Skip to content

Commit 9877c7f

Browse files
ravikumar-nKaushik Gopal
authored and
Kaushik Gopal
committed
Replaced RxJava1 RxRelay with RxJava2 version
1 parent 613acb9 commit 9877c7f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
compile "com.github.akarnokd:rxjava2-interop:0.6.1"
5252

5353
compile 'io.reactivex:rxjava-math:1.0.0'
54-
compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
54+
compile 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
5555
compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
5656
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
5757

app/src/main/java/com/morihacky/android/rxjava/rxbus/RxBus.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package com.morihacky.android.rxjava.rxbus;
22

3-
import com.jakewharton.rxrelay.PublishRelay;
4-
import com.jakewharton.rxrelay.Relay;
5-
import hu.akarnokd.rxjava.interop.RxJavaInterop;
3+
import com.jakewharton.rxrelay2.PublishRelay;
4+
import com.jakewharton.rxrelay2.Relay;
5+
6+
import io.reactivex.BackpressureStrategy;
67
import io.reactivex.Flowable;
78

89
/**
910
* courtesy: https://gist.github.com/benjchristensen/04eef9ca0851f3a5d7bf
1011
*/
1112
public class RxBus {
1213

13-
private final Relay<Object, Object> _bus = PublishRelay.create().toSerialized();
14+
private final Relay<Object> _bus = PublishRelay.create().toSerialized();
1415

1516
public void send(Object o) {
16-
_bus.call(o);
17+
_bus.accept(o);
1718
}
1819

1920
public Flowable<Object> asFlowable() {
20-
// this won't be necessary after https://github.com/JakeWharton/RxRelay/pull/20 is complete
21-
return RxJavaInterop.toV2Flowable(_bus.asObservable());
21+
return _bus.toFlowable(BackpressureStrategy.LATEST);
2222
}
2323

2424
public boolean hasObservers() {

0 commit comments

Comments
 (0)