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

Remove old manual overrides for notification profiles.

Browse Source
This commit is contained in:
Michelle Tang
2025-08-11 12:08:08 -04:00
committed by Greyson Parrelli
parent f518862dc3
commit be41c2e8cb
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,13 @@
package org.thoughtcrime.securesms.notifications.profiles
import android.content.Context
import org.signal.core.util.concurrent.SignalExecutors
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.keyvalue.NotificationProfileValues
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.storage.StorageSyncHelper
import org.thoughtcrime.securesms.util.formatHours
import org.thoughtcrime.securesms.util.toLocalDateTime
import org.thoughtcrime.securesms.util.toLocalTime
@@ -34,6 +38,13 @@ object NotificationProfiles {
profile.schedule.startDateTime(localNow).toMillis(zoneId.toOffset()) > storeValues.manuallyDisabledAt
}
if (shouldClearManualOverride(manualProfile, scheduledProfile)) {
SignalExecutors.UNBOUNDED.execute {
SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
StorageSyncHelper.scheduleSyncForDataChange()
}
}
if (manualProfile == null || scheduledProfile == null) {
return manualProfile ?: scheduledProfile
}
@@ -45,6 +56,24 @@ object NotificationProfiles {
}
}
private fun shouldClearManualOverride(manualProfile: NotificationProfile?, scheduledProfile: NotificationProfile?): Boolean {
val storeValues: NotificationProfileValues = SignalStore.notificationProfile
var shouldScheduleSync = false
if (manualProfile == null && storeValues.manuallyEnabledProfile != 0L) {
storeValues.manuallyEnabledProfile = 0
storeValues.manuallyEnabledUntil = 0
shouldScheduleSync = true
}
if (scheduledProfile != null && storeValues.manuallyDisabledAt != 0L) {
storeValues.manuallyDisabledAt = 0
shouldScheduleSync = true
}
return shouldScheduleSync
}
fun getActiveProfileDescription(context: Context, profile: NotificationProfile, now: Long = System.currentTimeMillis()): String {
val storeValues: NotificationProfileValues = SignalStore.notificationProfile

4
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.kt
View File

@@ -218,10 +218,12 @@ object StorageSyncHelper {
endAtTimestampMs = endTimestamp
)
)
} else {
} else if (SignalStore.notificationProfile.manuallyDisabledAt != 0L) {
AccountRecord.NotificationProfileManualOverride(
disabledAtTimestampMs = SignalStore.notificationProfile.manuallyDisabledAt
)
} else {
AccountRecord.NotificationProfileManualOverride()
}
}

2
app/src/test/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfilesTest.kt
View File

@@ -58,7 +58,7 @@ class NotificationProfilesTest {
@Before
fun setUp() {
notificationProfileValues = mockk()
notificationProfileValues = mockk(relaxed = true)
every { notificationProfileValues.manuallyEnabledUntil } returns 0
every { notificationProfileValues.manuallyDisabledAt } returns 0