jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification 

Allow stateloss on verification dialogfragment
This commit is contained in:
Benoit Marty 2023-05-25 09:36:40 +02:00 committed by GitHub
parent d5d5c9009b d6028b75c9
commit cff9fbd008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8439.bugfix Normal file
View File

@ -0,0 +1 @@
Allow stateloss on verification dialogfragment

11
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
View File

@ -38,6 +38,7 @@ import im.vector.app.config.OnboardingVariant
import im.vector.app.core.debug.DebugNavigator import im.vector.app.core.debug.DebugNavigator
import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.error.fatalError import im.vector.app.core.error.fatalError
import im.vector.app.core.extensions.commitTransaction
import im.vector.app.features.VectorFeatures import im.vector.app.features.VectorFeatures
import im.vector.app.features.analytics.AnalyticsTracker import im.vector.app.features.analytics.AnalyticsTracker
import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom
@ -256,8 +257,9 @@ class DefaultNavigator @Inject constructor(
otherSessionId otherSessionId
) )
if (context is AppCompatActivity) { if (context is AppCompatActivity) {
SelfVerificationBottomSheet.forTransaction(request.transactionId) context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
.show(context.supportFragmentManager, "VERIF") add(SelfVerificationBottomSheet.forTransaction(request.transactionId), "VERIF")
}
} }
} }
} }
@ -271,8 +273,9 @@ class DefaultNavigator @Inject constructor(
// .filter { it.deviceId != session.sessionParams.deviceId } // .filter { it.deviceId != session.sessionParams.deviceId }
// .map { it.deviceId } // .map { it.deviceId }
if (context is AppCompatActivity) { if (context is AppCompatActivity) {
SelfVerificationBottomSheet.verifyOwnUntrustedDevice() context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
.show(context.supportFragmentManager, "VERIF") add(SelfVerificationBottomSheet.verifyOwnUntrustedDevice(), "VERIF")
}
// if (otherSessions.isNotEmpty()) { // if (otherSessions.isNotEmpty()) {
// val pr = session.cryptoService().verificationService().requestSelfKeyVerification( // val pr = session.cryptoService().verificationService().requestSelfKeyVerification(
// supportedVerificationMethodsProvider.provide()) // supportedVerificationMethodsProvider.provide())