WIP: Quick filter all files

app/src/main/AndroidManifest.xml

@@ -211,6 +211,7 @@
 
                 <data android:mimeType="text/plain" />
                 <data android:mimeType="text/*" />
+                <data android:mimeType="*/*" />
             </intent-filter>
 
             <intent-filter tools:ignore="AppLinkUrlError">

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

@@ -49,7 +49,7 @@ public class DocumentActivity extends MarkorBaseActivity {
     private static boolean nextLaunchTransparentBg = false;
 
     public static void launch(final Activity activity, final Intent intent) {
-        final File file = MarkorContextUtils.getIntentFile(intent, null);
+        final File file = MarkorContextUtils.getIntentFile(intent);
         final Integer lineNumber = intent.hasExtra(Document.EXTRA_FILE_LINE_NUMBER) ? intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, -1) : null;
         final Boolean doPreview = intent.hasExtra(Document.EXTRA_DO_PREVIEW) ? intent.getBooleanExtra(Document.EXTRA_DO_PREVIEW, false) : null;
         launch(activity, file, doPreview, lineNumber);
@@ -167,26 +167,19 @@ private void handleLaunchingIntent(final Intent intent) {
 
         // Pull the file from the intent
         // -----------------------------------------------------------------------
-        File file = (File) intent.getSerializableExtra(Document.EXTRA_FILE);
+        File file = MarkorContextUtils.getIntentFile(intent, this);
 
         final boolean intentIsView = Intent.ACTION_VIEW.equals(intentAction);
-        final boolean intentIsSend = Intent.ACTION_SEND.equals(intentAction);
+        final boolean intentIsSend = Intent.ACTION_SEND.equals(intentAction) || Intent.ACTION_SEND_MULTIPLE.equals(intentAction);
         final boolean intentIsEdit = Intent.ACTION_EDIT.equals(intentAction);
 
-        if (intentIsSend && intent.hasExtra(Intent.EXTRA_TEXT)) {
+        if (intentIsSend) {
             showShareInto(intent);
             return;
         } else if (Intent.ACTION_PROCESS_TEXT.equals(intentAction) && intent.hasExtra(Intent.EXTRA_PROCESS_TEXT)) {
             intent.putExtra(Intent.EXTRA_TEXT, intent.getStringExtra("android.intent.extra.PROCESS_TEXT"));
             showShareInto(intent);
             return;
-        } else if (file == null && (intentIsView || intentIsEdit || intentIsSend)) {
-            file = _cu.extractFileFromIntent(this, intent);
-            if (file == null) {
-                // More permissive - file may not exist
-                // Will be filtered out in next stage
-                file = MarkorContextUtils.getIntentFile(intent, null);
-            }
         }
 
         // Decide what to do with the file
@@ -294,7 +287,7 @@ public void showTextEditor(final Document document, final Integer lineNumber, fi
 
     public void showShareInto(Intent intent) {
         setTitle(getString(R.string.share_into));
-        showFragment(DocumentShareIntoFragment.newInstance(intent));
+        showFragment(DocumentShareIntoFragment.newInstance(intent, this));
     }
 
     @Override

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

@@ -108,7 +108,6 @@ public static DocumentEditAndViewFragment newInstance(final @NonNull Document do
     private boolean _isPreviewVisible;
     private boolean _nextConvertToPrintMode = false;
 
-
     public DocumentEditAndViewFragment() {
         super();
     }
@@ -141,7 +140,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         _webView = view.findViewById(R.id.document__fragment_view_webview);
         _primaryScrollView = view.findViewById(R.id.document__fragment__edit__content_editor__scrolling_parent);
         _lineNumbersView = view.findViewById(R.id.document__fragment__edit__line_numbers_view);
-
         _cu = new MarkorContextUtils(activity);
 
         // Using `if (_document != null)` everywhere is dangerous
@@ -284,6 +282,9 @@ protected void onFragmentFirstTimeVisible() {
     public void onResume() {
         loadDocument();
         _webView.onResume();
+        if (_editTextUndoRedoHelper != null && _editTextUndoRedoHelper.getTextView() != _hlEditor) {
+            _editTextUndoRedoHelper.setTextView(_hlEditor);
+        }
         super.onResume();
     }
 
@@ -438,31 +439,15 @@ public boolean loadDocument() {
             }
 
             if (!_document.isContentSame(_hlEditor.getText())) {
-
-                final int[] sel = TextViewUtils.getSelection(_hlEditor);
-                sel[0] = Math.min(sel[0], content.length());
-                sel[1] = Math.min(sel[1], content.length());
-
-                if (_editTextUndoRedoHelper != null) {
-                    _editTextUndoRedoHelper.disconnect();
-                    _editTextUndoRedoHelper.clearHistory();
-                }
-
-                _hlEditor.withAutoFormatDisabled(() -> _hlEditor.setText(content));
-
-                if (_editTextUndoRedoHelper == null) {
-                    _editTextUndoRedoHelper = new TextViewUndoRedo(_hlEditor);
-                } else {
-                    _editTextUndoRedoHelper.setTextView(_hlEditor);
-                }
-
-                TextViewUtils.setSelectionAndShow(_hlEditor, sel);
+                _hlEditor.withAutoFormatDisabled(() -> _hlEditor.setTextKeepState(content));
             }
+
             checkTextChangeState();
 
             if (_isPreviewVisible) {
                 updateViewModeText();
             }
+
             return true;
         }
         return false;

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

@@ -14,7 +14,6 @@
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -62,28 +61,19 @@
 
 public class DocumentShareIntoFragment extends MarkorBaseFragment {
     public static final String FRAGMENT_TAG = "DocumentShareIntoFragment";
-    public static final String EXTRA_SHARED_TEXT = "EXTRA_SHARED_TEXT";
     public static final String TEXT_TOKEN = "{{text}}";
 
     private static final String CHECKBOX_TAG = "insert_link_checkbox";
 
-    public static DocumentShareIntoFragment newInstance(final Intent intent) {
+    public static DocumentShareIntoFragment newInstance(final Intent intent, final Context context) {
         final DocumentShareIntoFragment f = new DocumentShareIntoFragment();
-        final Bundle args = new Bundle();
-
-        final String sharedText = extractShareText(intent);
-
-        final Object intentFile = intent.getSerializableExtra(Document.EXTRA_FILE);
-        if (intentFile instanceof File && ((File) intentFile).isDirectory()) {
-            f.workingDir = (File) intentFile;
-        }
-
-        args.putString(EXTRA_SHARED_TEXT, sharedText);
-        f.setArguments(args);
+        f.sharedText = extractShareText(intent);
+        f.intentFile = MarkorContextUtils.getIntentFile(intent, context);
         return f;
     }
 
-    private File workingDir;
+    private File intentFile;
+    private String sharedText;
 
     public DocumentShareIntoFragment() {
     }
@@ -98,12 +88,11 @@ public void onViewCreated(final @NonNull View view, final Bundle savedInstanceSt
         super.onViewCreated(view, savedInstanceState);
         final HighlightingEditor _hlEditor = view.findViewById(R.id.document__fragment__share_into__highlighting_editor);
 
-        final String sharedText = (getArguments() != null ? getArguments().getString(EXTRA_SHARED_TEXT, "") : "").trim();
         final ShareIntoImportOptionsFragment _shareIntoImportOptionsFragment;
         if (_savedInstanceState == null) {
             FragmentTransaction t = getChildFragmentManager().beginTransaction();
             _shareIntoImportOptionsFragment = new ShareIntoImportOptionsFragment();
-            _shareIntoImportOptionsFragment.setWorkingDir(workingDir);
+            _shareIntoImportOptionsFragment.setIntentFile(intentFile);
             t.replace(R.id.document__share_into__fragment__placeholder_fragment, _shareIntoImportOptionsFragment, ShareIntoImportOptionsFragment.TAG).commit();
         } else {
             _shareIntoImportOptionsFragment = (ShareIntoImportOptionsFragment) getChildFragmentManager().findFragmentByTag(ShareIntoImportOptionsFragment.TAG);
@@ -114,6 +103,10 @@ public void onViewCreated(final @NonNull View view, final Bundle savedInstanceSt
             _shareIntoImportOptionsFragment._linkCheckBox = addCheckBoxToToolbar();
         }
 
+        if (GsTextUtils.isNullOrEmpty(sharedText)) {
+            sharedText = intentFile != null ? GsFileUtils.getFilenameWithoutExtension(intentFile) : "";
+        }
+
         _hlEditor.setTextSize(TypedValue.COMPLEX_UNIT_SP, _appSettings.getFontSize());
         _hlEditor.setTypeface(Typeface.create(_appSettings.getFontFamily(), Typeface.NORMAL));
         _hlEditor.setHighlighter(new PlaintextSyntaxHighlighter(_appSettings));
@@ -145,10 +138,7 @@ private CheckBox addCheckBoxToToolbar() {
             checkBox.setTag(CHECKBOX_TAG);
             CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(Color.WHITE));
             checkBox.setTextColor(Color.WHITE);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                checkBox.setLayoutDirection(CheckBox.LAYOUT_DIRECTION_RTL);
-            }
+            checkBox.setLayoutDirection(CheckBox.LAYOUT_DIRECTION_RTL);
 
             final Toolbar.LayoutParams layoutParams = new Toolbar.LayoutParams(
                     Toolbar.LayoutParams.WRAP_CONTENT,
@@ -189,7 +179,7 @@ public String getFragmentTag() {
 
     public static class ShareIntoImportOptionsFragment extends GsPreferenceFragmentBase<AppSettings> {
         public static final String TAG = "ShareIntoImportOptionsFragment";
-        private File workingDir;
+        private File intentFile;
 
         private EditText _editor = null;
         private CheckBox _linkCheckBox = null;
@@ -199,8 +189,9 @@ public boolean isDividerVisible() {
             return true;
         }
 
-        public void setWorkingDir(File dir) {
-            workingDir = dir;
+        public ShareIntoImportOptionsFragment setIntentFile(File file) {
+            intentFile = file;
+            return this;
         }
 
         @Override
@@ -235,7 +226,13 @@ private boolean shareAsLink() {
             return _linkCheckBox != null && _linkCheckBox.getVisibility() == View.VISIBLE && _linkCheckBox.isChecked();
         }
 
-        private void appendToExistingDocumentAndClose(final File file, final boolean showEditor) {
+        /**
+         * Attach file to document or copy to directory and close
+         *
+         * @param file       File or directory to attach to
+         * @param showEditor Whether to show the editor after attaching
+         */
+        private void attachOrCopyAndClose(final File file, final boolean showEditor) {
             final Activity activity = getActivity();
             if (activity == null) {
                 return;
@@ -244,7 +241,14 @@ private void appendToExistingDocumentAndClose(final File file, final boolean sho
             final Document document = new Document(file);
             final int format = _appSettings.getDocumentFormat(document.path, document.getFormat());
             final boolean asLink = shareAsLink();
-            final String formatted = getFormatted(asLink, file, format);
+
+            final String formatted;
+            if (intentFile != null) {
+                final String title = _editor.getText().toString().trim();
+                formatted = AttachLinkOrFileDialog.makeAttachmentLink(format, title, intentFile, file);
+            } else {
+                formatted = getFormatted(asLink, file, format);
+            }
 
             final String oldContent = document.loadContent(activity);
             if (oldContent != null) {
@@ -411,7 +415,7 @@ public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
 
                 @Override
                 public void onFsViewerSelected(String request, File file, final Integer lineNumber) {
-                    appendToExistingDocumentAndClose(file, true);
+                    attachOrCopyAndClose(file, true);
                 }
 
             }, getParentFragmentManager(), getActivity(), MarkorFileBrowserFactory.IsMimeText);
@@ -425,7 +429,7 @@ private void createSelectNewDocument() {
                 @Override
                 public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
                     dopt.rootFolder = _appSettings.getNotebookDirectory();
-                    dopt.startFolder = workingDir;
+                    dopt.startFolder = intentFile.isDirectory() ? intentFile : null;
                     dopt.okButtonText = R.string.create_new_document;
                     dopt.okButtonEnable = true;
                     dopt.dismissAfterCallback = false;
@@ -439,11 +443,11 @@ public void onFsViewerSelected(final String request, final File sel, final Integ
                     } else if (sel.isDirectory()) {
                         NewFileDialog.newInstance(sel, false, f -> {
                             if (f.isFile()) {
-                                appendToExistingDocumentAndClose(f, true);
+                                attachOrCopyAndClose(f, true);
                             }
                         }).show(getChildFragmentManager(), NewFileDialog.FRAGMENT_TAG);
                     } else {
-                        appendToExistingDocumentAndClose(sel, true);
+                        attachOrCopyAndClose(sel, true);
                     }
                 }
 
@@ -489,11 +493,11 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyId)
                     return true;
                 }
                 case R.string.pref_key__share_into__quicknote: {
-                    appendToExistingDocumentAndClose(_appSettings.getQuickNoteFile(), false);
+                    attachOrCopyAndClose(_appSettings.getQuickNoteFile(), false);
                     break;
                 }
                 case R.string.pref_key__share_into__todo: {
-                    appendToExistingDocumentAndClose(_appSettings.getTodoFile(), false);
+                    attachOrCopyAndClose(_appSettings.getTodoFile(), false);
                     break;
                 }
                 case R.string.pref_key__share_into__open_in_browser: {
@@ -519,7 +523,7 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyId)
             }
 
             if (preference.getKey().startsWith("/")) {
-                appendToExistingDocumentAndClose(new File(preference.getKey()), true);
+                attachOrCopyAndClose(new File(preference.getKey()), true);
             }
 
             if (close) {

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

@@ -8,6 +8,7 @@
 package net.gsantner.markor.activity;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -118,10 +119,10 @@ protected void onPreferenceChanged(SharedPreferences prefs, String key) {
         @SuppressWarnings("rawtypes")
         protected void onPreferenceScreenChanged(PreferenceFragmentCompat preferenceFragmentCompat, PreferenceScreen preferenceScreen) {
             super.onPreferenceScreenChanged(preferenceFragmentCompat, preferenceScreen);
-            if (!TextUtils.isEmpty(preferenceScreen.getTitle())) {
-                if (getActivity() instanceof GsActivityBase && ((GsActivityBase) getActivity()).getToolbar() != null) {
-                    ((GsActivityBase) getActivity()).getToolbar().setTitle(preferenceScreen.getTitle());
-                }
+            final CharSequence title = preferenceScreen.getTitle();
+            final Activity activity = getActivity();
+            if (activity instanceof GsActivityBase && !TextUtils.isEmpty(title)) {
+                ((GsActivityBase<?, ?>) activity).setToolbarText(title);
             }
         }
     }

app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java

@@ -1022,4 +1022,8 @@ public boolean onReceiveKeyPress(final int keyCode, final KeyEvent event) {
         }
         return false;
     }
+
+    public static class HeadlineState extends GsSearchOrCustomTextDialog.DialogState {
+        public final List<Integer> disabledLevels = new ArrayList<>();
+    }
 }

app/src/main/java/net/gsantner/markor/format/markdown/MarkdownActionButtons.java

@@ -36,8 +36,6 @@ public class MarkdownActionButtons extends ActionButtonBase {
 
     private static final Pattern WEB_URL = Pattern.compile("https?://[^\\s/$.?#].[^\\s]*");
 
-    private final GsSearchOrCustomTextDialog.DialogState _headlineDialogState = new GsSearchOrCustomTextDialog.DialogState();
-
     public static final String LINE_PREFIX = "^(>\\s|#{1,6}\\s|\\s*[-*+](?:\\s\\[[ xX]\\])?\\s|\\s*\\d+[.)]\\s)?";
 
     // Patterns used for surrounding entire lines
@@ -317,6 +315,8 @@ private void insertTableRow(int cols, boolean isHeaderEnabled) {
         }
     }
 
+    private final HeadlineState _headlineDialogState = new HeadlineState();
+
     @Override
     public boolean runTitleClick() {
         final Matcher m = MarkdownReplacePatternGenerator.PREFIX_ATX_HEADING.matcher("");

app/src/main/java/net/gsantner/markor/format/wikitext/WikitextActionButtons.java

@@ -33,8 +33,6 @@
 
 public class WikitextActionButtons extends ActionButtonBase {
 
-    private GsSearchOrCustomTextDialog.DialogState _headlineDialogState = new GsSearchOrCustomTextDialog.DialogState();
-
     public WikitextActionButtons(@NonNull Context context, Document document) {
         super(context, document);
     }
@@ -256,6 +254,8 @@ public static String createWikitextHeaderAndTitleContents(String fileNameWithout
         return contents;
     }
 
+    private final HeadlineState _headlineDialogState = new HeadlineState();
+
     @Override
     public boolean runTitleClick() {
         final Matcher m = WikitextSyntaxHighlighter.HEADING.matcher("");