fix(login): unconditionally proceed with login after account verification

proceedWithLogin() skipped setting the account active and navigating
onward whenever the newly stored account already looked like the
active user in the DB. Since storeProfile() always inserts new
accounts with current=true and the current-user query picks the row
with the highest id, this was true for any 2nd+ account added,
leaving the verification screen stuck forever.

Signed-off-by: Marcel Hibbe <marcel.hibbe@nextcloud.com>

Author: mahibi

app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -519,32 +519,21 @@ class AccountVerificationActivity : BaseActivity() {
     private fun proceedWithLogin() {
         cookieManager.cookieStore.removeAll()
 
-        if (userManager.users.blockingGet().size == 1 ||
-            currentUserProviderOld.currentUser.blockingGet().id != internalAccountId
-        ) {
-            val userToSetAsActive = userManager.getUserWithId(internalAccountId).blockingGet()
-            Log.d(TAG, "userToSetAsActive: " + userToSetAsActive.username)
+        val userToSetAsActive = userManager.getUserWithId(internalAccountId).blockingGet()
+        Log.d(TAG, "userToSetAsActive: " + userToSetAsActive.username)
 
-            if (userManager.setUserAsActive(userToSetAsActive).blockingGet()) {
-                runOnUiThread {
-                    if (userManager.users.blockingGet().size == 1) {
-                        val intent = Intent(context, ConversationsListActivity::class.java)
-                        startActivity(intent)
-                    } else {
-                        if (isAccountImport) {
-                            ApplicationWideMessageHolder.getInstance().messageType =
-                                ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED
-                        }
-                        val intent = Intent(context, ConversationsListActivity::class.java)
-                        startActivity(intent)
-                    }
+        if (userManager.setUserAsActive(userToSetAsActive).blockingGet()) {
+            runOnUiThread {
+                if (userManager.users.blockingGet().size > 1 && isAccountImport) {
+                    ApplicationWideMessageHolder.getInstance().messageType =
+                        ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED
                 }
-            } else {
-                Log.e(TAG, "failed to set active user")
-                Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
+                val intent = Intent(context, ConversationsListActivity::class.java)
+                startActivity(intent)
             }
         } else {
-            Log.d(TAG, "continuing proceedWithLogin was skipped for this user")
+            Log.e(TAG, "failed to set active user")
+            Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
         }
     }