Merge pull request #1407 from session-foundation/fix/qa-tweaks

1.27.0  fixes

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -688,6 +688,15 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                     is ConversationUiEvent.ShowUnblockConfirmation -> {
                         unblock()
                     }
+
+                    is ConversationUiEvent.ShowConversationSettings -> {
+                        val intent = ConversationSettingsActivity.createIntent(
+                            context = this@ConversationActivityV2,
+                            threadId = event.threadId,
+                            threadAddress = event.threadAddress
+                        )
+                        startActivity(intent)
+                    }
                 }
             }
         }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -494,7 +494,8 @@ class ConversationViewModel(
                     pagerData += ConversationAppBarPagerData(
                         title = title,
                         action = {
-                            showGroupMembers()
+                            if(conversation.isCommunityRecipient) showConversationSettings()
+                            else showGroupMembers()
                         },
                     )
                 }
@@ -1319,6 +1320,15 @@ class ConversationViewModel(
         }
     }
 
+    private fun showConversationSettings() {
+        recipient?.let { convo ->
+            _uiEvents.tryEmit(ConversationUiEvent.ShowConversationSettings(
+                threadId = threadId,
+                threadAddress = convo.address
+            ))
+        }
+    }
+
     private fun showNotificationSettings() {
         _uiEvents.tryEmit(ConversationUiEvent.ShowNotificationSettings(threadId))
     }
@@ -1480,6 +1490,7 @@ sealed interface ConversationUiEvent {
     data class ShowDisappearingMessages(val threadId: Long) : ConversationUiEvent
     data class ShowNotificationSettings(val threadId: Long) : ConversationUiEvent
     data class ShowGroupMembers(val groupId: String) : ConversationUiEvent
+    data class ShowConversationSettings(val threadId: Long, val threadAddress: Address) : ConversationUiEvent
     data object ShowUnblockConfirmation : ConversationUiEvent
 }
 

app/src/main/java/org/thoughtcrime/securesms/util/UserProfileUtils.kt

@@ -91,7 +91,7 @@ class UserProfileUtils @AssistedInject constructor(
             isResolvedBlinded -> {
                 "${address.substring(0, 23)}\n${address.substring(23, 46)}\n${address.substring(46)}" to
                         Phrase.from(context, R.string.tooltipAccountIdVisible)
-                            .put(NAME_KEY, recipient.name)
+                            .put(NAME_KEY, truncateName(recipient.name))
                             .format()
             }
 
@@ -119,6 +119,14 @@ class UserProfileUtils @AssistedInject constructor(
 
     }
 
+    private fun truncateName(name: String): String {
+        return if (name.length > 10) {
+            name.take(10) + "…"
+        } else {
+            name
+        }
+    }
+
     fun onCommand(command: UserProfileModalCommands){
         when(command){
             UserProfileModalCommands.ShowProCTA -> {