Loading app/src/main/java/at/bitfire/davdroid/ReLoginWithOidcActivity.kt +5 −0 Original line number Diff line number Diff line Loading @@ -51,9 +51,12 @@ class ReLoginWithOidcActivity : AppCompatActivity() { if (success) { Logger.log.info("Vincent: Account removed. Now will sign in again with OIDC") //todo: open Login activity without android AccountManager loginAccount(eAccountType) } else { Logger.log.info("failed to remove account: $accountName ") //todo call a finish } } Loading Loading @@ -90,7 +93,9 @@ class ReLoginWithOidcActivity : AppCompatActivity() { ) } catch (exception: Exception) { Logger.log.warning("${exception.javaClass}: can't add account: ${exception.message}") //todo call finish } } private fun getIntentFromFuture(future: AliasFuture): Intent? { Loading app/src/main/kotlin/at/bitfire/davdroid/receiver/BootCompletedReceiver.kt +1 −1 Original line number Diff line number Diff line Loading @@ -74,7 +74,7 @@ class BootCompletedReceiver: BroadcastReceiver() { private fun generateLogoutIntent(accountName: String, context: Context): PendingIntent { val reLoginIntent = Intent(context, ReLoginWithOidcActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK //flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK putExtra(AccountManager.KEY_ACCOUNT_NAME, accountName) } Loading Loading
app/src/main/java/at/bitfire/davdroid/ReLoginWithOidcActivity.kt +5 −0 Original line number Diff line number Diff line Loading @@ -51,9 +51,12 @@ class ReLoginWithOidcActivity : AppCompatActivity() { if (success) { Logger.log.info("Vincent: Account removed. Now will sign in again with OIDC") //todo: open Login activity without android AccountManager loginAccount(eAccountType) } else { Logger.log.info("failed to remove account: $accountName ") //todo call a finish } } Loading Loading @@ -90,7 +93,9 @@ class ReLoginWithOidcActivity : AppCompatActivity() { ) } catch (exception: Exception) { Logger.log.warning("${exception.javaClass}: can't add account: ${exception.message}") //todo call finish } } private fun getIntentFromFuture(future: AliasFuture): Intent? { Loading
app/src/main/kotlin/at/bitfire/davdroid/receiver/BootCompletedReceiver.kt +1 −1 Original line number Diff line number Diff line Loading @@ -74,7 +74,7 @@ class BootCompletedReceiver: BroadcastReceiver() { private fun generateLogoutIntent(accountName: String, context: Context): PendingIntent { val reLoginIntent = Intent(context, ReLoginWithOidcActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK //flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK putExtra(AccountManager.KEY_ACCOUNT_NAME, accountName) } Loading