Remove previous permissions, fixes #326

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -226,6 +226,13 @@ public File createProject(String targetID, boolean external, boolean wear)
       Platform.openFolder(tmpFolder);
     }
 
+    if (!external) {
+      // If creating an export project, then the manifest might have attributes
+      // that create trouble with gradle, so we just re-write it...
+      // TODO: the current manifest logic is exceeded by the complexity of the mode
+      // need to rewrite.
+      rewriteManifest = true;
+    }
     manifest = new Manifest(sketch, appComponent, mode.getFolder(), rewriteManifest);    
     manifest.setSdkTarget(target_sdk);
     rewriteManifest = false;
@@ -239,7 +246,8 @@ public File createProject(String targetID, boolean external, boolean wear)
     sketchClassName = preprocess(srcFolder, getPackageName(), preproc, false);
     if (sketchClassName != null) {
       File tempManifest = new File(tmpFolder, "AndroidManifest.xml");
-      manifest.writeCopy(tempManifest, sketchClassName, target.equals("debug"));
+            
+      manifest.writeCopy(tempManifest, sketchClassName, external, target.equals("debug"));
 
       writeAntProps(new File(tmpFolder, "ant.properties"));
       buildFile = new File(tmpFolder, "build.xml");
@@ -586,15 +594,7 @@ public File exportProject() throws IOException, SketchException {
       Preferences.set("android.export.build_system", buildSystem);
     }
 
-//    if (buildSystem.equals("ant")) {    
-//      // this will set debuggable to true in the manifest file
-//      target = "debug";
-//    } else {
-//      // debuggable property should not set in the manifest file when building
-//      // with gradle
-//      target = "";
-//    }
-    target = "debug";
+    this.target = "debug";
 
     String targetID = getTargetID();
 

src/processing/mode/android/Manifest.java

@@ -165,18 +165,17 @@ public void setPermissions(String[] names) {
     // just remove all the old ones
     for (XML kid : xml.getChildren("uses-permission")) {
       String name = kid.getString("android:name");
-      // Don't remove required permissions for wallpapers, watchfaces and VR.      
-      if (-1 < name.indexOf(".")) continue;
+      // Don't remove required permissions for wallpapers, watchfaces and VR.
       if (appComp == AndroidBuild.WALLPAPER) {
       } else if (appComp == AndroidBuild.WATCHFACE) {
         if (name.equals("WAKE_LOCK")) continue;
       } else if (appComp == AndroidBuild.VR) {
-        if (name.equals("INTERNET") ||
-            name.equals("NFC") ||
-            name.equals("VIBRATE") ||
-            name.equals("READ_EXTERNAL_STORAGE") ||
-            name.equals("WRITE_EXTERNAL_STORAGE")) continue;
+        if (name.equals("VIBRATE") ||
+            name.equals("READ_EXTERNAL_STORAGE")) continue;
       }
+      // Don't remove non-standard permissions, such as
+      // com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA
+      if (-1 < name.indexOf("com.google.android")) continue;
       xml.removeChild(kid);
     }
     // ...and add the new kids back
@@ -186,12 +185,9 @@ public void setPermissions(String[] names) {
       } else if (appComp == AndroidBuild.WATCHFACE) {
         if (name.equals("WAKE_LOCK")) continue;
       } else if (appComp == AndroidBuild.VR) {
-        if (name.equals("INTERNET") ||
-            name.equals("NFC") ||
-            name.equals("VIBRATE") ||
-            name.equals("READ_EXTERNAL_STORAGE") ||
-            name.equals("WRITE_EXTERNAL_STORAGE")) continue;
-      }       
+        if (name.equals("VIBRATE") ||
+            name.equals("READ_EXTERNAL_STORAGE")) continue;
+      }
       XML newbie = xml.addChild("uses-permission");
       if (-1 < name.indexOf(".")) {
         // Permission string contains path
@@ -226,8 +222,8 @@ private void writeBlankManifest(final File xmlFile, final int appComp) {
    * Save a new version of the manifest info to the build location.
    * Also fill in any missing attributes that aren't yet set properly.
    */
-  protected void writeCopy(File file, String className,
-                           boolean debug) throws IOException {
+  protected void writeCopy(File file, String className, boolean setDebugAttrib, 
+      boolean debug) throws IOException {
     // write a copy to the build location
     save(file);
 
@@ -257,7 +253,9 @@ protected void writeCopy(File file, String className,
         }       
       }
 
-      app.setString("android:debuggable", debug ? "true" : "false");
+      if (setDebugAttrib) {
+        app.setString("android:debuggable", debug ? "true" : "false");
+      }
 
 //      XML activity = app.getChild("activity");
       // the '.' prefix is just an alias for the full package name