mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

refactor notification service to be able to pass a name

Browse source
This commit is contained in:
Markus Doits 2022-11-30 21:38:03 +01:00
parent 1b587ab82a
commit d953507d2a
No known key found for this signature in database
GPG key ID: 4D406BBC615201D1
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
View file

@ -57,12 +57,12 @@ class NotificationService(val context: Context) {
} }
fun createNotificationChannels() { fun createNotificationChannels() {
(1..5).forEach { priority -> maybeCreateNotificationChannel(priority) } (1..5).forEach { priority -> maybeCreateNotificationChannel(DEFAULT_CHANNEL, priority) }
} }
private fun displayInternal(subscription: Subscription, notification: Notification, update: Boolean = false) { private fun displayInternal(subscription: Subscription, notification: Notification, update: Boolean = false) {
val title = formatTitle(subscription, notification) val title = formatTitle(subscription, notification)
val channelId = toChannelId(notification.priority) val channelId = toChannelId(DEFAULT_CHANNEL, notification.priority)
val builder = NotificationCompat.Builder(context, channelId) val builder = NotificationCompat.Builder(context, channelId)
.setSmallIcon(R.drawable.ic_notification) .setSmallIcon(R.drawable.ic_notification)
.setColor(ContextCompat.getColor(context, Colors.notificationIcon(context))) .setColor(ContextCompat.getColor(context, Colors.notificationIcon(context)))
@ -79,7 +79,7 @@ class NotificationService(val context: Context) {
maybeAddCancelAction(builder, notification) maybeAddCancelAction(builder, notification)
maybeAddUserActions(builder, notification) maybeAddUserActions(builder, notification)
maybeCreateNotificationChannel(notification.priority) maybeCreateNotificationChannel(DEFAULT_CHANNEL, notification.priority)
notificationManager.notify(notification.notificationId, builder.build()) notificationManager.notify(notification.notificationId, builder.build())
} }
@ -312,16 +312,16 @@ class NotificationService(val context: Context) {
} }
} }
private fun maybeCreateNotificationChannel(priority: Int) { private fun maybeCreateNotificationChannel(name: String, priority: Int) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// Note: To change a notification channel, you must delete the old one and create a new one! // Note: To change a notification channel, you must delete the old one and create a new one!
val pause = 300L val pause = 300L
val channel = when (priority) { val channel = when (priority) {
1 -> NotificationChannel(CHANNEL_ID_MIN, context.getString(R.string.channel_notifications_min_name), NotificationManager.IMPORTANCE_MIN) 1 -> NotificationChannel(toChannelId(name, priority), context.getString(R.string.channel_notifications_min_name), NotificationManager.IMPORTANCE_MIN)
2 -> NotificationChannel(CHANNEL_ID_LOW, context.getString(R.string.channel_notifications_low_name), NotificationManager.IMPORTANCE_LOW) 2 -> NotificationChannel(toChannelId(name, priority), context.getString(R.string.channel_notifications_low_name), NotificationManager.IMPORTANCE_LOW)
4 -> { 4 -> {
val channel = NotificationChannel(CHANNEL_ID_HIGH, context.getString(R.string.channel_notifications_high_name), NotificationManager.IMPORTANCE_HIGH) val channel = NotificationChannel(toChannelId(name, priority), context.getString(R.string.channel_notifications_high_name), NotificationManager.IMPORTANCE_HIGH)
channel.enableVibration(true) channel.enableVibration(true)
channel.vibrationPattern = longArrayOf( channel.vibrationPattern = longArrayOf(
pause, 100, pause, 100, pause, 100, pause, 100, pause, 100, pause, 100,
@ -330,7 +330,7 @@ class NotificationService(val context: Context) {
channel channel
} }
5 -> { 5 -> {
val channel = NotificationChannel(CHANNEL_ID_MAX, context.getString(R.string.channel_notifications_max_name), NotificationManager.IMPORTANCE_HIGH) // IMPORTANCE_MAX does not exist val channel = NotificationChannel(toChannelId(name, priority), context.getString(R.string.channel_notifications_max_name), NotificationManager.IMPORTANCE_HIGH) // IMPORTANCE_MAX does not exist
channel.enableLights(true) channel.enableLights(true)
channel.enableVibration(true) channel.enableVibration(true)
channel.vibrationPattern = longArrayOf( channel.vibrationPattern = longArrayOf(
@ -343,19 +343,19 @@ class NotificationService(val context: Context) {
) )
channel channel
} }
else -> NotificationChannel(CHANNEL_ID_DEFAULT, context.getString(R.string.channel_notifications_default_name), NotificationManager.IMPORTANCE_DEFAULT) else -> NotificationChannel(toChannelId(name, priority), context.getString(R.string.channel_notifications_default_name), NotificationManager.IMPORTANCE_DEFAULT)
} }
notificationManager.createNotificationChannel(channel) notificationManager.createNotificationChannel(channel)
} }
} }
private fun toChannelId(priority: Int): String { private fun toChannelId(name: String, priority: Int): String {
return when (priority) { return when (priority) {
1 -> CHANNEL_ID_MIN 1 -> name + PRIORITY_MIN
2 -> CHANNEL_ID_LOW 2 -> name + PRIORITY_LOW
4 -> CHANNEL_ID_HIGH 4 -> name + PRIORITY_HIGH
5 -> CHANNEL_ID_MAX 5 -> name + PRIORITY_MAX
else -> CHANNEL_ID_DEFAULT else -> name + PRIORITY_DEFAULT
} }
} }
@ -415,11 +415,13 @@ class NotificationService(val context: Context) {
private const val TAG = "NtfyNotifService" private const val TAG = "NtfyNotifService"
private const val CHANNEL_ID_MIN = "ntfy-min" private const val DEFAULT_CHANNEL = "ntfy"
private const val CHANNEL_ID_LOW = "ntfy-low"
private const val CHANNEL_ID_DEFAULT = "ntfy" private const val PRIORITY_MIN = "-min"
private const val CHANNEL_ID_HIGH = "ntfy-high" private const val PRIORITY_LOW = "-low"
private const val CHANNEL_ID_MAX = "ntfy-max" private const val PRIORITY_DEFAULT = ""
private const val PRIORITY_HIGH = "-high"
private const val PRIORITY_MAX = "-max"
private const val VIEW_ACTION_EXTRA_URL = "url" private const val VIEW_ACTION_EXTRA_URL = "url"
private const val VIEW_ACTION_EXTRA_NOTIFICATION_ID = "notificationId" private const val VIEW_ACTION_EXTRA_NOTIFICATION_ID = "notificationId"