From ae197df4f316976d83ca29337ce36a41870887da Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Thu, 9 Jun 2016 18:25:33 +0300
Subject: [PATCH] bug with endless loading fixed

---
 .../listing/adapters/ObservableCollectionAdapter.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/listing/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/listing/adapters/ObservableCollectionAdapter.java
index d12a871..62301f1 100644
--- a/src/main/java/ru/touchin/roboswag/components/listing/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/listing/adapters/ObservableCollectionAdapter.java
@@ -77,12 +77,9 @@ public abstract class ObservableCollectionAdapter<TItem, TViewHolder extends Obs
         newItemsUpdatingObservable = uiBindable.untilStop(observableCollectionSubject
                 .switchMap(observableCollection -> observableCollection != null ? observableCollection.loadItem(0) : Observable.empty()));
         historyPreLoadingObservable = uiBindable.untilStop(observableCollectionSubject
-                .switchMap(observableCollection -> observableCollection != null
-                        ? Observable.just(observableCollection).concatWith(observableCollection.observeChanges().map(ignored -> observableCollection))
-                        : Observable.<ObservableCollection>empty())
-                .switchMap(changedObservableCollection -> {
-                    final int size = changedObservableCollection.size();
-                    return changedObservableCollection.loadRange(size, size + PRE_LOADING_COUNT);
+                .switchMap(observableCollection -> {
+                    final int size = observableCollection.size();
+                    return observableCollection.loadRange(size, size + PRE_LOADING_COUNT);
                 }));
     }