Disallow path characters as input as document title

MohammedBelkacem · Nov 18, 2017 · 89d7cb4 · 89d7cb4
1 parent cd88bb6
commit 89d7cb4
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### v0.2.3
+- Select file/image from filesystem
+- Fix relative web local file loading
+- Added: manually save option
+- Added: Launcher shortcuts
+- Filesystem: Add refresh menu option
+
 ### v0.2.2
 - Show document and file amount below folders
 - Settings toolbar option

diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java
@@ -18,6 +18,7 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.InputFilter;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -129,6 +130,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 showEditor(null, file, fileIsFolder);
             }
         }
+
+        _toolbarTitleEdit.setFilters(new InputFilter[]{DocumentIO.INPUT_FILTER_FILESYSTEM_FILENAME});
     }
 
     @Override

diff --git a/app/src/main/java/net/gsantner/markor/util/DocumentIO.java b/app/src/main/java/net/gsantner/markor/util/DocumentIO.java
@@ -15,6 +15,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.text.TextUtils;
 
 import net.gsantner.markor.R;
 import net.gsantner.markor.format.converter.MarkdownConverter;
@@ -149,4 +152,17 @@ public static String normalizeTitleForFilename(Document _document) {
         }
         return name;
     }
+
+    public static final InputFilter INPUT_FILTER_FILESYSTEM_FILENAME = new InputFilter() {
+        private final String blockCharacterSet = "\\/:\"´`'*?<>\n\r@|";
+
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            for (int i = 0; !TextUtils.isEmpty(source) && i < source.length(); i++) {
+                if (blockCharacterSet.contains(("" + source.charAt(i)))) {
+                    return "";
+                }
+            }
+            return null;
+        }
+    };
 }
diff --git a/app/src/test/java/net/gsantner/markor/model/DocumentTest.java b/app/src/test/java/net/gsantner/markor/model/DocumentTest.java
@@ -11,10 +11,9 @@
  */
 package net.gsantner.markor.model;
 
-import net.gsantner.markor.model.Document;
-
 import org.junit.Test;
 
+import static net.gsantner.markor.util.DocumentIO.normalizeTitleForFilename;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DocumentTest {
@@ -48,4 +47,24 @@ public void documentNewerVersion() {
         assertThat(document.getTitle()).isEqualTo("Hello World Again");
         assertThat(document.canGoToNewerVersion()).isEqualTo(false);
     }
+
+    @Test
+    public void filenameNormalization(){
+        assertThat(normalizeTitleForFilename(nd(null, "HelloWorld"))).isEqualTo("HelloWorld");
+        assertThat(normalizeTitleForFilename(nd("HelloWorld", "text"))).isEqualTo("HelloWorld");
+        assertThat(normalizeTitleForFilename(nd(null, "text\nnewline"))).isEqualTo("text");
+        assertThat(normalizeTitleForFilename(nd(null, "sumtext/folder"))).isEqualTo("sumtextfolder");
+        assertThat(normalizeTitleForFilename(nd(null, "## hello world"))).isEqualTo("hello world");
+    }
+
+    private Document nd(String title, String content){
+        Document document = new Document();
+        if (title != null){
+            document.setTitle(title);
+        }
+        if (content != null){
+            document.setContent(content);
+        }
+        return document;
+    }
 }