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

make context at updating alarms nullable

Browse Source
This commit is contained in:
tibbi 2018-05-16 15:35:00 +02:00
parent 9c4f4d242a
commit 3b4a0c85cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.simplemobiletools.clock.extensions package com.simplemobiletools.clock.extensions
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.annotation.TargetApi
import android.app.* import android.app.*
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.ComponentName import android.content.ComponentName
@ -12,7 +13,6 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.PowerManager import android.os.PowerManager
import android.provider.Settings import android.provider.Settings
import android.support.annotation.RequiresApi
import android.support.v4.app.AlarmManagerCompat import android.support.v4.app.AlarmManagerCompat
import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationCompat
import android.text.SpannableString import android.text.SpannableString
@ -195,7 +195,7 @@ fun Context.formatTo12HourFormat(showSeconds: Boolean, hours: Int, minutes: Int,
return "${formatTime(showSeconds, false, newHours, minutes, seconds)} $appendable" return "${formatTime(showSeconds, false, newHours, minutes, seconds)} $appendable"
} }
@RequiresApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
fun Context.getNextAlarm(): String { fun Context.getNextAlarm(): String {
if (isLollipopPlus()) { if (isLollipopPlus()) {
val milliseconds = (getSystemService(Context.ALARM_SERVICE) as AlarmManager).nextAlarmClock?.triggerTime ?: return "" val milliseconds = (getSystemService(Context.ALARM_SERVICE) as AlarmManager).nextAlarmClock?.triggerTime ?: return ""

4
app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
View File

@ -101,9 +101,9 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
private fun checkAlarmState(alarm: Alarm) { private fun checkAlarmState(alarm: Alarm) {
if (alarm.isEnabled) { if (alarm.isEnabled) {
context!!.scheduleNextAlarm(alarm, true) context?.scheduleNextAlarm(alarm, true)
} else { } else {
context!!.cancelAlarmClock(alarm) context?.cancelAlarmClock(alarm)
} }
} }