Merge branch 'master' into 831-room

# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
#	app/src/test/java/android/text/TextUtils.java

1 files changed, 3 insertions, 2 deletions

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 32caeaaf..e5b8afae 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
@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import it.niedermann.owncloud.notes.R;
 
 import static it.niedermann.android.markdown.MarkdownUtil.removeMarkdown;
+import static it.niedermann.android.markdown.MarkdownUtil.replaceCheckboxesWithEmojis;
 
 /**
  * Provides basic functionality for Note operations.
@@ -63,12 +64,12 @@ public class NoteUtil {
      */
     @NonNull
     public static String generateNoteExcerpt(@NonNull String content, @Nullable String title) {
-        content = removeMarkdown(content.trim());
+        content = removeMarkdown(replaceCheckboxesWithEmojis(content.trim()));
         if (TextUtils.isEmpty(content)) {
             return "";
         }
         if (!TextUtils.isEmpty(title)) {
-            final String trimmedTitle = removeMarkdown(title.trim());
+            final String trimmedTitle = removeMarkdown(replaceCheckboxesWithEmojis(title.trim()));
             if (content.startsWith(trimmedTitle)) {
                 content = content.substring(trimmedTitle.length());
             }