From f3e5de1d5f443862f38dc4c0ae8fd2d6c7704370 Mon Sep 17 00:00:00 2001 From: houxg Date: Thu, 9 Mar 2017 14:48:18 +0800 Subject: [PATCH] fix can't delete note --- app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java | 2 -- .../main/java/org/houxg/leamonax/ui/SearchActivity.java | 2 -- .../java/org/houxg/leamonax/utils/ActionModeHandler.java | 7 ++----- 3 files changed, 2 insertions(+), 9 deletions(-) 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 04dbefe..489dbe1 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -204,8 +204,6 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - mActionModeHandler.dismiss(); - mNoteList.invalidateAllSelected(); } }) .show(); 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 b7da0a4..8477425 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SearchActivity.java @@ -216,8 +216,6 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - mActionModeHandler.dismiss(); - mAdapter.invalidateAllSelected(); } }) .show(); 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..0f73ce0 100644 --- a/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java +++ b/app/src/main/java/org/houxg/leamonax/utils/ActionModeHandler.java @@ -43,16 +43,13 @@ 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 public void onDestroyActionMode(ActionMode mode) { mActionMode = null; + mPendingItems = null; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mContext.getWindow().setStatusBarColor(mContext.getResources().getColor(R.color.colorPrimary)); }