Fixed #565 - Confirm item deletion from list after the adapter is filtered.

Author: davideas

flexible-adapter-ui/src/main/java/eu/davidea/flexibleadapter/helpers/UndoHelper.java

@@ -72,7 +72,7 @@ public class UndoHelper extends Snackbar.Callback implements FlexibleAdapter.OnD
     private boolean consecutive = false;
     private List<Integer> mPositions = null;
     private Object mPayload = null;
-    private FlexibleAdapter mAdapter;
+    private FlexibleAdapter<?> mAdapter;
     private OnActionListener mUndoListener;
     private Snackbar mSnackbar;
 
@@ -230,7 +230,7 @@ public void onDeleteConfirmed(int event) {
             Log.v("onActionConfirmed event=%s", event);
             mUndoListener.onActionConfirmed(mAction, event);
         }
-        mAdapter.emptyBin();
+        mAdapter.confirmDeletion();
         // Trigger manual dismiss event
         // Avoid circular calls!
         if (mSnackbar.isShown() && (mAction == Action.REMOVE && !mAdapter.isRestoreInTime())) {

flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java

@@ -3501,6 +3501,9 @@ public void removeRange(@IntRange(from = 0) int positionStart,
             }
             // Remove item from internal list
             mItems.remove(positionStart);
+            if (permanentDelete && mOriginalList != null) {
+                mOriginalList.remove(item);
+            }
             removeSelection(position);
         }
 
@@ -3680,10 +3683,24 @@ public void restoreDeletedItems() {
         emptyBin();
     }
 
+    /**
+     * Performs removal confirmation and cleans memory by synchronizing the internal list from deletion.
+     * <p><b>Note:</b> This method is automatically called after timer is over in UndoHelper.</p>
+     *
+     * @since 5.0.1
+     */
+    public void confirmDeletion() {
+        log.d("confirmDeletion!");
+        if (mOriginalList != null) {
+            mOriginalList.removeAll(getDeletedItems());
+        }
+        emptyBin();
+    }
+
     /**
      * Cleans memory from items just removed.
-     * <p><b>Note:</b> This method is automatically called after timer is over and after a
-     * restoration.</p>
+     * <p><b>Note:</b> This method is automatically called after timer is over in UndoHelper
+     * and after a restoration.</p>
      *
      * @since 3.0.0
      */
@@ -3697,7 +3714,7 @@ public synchronized void emptyBin() {
      * @return true if the restore list is not empty, false otherwise
      * @since 4.0.0
      */
-    public final boolean isRestoreInTime() {
+    public synchronized final boolean isRestoreInTime() {
         return mRestoreList != null && !mRestoreList.isEmpty();
     }
 
@@ -5386,13 +5403,14 @@ protected void onPreExecute() {
                 log.w("Cannot filter while endlessLoading");
                 this.cancel(true);
             }
-            // Note: In case some items are in pending deletion (Undo started),
-            // we commit the deletion before starting or resetting the filter.
-            if (isRestoreInTime() && mDeleteCompleteListener != null) {
+            // Note: In case of some deleted items, we commit the deletion in the original list
+            // and in the current list before starting or resetting the filter.
+            if (isRestoreInTime()) {
                 log.d("Removing all deleted items before filtering/updating");
                 newItems.removeAll(getDeletedItems());
-                if (mOriginalList != null) mOriginalList.removeAll(getDeletedItems());
-                mDeleteCompleteListener.onDeleteConfirmed(3); // Snackbar.Callback.DISMISS_EVENT_MANUAL = 3
+                if (mDeleteCompleteListener != null) {
+                    mDeleteCompleteListener.onDeleteConfirmed(3); // Snackbar.Callback.DISMISS_EVENT_MANUAL = 3
+                }
             }
         }
 
@@ -5487,8 +5505,9 @@ private void prepareItemsForUpdate(List<T> newItems) {
     @CallSuper
     protected void onPostUpdate() {
         // Call listener to update EmptyView, assuming the update always made a change
-        if (mUpdateListener != null)
+        if (mUpdateListener != null) {
             mUpdateListener.onUpdateEmptyView(getMainItemCount());
+        }
     }
 
     /**
@@ -5500,8 +5519,9 @@ protected void onPostUpdate() {
     @CallSuper
     protected void onPostFilter() {
         // Call listener to update FilterView, assuming the filter always made a change
-        if (mFilterListener != null)
+        if (mFilterListener != null) {
             mFilterListener.onUpdateFilterView(getMainItemCount());
+        }
     }
 
     /**