Merge pull request #481 from schlimme-gegend/fixing-dangling-animation-threads

Fixing dangling animation threads

Author: codeanticode

core/src/processing/android/PWallpaper.java

@@ -32,6 +32,7 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 
+
 public class PWallpaper extends WallpaperService implements AppComponent {
   private Point size;
   private DisplayMetrics metrics;
@@ -119,12 +120,16 @@ public Engine onCreateEngine() {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    if (engine != null) engine.onDestroy();
+
+    if (engine != null){
+      //engine.sketch = null;
+      engine.onDestroy();
+    }
   }
 
 
   public class WallpaperEngine extends Engine implements ServiceEngine {
-    private PApplet sketch;
+    PApplet sketch;
     private float xOffset, xOffsetStep;
     private float yOffset, yOffsetStep;
     private int xPixelOffset, yPixelOffset;
@@ -205,7 +210,7 @@ public void onSurfaceDestroyed(SurfaceHolder holder) {
       // surface. If you have a rendering thread that directly accesses the
       // surface, you must ensure that thread is no longer touching the Surface
       // before returning from this function.
-      super.onSurfaceDestroyed(holder);
+        super.onSurfaceDestroyed(holder);
     }
 
 

core/src/processing/core/PSurfaceNone.java

@@ -434,7 +434,7 @@ public boolean stopThread() {
     if (thread == null) {
       return false;
     }
-    thread = null;
+    thread.interrupt();
     return true;
   }
 
@@ -451,15 +451,11 @@ public void setFrameRate(float fps) {
   }
 
 
-  protected void checkPause() {
+  protected void checkPause() throws InterruptedException {
 //    if (paused) {
       synchronized (pauseObject) {
         while (paused) {
-        try {
-          pauseObject.wait();
-        } catch (InterruptedException e) {
-          // waiting for this interrupt on a start() (resume) call
-        }
+        pauseObject.wait();
       }
     }
   }
@@ -499,7 +495,17 @@ public void run() {  // not good to make this synchronized, locks things up
 
       while ((Thread.currentThread() == thread) &&
              (sketch != null && !sketch.finished)) {
-        checkPause();
+        if (Thread.currentThread().isInterrupted()) {
+          finish();
+          return;
+        }
+        try {
+          checkPause();
+        } catch (InterruptedException e) {
+          finish();
+          return;
+        }
+
         callDraw();
 
         // wait for update & paint to happen before drawing next frame

studio/apps/wallpaper/src/main/AndroidManifest.xml

@@ -10,5 +10,11 @@
             <meta-data android:name="android.service.wallpaper" android:resource="@xml/wallpaper"/>
         </service>
         <activity android:name="processing.android.PermissionRequestor"/>
+        <activity android:name=".DebuggerEntryPointActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>

studio/apps/wallpaper/src/main/java/wallpaper/DebuggerEntryPointActivity.java

@@ -0,0 +1,12 @@
+package wallpaper;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+public class DebuggerEntryPointActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}