Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure secureBackupRequired is enforced

Browse Source
This commit is contained in:
valere 2023-02-07 09:27:18 +01:00
parent e1c3f1ce08
commit 6edde6a6b9
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationViewModel.kt
View File

@ -395,6 +395,7 @@ class SelfVerificationViewModel @AssistedInject constructor(
if (state.isThisSessionVerified) {
// we are the verified session, so just dismiss?
// do we want to prompt confirm??
_viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
} else {
// cancel the active request and go back?
setState {

14
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
View File

@ -257,12 +257,7 @@ class HomeActivity :
HomeActivityViewEvents.PromptToEnableSessionPush -> handlePromptToEnablePush()
HomeActivityViewEvents.StartRecoverySetupFlow -> handleStartRecoverySetup()
is HomeActivityViewEvents.ForceVerification -> {
// TODO
// if (it.sendRequest) {
navigator.requestSelfSessionVerification(this)
// } else {
// navigator.waitSessionVerification(this)
// }
navigator.requestSelfSessionVerification(this)
}
is HomeActivityViewEvents.OnCrossSignedInvalidated -> handleCrossSigningInvalidated(it)
HomeActivityViewEvents.ShowAnalyticsOptIn -> handleShowAnalyticsOptIn()
@ -479,12 +474,7 @@ class HomeActivity :
titleRes = R.string.crosssigning_verify_this_session,
descRes = R.string.confirm_your_identity,
) {
// navigator.openSettings(this, SettingsActivityPayload.SecurityPrivacy)
// if (event.waitForIncomingRequest) {
// //it.navigator.waitSessionVerification(it)
// } else {
it.navigator.requestSelfSessionVerification(it)
// }
it.navigator.requestSelfSessionVerification(it)
}
}