fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-02-02 11:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

recheck alarms with the deleted sound uri from timer fragment too

Browse Source
This commit is contained in:
tibbi 2018-03-30 00:12:40 +02:00
parent 02b4de56c5
commit b3c6375923
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt
View File

@ -33,16 +33,11 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
updateSelectedAlarmSound(it)
}
}, onAlarmSoundDeleted = {
val defaultAlarm = AlarmSound(0, context.getDefaultAlarmTitle(), context.getDefaultAlarmUri().toString())
if (alarm.soundUri == it.uri) {
val defaultAlarm = AlarmSound(0, context.getDefaultAlarmTitle(), context.getDefaultAlarmUri().toString())
updateSelectedAlarmSound(defaultAlarm)
}
activity.dbHelper.getAlarmsWithUri(it.uri).forEach {
it.soundTitle = defaultAlarm.title
it.soundUri = defaultAlarm.uri
activity.dbHelper.updateAlarm(it)
}
activity.checkAlarmsWithDeletedSoundUri(it.uri)
})
}

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

@ -22,6 +22,7 @@ import com.simplemobiletools.clock.activities.SnoozeReminderActivity
import com.simplemobiletools.clock.activities.SplashActivity
import com.simplemobiletools.clock.helpers.*
import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.clock.models.AlarmSound
import com.simplemobiletools.clock.models.MyTimeZone
import com.simplemobiletools.clock.receivers.AlarmReceiver
import com.simplemobiletools.clock.receivers.DateTimeWidgetUpdateReceiver
@ -354,3 +355,12 @@ fun Context.getReminderActivityIntent(): PendingIntent {
val intent = Intent(this, ReminderActivity::class.java)
return PendingIntent.getActivity(this, REMINDER_ACTIVITY_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)
}
fun Context.checkAlarmsWithDeletedSoundUri(uri: String) {
val defaultAlarm = AlarmSound(0, getDefaultAlarmTitle(), getDefaultAlarmUri().toString())
dbHelper.getAlarmsWithUri(uri).forEach {
it.soundTitle = defaultAlarm.title
it.soundUri = defaultAlarm.uri
dbHelper.updateAlarm(it)
}
}

1
app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
View File

@ -75,6 +75,7 @@ class TimerFragment : Fragment() {
val defaultAlarm = AlarmSound(0, context.getDefaultAlarmTitle(), context.getDefaultAlarmUri().toString())
updateAlarmSound(defaultAlarm)
}
context.checkAlarmsWithDeletedSoundUri(it.uri)
})
}
}