From 0c289eba2b60b67432985f743a72407818ffa90b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 22 Jul 2022 11:26:32 +0200 Subject: [PATCH] Fix crash observed on nightly build. MainActivity is not able to display alert because the theme is not compliant. Anyway we should not display alert on this screen. --- .../main/java/im/vector/app/features/popup/PopupAlertManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index 3ebcb3f318..40ef6d819e 100644 --- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt @@ -26,6 +26,7 @@ import im.vector.app.R import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.time.Clock import im.vector.app.core.utils.isAnimationEnabled +import im.vector.app.features.MainActivity import im.vector.app.features.analytics.ui.consent.AnalyticsOptInActivity import im.vector.app.features.pin.PinActivity import im.vector.app.features.signout.hard.SignedOutActivity @@ -302,6 +303,7 @@ class PopupAlertManager @Inject constructor( private fun shouldBeDisplayedIn(alert: VectorAlert?, activity: Activity): Boolean { return alert != null && + activity !is MainActivity && activity !is PinActivity && activity !is SignedOutActivity && activity !is AnalyticsOptInActivity &&