fix: address review feedback for shortcuts and deep links

- Align "Add to home screen" menu icon and text padding with other
  bottom dialog items (use standard_dialog_padding consistently)
- Disable shortcuts when a conversation is deleted so pinned shortcuts
  show "conversation no longer exists" instead of broken navigation
- Use nextcloudtalk:// deep link URIs in shortcuts instead of bundle
  extras to fix multi-account navigation bug where switching accounts
  via shortcut would show conversation list instead of the conversation

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

Author: angrymuesli

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

@@ -1111,6 +1111,14 @@ class ConversationsListActivity : BaseActivity() {
                 if (workInfo != null) {
                     when (workInfo.state) {
                         WorkInfo.State.SUCCEEDED -> {
+                            currentUser?.id?.let { userId ->
+                                ShortcutManagerHelper.disableConversationShortcut(
+                                    context,
+                                    conversation.token,
+                                    userId,
+                                    context.resources.getString(R.string.nc_shortcut_conversation_deleted)
+                                )
+                            }
                             showSnackbar(
                                 String.format(
                                     context.resources.getString(R.string.deleted_conversation),

app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt

@@ -424,6 +424,14 @@ class ConversationsListBottomDialog(
                 if (workInfo != null) {
                     when (workInfo.state) {
                         WorkInfo.State.SUCCEEDED -> {
+                            currentUser.id?.let { userId ->
+                                ShortcutManagerHelper.disableConversationShortcut(
+                                    context,
+                                    conversation.token,
+                                    userId,
+                                    context.resources.getString(R.string.nc_shortcut_conversation_deleted)
+                                )
+                            }
                             activity.showSnackbar(
                                 String.format(
                                     context.resources.getString(R.string.left_conversation),

app/src/main/java/com/nextcloud/talk/utils/DeepLinkHandler.kt

@@ -24,7 +24,6 @@ object DeepLinkHandler {
 
     private const val SCHEME_NEXTCLOUD_TALK = "nextcloudtalk"
     private const val PATH_CALL = "call"
-    private const val PATH_INDEX_PHP = "index.php"
 
     // Token validation: alphanumeric characters, reasonable length
     private val TOKEN_PATTERN = Regex("^[a-zA-Z0-9]{4,32}$")

app/src/main/java/com/nextcloud/talk/utils/ShortcutManagerHelper.kt

@@ -8,7 +8,7 @@ package com.nextcloud.talk.utils
 
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
+import android.net.Uri
 import android.util.Log
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -17,7 +17,6 @@ import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.MainActivity
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.domain.ConversationModel
-import com.nextcloud.talk.utils.bundle.BundleKeys
 
 /**
  * Helper class for managing Android shortcuts for conversations.
@@ -32,39 +31,33 @@ object ShortcutManagerHelper {
     private const val CONVERSATION_SHORTCUT_PREFIX = "conversation_"
 
     /**
-     * Creates a shortcut for a conversation using bundle extras.
-     * This matches the existing Note To Self shortcut pattern.
+     * Creates a shortcut for a conversation using a nextcloudtalk:// deep link URI.
+     * This ensures proper multi-account user resolution when the shortcut is opened.
      *
      * @param context Application context
      * @param conversation The conversation to create a shortcut for
      * @param user The user account associated with the conversation
      * @return ShortcutInfoCompat ready to be added, or null if user ID is invalid
      */
     fun createConversationShortcut(context: Context, conversation: ConversationModel, user: User): ShortcutInfoCompat? {
-        val userId = user.id ?: run {
-            Log.w(TAG, "Cannot create shortcut: user ID is null")
-            return null
+        val userId = user.id
+        val baseUrl = user.baseUrl
+        val uri = baseUrl?.let {
+            DeepLinkHandler.createConversationUri(conversation.token, it, user.username)
+                .takeIf { built -> built != Uri.EMPTY }
         }
+        if (userId == null || uri == null) return null
 
-        val shortcutId = getShortcutId(conversation.token, userId)
         val displayName = conversation.displayName.ifBlank { conversation.name }
-
-        val bundle = Bundle().apply {
-            putString(BundleKeys.KEY_ROOM_TOKEN, conversation.token)
-            putLong(BundleKeys.KEY_INTERNAL_USER_ID, userId)
-        }
-
         val intent = Intent(context, MainActivity::class.java).apply {
             action = Intent.ACTION_VIEW
-            putExtras(bundle)
+            data = uri
         }
 
-        val icon = IconCompat.createWithResource(context, R.drawable.baseline_chat_bubble_outline_24)
-
-        return ShortcutInfoCompat.Builder(context, shortcutId)
+        return ShortcutInfoCompat.Builder(context, getShortcutId(conversation.token, userId))
             .setShortLabel(displayName)
             .setLongLabel(displayName)
-            .setIcon(icon)
+            .setIcon(IconCompat.createWithResource(context, R.drawable.baseline_chat_bubble_outline_24))
             .setIntent(intent)
             .build()
     }
@@ -135,21 +128,22 @@ object ShortcutManagerHelper {
      */
     @Suppress("DEPRECATION")
     private fun createLegacyShortcut(context: Context, conversation: ConversationModel, user: User): Boolean {
-        val userId = user.id ?: run {
-            Log.w(TAG, "Cannot create legacy shortcut: user ID is null")
+        if (user.id == null || user.baseUrl == null) {
+            Log.w(TAG, "Cannot create legacy shortcut: user ID or base URL is null")
             return false
         }
 
         val displayName = conversation.displayName.ifBlank { conversation.name }
 
-        val bundle = Bundle().apply {
-            putString(BundleKeys.KEY_ROOM_TOKEN, conversation.token)
-            putLong(BundleKeys.KEY_INTERNAL_USER_ID, userId)
-        }
+        val uri = DeepLinkHandler.createConversationUri(
+            roomToken = conversation.token,
+            serverUrl = user.baseUrl!!,
+            username = user.username
+        )
 
         val launchIntent = Intent(context, MainActivity::class.java).apply {
             action = Intent.ACTION_VIEW
-            putExtras(bundle)
+            data = uri
         }
 
         val shortcutIntent = Intent("com.android.launcher.action.INSTALL_SHORTCUT").apply {
@@ -197,6 +191,21 @@ object ShortcutManagerHelper {
         ShortcutManagerCompat.removeDynamicShortcuts(context, listOf(shortcutId))
     }
 
+    /**
+     * Disables all shortcuts (dynamic and pinned) for a deleted conversation.
+     * Dynamic shortcuts are removed; pinned shortcuts are disabled with a message.
+     *
+     * @param context Application context
+     * @param roomToken The conversation token
+     * @param userId The user ID
+     * @param disabledMessage Message shown when a disabled pinned shortcut is tapped
+     */
+    fun disableConversationShortcut(context: Context, roomToken: String, userId: Long, disabledMessage: String) {
+        val shortcutId = getShortcutId(roomToken, userId)
+        ShortcutManagerCompat.removeDynamicShortcuts(context, listOf(shortcutId))
+        ShortcutManagerCompat.disableShortcuts(context, listOf(shortcutId), disabledMessage)
+    }
+
     /**
      * Generates a unique shortcut ID for a conversation.
      */

app/src/main/res/layout/dialog_conversation_operations.xml

@@ -203,8 +203,8 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
+                android:paddingStart="@dimen/standard_dialog_padding"
+                android:paddingEnd="@dimen/standard_dialog_padding"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
@@ -218,7 +218,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start|center_vertical"
-                    android:paddingStart="40dp"
+                    android:paddingStart="@dimen/standard_dialog_padding"
                     android:paddingEnd="@dimen/zero"
                     android:text="@string/nc_add_to_home_screen"
                     android:textAlignment="viewStart"

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

@@ -42,6 +42,7 @@ How to translate with transifex:
     <!-- Shortcuts and Deep Links -->
     <string name="nc_add_to_home_screen">Add to home screen</string>
     <string name="nc_shortcut_created">Shortcut created</string>
+    <string name="nc_shortcut_conversation_deleted">This conversation no longer exists</string>
     <string name="nc_no_account_for_server">No account found for this server</string>
 
     <!-- Bottom Navigation -->