#831 Migrate from SQLiteOpenHelper to Room

Fix some build issues

1 files changed, 11 insertions, 5 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
index 81f138a1..ac4c3680 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
@@ -1,6 +1,7 @@
 package it.niedermann.owncloud.notes.shared.util.text;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -11,15 +12,16 @@ import androidx.annotation.VisibleForTesting;
 
 public class NoteLinksProcessor extends TextProcessor {
 
+    private static final String TAG = NoteLinksProcessor.class.getSimpleName();
     public static final String RELATIVE_LINK_WORKAROUND_PREFIX = "https://nextcloudnotes/notes/";
 
     @VisibleForTesting
     private static final String linksThatLookLikeNoteLinksRegEx = "\\[[^]]*]\\((\\d+)\\)";
     private static final String replaceNoteRemoteIdsRegEx = "\\[([^\\]]*)\\]\\((%s)\\)";
 
-    private Set<String> existingNoteRemoteIds;
+    private Set<Long> existingNoteRemoteIds;
 
-    public NoteLinksProcessor(Set<String> existingNoteRemoteIds) {
+    public NoteLinksProcessor(Set<Long> existingNoteRemoteIds) {
         this.existingNoteRemoteIds = existingNoteRemoteIds;
     }
 
@@ -37,15 +39,19 @@ public class NoteLinksProcessor extends TextProcessor {
         return replaceNoteLinksWithDummyUrls(s, existingNoteRemoteIds);
     }
 
-    private static String replaceNoteLinksWithDummyUrls(String markdown, Set<String> existingNoteRemoteIds) {
+    private static String replaceNoteLinksWithDummyUrls(String markdown, Set<Long> existingNoteRemoteIds) {
         Pattern noteLinkCandidates = Pattern.compile(linksThatLookLikeNoteLinksRegEx);
         Matcher matcher = noteLinkCandidates.matcher(markdown);
 
         Set<String> noteRemoteIdsToReplace = new HashSet<>();
         while (matcher.find()) {
             String presumedNoteId = matcher.group(1);
-            if (existingNoteRemoteIds.contains(presumedNoteId)) {
-                noteRemoteIdsToReplace.add(presumedNoteId);
+            try {
+                if (presumedNoteId != null && existingNoteRemoteIds.contains(Long.parseLong(presumedNoteId))) {
+                    noteRemoteIdsToReplace.add(presumedNoteId);
+                }
+            } catch (NumberFormatException e) {
+                Log.w(TAG, e);
             }
         }