Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow stateloss on verification dialogfragment #8439

Merged
merged 2 commits into from
May 25, 2023
Merged

Allow stateloss on verification dialogfragment #8439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadad35
Allow stateloss on verification dialogfragment
yostyle May 17, 2023
d6028b7
Add changelog
yostyle May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8439.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow stateloss on verification dialogfragment
11 changes: 7 additions & 4 deletions vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import im.vector.app.config.OnboardingVariant
import im.vector.app.core.debug.DebugNavigator
import im.vector.app.core.di.ActiveSessionHolder
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.analytics.AnalyticsTracker
import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom
Expand Down Expand Up @@ -256,8 +257,9 @@ class DefaultNavigator @Inject constructor(
otherSessionId
)
if (context is AppCompatActivity) {
SelfVerificationBottomSheet.forTransaction(request.transactionId)
.show(context.supportFragmentManager, "VERIF")
context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
add(SelfVerificationBottomSheet.forTransaction(request.transactionId), "VERIF")
}
}
}
}
Expand All @@ -271,8 +273,9 @@ class DefaultNavigator @Inject constructor(
// .filter { it.deviceId != session.sessionParams.deviceId }
// .map { it.deviceId }
if (context is AppCompatActivity) {
SelfVerificationBottomSheet.verifyOwnUntrustedDevice()
.show(context.supportFragmentManager, "VERIF")
context.supportFragmentManager.commitTransaction(allowStateLoss = true) {
add(SelfVerificationBottomSheet.verifyOwnUntrustedDevice(), "VERIF")
}
// if (otherSessions.isNotEmpty()) {
// val pr = session.cryptoService().verificationService().requestSelfKeyVerification(
// supportedVerificationMethodsProvider.provide())
Expand Down