diff --git a/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java index f9f4e44..18d8fdd 100644 --- a/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java +++ b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java @@ -202,9 +202,9 @@ public class NoteAdapter extends RecyclerView.Adapter { } } if (note.isMarkDown()) { - holder.contentTv.setText(note.getContent()); + holder.contentTv.setText(note.getNoteAbstract()); } else { - Spanned spannedContent = Html.fromHtml(note.getContent()); + Spanned spannedContent = Html.fromHtml(note.getNoteAbstract()); String contentStr = spannedContent.toString(); contentStr = contentStr.replaceAll("\\n\\n+", "\n"); holder.contentTv.setText(contentStr); diff --git a/app/src/main/java/org/houxg/leamonax/service/NoteService.java b/app/src/main/java/org/houxg/leamonax/service/NoteService.java index 0ec38b7..37cae60 100644 --- a/app/src/main/java/org/houxg/leamonax/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -104,12 +104,15 @@ public class NoteService { localId = localNote.getId(); } remoteNote.setIsDirty(false); + String content; if (remoteNote.isMarkDown()) { - remoteNote.setContent(convertToLocalImageLinkForMD(localId, remoteNote.getContent())); + content = convertToLocalImageLinkForMD(localId, remoteNote.getContent()); } else { - remoteNote.setContent(convertToLocalImageLinkForRichText(localId, remoteNote.getContent())); + content = convertToLocalImageLinkForRichText(localId, remoteNote.getContent()); } XLog.i(TAG + "content=" + remoteNote.getContent()); + remoteNote.setContent(content); + remoteNote.setNoteAbstract(content.length() < 500 ? content : content.substring(0, 500)); remoteNote.update(); handleFile(localId, remoteNote.getNoteFiles()); updateTagsToLocal(localId, remoteNote.getTagData());