haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Android] Fix crash if settings activity cannot be opened 

The documentation states this is possible, so make sure we handle such errors.

Ref:
https://developer.android.com/reference/android/provider/Settings.html#ACTION_APPLICATION_DETAILS_SETTINGS
This commit is contained in:
Saúl Ibarra Corretgé 2018-01-09 14:49:43 +01:00 committed by Paweł Domas
parent a3cb081609
commit 292f3ab1bd
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/sdk/src/main/java/org/jitsi/meet/sdk/AndroidSettingsModule.java
View File

@ -5,11 +5,13 @@
package org.jitsi.meet.sdk;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Settings;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
@ -25,7 +27,7 @@ class AndroidSettingsModule extends ReactContextBaseJavaModule {
}
@ReactMethod
public void open() {
public void open(Promise promise) {
Context context = getReactApplicationContext();
Intent intent = new Intent();
@ -34,6 +36,15 @@ class AndroidSettingsModule extends ReactContextBaseJavaModule {
intent.setData(
Uri.fromParts("package", context.getPackageName(), null));
context.startActivity(intent);
try {
context.startActivity(intent);
} catch (ActivityNotFoundException e) {
// Some devices may give an error here.
// https://developer.android.com/reference/android/provider/Settings.html#ACTION_APPLICATION_DETAILS_SETTINGS
promise.reject(e);
return;
}
promise.resolve(null);
}
}

10
react/features/mobile/permissions/middleware.js
View File

@ -80,7 +80,15 @@ function _alertPermissionErrorWithSettings(trackType) {
function _openSettings() {
switch (Platform.OS) {
case 'android':
NativeModules.AndroidSettings.open();
NativeModules.AndroidSettings.open().catch(() => {
Alert.alert(
'Error opening settings',
'Please open settings and grant the required permissions',
[
{ text: 'OK' }
]
);
});
break;
case 'ios':