fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-04-24 23:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix possibly error in alarm notification

Browse Source
This commit is contained in:
Rien Maertens 2020-07-05 12:39:06 +02:00
parent c17849f12b
commit 212588cd90
No known key found for this signature in database
GPG Key ID: AE66CE42F1AF9DEF
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -314,9 +314,7 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent {
@SuppressLint("NewApi") @SuppressLint("NewApi")
fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification { fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification {
var soundUri = alarm.soundUri var soundUri = alarm.soundUri
if (soundUri == SILENT) { if (soundUri != SILENT) {
soundUri = ""
} else {
grantReadUriPermission(soundUri) grantReadUriPermission(soundUri)
} }
@ -350,12 +348,15 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
.setChannelId(channelId) .setChannelId(channelId)
.addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(alarm)) .addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(alarm))
.addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm)) .addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm))
builder.setVisibility(Notification.VISIBILITY_PUBLIC) builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
if (soundUri != SILENT) {
builder.setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM);
}
if (alarm.vibrate) { if (alarm.vibrate) {
val vibrateArray = LongArray(2) { 500 } val vibrateArray = LongArray(2) { 500 }