aggregate permissions and request at the end of draw

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -232,11 +232,20 @@ public class PApplet extends Object implements PConstants {
    */
   public boolean focused = false;
 
+  ///////////////////////////////////////////////////////////////
+  // Permission handling
+
   /**
    * Callback methods to handle permission requests
    */
   protected HashMap<String, Method> permissionMethods = new HashMap<String, Method>();
 
+
+  /**
+   * Permissions requested during one frame
+   */
+  protected ArrayList<String> reqPermissions = new ArrayList<String>();
+
   ///////////////////////////////////////////////////////////////
   // Wallpaper and watchface variables: these will go away soon...
   @Deprecated
@@ -579,7 +588,6 @@ public boolean hasPermission(String 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();
@@ -589,7 +597,9 @@ public void requestPermission(String permission, String callback) {
       }
       if (handleMethod != null) {
         permissionMethods.put(permission, handleMethod);
-        surface.requestPermission(permission);
+        // Accumulating permissions so they requested all at once at the end
+        // of draw.
+        reqPermissions.add(permission);
       }
     }
   }
@@ -623,6 +633,15 @@ private void handlePermissionsResult(String permission, boolean granted) {
   }
 
 
+  private void handlePermissions() {
+    if (0 < reqPermissions.size()) {
+      String[] req = reqPermissions.toArray(new String[reqPermissions.size()]);
+      surface.requestPermissions(req);
+      reqPermissions.clear();
+    }
+  }
+
+
   /**
    * @param method "size" or "fullScreen"
    * @param args parameters passed to the function so we can show the user
@@ -1744,6 +1763,7 @@ public void handleDraw() {
       dequeueEvents();
 
       handleMethods("draw");
+      handlePermissions();
 
       redraw = false;  // unset 'redraw' flag in case it was set
       // (only do this once draw() has run, not just setup())

core/src/processing/core/PSurface.java

@@ -99,5 +99,5 @@ public void initView(int sketchWidth, int sketchHeight, boolean parentSize,
   public void setFrameRate(float fps);
 
   public boolean hasPermission(String permission);
-  public void requestPermission(String permission);
+  public void requestPermissions(String[] permissions);
 }

core/src/processing/core/PSurfaceNone.java

@@ -46,8 +46,6 @@
 import android.widget.RelativeLayout;
 import android.support.v4.os.ResultReceiver;
 
-import android.support.wearable.activity.WearableActivity;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -522,16 +520,15 @@ public boolean hasPermission(String permission) {
   }
 
 
-  public void requestPermission(String permission) {
+  public void requestPermissions(String[] permissions) {
     int comp = component.getKind();
     if (comp == AppComponent.FRAGMENT) {
       // Requesting permissions from user when the app resumes.
       // Nice example on how to handle user response
       // http://stackoverflow.com/a/35495855
       // More on permission in Android 23:
       // https://inthecheesefactory.com/blog/things-you-need-to-know-about-android-m-permission-developer-edition/en
-      ActivityCompat.requestPermissions(activity, new String[] { permission },
-                                        REQUEST_PERMISSIONS);
+      ActivityCompat.requestPermissions(activity, permissions, REQUEST_PERMISSIONS);
     } else if (comp == AppComponent.WALLPAPER || comp == AppComponent.WATCHFACE) {
       // https://developer.android.com/training/articles/wear-permissions.html
       // Inspired by PermissionHelper.java from Michael von Glasow:
@@ -549,7 +546,7 @@ protected void onReceiveResult (int resultCode, Bundle resultData) {
       };
       final Intent permIntent = new Intent(getContext(), PermissionRequestActivity.class);
       permIntent.putExtra(KEY_RESULT_RECEIVER, resultReceiver);
-      permIntent.putExtra(KEY_PERMISSIONS, new String[] { permission });
+      permIntent.putExtra(KEY_PERMISSIONS, permissions);
       permIntent.putExtra(KEY_REQUEST_CODE, REQUEST_PERMISSIONS);
       // Show the dialog requesting the permissions
       permIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -558,7 +555,6 @@ protected void onReceiveResult (int resultCode, Bundle resultData) {
     }
   }
 
-  //WearableActivity
   public static class PermissionRequestActivity extends Activity {
     ResultReceiver resultReceiver;
     String[] permissions;

templates/FragmentActivity.java.tmpl

@@ -29,7 +29,6 @@ public class MainActivity extends AppCompatActivity {
   public void onRequestPermissionsResult(int requestCode,
                                          String permissions[],
                                          int[] grantResults) {
-    PApplet.println("------->  onRequestPermissionsResult", grantResults);
     if (sketch != null) {
       sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }