From 75582c2167afc405cc6cd4fa7be120ae4a67fc89 Mon Sep 17 00:00:00 2001 From: houxg Date: Tue, 21 Feb 2017 14:53:40 +0800 Subject: [PATCH] fix wrong condition of local note --- app/src/main/java/org/houxg/leamonax/model/Note.java | 10 ++++++++++ .../java/org/houxg/leamonax/service/NoteService.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/houxg/leamonax/model/Note.java b/app/src/main/java/org/houxg/leamonax/model/Note.java index bc2ff0f..0b08f31 100644 --- a/app/src/main/java/org/houxg/leamonax/model/Note.java +++ b/app/src/main/java/org/houxg/leamonax/model/Note.java @@ -1,5 +1,7 @@ package org.houxg.leamonax.model; +import android.text.TextUtils; + import com.elvishew.xlog.XLog; import com.google.gson.annotations.SerializedName; import com.raizlabs.android.dbflow.annotation.Column; @@ -193,6 +195,14 @@ public class Note extends BaseModel implements Serializable { return tagData; } + public boolean isTotalEmpty() { + return TextUtils.isEmpty(title) && TextUtils.isEmpty(content); + } + + public boolean isLocalNote() { + return TextUtils.isEmpty(noteId); + } + public void updateTags() { if (CollectionUtils.isEmpty(tagData)) { tags = ""; 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 ce67d9f..0e81b11 100644 --- a/app/src/main/java/org/houxg/leamonax/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -204,7 +204,7 @@ public class NoteService { Map requestBodyMap = generateCommonBodyMap(modifiedNote); List fileBodies = handleFileBodies(modifiedNote, requestBodyMap); Call call; - if (modifiedNote.getUsn() == 0) { + if (modifiedNote.isLocalNote()) { call = ApiProvider.getInstance().getNoteApi().add(requestBodyMap, fileBodies); } else { Note remoteNote = RetrofitUtils.excuteWithException(getNoteByServerId(modifiedNote.getNoteId()));