From 7b81bb467f2ca9409c35463eabcedbc53ecf6ceb Mon Sep 17 00:00:00 2001 From: Phillip Hsu Date: Thu, 1 Sep 2016 16:30:03 -0700 Subject: [PATCH] Play default ringtone if alarm has not set one --- .../philliphsu/clock2/alarms/AlarmRingtoneService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java index 7c4b9e9..9aa4946 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java @@ -3,6 +3,7 @@ package com.philliphsu.clock2.alarms; import android.app.Notification; import android.content.Intent; import android.net.Uri; +import android.provider.Settings; import android.support.v4.app.NotificationCompat; import com.philliphsu.clock2.Alarm; @@ -54,7 +55,12 @@ public class AlarmRingtoneService extends RingtoneService { @Override protected Uri getRingtoneUri() { - return Uri.parse(getRingingObject().ringtone()); + String ringtone = getRingingObject().ringtone(); + // can't be null... + if (ringtone.isEmpty()) { + return Settings.System.DEFAULT_ALARM_ALERT_URI; + } + return Uri.parse(ringtone); } @Override