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

Merge pull request #9 from leanote/bugfix/delete-note

Browse Source 
修复ActionMode模式下，删除笔记，点击删除，list为null的错误
This commit is contained in:
houxg
2017-02-19 19:44:48 +08:00
committed by GitHub
parent 4a3c1ffd8f c9998c1c21
commit 99e79e9622
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java
View File

@@ -199,6 +199,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
mActionModeHandler.getPendingItems().clear();
mActionModeHandler.dismiss();
deleteNote(waitToDelete);
}

1
app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java
View File

@@ -197,6 +197,7 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
mActionModeHandler.getPendingItems().clear();
mActionModeHandler.dismiss();
deleteNote(waitToDelete);
}

10
app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java
View File

@@ -43,11 +43,7 @@ public class ActionModeHandler<T> {
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
boolean isProceed = mCallback.onAction(item.getItemId(), mPendingItems);
if (isProceed) {
mPendingItems.clear();
}
return isProceed;
return mCallback.onAction(item.getItemId(), mPendingItems);
}
@Override
@@ -66,6 +62,10 @@ public class ActionModeHandler<T> {
mCallback = callback;
}
public List<T> getPendingItems() {
return mPendingItems;
}
/**
*
* @param item