Clean up `AccountRemover[Worker]` (d8e09b57) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@ class AccountRemover(
		private val preferences: Preferences,
		) {

		fun removeAccount(accountUuid: String): Boolean {
		fun removeAccount(accountUuid: String) {
		val account = preferences.getAccount(accountUuid)
		if (account == null) {
		Timber.w("Can't remove account with UUID %s because it doesn't exist.", accountUuid)
		return false
		return
		}

		val accountName = account.toString()
		@@ -40,7 +40,6 @@ class AccountRemover(
		Core.setServicesEnabled()

		Timber.v("Finished removing account '%s'.", accountName)
		return true
		}

		private fun removeLocalStore(account: Account) {

+4 −5

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ import androidx.work.Worker
		import androidx.work.WorkerParameters

		/**
		* A [Worker] to remove account in the background.
		* A [Worker] to remove an account in the background.
		*/
		class AccountRemoverWorker(
		private val accountRemover: AccountRemover,
		@@ -18,12 +18,11 @@ class AccountRemoverWorker(
		) : Worker(context, workerParams) {

		override fun doWork(): Result {
		val accountUuid = inputData.getString(ARG_ACCOUNT_UUID)
		?: throw IllegalArgumentException("No account UUID provided")
		val accountUuid = requireNotNull(inputData.getString(ARG_ACCOUNT_UUID)) { "No account UUID provided" }

		val success = accountRemover.removeAccount(accountUuid)
		accountRemover.removeAccount(accountUuid)

		return if (success) Result.success() else Result.retry()
		return Result.success()
		}

		companion object {