Browse Source

Media picker will require Read storage permission

renovate/org.robolectric-robolectric-4.x
Ammar Githam 4 years ago
parent
commit
6005e91d8a
  1. 2
      app/src/main/AndroidManifest.xml
  2. 15
      app/src/main/java/awais/instagrabber/dialogs/MediaPickerBottomDialogFragment.java
  3. 8
      app/src/main/java/awais/instagrabber/utils/MediaController.java
  4. 19
      app/src/main/java/awais/instagrabber/utils/PermissionUtils.java

2
app/src/main/AndroidManifest.xml

@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<!--<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />-->

15
app/src/main/java/awais/instagrabber/dialogs/MediaPickerBottomDialogFragment.java

@ -26,6 +26,7 @@ import awais.instagrabber.R;
import awais.instagrabber.adapters.MediaItemsAdapter;
import awais.instagrabber.databinding.LayoutMediaPickerBinding;
import awais.instagrabber.utils.MediaController;
import awais.instagrabber.utils.PermissionUtils;
import awais.instagrabber.utils.TextUtils;
import awais.instagrabber.viewmodels.MediaPickerViewModel;
@ -120,10 +121,10 @@ public class MediaPickerBottomDialogFragment extends BottomSheetDialogFragment {
if (requestCode == ATTACH_MEDIA_REQUEST_CODE) {
final Context context = getContext();
if (context == null) return;
// final boolean hasAttachMediaPerms = PermissionUtils.hasAttachMediaPerms(context);
// if (hasAttachMediaPerms) {
final boolean hasAttachMediaPerms = PermissionUtils.hasAttachMediaPerms(context);
if (hasAttachMediaPerms) {
viewModel.loadMedia(context);
// }
}
}
}
@ -132,10 +133,10 @@ public class MediaPickerBottomDialogFragment extends BottomSheetDialogFragment {
setupAlbumPicker();
final Context context = getContext();
if (context == null) return;
// if (!PermissionUtils.hasAttachMediaPerms(context)) {
// PermissionUtils.requestAttachMediaPerms(this, ATTACH_MEDIA_REQUEST_CODE);
// return;
// }
if (!PermissionUtils.hasAttachMediaPerms(context)) {
PermissionUtils.requestAttachMediaPerms(this, ATTACH_MEDIA_REQUEST_CODE);
return;
}
viewModel.loadMedia(context);
}

8
app/src/main/java/awais/instagrabber/utils/MediaController.java

@ -87,7 +87,7 @@ public class MediaController {
Cursor cursor = null;
try {
// if (PermissionUtils.hasAttachMediaPerms(context)) {
if (PermissionUtils.hasAttachMediaPerms(context)) {
cursor = MediaStore.Images.Media.query(context.getContentResolver(),
MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
PROJECTION_PHOTOS,
@ -163,7 +163,7 @@ public class MediaController {
albumEntry.addPhoto(mediaEntry);
}
}
// }
}
} catch (Throwable e) {
Log.e(TAG, "loadGalleryAlbums: ", e);
} finally {
@ -177,7 +177,7 @@ public class MediaController {
}
try {
// if (PermissionUtils.hasAttachMediaPerms(context)) {
if (PermissionUtils.hasAttachMediaPerms(context)) {
cursor = MediaStore.Images.Media.query(context.getContentResolver(),
MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
PROJECTION_VIDEO,
@ -249,7 +249,7 @@ public class MediaController {
albumEntry.addPhoto(mediaEntry);
}
}
// }
}
} catch (Throwable e) {
Log.e(TAG, "loadGalleryAlbums: ", e);
} finally {

19
app/src/main/java/awais/instagrabber/utils/PermissionUtils.java

@ -11,31 +11,30 @@ import androidx.core.content.PermissionChecker;
import androidx.fragment.app.Fragment;
import static android.Manifest.permission.CAMERA;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.RECORD_AUDIO;
import static androidx.core.content.PermissionChecker.checkSelfPermission;
public class PermissionUtils {
public static final String[] AUDIO_RECORD_PERMS = new String[]{RECORD_AUDIO};
// public static final String[] ATTACH_MEDIA_PERMS = new String[]{READ_EXTERNAL_STORAGE};
public static final String[] ATTACH_MEDIA_PERMS = new String[]{READ_EXTERNAL_STORAGE};
public static final String[] CAMERA_PERMS = new String[]{CAMERA};
public static boolean hasAudioRecordPerms(@NonNull final Context context) {
return // checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_GRANTED
// &&
checkSelfPermission(context, RECORD_AUDIO) == PermissionChecker.PERMISSION_GRANTED;
return checkSelfPermission(context, RECORD_AUDIO) == PermissionChecker.PERMISSION_GRANTED;
}
public static void requestAudioRecordPerms(final Fragment fragment, final int requestCode) {
fragment.requestPermissions(AUDIO_RECORD_PERMS, requestCode);
}
// public static boolean hasAttachMediaPerms(@NonNull final Context context) {
// return checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_GRANTED;
// }
public static boolean hasAttachMediaPerms(@NonNull final Context context) {
return checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_GRANTED;
}
// public static void requestAttachMediaPerms(final Fragment fragment, final int requestCode) {
// fragment.requestPermissions(ATTACH_MEDIA_PERMS, requestCode);
// }
public static void requestAttachMediaPerms(final Fragment fragment, final int requestCode) {
fragment.requestPermissions(ATTACH_MEDIA_PERMS, requestCode);
}
public static boolean hasCameraPerms(final Context context) {
return ContextCompat.checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;

Loading…
Cancel
Save