Fixing back button bug and permissions errors

Author: maxieds

AndroidFilePickerLightLibrary/build.gradle

@@ -30,8 +30,8 @@ android {
     defaultConfig {
         minSdkVersion 29
         targetSdkVersion 30
-        versionCode 13
-        versionName "1.1.2"
+        versionCode 14
+        versionName "1.1.3"
     }
 
     compileOptions {

AndroidFilePickerLightLibrary/src/main/AndroidManifest.xml

@@ -21,7 +21,8 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:required="true" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" android:required="false" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" android:required="true" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" android:required="true" />
     <uses-permission android:name="android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION" android:required="false" />
     <uses-permission android:name="android.permission.INTERNET" android:required="false" />
 

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/BasicFileProvider.java

@@ -452,11 +452,12 @@ public Cursor queryChildDocuments(String parentDocumentId, String[] projection,
         int lastFileIndex = startFileIndex + getFilesListLength();
         if(lastFileIndex >= docsQueryFilesList.length) {
             lastFileIndex = docsQueryFilesList.length - 1;
-            startFileIndex = Math.max(0, lastFileIndex - getFilesListLength());
+            startFileIndex = Math.max(0, lastFileIndex + 1 - getFilesListLength());
         }
         int curFileIndex = 0;
         for(File file : docsQueryFilesList) {
-            if(curFileIndex++ < startFileIndex) {
+            if(curFileIndex < startFileIndex) {
+                curFileIndex++;
                 continue;
             }
             else if(curFileIndex > lastFileIndex) {

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayTypes.java

@@ -106,7 +106,7 @@ public void computeDirectoryContents(int startIndexPos, int maxIndexPos,
                 return;
             }
             if(newItemsCount > 0) {
-                fpInst.setFilesStartIndex(maxIndexPos + 1 - Math.abs(newItemsCount));
+                fpInst.setFilesStartIndex(Math.max(0, maxIndexPos + 1 - Math.abs(newItemsCount)));
                 fpInst.setFilesListLength(Math.abs(newItemsCount));
                 Log.d(LOGTAG, "REQUESTING start index = " + (maxIndexPos + 1 - Math.abs(newItemsCount)) + ", LEN = " + Math.abs(newItemsCount));
             }

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java

@@ -325,12 +325,13 @@ public void onNewIntent(Intent broadcastIntent) {
     public static final String[] ACTIVITY_REQUIRED_PERMISSIONS = {
             "android.permission.READ_EXTERNAL_STORAGE",
             "android.permission.WRITE_EXTERNAL_STORAGE",
+            "android.permission.ACCESS_MEDIA_LOCATION",
     };
 
     public static final String[] ACTIVITY_OPTIONAL_PERMISSIONS = {
-            "android.permission.MANAGE_EXTERNAL_STORAGE",
+            "android.permission.INTERNET",
             "android.permission.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION",
-            "android.permission.INTERNET"
+            "android.permission.MANAGE_EXTERNAL_STORAGE",
     };
 
     @Override
@@ -403,4 +404,7 @@ public void postSelectedFilesActivityResult(Exception runtimeExcpt) {
         finish();
     }
 
+    @Override
+    public void onBackPressed() {}
+
 }

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserBuilder.java

@@ -471,6 +471,7 @@ public void launchFilePicker() throws FileChooserException.AndroidFilePickerLigh
         Intent launchPickerIntent = new Intent(activityContextRef.get().getApplicationContext(), FileChooserActivity.class);
         launchPickerIntent.setAction(Intent.ACTION_PICK_ACTIVITY);
         launchPickerIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        launchPickerIntent.setType("*/*");
         activityContextRef.get().startActivityForResult(launchPickerIntent, activityActionCode);
     }
 

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/PermissionsHandler.java

@@ -22,6 +22,9 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 import androidx.core.content.ContextCompat;
 
+import pub.devrel.easypermissions.EasyPermissions;
+import pub.devrel.easypermissions.PermissionRequest;
+
 public class PermissionsHandler {
 
     protected static boolean hasAccessPermission(Activity activityCtx, String permName) {
@@ -34,11 +37,18 @@ protected static boolean hasAccessPermission(Activity activityCtx, String permNa
     public static boolean obtainRequiredPermissions(Activity activityCtx, String[] permsList) {
         if(android.os.Build.VERSION.SDK_INT >= 23) {
              activityCtx.requestPermissions(permsList, REQUEST_REQUIRED_PERMISSIONS_CODE);
+             EasyPermissions.requestPermissions(
+                    new PermissionRequest.Builder(activityCtx, REQUEST_REQUIRED_PERMISSIONS_CODE, permsList)
+                            .setRationale(R.string.grantPermsDialogRationaleText)
+                            .setPositiveButtonText(R.string.grantPermsDialogOkBtnText)
+                            .setNegativeButtonText(R.string.grantPermsDialogCancelBtnText)
+                            .setTheme(R.style.LibraryDefaultTheme)
+                            .build());
         }
         for(int pidx = 0; pidx < permsList.length; pidx++) {
             if(!hasAccessPermission(activityCtx, permsList[pidx])) {
-                //throw new FileChooserException.PermissionsErrorException();
-                return false;
+                throw new FileChooserException.PermissionsErrorException();
+                //return false;
             }
         }
         return true;

AndroidFilePickerLightLibrary/src/main/res/values/strings.xml

@@ -36,4 +36,12 @@
     <string name="filePickerDoneActionButtonText">Done</string>
     <string name="filePickerCancelActionButtonText">Cancel</string>
 
+    <string name="grantPermsDialogOkBtnText">Grant Permissions</string>
+    <string name="grantPermsDialogCancelBtnText">Deny Permissions</string>
+    <string name="grantPermsDialogRationaleText">
+        We require several file storage permissions to list and access the local device file system,
+        e.g., to choose a file or directory path to load. You will not be able to select files with
+        this application unless these permissions are granted.
+    </string>
+
 </resources>

AndroidFilePickerLightLibrary/src/main/res/xml/file_provider_paths_base.xml

@@ -31,6 +31,7 @@
 
         <external-files name="/storage/self/primary" path="."/>
         <external-files name="Download" path="Download/" />
+        <external-files name="Downloads" path="Downloads/" />
         <external-files name="Movies" path="./Movies/" />
         <external-files name="Music" path="./Music" />
         <external-files name="Pictures" path="./Pictures/" />
@@ -40,6 +41,7 @@
 
         <external-files-path name="/storage/self/primary" path="."/>
         <external-files-path name="Download" path="Download/" />
+        <external-files-path name="Downloads" path="Downloads/" />
         <external-files-path name="Movies" path="Movies/" />
         <external-files-path name="Music" path="Music" />
         <external-files-path name="Pictures" path="Pictures/" />