Merge branch 'feature/bca/rust_flavor' into feature/amitkma/rust_flavor

Don't dismiss bottomsheet if verification is required
Fix strings and improve state step logic in SharedSecureStorageViewModel
2025-10-06 00:02:48 +02:00 · 2022-12-12 18:24:11 +05:30 · 2022-12-12 18:05:30 +05:30 · 2022-12-07 17:05:53 +05:30 · 2022-12-06 16:11:14 +05:30 · 2022-12-06 16:07:17 +05:30
3 changed files with 16 additions and 3 deletions
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationBottomSheet.kt
@@ -173,6 +173,9 @@ class SelfVerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSh
            views.otherUserNameText.text = getString(R.string.crosssigning_verify_this_session)
        }

+        // Don't allow the bottom sheet to be dismissed if verification is required.
+        isCancelable = !state.isVerificationRequired
+
        super.invalidate()
    }

--- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationViewModel.kt
@@ -204,8 +204,18 @@ class SelfVerificationViewModel @AssistedInject constructor(
                }
            }
            is VerificationAction.GotItConclusion -> {
-                // just dismiss
-                _viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
+                withState { state ->
+                    if (state.isVerificationRequired && !action.verified) {
+                        // we should go back to first screen
+                        setState {
+                            copy(
+                                    pendingRequest = Uninitialized,
+                            )
+                        }
+                    } else {
+                        _viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
+                    }
+                }
            }
            is VerificationAction.GotResultFromSsss -> handleSecretBackFromSSSS(action)
            VerificationAction.OtherUserDidNotScanned -> {
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/RoomSummaryRoomListDiffCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/RoomSummaryRoomListDiffCallback.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject

 class RoomSummaryRoomListDiffCallback @Inject constructor(
-        vectorPreferences: VectorPreferences
+        // vectorPreferences: VectorPreferences
 ) : DiffUtil.ItemCallback<RoomSummary>() {

    override fun areItemsTheSame(oldItem: RoomSummary, newItem: RoomSummary): Boolean {
Author	SHA1	Message	Date
Amit Kumar	0e61f6f8f8	Merge branch 'feature/bca/rust_flavor' into feature/amitkma/rust_flavor	2022-12-12 18:24:11 +05:30
Amit Kumar	751aff2d12	Don't dismiss bottomsheet if verification is required	2022-12-12 18:05:30 +05:30
Amit Kumar	d2966fc3d5	Fix strings and improve state step logic in SharedSecureStorageViewModel	2022-12-07 17:05:53 +05:30
Amit Kumar	2f30718489	Change ResetAll bottomsheet event to no-op for user verification	2022-12-06 16:11:14 +05:30
Amit Kumar	976cc4852f	Enable reset all and skip options	2022-12-06 16:07:17 +05:30
Amit Kumar	329a9973df	Dismiss bottomsheet on skipping verification	2022-12-06 16:07:17 +05:30