Merge branch 'master' into master-rx-java-2
# Conflicts: # build.gradle
This commit is contained in:
commit
169f4ffec8
|
|
@ -33,6 +33,9 @@ dependencies {
|
|||
provided 'com.android.support:recyclerview-v7:25.3.1'
|
||||
|
||||
provided 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
provided('com.google.http-client:google-http-client-jackson2:1.22.0') {
|
||||
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
|
||||
}
|
||||
|
||||
provided 'com.facebook.fresco:fresco:1.3.0'
|
||||
provided 'com.bluelinelabs:logansquare:1.3.7'
|
||||
|
|
|
|||
|
|
@ -142,8 +142,7 @@ public abstract class SocketConnection {
|
|||
socket.off(socketEvent.getName());
|
||||
messagesObservableCache.remove(socketEvent);
|
||||
}))
|
||||
.replay(1)
|
||||
.refCount();
|
||||
.publish();
|
||||
messagesObservableCache.put(socketEvent, result);
|
||||
}
|
||||
return result;
|
||||
|
|
|
|||
Loading…
Reference in New Issue