Fixes for a few edge cases

harshad1 · Nov 10, 2023 · 2ea9d01 · 2ea9d01
1 parent 867f930
commit 2ea9d01
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java
@@ -80,10 +80,11 @@ public static void launch(Activity activity, File path, Boolean doPreview, Inten
         GsContextUtils.instance.animateToActivity(activity, intent, false, null);
     }
 
-
     public static void handleFileClick(Activity activity, File file, Integer lineNumber) {
-        if (activity != null && file != null && file.canRead()) {
-            if (FormatRegistry.isFileSupported(file) || file.isDirectory()) {
+        if (activity != null && file != null) {
+            final boolean readableDirectory = file.isDirectory() && file.canRead();
+            final boolean creatableFile = FormatRegistry.isFileSupported(file) && GsFileUtils.canCreate(file);
+            if (readableDirectory || creatableFile) {
                 launch(activity, file, null, null, lineNumber);
             } else if (GsFileUtils.getFilenameExtension(file).equals(".apk")) {
                 GsContextUtils.instance.requestApkInstallation(activity, file);

diff --git a/app/src/main/java/net/gsantner/markor/format/FormatRegistry.java b/app/src/main/java/net/gsantner/markor/format/FormatRegistry.java
@@ -88,7 +88,7 @@ public class FormatRegistry {
     };
 
     public static boolean isFileSupported(final File file, final boolean... textOnly) {
-        boolean textonly = textOnly != null && textOnly.length > 0 && textOnly[0];
+        final boolean textonly = textOnly != null && textOnly.length > 0 && textOnly[0];
         if (file != null) {
             final String filepath = file.getAbsolutePath().toLowerCase(Locale.ROOT);
             for (TextConverterBase converter : CONVERTERS) {

diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java
@@ -591,6 +591,12 @@ public void onFsViewerDoUiUpdate(GsFileBrowserListAdapter adapter) {
                     }
                 }
             }
+
+            @Override
+            public void onFsViewerCancel(final String request) {
+                super.onFsViewerCancel(request);
+                _filesystemViewerAdapter.reloadCurrentFolder(); // May be new folders
+            }
         }, getChildFragmentManager(), getActivity());
     }