-
Notifications
You must be signed in to change notification settings - Fork 2
revision 4.1.0 #6
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| import android.media.RingtoneManager; | ||
| import android.net.Uri; | ||
| import android.os.Build; | ||
| import android.os.PowerManager; | ||
| import androidx.core.app.NotificationCompat; | ||
| import java.util.Calendar; | ||
| import java.util.List; | ||
|
|
@@ -20,15 +21,19 @@ public class AlarmReceiver extends BroadcastReceiver { | |
|
|
||
| @Override | ||
| public void onReceive(Context context, Intent intent) { | ||
| // Use a WakeLock to ensure the CPU stays awake while we process the alarm | ||
| PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); | ||
| PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "GisingApp:AlarmWakeLock"); | ||
| wakeLock.acquire(10000); // Hold for 10 seconds | ||
|
|
||
| int alarmId = intent.getIntExtra("alarm_id", -1); | ||
| String challengeType = intent.getStringExtra("challenge_type"); | ||
| int difficulty = intent.getIntExtra("difficulty", 1); | ||
|
|
||
| createNotificationChannel(context); | ||
|
|
||
| // Prepare the ring activity intent | ||
| Intent ringIntent = new Intent(context, AlarmRingActivity.class); | ||
| ringIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); | ||
| ringIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION); | ||
| ringIntent.putExtra("alarm_id", alarmId); | ||
| ringIntent.putExtra("challenge_type", challengeType); | ||
| ringIntent.putExtra("difficulty", difficulty); | ||
|
|
@@ -55,14 +60,13 @@ public void onReceive(Context context, Intent intent) { | |
|
|
||
| NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); | ||
| if (notificationManager != null) { | ||
| // Use unique alarmId to allow multiple simultaneous alarms | ||
| notificationManager.notify(alarmId, builder.build()); | ||
| } | ||
|
|
||
| // Start activity | ||
| // Force the activity to the front | ||
| context.startActivity(ringIntent); | ||
|
|
||
| // Reschedule for next occurrence if it's a repeating alarm | ||
| // Reschedule logic | ||
| rescheduleNextOccurrence(context, alarmId); | ||
| } | ||
|
|
||
|
|
@@ -72,10 +76,8 @@ private void rescheduleNextOccurrence(Context context, int alarmId) { | |
|
|
||
| for (Alarm alarm : alarmList) { | ||
| if (alarm.getId() == alarmId && alarm.isEnabled()) { | ||
| // If it's a repeating alarm, calculate and schedule the next time | ||
| boolean hasDays = false; | ||
| for (boolean d : alarm.getDaysSelected()) if (d) hasDays = true; | ||
|
|
||
| if (hasDays) { | ||
| scheduleNext(context, alarm); | ||
| } | ||
|
|
@@ -95,24 +97,19 @@ private void scheduleNext(Context context, Alarm alarm) { | |
| PendingIntent pendingIntent = PendingIntent.getBroadcast(context, alarm.getId(), intent, | ||
| PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); | ||
|
|
||
| // Logic to find next trigger time (similar to MainActivity) | ||
| Calendar calendar = Calendar.getInstance(); | ||
| calendar.set(Calendar.HOUR_OF_DAY, alarm.getHour()); | ||
| calendar.set(Calendar.MINUTE, alarm.getMinute()); | ||
| calendar.set(Calendar.SECOND, 0); | ||
| calendar.set(Calendar.MILLISECOND, 0); | ||
|
|
||
| long now = System.currentTimeMillis(); | ||
| boolean[] days = alarm.getDaysSelected(); | ||
|
|
||
| // Start looking from "tomorrow" relative to the current alarm trigger | ||
| calendar.add(Calendar.DAY_OF_YEAR, 1); | ||
|
|
||
| for (int i = 0; i < 7; i++) { | ||
| int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); | ||
| int dayIndex = dayOfWeek - 1; | ||
|
|
||
| if (days[dayIndex]) { | ||
| if (alarm.getDaysSelected()[dayIndex]) { | ||
| if (alarmManager != null) { | ||
|
Comment on lines
108
to
113
|
||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | ||
| if (alarmManager.canScheduleExactAlarms()) { | ||
|
|
@@ -148,17 +145,13 @@ private void createNotificationChannel(Context context) { | |
| .build(); | ||
|
|
||
| Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM); | ||
| if (alarmSound == null) { | ||
| alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE); | ||
| } | ||
| if (alarmSound == null) alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE); | ||
|
|
||
| channel.setSound(alarmSound, audioAttributes); | ||
| channel.enableVibration(true); | ||
| channel.setLockscreenVisibility(android.app.Notification.VISIBILITY_PUBLIC); | ||
|
|
||
| if (manager != null) { | ||
| manager.createNotificationChannel(channel); | ||
| } | ||
| if (manager != null) manager.createNotificationChannel(channel); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PowerManagercan be null here, and theWakeLockis never released. This can crash (NullPointerException) and/or keep the CPU awake longer than necessary if later code throws. Add a null-check forpowerManager, and wrap the receiver work intry/finallytorelease()the wake lock (still keeping a timeout as a safety net).