From 597f2ebc17c680293b62f0ae1e2d60d46c8f36a1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 11 Apr 2018 12:27:24 +0200 Subject: [PATCH] renaming some sound uri variables --- .../clock/extensions/Context.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 bc83cec5..99ebdf0d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -232,11 +232,11 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent: } } - var uri = config.timerSoundUri - if (uri == SILENT) { - uri = "" + var soundUri = config.timerSoundUri + if (soundUri == SILENT) { + soundUri = "" } else { - grantReadUriPermission(uri) + grantReadUriPermission(soundUri) } val reminderActivityIntent = getReminderActivityIntent() @@ -248,7 +248,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent: .setPriority(Notification.PRIORITY_HIGH) .setDefaults(Notification.DEFAULT_LIGHTS) .setAutoCancel(true) - .setSound(Uri.parse(uri), AudioManager.STREAM_SYSTEM) + .setSound(Uri.parse(soundUri), AudioManager.STREAM_SYSTEM) .setChannelId(channelId) .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent()) @@ -297,11 +297,11 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add } } - var uri = alarm.soundUri - if (uri == SILENT) { - uri = "" + var soundUri = alarm.soundUri + if (soundUri == SILENT) { + soundUri = "" } else { - grantReadUriPermission(uri) + grantReadUriPermission(soundUri) } val reminderActivityIntent = getReminderActivityIntent() @@ -313,7 +313,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add .setPriority(Notification.PRIORITY_HIGH) .setDefaults(Notification.DEFAULT_LIGHTS) .setAutoCancel(true) - .setSound(Uri.parse(uri), AudioManager.STREAM_ALARM) + .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM) .setChannelId(channelId) .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideAlarmPendingIntent(alarm)) .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm, addDeleteIntent))