finish() is not called by the animation thread, but by PApplet.exit()

Author: codeanticode

core/src/processing/a2d/PSurfaceAndroid2D.java

@@ -99,8 +99,7 @@ public SurfaceHolder getHolder() {
     public void surfaceCreated(SurfaceHolder holder) {
       surfaceReady = true;
       if (requestedThreadStart) {
-        // Only start the thread once the surface has been created, otherwise
-        // it will not be able draw
+        // Only start the thread once the surface has been created, otherwise it will not be able to draw
         startThread();
       }
       if (PApplet.DEBUG) {

core/src/processing/core/PApplet.java

@@ -616,6 +616,9 @@ public void onCreate(Bundle savedInstanceState) {
 
   public void onDestroy() {
     handleMethods("onDestroy");
+
+    surface.stopThread();
+
     dispose();
   }
 
@@ -2859,22 +2862,14 @@ public void create() {
 
   }
 
+  /**
+   * Should trigger a graceful activity/service shutdown (calling onPause/onStop, etc).
+   */
   public void exit() {
-    if (getSurface().getComponent().isService()) {
-      PGraphics.showWarning("This sketch is running as a live wallpaper or a watch face, and cannot be stopped with exit().\n" +
-                                  "Use the corresponding selector on the device to change the current wallpaper or watch face.");
-    } else {
-      // This is the correct way to stop the sketch programmatically, according to the developer's docs:
-      // https://developer.android.com/reference/android/app/Activity.html#onDestroy()
-      // https://developer.android.com/reference/android/app/Activity.html#finish()
-      // and online discussions:
-      // http://stackoverflow.com/questions/2033914/quitting-an-application-is-that-frowned-upon/2034238
-      // finish() it will trigger an onDestroy() event, which will translate down through the
-      // activity hierarchy and trigger stopping Processing's animation thread, etc.
-      getActivity().finish();
-    }
+    surface.finish();
   }
 
+
   /**
    * Called to dispose of resources and shut down the sketch.
    * Destroys the thread, dispose the renderer, and notify listeners.

core/src/processing/core/PSurfaceNone.java

@@ -362,17 +362,24 @@ public void setSystemUiVisibility(int visibility) {
 
   @Override
   public void finish() {
-    // No need to do anything here, as the Android system will take care of
-    // releasing activity resources if needed, etc.
-//    if (component == null) return;
-//
-//    if (component.getKind() == AppComponent.FRAGMENT) {
-//      activity.finish();
-//    } else if (component.getKind() == AppComponent.WALLPAPER) {
-//      wallpaper.stopSelf();
-//    } else if (component.getKind() == AppComponent.WATCHFACE) {
-//      watchface.stopSelf();
-//    }
+    if (component == null) return;
+
+    if (component.getKind() == AppComponent.FRAGMENT) {
+      // This is the correct way to stop the sketch programmatically, according to the developer's docs:
+      // https://developer.android.com/reference/android/app/Activity.html#onDestroy()
+      // https://developer.android.com/reference/android/app/Activity.html#finish()
+      // and online discussions:
+      // http://stackoverflow.com/questions/2033914/quitting-an-application-is-that-frowned-upon/2034238
+      // finish() it will trigger an onDestroy() event, which will translate down through the
+      // activity hierarchy and eventually pausing and stopping Processing's animation thread, etc.
+      activity.finish();
+    } else if (component.getKind() == AppComponent.WALLPAPER) {
+      // stopSelf() stops a service from within:
+      // https://developer.android.com/reference/android/app/Service.html#stopSelf()
+      wallpaper.stopSelf();
+    } else if (component.getKind() == AppComponent.WATCHFACE) {
+      watchface.stopSelf();
+    }
   }
 
   ///////////////////////////////////////////////////////////
@@ -498,13 +505,11 @@ public void run() {  // not good to make this synchronized, locks things up
       while ((Thread.currentThread() == thread) &&
              (sketch != null && !sketch.finished)) {
         if (Thread.currentThread().isInterrupted()) {
-          finish();
           return;
         }
         try {
           checkPause();
         } catch (InterruptedException e) {
-          finish();
           return;
         }
 
@@ -540,8 +545,6 @@ public void run() {  // not good to make this synchronized, locks things up
 
         beforeTime = System.nanoTime();
       }
-
-      finish();
     }
   }