Improved in-built file picker

Signed-off-by: sunilpaulmathew <sunil.kde@gmail.com>

Author: sunilpaulmathew

app/src/main/java/com/smartpack/scriptmanager/activities/FilePickerActivity.java

@@ -86,7 +86,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         mRecycleViewAdapter.setOnItemClickListener((position, v) -> {
-            if (isDirectory(mData.get(position))) {
+            if (new File(mData.get(position)).isDirectory()) {
                 mPath = mData.get(position);
                 reload();
             } else {
@@ -120,8 +120,8 @@ private int getSpanCount(Activity activity) {
     }
 
     private File[] getFilesList() {
-        if (!mPath.endsWith("/")) {
-            mPath = mPath + "/";
+        if (!mPath.endsWith(File.separator)) {
+            mPath = mPath + File.separator;
         }
         if (!new File(mPath).exists()) {
             mPath = Environment.getExternalStorageDirectory().toString();
@@ -131,32 +131,25 @@ private File[] getFilesList() {
 
     private List<String> getData() {
         try {
+            mData.clear();
             // Add directories
             for (File mFile : getFilesList()) {
-                if (isDirectory(mPath + mFile.getName())) {
-                    mData.add(mPath + mFile.getName());
+                if (mFile.isDirectory()) {
+                    mData.add(mFile.getAbsolutePath());
                 }
             }
             // Add files
             for (File mFile : getFilesList()) {
-                if (isFile(mPath + mFile.getName())) {
-                    mData.add(mPath + mFile.getName());
+                if (mFile.isFile()) {
+                    mData.add(mFile.getAbsolutePath());
                 }
             }
-        } catch (RuntimeException e) {
-            Utils.snackbar(findViewById(android.R.id.content), e.getMessage());
+        } catch (NullPointerException ignored) {
+            Utils.snackbar(findViewById(android.R.id.content), getString(R.string.file_picker_failed_message));
         }
         return mData;
     }
 
-    private static boolean isDirectory(String path) {
-        return new File(path).isDirectory();
-    }
-
-    private static boolean isFile(String path) {
-        return new File(path).isFile();
-    }
-
     private static String getSize(File file) {
         long size = file.length() / 1024;
         String timeCreated = DateFormat.getDateTimeInstance().format(System.currentTimeMillis());
@@ -240,9 +233,10 @@ public RecycleViewAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int vi
         @SuppressLint("UseCompatLoadingForDrawables")
         @Override
         public void onBindViewHolder(@NonNull RecycleViewAdapter.ViewHolder holder, int position) {
-            if (isDirectory(this.data.get(position))) {
+            if (new File(this.data.get(position)).isDirectory()) {
                 holder.mIcon.setImageDrawable(holder.mTitle.getContext().getResources().getDrawable(R.drawable.ic_folder));
                 holder.mIcon.setColorFilter(Utils.getThemeAccentColor(holder.mTitle.getContext()));
+                holder.mDescription.setVisibility(View.GONE);
             } else {
                 if (Utils.getExtension(this.data.get(position)).equals("sh")) {
                     holder.mDescription.setVisibility(View.VISIBLE);

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

@@ -84,6 +84,7 @@
     <string name="translations_summary">Help me to translate this app! Click here to get the original language strings in english</string>
     <string name="file_picker">File Picker</string>
     <string name="file_picker_external">External</string>
+    <string name="file_picker_failed_message">Permission denied to read this folder!</string>
     <string name="file_picker_inbuilt">In-built</string>
     <string name="use_file_picker_message">Got some issues? Please disable \'Use In-built File Picker\' in \'Settings\' Menu!</string>
     <string name="wrong_extension">Please select a file with %s extension.</string>