From 736a64e0c8d3976e23401dba57d8b7b91d3aec04 Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Tue, 7 Jun 2016 19:30:58 +0300 Subject: [PATCH] null filter added --- .../observables/collections/ObservableCollection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java b/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java index 5dc63e4..0abbb71 100644 --- a/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java +++ b/src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java @@ -76,7 +76,13 @@ public abstract class ObservableCollection { for (int i = first; i <= last; i++) { itemsRequests.add(loadItem(i)); } - return Observable.concatEager(itemsRequests).toList(); + return Observable.concatEager(itemsRequests).toList().doOnNext(list -> { + for (int i = list.size() - 1; i >= 0; i--) { + if (list.get(i) == null) { + list.remove(i); + } + } + }); } public static class CollectionChange {