Skip to content
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

Jump to bottom

Improve android code #2215

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improve android code #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcdc6b1
feat: android: explain better the no permission error
GiovanniVisentiniCasavo Sep 16, 2023
31f1d72
refactor: remove always true if
GiovanniVisentiniCasavo Sep 16, 2023
b267e20
refactor: simplify if
GiovanniVisentiniCasavo Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 5 additions & 10 deletions android/src/main/java/com/imagepicker/ImagePickerModuleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.module.annotations.ReactModule;

import java.io.File;
import java.util.Collections;
Expand Down Expand Up @@ -65,8 +62,8 @@ public void launchCamera(final ReadableMap options, final Callback callback) {
this.callback = callback;
this.options = new Options(options);

if (this.options.saveToPhotos && Build.VERSION.SDK_INT <= Build.VERSION_CODES.P && !hasPermission(currentActivity)) {
callback.invoke(getErrorMap(errPermission, null));
if (this.options.saveToPhotos && Build.VERSION.SDK_INT <= Build.VERSION_CODES.P && !hasWriteExternalStoragePermission(currentActivity)) {
callback.invoke(getErrorMap(errPermission, archivePermissionDescription));
return;
}

Expand Down Expand Up @@ -140,11 +137,9 @@ public void launchImageLibrary(final ReadableMap options, final Callback callbac
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
libraryIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
} else {
if (selectionLimit != 1) {
int maxNum = selectionLimit;
if (selectionLimit == 0) maxNum = MediaStore.getPickImagesMaxLimit();
libraryIntent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, maxNum);
}
int maxNum = selectionLimit;
if (selectionLimit == 0) maxNum = MediaStore.getPickImagesMaxLimit();
libraryIntent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, maxNum);
}
}

Expand Down
14 changes: 5 additions & 9 deletions android/src/main/java/com/imagepicker/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class Utils {
public static String mediaTypeVideo = "video";

public static String cameraPermissionDescription = "This library does not require Manifest.permission.CAMERA, if you add this permission in manifest then you have to obtain the same.";
public static String archivePermissionDescription = "To save an image in the photo library the write permission is need";

public static File createFile(Context reactContext, String fileType) {
try {
Expand Down Expand Up @@ -138,8 +139,7 @@ public static Uri getAppSpecificStorageUri(Uri sharedStorageUri, Context context
}

public static boolean isCameraAvailable(Context reactContext) {
return reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)
|| reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
return reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
}

// Opening front camera is not officially supported in android, the below hack is obtained from various online sources
Expand All @@ -166,7 +166,7 @@ public static int[] getImageDimensions(Uri uri, Context reactContext) {
}
}

static boolean hasPermission(final Activity activity) {
static boolean hasWriteExternalStoragePermission(final Activity activity) {
final int writePermission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
return writePermission == PackageManager.PERMISSION_GRANTED ? true : false;
}
Expand Down Expand Up @@ -338,12 +338,8 @@ public static boolean isCameraPermissionFulfilled(Context context, Activity acti
return true;
}

if (Arrays.asList(declaredPermissions).contains(Manifest.permission.CAMERA)
&& ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
return false;
}

return true;
return !Arrays.asList(declaredPermissions).contains(Manifest.permission.CAMERA)
|| ActivityCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;

} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
Expand Down