additional wakelock checks

jvde-github · Jul 31, 2024 · 3c2ff2d · 3c2ff2d
1 parent 20a9fd7
commit 3c2ff2d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.jvdegithub.aiscatcher"
         minSdk 23
         targetSdk 34
-        versionCode 104
-        versionName '1.04'
+        versionCode 105
+        versionName '1.05'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/AisService.java b/app/src/main/java/com/jvdegithub/aiscatcher/AisService.java
@@ -88,19 +88,23 @@ private Notification buildNotification(String msg) {
     }
 
 
-    public void acquireLocks()
-    {
+    public void acquireLocks() {
         PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-        wakeLock = powerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE,
-                "AIS-catcher:WakeLock");
-        wakeLock.acquire();
+        if (powerManager != null) {
+            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AIS-catcher:WakeLock");
+            if (wakeLock != null && !wakeLock.isHeld()) {
+                wakeLock.acquire();
+            }
+        }
     }
 
-    public void releaseLocks()
-    {
-        wakeLock.release();
+    public void releaseLocks() {
+        if (wakeLock != null && wakeLock.isHeld()) {
+            wakeLock.release();
+        }
     }
 
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
 
@@ -118,19 +122,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 String msg = "Receiver running - " + DeviceManager.getDeviceTypeDescription() + " @ " + AisCatcherJava.getRateDescription();
                 startForeground(1001, buildNotification(msg));
 
-                new Thread(
-                        () -> {
-                            acquireLocks();
-
-                            AisCatcherJava.Run();
-                            AisCatcherJava.Close();
+                new Thread(() -> {
+                    try {
+                        acquireLocks();
+                        AisCatcherJava.Run();
+                        AisCatcherJava.Close();
+                        sendBroadcast();
 
-                            stopForeground(true);
-                            stopSelf();
-                            sendBroadcast();
+                    } finally {
+                        releaseLocks();
 
-                            releaseLocks();
-                        }).start();
+                        stopForeground(true);
+                        stopSelf();
+                    }
+                }).start();
             } else {
                 String msg = "Receiver creation failed";
                 startForeground(1001, buildNotification(msg));

diff --git a/app/src/main/jni/AIS-catcher b/app/src/main/jni/AIS-catcher
+77 −2		.github/workflows/build.yml
+2 −2		Application/AIS-catcher.h
+27 −8		Application/Main.cpp
+123 −235		Application/WebViewer.cpp
+96 −56		Device/Serial.cpp
+28 −4		Device/Serial.h
+41 −7		HTML/index.html
+775 −739		HTML/index_html.cpp
+41 −7		HTML/index_local.html
+773 −737		HTML/index_local_html.cpp
+310 −42		HTML/script.js
+2,929 −2,839		HTML/script_js.cpp
+88 −12		HTML/style.css
+2,320 −2,279		HTML/style_css.cpp
+2 −0		IO/IO.cpp
+1 −1		Library/Keys.cpp
+221 −74		Library/Message.cpp
+5 −2		Library/Message.h
+34 −0		Library/Utilities.cpp
+125 −56		Library/Utilities.h
+86 −26		README.md
+208 −110		Ships/DB.cpp
+1 −1		Ships/DB.h
+12 −10		Ships/Ships.cpp
+36 −21		Ships/Ships.h
+1 −1		Ships/Statistics.h
+13 −0		build-docker/bookworm/Dockerfile
+0 −17		build.me
+219 −0		scripts/aiscatcher-install
+0 −0		scripts/build-NMEA2000.sh
+0 −0		scripts/build-html.sh
+175 −0		scripts/build.sh