Loading app/src/main/java/at/bitfire/davdroid/ReLoginWithOidcActivity.kt +5 −11 Original line number Diff line number Diff line Loading @@ -32,20 +32,18 @@ class ReLoginWithOidcActivity : AppCompatActivity() { override fun onStart() { super.onStart() Logger.log.info("Vincent: onStart()") val accountName = intent?.extras?.getString(KEY_ACCOUNT_NAME, null) ?: run { finish() finishAndRemoveTask() return } val account = getAccount(accountName) if (isAccountRemoved && account == null) { Logger.log.info("Vincent: call loginAccount()") loginAccount(eAccountType) } else if (!isAccountRemoved && account != null) { Logger.log.info("Vincent: call logoutAccount()") logoutAccount(account) } else { finishAndRemoveTask() Loading @@ -71,7 +69,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() { if (success) { isAccountRemoved = true Logger.log.info("Vincent: Account removed. Now will sign in again with OIDC") Logger.log.info("Account removed. Now will sign in again with OIDC") loginAccount(eAccountType) } else { Handler(Looper.getMainLooper()).post { Loading @@ -79,8 +77,6 @@ class ReLoginWithOidcActivity : AppCompatActivity() { } } } Logger.log.info("Vincent: about to call accountManager.removeAccount") accountManager.removeAccount(account, this, callback, null) } Loading @@ -89,10 +85,8 @@ class ReLoginWithOidcActivity : AppCompatActivity() { val callback: (AliasFuture) -> Unit = { future -> try { val accountName = future.result?.getString(KEY_ACCOUNT_NAME) if (accountName != null) { Logger.log.info("Vincent: Account $accountName logged again") } else { Logger.log.warning("Vincent: No new account relogged") if (accountName == null) { Logger.log.warning("No account re-added") } } catch (exception: Exception) { Logger.log.warning("${exception.javaClass}: can't add account: ${exception.message}") Loading Loading
app/src/main/java/at/bitfire/davdroid/ReLoginWithOidcActivity.kt +5 −11 Original line number Diff line number Diff line Loading @@ -32,20 +32,18 @@ class ReLoginWithOidcActivity : AppCompatActivity() { override fun onStart() { super.onStart() Logger.log.info("Vincent: onStart()") val accountName = intent?.extras?.getString(KEY_ACCOUNT_NAME, null) ?: run { finish() finishAndRemoveTask() return } val account = getAccount(accountName) if (isAccountRemoved && account == null) { Logger.log.info("Vincent: call loginAccount()") loginAccount(eAccountType) } else if (!isAccountRemoved && account != null) { Logger.log.info("Vincent: call logoutAccount()") logoutAccount(account) } else { finishAndRemoveTask() Loading @@ -71,7 +69,7 @@ class ReLoginWithOidcActivity : AppCompatActivity() { if (success) { isAccountRemoved = true Logger.log.info("Vincent: Account removed. Now will sign in again with OIDC") Logger.log.info("Account removed. Now will sign in again with OIDC") loginAccount(eAccountType) } else { Handler(Looper.getMainLooper()).post { Loading @@ -79,8 +77,6 @@ class ReLoginWithOidcActivity : AppCompatActivity() { } } } Logger.log.info("Vincent: about to call accountManager.removeAccount") accountManager.removeAccount(account, this, callback, null) } Loading @@ -89,10 +85,8 @@ class ReLoginWithOidcActivity : AppCompatActivity() { val callback: (AliasFuture) -> Unit = { future -> try { val accountName = future.result?.getString(KEY_ACCOUNT_NAME) if (accountName != null) { Logger.log.info("Vincent: Account $accountName logged again") } else { Logger.log.warning("Vincent: No new account relogged") if (accountName == null) { Logger.log.warning("No account re-added") } } catch (exception: Exception) { Logger.log.warning("${exception.javaClass}: can't add account: ${exception.message}") Loading