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

fix can’t save changes when clicked navigation button

Browse Source
This commit is contained in:
houxg
2016-12-21 16:38:20 +08:00
parent 9c0fe8b9c8
commit 13d34e5590
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,8 +106,9 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case
case R.id.action_save: case R.id.action_save:
filterUnchanged() filterUnchanged()
.doOnNext(new Action1<Wrapper>() { .doOnNext(new Action1<Wrapper>() {
@@ -159,6 +160,34 @@ public class NoteEditActivity extends BaseActivity implements EditorFragment.Edi
case R.id.action_settings: case R.id.action_settings:
mPager.setCurrentItem(FRAG_SETTINGS); mPager.setCurrentItem(FRAG_SETTINGS);
return true; return true;
case android.R.id.home:
if (mPager.getCurrentItem() > FRAG_EDITOR) {
mPager.setCurrentItem(FRAG_EDITOR);
} else {
filterUnchanged()
.observeOn(AndroidSchedulers.mainThread())
.doOnCompleted(new Action0() {
@Override
public void call() {
NoteEditActivity.super.onOptionsItemSelected(item);
}
})
.subscribe(new Action1<Wrapper>() {
@Override
public void call(Wrapper wrapper) {
setResult(RESULT_OK);
Log.i(TAG, wrapper.toString());
if (mIsNewNote && isTitleContentEmpty(wrapper.note)) {
Log.i(TAG, "remove empty note, id=" + wrapper.note.getId());
AppDataBase.deleteNoteByLocalId(wrapper.note.getId());
} else {
saveAsDraft(wrapper);
}
}
});
}
return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }