Skip to content

Android 13 support #2

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

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

Android 13 support #2

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
815a296
Update plugin.xml
BrutalBunny Sep 23, 2023
8fcbe6e
Update FilePickerPlugin.java
BrutalBunny Sep 23, 2023
324762d
Update FileUtils.java
BrutalBunny Mar 10, 2024
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
11 changes: 8 additions & 3 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@

<!-- android -->
<platform name="android">
<config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<config-file target="AndroidManifest.xml" parent="/*" mode="merge">
<uses-permission android:maxSdkVersion="32" android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:maxSdkVersion="32" android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<uses-permission android:minSdkVersion="33" android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:minSdkVersion="33" android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:minSdkVersion="33" android:name="android.permission.READ_MEDIA_VIDEO" />
</config-file>

<config-file target="res/xml/config.xml" parent="/*">
<feature name="FilePicker">
<param name="android-package" value="com.wavemaker.cordova.plugin.FilePickerPlugin" />
Expand Down
30 changes: 24 additions & 6 deletions src/android/FilePickerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@
import android.content.ClipData;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;

public class FilePickerPlugin extends CordovaPlugin {
private static final String TAG = "FILE";

//PERMISSION REQUEST CODE
private static final int WRITE_PERMISSION_REQUEST_CODE = 1000;
private static final int REQUEST_CODE_READ_MEDIA = 1001;
private static final int REQUEST_CODE_READ_EXTERNAL_STORAGE = 1002;

//ACTIVITY REQUEST CODE
private static final int FILE_REQUEST_CODE = 1000;
Expand Down Expand Up @@ -88,6 +90,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
if ("selectFiles".equals(action)) {
JSONObject options = args.getJSONObject(0);
String type = options.getString("type");

if ("IMAGE".equals(type)) {
this.mimeType = "image/*";
} else if ("VIDEO".equals(type)) {
Expand All @@ -97,12 +100,26 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
} else {
this.mimeType = "*/*";
}

this.multiple = options.getBoolean("multiple");
this.mCallbackContext = callbackContext;
if (!this.cordova.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
this.cordova.requestPermission(this, 0, Manifest.permission.WRITE_EXTERNAL_STORAGE);
} else {
this.selectFiles();

if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
// Android API 33 and higher
if (!this.cordova.hasPermission(Manifest.permission.READ_MEDIA_IMAGES) && !this.cordova.hasPermission(Manifest.permission.READ_MEDIA_VIDEO)) {
String[] permissions = {Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO};
this.cordova.requestPermissions(this, REQUEST_CODE_READ_MEDIA, permissions);
} else {
this.selectFiles();
}
}
else {
// Android API 32 or lower
if (!this.cordova.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
this.cordova.requestPermission(this, REQUEST_CODE_READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
} else {
this.selectFiles();
}
}
} else {
return false;
Expand Down Expand Up @@ -140,7 +157,8 @@ public void onRequestPermissionResult(int requestCode, String[] permissions, int
return;
}
}
if (requestCode == WRITE_PERMISSION_REQUEST_CODE) {

if (requestCode == REQUEST_CODE_READ_MEDIA || requestCode == REQUEST_CODE_READ_EXTERNAL_STORAGE) {
selectFiles();
}
}
Expand Down
24 changes: 24 additions & 0 deletions src/android/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
import android.util.Log;

Expand Down Expand Up @@ -129,10 +131,32 @@ private static File createFile(Context context, Uri uri) {
}
outputStream.flush();
}

long originalDate = getFileModifiedDate(context, uri);
file.setLastModified(originalDate);

return file;
} catch (Exception e) {
Log.e(TAG, "Exception occured", e);
}
return null;
}

private static Long getFileModifiedDate(Context context, Uri uri) {
Cursor cursor = context.getContentResolver().query(uri, null, null, null, null, null);
if (cursor != null && cursor.moveToFirst()) {
int columnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATE_MODIFIED);
if (columnIndex == -1) {
columnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED);
}
if (columnIndex != -1) {
String dateStr = cursor.getString(columnIndex);
if (dateStr != null) {
return Long.parseLong(dateStr);
}
}
}

return null;
}
}