3.4.0 beta (supports Ask next time, Only this time, etc) (#696)

* Bump dependencies

* Remove SharedPreferences usage

* Update permission app

* Use Snackbar in example App

* Set beta.1

* Remove shouldShowRequestPermissionRationale pre-check

* Update Android flow chart

* Update README.md

* Update dependencies

* Improve example app look

Author: zoontek

README.md

@@ -190,6 +190,7 @@ Add all wanted permissions to your app `android/app/src/main/AndroidManifest.xml
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
   <uses-permission android:name="android.permission.SEND_SMS" />
   <uses-permission android:name="android.permission.USE_SIP" />
+  <uses-permission android:name="android.permission.UWB_RANGING" />
   <uses-permission android:name="android.permission.WRITE_CALENDAR" />
   <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
   <uses-permission android:name="android.permission.WRITE_CONTACTS" />
@@ -354,32 +355,32 @@ As permissions are not handled in the same way on iOS and Android, this library
                 ╚═════╝                 │ RESULTS.UNAVAILABLE │
                    │                    └─────────────────────┘
            Is the permission
-             requestable ?
-                   │           ╔════╗
-                   ├───────────║ NO ║──────────────┐
-                   │           ╚════╝              │
-                ╔═════╗                            ▼
-                ║ YES ║                  ┌───────────────────┐
-                ╚═════╝                  │ RESULTS.BLOCKED / │
-                   │                     │  RESULTS.GRANTED  │
-                   ▼                     └───────────────────┘
+           already granted ?
+                   │           ╔═════╗
+                   ├───────────║ YES ║─────────────┐
+                   │           ╚═════╝             │
+                ╔════╗                             ▼
+                ║ NO ║                   ┌───────────────────┐
+                ╚════╝                   │  RESULTS.GRANTED  │
+                   │                     └───────────────────┘
+                   ▼
           ┌────────────────┐
           │ RESULTS.DENIED │◀──────────────────────┐
           └────────────────┘                       │
                    │                               │
                    ▼                               │
-┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓         ╔════╗
-┃ request(PERMISSIONS.ANDROID.CAMERA) ┃         ║ NO ║
-┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛         ╚════╝
+┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓         ╔═════╗
+┃ request(PERMISSIONS.ANDROID.CAMERA) ┃         ║ YES ║
+┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛         ╚═════╝
                    │                               │
          Does the user accept                      │
             the request ?                          │
-                   │           ╔════╗     Does the user check
-                   ├───────────║ NO ║─────"Never ask again" ?
+                   │           ╔════╗      Is the permission
+                   ├───────────║ NO ║──── still requestable ?
                    │           ╚════╝              │
-                ╔═════╗                         ╔═════╗
-                ║ YES ║                         ║ YES ║
-                ╚═════╝                         ╚═════╝
+                ╔═════╗                         ╔════╗
+                ║ YES ║                         ║ NO ║
+                ╚═════╝                         ╚════╝
                    │                               │
                    ▼                               ▼
           ┌─────────────────┐             ┌─────────────────┐
@@ -476,6 +477,7 @@ PERMISSIONS.ANDROID.RECEIVE_WAP_PUSH;
 PERMISSIONS.ANDROID.RECORD_AUDIO;
 PERMISSIONS.ANDROID.SEND_SMS;
 PERMISSIONS.ANDROID.USE_SIP;
+PERMISSIONS.ANDROID.UWB_RANGING;
 PERMISSIONS.ANDROID.WRITE_CALENDAR;
 PERMISSIONS.ANDROID.WRITE_CALL_LOG;
 PERMISSIONS.ANDROID.WRITE_CONTACTS;

android/src/main/java/com/zoontek/rnpermissions/RNPermissionsModule.java

@@ -1,11 +1,9 @@
 package com.zoontek.rnpermissions;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
@@ -36,10 +34,8 @@ public class RNPermissionsModule extends ReactContextBaseJavaModule implements P
 
   private static final String ERROR_INVALID_ACTIVITY = "E_INVALID_ACTIVITY";
   public static final String MODULE_NAME = "RNPermissions";
-  private static final String SETTING_NAME = "@RNPermissions:NonRequestables";
 
-  private final SharedPreferences mSharedPrefs;
-  private final SparseArray<Request> mRequests;
+  private final SparseArray<Callback> mCallbacks;
   private int mRequestCode = 0;
   private final String GRANTED = "granted";
   private final String DENIED = "denied";
@@ -48,26 +44,14 @@ public class RNPermissionsModule extends ReactContextBaseJavaModule implements P
 
   public RNPermissionsModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    mSharedPrefs = reactContext.getSharedPreferences(SETTING_NAME, Context.MODE_PRIVATE);
-    mRequests = new SparseArray<Request>();
+    mCallbacks = new SparseArray<Callback>();
   }
 
   @Override
   public String getName() {
     return MODULE_NAME;
   }
 
-  private class Request {
-
-    public boolean[] rationaleStatuses;
-    public Callback callback;
-
-    public Request(boolean[] rationaleStatuses, Callback callback) {
-      this.rationaleStatuses = rationaleStatuses;
-      this.callback = callback;
-    }
-  }
-
   private @Nullable String getFieldName(final String permission) {
     if (permission.equals("android.permission.ACCEPT_HANDOVER"))
       return "ACCEPT_HANDOVER";
@@ -79,10 +63,10 @@ public Request(boolean[] rationaleStatuses, Callback callback) {
       return "ACCESS_FINE_LOCATION";
     if (permission.equals("android.permission.ACCESS_MEDIA_LOCATION"))
       return "ACCESS_MEDIA_LOCATION";
-    if (permission.equals("com.android.voicemail.permission.ADD_VOICEMAIL"))
-      return "ADD_VOICEMAIL";
     if (permission.equals("android.permission.ACTIVITY_RECOGNITION"))
       return "ACTIVITY_RECOGNITION";
+    if (permission.equals("com.android.voicemail.permission.ADD_VOICEMAIL"))
+      return "ADD_VOICEMAIL";
     if (permission.equals("android.permission.ANSWER_PHONE_CALLS"))
       return "ANSWER_PHONE_CALLS";
     if (permission.equals("android.permission.BLUETOOTH_ADVERTISE"))
@@ -127,6 +111,8 @@ public Request(boolean[] rationaleStatuses, Callback callback) {
       return "SEND_SMS";
     if (permission.equals("android.permission.USE_SIP"))
       return "USE_SIP";
+    if (permission.equals("android.permission.UWB_RANGING"))
+      return "UWB_RANGING";
     if (permission.equals("android.permission.WRITE_CALENDAR"))
       return "WRITE_CALENDAR";
     if (permission.equals("android.permission.WRITE_CALL_LOG"))
@@ -157,16 +143,13 @@ private boolean permissionExists(final String permission) {
   public void checkNotifications(final Promise promise) {
     final boolean enabled = NotificationManagerCompat
       .from(getReactApplicationContext()).areNotificationsEnabled();
+
     final WritableMap output = Arguments.createMap();
     final WritableMap settings = Arguments.createMap();
 
-    if (enabled) {
-      output.putString("status", "granted");
-    } else {
-      output.putString("status", "blocked");
-    }
-
+    output.putString("status", enabled ? GRANTED : BLOCKED);
     output.putMap("settings", settings);
+
     promise.resolve(output);
   }
 
@@ -207,8 +190,6 @@ public void checkPermission(final String permission, final Promise promise) {
 
     if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
       promise.resolve(GRANTED);
-    } else if (mSharedPrefs.getBoolean(permission, false)) {
-      promise.resolve(BLOCKED);
     } else {
       promise.resolve(DENIED);
     }
@@ -248,20 +229,14 @@ public void requestPermission(final String permission, final Promise promise) {
     if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
       promise.resolve(GRANTED);
       return;
-    } else if (mSharedPrefs.getBoolean(permission, false)) {
-      promise.resolve(BLOCKED); // not supporting reset the permission with "Ask me every time"
-      return;
     }
 
     try {
       PermissionAwareActivity activity = getPermissionAwareActivity();
-      boolean[] rationaleStatuses = new boolean[1];
-      rationaleStatuses[0] = activity.shouldShowRequestPermissionRationale(permission);
 
-      mRequests.put(mRequestCode, new Request(
-        rationaleStatuses,
+      mCallbacks.put(
+        mRequestCode,
         new Callback() {
-          @SuppressLint("ApplySharedPref")
           @Override
           public void invoke(Object... args) {
             int[] results = (int[]) args[0];
@@ -270,18 +245,15 @@ public void invoke(Object... args) {
               promise.resolve(GRANTED);
             } else {
               PermissionAwareActivity activity = (PermissionAwareActivity) args[1];
-              boolean[] rationaleStatuses = (boolean[]) args[2];
 
-              if (rationaleStatuses[0] &&
-                !activity.shouldShowRequestPermissionRationale(permission)) {
-                mSharedPrefs.edit().putBoolean(permission, true).commit(); // enforce sync
-                promise.resolve(BLOCKED);
-              } else {
+              if (activity.shouldShowRequestPermissionRationale(permission)) {
                 promise.resolve(DENIED);
+              } else {
+                promise.resolve(BLOCKED);
               }
             }
           }
-        }));
+        });
 
       activity.requestPermissions(new String[] {permission}, mRequestCode, this);
       mRequestCode++;
@@ -309,8 +281,6 @@ public void checkMultiplePermissions(final ReadableArray permissions, final Prom
             : BLOCKED);
       } else if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
         output.putString(permission, GRANTED);
-      } else if (mSharedPrefs.getBoolean(permission, false)) {
-        output.putString(permission, BLOCKED); // not supporting reset the permission with "Ask me every time"
       } else {
         output.putString(permission, DENIED);
       }
@@ -345,9 +315,6 @@ public void requestMultiplePermissions(final ReadableArray permissions, final Pr
       } else if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
         output.putString(permission, GRANTED);
         checkedPermissionsCount++;
-      } else if (mSharedPrefs.getBoolean(permission, false)) {
-        output.putString(permission, BLOCKED); // not supporting reset the permission with "Ask me every time"
-        checkedPermissionsCount++;
       } else {
         permissionsToCheck.add(permission);
       }
@@ -360,42 +327,32 @@ public void requestMultiplePermissions(final ReadableArray permissions, final Pr
 
     try {
       PermissionAwareActivity activity = getPermissionAwareActivity();
-      boolean[] rationaleStatuses = new boolean[permissionsToCheck.size()];
 
-      for (int i = 0; i < permissionsToCheck.size(); i++) {
-        rationaleStatuses[i] = activity
-          .shouldShowRequestPermissionRationale(permissionsToCheck.get(i));
-      }
-
-      mRequests.put(mRequestCode, new Request(
-        rationaleStatuses,
+      mCallbacks.put(
+        mRequestCode,
         new Callback() {
-          @SuppressLint("ApplySharedPref")
           @Override
           public void invoke(Object... args) {
             int[] results = (int[]) args[0];
             PermissionAwareActivity activity = (PermissionAwareActivity) args[1];
-            boolean[] rationaleStatuses = (boolean[]) args[2];
 
             for (int j = 0; j < permissionsToCheck.size(); j++) {
               String permission = permissionsToCheck.get(j);
 
               if (results.length > 0 && results[j] == PackageManager.PERMISSION_GRANTED) {
                 output.putString(permission, GRANTED);
               } else {
-                if (rationaleStatuses[j] &&
-                  !activity.shouldShowRequestPermissionRationale(permission)) {
-                  mSharedPrefs.edit().putBoolean(permission, true).commit(); // enforce sync
-                  output.putString(permission, BLOCKED);
-                } else {
+                if (activity.shouldShowRequestPermissionRationale(permission)) {
                   output.putString(permission, DENIED);
+                } else {
+                  output.putString(permission, BLOCKED);
                 }
               }
             }
 
             promise.resolve(output);
           }
-        }));
+        });
 
       activity.requestPermissions(permissionsToCheck.toArray(new String[0]), mRequestCode, this);
       mRequestCode++;
@@ -406,10 +363,9 @@ public void invoke(Object... args) {
 
   @Override
   public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-    Request request = mRequests.get(requestCode);
-    request.callback.invoke(grantResults, getPermissionAwareActivity(), request.rationaleStatuses);
-    mRequests.remove(requestCode);
-    return mRequests.size() == 0;
+    mCallbacks.get(requestCode).invoke(grantResults, getPermissionAwareActivity());
+    mCallbacks.remove(requestCode);
+    return mCallbacks.size() == 0;
   }
 
   private PermissionAwareActivity getPermissionAwareActivity() {