diff --git a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java index 53d5ccc..95b4cd8 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -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); } diff --git a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java index 5793333..c227942 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java @@ -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); } diff --git a/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java b/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java index 341b15a..108d2f5 100644 --- a/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java +++ b/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java @@ -43,11 +43,7 @@ public class ActionModeHandler { @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 { mCallback = callback; } + public List getPendingItems() { + return mPendingItems; + } + /** * * @param item