revised dispose/exit

Author: codeanticode

core/src/processing/android/AppComponent.java

@@ -42,5 +42,6 @@ abstract public interface AppComponent extends PConstants {
   public void requestDraw();
   public boolean canDraw();
 
+  public void dispose();
   public void onPermissionsGranted();
 }

core/src/processing/android/PFragment.java

@@ -94,6 +94,10 @@ public void setSketch(PApplet sketch) {
     this.sketch = sketch;
   }
 
+  public void dispose() {
+    sketch = null;
+  }
+
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     if (sketch != null) {
@@ -121,8 +125,8 @@ public void onPause() {
 
   @Override
   public void onDestroy() {
-    sketch.onDestroy();
     super.onDestroy();
+    sketch.onDestroy();
   }
 
 
@@ -147,9 +151,9 @@ public void onConfigurationChanged(Configuration newConfig) {
   }
 
 
-  public void onBackPressed() {
-    sketch.exit();
-  }
+//  public void onBackPressed() {
+//    sketch.exit();
+//  }
 
 
   public void onPermissionsGranted() {

core/src/processing/android/PWallpaper.java

@@ -100,6 +100,10 @@ public boolean canDraw() {
     return true;
   }
 
+  public void dispose() {
+    engine = null;
+  }
+
   public void onPermissionsGranted() {
 
   }

core/src/processing/android/PWatchFaceCanvas.java

@@ -93,6 +93,11 @@ public void setSketch(PApplet sketch) {
     this.sketch = sketch;
   }
 
+  public void dispose() {
+    sketch = null;
+    engine = null;
+  }
+
   public void onPermissionsGranted() {
 
   }
@@ -266,7 +271,7 @@ public void onDestroy() {
 
   @Override
   public void onDestroy() {
-    sketch.onDestroy();
     super.onDestroy();
+    sketch.onDestroy();
   }
 }

core/src/processing/android/PWatchFaceGLES.java

@@ -90,6 +90,11 @@ public void setSketch(PApplet sketch) {
     this.sketch = sketch;
   }
 
+  public void dispose() {
+    sketch = null;
+    engine = null;
+  }
+
   public void onPermissionsGranted() {
 
   }
@@ -282,7 +287,7 @@ public void onDestroy() {
 
   @Override
   public void onDestroy() {
-    sketch.onDestroy();
     super.onDestroy();
+    sketch.onDestroy();
   }
 }

core/src/processing/core/PApplet.java

@@ -2823,14 +2823,14 @@ public void die(String what, Exception e) {
     die(what);
   }
 
+  /*
+   // No need for these two, as explicit app exit is not required on Android, read
+   // this discussion:
+   // http://stackoverflow.com/questions/2033914/quitting-an-application-is-that-frowned-upon/2034238
 
-  /**
-   * Call to safely exit the sketch when finished. For instance,
-   * to render a single frame, save it, and quit.
-   */
+   // Call to safely exit the sketch when finished. For instance,
+   // to render a single frame, save it, and quit.
   public void exit() {
-//    println("exit() called");
-//    if (thread == null) {
     if (surface.isStopped()) {
       // exit immediately, stop() has already been called,
       // meaning that the main thread has long since exited
@@ -2853,14 +2853,14 @@ public void exit() {
     }
   }
 
-
   public void exitActual() {
     try {
       System.exit(0);
     } catch (SecurityException e) {
       // don't care about applet security exceptions
     }
   }
+  */
 
   /**
    * Called to dispose of resources and shut down the sketch.

core/src/processing/core/PGraphics.java

@@ -721,6 +721,7 @@ protected void allocate() { }
    * endRaw(), in order to shut things off.
    */
   public void dispose() {  // ignore
+    parent = null;
   }
 
 

core/src/processing/core/PSurface.java

@@ -78,5 +78,7 @@ public interface PSurface {
 
   public boolean isStopped();
 
+  public void finish();
+
   public void setFrameRate(float fps);
 }

core/src/processing/core/PSurfaceNone.java

@@ -105,9 +105,33 @@ public String getName() {
   public void dispose() {
     sketch = null;
     graphics = null;
-    component = null;
-    activity = null;
-    view = null;
+
+    if (activity != null) {
+      // In API level 21 you can do
+      // activity.releaseInstance();
+      // to ask the app to free up its memory.
+      // https://developer.android.com/reference/android/app/Activity.html#releaseInstance()
+      // but seems redundant to call it here, since dispose() is triggered by
+      // the onDestroy() handler, which means that the app is already
+      // being destroyed.
+
+      activity = null;
+    }
+
+    if (view != null) {
+      view.destroyDrawingCache();
+      view = null;
+    }
+
+    if (component != null) {
+      component.dispose();
+      component = null;
+    }
+
+    if (surface != null) {
+      surface.getHolder().getSurface().release();
+      surface = null;
+    }
   }
 
   @Override
@@ -222,6 +246,17 @@ public void setSystemUiVisibility(int visibility) {
     }
   }
 
+  @Override
+  public void finish() {
+    if (component.getKind() == AppComponent.FRAGMENT) {
+      activity.finish();
+    } else if (component.getKind() == AppComponent.WALLPAPER) {
+      wallpaper.stopSelf();
+    } else if (component.getKind() == AppComponent.WATCHFACE) {
+      watchface.stopSelf();
+    }
+  }
+
   ///////////////////////////////////////////////////////////
 
   // Thread handling
@@ -356,14 +391,7 @@ public void run() {  // not good to make this synchronized, locks things up
         beforeTime = System.nanoTime();
       }
 
-      if (sketch != null) {
-        sketch.dispose();  // call to shutdown libs?
-        // If the user called the exit() function, the window should close,
-        // rather than the sketch just halting.
-        if (sketch.exitCalled) {
-          sketch.exitActual();
-        }
-      }
+      finish();
     }
   }
 }

core/src/processing/opengl/PGL.java

@@ -409,6 +409,8 @@ public PGL(PGraphicsOpenGL pg) {
 
   public void dispose() {
     destroyFBOLayer();
+    graphics = null;
+    sketch = null;    
   }