From 8925e5083e5a486f52157fff217e44a61d77f032 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Tue, 18 Apr 2017 21:54:57 +0300
Subject: [PATCH] small updates

---
 .../components/adapters/AdapterDelegate.java      | 15 ++++++++++++++-
 .../adapters/ObservableCollectionAdapter.java     |  1 +
 .../components/utils/BaseLifecycleBindable.java   |  8 ++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index 3465312..f7bdadd 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -1,13 +1,21 @@
 package ru.touchin.roboswag.components.adapters;
 
-
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import java.util.List;
 
+import ru.touchin.roboswag.components.utils.LifecycleBindable;
+
 public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder, TItem> {
 
+    @NonNull
+    private final LifecycleBindable lifecycleBindable;
+
+    public AdapterDelegate(@NonNull final LifecycleBindable lifecycleBindable) {
+        this.lifecycleBindable = lifecycleBindable;
+    }
+
     public abstract int getItemViewType();
 
     public abstract boolean isForViewType(@NonNull final Object item, final int adapterPosition, final int itemCollectionPosition);
@@ -27,4 +35,9 @@ public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder, TI
         //do nothing by default
     }
 
+    @NonNull
+    protected LifecycleBindable getLifecycleBindable() {
+        return lifecycleBindable;
+    }
+
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index 956d33c..43bed1d 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -98,6 +98,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
                         innerCollection.clear();
                         return Observable.empty();
                     }
+                    innerCollection.set(collection.getItems());
                     return collection.observeChanges().observeOn(AndroidSchedulers.mainThread());
                 }), this::onApplyChanges);
         historyPreLoadingObservable = observableCollectionSubject
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
index b792d47..dae9481 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
@@ -60,7 +60,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onStart method.
      */
     public void onStart() {
-        if (isStartedSubject.hasValue() && !isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || !isStartedSubject.getValue()) {
             isStartedSubject.onNext(true);
         }
     }
@@ -71,7 +71,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * In that case onResume will be called after onSaveInstanceState so lifecycle object is becoming started.
      */
     public void onResume() {
-        if (isStartedSubject.hasValue() && !isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || !isStartedSubject.getValue()) {
             isStartedSubject.onNext(true);
         }
     }
@@ -80,7 +80,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onSaveInstanceState method.
      */
     public void onSaveInstanceState() {
-        if (isStartedSubject.hasValue() && isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || isStartedSubject.getValue()) {
             isStartedSubject.onNext(false);
         }
     }
@@ -89,7 +89,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onStop method.
      */
     public void onStop() {
-        if (isStartedSubject.hasValue() && isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || isStartedSubject.getValue()) {
             isStartedSubject.onNext(false);
         }
     }