fix last minor point (b137fb3c) · Commits · e / os / AccountManager

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

+14 −9

Original line number	Diff line number	Diff line
		@@ -17,7 +17,19 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		override fun onStart() {
		super.onStart()

		val accountName = intent?.extras?.getString(KEY_ACCOUNT_NAME, null) ?: return
		val accountName = intent?.extras?.getString(KEY_ACCOUNT_NAME, null) ?: run {
		finish()
		return
		}

		logoutAccount(accountName)
		}

		private fun logoutAccount(accountName: String)
		{
		val accountManager = AccountManager.get(this)
		val eAccounts= accountManager.getAccountsByType(applicationContext.getString(R.string.eelo_account_type))
		val activity = this

		val accountRemovalCallback: (AliasFuture) -> Unit = { future ->
		val success = future.result.getBoolean(KEY_BOOLEAN_RESULT)
		@@ -30,18 +42,11 @@ class ReLoginWithOidcActivity : AppCompatActivity() {
		}
		}

		logoutAccount(accountName, accountRemovalCallback)
		}

		private fun logoutAccount(accountName: String, callback : (AliasFuture) -> Unit)
		{
		val accountManager = AccountManager.get(this)
		val eAccounts= accountManager.getAccountsByType(applicationContext.getString(R.string.eelo_account_type))
		val activity = this

		eAccounts.firstOrNull() { it.name == accountName }?.run {
		Logger.log.info("Vincent: try to remove account: ${this.name} ") //todo remove this before merge
		accountManager.removeAccount(this, activity, callback, null)
		accountManager.removeAccount(this, activity, accountRemovalCallback, null)

		} ?: finish()
		}