using notifications fixes permission request on watch faces

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -1776,38 +1776,33 @@ private void writeServicePermissionHandlers(final PrintWriter writer, String[] p
       writer.println("    permIntent.putExtra(KEY_RESULT_RECEIVER, resultReceiver);");
       writer.println("    permIntent.putExtra(KEY_PERMISSIONS, permissions);");
       writer.println("    permIntent.putExtra(KEY_REQUEST_CODE, requestCode);");
-      writer.println("    permIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);");
-//      writer.println("  TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);");
-//      writer.println("  stackBuilder.addNextIntent(permIntent);");
-//      writer.println("  PendingIntent permPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);");
-//      writer.println("  NotificationCompat.Builder builder = new NotificationCompat.Builder(this)");
-//      writer.println("      .setSmallIcon(R.drawable.icon)");
-//      writer.println("      .setContentTitle(\"Requesting permissions\")");
-//      writer.println("      .setContentText(\"The app need permissions to work properly\")");
-//      writer.println("      .setOngoing(true)");
-//      writer.println("      .setAutoCancel(true)");
-//      writer.println("      .setWhen(0)");
-//      writer.println("      .setContentIntent(permPendingIntent)");
-//      writer.println("      .setStyle(null);");
-//      writer.println("    NotificationManager notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);");
-//      writer.println("    notificationManager.notify(requestCode, builder.build());");
-      
-//      writer.println("    AlertDialog.Builder builder = new AlertDialog.Builder(this);");
-//      writer.println("    builder.setMessage(\"The app needs some permissions to run.\")");
-//      writer.println("            .setCancelable(false)");
-//      writer.println("            .setPositiveButton(\"OK\", new DialogInterface.OnClickListener() {");
-//      writer.println("              public void onClick(DialogInterface dialog, int id) {");
-//      writer.println("                startActivity(permIntent);");
-//      writer.println("              }");
-//      writer.println("             });");
-//      writer.println("    AlertDialog alert = builder.create();");
-//      writer.println("    alert.show();");
-      writer.println("    startActivity(permIntent);");    
+
+      if (appComponent == WATCHFACE) {
+        // Create a notification on watch faces, otherwise it does not work.
+        writer.println("  TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);");
+        writer.println("  stackBuilder.addNextIntent(permIntent);");
+        writer.println("  PendingIntent permPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);");
+        writer.println("  NotificationCompat.Builder builder = new NotificationCompat.Builder(this)");
+        writer.println("      .setSmallIcon(R.drawable.icon)");
+        writer.println("      .setContentTitle(\"Requesting permissions\")");
+        writer.println("      .setContentText(\"The app need permissions to work properly\")");
+        writer.println("      .setOngoing(true)");
+        writer.println("      .setAutoCancel(true)");
+        writer.println("      .setWhen(0)");
+        writer.println("      .setContentIntent(permPendingIntent)");
+        writer.println("      .setStyle(null);");
+        writer.println("    NotificationManager notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);");
+        writer.println("    notificationManager.notify(requestCode, builder.build());");
+      } else {
+        // Just show the dialog requesting the permissions
+        writer.println("    permIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);");
+        writer.println("    startActivity(permIntent);");
+      }
       writer.println("  }");
     }
 
     // Activity that triggers the ActivityCompat.requestPermissions() call
-    // (still needs the class declaration because it is the maninfest file)
+    // (still needs the class declaration because it is the manifest file)
     writer.println("  public static class PermissionRequestActivity extends Activity {");
     if (permissions.length > 0) {
       writer.println("    ResultReceiver resultReceiver;");