From c9998c1c21583286f55493ea9388d930c5b626df Mon Sep 17 00:00:00 2001
From: xingxing <xxx823952375@gmail.com>
Date: Sat, 18 Feb 2017 14:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DActionMode=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=88=A0=E9=99=A4=E7=AC=94=E8=AE=B0=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=EF=BC=8Clist=E4=B8=BAnull?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/houxg/leamonax/ui/NoteFragment.java  |  1 +
 .../java/org/houxg/leamonax/ui/SearchActivity.java     |  1 +
 .../org/houxg/leamonax/utils/ActionModeHandler.java    | 10 +++++-----
 3 files changed, 7 insertions(+), 5 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 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<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