Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix notification profile overrides.

Browse Source
This commit is contained in:
Michelle Tang
2025-12-16 15:18:18 -05:00
committed by jeffrey-signal
parent df6d446e83
commit e1454cfc6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
View File

@@ -1031,7 +1031,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
}
private fun updateNotificationProfileStatus(notificationProfiles: List<NotificationProfile>) {
val activeProfile = NotificationProfiles.getActiveProfile(notificationProfiles)
val activeProfile = NotificationProfiles.getActiveProfile(profiles = notificationProfiles, shouldSync = true)
if (activeProfile != null) {
if (activeProfile.id != SignalStore.notificationProfile.lastProfilePopup) {
val view = findViewById<ViewGroup>(android.R.id.content)

4
app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfiles.kt
View File

@@ -27,7 +27,7 @@ object NotificationProfiles {
@JvmStatic
@JvmOverloads
fun getActiveProfile(profiles: List<NotificationProfile>, now: Long = System.currentTimeMillis(), zoneId: ZoneId = ZoneId.systemDefault()): NotificationProfile? {
fun getActiveProfile(profiles: List<NotificationProfile>, now: Long = System.currentTimeMillis(), zoneId: ZoneId = ZoneId.systemDefault(), shouldSync: Boolean = false): NotificationProfile? {
val storeValues: NotificationProfileValues = SignalStore.notificationProfile
val localNow: LocalDateTime = now.toLocalDateTime(zoneId)
@@ -41,7 +41,7 @@ object NotificationProfiles {
profile.schedule.startDateTime(localNow).toMillis(zoneId.toOffset()) > storeValues.manuallyDisabledAt
}
if (shouldClearManualOverride(manualProfile, scheduledProfile)) {
if (shouldSync && shouldClearManualOverride(manualProfile, scheduledProfile)) {
SignalExecutors.UNBOUNDED.execute {
SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
StorageSyncHelper.scheduleSyncForDataChange()