Fix some of the agent's code, mediaplayer not defined in TimerForegroundService so maybe it was intended for Main, and PowerManager's WakeLock tag wanted to know the app name with a colon for logging.

This commit is contained in:
me committed 2026-11-03 13:34:31 -07:00
1 parent 1b9f40c002
commit 124e1bc211
2 files changed
+5 -5

No files matched your search

@@ -357,7 +357,7 @@ public class MainActivity extends AppCompatActivity {
setLoopInterval(); setLoopInterval();
resetTimeLeft(); resetTimeLeft();
setStartTime(); setStartTime();
// Start the background alert service using Alert manager // Start the background alert service using Alert manager
long interval = longLoopInterval > 1000 ? longLoopInterval : 60000; // Minimum 1 minute interval for alarms long interval = longLoopInterval > 1000 ? longLoopInterval : 60000; // Minimum 1 minute interval for alarms
if (Alert.isExactAlarmAllowed(this)) { if (Alert.isExactAlarmAllowed(this)) {
@@ -608,7 +608,7 @@ public class MainActivity extends AppCompatActivity {
// Safely instantiate MediaPlayer locally to prevent NPE // Safely instantiate MediaPlayer locally to prevent NPE
Uri uri = android.media.RingtoneManager.getDefaultUri(android.media.RingtoneManager.TYPE_NOTIFICATION); Uri uri = android.media.RingtoneManager.getDefaultUri(android.media.RingtoneManager.TYPE_NOTIFICATION);
MediaPlayer localPlayer = MediaPlayer.create(this, uri); MediaPlayer localPlayer = MediaPlayer.create(this, uri);
if (localPlayer != null) { if (localPlayer != null) {
localPlayer.start(); localPlayer.start();
localPlayer.release(); // Clean up resources immediately localPlayer.release(); // Clean up resources immediately
@@ -742,7 +742,8 @@ public class MainActivity extends AppCompatActivity {
// Stop the background alert service when destroying activity // Stop the background alert service when destroying activity
Alert.stop(this); Alert.stop(this);
if (mediaPlayer != null) { mediaPlayer.release(); mediaPlayer = null; }
if (DEBUG) Log.d(tag, "Done with local code, calling super.."); if (DEBUG) Log.d(tag, "Done with local code, calling super..");
super.onDestroy(); super.onDestroy();
@@ -30,7 +30,7 @@ public class TimerForegroundService extends Service {
// Acquire a wake lock briefly to ensure the CPU stays awake during playback // Acquire a wake lock briefly to ensure the CPU stays awake during playback
PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE); PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TimerWakeLock"); wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "InfiniteTimer:TimerWakeLock");
wakeLock.acquire(60 * 1000L); wakeLock.acquire(60 * 1000L);
} }
@@ -91,6 +91,5 @@ public class TimerForegroundService extends Service {
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (wakeLock.isHeld()) wakeLock.release(); if (wakeLock.isHeld()) wakeLock.release();
if (mediaPlayer != null) { mediaPlayer.release(); mediaPlayer = null; }
} }
} }