Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Persist next notification ID in the shared preferences #397

Merged
merged 1 commit into from
Jul 31, 2023
Merged

Persist next notification ID in the shared preferences #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions app/src/main/java/com/chiller3/bcr/Notifications.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,6 @@ class Notifications(

private val LEGACY_CHANNEL_IDS = arrayOf("alerts")

/** Incremented for each new notification. */
private var nextNotificationId = 1

/** Get a new unique notification ID. */
fun allocateNotificationId(): Int {
val id = nextNotificationId
++nextNotificationId
return id
}

/** For access to system/internal resource values. */
private val systemRes = Resources.getSystem()

Expand Down Expand Up @@ -80,6 +70,7 @@ class Notifications(
}
}

private val prefs = Preferences(context)
private val notificationManager = context.getSystemService(NotificationManager::class.java)

/**
Expand Down Expand Up @@ -199,7 +190,7 @@ class Notifications(
file: OutputFile?,
additionalFiles: List<OutputFile>,
) {
val notificationId = allocateNotificationId()
val notificationId = prefs.nextNotificationId

val notification = Notification.Builder(context, channel).run {
val text = buildString {
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/java/com/chiller3/bcr/Preferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class Preferences(private val context: Context) {
private const val PREF_FORMAT_PARAM_PREFIX = "codec_param_"
const val PREF_OUTPUT_RETENTION = "output_retention"
const val PREF_SAMPLE_RATE = "sample_rate"
private const val PREF_NEXT_NOTIFICATION_ID = "next_notification_id"

// Defaults
val DEFAULT_FILENAME_TEMPLATE = Template(
Expand Down Expand Up @@ -300,4 +301,14 @@ class Preferences(private val context: Context) {
var writeMetadata: Boolean
get() = prefs.getBoolean(PREF_WRITE_METADATA, false)
set(enabled) = prefs.edit { putBoolean(PREF_WRITE_METADATA, enabled) }

/**
* Get a unique notification ID that increments on every call.
*/
val nextNotificationId: Int
get() = synchronized(context.applicationContext) {
val nextId = prefs.getInt(PREF_NEXT_NOTIFICATION_ID, 0)
prefs.edit { putInt(PREF_NEXT_NOTIFICATION_ID, nextId + 1) }
nextId
}
}
6 changes: 4 additions & 2 deletions app/src/main/java/com/chiller3/bcr/RecorderInCallService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ class RecorderInCallService : InCallService(), RecorderThread.OnRecordingComplet
* Notification ID to use for the foreground service. Throughout the lifetime of the service, it
* may be associated with different calls. It is not cancelled until all recorders exit.
*/
private val foregroundNotificationId = Notifications.allocateNotificationId()
private val foregroundNotificationId by lazy {
prefs.nextNotificationId
}

/**
* Notification IDs and their associated recorders. This indicates the desired state of the
Expand Down Expand Up @@ -243,7 +245,7 @@ class RecorderInCallService : InCallService(), RecorderThread.OnRecordingComplet
val notificationId = if (notificationIdsToRecorders.isEmpty()) {
foregroundNotificationId
} else {
Notifications.allocateNotificationId()
prefs.nextNotificationId
}
notificationIdsToRecorders[notificationId] = recorder

Expand Down