Move removeMarkdown() util method to MarkdownUtil

2 files changed, 10 insertions, 36 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
index cf6c51e8..e194b11e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CloudNote.java
@@ -7,6 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 
+import it.niedermann.android.markdown.MarkdownUtil;
 import it.niedermann.owncloud.notes.shared.util.NoteUtil;
 
 /**
@@ -46,7 +47,7 @@ public class CloudNote implements Serializable {
     }
 
     public void setTitle(String title) {
-        this.title = NoteUtil.removeMarkDown(title);
+        this.title = MarkdownUtil.removeMarkdown(title);
     }
 
     public Calendar getModified() {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
index 014d3377..5033417c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
@@ -7,10 +7,10 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.util.regex.Pattern;
-
 import it.niedermann.owncloud.notes.R;
 
+import static it.niedermann.android.markdown.MarkdownUtil.removeMarkdown;
+
 /**
  * Provides basic functionality for Note operations.
  * Created by stefan on 06.10.15.
@@ -18,13 +18,6 @@ import it.niedermann.owncloud.notes.R;
 @SuppressWarnings("WeakerAccess")
 public class NoteUtil {
 
-    private static final Pattern pLists = Pattern.compile("^\\s*[*+-]\\s+", Pattern.MULTILINE);
-    private static final Pattern pHeadings = Pattern.compile("^#+\\s+(.*?)\\s*#*$", Pattern.MULTILINE);
-    private static final Pattern pHeadingLine = Pattern.compile("^(?:=*|-*)$", Pattern.MULTILINE);
-    private static final Pattern pEmphasis = Pattern.compile("(\\*+|_+)(.*?)\\1", Pattern.MULTILINE);
-    private static final Pattern pSpace1 = Pattern.compile("^\\s+", Pattern.MULTILINE);
-    private static final Pattern pSpace2 = Pattern.compile("\\s+$", Pattern.MULTILINE);
-
     public static final String EXCERPT_LINE_SEPARATOR = "   ";
 
     private NoteUtil() {
@@ -32,26 +25,6 @@ public class NoteUtil {
     }
 
     /**
-     * Strips all MarkDown from the given String
-     *
-     * @param s String - MarkDown
-     * @return Plain Text-String
-     */
-    @NonNull
-    public static String removeMarkDown(@Nullable String s) {
-        if (s == null)
-            return "";
-        String result = s;
-        result = pLists.matcher(result).replaceAll("");
-        result = pHeadings.matcher(result).replaceAll("$1");
-        result = pHeadingLine.matcher(result).replaceAll("");
-        result = pEmphasis.matcher(result).replaceAll("$2");
-        result = pSpace1.matcher(result).replaceAll("");
-        result = pSpace2.matcher(result).replaceAll("");
-        return result;
-    }
-
-    /**
      * Checks if a line is empty.
      * <pre>
      * " "    -> empty
@@ -65,7 +38,7 @@ public class NoteUtil {
      * @return boolean isEmpty
      */
     public static boolean isEmptyLine(@Nullable String line) {
-        return removeMarkDown(line).trim().length() == 0;
+        return removeMarkdown(line).trim().length() == 0;
     }
 
     /**
@@ -90,12 +63,12 @@ public class NoteUtil {
      */
     @NonNull
     public static String generateNoteExcerpt(@NonNull String content, @Nullable String title) {
-        content = removeMarkDown(content.trim());
+        content = removeMarkdown(content.trim());
         if(TextUtils.isEmpty(content)) {
             return "";
         }
         if (!TextUtils.isEmpty(title)) {
-            final String trimmedTitle = removeMarkDown(title.trim());
+            final String trimmedTitle = removeMarkdown(title.trim());
             if (content.startsWith(trimmedTitle)) {
                 content = content.substring(trimmedTitle.length());
             }
@@ -120,7 +93,7 @@ public class NoteUtil {
      */
     @NonNull
     public static String generateNoteTitle(@NonNull String content) {
-        return getLineWithoutMarkDown(content, 0);
+        return getLineWithoutMarkdown(content, 0);
     }
 
     /**
@@ -131,7 +104,7 @@ public class NoteUtil {
      * @return lineContent String
      */
     @NonNull
-    public static String getLineWithoutMarkDown(@NonNull String content, int lineNumber) {
+    public static String getLineWithoutMarkdown(@NonNull String content, int lineNumber) {
         String line = "";
         if (content.contains("\n")) {
             String[] lines = content.split("\n");
@@ -140,7 +113,7 @@ public class NoteUtil {
                 currentLine++;
             }
             if (currentLine < lines.length) {
-                line = NoteUtil.removeMarkDown(lines[currentLine]);
+                line = removeMarkdown(lines[currentLine]);
             }
         } else {
             line = content;