leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2025-10-14 14:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix extra conflict note

Browse Source
This commit is contained in:
houxg
2017-02-21 14:33:13 +08:00
parent cb13146d3c
commit 99d07c90bf
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java
View File

@@ -110,12 +110,19 @@ public class NotePreviewActivity extends BaseActivity implements EditorFragment.
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQ_EDIT && resultCode == RESULT_OK) {
mNote = AppDataBase.getNoteByLocalId(mNote.getId());
if (mNote == null) {
finish();
} else {
refresh();
if (requestCode == REQ_EDIT) {
switch (resultCode) {
case RESULT_OK:
mNote = AppDataBase.getNoteByLocalId(mNote.getId());
if (mNote == null) {
finish();
} else {
refresh();
}
break;
case NoteEditActivity.RESULT_CONFLICT:
finish();
break;
}
}
}

8
app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java
View File

@@ -14,7 +14,9 @@ import android.view.ViewGroup;
import com.elvishew.xlog.XLog;
import org.houxg.leamonax.Leamonax;
import org.houxg.leamonax.R;
import org.houxg.leamonax.ReadableException;
import org.houxg.leamonax.database.AppDataBase;
import org.houxg.leamonax.model.Note;
import org.houxg.leamonax.model.Tag;
@@ -43,6 +45,7 @@ import rx.schedulers.Schedulers;
public class NoteEditActivity extends BaseActivity implements EditorFragment.EditorFragmentListener, SettingFragment.SettingFragmentListener {
private static final String TAG = "NoteEditActivity:";
public static final int RESULT_CONFLICT = 525;
public static final String EXT_NOTE_LOCAL_ID = "ext_note_local_id";
public static final String EXT_IS_NEW_NOTE = "ext_is_new_note";
public static final String TAG_EDITOR = "tag_editor_tag";
@@ -142,9 +145,12 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi
@Override
public void onError(Throwable e) {
DialogDisplayer.dismissProgress();
ToastUtils.show(NoteEditActivity.this, e.getMessage());
ToastUtils.show(Leamonax.getContext(), e.getMessage());
if (e instanceof NetworkUtils.NetworkUnavailableException) {
finish();
} else if (e instanceof ReadableException) {
setResult(RESULT_CONFLICT);
finish();
}
}