From 9051f8074e36bae99eff3288ef63b6cec4babb6c Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 5 Jul 2017 15:25:09 +0300
Subject: [PATCH] Changes fix

---
 build.gradle                                      |  6 +++---
 src/main/java/ru/touchin/templates/chat/Chat.java | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index b0cdb80..08a258b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ dependencies {
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'io.reactivex:rxjava:1.3.0'
 
-    provided 'com.android.support:appcompat-v7:25.3.1'
-    provided 'com.android.support:recyclerview-v7:25.3.1'
+    provided 'com.android.support:appcompat-v7:25.4.0'
+    provided 'com.android.support:recyclerview-v7:25.4.0'
 
     provided 'com.squareup.retrofit2:retrofit:2.3.0'
     provided('com.google.http-client:google-http-client-jackson2:1.22.0') {
@@ -44,7 +44,7 @@ dependencies {
         exclude group: 'org.json', module: 'json'
     }
 
-    provided('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+    provided('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
 
diff --git a/src/main/java/ru/touchin/templates/chat/Chat.java b/src/main/java/ru/touchin/templates/chat/Chat.java
index b8b38db..fd32b55 100644
--- a/src/main/java/ru/touchin/templates/chat/Chat.java
+++ b/src/main/java/ru/touchin/templates/chat/Chat.java
@@ -31,7 +31,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.observables.collections.Change;
 import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
 import ru.touchin.roboswag.core.observables.collections.ObservableList;
 import rx.Completable;
@@ -77,15 +76,8 @@ public abstract class Chat<TOutgoingMessage> {
                     final List<TOutgoingMessage> reversedMessages = new ArrayList<>(initialMessages);
                     Collections.reverse(reversedMessages);
                     return Observable.from(reversedMessages)
-                            .concatWith(sendingMessages.observeChanges().concatMap(changes -> {
-                                final Collection<TOutgoingMessage> insertedMessages = new ArrayList<>();
-                                for (final Change<TOutgoingMessage> change : changes.getChanges()) {
-                                    if (change.getType() == Change.Type.INSERTED) {
-                                        insertedMessages.addAll(change.getChangedItems());
-                                    }
-                                }
-                                return insertedMessages.isEmpty() ? Observable.empty() : Observable.from(insertedMessages);
-                            }))
+                            .concatWith(sendingMessages.observeChanges().concatMap(changes ->
+                                    changes.getInsertedItems().isEmpty() ? Observable.empty() : Observable.from(changes.getInsertedItems())))
                             //observe on some scheduler?
                             .flatMap(message -> internalSendMessage(message).toObservable());
                 });