new permission handling api

Author: codeanticode

core/src/processing/android/AppComponent.java

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

core/src/processing/android/PFragment.java

@@ -28,6 +28,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.util.DisplayMetrics;
+
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -43,8 +44,8 @@
 
 public class PFragment extends Fragment implements AppComponent {
   private DisplayMetrics metrics;
-  protected Point size;
-  protected PApplet sketch;
+  private Point size;
+  private PApplet sketch;
 
   public PFragment() {
   }
@@ -113,6 +114,13 @@ public void setSketch(PApplet sketch, @IdRes int id, @LayoutRes int layout,
     transaction.commit();
   }
 
+  public void setSketch(PApplet sketch, View view, FragmentManager manager) {
+    this.sketch = sketch;
+    FragmentTransaction transaction = manager.beginTransaction();
+    transaction.add(view.getId(), this);
+    transaction.commit();
+  }
+
   public PApplet getSketch() {
     return sketch;
   }
@@ -124,6 +132,7 @@ public ServiceEngine getEngine() {
   public void dispose() {
   }
 
+
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
@@ -177,16 +186,6 @@ public void onConfigurationChanged(Configuration newConfig) {
   }
 
 
-//  public void onBackPressed() {
-//    sketch.exit();
-//  }
-
-
-  public void onPermissionsGranted() {
-    if (sketch != null) sketch.onPermissionsGranted();
-  }
-
-
   public void setOrientation(int which) {
     if (which == PORTRAIT) {
       getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -199,8 +198,14 @@ public void setOrientation(int which) {
   public void requestDraw() {
   }
 
+
   public boolean canDraw() {
     if (sketch == null) return false;
     return sketch.isLooping();
   }
+
+
+//public void onBackPressed() {
+//  sketch.exit();
+//}
 }

core/src/processing/android/PWallpaper.java

@@ -122,11 +122,6 @@ public void requestPermissions() {
   }
 
 
-  public void onPermissionsGranted() {
-    if (engine != null) engine.onPermissionsGranted();
-  }
-
-
   @Override
   public Engine onCreateEngine() {
     engine = new WallpaperEngine();
@@ -159,13 +154,6 @@ public void onCreate(SurfaceHolder surfaceHolder) {
     }
 
 
-    private void onPermissionsGranted() {
-      if (sketch != null) {
-        sketch.onPermissionsGranted();
-      }
-    }
-
-
     @Override
     public void onSurfaceCreated(SurfaceHolder surfaceHolder) {
       super.onSurfaceCreated(surfaceHolder);
@@ -315,5 +303,14 @@ public boolean useLowBitAmbient() {
     public boolean requireBurnInProtection() {
       return false;
     }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[],
+                                           int[] grantResults) {
+      if (sketch != null) {
+        sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
+      }
+    }
   }
 }

core/src/processing/android/PWatchFaceCanvas.java

@@ -135,11 +135,6 @@ public void requestPermissions() {
   }
 
 
-  public void onPermissionsGranted() {
-    if (engine != null) engine.onPermissionsGranted();
-  }
-
-
   @Override
   public Engine onCreateEngine() {
     engine = new CanvasEngine();
@@ -198,13 +193,6 @@ private void invalidateIfNecessary() {
     }
 
 
-    private void onPermissionsGranted() {
-      if (sketch != null) {
-        sketch.onPermissionsGranted();
-      }
-    }
-
-
     @Override
     public void onAmbientModeChanged(boolean inAmbientMode) {
       super.onAmbientModeChanged(inAmbientMode);
@@ -433,5 +421,14 @@ public boolean useLowBitAmbient() {
     public boolean requireBurnInProtection() {
       return burnInProtection;
     }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[],
+                                           int[] grantResults) {
+      if (sketch != null) {
+        sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
+      }
+    }
   }
 }

core/src/processing/android/PWatchFaceGLES.java

@@ -133,11 +133,6 @@ public void requestPermissions() {
   }
 
 
-  public void onPermissionsGranted() {
-    if (engine != null) engine.onPermissionsGranted();
-  }
-
-
   @Override
   public Engine onCreateEngine() {
     engine = new GLES2Engine();
@@ -215,13 +210,6 @@ private void invalidateIfNecessary() {
     }
 
 
-    public void onPermissionsGranted() {
-      if (sketch != null) {
-        sketch.onPermissionsGranted();
-      }
-    }
-
-
     @Override
     public void onAmbientModeChanged(boolean inAmbientMode) {
       super.onAmbientModeChanged(inAmbientMode);
@@ -434,5 +422,15 @@ public boolean useLowBitAmbient() {
     public boolean requireBurnInProtection() {
       return burnInProtection;
     }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[],
+                                           int[] grantResults) {
+      if (sketch != null) {
+        sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
+      }
+    }
   }
 }

core/src/processing/android/ServiceEngine.java

@@ -41,4 +41,9 @@ public interface ServiceEngine extends PConstants {
   public Rect getInsets();
   public boolean useLowBitAmbient();
   public boolean requireBurnInProtection();
+
+  // Service permissions
+  public void onRequestPermissionsResult(int requestCode,
+                                         String permissions[],
+                                         int[] grantResults);
 }

core/src/processing/core/PApplet.java

@@ -113,43 +113,12 @@ public class PApplet extends Object implements PConstants {
   static public final int DEFAULT_WIDTH = -1;
   static public final int DEFAULT_HEIGHT = -1;
 
-  /**
-   * Minimum dimensions for the window holding an applet.
-   * This varies between platforms, Mac OS X 10.3 can do any height
-   * but requires at least 128 pixels width. Windows XP has another
-   * set of limitations. And for all I know, Linux probably lets you
-   * make windows with negative sizes.
-   */
-//  static public final int MIN_WINDOW_WIDTH = 128;
-//  static public final int MIN_WINDOW_HEIGHT = 128;
-
-  /**
-   * Exception thrown when size() is called the first time.
-   * <P>
-   * This is used internally so that setup() is forced to run twice
-   * when the renderer is changed. This is the only way for us to handle
-   * invoking the new renderer while also in the midst of rendering.
-   */
-//  static public class RendererChangeException extends RuntimeException { }
-
-//  protected boolean surfaceReady;
-
   /**
    * Set true when the surface dimensions have changed, so that the PGraphics
    * object can be resized on the next trip through handleDraw().
    */
   protected boolean surfaceChanged;
 
-  /**
-   * true if no size() command has been executed. This is used to wait until
-   * a size has been set before placing in the window and showing it.
-   */
-//  public boolean defaultSize;
-
-//  volatile boolean resizeRequest;
-//  volatile int resizeWidth;
-//  volatile int resizeHeight;
-
   /**
    * Pixel buffer from this applet's PGraphics.
    * <P>
@@ -263,6 +232,11 @@ public class PApplet extends Object implements PConstants {
    */
   public boolean focused = false;
 
+  /**
+   * Callback methods to handle permission requests
+   */
+  protected HashMap<String, Method> permissionMethods = new HashMap<String, Method>();
+
   ///////////////////////////////////////////////////////////////
   // Wallpaper and watchface variables: these will go away soon...
   @Deprecated
@@ -311,12 +285,6 @@ public class PApplet extends Object implements PConstants {
    * As such, this value won't be valid until after 5-10 frames.
    */
   public float frameRate = 10;
-  /** Last time in nanoseconds that frameRate was checked */
-//  protected long frameRateLastNanos = 0;
-//
-//  /** As of release 0116, frameRate(60) is called as a default */
-//  protected float frameRateTarget = 60;
-//  protected long frameRatePeriod = 1000000000L / 60L;
 
   protected boolean looping;
 
@@ -339,18 +307,6 @@ public class PApplet extends Object implements PConstants {
    */
   public boolean finished;
 
-  /**
-   * For Android, true if the activity has been paused.
-   */
-//  protected boolean paused;
-
-//  protected SurfaceView surfaceView;
-
-  /**
-   * The Window object for Android.
-   */
-//  protected Window window;
-
   /**
    * true if exit() has been called so that things shut down
    * once the main thread kicks off.
@@ -616,8 +572,54 @@ public void onStop() {
   }
 
 
-  public void onPermissionsGranted() {
+  public boolean hasPermission(String permission) {
+    return surface.hasPermission(permission);
+  }
+
+
+  public void requestPermission(String permission, String callback) {
+    if (!hasPermission(permission)) {
+      println("Requesting permission ", permission, " with callback ", callback);
+      Method handleMethod = null;
+      try {
+        Class<?> callbackClass = this.getClass();
+        handleMethod = callbackClass.getMethod(callback, new Class[] { boolean.class });
+      } catch (NoSuchMethodException nsme) {
+        System.err.println(callback + "() could not be found");
+      }
+      if (handleMethod != null) {
+        permissionMethods.put(permission, handleMethod);
+        surface.requestPermission(permission);
+      }
+    }
+  }
+
+
+  public void onRequestPermissionsResult(int requestCode,
+                                         String permissions[],
+                                         int[] grantResults) {
+    if (requestCode == PSurface.REQUEST_PERMISSIONS) {
+      for (int i = 0; i < grantResults.length; i++) {
+        boolean granted = grantResults[i] == PackageManager.PERMISSION_GRANTED;
+        handlePermissionsResult(permissions[i], granted);
+      }
+    }
+  }
+
 
+  private void handlePermissionsResult(String permission, boolean granted) {
+    Method handleMethod = permissionMethods.get(permission);
+    if (handleMethod != null) {
+      try {
+        handleMethod.invoke(this, new Object[] { granted });
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (IllegalArgumentException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
+        e.printStackTrace();
+      }
+    }
   }
 
 

core/src/processing/core/PSurface.java

@@ -44,6 +44,8 @@
  * handling
  */
 public interface PSurface {
+  public static final int REQUEST_PERMISSIONS = 1;
+
   public AppComponent getComponent();
   public Context getContext();
   public Activity getActivity();
@@ -95,4 +97,7 @@ public void initView(int sketchWidth, int sketchHeight, boolean parentSize,
   public void finish();
 
   public void setFrameRate(float fps);
+
+  public boolean hasPermission(String permission);
+  public void requestPermission(String permission);
 }