encapsulate and protect

emilsjolander · May 17, 2020 · 6a3fcbc · 6a3fcbc
1 parent 9294ffb
commit 6a3fcbc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersAdapter.java b/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersAdapter.java
@@ -13,15 +13,24 @@
  */
 class ExpandableStickyListHeadersAdapter extends BaseAdapter implements StickyListHeadersAdapter {
 
-    protected final StickyListHeadersAdapter mInnerAdapter;
-    DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<View, Long>();
-    DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<Integer, View>();
-    List<Long> mCollapseHeaderIds = new ArrayList<>();
+    final StickyListHeadersAdapter mInnerAdapter;
+    private DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<>();
+    private DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<>();
+
+    private List<Long> mCollapseHeaderIds = new ArrayList<>();
 
     ExpandableStickyListHeadersAdapter(StickyListHeadersAdapter innerAdapter){
         this.mInnerAdapter = innerAdapter;
     }
 
+    public List<Long> getCollapseHeaderIds() {
+        return mCollapseHeaderIds;
+    }
+
+    public void setCollapseHeaderIds(List<Long> collapseHeaderIds) {
+        this.mCollapseHeaderIds = new ArrayList<>(collapseHeaderIds);
+    }
+
     @Override
     public View getHeaderView(int position, View convertView, ViewGroup parent) {
         return mInnerAdapter.getHeaderView(position,convertView,parent);
@@ -110,7 +119,7 @@ public boolean isHeaderCollapsed(long headerId){
 
     public void expand(long headerId) {
         if(isHeaderCollapsed(headerId)){
-            mCollapseHeaderIds.remove((Object) headerId);
+            mCollapseHeaderIds.remove(headerId);
         }
     }
 

diff --git a/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java
@@ -102,11 +102,11 @@ public boolean isHeaderCollapsed(long headerId){
     }
 
     public List<Long> getCollapsedHeaderIds() {
-        return mExpandableStickyListHeadersAdapter.mCollapseHeaderIds;
+        return mExpandableStickyListHeadersAdapter.getCollapseHeaderIds();
     }
 
     public void setCollapsedHeaderIds(List<Long> collapsedHeaderIds ) {
-        mExpandableStickyListHeadersAdapter.mCollapseHeaderIds = collapsedHeaderIds;
+        mExpandableStickyListHeadersAdapter.setCollapseHeaderIds(collapsedHeaderIds);
     }
 
     public void setAnimExecutor(IAnimationExecutor animExecutor) {