sanjeok77/ShiftRing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 23 Wiki Activity

Fix: AlarmManager cancel - add action to Intent for proper alarm cancellation

Browse Source 
- Add action to cancelAlarmInternal
- Add action to cancelAllPendingIntentsForUniqueId
- Fix deleted alarms still ringing (주, 석, 야, 기타)
- Bump version to v1.2.2
This commit is contained in:
sanjeok77-tech
2026-02-23 12:19:29 +09:00
parent fa4c50a054
commit 6c2dec6cd3
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/example/shiftalarm/AlarmUtils.kt
View File

@@ -137,7 +137,9 @@ private fun cancelAllPendingIntentsForUniqueId(context: Context, uniqueId: Int)
for (day in 1..31) { for (day in 1..31) {
try { try {
val alarmId = 200000000 + year * 1000000 + month * 10000 + day * 100 + baseId val alarmId = 200000000 + year * 1000000 + month * 10000 + day * 100 + baseId
val intent = Intent(context, AlarmReceiver::class.java) val intent = Intent(context, AlarmReceiver::class.java).apply {
action = "com.example.shiftalarm.ALARM_TRIGGER"
}
val pendingIntent = PendingIntent.getBroadcast( val pendingIntent = PendingIntent.getBroadcast(
context, alarmId, intent, context, alarmId, intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
@@ -200,7 +202,9 @@ private fun cancelTestAlarm(context: Context) {
private fun cancelAlarmInternal(context: Context, alarmId: Int) { private fun cancelAlarmInternal(context: Context, alarmId: Int) {
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
val intent = Intent(context, AlarmReceiver::class.java) val intent = Intent(context, AlarmReceiver::class.java).apply {
action = "com.example.shiftalarm.ALARM_TRIGGER"
}
val pendingIntent = PendingIntent.getBroadcast( val pendingIntent = PendingIntent.getBroadcast(
context, alarmId, intent, context, alarmId, intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE

8
version.json
View File

@@ -1,7 +1,7 @@
{ {
"versionCode": 1121, "versionCode": 1122,
"versionName": "1.2.1", "versionName": "1.2.2",
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.1/app.apk", "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.2/app.apk",
"changelog": "v1.2.1: 내부 버전 매칭 수정", "changelog": "v1.2.2: 삭제한 알람이 울리는 버그 수정 - AlarmManager 취소 시 action 누락 문제 해결",
"forceUpdate": false "forceUpdate": false
} }