From 7b71e20bd86f89e60bfb117b0f627794311823bb Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 2 Mar 2026 18:32:19 +0100 Subject: [PATCH 1/3] properly switch between the accounts Signed-off-by: sowjanyakch --- app/src/main/AndroidManifest.xml | 10 ++--- .../ConversationsListActivity.kt | 37 +++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 10899b632f..343b4cc4db 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -110,11 +110,6 @@ - - - - - @@ -164,6 +159,11 @@ android:name="android.service.chooser.chooser_target_service" android:value="androidx.sharetarget.ChooserTargetServiceCompat" /> + + + + + diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index a2c4296a6d..9972d839fc 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -33,6 +33,10 @@ import androidx.work.WorkInfo import androidx.work.WorkManager import autodagger.AutoInjector import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.snackbar.Snackbar +import com.nextcloud.android.common.core.utils.ecosystem.AccountReceiverCallback +import com.nextcloud.android.common.core.utils.ecosystem.EcosystemManager +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.account.BrowserLoginActivity import com.nextcloud.talk.account.ServerSelectionActivity @@ -168,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) { @@ -181,6 +187,7 @@ class ConversationsListActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) + ecosystemManager = EcosystemManager(this@ConversationsListActivity) currentUser = currentUserProviderOld.currentUser.blockingGet() @@ -201,6 +208,9 @@ class ConversationsListActivity : BaseActivity() { ) } + intent?.let { + handleEcoSystemIntent(it) + } initObservers() } @@ -302,6 +312,33 @@ 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) + } + Log.d(TAG, accountName) + } + + override fun onAccountError(reason: String) { + Log.d(TAG, "handleEcosystemIntent: $reason") + } + } + ) + } + override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) From 2cf8028495adf7a13aa412539319b02ff2db4d0d Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 2 Mar 2026 18:43:48 +0100 Subject: [PATCH 2/3] show warning - account not found Signed-off-by: sowjanyakch --- .../talk/conversationlist/ConversationsListActivity.kt | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 9972d839fc..5b3a29ad61 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -219,6 +219,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, @@ -328,6 +333,8 @@ class ConversationsListActivity : BaseActivity() { userManager.setUserAsActive(user) val intent = Intent(context, ConversationsListActivity::class.java) startActivity(intent) + } else { + Snackbar.make(binding.root, R.string.nc_no_account_found, Snackbar.LENGTH_LONG).show() } Log.d(TAG, accountName) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d856713cc5..edc86177be 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1001,4 +1001,5 @@ How to translate with transifex: Nextcloud app suggestions in account chooser dialog Turn on background blur Turn off background blur + Account not found From e423253434b1a0da9f9f1592080c92033daac500 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 1 Apr 2026 12:05:00 +0200 Subject: [PATCH 3/3] modify snackbar to composable Signed-off-by: sowjanyakch --- .../talk/conversationlist/ConversationsListActivity.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 5b3a29ad61..239069e871 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -33,10 +33,8 @@ import androidx.work.WorkInfo import androidx.work.WorkManager import autodagger.AutoInjector import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.google.android.material.snackbar.Snackbar import com.nextcloud.android.common.core.utils.ecosystem.AccountReceiverCallback import com.nextcloud.android.common.core.utils.ecosystem.EcosystemManager -import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.account.BrowserLoginActivity import com.nextcloud.talk.account.ServerSelectionActivity @@ -334,7 +332,7 @@ class ConversationsListActivity : BaseActivity() { val intent = Intent(context, ConversationsListActivity::class.java) startActivity(intent) } else { - Snackbar.make(binding.root, R.string.nc_no_account_found, Snackbar.LENGTH_LONG).show() + showSnackbar(getString(R.string.nc_no_account_found)) } Log.d(TAG, accountName) }