Jump to correct heading via id, other tweaks, bugfixes

app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java

@@ -18,8 +18,8 @@
 import android.text.Html;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.widget.TextView;
 
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
@@ -32,9 +32,9 @@
 import net.gsantner.markor.util.MarkorContextUtils;
 import net.gsantner.opoc.format.GsTextUtils;
 import net.gsantner.opoc.frontend.base.GsFragmentBase;
+import net.gsantner.opoc.frontend.filebrowser.GsFileBrowserListAdapter;
 import net.gsantner.opoc.util.GsContextUtils;
 import net.gsantner.opoc.util.GsFileUtils;
-import net.gsantner.opoc.wrapper.GsCallback;
 
 import java.io.File;
 
@@ -44,101 +44,82 @@ public class DocumentActivity extends MarkorBaseActivity {
     public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
 
     private Toolbar _toolbar;
-    private TextView _toolbarTitleText;
 
     private FragmentManager _fragManager;
 
     private static boolean nextLaunchTransparentBg = false;
 
-    public static void launch(Activity activity, File path, Boolean doPreview, Intent intent, final Integer lineNumber) {
-        final AppSettings as = ApplicationObject.settings();
-        if (intent == null) {
-            intent = new Intent(activity, DocumentActivity.class);
+    public static void launch(
+            final Activity activity,
+            final File file,
+            final Boolean doPreview,
+            final Integer lineNumber
+    ) {
+        launch(activity, file, doPreview, lineNumber, false);
+    }
+
+    private static void launch(
+            final Activity activity,
+            final File file,
+            final Boolean doPreview,
+            final Integer lineNumber,
+            final boolean forceOpenInThisApp
+    ) {
+        if (activity == null || file == null) {
+            return;
+        }
+
+        if (GsFileUtils.getFilenameExtension(file).equals(".apk")) {
+            GsContextUtils.instance.requestApkInstallation(activity, file);
+            return;
+        }
+
+        if (!forceOpenInThisApp && file.isFile() && !FormatRegistry.isFileSupported(file)) {
+            askUserIfWantsToOpenFileInThisApp(activity, file);
+            return;
         }
-        if (path != null) {
-            intent.putExtra(Document.EXTRA_FILE, path);
+
+        final AppSettings as = ApplicationObject.settings();
+
+        final Intent intent;
+        if (GsFileBrowserListAdapter.isVirtualFolder(file) || file.isDirectory()) {
+            intent = new Intent(activity, MainActivity.class);
         } else {
-            path = intent.hasExtra(Document.EXTRA_FILE) ? ((File) intent.getSerializableExtra(Document.EXTRA_FILE)) : null;
+            intent = new Intent(activity, DocumentActivity.class);
         }
+
+        intent.putExtra(Document.EXTRA_FILE, file);
+
         if (lineNumber != null && lineNumber >= 0) {
             intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber);
         }
+
         if (doPreview != null) {
             intent.putExtra(DocumentActivity.EXTRA_DO_PREVIEW, doPreview);
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && ApplicationObject.settings().isMultiWindowEnabled()) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && as.isMultiWindowEnabled()) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
         } else {
-            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        }
-        if (path != null && path.isDirectory()) {
-            intent = new Intent(activity, MainActivity.class).putExtra(Document.EXTRA_FILE, path);
-        }
-        if (path != null && path.isFile() && as.isPreferViewMode()) {
-            as.setDocumentPreviewState(path.getAbsolutePath(), true);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         }
+
         nextLaunchTransparentBg = (activity instanceof MainActivity);
         GsContextUtils.instance.animateToActivity(activity, intent, false, null);
     }
 
-    public static void handleFileClick(Activity activity, File file, Integer lineNumber) {
-        if (activity == null || file == null) {
-            return;
-        }
-
-        if (file.isDirectory()) {
-            if (file.canRead()) {
-                launch(activity, file, null, null, null);
-            }
-        } else if (FormatRegistry.isFileSupported(file) && GsFileUtils.canCreate(file)) {
-            launch(activity, file, null, null, lineNumber);
-        } else if (GsFileUtils.getFilenameExtension(file).equals(".apk")) {
-            GsContextUtils.instance.requestApkInstallation(activity, file);
-        } else {
-            askUserIfWantsToOpenFileInThisApp(activity, file);
-        }
-    }
-
-    public static Object[] checkIfLikelyTextfileAndGetExt(File file) {
-        String fn = file.getName().toLowerCase();
-        if (!fn.contains(".")) {
-            return new Object[]{true, ""};
-        }
-        String ext = fn.substring(fn.lastIndexOf("."));
-        for (String ce : new String[]{".dummy"}) {
-            if (ext.equals(ce)) {
-                return new Object[]{true, ext};
-            }
-        }
-        return new Object[]{false, ext};
-    }
-
     public static void askUserIfWantsToOpenFileInThisApp(final Activity activity, final File file) {
-        final Object[] fret = checkIfLikelyTextfileAndGetExt(file);
-        final boolean isLikelyTextfile = (boolean) fret[0];
-        final String ext = (String) fret[1];
-        final boolean isYes = ApplicationObject.settings().isExtOpenWithThisApp(ext);
-
-        final GsCallback.a1<Boolean> openFile = (openInThisApp) -> {
-            if (openInThisApp) {
-                DocumentActivity.launch(activity, file, null, null, null);
-            } else {
-                new MarkorContextUtils(activity).viewFileInOtherApp(activity, file, null);
-            }
-        };
-
-        if (isYes) {
-            openFile.callback(true);
-        } else if (isLikelyTextfile) {
-            AlertDialog.Builder dialog = new AlertDialog.Builder(activity, R.style.Theme_AppCompat_DayNight_Dialog);
-            dialog.setTitle(R.string.open_with)
+        if (GsFileUtils.isContentsPlainText(file)) {
+            new AlertDialog.Builder(activity, R.style.Theme_AppCompat_DayNight_Dialog_Rounded)
+                    .setTitle(R.string.open_with)
                     .setMessage(R.string.selected_file_may_be_a_textfile_want_to_open_in_editor)
                     .setIcon(R.drawable.ic_open_in_browser_black_24dp)
-                    .setPositiveButton(R.string.app_name, (dialog1, which) -> openFile.callback(true))
-                    .setNegativeButton(R.string.other, (dialog1, which) -> openFile.callback(false));
-            dialog.create().show();
+                    .setPositiveButton(R.string.app_name, (dialog1, which) -> DocumentActivity.launch(activity, file, null, null, true))
+                    .setNegativeButton(R.string.other, (dialog1, which) -> new MarkorContextUtils(activity).viewFileInOtherApp(activity, file, null))
+                    .create()
+                    .show();
         } else {
-            openFile.callback(false);
+            new MarkorContextUtils(activity).viewFileInOtherApp(activity, file, null);
         }
     }
 
@@ -153,7 +134,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         setContentView(R.layout.document__activity);
         _toolbar = findViewById(R.id.toolbar);
-        _toolbarTitleText = findViewById(R.id.note__activity__text_note_title);
 
         if (_appSettings.isHideSystemStatusbar()) {
             AndroidBug5497Workaround.assistActivity(this);
@@ -203,12 +183,8 @@ private void handleLaunchingIntent(final Intent intent) {
 
         // Decide what to do with the file
         // -----------------------------------------------------------------------
-        if (file == null) {
+        if (file == null || !_cu.canWriteFile(this, file, false, true)) {
             showNotSupportedMessage();
-        } else if (file.isDirectory() || !FormatRegistry.isFileSupported(file)) {
-            // File readable but is not a text-file (and not a supported binary-embed type)
-            handleFileClick(this, file, null);
-            finish();
         } else {
             // Open in editor/viewer
             final Document doc = new Document(file);
@@ -237,7 +213,7 @@ private void handleLaunchingIntent(final Intent intent) {
 
     private void showNotSupportedMessage() {
         final String notSupportedMessage = (getString(R.string.filemanager_doesnot_supply_required_data__appspecific) + "\n\n" + getString(R.string.sync_to_local_folder_notice)).replace("\n", "<br/>");
-        new AlertDialog.Builder(this)
+        new AlertDialog.Builder(this, R.style.Theme_AppCompat_DayNight_Dialog_Rounded)
                 .setMessage(Html.fromHtml(notSupportedMessage))
                 .setNegativeButton(R.string.more_info, (di, i) -> _cu.openWebpageInExternalBrowser(this, getString(R.string.sync_client_support_issue_url)))
                 .setPositiveButton(android.R.string.ok, null)
@@ -281,8 +257,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         _cu.extractResultFromActivityResult(this, requestCode, resultCode, data);
     }
 
+    public void setTitle(final CharSequence title) {
+        final ActionBar bar = getSupportActionBar();
+        if (bar != null) {
+            bar.setTitle(title);
+        }
+    }
+
     public void setDocumentTitle(final String title) {
-        _toolbarTitleText.setText(title);
+        setTitle(title);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && _appSettings.isMultiWindowEnabled()) {
             setTaskDescription(new ActivityManager.TaskDescription(title));
         }
@@ -301,8 +284,7 @@ public void showTextEditor(final Document document, final Integer lineNumber, fi
     }
 
     public void showShareInto(Intent intent) {
-        // Disable edittext when going to shareinto
-        _toolbarTitleText.setText(R.string.share_into);
+        setTitle(getString(R.string.share_into));
         showFragment(DocumentShareIntoFragment.newInstance(intent));
     }
 

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -231,20 +231,21 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
 
         // We set the keyboard to be hidden if it was hidden when we lost focus
         // This works well to preserve keyboard state.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && activity != null) {
             final Window window = activity.getWindow();
             final int adjustResize = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
             final int unchanged = WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | adjustResize;
             final int hidden = WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | adjustResize;
+            final int shown = WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE | adjustResize;
 
             _hlEditor.getViewTreeObserver().addOnWindowFocusChangeListener(hasFocus -> {
                 if (hasFocus) {
                     // Restore old state
                     _hlEditor.postDelayed(() -> window.setSoftInputMode(unchanged), 500);
                 } else {
                     final Boolean isOpen = TextViewUtils.isImeOpen(_hlEditor);
-                    if (isOpen != null && !isOpen) {
-                        window.setSoftInputMode(hidden);
+                    if (isOpen != null) {
+                        window.setSoftInputMode(isOpen ? shown : hidden);
                     }
                 }
             });
@@ -557,8 +558,8 @@ public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
                     _document.setFormat(itemId);
                     applyTextFormat(itemId);
                     _appSettings.setDocumentFormat(_document.getPath(), _document.getFormat());
-                    return true;
                 }
+                return true;
             }
             case R.id.action_search: {
                 setViewModeVisibility(false);
@@ -762,7 +763,6 @@ public boolean isStateBad() {
         return (_document == null ||
                 _hlEditor == null ||
                 _appSettings == null ||
-                !_document.testCreateParent() ||
                 !_cu.canWriteFile(getContext(), _document.getFile(), false, true));
     }