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

fix(android): Filesystem.requestPermissions() not working #2936

Merged
merged 1 commit into from
May 15, 2020
Merged

fix(android): Filesystem.requestPermissions() not working #2936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions android/capacitor/src/main/java/com/getcapacitor/PluginRequestCodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ public class PluginRequestCodes {
public static final int FILESYSTEM_REQUEST_STAT_PERMISSIONS = 9019;
public static final int FILESYSTEM_REQUEST_RENAME_PERMISSIONS = 9020;
public static final int FILESYSTEM_REQUEST_COPY_PERMISSIONS = 9021;
public static final int FILESYSTEM_REQUEST_ALL_PERMISSIONS = 9022;
}
33 changes: 21 additions & 12 deletions android/capacitor/src/main/java/com/getcapacitor/plugin/Filesystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

@NativePlugin(requestCodes = {
PluginRequestCodes.FILESYSTEM_REQUEST_WRITE_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_WRITE_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_READ_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_READ_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_DELETE_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_DELETE_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_URI_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_STAT_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_RENAME_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_COPY_PERMISSIONS,
})
@NativePlugin(
requestCodes = {
PluginRequestCodes.FILESYSTEM_REQUEST_WRITE_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_WRITE_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_READ_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_READ_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_DELETE_FILE_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_DELETE_FOLDER_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_URI_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_STAT_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_RENAME_PERMISSIONS,
PluginRequestCodes.FILESYSTEM_REQUEST_COPY_PERMISSIONS,
},
permissions={
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE
},
permissionRequestCode = PluginRequestCodes.FILESYSTEM_REQUEST_ALL_PERMISSIONS
)
public class Filesystem extends Plugin {

private static final String PERMISSION_DENIED_ERROR = "Unable to do file operation, user denied permission request";
Expand Down Expand Up @@ -676,6 +683,8 @@ protected void handleRequestPermissionsResult(int requestCode, String[] permissi
this.rename(savedCall);
} else if (requestCode == PluginRequestCodes.FILESYSTEM_REQUEST_COPY_PERMISSIONS) {
this.copy(savedCall);
} else if (requestCode == PluginRequestCodes.FILESYSTEM_REQUEST_ALL_PERMISSIONS){
savedCall.resolve();
}
this.freeSavedCall();
}
Expand Down