Merge pull request #5920 from nextcloud/bugfix/5886/ecosystemSwitcher

Switch properly between accounts

Author: mahibi

app/src/main/AndroidManifest.xml

@@ -111,11 +111,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="com.nextcloud.intent.OPEN_ECOSYSTEM_APP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -173,6 +168,11 @@
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
 
+            <intent-filter>
+                <action android:name="com.nextcloud.intent.OPEN_ECOSYSTEM_APP" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -34,6 +34,8 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import autodagger.AutoInjector
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.nextcloud.android.common.core.utils.ecosystem.AccountReceiverCallback
+import com.nextcloud.android.common.core.utils.ecosystem.EcosystemManager
 import com.nextcloud.talk.R
 import com.nextcloud.talk.account.BrowserLoginActivity
 import com.nextcloud.talk.account.ServerSelectionActivity
@@ -170,6 +172,8 @@ class ConversationsListActivity : BaseActivity() {
     private var selectedMessageId: String? = null
     private var pendingDirectShareToken: String? = null
 
+    lateinit var ecosystemManager: EcosystemManager
+
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
             if (forwardMessage) {
@@ -183,6 +187,7 @@ class ConversationsListActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
+        ecosystemManager = EcosystemManager(this@ConversationsListActivity)
 
         val targetUserId = intent.getLongExtra(KEY_INTERNAL_USER_ID, 0L)
         currentUser = if (targetUserId != 0L) {
@@ -208,6 +213,9 @@ class ConversationsListActivity : BaseActivity() {
             )
         }
 
+        intent?.let {
+            handleEcoSystemIntent(it)
+        }
         initObservers()
     }
 
@@ -216,6 +224,11 @@ class ConversationsListActivity : BaseActivity() {
         outState.putBoolean(KEY_ACCOUNT_DIALOG_VISIBLE, showAccountDialogState.value)
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        handleEcoSystemIntent(intent)
+    }
+
     private fun buildScreenState() =
         ConversationsListScreenState(
             currentUser = currentUser,
@@ -309,6 +322,35 @@ class ConversationsListActivity : BaseActivity() {
             onConversationOpsAction = { action, conversation -> handleConversationOpsAction(action, conversation) }
         )
 
+    private fun handleEcoSystemIntent(intent: Intent) {
+        ecosystemManager.receiveAccount(
+            intent,
+            object : AccountReceiverCallback {
+                @SuppressLint("UseKtx")
+                override fun onAccountReceived(accountName: String) {
+                    val users = userManager.users.blockingGet()
+                    val baseUrl = accountName.substringAfterLast("@")
+                    val accountName = accountName.substringBeforeLast("@")
+                    val user = users.firstOrNull { user ->
+                        user.username == accountName && baseUrl == user.baseUrl?.toUri()?.host
+                    }
+                    if (user != null) {
+                        userManager.setUserAsActive(user)
+                        val intent = Intent(context, ConversationsListActivity::class.java)
+                        startActivity(intent)
+                    } else {
+                        showSnackbar(getString(R.string.nc_no_account_found))
+                    }
+                    Log.d(TAG, accountName)
+                }
+
+                override fun onAccountError(reason: String) {
+                    Log.d(TAG, "handleEcosystemIntent: $reason")
+                }
+            }
+        )
+    }
+
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
 

app/src/main/res/values/strings.xml

@@ -991,4 +991,5 @@ How to translate with transifex:
     <string name="nc_show_ecosystem_description">Nextcloud app suggestions in account chooser dialog</string>
     <string name="turn_on_background_blur">Turn on background blur</string>
     <string name="turn_off_background_blur">Turn off background blur</string>
+    <string name="nc_no_account_found">Account not found</string>
 </resources>