Merge pull request #1446 from session-foundation/fix/qr-scanning-improvements

ThomasSession · web-flow · commit a773a30fd576 · 2025-08-20T14:59:00.000+10:00
Fix/qr scanning improvements
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -231,6 +231,7 @@ import kotlin.math.sqrt
 import kotlin.time.Duration.Companion.minutes
 
 private const val TAG = "ConversationActivityV2"
+private const val TAG_REACTION_FRAGMENT = "ReactionsDialog"
 
 // Some things that seemingly belong to the input bar (e.g. the voice message recording UI) are actually
 // part of the conversation activity layout. This is just because it makes the layout a lot simpler. The
@@ -540,7 +541,13 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                     dialogsState = dialogsState,
                     inputBarDialogsState = inputBarDialogState,
                     sendCommand = viewModel::onCommand,
-                    sendInputBarCommand = viewModel::onInputBarCommand
+                    sendInputBarCommand = viewModel::onInputBarCommand,
+                    onPostUserProfileModalAction = {
+                        // this function is to perform logic once an action
+                        // has been taken in the UPM, like messaging a user
+                        // in this case we want to make sure the reaction dialog is dismissed
+                        dismissReactionsDialog()
+                    }
                 )
             }
         }
@@ -1819,6 +1826,10 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         sendEmojiRemoval(emoji, message)
     }
 
+    override fun onEmojiReactionUserTapped(recipient: Recipient) {
+        showUserProfileModal(recipient)
+    }
+
     // Called when the user is attempting to clear all instance of a specific emoji
     override fun onClearAll(emoji: String, messageId: MessageId) = viewModel.onEmojiClear(emoji, messageId)
 
@@ -1957,10 +1968,15 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 )
             } ?: false
             val fragment = ReactionsDialogFragment.create(messageId, isUserModerator, emoji, viewModel.canRemoveReaction)
-            fragment.show(supportFragmentManager, null)
+            fragment.show(supportFragmentManager, TAG_REACTION_FRAGMENT)
         }
     }
 
+    private fun dismissReactionsDialog() {
+        val fragment = supportFragmentManager.findFragmentByTag(TAG_REACTION_FRAGMENT) as? ReactionsDialogFragment
+        fragment?.dismissAllowingStateLoss()
+    }
+
     override fun playVoiceMessageAtIndexIfPossible(indexInAdapter: Int) {
         if (!textSecurePreferences.autoplayAudioMessages()) return
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationV2Dialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationV2Dialogs.kt
@@ -48,7 +48,8 @@ fun ConversationV2Dialogs(
     dialogsState: ConversationViewModel.DialogsState,
     inputBarDialogsState: InputbarViewModel.InputBarDialogsState,
     sendCommand: (ConversationViewModel.Commands) -> Unit,
-    sendInputBarCommand: (InputbarViewModel.Commands) -> Unit
+    sendInputBarCommand: (InputbarViewModel.Commands) -> Unit,
+    onPostUserProfileModalAction: () -> Unit // a function called in the User Profile Modal once an action has been taken
 ){
     SessionMaterialTheme {
         // inputbar dialogs
@@ -233,6 +234,7 @@ fun ConversationV2Dialogs(
                 sendCommand = {
                     sendCommand(ConversationViewModel.Commands.HandleUserProfileCommand(it))
                 },
+                onPostAction = onPostUserProfileModalAction
             )
         }
     }
@@ -248,7 +250,8 @@ fun PreviewURLDialog(){
             ),
             inputBarDialogsState = InputbarViewModel.InputBarDialogsState(),
             sendCommand = {},
-            sendInputBarCommand = {}
+            sendInputBarCommand = {},
+            onPostUserProfileModalAction = {}
         )
     }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/startconversation/newmessage/NewMessageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/startconversation/newmessage/NewMessageViewModel.kt
@@ -37,6 +37,9 @@ internal class NewMessageViewModel @Inject constructor(
 
     private var loadOnsJob: Job? = null
 
+    private var lasQrScan: Long = 0L
+    private val qrDebounceTime = 3000L
+
     override fun onChange(value: String) {
         loadOnsJob?.cancel()
         loadOnsJob = null
@@ -68,10 +71,18 @@ internal class NewMessageViewModel @Inject constructor(
     }
 
     override fun onScanQrCode(value: String) {
-        if (PublicKeyValidation.isValid(value, isPrefixRequired = false) && PublicKeyValidation.hasValidPrefix(value)) {
-            onPublicKey(value)
-        } else {
-            _qrErrors.tryEmit(application.getString(R.string.qrNotAccountId))
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - lasQrScan > qrDebounceTime) {
+            lasQrScan = currentTime
+            if (PublicKeyValidation.isValid(
+                    value,
+                    isPrefixRequired = false
+                ) && PublicKeyValidation.hasValidPrefix(value)
+            ) {
+                onPublicKey(value)
+            } else {
+                _qrErrors.tryEmit(application.getString(R.string.qrNotAccountId))
+            }
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsScreen.kt
@@ -510,7 +510,8 @@ fun Buttons(
 
                 Crossfade(if (hasPaths) primaryGreen else primaryYellow, label = "path") {
                     LargeItemButton(
-                        AnnotatedString(stringResource(R.string.onionRoutingPath)),
+                        modifier = Modifier.qaTag(R.string.qa_settings_item_path),
+                        annotatedStringText = AnnotatedString(stringResource(R.string.onionRoutingPath)),
                         icon = {
                             PathDot(
                                 modifier = Modifier.align(Alignment.Center),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
@@ -155,6 +155,10 @@ void bind(@NonNull ReactionDetails reaction) {
         callback.onRemoveReaction(reaction.getBaseEmoji(), reaction.getLocalId(), reaction.getTimestamp());
       });
 
+      itemView.setOnClickListener((v) -> {
+        callback.onEmojiReactionUserTapped(reaction.getSender());
+      });
+
       this.avatar.update(reaction.getSender());
 
       if (reaction.getSender().isLocalNumber()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionViewPagerAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionViewPagerAdapter.java
@@ -10,6 +10,7 @@
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.adapter.AlwaysChangedDiffUtil;
@@ -119,6 +120,8 @@ public void setSelected(int position) {
   public interface Listener {
     void onRemoveReaction(@NonNull String emoji, @NonNull MessageId messageId, long timestamp);
 
+    void onEmojiReactionUserTapped(@NonNull Recipient recipient);
+
     void onClearAll(@NonNull String emoji, @NonNull MessageId messageId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsDialogFragment.java
@@ -20,6 +20,7 @@
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.components.emoji.EmojiImageView;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.util.LifecycleDisposable;
@@ -181,9 +182,16 @@ public void onClearAll(@NonNull String emoji, @NonNull MessageId messageId) {
     dismiss();
   }
 
+  @Override
+  public void onEmojiReactionUserTapped(@NonNull Recipient recipient) {
+    callback.onEmojiReactionUserTapped(recipient);
+  }
+
   public interface Callback {
     void onRemoveReaction(@NonNull String emoji, @NonNull MessageId messageId);
 
+    void onEmojiReactionUserTapped(@NonNull Recipient recipient);
+
     void onClearAll(@NonNull String emoji, @NonNull MessageId messageId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
@@ -766,6 +767,7 @@ fun LoadingArcOr(loading: Boolean, content: @Composable () -> Unit) {
 fun SpeechBubbleTooltip(
     text: CharSequence,
     modifier: Modifier = Modifier,
+    maxWidth: Dp = LocalDimensions.current.maxTooltipWidth,
     tooltipState: TooltipState = rememberTooltipState(),
     content: @Composable () -> Unit,
 ) {
@@ -776,23 +778,22 @@ fun SpeechBubbleTooltip(
                 tooltip = {
             val bubbleColor = LocalColors.current.backgroundBubbleReceived
 
-            Column {
-                Card(
-                    shape = MaterialTheme.shapes.medium,
-                    colors = CardDefaults.cardColors(containerColor = bubbleColor),
-                    elevation = CardDefaults.elevatedCardElevation(4.dp)
-                ) {
-                    Text(
-                        text = annotatedStringResource(text),
-                        modifier = Modifier.padding(
-                            horizontal = LocalDimensions.current.xsSpacing,
-                            vertical = LocalDimensions.current.xxsSpacing
-                        ),
-                        style = LocalType.current.small,
-                        color = LocalColors.current.text
-                    )
-                }
-
+            Card(
+                modifier = Modifier.widthIn(max = maxWidth),
+                shape = MaterialTheme.shapes.medium,
+                colors = CardDefaults.cardColors(containerColor = bubbleColor),
+                elevation = CardDefaults.elevatedCardElevation(4.dp)
+            ) {
+                Text(
+                    text = annotatedStringResource(text),
+                    modifier = Modifier.padding(
+                        horizontal = LocalDimensions.current.xsSpacing,
+                        vertical = LocalDimensions.current.xxsSpacing
+                    ),
+                    textAlign = TextAlign.Center,
+                    style = LocalType.current.small,
+                    color = LocalColors.current.text
+                )
             }
         }
     ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt
@@ -515,6 +515,7 @@ fun AnimatedSessionProActivatedCTA(
 @Composable
 fun GenericProCTA(
     onDismissRequest: () -> Unit,
+    onPostAction: (() -> Unit)? = null // a function for optional code once an action has been taken
 ){
     val context = LocalContext.current
     AnimatedSessionProCTA(
@@ -532,6 +533,7 @@ fun GenericProCTA(
         ),
         onUpgrade = {
             onDismissRequest()
+            onPostAction?.invoke()
             //todo PRO go to screen once it exists
         },
         onCancel = {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/UserProfileModal.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/UserProfileModal.kt
@@ -63,6 +63,7 @@ fun UserProfileModal(
     data: UserProfileModalData,
     sendCommand: (UserProfileModalCommands) -> Unit,
     onDismissRequest: () -> Unit,
+    onPostAction: (() -> Unit)? = null // a function for optional code once an action has been taken
 ){
     // the user profile modal
     val context = LocalContext.current
@@ -193,6 +194,9 @@ fun UserProfileModal(
                         // close dialog
                         onDismissRequest()
 
+                        // optional action
+                        onPostAction?.invoke()
+
                         // open conversation with user
                         context.startActivity(Intent(context, ConversationActivityV2::class.java)
                             .putExtra(ADDRESS, Address.fromSerialized(data.rawAddress))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/Dimensions.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/Dimensions.kt
@@ -43,4 +43,5 @@ data class Dimensions(
     val shapeMedium: Dp = 16.dp,
 
     val maxContentWidth: Dp = 410.dp,
+    val maxTooltipWidth: Dp = 280.dp,
 )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/UserProfileUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/util/UserProfileUtils.kt
@@ -101,7 +101,7 @@ class UserProfileUtils @AssistedInject constructor(
         }
 
         return UserProfileModalData(
-            name = if(recipient.isLocalNumber) context.getString(R.string.noteToSelf) else recipient.name,
+            name = if(recipient.isLocalNumber) context.getString(R.string.you) else recipient.name,
             subtitle = if(configContact?.nickname?.isNotEmpty() == true) "(${configContact.name})" else null,
             avatarUIData = avatarUtils.getUIDataFromAccountId(accountId = address),
             showProBadge = proStatusManager.shouldShowProBadge(recipient.address),
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
@@ -250,6 +250,7 @@
     <string name="AccessibilityId_displayName">Display name</string>
     <string name="qa_settings_item_session_network">session-network-menu-item</string>
     <string name="qa_settings_item_donate">donate-menu-item</string>
+    <string name="qa_settings_item_path">path-menu-item</string>
     <string name="qa_settings_item_pro">pro-menu-item</string>
 
     <!-- In app review -->

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ fun ConversationV2Dialogs(`
`48`	`48`	`dialogsState: ConversationViewModel.DialogsState,`
`49`	`49`	`inputBarDialogsState: InputbarViewModel.InputBarDialogsState,`
`50`	`50`	`sendCommand: (ConversationViewModel.Commands) -> Unit,`
`51`		`- sendInputBarCommand: (InputbarViewModel.Commands) -> Unit`
	`51`	`+ sendInputBarCommand: (InputbarViewModel.Commands) -> Unit,`
	`52`	`+ onPostUserProfileModalAction: () -> Unit // a function called in the User Profile Modal once an action has been taken`
`52`	`53`	`){`
`53`	`54`	`SessionMaterialTheme {`
`54`	`55`	`// inputbar dialogs`
`@@ -233,6 +234,7 @@ fun ConversationV2Dialogs(`
`233`	`234`	`sendCommand = {`
`234`	`235`	`sendCommand(ConversationViewModel.Commands.HandleUserProfileCommand(it))`
`235`	`236`	`},`
	`237`	`+ onPostAction = onPostUserProfileModalAction`
`236`	`238`	`)`
`237`	`239`	`}`
`238`	`240`	`}`
`@@ -248,7 +250,8 @@ fun PreviewURLDialog(){`
`248`	`250`	`),`
`249`	`251`	`inputBarDialogsState = InputbarViewModel.InputBarDialogsState(),`
`250`	`252`	`sendCommand = {},`
`251`		`- sendInputBarCommand = {}`
	`253`	`+ sendInputBarCommand = {},`
	`254`	`+ onPostUserProfileModalAction = {}`
`252`	`255`	`)`
`253`	`256`	`}`
`254`	`257`	`}`