ANDROID: request permissions from Manifest

This reads permissions from the manifest and requests all that are needed. Apps and modules should add necessary permissions to ANDROID_xml_permissions. Moved the initial setContentView back to before @ANDROID_JAVA_ONCREATE@ so that apps can set a content view in ANDROID_java_oncreate

Author: peterlew

loaders/android/AndroidManifest.xml.in

@@ -21,7 +21,7 @@
     @ANDROID_XML_RECEIVERS@
     @ANDROID_XML_SERVICES@
   </application>
-@ANDROID_XML_PERMISSIONS@
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+@ANDROID_XML_PERMISSIONS@
 </manifest> 
 # eof

loaders/android/bootstrap.java.in

@@ -45,6 +45,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.content.res.Configuration;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageInfo;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.PowerManager;
@@ -107,6 +109,29 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
     return true;
   }
 
+  public boolean requestAllPermissions() {
+    @IF_ANDROIDAPI_GT_22@
+    PackageManager pm = getPackageManager();
+    try
+    {
+        PackageInfo packageInfo = pm.getPackageInfo(getPackageName(), PackageManager.GET_PERMISSIONS);
+        String[] requestedPermissions = null;
+        if (packageInfo != null)
+            requestedPermissions = packageInfo.requestedPermissions;
+
+        if (requestedPermissions != null && requestedPermissions.length > 0)
+          requestPermissions(requestedPermissions, 1);
+    }
+    catch (PackageManager.NameNotFoundException e)
+    {
+        System.err.print("requestAllPermissions error: " + e);
+        e.printStackTrace(System.err);
+        return false;
+    }
+    /* end of IF_ANDROIDAPI_GT_22 */
+    return true;
+  }
+
   @Override
   public void startActivityForResult(Intent intent, int cont) {
       try {
@@ -176,16 +201,19 @@ public class @SYS_APPNAME@ extends Activity implements @ANDROID_JAVA_IMPLEMENTS@
 
     mSensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
 
-    checkOrRequestPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
-    // Additions and permissions needed by modules, e.g. gps
-    @ANDROID_JAVA_ONCREATE@
+    requestAllPermissions();
 
     // MUST NOT run before nativeInstanceInit completed
     // and MUST NOT run before permission checks
     setContentView(current_ContentView==null ? mGLView : current_ContentView);
+
+    // Additions needed by modules, e.g. gps
+    @ANDROID_JAVA_ONCREATE@
+
     // start EVENT_IDLE 
     if(idle_tmScheduleRate > 0) idle_tm.scheduleAtFixedRate(idle_task, 0, idle_tmScheduleRate);
   }
+
   @Override 
   protected void onDestroy() {
     setContentView(mGLView);

modules/camera/ANDROID_java_oncreate

@@ -2,11 +2,9 @@ locationManager = (LocationManager)getSystemService(Context.LOCATION_SERVICE);
 Criteria criteria = new Criteria();
 if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){ 
   criteria.setAccuracy(Criteria.ACCURACY_FINE);
-  checkOrRequestPermission(android.Manifest.permission.ACCESS_FINE_LOCATION);
 } else {
   criteria.setPowerRequirement(Criteria.POWER_LOW);
   criteria.setAccuracy(Criteria.ACCURACY_COARSE);
-  checkOrRequestPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION);
 }
 provider = locationManager.getBestProvider(criteria, false);
 Location location = locationManager.getLastKnownLocation(provider);

modules/gps/ANDROID_java_oncreate

@@ -1,6 +1,3 @@
-// permissions
-
-checkOrRequestPermission(android.Manifest.permission.ACCESS_FINE_LOCATION);
 
 // webview
 

modules/hybridapp-xwalk/ANDROID_java_oncreate

@@ -1,6 +1,3 @@
-// permissions
-
-checkOrRequestPermission(android.Manifest.permission.ACCESS_FINE_LOCATION);
 
 // webview