remove permission related codes

Use another permission modules instead.
User is responsible for checking permissions prior to use this lib.

Author: zxcpoiu

android/src/main/java/com/zxcpoiu/incallmanager/InCallManagerModule.java

@@ -22,7 +22,6 @@
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.content.pm.PackageManager;
-import android.Manifest.permission;
 //import android.media.AudioAttributes; // --- for API 21+
 import android.media.AudioManager;
 import android.media.AudioDeviceInfo;
@@ -69,8 +68,6 @@
 public class InCallManagerModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
     private static final String REACT_NATIVE_MODULE_NAME = "InCallManager";
     private static final String TAG = REACT_NATIVE_MODULE_NAME;
-    private static SparseArray<Promise> mRequestPermissionCodePromises;
-    private static SparseArray<String> mRequestPermissionCodeTargetPermission;
     private String mPackageName = "com.zxcpoiu.incallmanager";
 
     // --- Screen Manager
@@ -112,8 +109,6 @@ public class InCallManagerModule extends ReactContextBaseJavaModule implements L
     private MyPlayerInterface mBusytone;
     private Handler mRingtoneCountDownHandler;
     private String media = "audio";
-    private static String recordPermission = "unknow";
-    private static String cameraPermission = "unknow";
 
     private static final String SPEAKERPHONE_AUTO = "auto";
     private static final String SPEAKERPHONE_TRUE = "true";
@@ -196,8 +191,6 @@ public InCallManagerModule(ReactApplicationContext reactContext) {
         audioUriMap.put("bundleRingtoneUri", bundleRingtoneUri);
         audioUriMap.put("bundleRingbackUri", bundleRingbackUri);
         audioUriMap.put("bundleBusytoneUri", bundleBusytoneUri);
-        mRequestPermissionCodePromises = new SparseArray<Promise>();
-        mRequestPermissionCodeTargetPermission = new SparseArray<String>();
         mOnFocusChangeListener = new OnFocusChangeListener();
         bluetoothManager = AppRTCBluetoothManager.create(reactContext, this);
         proximityManager = InCallProximityManager.create(reactContext, this);
@@ -1407,79 +1400,6 @@ public boolean isPlaying() {
     }
 // ===== Internal Classes End =====
 
-//  ===== Permission Start =====
-    @ReactMethod
-    public void checkRecordPermission(Promise promise) {
-        Log.d(TAG, "RNInCallManager.checkRecordPermission(): enter");
-        _checkRecordPermission();
-        if (recordPermission.equals("unknow")) {
-            Log.d(TAG, "RNInCallManager.checkRecordPermission(): failed");
-            promise.reject(new Exception("checkRecordPermission failed"));
-        } else {
-            promise.resolve(recordPermission);
-        }
-    }
-
-    @ReactMethod
-    public void checkCameraPermission(Promise promise) {
-        Log.d(TAG, "RNInCallManager.checkCameraPermission(): enter");
-        _checkCameraPermission();
-        if (cameraPermission.equals("unknow")) {
-            Log.d(TAG, "RNInCallManager.checkCameraPermission(): failed");
-            promise.reject(new Exception("checkCameraPermission failed"));
-        } else {
-            promise.resolve(cameraPermission);
-        }
-    }
-
-    private void _checkRecordPermission() {
-        recordPermission = _checkPermission(permission.RECORD_AUDIO);
-        Log.d(TAG, String.format("RNInCallManager.checkRecordPermission(): recordPermission=%s", recordPermission));
-    }
-
-    private void _checkCameraPermission() {
-        cameraPermission = _checkPermission(permission.CAMERA);
-        Log.d(TAG, String.format("RNInCallManager.checkCameraPermission(): cameraPermission=%s", cameraPermission));
-    }
-
-    private String _checkPermission(String targetPermission) {
-        try {
-            ReactContext reactContext = getReactApplicationContext();
-            if (ContextCompat.checkSelfPermission(reactContext, targetPermission) == PackageManager.PERMISSION_GRANTED) {
-                return "granted";
-            } else {
-                return "denied";
-            }
-        } catch (Exception e) {
-            Log.d(TAG, "_checkPermission() catch");
-            return "denied";
-        }
-    }
-
-    @ReactMethod
-    public void requestRecordPermission(Promise promise) {
-        Log.d(TAG, "RNInCallManager.requestRecordPermission(): enter");
-        _checkRecordPermission();
-        if (!recordPermission.equals("granted")) {
-            _requestPermission(permission.RECORD_AUDIO, promise);
-        } else {
-            // --- already granted
-            promise.resolve(recordPermission);
-        }
-    }
-
-    @ReactMethod
-    public void requestCameraPermission(Promise promise) {
-        Log.d(TAG, "RNInCallManager.requestCameraPermission(): enter");
-        _checkCameraPermission();
-        if (!cameraPermission.equals("granted")) {
-            _requestPermission(permission.CAMERA, promise);
-        } else {
-            // --- already granted
-            promise.resolve(cameraPermission);
-        }
-    }
-
     @ReactMethod
     public void chooseAudioRoute(String audioRoute, Promise promise) {
         Log.d(TAG, "RNInCallManager.chooseAudioRoute(): user choose audioDevice = " + audioRoute);
@@ -1496,33 +1416,6 @@ public void chooseAudioRoute(String audioRoute, Promise promise) {
         promise.resolve(getAudioDeviceStatusMap());
     }
 
-    private void _requestPermission(String targetPermission, Promise promise) {
-        Activity currentActivity = getCurrentActivity();
-        if (currentActivity == null) {
-            Log.d(TAG, String.format("RNInCallManager._requestPermission(): ReactContext doesn't hava any Activity attached when requesting %s", targetPermission));
-            promise.reject(new Exception("_requestPermission(): currentActivity is not attached"));
-            return;
-        }
-        int requestPermissionCode = getRandomInteger(1, 65535);
-        while (mRequestPermissionCodePromises.get(requestPermissionCode, null) != null) {
-            requestPermissionCode = getRandomInteger(1, 65535);
-        }
-        mRequestPermissionCodePromises.put(requestPermissionCode, promise);
-        mRequestPermissionCodeTargetPermission.put(requestPermissionCode, targetPermission);
-        /*
-        if (ActivityCompat.shouldShowRequestPermissionRationale(currentActivity, permission.RECORD_AUDIO)) {
-            showMessageOKCancel("You need to allow access to microphone for making call", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    ActivityCompat.requestPermissions(currentActivity, new String[] {permission.RECORD_AUDIO}, requestPermissionCode);
-                }
-            });
-            return;
-        }
-        */
-        ActivityCompat.requestPermissions(currentActivity, new String[] {targetPermission}, requestPermissionCode);
-    }
-
     private static int getRandomInteger(int min, int max) {
         if (min >= max) {
             throw new IllegalArgumentException("max must be greater than min");
@@ -1531,47 +1424,6 @@ private static int getRandomInteger(int min, int max) {
         return random.nextInt((max - min) + 1) + min;
     }
 
-    protected static void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        Log.d(TAG, "RNInCallManager.onRequestPermissionsResult(): enter");
-        Promise promise = mRequestPermissionCodePromises.get(requestCode, null);
-        String targetPermission = mRequestPermissionCodeTargetPermission.get(requestCode, null);
-        mRequestPermissionCodePromises.delete(requestCode);
-        mRequestPermissionCodeTargetPermission.delete(requestCode);
-        if (promise != null && targetPermission != null) {
-
-            Map<String, Integer> permissionResultMap = new HashMap<String, Integer>();
-
-            for (int i = 0; i < permissions.length; i++) {
-                permissionResultMap.put(permissions[i], grantResults[i]);
-            }
-
-            if (!permissionResultMap.containsKey(targetPermission)) {
-                Log.wtf(TAG, String.format("RNInCallManager.onRequestPermissionsResult(): requested permission %s but did not appear", targetPermission));
-                promise.reject(String.format("%s_PERMISSION_NOT_FOUND", targetPermission), String.format("requested permission %s but did not appear", targetPermission));
-                return;
-            }
-
-            String _requestPermissionResult = "unknow";
-            if (permissionResultMap.get(targetPermission) == PackageManager.PERMISSION_GRANTED) {
-                _requestPermissionResult = "granted";
-            } else {
-                _requestPermissionResult = "denied";
-            }
-
-            if (targetPermission.equals(permission.RECORD_AUDIO)) {
-                recordPermission = _requestPermissionResult;
-            } else if (targetPermission.equals(permission.CAMERA)) {
-                cameraPermission = _requestPermissionResult;
-            }
-            promise.resolve(_requestPermissionResult);
-        } else {
-            //super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-            Log.wtf(TAG, "RNInCallManager.onRequestPermissionsResult(): request code not found");
-            promise.reject("PERMISSION_REQUEST_CODE_NOT_FOUND", "request code not found");
-        }
-    }
-//  ===== Permission End =====
-
     private void pause() {
         if (audioManagerActivated) {
             Log.d(TAG, "pause audioRouteManager");

android/src/main/java/com/zxcpoiu/incallmanager/InCallManagerPackage.java

@@ -42,7 +42,4 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
         return Collections.emptyList();
     }
 
-    public static void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        InCallManagerModule.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
 }

index.js

@@ -8,19 +8,11 @@ import {
 class InCallManager {
     constructor() {
         this.vibrate = false;
-        this.recordPermission = 'unknow';
-        this.cameraPermission = 'unknow';
         this.audioUriMap = {
             ringtone: { _BUNDLE_: null, _DEFAULT_: null},
             ringback: { _BUNDLE_: null, _DEFAULT_: null},
             busytone: { _BUNDLE_: null, _DEFAULT_: null},
         };
-        this.checkRecordPermission = this.checkRecordPermission.bind(this);
-        this.requestRecordPermission = this.requestRecordPermission.bind(this);
-        this.checkCameraPermission = this.checkCameraPermission.bind(this);
-        this.requestCameraPermission = this.requestCameraPermission.bind(this);
-        this.checkRecordPermission();
-        this.checkCameraPermission();
     }
 
     start(setup) {
@@ -120,34 +112,6 @@ class InCallManager {
         _InCallManager.stopRingback();
     }
 
-    async checkRecordPermission() {
-        // --- on android which api < 23, it will always be "granted"
-        let result = await _InCallManager.checkRecordPermission();
-        this.recordPermission = result;
-        return result;
-    }
-
-    async requestRecordPermission() {
-        // --- on android which api < 23, it will always be "granted"
-        let result = await _InCallManager.requestRecordPermission();
-        this.recordPermission = result;
-        return result;
-    }
-
-    async checkCameraPermission() {
-        // --- on android which api < 23, it will always be "granted"
-        let result = await _InCallManager.checkCameraPermission();
-        this.cameraPermission = result;
-        return result;
-    }
-
-    async requestCameraPermission() {
-        // --- on android which api < 23, it will always be "granted"
-        let result = await _InCallManager.requestCameraPermission();
-        this.cameraPermission = result;
-        return result;
-    }
-
     pokeScreen(_timeout) {
         if (Platform.OS === 'android') {
             let timeout = (typeof _timeout === "number" && _timeout > 0) ? _timeout : 3000; // --- default 3000 ms

ios/RNInCallManager/RNInCallManager.m

@@ -56,8 +56,6 @@ @implementation RNInCallManager
     NSString *_origAudioMode;
     BOOL _audioSessionInitialized;
     int _forceSpeakerOn;
-    NSString *_recordPermission;
-    NSString *_cameraPermission;
     NSString *_media;
 }
 
@@ -106,8 +104,6 @@ - (instancetype)init
         _origAudioMode = nil;
         _audioSessionInitialized = NO;
         _forceSpeakerOn = 0;
-        _recordPermission = nil;
-        _cameraPermission = nil;
         _media = @"audio";
 
         NSLog(@"RNInCallManager.init(): initialized");
@@ -134,10 +130,6 @@ - (void)dealloc
     if (_audioSessionInitialized) {
         return;
     }
-    if (![_recordPermission isEqualToString:@"granted"]) {
-        NSLog(@"RNInCallManager.start(): recordPermission should be granted. state: %@", _recordPermission);
-        return;
-    }
     _media = mediaType;
 
     // --- auto is always true on ios
@@ -416,102 +408,6 @@ - (void)dealloc
     }
 }
 
-- (void)_checkRecordPermission
-{
-    NSString *recordPermission = @"unsupported";
-    switch ([_audioSession recordPermission]) {
-        case AVAudioSessionRecordPermissionGranted:
-            recordPermission = @"granted";
-            break;
-        case AVAudioSessionRecordPermissionDenied:
-            recordPermission = @"denied";
-            break;
-        case AVAudioSessionRecordPermissionUndetermined:
-            recordPermission = @"undetermined";
-            break;
-        default:
-            recordPermission = @"unknow";
-            break;
-    }
-    _recordPermission = recordPermission;
-    NSLog(@"RNInCallManager._checkRecordPermission(): recordPermission=%@", _recordPermission);
-}
-
-RCT_EXPORT_METHOD(checkRecordPermission:(RCTPromiseResolveBlock)resolve
-                                 reject:(RCTPromiseRejectBlock)reject)
-{
-    [self _checkRecordPermission];
-    if (_recordPermission != nil) {
-        resolve(_recordPermission);
-    } else {
-        reject(@"error_code", @"error message", RCTErrorWithMessage(@"checkRecordPermission is nil"));
-    }
-}
-
-RCT_EXPORT_METHOD(requestRecordPermission:(RCTPromiseResolveBlock)resolve
-                                   reject:(RCTPromiseRejectBlock)reject)
-{
-    NSLog(@"RNInCallManager.requestRecordPermission(): waiting for user confirmation...");
-    [_audioSession requestRecordPermission:^(BOOL granted) {
-        if (granted) {
-            self->_recordPermission = @"granted";
-        } else {
-            self->_recordPermission = @"denied";
-        }
-        NSLog(@"RNInCallManager.requestRecordPermission(): %@", self->_recordPermission);
-        resolve(self->_recordPermission);
-    }];
-}
-
-- (NSString *)_checkMediaPermission:(NSString *)targetMediaType
-{
-    switch ([AVCaptureDevice authorizationStatusForMediaType:targetMediaType]) {
-        case AVAuthorizationStatusAuthorized:
-            return @"granted";
-        case AVAuthorizationStatusDenied:
-            return @"denied";
-        case AVAuthorizationStatusNotDetermined:
-            return @"undetermined";
-        case AVAuthorizationStatusRestricted:
-            return @"restricted";
-        default:
-            return @"unknow";
-    }
-}
-
-- (void)_checkCameraPermission
-{
-    _cameraPermission = [self _checkMediaPermission:AVMediaTypeVideo];
-    NSLog(@"RNInCallManager._checkCameraPermission(): using iOS7 api. cameraPermission=%@", _cameraPermission);
-}
-
-RCT_EXPORT_METHOD(checkCameraPermission:(RCTPromiseResolveBlock)resolve
-                                 reject:(RCTPromiseRejectBlock)reject)
-{
-    [self _checkCameraPermission];
-    if (_cameraPermission != nil) {
-        resolve(_cameraPermission);
-    } else {
-        reject(@"error_code", @"error message", RCTErrorWithMessage(@"checkCameraPermission is nil"));
-    }
-}
-
-RCT_EXPORT_METHOD(requestCameraPermission:(RCTPromiseResolveBlock)resolve
-                                   reject:(RCTPromiseRejectBlock)reject)
-{
-    NSLog(@"RNInCallManager.requestCameraPermission(): waiting for user confirmation...");
-    [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo
-                             completionHandler:^(BOOL granted) {
-        if (granted) {
-            self->_cameraPermission = @"granted";
-        } else {
-            self->_cameraPermission = @"denied";
-        }
-        NSLog(@"RNInCallManager.requestCameraPermission(): %@", self->_cameraPermission);
-        resolve(self->_cameraPermission);
-    }];
-}
-
 RCT_EXPORT_METHOD(getAudioUriJS:(NSString *)audioType
                        fileType:(NSString *)fileType
                         resolve:(RCTPromiseResolveBlock)resolve