Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 12:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conversation Banner display conditions.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-08-13 16:47:25 -04:00
committed by mtang-signal
parent 69e8c9351d
commit c39a1ebdb6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/banner/banners/GroupsV1MigrationSuggestionsBanner.kt
View File

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
class GroupsV1MigrationSuggestionsBanner(private val suggestionsSize: Int, private val onAddMembers: () -> Unit, private val onNoThanks: () -> Unit) : Banner() { class GroupsV1MigrationSuggestionsBanner(private val suggestionsSize: Int, private val onAddMembers: () -> Unit, private val onNoThanks: () -> Unit) : Banner() {
private val timeUntilUnblock = SignalStore.misc.cdsBlockedUtil - System.currentTimeMillis() private val timeUntilUnblock = SignalStore.misc.cdsBlockedUtil - System.currentTimeMillis()
override val enabled: Boolean = SignalStore.misc.isCdsBlocked && timeUntilUnblock < CdsPermanentErrorBanner.PERMANENT_TIME_CUTOFF override val enabled: Boolean = suggestionsSize > 0
@Composable @Composable
override fun DisplayBanner() { override fun DisplayBanner() {

2
app/src/main/java/org/thoughtcrime/securesms/banner/banners/PendingGroupJoinRequestsBanner.kt
View File

@@ -36,7 +36,7 @@ class PendingGroupJoinRequestsBanner(override val enabled: Boolean, private val
private val dismissListener: () -> Unit = { private val dismissListener: () -> Unit = {
mutableStateFlow.tryEmit(PendingGroupJoinRequestsBanner(false, suggestionsSize, onViewClicked, null)) mutableStateFlow.tryEmit(PendingGroupJoinRequestsBanner(false, suggestionsSize, onViewClicked, null))
} }
private val mutableStateFlow: MutableStateFlow<PendingGroupJoinRequestsBanner> = MutableStateFlow(PendingGroupJoinRequestsBanner(true, suggestionsSize, onViewClicked, dismissListener)) private val mutableStateFlow: MutableStateFlow<PendingGroupJoinRequestsBanner> = MutableStateFlow(PendingGroupJoinRequestsBanner(suggestionsSize > 0, suggestionsSize, onViewClicked, dismissListener))
val flow: Flow<PendingGroupJoinRequestsBanner> = mutableStateFlow val flow: Flow<PendingGroupJoinRequestsBanner> = mutableStateFlow
} }
} }