From 0662dd50157c7b83ba7d9f945a08d66f3d122a0e Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 1 Jan 2018 20:43:12 +1000 Subject: [PATCH] Use stored fragment for requesting permissions --- .../fr/free/nrw/commons/nearby/DirectUpload.java | 16 +++++++--------- .../nrw/commons/nearby/NearbyMapFragment.java | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java index 7d835fd31..71f9e839e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java @@ -48,23 +48,21 @@ class DirectUpload { Timber.d("After shared prefs, image title: " + imageTitle + " Image desc: " + imageDesc); } - void initiateGalleryUpload(Context context) { - Activity activity = (Activity) context; - + void initiateGalleryUpload() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (ContextCompat.checkSelfPermission(activity, READ_EXTERNAL_STORAGE) != PERMISSION_GRANTED) { - if (activity.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) { - new AlertDialog.Builder(activity) - .setMessage(activity.getString(R.string.read_storage_permission_rationale)) + if (ContextCompat.checkSelfPermission(fragment.getActivity(), READ_EXTERNAL_STORAGE) != PERMISSION_GRANTED) { + if (fragment.getActivity().shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) { + new AlertDialog.Builder(fragment.getActivity()) + .setMessage(fragment.getActivity().getString(R.string.read_storage_permission_rationale)) .setPositiveButton("OK", (dialog, which) -> { - activity.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1); + fragment.getActivity().requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1); dialog.dismiss(); }) .setNegativeButton("Cancel", null) .create() .show(); } else { - activity.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, + fragment.getActivity().requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1); } } else { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index 0e5e16603..4910cbabb 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -406,7 +406,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { Timber.d("Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this); - directUpload.storeSharedPrefs(getActivity()); + directUpload.storeSharedPrefs(); directUpload.initiateGalleryUpload(getActivity()); }); }