diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index 9bd39e64..8a3ad185 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -21,10 +21,7 @@ import com.simplemobiletools.clock.helpers.ALARM_ID import com.simplemobiletools.clock.helpers.getPassedSeconds import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.MINUTE_SECONDS -import com.simplemobiletools.commons.helpers.SILENT -import com.simplemobiletools.commons.helpers.isOreoMr1Plus -import com.simplemobiletools.commons.helpers.isOreoPlus +import com.simplemobiletools.commons.helpers.* import kotlinx.android.synthetic.main.activity_reminder.* class ReminderActivity : SimpleActivity() { @@ -176,7 +173,7 @@ class ReminderActivity : SimpleActivity() { } val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate - if (doVibrate) { + if (doVibrate && isOreoPlus()) { val pattern = LongArray(2) { 500 } vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator vibrator?.vibrate(VibrationEffect.createWaveform(pattern, 0)) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index 04d9f414..403cdf03 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -142,7 +142,11 @@ fun Context.showRemainingTimeMessage(totalMinutes: Int) { fun Context.setupAlarmClock(alarm: Alarm, triggerInSeconds: Int) { val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val targetMS = System.currentTimeMillis() + triggerInSeconds * 1000 - AlarmManagerCompat.setAlarmClock(alarmManager, targetMS, getOpenAlarmTabIntent(), getAlarmIntent(alarm)) + try { + AlarmManagerCompat.setAlarmClock(alarmManager, targetMS, getOpenAlarmTabIntent(), getAlarmIntent(alarm)) + } catch (e: Exception) { + showErrorToast(e) + } } fun Context.getOpenAlarmTabIntent(): PendingIntent {