Skip to content

fix #406: Added the service for canceling the ringing sound #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wellorbetter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix #406: Added the service for canceling the ringing sound #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/kotlin/org/fossify/clock/extensions/Context.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import org.fossify.clock.receivers.HideTimerReceiver
import org.fossify.clock.receivers.SkipUpcomingAlarmReceiver
import org.fossify.clock.receivers.StopAlarmReceiver
import org.fossify.clock.receivers.UpcomingAlarmReceiver
import org.fossify.clock.services.AlarmService
import org.fossify.clock.services.SnoozeService
import org.fossify.commons.extensions.formatMinutesToTimeString
import org.fossify.commons.extensions.formatSecondsToTimeString
Expand Down Expand Up @@ -282,6 +283,14 @@ fun Context.cancelAlarmClock(alarm: Alarm) {
alarmManager.cancel(getUpcomingAlarmPendingIntent(alarm))
}

fun Context.stopAlarmService(id: Int) {
val intent = Intent(this, AlarmService::class.java).apply {
action = AlarmService.ACTION_STOP_ALARM
putExtra(ALARM_ID, id)
}
startService(intent)
}

fun Context.hideNotification(id: Int) {
notificationManager.cancel(id)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/org/fossify/clock/helpers/DBHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.database.sqlite.SQLiteOpenHelper
import android.text.TextUtils
import org.fossify.clock.extensions.cancelAlarmClock
import org.fossify.clock.extensions.createNewAlarm
import org.fossify.clock.extensions.stopAlarmService
import org.fossify.clock.models.Alarm
import org.fossify.commons.extensions.getIntValue
import org.fossify.commons.extensions.getStringValue
Expand Down Expand Up @@ -100,8 +101,8 @@ class DBHelper private constructor(
fun deleteAlarms(alarms: ArrayList<Alarm>) {
alarms.filter { it.isEnabled }.forEach {
context.cancelAlarmClock(it)
context.stopAlarmService(it.id)
}

val args = TextUtils.join(", ", alarms.map { it.id.toString() })
val selection = "$ALARMS_TABLE_NAME.$COL_ID IN ($args)"
mDb.delete(ALARMS_TABLE_NAME, selection, null)
Expand Down
14 changes: 8 additions & 6 deletions app/src/main/kotlin/org/fossify/clock/services/AlarmService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,16 @@ class AlarmService : Service() {
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val action = intent?.action ?: ACTION_START_ALARM
val alarmId = intent?.getIntExtra(ALARM_ID, -1) ?: -1
val newAlarm = applicationContext.dbHelper.getAlarmWithId(alarmId)
if (alarmId == -1 || newAlarm == null) {
stopSelfIfIdle()
return START_NOT_STICKY
}

when (action) {
ACTION_START_ALARM -> startNewAlarm(newAlarm)
ACTION_START_ALARM -> {
val newAlarm = applicationContext.dbHelper.getAlarmWithId(alarmId)
if (alarmId == -1 || newAlarm == null) {
stopSelfIfIdle()
return START_NOT_STICKY
}
startNewAlarm(newAlarm)
}
ACTION_STOP_ALARM -> stopActiveAlarm(alarmId)
else -> throw IllegalArgumentException("Unknown action: $action")
}
Expand Down
Loading