status-im
/
react-native-cameraroll
mirror of https://github.com/status-im/react-native-cameraroll.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Use DCIM folder when album is not provided on Android. (#185) 

fixes #141

Co-authored-by: Antonio Gallo <antgallo@amazon.com>
This commit is contained in:
Antonio Gallo 2020-05-26 12:16:54 +02:00 committed by GitHub
parent 4c448619d3
commit b5352cb8be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -62,11 +62,13 @@ The user's permission is required in order to access the Camera Roll on devices
If you are targeting devices running iOS 11 or later, you will also need to add the `NSPhotoLibraryAddUsageDescription` key in your `Info.plist`. Use this key to define a string that describes how your app will use this data. By adding this key to your `Info.plist`, you will be able to request write-only access permission from the user. If you try to save to the camera roll without this permission, your app will exit. If you are targeting devices running iOS 11 or later, you will also need to add the `NSPhotoLibraryAddUsageDescription` key in your `Info.plist`. Use this key to define a string that describes how your app will use this data. By adding this key to your `Info.plist`, you will be able to request write-only access permission from the user. If you try to save to the camera roll without this permission, your app will exit.
On Android permission is required to read the external storage. Add below line to your manifest to request this permission on app install. On Android permission is required to read the external storage. Add below line to your manifest to request this permission on app install.
On Android permission is required to write in the external storage when saving to camera roll. Add below line to your manifest to request this permission on app install.
``` ```
<manifest> <manifest>
... ...
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
... ...
<application> <application>
``` ```
@ -98,7 +100,8 @@ On iOS, the tag can be any image URI (including local, remote asset-library and
If the tag has a file extension of .mov or .mp4, it will be inferred as a video. Otherwise it will be treated as a photo. To override the automatic choice, you can pass an optional `type` parameter that must be one of 'photo' or 'video'. If the tag has a file extension of .mov or .mp4, it will be inferred as a video. Otherwise it will be treated as a photo. To override the automatic choice, you can pass an optional `type` parameter that must be one of 'photo' or 'video'.
It allows to specify a particular album you want to store the asset to. It allows to specify a particular album you want to store the asset to when the param `album` is provided.
On Android, if no album is provided, DCIM directory is used, otherwise PICTURE or MOVIES directory is used depending on the `type` provided.
Returns a Promise which will resolve with the new URI. Returns a Promise which will resolve with the new URI.

20
android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
View File

@ -129,16 +129,22 @@ public class CameraRollModule extends ReactContextBaseJavaModule {
File source = new File(mUri.getPath()); File source = new File(mUri.getPath());
FileChannel input = null, output = null; FileChannel input = null, output = null;
try { try {
File environment; boolean isAlbumPresent = !"".equals(mOptions.getString("album"));
if ("mov".equals(mOptions.getString("type"))) {
environment = Environment.getExternalStoragePublicDirectory( final File environment;
Environment.DIRECTORY_MOVIES); // Media is not saved into an album when using Environment.DIRECTORY_DCIM.
if (isAlbumPresent) {
if ("video".equals(mOptions.getString("type"))) {
environment = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES);
} else {
environment = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
}
} else { } else {
environment = Environment.getExternalStoragePublicDirectory( environment = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
Environment.DIRECTORY_PICTURES);
} }
File exportDir; File exportDir;
if (!"".equals(mOptions.getString("album"))) { if (isAlbumPresent) {
exportDir = new File(environment, mOptions.getString("album")); exportDir = new File(environment, mOptions.getString("album"));
if (!exportDir.exists() && !exportDir.mkdirs()) { if (!exportDir.exists() && !exportDir.mkdirs()) {
mPromise.reject(ERROR_UNABLE_TO_LOAD, "Album Directory not created. Did you request WRITE_EXTERNAL_STORAGE?"); mPromise.reject(ERROR_UNABLE_TO_LOAD, "Album Directory not created. Did you request WRITE_EXTERNAL_STORAGE?");