Merge branch 'feature/make_wrapper_adapters_safe_after_released' into…

… develop
ynheng · Nov 7, 2015 · 710b001 · 710b001
2 parents 766a75b + 823954a
commit 710b001
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...java/com/h6ah4i/android/widget/advrecyclerview/swipeable/SwipeableItemWrapperAdapter.java b/...java/com/h6ah4i/android/widget/advrecyclerview/swipeable/SwipeableItemWrapperAdapter.java
@@ -77,11 +77,16 @@ public void onViewRecycled(VH holder) {
 
         // reset SwipeableItemViewHolder state
         if (holder instanceof SwipeableItemViewHolder) {
-            mSwipeManager.cancelPendingAnimations(holder);
+            if (mSwipeManager != null) {
+                mSwipeManager.cancelPendingAnimations(holder);
+            }
+
+            SwipeableItemViewHolder swipeableHolder = (SwipeableItemViewHolder) holder;
 
-            setSwipeItemSlideAmount(((SwipeableItemViewHolder) holder), 0.0f, swipeHorizontal());
+            swipeableHolder.setSwipeItemHorizontalSlideAmount(0);
+            swipeableHolder.setSwipeItemVerticalSlideAmount(0);
 
-            View containerView = ((SwipeableItemViewHolder) holder).getSwipeableContainerView();
+            View containerView = swipeableHolder.getSwipeableContainerView();
 
             if (containerView != null) {
                 ViewCompat.animate(containerView).cancel();

diff --git a/...ary/src/main/java/com/h6ah4i/android/widget/advrecyclerview/utils/BaseWrapperAdapter.java b/...ary/src/main/java/com/h6ah4i/android/widget/advrecyclerview/utils/BaseWrapperAdapter.java
@@ -41,7 +41,7 @@ public BaseWrapperAdapter(RecyclerView.Adapter<VH> adapter) {
         super.setHasStableIds(mWrappedAdapter.hasStableIds());
     }
 
-    private boolean isWrappedAdapterAlive(){
+    public boolean isWrappedAdapterAlive(){
         return mWrappedAdapter!=null;
     }