Skip to content

Fix #113 #115

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

Closed
Joshix-1 wants to merge 6 commits into from
Closed

Fix #113 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7333397
fix #113
Joshix-1 Jan 28, 2025
27d6c4b
Merge branch 'Joshix-1/master' into 113-second-alarm
Joshix-1 Jan 29, 2025
56c46df
Merge remote-tracking branch 'upstream/master' into 113-second-alarm
Joshix-1 Jan 29, 2025
8de12c3
rescheduleEnabledAlarms in bg
Joshix-1 Jan 29, 2025
3d8f9e5
DEBUG: add Log.d calls
Joshix-1 Jan 29, 2025
073d802
Merge branch 'master' into 113-second-alarm
naveensingh Mar 11, 2025
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
8 changes: 1 addition & 7 deletions app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,7 @@ class MainActivity : SimpleActivity() {
updateWidgets()
migrateFirstDayOfWeek()

getEnabledAlarms { enabledAlarms ->
if (enabledAlarms.isNullOrEmpty()) {
ensureBackgroundThread {
rescheduleEnabledAlarms()
}
}
}
rescheduleEnabledAlarms()
}

override fun onResume() {
Expand Down
19 changes: 14 additions & 5 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 @@ -14,6 +14,7 @@ import android.os.Looper
import android.os.PowerManager
import android.text.SpannableString
import android.text.style.RelativeSizeSpan
import android.util.Log
import android.widget.Toast
import androidx.core.app.AlarmManagerCompat
import androidx.core.app.NotificationCompat
Expand Down Expand Up @@ -257,7 +258,7 @@ fun Context.formatTo12HourFormat(showSeconds: Boolean, hours: Int, minutes: Int,

fun Context.getClosestEnabledAlarmString(callback: (result: String) -> Unit) {
getEnabledAlarms { enabledAlarms ->
if (enabledAlarms.isNullOrEmpty()) {
if (enabledAlarms.isEmpty()) {
callback("")
return@getEnabledAlarms
}
Expand Down Expand Up @@ -286,7 +287,7 @@ fun Context.getClosestEnabledAlarmString(callback: (result: String) -> Unit) {
}
}

fun Context.getEnabledAlarms(callback: (result: List<Alarm>?) -> Unit) {
fun Context.getEnabledAlarms(callback: (result: List<Alarm>) -> Unit) {
ensureBackgroundThread {
val alarms = dbHelper.getEnabledAlarms()
Handler(Looper.getMainLooper()).post {
Expand All @@ -296,9 +297,17 @@ fun Context.getEnabledAlarms(callback: (result: List<Alarm>?) -> Unit) {
}

fun Context.rescheduleEnabledAlarms() {
dbHelper.getEnabledAlarms().forEach {
if (it.days != TODAY_BIT || it.timeInMinutes > getCurrentDayMinutes()) {
scheduleNextAlarm(it, false)
Log.d("rescheduleEnabledAlarms", "Rescheduling enabled alarms.")
getEnabledAlarms { alarms ->
val now = Calendar.getInstance();
alarms.forEach {
val nextTime = getTimeOfNextAlarm(it)
val isInFuture = nextTime?.after(now)
Log.d("rescheduleEnabledAlarms", "Alarm: ${it.label}, nextTIme: ${nextTime?.time}, isInFuture: $isInFuture")
if (isInFuture == true) {
Log.d("rescheduleEnabledAlarms", "Scheduling: $it");
scheduleNextAlarm(it, false)
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/org/fossify/clock/fragments/AlarmFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
}
}
context?.getEnabledAlarms { enabledAlarms ->
if (enabledAlarms.isNullOrEmpty()) {
if (enabledAlarms.isEmpty()) {
val removedAlarms = mutableListOf<Alarm>()
alarms.forEach {
if (it.days == TODAY_BIT && it.isEnabled && it.timeInMinutes <= getCurrentDayMinutes()) {
Expand All @@ -115,6 +115,7 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
if (it.oneShot) {
it.isEnabled = false
context?.dbHelper?.deleteAlarms(arrayListOf(it))
// TODO: Fix race condition. `alarms.removeAll(removedAlarms)` could be called before this
removedAlarms.add(it)
} else {
context?.dbHelper?.updateAlarmEnabledState(it.id, false)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/kotlin/org/fossify/clock/receivers/AlarmReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import org.fossify.commons.helpers.isOreoPlus
class AlarmReceiver : BroadcastReceiver() {

override fun onReceive(context: Context, intent: Intent) {
Thread(context::rescheduleEnabledAlarms).start()

val id = intent.getIntExtra(ALARM_ID, -1)
val alarm = context.dbHelper.getAlarmWithId(id) ?: return

Expand Down
Loading