这是indexloc提供的服务，不要输入任何密码
Skip to content

android: use PermissionListener to avoid Android manual steps #243

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
May 19, 2019
Merged

android: use PermissionListener to avoid Android manual steps #243

Show file tree
Hide file tree
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
21 changes: 15 additions & 6 deletions android/src/main/java/com/calendarevents/CalendarEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import android.database.DatabaseUtils;
import android.net.Uri;
import android.provider.CalendarContract;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.database.Cursor;
import android.accounts.Account;
Expand All @@ -30,6 +29,8 @@
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.bridge.Dynamic;
import com.facebook.react.modules.core.PermissionAwareActivity;
import com.facebook.react.modules.core.PermissionListener;

import java.sql.Array;
import java.text.ParseException;
Expand All @@ -41,7 +42,7 @@
import java.util.TimeZone;
import android.util.Log;

public class CalendarEvents extends ReactContextBaseJavaModule {
public class CalendarEvents extends ReactContextBaseJavaModule implements PermissionListener {

private static int PERMISSION_REQUEST_CODE = 37;
private final ReactContext reactContext;
Expand All @@ -66,15 +67,21 @@ private void requestCalendarReadWritePermission(final Promise promise)
promise.reject("E_ACTIVITY_DOES_NOT_EXIST", "Activity doesn't exist");
return;
}
if (!(currentActivity instanceof PermissionAwareActivity)) {
promise.reject("E_ACTIVITY_NOT_PERMISSION_AWARE", "Activity does not implement the PermissionAwareActivity interface");
return;
}
PermissionAwareActivity activity = (PermissionAwareActivity)currentActivity;
PERMISSION_REQUEST_CODE++;
permissionsPromises.put(PERMISSION_REQUEST_CODE, promise);
ActivityCompat.requestPermissions(currentActivity, new String[]{
activity.requestPermissions(new String[]{
Manifest.permission.WRITE_CALENDAR,
Manifest.permission.READ_CALENDAR
}, PERMISSION_REQUEST_CODE);
}, PERMISSION_REQUEST_CODE, this);
}

public static void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
@Override
public boolean onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
if (permissionsPromises.containsKey(requestCode)) {

// If request is cancelled, the result arrays are empty.
Expand All @@ -89,6 +96,8 @@ public static void onRequestPermissionsResult(int requestCode, String permission
}
permissionsPromises.remove(requestCode);
}

return permissionsPromises.size() == 0;
}

private boolean haveCalendarReadWritePermissions() {
Expand Down Expand Up @@ -1324,4 +1333,4 @@ public void uriForCalendar(Promise promise) {
promise.resolve(CalendarContract.Events.CONTENT_URI.toString());
}
//endregion
}
}
4 changes: 0 additions & 4 deletions android/src/main/java/com/calendarevents/CalendarEventsPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,4 @@ public List<NativeModule> createNativeModules(

return modules;
}

public static void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
CalendarEvents.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
}