Merge pull request #157 from evant/lifecycle-fix

Fix issues with setting the lifecycle owner before a bind.
evant · Feb 21, 2019 · 1657869 · 1657869
2 parents 9d54ebc + b17f13a
commit 1657869
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...ionadapter/src/main/java/me/tatarka/bindingcollectionadapter2/BindingListViewAdapter.java b/...ionadapter/src/main/java/me/tatarka/bindingcollectionadapter2/BindingListViewAdapter.java
@@ -106,7 +106,9 @@ public ViewDataBinding onCreateBinding(@NonNull LayoutInflater inflater, @Layout
 
     @Override
     public void onBindBinding(@NonNull ViewDataBinding binding, int variableId, @LayoutRes int layoutRes, int position, T item) {
-        if (itemBinding.bind(binding, item)) {
+        boolean bound = itemBinding.bind(binding, item);
+        binding.setLifecycleOwner(lifecycleOwner);
+        if (bound) {
             binding.executePendingBindings();
         }
     }
@@ -166,7 +168,6 @@ public final View getView(int position, @Nullable View convertView, @NonNull Vie
         }
 
         View view = binding.getRoot();
-        binding.setLifecycleOwner(lifecycleOwner);
 
         T item = items.get(position);
         onBindBinding(binding, itemBinding.variableId(), layoutRes, position, item);
@@ -194,7 +195,6 @@ public final View getDropDownView(int position, @Nullable View convertView, @Non
             }
 
             View view = binding.getRoot();
-            binding.setLifecycleOwner(lifecycleOwner);
 
             T item = items.get(position);
             onBindBinding(binding, itemBinding.variableId(), layoutRes, position, item);

diff --git a/...onadapter/src/main/java/me/tatarka/bindingcollectionadapter2/BindingViewPagerAdapter.java b/...onadapter/src/main/java/me/tatarka/bindingcollectionadapter2/BindingViewPagerAdapter.java
@@ -93,7 +93,9 @@ public ViewDataBinding onCreateBinding(@NonNull LayoutInflater inflater, @Layout
 
     @Override
     public void onBindBinding(@NonNull ViewDataBinding binding, int variableId, @LayoutRes int layoutRes, int position, T item) {
-        if (itemBinding.bind(binding, item)) {
+        boolean bound = itemBinding.bind(binding, item);
+        binding.setLifecycleOwner(lifecycleOwner);
+        if (bound) {
             binding.executePendingBindings();
         }
     }