fix: handle shortcut cleanup in ConversationInfoActivity and fix back-stack

- Disable shortcuts when deleting or leaving a conversation from
  ConversationInfoActivity (previously only handled in bottom dialog)
- Fix back-stack for deep link navigation: open ConversationsListActivity
  before ChatActivity so pressing back shows the correct user's
  conversation list instead of stale data from a previous account

Signed-off-by: angrymuesli <github.visibly626@slmails.com>

Author: angrymuesli

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -336,10 +336,15 @@ class MainActivity :
 
                         if (isFinishing || isDestroyed) return@subscribe
 
+                        // Open conversation list first so back press shows correct user's conversations
+                        val listIntent = Intent(context, ConversationsListActivity::class.java)
+                        listIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+
                         val chatIntent = Intent(context, ChatActivity::class.java)
                         chatIntent.putExtra(KEY_ROOM_TOKEN, deepLinkResult.roomToken)
                         chatIntent.putExtra(BundleKeys.KEY_INTERNAL_USER_ID, targetUser.id)
-                        startActivity(chatIntent)
+
+                        startActivities(arrayOf(listIntent, chatIntent))
                     } else {
                         Toast.makeText(
                             context,

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -90,6 +90,7 @@ import com.nextcloud.talk.utils.ConversationUtils
 import com.nextcloud.talk.utils.DateConstants
 import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.ShareUtils
+import com.nextcloud.talk.utils.ShortcutManagerHelper
 import com.nextcloud.talk.utils.SpreedFeatures
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
@@ -1005,6 +1006,14 @@ class ConversationInfoActivity : BaseActivity() {
                     if (workInfo != null) {
                         when (workInfo.state) {
                             WorkInfo.State.SUCCEEDED -> {
+                                conversationUser.id?.let { userId ->
+                                    ShortcutManagerHelper.disableConversationShortcut(
+                                        context,
+                                        conversationToken,
+                                        userId,
+                                        context.resources.getString(R.string.nc_shortcut_conversation_deleted)
+                                    )
+                                }
                                 val intent = Intent(context, MainActivity::class.java)
                                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                                 startActivity(intent)
@@ -1080,6 +1089,14 @@ class ConversationInfoActivity : BaseActivity() {
                     DeleteConversationWorker::class.java
                 ).setInputData(it).build()
             )
+            conversationUser.id?.let { userId ->
+                ShortcutManagerHelper.disableConversationShortcut(
+                    context,
+                    conversationToken,
+                    userId,
+                    context.resources.getString(R.string.nc_shortcut_conversation_deleted)
+                )
+            }
             val intent = Intent(context, MainActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(intent)