handle non-standard permissions

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -1438,8 +1438,14 @@ private void writeResXMLWatchFace(final File xmlFolder) {
   private String generatePermissionsString(final String[] permissions) {
     String permissionsStr = "";
     for (String p: permissions) {
-      permissionsStr += (0 < permissionsStr.length()?",":"") + 
-                        (p.indexOf("permission") == -1?"Manifest.permission.":"") + p;  
+      permissionsStr += (0 < permissionsStr.length() ? "," : "");
+      if (p.indexOf("permission") == -1) {
+        permissionsStr += "Manifest.permission." + p;
+      } else if (p.indexOf("Manifest.permission") == 0) {
+        permissionsStr += p;
+      } else {
+        permissionsStr += "\"" + p + "\"";
+      }
     }
     permissionsStr = "{" + permissionsStr + "}";   
     return permissionsStr;

src/processing/mode/android/Manifest.java

@@ -137,8 +137,15 @@ public String[] getPermissions() {
     String[] names = new String[count];
     for (int i = 0; i < count; i++) {
       String tmp = elements[i].getString("android:name");
-      int idx = tmp.lastIndexOf(".");
-      names[i] = tmp.substring(idx + 1);
+      if (tmp.indexOf("android.permission") == 0) {
+        // Standard permission, remove perfix
+        int idx = tmp.lastIndexOf(".");
+        names[i] = tmp.substring(idx + 1);        
+      } else {
+        // Non-standard permission (for example, wearables)
+        // Store entire name.
+        names[i] = tmp;
+      }
     }
     return names;
   }
@@ -175,7 +182,12 @@ public void setPermissions(String[] names) {
             name.equals("android.permission.WRITE_EXTERNAL_STORAGE")) continue;
       }       
       XML newbie = xml.addChild("uses-permission");
-      newbie.setString("android:name", PERMISSION_PREFIX + name);
+      if (-1 < name.indexOf(".")) {
+        // Permission string contains path
+        newbie.setString("android:name", name);
+      } else {
+        newbie.setString("android:name", PERMISSION_PREFIX + name);
+      }      
     }
     save();
   }