Skip to content

Commit 181fd4d

Browse files
authored
Merge pull request #146 from s0nerik/s0nerik-npe-livedata
Fixes potential NPE when items are in LiveData
2 parents 1657869 + adf877d commit 181fd4d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bindingcollectionadapter-recyclerview/src/main/java/me/tatarka/bindingcollectionadapter2/BindingRecyclerViewAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ public ViewDataBinding onCreateBinding(@NonNull LayoutInflater inflater, @Layout
108108

109109
@Override
110110
public void onBindBinding(@NonNull ViewDataBinding binding, int variableId, @LayoutRes int layoutRes, int position, T item) {
111-
if (itemBinding.bind(binding, item)) {
111+
boolean bound = itemBinding.bind(binding, item);
112+
binding.setLifecycleOwner(lifecycleOwner);
113+
if (bound) {
112114
binding.executePendingBindings();
113115
}
114116
}
@@ -195,8 +197,6 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position, @NonNull
195197
if (isForDataBinding(payloads)) {
196198
binding.executePendingBindings();
197199
} else {
198-
binding.setLifecycleOwner(lifecycleOwner);
199-
200200
T item = items.get(position);
201201
onBindBinding(binding, itemBinding.variableId(), itemBinding.layoutRes(), position, item);
202202
}

0 commit comments

Comments
 (0)