fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-03-10 16:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

renaming some sound uri variables

Browse Source
This commit is contained in:
tibbi 2018-04-11 12:27:24 +02:00
parent fe16f35c66
commit 597f2ebc17
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,11 +232,11 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent:
} }
} }
var uri = config.timerSoundUri var soundUri = config.timerSoundUri
if (uri == SILENT) { if (soundUri == SILENT) {
uri = "" soundUri = ""
} else { } else {
grantReadUriPermission(uri) grantReadUriPermission(soundUri)
} }
val reminderActivityIntent = getReminderActivityIntent() val reminderActivityIntent = getReminderActivityIntent()
@ -248,7 +248,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent:
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setSound(Uri.parse(uri), AudioManager.STREAM_SYSTEM) .setSound(Uri.parse(soundUri), AudioManager.STREAM_SYSTEM)
.setChannelId(channelId) .setChannelId(channelId)
.addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent()) .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 var soundUri = alarm.soundUri
if (uri == SILENT) { if (soundUri == SILENT) {
uri = "" soundUri = ""
} else { } else {
grantReadUriPermission(uri) grantReadUriPermission(soundUri)
} }
val reminderActivityIntent = getReminderActivityIntent() val reminderActivityIntent = getReminderActivityIntent()
@ -313,7 +313,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add
.setPriority(Notification.PRIORITY_HIGH) .setPriority(Notification.PRIORITY_HIGH)
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setSound(Uri.parse(uri), AudioManager.STREAM_ALARM) .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
.setChannelId(channelId) .setChannelId(channelId)
.addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideAlarmPendingIntent(alarm)) .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)) .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm, addDeleteIntent))