From 212588cd901e6793bc8c13abfea54a988ba8b16e Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Sun, 5 Jul 2020 12:39:06 +0200 Subject: [PATCH] Fix possibly error in alarm notification --- .../com/simplemobiletools/clock/extensions/Context.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index 48e21408..9d9b6fab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -314,9 +314,7 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent { @SuppressLint("NewApi") fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification { var soundUri = alarm.soundUri - if (soundUri == SILENT) { - soundUri = "" - } else { + if (soundUri != SILENT) { grantReadUriPermission(soundUri) } @@ -350,12 +348,15 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No .setPriority(Notification.PRIORITY_HIGH) .setDefaults(Notification.DEFAULT_LIGHTS) .setAutoCancel(true) - .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM) .setChannelId(channelId) .addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(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) { val vibrateArray = LongArray(2) { 500 }