fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-07 15:38:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

delete the old notification channel id when appropriate

Browse Source
This commit is contained in:
tibbi 2019-01-07 14:46:59 +01:00
parent 98c1151680
commit 90f1462f51
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -210,8 +210,15 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
grantReadUriPermission(soundUri) grantReadUriPermission(soundUri)
} }
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
// create a new channel for every new sound uri as the new Android Oreo notification system is fundamentally broken // create a new channel for every new sound uri as the new Android Oreo notification system is fundamentally broken
if (soundUri != config.lastSoundUri || config.lastVibrateOnReminder != config.vibrateOnReminder) { if (soundUri != config.lastSoundUri || config.lastVibrateOnReminder != config.vibrateOnReminder) {
if (!publicVersion) {
val oldChannelId = "simple_calendar_${config.lastReminderChannel}_${config.reminderAudioStream}"
notificationManager.deleteNotificationChannel(oldChannelId)
}
config.lastVibrateOnReminder = config.vibrateOnReminder
config.lastReminderChannel = System.currentTimeMillis() config.lastReminderChannel = System.currentTimeMillis()
config.lastSoundUri = soundUri config.lastSoundUri = soundUri
} }
@ -224,7 +231,6 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
.setLegacyStreamType(config.reminderAudioStream) .setLegacyStreamType(config.reminderAudioStream)
.build() .build()
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
val name = resources.getString(R.string.event_reminders) val name = resources.getString(R.string.event_reminders)
val importance = NotificationManager.IMPORTANCE_HIGH val importance = NotificationManager.IMPORTANCE_HIGH
NotificationChannel(channelId, name, importance).apply { NotificationChannel(channelId, name, importance).apply {
@ -266,7 +272,6 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
if (config.loopReminders) { if (config.loopReminders) {
notification.flags = notification.flags or Notification.FLAG_INSISTENT notification.flags = notification.flags or Notification.FLAG_INSISTENT
} }
config.lastVibrateOnReminder = config.vibrateOnReminder
return notification return notification
} }