4 Commits

Author SHA1 Message Date
6c2dec6cd3 Fix: AlarmManager cancel - add action to Intent for proper alarm cancellation
- Add action to cancelAlarmInternal
- Add action to cancelAllPendingIntentsForUniqueId
- Fix deleted alarms still ringing (주, 석, 야, 기타)
- Bump version to v1.2.2
2026-02-23 12:19:29 +09:00
fa4c50a054 v1.2.1: 내부 버전 매칭 수정 2026-02-23 09:05:55 +09:00
707d81d850 v1.2.0: 버전 코드 업데이트 2026-02-23 08:55:16 +09:00
4d8861d79c v1.2.0: 알람 버그 수정 2026-02-23 08:42:37 +09:00
3 changed files with 13 additions and 9 deletions

View File

@@ -20,8 +20,8 @@ android {
applicationId = "com.example.shiftalarm" applicationId = "com.example.shiftalarm"
minSdk = 26 minSdk = 26
targetSdk = 35 targetSdk = 35
versionCode = 1119 versionCode = 1121
versionName = "1.1.9" versionName = "1.2.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }

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

View File

@@ -1,7 +1,7 @@
{ {
"versionCode": 1119, "versionCode": 1122,
"versionName": "1.1.9", "versionName": "1.2.2",
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.1.9/app.apk", "apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.2/app.apk",
"changelog": "v1.1.9: version.json URL 수정 (서버 연결 실패 해결)", "changelog": "v1.2.2: 삭제한 알람이 울리는 버그 수정 - AlarmManager 취소 시 action 누락 문제 해결",
"forceUpdate": false "forceUpdate": false
} }