Fixing a few more bugs, having FileProvider return File objects

Author: maxieds

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

@@ -894,12 +894,19 @@ public DocumentPointer(String absInitFolderPath) {
 
         public boolean isValid() { return isValid; }
 
+        public File getFile(String documentPath) {
+            if(!isValid()) {
+                return null;
+            }
+            this.filePath = documentPath.replaceFirst(fpInst.getCWD(), "");
+            return new File(fpInst.getCWD(), filePath);
+        }
+
         public boolean locateDocument(String documentPath) throws FileNotFoundException {
             if(!isValid()) {
                 return false;
             }
-            this.filePath = documentPath.replaceFirst(fpInst.getCWD(), "");
-            File docFile = new File(fpInst.getCWD(), filePath);
+            File docFile = getFile(documentPath);
             documentId = fpInst.getDocIdForFile(docFile);
             return true;
         }

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

@@ -247,26 +247,7 @@ public void onClick(View btnView) {
         backBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                DisplayFragments displayCtx = DisplayFragments.getInstance();
-                if(displayCtx.pathHistoryStack.empty() || displayCtx.getCwdFolderContext().isTopLevelFolder()) {
-                    getInstance().postSelectedFilesActivityResult(new FileChooserException.CommunicateNoDataException());
-                    return;
-                }
-                String displayAscendingPrecurseMsg = String.format(Locale.getDefault(), "Ascending back upwards into DIR \"%s\".",
-                        displayCtx.pathHistoryStack.peek().getCWDBasePath());
-                DisplayUtils.displayToastMessageShort(displayAscendingPrecurseMsg);
-                if(displayCtx.pathHistoryStack.peek().isRecentDocuments()) {
-                    BasicFileProvider fpInst = BasicFileProvider.getInstance();
-                    fpInst.selectBaseDirectoryByType(FileChooserBuilder.BaseFolderPathType.BASE_PATH_DEFAULT);
-                    DisplayFragments.getInstance().descendIntoNextDirectory(true);
-                    DisplayFragments.updateFolderHistoryPaths(displayCtx.getCwdFolderContext().getCWDBasePath(), true);
-                }
-                else {
-                    DisplayTypes.DirectoryResultContext.probePreviousFolder(1);
-                    boolean initNewTree = displayCtx.pathHistoryStack.peek().isTopLevelFolder();
-                    DisplayFragments.getInstance().descendIntoNextDirectory(initNewTree);
-                    DisplayFragments.updateFolderHistoryPaths(displayCtx.getCwdFolderContext().getCWDBasePath(), initNewTree);
-                }
+                chooserBackButtonPressed();
             }
         });
         LinearLayout dirHistoryNavContainer = (LinearLayout) findViewById(R.id.mainDirPrevPathsNavContainer);
@@ -317,6 +298,29 @@ public void onClick(View btnView) {
 
     }
 
+    private void chooserBackButtonPressed() {
+        DisplayFragments displayCtx = DisplayFragments.getInstance();
+        if(displayCtx.pathHistoryStack.empty() || displayCtx.getCwdFolderContext().isTopLevelFolder()) {
+            getInstance().postSelectedFilesActivityResult(new FileChooserException.CommunicateNoDataException());
+            return;
+        }
+        String displayAscendingPrecurseMsg = String.format(Locale.getDefault(), "Ascending back upwards into DIR \"%s\".",
+                displayCtx.pathHistoryStack.peek().getCWDBasePath());
+        DisplayUtils.displayToastMessageShort(displayAscendingPrecurseMsg);
+        if(displayCtx.pathHistoryStack.peek().isRecentDocuments()) {
+            BasicFileProvider fpInst = BasicFileProvider.getInstance();
+            fpInst.selectBaseDirectoryByType(FileChooserBuilder.BaseFolderPathType.BASE_PATH_DEFAULT);
+            DisplayFragments.getInstance().descendIntoNextDirectory(true);
+            DisplayFragments.updateFolderHistoryPaths(displayCtx.getCwdFolderContext().getCWDBasePath(), true);
+        }
+        else {
+            DisplayTypes.DirectoryResultContext.probePreviousFolder(1);
+            boolean initNewTree = displayCtx.pathHistoryStack.peek().isTopLevelFolder();
+            DisplayFragments.getInstance().descendIntoNextDirectory(initNewTree);
+            DisplayFragments.updateFolderHistoryPaths(displayCtx.getCwdFolderContext().getCWDBasePath(), initNewTree);
+        }
+    }
+
     @Override
     public void onNewIntent(Intent broadcastIntent) {
         super.onNewIntent(broadcastIntent);
@@ -405,6 +409,9 @@ public void postSelectedFilesActivityResult(Exception runtimeExcpt) {
     }
 
     @Override
-    public void onBackPressed() {}
+    public void onBackPressed() {
+        //super.onBackPressed();
+        chooserBackButtonPressed();
+    }
 
 }