filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Benoit Marty 2022-07-22 11:26:32 +02:00
parent 9e83f376e7
commit 0c289eba2b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
View File

@ -26,6 +26,7 @@ import im.vector.app.R
import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.core.time.Clock import im.vector.app.core.time.Clock
import im.vector.app.core.utils.isAnimationEnabled 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.analytics.ui.consent.AnalyticsOptInActivity
import im.vector.app.features.pin.PinActivity import im.vector.app.features.pin.PinActivity
import im.vector.app.features.signout.hard.SignedOutActivity import im.vector.app.features.signout.hard.SignedOutActivity
@ -302,6 +303,7 @@ class PopupAlertManager @Inject constructor(
private fun shouldBeDisplayedIn(alert: VectorAlert?, activity: Activity): Boolean { private fun shouldBeDisplayedIn(alert: VectorAlert?, activity: Activity): Boolean {
return alert != null && return alert != null &&
activity !is MainActivity &&
activity !is PinActivity && activity !is PinActivity &&
activity !is SignedOutActivity && activity !is SignedOutActivity &&
activity !is AnalyticsOptInActivity && activity !is AnalyticsOptInActivity &&