fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-04-15 18:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding some crashfixes

Browse Source
This commit is contained in:
tibbi 2022-09-02 15:47:34 +02:00
parent 0a490fa665
commit 008a3580f7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
View File

@ -21,10 +21,7 @@ import com.simplemobiletools.clock.helpers.ALARM_ID
import com.simplemobiletools.clock.helpers.getPassedSeconds import com.simplemobiletools.clock.helpers.getPassedSeconds
import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.MINUTE_SECONDS import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.helpers.SILENT
import com.simplemobiletools.commons.helpers.isOreoMr1Plus
import com.simplemobiletools.commons.helpers.isOreoPlus
import kotlinx.android.synthetic.main.activity_reminder.* import kotlinx.android.synthetic.main.activity_reminder.*
class ReminderActivity : SimpleActivity() { class ReminderActivity : SimpleActivity() {
@ -176,7 +173,7 @@ class ReminderActivity : SimpleActivity() {
} }
val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate
if (doVibrate) { if (doVibrate && isOreoPlus()) {
val pattern = LongArray(2) { 500 } val pattern = LongArray(2) { 500 }
vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
vibrator?.vibrate(VibrationEffect.createWaveform(pattern, 0)) vibrator?.vibrate(VibrationEffect.createWaveform(pattern, 0))

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

@ -142,7 +142,11 @@ fun Context.showRemainingTimeMessage(totalMinutes: Int) {
fun Context.setupAlarmClock(alarm: Alarm, triggerInSeconds: Int) { fun Context.setupAlarmClock(alarm: Alarm, triggerInSeconds: Int) {
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
val targetMS = System.currentTimeMillis() + triggerInSeconds * 1000 val targetMS = System.currentTimeMillis() + triggerInSeconds * 1000
try {
AlarmManagerCompat.setAlarmClock(alarmManager, targetMS, getOpenAlarmTabIntent(), getAlarmIntent(alarm)) AlarmManagerCompat.setAlarmClock(alarmManager, targetMS, getOpenAlarmTabIntent(), getAlarmIntent(alarm))
} catch (e: Exception) {
showErrorToast(e)
}
} }
fun Context.getOpenAlarmTabIntent(): PendingIntent { fun Context.getOpenAlarmTabIntent(): PendingIntent {