mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

No alert possible in SignedOutActivity

Browse source
This commit is contained in:
Benoit Marty 2021-03-19 13:15:13 +01:00
parent ec50f891a2
commit 80db39a934
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.utils.isAnimationDisabled import im.vector.app.core.utils.isAnimationDisabled
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.themes.ThemeUtils import im.vector.app.features.themes.ThemeUtils
import timber.log.Timber import timber.log.Timber
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
@ -294,6 +295,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 PinActivity && activity !is PinActivity
&& activity !is SignedOutActivity
&& activity is VectorBaseActivity<*> && activity is VectorBaseActivity<*>
&& alert.shouldBeDisplayedIn.invoke(activity) && alert.shouldBeDisplayedIn.invoke(activity)
} }