- ➖ Allow dashes in note titles (#1104)

4 files changed, 17 insertions, 9 deletions

diff --git a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.java b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.java
index a0e1f9c0..7a264fdd 100644
--- a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.java
+++ b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.java
@@ -9,6 +9,8 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import it.niedermann.android.markdown.MarkdownUtil;
+
 /**
  * Tests the NoteUtil
  * Created by stefan on 06.10.15.
@@ -42,6 +44,9 @@ public class NoteUtilTest extends TestCase {
         assertEquals("Test", NoteUtil.generateNoteTitle("Test\nFoo"));
         assertEquals("Test", NoteUtil.generateNoteTitle("\nTest"));
         assertEquals("Test", NoteUtil.generateNoteTitle("\n\nTest"));
+
+        // https://github.com/stefan-niedermann/nextcloud-notes/issues/1104
+        assertEquals("2021-03-24 - Example title", MarkdownUtil.removeMarkdown("2021-03-24 - Example title"));
     }
 
     @Test
diff --git a/fastlane/metadata/android/en-US/changelogs/3004001.txt b/fastlane/metadata/android/en-US/changelogs/3004001.txt
index 2dae115f..3d40e264 100644
--- a/fastlane/metadata/android/en-US/changelogs/3004001.txt
+++ b/fastlane/metadata/android/en-US/changelogs/3004001.txt
@@ -1 +1,2 @@
-- ⚠️️ Display confirm dialog when deleting an account with unsynchronized changes (#989) - by @AlpAcA0072
\ No newline at end of file
+- ⚠️️ Display confirm dialog when deleting an account with unsynchronized changes (#989) - by @AlpAcA0072
+- ➖ Allow dashes in note titles (#1104)
\ No newline at end of file
diff --git a/markdown/src/androidTest/java/it/niedermann/android/markdown/MarkdownUtilTest.java b/markdown/src/androidTest/java/it/niedermann/android/markdown/MarkdownUtilTest.java
index bcd28328..cef46ebe 100644
--- a/markdown/src/androidTest/java/it/niedermann/android/markdown/MarkdownUtilTest.java
+++ b/markdown/src/androidTest/java/it/niedermann/android/markdown/MarkdownUtilTest.java
@@ -659,9 +659,11 @@ public class MarkdownUtilTest extends TestCase {
         assertEquals("Foo\nAufzählung *\nBar", MarkdownUtil.removeMarkdown("Foo\n* Aufzählung *\nBar"));
         assertEquals("Title", MarkdownUtil.removeMarkdown("# Title"));
         assertEquals("Aufzählung", MarkdownUtil.removeMarkdown("* Aufzählung"));
-//        assertEquals("Foo Link Bar", MarkdownUtil.removeMarkdown("Foo [Link](https://example.com) Bar"));
-
+        // assertEquals("Foo Link Bar", MarkdownUtil.removeMarkdown("Foo [Link](https://example.com) Bar"));
         assertFalse(MarkdownUtil.removeMarkdown("- [ ] Test").contains("- [ ]"));
         assertTrue(MarkdownUtil.removeMarkdown("- [ ] Test").endsWith("Test"));
+
+        // https://github.com/stefan-niedermann/nextcloud-notes/issues/1104
+        assertEquals("2021-03-24 - Example text", MarkdownUtil.removeMarkdown("2021-03-24 - Example text"));
     }
 }
\ No newline at end of file
diff --git a/markdown/src/main/java/it/niedermann/android/markdown/MarkdownUtil.java b/markdown/src/main/java/it/niedermann/android/markdown/MarkdownUtil.java
index 99575914..045b7f13 100644
--- a/markdown/src/main/java/it/niedermann/android/markdown/MarkdownUtil.java
+++ b/markdown/src/main/java/it/niedermann/android/markdown/MarkdownUtil.java
@@ -21,9 +21,7 @@ import com.yydcdut.markdown.MarkdownProcessor;
 import com.yydcdut.markdown.syntax.text.TextFactory;
 import com.yydcdut.rxmarkdown.RxMarkdown;
 
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
+import java.util.Arrays;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -446,9 +444,11 @@ public class MarkdownUtil {
         // TODO maybe we can utilize the markwon renderer?
 
         for (EListType listType : EListType.values()) {
-            s = s.replace(listType.checkboxChecked, "");
-            s = s.replace(listType.checkboxUnchecked, "");
-            s = s.replace(listType.listSymbolWithTrailingSpace, "");
+            for (String item : Arrays.asList(listType.checkboxChecked, listType.checkboxUnchecked, listType.listSymbolWithTrailingSpace)) {
+                if (s.startsWith(item)) {
+                    s = s.substring(item.length());
+                }
+            }
         }
         s = PATTERN_LISTS.matcher(s).replaceAll("");
         s = PATTERN_HEADINGS.matcher(s).replaceAll("$1");