Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 161cc8060d | |||
| 6c2dec6cd3 | |||
| fa4c50a054 |
@@ -20,8 +20,8 @@ android {
|
|||||||
applicationId = "com.example.shiftalarm"
|
applicationId = "com.example.shiftalarm"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
versionCode = 1120
|
versionCode = 1123
|
||||||
versionName = "1.2.0"
|
versionName = "1.2.3"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"versionCode": 1120,
|
"versionCode": 1123,
|
||||||
"versionName": "1.2.0",
|
"versionName": "1.2.3",
|
||||||
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.0/app.apk",
|
"apkUrl": "https://git.webpluss.net/sanjeok77/ShiftRing/releases/download/v1.2.3/app.apk",
|
||||||
"changelog": "v1.2.0: 알람 버그 수정 (전체알람 꺼짐, 무음모드 알람, 다크모드 팝업 등)",
|
"changelog": "v1.2.3: 삭제한 알람이 울리는 버그 수정 - AlarmManager 취소 시 action 누락 문제 해결",
|
||||||
"forceUpdate": false
|
"forceUpdate": false
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user