Merge pull request #42 from l3ger0j/patch-4

`FixMe!` Third package of fixes

Author: l3ger0j

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "org.qp.android"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 202203
-        versionName "3.22.3"
+        versionCode 202204
+        versionName "3.22.4"
         resourceConfigurations += ['en', 'ru']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/org/qp/android/model/libQP/LibQpProxyImpl.java

@@ -217,12 +217,11 @@ private ArrayList<QpListItem> getObjects() {
 
     public synchronized void start() {
         libQspThread = new Thread(() -> {
+            exitLoopIfExist();
             while (!Thread.currentThread().isInterrupted()) {
                 try {
                     nativeMethods.QSPInit();
-                    if (Looper.myLooper() == null) {
-                        Looper.prepare();
-                    }
+                    Looper.prepare();
                     libQspHandler = new Handler();
                     libQspThreadInit = true;
                     Looper.loop();
@@ -251,6 +250,18 @@ public void stop() {
         libQspThread.interrupt();
     }
 
+    private void exitLoopIfExist() {
+        var handler = libQspHandler;
+        if (handler != null) {
+            handler.getLooper().quitSafely();
+        } else {
+            var mLooper = Looper.myLooper();
+            if (mLooper != null) {
+                mLooper.quitSafely();
+            }
+        }
+    }
+
     public void enableDebugMode (boolean isDebug) {
         runOnQspThread(() -> nativeMethods.QSPEnableDebugMode(isDebug));
     }

app/src/main/java/org/qp/android/model/service/HtmlProcessor.java

@@ -195,7 +195,11 @@ public String removeHTMLTags(String html) {
             result.append(html, fromIdx, idx);
             var endIdx = html.indexOf('>', idx + 1);
             if (endIdx == -1) {
-                Log.w(TAG,"Invalid HTML: element at " + idx + " is not closed");
+                var message = "Invalid HTML:"
+                        + "\n source HTML:" + html
+                        + "\n element at " + idx
+                        + " is not closed";
+                Log.w(TAG , message);
                 result.append(html.substring(idx));
                 break;
             }

app/src/main/java/org/qp/android/ui/game/GameActivity.java

@@ -418,6 +418,7 @@ public void showSavePopup() {
     public void showSimpleDialog(@NonNull String inputString ,
                                  @NonNull GameDialogType dialogType ,
                                  @Nullable ErrorType errorType) {
+        if (isFinishing()) return;
         if (!isMainThread()) {
             runOnUiThread(() -> showSimpleDialog(inputString , dialogType , errorType));
         } else {