Bug Fix for Intial directory and file filter

Author: adityak368

filebrowser/src/main/java/com/aditya/filebrowser/FileBrowser.java

@@ -107,12 +107,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mNavigationHelper.setAllowedFileExtensionFilter(allowedFilesFilter);
         }
 
-        //switch to initial directory if given
-        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
-        File initDir = new File(mInitialDirectory);
-        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
-            mNavigationHelper.changeDirectory(initDir);
-
         mFileList = mNavigationHelper.getFilesItemsInCurrentDirectory();
     }
 
@@ -272,6 +266,12 @@ public void onFastScrollStop() {
         mBottomView.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         mPathChange.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         onFileChanged(mNavigationHelper.getCurrentDirectory());
+
+        //switch to initial directory if given
+        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
+        File initDir = new File(mInitialDirectory);
+        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
+            mNavigationHelper.changeDirectory(initDir);
     }
 
     public void switchMode(Constants.CHOICE_MODE mode) {

filebrowser/src/main/java/com/aditya/filebrowser/FileBrowserWithCustomHandler.java

@@ -105,12 +105,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mNavigationHelper.setAllowedFileExtensionFilter(allowedFilesFilter);
         }
 
-        //switch to initial directory if given
-        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
-        File initDir = new File(mInitialDirectory);
-        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
-            mNavigationHelper.changeDirectory(initDir);
-
         mFileList = mNavigationHelper.getFilesItemsInCurrentDirectory();
     }
 
@@ -265,6 +259,12 @@ public void onFastScrollStop() {
         mBottomView.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         mPathChange.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         onFileChanged(mNavigationHelper.getCurrentDirectory());
+
+        //switch to initial directory if given
+        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
+        File initDir = new File(mInitialDirectory);
+        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
+            mNavigationHelper.changeDirectory(initDir);
     }
 
     public void switchMode(Constants.CHOICE_MODE mode) {

filebrowser/src/main/java/com/aditya/filebrowser/FileChooser.java

@@ -104,12 +104,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mNavigationHelper.setAllowedFileExtensionFilter(allowedFilesFilter);
         }
 
-        //switch to initial directory if given
-        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
-        File initDir = new File(mInitialDirectory);
-        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
-            mNavigationHelper.changeDirectory(initDir);
-
         mFileList = mNavigationHelper.getFilesItemsInCurrentDirectory();
     }
 
@@ -243,6 +237,12 @@ public void onFastScrollStop() {
         mBottomView.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         mPathChange.getTabWithId(R.id.menu_none).setVisibility(View.GONE);
         onFileChanged(mNavigationHelper.getCurrentDirectory());
+
+        //switch to initial directory if given
+        mInitialDirectory = getIntent().getStringExtra(Constants.INITIAL_DIRECTORY);
+        File initDir = new File(mInitialDirectory);
+        if(mInitialDirectory!=null && !mInitialDirectory.isEmpty() && initDir.exists())
+            mNavigationHelper.changeDirectory(initDir);
     }
 
     @Override

filebrowser/src/main/java/com/aditya/filebrowser/fileoperations/FileNavigator.java

@@ -35,7 +35,8 @@ public static FileNavigator getInstance() {
            FilenameFilter fileNameFilter = new FilenameFilter() {
                @Override
                public boolean accept(File dir, String name) {
-                   if(mAllowedFileExtensionFilter.contains(FilenameUtils.getExtension(name)))
+                   String fileExtension = FilenameUtils.getExtension(name);
+                   if(mAllowedFileExtensionFilter.contains(fileExtension) || fileExtension.isEmpty() )
                        return true;
                    else
                        return false;