add onRequestPermissionsResult() only if SDK >= 23, fix #268

processing · Dec 30, 2016 · 774453f · 774453f
1 parent 40a762e
commit 774453f
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -978,30 +978,32 @@ private void writeMainActivity(final File srcDirectory, String[] permissions) {
     writer.println("        }");
     writer.println("    }");    
 
-    // The event handler for the permission result
-    writer.println("    @Override");
-    writer.println("    public void onRequestPermissionsResult(int requestCode,");
-    writer.println("                                           String permissions[], int[] grantResults) {");      
-    writer.println("      if (requestCode == REQUEST_PERMISSIONS) {");      
-    writer.println("        if (grantResults.length > 0) {");
-    writer.println("          for (int i = 0; i < grantResults.length; i++) {");
-    writer.println("            if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {");
-    writer.println("              AlertDialog.Builder builder = new AlertDialog.Builder(this);");
-    writer.println("              builder.setMessage(\"Some permissions needed by the app were not granted, so it might not work as intended.\")");
-    writer.println("                     .setCancelable(false)");
-    writer.println("                     .setPositiveButton(\"OK\", new DialogInterface.OnClickListener() {");
-    writer.println("                          public void onClick(DialogInterface dialog, int id) {");
-//    writer.println("                              finish();");    
-    writer.println("                          }");
-    writer.println("                     });");
-    writer.println("              AlertDialog alert = builder.create();");
-    writer.println("              alert.show();");
-    writer.println("            }");
-    writer.println("          }");
-    writer.println("          fragment.onPermissionsGranted();");
-    writer.println("        }");
-    writer.println("      }");    
-    writer.println("    }");
+    if (Integer.parseInt(sdkVersion) >= 23) {
+      // The event handler for the permission result
+      writer.println("    @Override");
+      writer.println("    public void onRequestPermissionsResult(int requestCode,");
+      writer.println("                                           String permissions[], int[] grantResults) {");      
+      writer.println("      if (requestCode == REQUEST_PERMISSIONS) {");      
+      writer.println("        if (grantResults.length > 0) {");
+      writer.println("          for (int i = 0; i < grantResults.length; i++) {");
+      writer.println("            if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {");
+      writer.println("              AlertDialog.Builder builder = new AlertDialog.Builder(this);");
+      writer.println("              builder.setMessage(\"Some permissions needed by the app were not granted, so it might not work as intended.\")");
+      writer.println("                     .setCancelable(false)");
+      writer.println("                     .setPositiveButton(\"OK\", new DialogInterface.OnClickListener() {");
+      writer.println("                          public void onClick(DialogInterface dialog, int id) {");
+//      writer.println("                              finish();");    
+      writer.println("                          }");
+      writer.println("                     });");
+      writer.println("              AlertDialog alert = builder.create();");
+      writer.println("              alert.show();");
+      writer.println("            }");
+      writer.println("          }");
+      writer.println("          fragment.onPermissionsGranted();");
+      writer.println("        }");
+      writer.println("      }");    
+      writer.println("    }");    
+    }
 
     writer.println("}");
     writer.flush();