feat: adapt shortcuts to Compose conversation operations sheet

Upstream migrated the conversation bottom dialog to a Compose
ModalBottomSheet. Adapt our shortcut features to the new architecture:

- Add AddToHomeScreen action to ConversationOpsAction sealed class
- Add "Add to home screen" menu item in ConversationOperationsSheet
- Wire handler in ConversationsListActivity.handleConversationOpsAction
- Fix back-stack: pass KEY_INTERNAL_USER_ID to ConversationsListActivity
  via intent so it reads the correct user from DB instead of stale cache

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

Author: angrymuesli

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

@@ -298,8 +298,6 @@ class MainActivity :
     private fun handleDeepLink(intent: Intent): Boolean {
         val deepLinkResult = intent.data?.let { DeepLinkHandler.parseDeepLink(it) } ?: return false
 
-        Log.d(TAG, "Handling deep link: token=${deepLinkResult.roomToken}, server=${deepLinkResult.serverUrl}")
-
         val disposable = userManager.users
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
@@ -339,6 +337,7 @@ class MainActivity :
                         // 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)
+                        listIntent.putExtra(BundleKeys.KEY_INTERNAL_USER_ID, targetUser.id)
 
                         val chatIntent = Intent(context, ChatActivity::class.java)
                         chatIntent.putExtra(KEY_ROOM_TOKEN, deepLinkResult.roomToken)

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

@@ -179,7 +179,12 @@ class ConversationsListActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
 
-        currentUser = currentUserProviderOld.currentUser.blockingGet()
+        val targetUserId = intent.getLongExtra(KEY_INTERNAL_USER_ID, 0L)
+        currentUser = if (targetUserId != 0L) {
+            userManager.getUserWithId(targetUserId).blockingGet()
+        } else {
+            currentUserProviderOld.currentUser.blockingGet()
+        }
 
         conversationsListViewModel = ViewModelProvider(this, viewModelFactory)[ConversationsListViewModel::class.java]
         contextChatViewModel = ViewModelProvider(this, viewModelFactory)[ContextChatViewModel::class.java]
@@ -975,6 +980,7 @@ class ConversationsListActivity : BaseActivity() {
             is ConversationOpsAction.ShareLink -> shareConversationLink(conversation)
             is ConversationOpsAction.Rename -> renameConversation(conversation)
             is ConversationOpsAction.ToggleArchive -> handleArchiving(conversation)
+            is ConversationOpsAction.AddToHomeScreen -> addConversationToHomeScreen(conversation)
             is ConversationOpsAction.Leave -> leaveConversation(conversation)
             is ConversationOpsAction.Delete -> showDeleteConversationDialog(conversation)
         }
@@ -991,6 +997,16 @@ class ConversationsListActivity : BaseActivity() {
         )
     }
 
+    private fun addConversationToHomeScreen(conversation: ConversationModel) {
+        val user = currentUser ?: return
+        val success = ShortcutManagerHelper.requestPinShortcut(this, conversation, user)
+        if (success) {
+            showSnackbar(resources.getString(R.string.nc_shortcut_created))
+        } else {
+            showSnackbar(resources.getString(R.string.nc_common_error_sorry))
+        }
+    }
+
     @Suppress("Detekt.TooGenericExceptionCaught", "TooGenericExceptionCaught")
     private fun handleArchiving(conversation: ConversationModel) {
         val apiVersion = ApiUtils.getConversationApiVersion(currentUser!!, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V1))
@@ -1077,6 +1093,14 @@ class ConversationsListActivity : BaseActivity() {
         WorkManager.getInstance(this).getWorkInfoByIdLiveData(worker.id).observeForever { workInfo ->
             when (workInfo?.state) {
                 WorkInfo.State.SUCCEEDED -> {
+                    currentUser?.id?.let { userId ->
+                        ShortcutManagerHelper.disableConversationShortcut(
+                            this,
+                            conversation.token,
+                            userId,
+                            resources.getString(R.string.nc_shortcut_conversation_deleted)
+                        )
+                    }
                     showSnackbar(
                         String.format(resources.getString(R.string.left_conversation), conversation.displayName)
                     )

app/src/main/java/com/nextcloud/talk/conversationlist/ui/ConversationOperationsSheet.kt

@@ -53,6 +53,7 @@ private data class ConversationOpsVisibility(
     val showShareLink: Boolean,
     val showRename: Boolean,
     val isArchived: Boolean,
+    val showAddToHomeScreen: Boolean,
     val showLeave: Boolean,
     val showDelete: Boolean
 )
@@ -70,6 +71,7 @@ private fun computeVisibility(conversation: ConversationModel, user: User): Conv
         showShareLink = !ConversationUtils.isNoteToSelfConversation(conversation),
         showRename = spreedCap != null && ConversationUtils.isNameEditable(conversation, spreedCap),
         isArchived = conversation.hasArchived,
+        showAddToHomeScreen = true,
         showLeave = conversation.canLeaveConversation,
         showDelete = conversation.canDeleteConversation
     )
@@ -165,6 +167,12 @@ private fun ConversationOpsManageGroup(
         stringResource(R.string.archive_conversation)
     }
     ConversationOpsMenuItem(archiveIcon, archiveLabel) { onAction(ConversationOpsAction.ToggleArchive) }
+    if (visibility.showAddToHomeScreen) {
+        ConversationOpsMenuItem(
+            R.drawable.ic_home,
+            stringResource(R.string.nc_add_to_home_screen)
+        ) { onAction(ConversationOpsAction.AddToHomeScreen) }
+    }
     if (visibility.showLeave) {
         ConversationOpsMenuItem(
             R.drawable.ic_exit_to_app_black_24dp,

app/src/main/java/com/nextcloud/talk/conversationlist/ui/ConversationOpsAction.kt

@@ -15,6 +15,7 @@ sealed class ConversationOpsAction {
     object ShareLink : ConversationOpsAction()
     object Rename : ConversationOpsAction()
     object ToggleArchive : ConversationOpsAction()
+    object AddToHomeScreen : ConversationOpsAction()
     object Leave : ConversationOpsAction()
     object Delete : ConversationOpsAction()
 }

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

@@ -128,7 +128,8 @@ object ShortcutManagerHelper {
      */
     @Suppress("DEPRECATION")
     private fun createLegacyShortcut(context: Context, conversation: ConversationModel, user: User): Boolean {
-        if (user.id == null || user.baseUrl == null) {
+        val baseUrl = user.baseUrl
+        if (user.id == null || baseUrl == null) {
             Log.w(TAG, "Cannot create legacy shortcut: user ID or base URL is null")
             return false
         }
@@ -137,7 +138,7 @@ object ShortcutManagerHelper {
 
         val uri = DeepLinkHandler.createConversationUri(
             roomToken = conversation.token,
-            serverUrl = user.baseUrl!!,
+            serverUrl = baseUrl,
             username = user.username
         )