Merge pull request #114 from XMRig-for-Android/issue-113-0_0_38_Release_Bugfix

Issue 113 0 0 38 release bugfix

Author: garrylachman

android/app/src/main/java/com/xmrigforandroid/MiningService.java

@@ -16,12 +16,15 @@
 import com.xmrigforandroid.events.MinerStartEvent;
 import com.xmrigforandroid.events.MinerStopEvent;
 import com.xmrigforandroid.events.StdoutEvent;
+import com.xmrigforandroid.utils.ProcessExitDetector;
 
 import org.greenrobot.eventbus.EventBus;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class MiningService extends Service {
 
@@ -33,6 +36,9 @@ public class MiningService extends Service {
     private Process process;
     private OutputReaderThread outputHandler;
 
+    private final String ansiRegex = "\\e\\[[\\d;]*[^\\d;]";
+    private final Pattern ansiRegexPattern = Pattern.compile(ansiRegex);
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -131,6 +137,11 @@ public void startMining(String configPath, String xmrigFork) {
             pb.redirectErrorStream(true);
 
             process = pb.start();
+
+            ProcessExitDetector processExitDetector = new ProcessExitDetector(process);
+            processExitDetector.addProcessListener(process -> EventBus.getDefault().post(new MinerStopEvent()));
+            processExitDetector.start();
+
             outputHandler = new MiningService.OutputReaderThread(process.getInputStream());
             outputHandler.start();
 
@@ -145,7 +156,9 @@ public void startMining(String configPath, String xmrigFork) {
     }
 
     public void updateNotification(String str) {
-        notificationbuilder.setContentText(str);
+        Matcher matcher = ansiRegexPattern.matcher(str);
+
+        notificationbuilder.setContentText(matcher.replaceAll(""));
 
         NotificationManager notificationManager = (NotificationManager) getApplication().getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.notify(NOTIFICATION_ID, notificationbuilder.build());

android/app/src/main/java/com/xmrigforandroid/services/ThermalService.kt

@@ -12,7 +12,7 @@ class ThermalService : Service() {
 
     val thermalWorkRequest: OneTimeWorkRequest.Builder = OneTimeWorkRequestBuilder<ThermalWorker>()
 
-    val updateTimer = object: CountDownTimer(5000, 5000) {
+    val updateTimer = object: CountDownTimer(15000, 15000) {
         override fun onTick(millisUntilFinished: Long) {
         }
 
@@ -32,7 +32,7 @@ class ThermalService : Service() {
     }
 
     companion object {
-        private val LOG_TAG = "XMRigAPIService"
+        private val LOG_TAG = "ThermalService"
         var IS_SERVICE_RUNNING = false
     }
 }

android/app/src/main/java/com/xmrigforandroid/services/XMRigAPIService.kt

@@ -6,27 +6,11 @@ import android.os.CountDownTimer
 import android.os.IBinder
 import android.util.Log
 import androidx.work.*
-import com.xmrigforandroid.events.MinerSummaryEvent
-import com.xmrigforandroid.workers.ThermalWorker
 import com.xmrigforandroid.workers.XMRigJsonRpcWorker
 import com.xmrigforandroid.workers.XMRigSummaryUpdateWorker
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
 import okhttp3.OkHttpClient
-import okhttp3.Request
-import okio.IOException
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.internal.threadName
-import org.greenrobot.eventbus.EventBus
 
 class XMRigAPIService : Service() {
-
-    val constraints = Constraints.Builder()
-            .setRequiredNetworkType(NetworkType.UNMETERED)
-            .setRequiresCharging(true)
-            .build()
     val summaryUpdateWorkerRequest: OneTimeWorkRequest.Builder = OneTimeWorkRequestBuilder<XMRigSummaryUpdateWorker>()
 
     var isSummaryUpdate = false
@@ -39,9 +23,7 @@ class XMRigAPIService : Service() {
         override fun onFinish() {
             Log.d(LOG_TAG, "summaryUpdateTimer::Finish")
             WorkManager.getInstance(applicationContext).enqueue(
-                    summaryUpdateWorkerRequest
-                            .setConstraints(constraints)
-                            .build()
+                    summaryUpdateWorkerRequest.build()
             )
             if (isSummaryUpdate) {
                 this.start()
@@ -52,7 +34,6 @@ class XMRigAPIService : Service() {
     fun sendJSONRpcCommand(method: String) {
         Log.d(LOG_TAG, "sendJSONRpcCommand: " + method)
         val jsonRpcWorkerRequest = OneTimeWorkRequestBuilder<XMRigJsonRpcWorker>()
-                .setConstraints(constraints)
                 .setInputData(workDataOf(
                         "METHOD" to method
                 ))

android/app/src/main/java/com/xmrigforandroid/utils/ProcessExitDetector.java

@@ -0,0 +1,65 @@
+package com.xmrigforandroid.utils;
+
+import java.util.ArrayList;
+import java.util.EventListener;
+import java.util.List;
+
+/**
+ * Detects when a process is finished and invokes the associated listeners.
+ */
+public class ProcessExitDetector extends Thread {
+
+    public interface ProcessListener extends EventListener {
+        void processFinished(Process process);
+    }
+
+    /** The process for which we have to detect the end. */
+    private Process process;
+    /** The associated listeners to be invoked at the end of the process. */
+    private List<ProcessListener> listeners = new ArrayList<ProcessListener>();
+
+    /**
+     * Starts the detection for the given process
+     * @param process the process for which we have to detect when it is finished
+     */
+    public ProcessExitDetector(Process process) {
+        try {
+            // test if the process is finished
+            process.exitValue();
+            throw new IllegalArgumentException("The process is already ended");
+        } catch (IllegalThreadStateException exc) {
+            this.process = process;
+        }
+    }
+
+    /** @return the process that it is watched by this detector. */
+    public Process getProcess() {
+        return process;
+    }
+
+    public void run() {
+        try {
+            // wait for the process to finish
+            process.waitFor();
+            // invokes the listeners
+            for (ProcessListener listener : listeners) {
+                listener.processFinished(process);
+            }
+        } catch (InterruptedException e) {
+        }
+    }
+
+    /** Adds a process listener.
+     * @param listener the listener to be added
+     */
+    public void addProcessListener(ProcessListener listener) {
+        listeners.add(listener);
+    }
+
+    /** Removes a process listener.
+     * @param listener the listener to be removed
+     */
+    public void removeProcessListener(ProcessListener listener) {
+        listeners.remove(listener);
+    }
+}