fix: replace finish() by finishAdnRemoveTask() (5d9bbe79) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/ReLoginWithOidcActivity.kt

+5 −4

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		Logger.log.info("Vincent: call logoutAccount()")
		logoutAccount(account)
		} else {
		finish()
		finishAndRemoveTask()
		}
		}

		@@ -70,7 +70,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		} else {
		Logger.log.info("failed to remove /e/OS account")
		Handler(Looper.getMainLooper()).post {
		finish()
		finishAndRemoveTask()
		}
		}
		}
		@@ -80,6 +80,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		accountManager.removeAccount(account, this, callback, null)
		} catch (exception: Exception) {
		Logger.log.warning("Cannot remove account: ${account.name} : ${exception.message}")
		finishAndRemoveTask()
		}
		}

		@@ -91,7 +92,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		Logger.log.info("Vincent: callback for login account. Intent started. About to finish ${this.javaClass}")

		Handler(Looper.getMainLooper()).post {
		finish()
		finishAndRemoveTask()
		}
		}

		@@ -99,7 +100,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		accountManager.addAccount(accountType,null, null, null, null, callback, null)
		} catch (exception: Exception) {
		Logger.log.warning("${exception.javaClass}: can't add account: ${exception.message}")
		finish()
		finishAndRemoveTask()
		}
		}