uses same file name for pixels cache, delete it on destroy

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -54,8 +54,11 @@
 import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
 import android.os.Build;
+import android.os.Environment;
 import android.view.SurfaceHolder;
 
+import static android.os.Environment.isExternalStorageRemovable;
+
 
 /**
  * Subclass for PGraphics that implements the graphics API using
@@ -2055,6 +2058,16 @@ public void resize(int wide, int high) {
   }
 
 
+  @Override
+  protected void clearState() {
+    super.clearState();
+    if (restoreFilename != null) {
+      File cacheFile = new File(restoreFilename);
+      cacheFile.delete();
+    }
+  }
+
+
   @Override
   protected void saveState() {
     super.saveState();
@@ -2070,9 +2083,13 @@ protected void saveState() {
       ByteBuffer restoreBitmap = ByteBuffer.allocate(size);
       bitmap.copyPixelsToBuffer(restoreBitmap);
 
-      File cacheDir = context.getCacheDir();
-      File cacheFile = File.createTempFile("processing", "pixels", cacheDir);
+      // Tries to use external but if not mounted, falls back on internal storage, as shown in
+      // https://developer.android.com/topic/performance/graphics/cache-bitmap#java
+      File cacheDir = Environment.MEDIA_MOUNTED == Environment.getExternalStorageState() || !isExternalStorageRemovable() ?
+          context.getExternalCacheDir() : context.getCacheDir();
+      File cacheFile = new File(cacheDir + File.separator + "restore_pixels");
       restoreFilename = cacheFile.getAbsolutePath();
+
       FileOutputStream stream = new FileOutputStream(cacheFile);
       ObjectOutputStream dout = new ObjectOutputStream(stream);
       byte[] array = new byte[size];

core/src/processing/core/PApplet.java

@@ -1896,7 +1896,7 @@ public void handleDraw() {
 
 
   // This method handles some special situations on Android where beginDraw/endDraw are needed,
-  // but not to render the actualy contents of draw(). In general, this situations arise from
+  // but not to render the actual contents of draw(). In general, these situations arise from
   // having to refresh/restore the screen after requesting no loop, or resuming the sketch in
   // no-loop state.
   protected boolean handleSpecialDraw() {
@@ -2908,6 +2908,7 @@ final public void dispose() {
       surface.dispose();
     }
     if (g != null) {
+      g.clearState(); // This should probably go in dispose, but for the time being...
       g.dispose();
     }
 

core/src/processing/core/PGraphics.java

@@ -982,10 +982,16 @@ protected void reapplySettings() {  // ignore
   // RENDERER STATE
 
 
+  protected void clearState() {  // ignore
+    // Nothing to do here, it depends on the renderer's implementation.
+  }
+
+
   protected void saveState() {  // ignore
     // Nothing to do here, it depends on the renderer's implementation.
   }
 
+
   protected void restoreState() {  // ignore
     // This method probably does not need to be re-implemented in the subclasses. All we need to
     // do is to check for the resume in no-loop state situation:

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -39,8 +39,11 @@
 import java.util.*;
 
 import android.content.Context;
+import android.os.Environment;
 import android.view.SurfaceHolder;
 
+import static android.os.Environment.isExternalStorageRemovable;
+
 /**
  * OpenGL renderer.
  */
@@ -5694,6 +5697,16 @@ protected void drawPixels(int[] pixBuffer, int x, int y, int w, int h) {
   }
 
 
+  @Override
+  protected void clearState() {
+    super.clearState();
+    if (restoreFilename != null) {
+      File cacheFile = new File(restoreFilename);
+      cacheFile.delete();
+    }
+  }
+
+
   @Override
   protected void saveState() {
     super.saveState();
@@ -5715,9 +5728,13 @@ public void run() {
           pgl.readPixelsImpl(0, 0, pixelWidth, pixelHeight, PGL.RGBA, PGL.UNSIGNED_BYTE, buf);
           endPixelsOp();
 
-          File cacheDir = context.getCacheDir();
-          File cacheFile = File.createTempFile("processing", "pixels", cacheDir);
+          // Tries to use external but if not mounted, falls back on internal storage, as shown in
+          // https://developer.android.com/topic/performance/graphics/cache-bitmap#java
+          File cacheDir = Environment.MEDIA_MOUNTED == Environment.getExternalStorageState() || !isExternalStorageRemovable() ?
+                          context.getExternalCacheDir() : context.getCacheDir();
+          File cacheFile = new File(cacheDir + File.separator + "restore_pixels");
           restoreFilename = cacheFile.getAbsolutePath();
+
           FileOutputStream stream = new FileOutputStream(cacheFile);
           ObjectOutputStream dout = new ObjectOutputStream(stream);
           dout.writeObject(restorePixels);