fix(markdown): Fix NPE on rerendering

Signed-off-by: Stefan Niedermann <[email protected]>
stefan-niedermann · Feb 1, 2024 · 6fe87b8 · 6fe87b8
1 parent c1c29f2
commit 6fe87b8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/markdown/src/main/java/it/niedermann/android/markdown/markwon/MarkwonMarkdownViewer.java b/markdown/src/main/java/it/niedermann/android/markdown/markwon/MarkwonMarkdownViewer.java
@@ -237,7 +237,7 @@ public void setCurrentSingleSignOnAccount(@Nullable SingleSignOnAccount ssoAccou
             mentionsPlugin.setCurrentSingleSignOnAccount(ssoAccount);
         }
 
-        this.renderService.execute(() -> post(() -> this.markwon.setMarkdown(this, getMarkdownString().getValue().toString())));
+        rerender();
     }
 
     @Override
@@ -249,7 +249,7 @@ public void setSearchText(@Nullable CharSequence searchText, @Nullable Integer c
             searchHighlightPlugin.setSearchText(searchText, current, this);
         }
 
-        this.renderService.execute(() -> post(() -> this.markwon.setMarkdown(this, getMarkdownString().getValue().toString())));
+        rerender();
     }
 
     /**
@@ -287,6 +287,13 @@ public void setTextSize(int unit, float size) {
             mentionsPlugin.setTextSize((int) getTextSize());
         }
 
-        this.renderService.execute(() -> post(() -> this.markwon.setMarkdown(this, getMarkdownString().getValue().toString())));
+        rerender();
+    }
+
+    private void rerender() {
+        this.renderService.execute(() -> post(() -> {
+            final var currentValue = unrenderedText$.getValue();
+            this.markwon.setMarkdown(this, currentValue == null ? "" : currentValue.toString());
+        }));
     }
 }