WIP. Fix failing login etc

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

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

@@ -22,7 +22,6 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import autodagger.AutoInjector
 import com.bluelinelabs.logansquare.LoganSquare
-import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.BaseActivity
 import com.nextcloud.talk.api.NcApi
@@ -240,7 +239,7 @@ class AccountVerificationActivity : BaseActivity() {
             UserManager.UserAttributes(
                 id = null,
                 serverUrl = baseUrl,
-                currentUser = true,
+                currentUser = false,
                 userId = userId,
                 token = token,
                 displayName = displayName,
@@ -259,25 +258,32 @@ class AccountVerificationActivity : BaseActivity() {
 
                 @SuppressLint("SetTextI18n")
                 override fun onSuccess(user: User) {
-                    internalAccountId = user.id!!
+                    if (userManager.setUserAsActive(user).blockingGet()) {
-                    if (ClosedInterfaceImpl().isGooglePlayServicesAvailable) {
+                        internalAccountId = user.id!!
-                        ClosedInterfaceImpl().setUpPushTokenRegistration()
+                        if (ClosedInterfaceImpl().isGooglePlayServicesAvailable) {
-                    } else {
+                            ClosedInterfaceImpl().setUpPushTokenRegistration()
-                        Log.w(TAG, "Skipping push registration.")
+                        } else {
-                        runOnUiThread {
+                            Log.w(TAG, "Skipping push registration.")
-                            binding.progressText.text =
+                            runOnUiThread {
-                                """ ${binding.progressText.text}
+                                binding.progressText.text =
+                                    """ ${binding.progressText.text}
                                     ${resources!!.getString(R.string.nc_push_disabled)}
-                                """.trimIndent()
+                                    """.trimIndent()
+                            }
+                            fetchAndStoreCapabilities()
                         }
-                        fetchAndStoreCapabilities()
+                    } else {
+                        Log.e(TAG, "Failed to set user active")
+                        binding.progressText.text = """ ${binding.progressText.text}""".trimIndent() +
+                            resources!!.getString(R.string.nc_common_error_sorry)
+                        abortVerification()
                     }
                 }
 
                 @SuppressLint("SetTextI18n")
                 override fun onError(e: Throwable) {
                     binding.progressText.text = """ ${binding.progressText.text}""".trimIndent() +
-                        resources!!.getString(R.string.nc_display_name_not_stored)
+                        resources!!.getString(R.string.nc_common_error_sorry)
                     abortVerification()
                 }
 
@@ -371,16 +377,25 @@ class AccountVerificationActivity : BaseActivity() {
                 fetchAndStoreExternalSignalingSettings()
             }
         } else if (eventStatus.eventType == EventStatus.EventType.SIGNALING_SETTINGS) {
-            if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
+            if (internalAccountId == eventStatus.userId) {
-                runOnUiThread {
+                if (eventStatus.isAllGood) {
-                    binding.progressText.text =
+                    proceedWithLogin()
-                        """
+                } else {
+                    runOnUiThread {
+                        binding.progressText.text =
+                            """
                             ${binding.progressText.text}
                             ${resources!!.getString(R.string.nc_external_server_failed)}
-                        """.trimIndent()
+                            """.trimIndent()
+                    }
                 }
+            } else {
+                Log.d(
+                    TAG,
+                    "got SIGNALING_SETTINGS, internalAccountId=$internalAccountId , eventStatus.userId=" +
+                        eventStatus.userId
+                )
             }
-            proceedWithLogin()
         }
     }
 
@@ -414,33 +429,27 @@ class AccountVerificationActivity : BaseActivity() {
 
     private fun proceedWithLogin() {
         cookieManager.cookieStore.removeAll()
+        // make sure currentUser is already set! otherwise: continuing proceedWithLogin was skipped for this user
 
-        if (userManager.users.blockingGet().size == 1 ||
+        // val usersAmount = userManager.users.blockingGet().size
-            currentUserProvider.currentUser.blockingGet().id != internalAccountId
+        // val currentUserId = currentUserProvider.currentUser.blockingGet().id
-        ) {
-            val userToSetAsActive = userManager.getUserWithId(internalAccountId).blockingGet()
-            Log.d(TAG, "userToSetAsActive: " + userToSetAsActive.username)
 
-            if (userManager.setUserAsActive(userToSetAsActive).blockingGet()) {
+        // Log.d(TAG, "usersAmount in proceedWithLogin: $usersAmount")
-                runOnUiThread {
+        // Log.d(TAG, "currentUserId in proceedWithLogin: $currentUserId")
-                    if (userManager.users.blockingGet().size == 1) {
+        Log.d(TAG, "internalAccountId in proceedWithLogin: $internalAccountId")
-                        val intent = Intent(context, ConversationsListActivity::class.java)
+
-                        startActivity(intent)
+        runOnUiThread {
-                    } else {
+            // if (usersAmount == 1) {
-                        if (isAccountImport) {
+            //     val intent = Intent(context, ConversationsListActivity::class.java)
-                            ApplicationWideMessageHolder.getInstance().messageType =
+            //     startActivity(intent)
-                                ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED
+            // } else {
-                        }
+            if (isAccountImport) {
-                        val intent = Intent(context, ConversationsListActivity::class.java)
+                ApplicationWideMessageHolder.getInstance().messageType =
-                        startActivity(intent)
+                    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()
             }
-        } else {
+            val intent = Intent(context, ConversationsListActivity::class.java)
-            Log.d(TAG, "continuing proceedWithLogin was skipped for this user")
+            startActivity(intent)
+            // }
         }
     }
 

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -1780,6 +1780,7 @@ class ConversationsListActivity :
 
     @SuppressLint("CheckResult")
     private fun deleteUserAndRestartApp() {
+        val userToDeleteDisplayName = currentUser!!.displayName
         userManager.scheduleUserForDeletionWithId(currentUser!!.id!!).blockingGet()
         val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java).build()
         WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork)
@@ -1791,7 +1792,7 @@ class ConversationsListActivity :
                     WorkInfo.State.SUCCEEDED -> {
                         val text = String.format(
                             context.resources.getString(R.string.nc_deleted_user),
-                            currentUser!!.displayName
+                            userToDeleteDisplayName
                         )
                         Toast.makeText(
                             context,
@@ -1807,7 +1808,7 @@ class ConversationsListActivity :
                             context.resources.getString(R.string.nc_common_error_sorry),
                             Toast.LENGTH_LONG
                         ).show()
-                        Log.e(TAG, "something went wrong when deleting user with id " + currentUser!!.userId)
+                        Log.e(TAG, "something went wrong when deleting user")
                         restartApp()
                     }
 

app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt

@@ -108,7 +108,7 @@ abstract class TalkDatabase : RoomDatabase() {
             return Room
                 .databaseBuilder(context.applicationContext, TalkDatabase::class.java, dbName)
                 // comment out openHelperFactory to view the database entries in Android Studio for debugging
-                .openHelperFactory(factory)
+                // .openHelperFactory(factory)
                 .addMigrations(
                     Migrations.MIGRATION_6_8,
                     Migrations.MIGRATION_7_8,