handle back press event in the animation thread

Author: codeanticode

core/src/processing/android/PWallpaper.java

@@ -154,26 +154,18 @@ public void onSurfaceCreated(SurfaceHolder surfaceHolder) {
     @Override
     public void onSurfaceChanged(final SurfaceHolder holder, final int format,
                                  final int width, final int height) {
-//      if (sketch != null) {
-////        sketch.g.setSize(width, height);
-//        sketch.surfaceChanged();
-//        sketch.setSize(width, height);
-//      }
-
       // When the surface of a live wallpaper changes (eg: after a screen rotation) the same sketch
       // continues to run (unlike the case of regular apps, where its re-created) so we need to
       // force a reset of the renderer so the backing FBOs (in the case of the OpenGL renderers)
       // get reinitalized with the correct size.
       sketch.g.reset();
-      System.out.println("===================> ON SURFACE CHANGED!!!!!!!!!!!!!!!");
       super.onSurfaceChanged(holder, format, width, height);
     }
 
 
     @Override
     public void onVisibilityChanged(boolean visible) {
       if (sketch != null) {
-        System.out.println("============> CHANGING WALLPAPER VISIBILITY TO " + visible);
         if (visible) {
           sketch.onResume();
         } else {

core/src/processing/android/PWatchFaceCanvas.java

@@ -230,10 +230,6 @@ public void onVisibilityChanged(boolean visible) {
     public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
       super.onSurfaceChanged(holder, format, width, height);
       if (sketch != null) {
-//        sketch.displayWidth = width;
-//        sketch.displayHeight = height;
-//        sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
-//        sketch.surfaceChanged();
         sketch.surfaceChanged();
         sketch.setSize(width, height);
       }

core/src/processing/android/PWatchFaceGLES.java

@@ -191,10 +191,6 @@ public void onGlContextCreated() {
     public void onGlSurfaceCreated(int width, int height) {
       super.onGlSurfaceCreated(width, height);
       if (sketch != null) {
-//        sketch.displayWidth = width;
-//        sketch.displayHeight = height;
-//        sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
-//        sketch.surfaceChanged();
         sketch.surfaceChanged();
         sketch.setSize(width, height);
       }

core/src/processing/core/PApplet.java

@@ -260,6 +260,11 @@ public class PApplet extends Object implements ActivityAPI, PConstants {
    */
   boolean keyboardIsOpen = false;
 
+  /**
+   * Flag to determine if the back key was pressed.
+   */
+  private boolean requestedBackPress = false;
+
   /**
    * Flag to determine if the user handled the back press.
    */
@@ -648,8 +653,8 @@ public void setHasOptionsMenu(boolean hasMenu) {
   }
 
 
-  public void onBackPressed() {
-    handledBackPressed = false;
+  synchronized public void onBackPressed() {
+    requestedBackPress = true;
   }
 
   public void startActivity(Intent intent) {
@@ -729,6 +734,19 @@ private void handlePermissions() {
     }
   }
 
+  synchronized private void handleBackPressed() {
+    if (requestedBackPress) {
+      requestedBackPress = false;
+      backPressed();
+      if (!handledBackPressed) {
+        if (getActivity() != null) {
+          // Services don't have an activity associated to them, but back press could not be triggered for those anyways
+          getActivity().finish();
+        }
+        handledBackPressed = false;
+      }
+    }
+  }
 
   /**
    * @param method "size" or "fullScreen"
@@ -904,6 +922,10 @@ public void resume() {
   }
 
 
+  public void backPressed() {
+    handledBackPressed = false;
+  }
+
   //////////////////////////////////////////////////////////////
 
 
@@ -1844,6 +1866,7 @@ public void handleDraw() {
 
       handleMethods("draw");
       handlePermissions();
+      handleBackPressed();
 
       redraw = false;  // unset 'redraw' flag in case it was set
       // (only do this once draw() has run, not just setup())

mode/libraries/vr/src/processing/vr/PVR.java

@@ -195,8 +195,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
   public void onBackPressed() {
     if (sketch != null) {
       sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
     }
-    super.onBackPressed();
   }
 }

mode/templates/AppActivity.java.tmpl

@@ -52,8 +52,6 @@ public class MainActivity extends AppCompatActivity {
   public void onBackPressed() {
     if (sketch != null) {
       sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
     }
-    super.onBackPressed();
-  }  
+  }
 }

studio/apps/fast2d/src/main/java/fast2d/MainActivity.java

@@ -52,8 +52,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
   public void onBackPressed() {
     if (sketch != null) {
       sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
     }
-    super.onBackPressed();
   }
 }

studio/apps/simple/src/main/java/simple/MainActivity.java

@@ -52,8 +52,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
   public void onBackPressed() {
     if (sketch != null) {
       sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
     }
-    super.onBackPressed();
   }
 }

studio/apps/simple/src/main/java/simple/Sketch.java

@@ -20,4 +20,4 @@ public void draw() {
     background(9);
     image(leaf, mouseX, mouseY);
   }
-}
+}

studio/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files