Skip to content

[Android] fix app crash after permissions dialog closed #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2020
+74 −2
Merged

[Android] fix app crash after permissions dialog closed #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 74 additions & 2 deletions android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java
View file
Original file line number Diff line number Diff line change
@@ -55,9 +55,11 @@
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.HeadlessJsTaskService;
import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
import com.facebook.react.modules.permissions.PermissionsModule;

import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -253,13 +255,83 @@ public void checkPhoneAccountPermission(ReadableArray optionalPermissions, Promi
optionalPermsArr[i] = optionalPermissions.getString(i);
}

String[] allPermissions = Arrays.copyOf(permissions, permissions.length + optionalPermsArr.length);
final String[] allPermissions = Arrays.copyOf(permissions, permissions.length + optionalPermsArr.length);
System.arraycopy(optionalPermsArr, 0, allPermissions, permissions.length, optionalPermsArr.length);

hasPhoneAccountPromise = promise;

if (!this.hasPermissions()) {
requestPermissions(currentActivity, allPermissions, REQUEST_READ_PHONE_STATE);
WritableArray allPermissionaw = Arguments.createArray();
for (String allPermission : allPermissions) {
allPermissionaw.pushString(allPermission);
}

getReactApplicationContext()
.getNativeModule(PermissionsModule.class)
.requestMultiplePermissions(allPermissionaw, new Promise() {
@Override
public void resolve(@Nullable Object value) {
WritableMap grantedPermission = (WritableMap) value;
int[] grantedResult = new int[allPermissions.length];
for (int i=0; i<allPermissions.length; ++i) {
String perm = allPermissions[i];
grantedResult[i] = grantedPermission.getString(perm).equals("granted")
? PackageManager.PERMISSION_GRANTED
: PackageManager.PERMISSION_DENIED;
}
RNCallKeepModule.onRequestPermissionsResult(REQUEST_READ_PHONE_STATE, allPermissions, grantedResult);
}

@Override
public void reject(String code, String message) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, Throwable throwable) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, String message, Throwable throwable) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(Throwable throwable) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(Throwable throwable, WritableMap userInfo) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, @NonNull WritableMap userInfo) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, Throwable throwable, WritableMap userInfo) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, String message, @NonNull WritableMap userInfo) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String code, String message, Throwable throwable, WritableMap userInfo) {
hasPhoneAccountPromise.resolve(false);
}

@Override
public void reject(String message) {
hasPhoneAccountPromise.resolve(false);
}
});
return;
}