make auto shutdown working again on android, max. time 600

wellenvogel · May 20, 2024 · aec7a6d · aec7a6d
1 parent a9b914d
commit aec7a6d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/android/app/src/main/java/de/wellenvogel/ochartsprovider/MainActivity.java b/android/app/src/main/java/de/wellenvogel/ochartsprovider/MainActivity.java
@@ -121,7 +121,7 @@ public void run() {
                 }
             }
             else{
-                state=service.getProcessState();
+                state=service.getProcessState(true);
             }
             if (state.isRunning){
                 pid.setText("running");

diff --git a/android/app/src/main/java/de/wellenvogel/ochartsprovider/OchartsService.java b/android/app/src/main/java/de/wellenvogel/ochartsprovider/OchartsService.java
@@ -226,8 +226,10 @@ private boolean checkPermissions(boolean request){
     }
 
 
-    public ProcessState getProcessState(){
-        lastTrigger=SystemClock.uptimeMillis();
+    public ProcessState getProcessState(boolean trigger){
+        if (trigger) {
+            lastTrigger = SystemClock.uptimeMillis();
+        }
         if (processHandler != null) return processHandler.getState();
         return new ProcessState();
     }
@@ -537,7 +539,7 @@ void shutDown(){
         stopSelf();
     }
     private void broadcastInfo(){
-        ProcessState pstate=getProcessState();
+        ProcessState pstate=getProcessState(false);
         lastBroadcast=SystemClock.uptimeMillis();
         //intentionally set lastBroadcaset before check to avoid error flood
         if (!pstate.isRunning){

diff --git a/android/app/src/main/res/values/settings.xml b/android/app/src/main/res/values/settings.xml
@@ -9,7 +9,7 @@
     <string name="s_shutdown">shutdown</string>
     <integer name="s_shutdown_default">30</integer>
     <integer name="s_shutdown_min">0</integer>
-    <integer name="s_shutdown_max">3600</integer>
+    <integer name="s_shutdown_max">600</integer>
     <string name="s_memory">memory</string>
     <integer name="s_memory_min">10</integer>
     <integer name="s_memory_default">30</integer>