Skip to content

Commit cff9fbd

Browse files
authored
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification
Allow stateloss on verification dialogfragment
2 parents d5d5c90 + d6028b7 commit cff9fbd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

changelog.d/8439.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Allow stateloss on verification dialogfragment

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import im.vector.app.config.OnboardingVariant
3838
import im.vector.app.core.debug.DebugNavigator
3939
import im.vector.app.core.di.ActiveSessionHolder
4040
import im.vector.app.core.error.fatalError
41+
import im.vector.app.core.extensions.commitTransaction
4142
import im.vector.app.features.VectorFeatures
4243
import im.vector.app.features.analytics.AnalyticsTracker
4344
import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom
@@ -256,8 +257,9 @@ class DefaultNavigator @Inject constructor(
256257
otherSessionId
257258
)
258259
if (context is AppCompatActivity) {
259-
SelfVerificationBottomSheet.forTransaction(request.transactionId)
260-
.show(context.supportFragmentManager, "VERIF")
260+
context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
261+
add(SelfVerificationBottomSheet.forTransaction(request.transactionId), "VERIF")
262+
}
261263
}
262264
}
263265
}
@@ -271,8 +273,9 @@ class DefaultNavigator @Inject constructor(
271273
// .filter { it.deviceId != session.sessionParams.deviceId }
272274
// .map { it.deviceId }
273275
if (context is AppCompatActivity) {
274-
SelfVerificationBottomSheet.verifyOwnUntrustedDevice()
275-
.show(context.supportFragmentManager, "VERIF")
276+
context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
277+
add(SelfVerificationBottomSheet.verifyOwnUntrustedDevice(), "VERIF")
278+
}
276279
// if (otherSessions.isNotEmpty()) {
277280
// val pr = session.cryptoService().verificationService().requestSelfKeyVerification(
278281
// supportedVerificationMethodsProvider.provide())

0 commit comments

Comments
 (0)