Skip to content

Commit

Permalink
Update RxJava to version 1.1.0 and applied api changes in this version.
Browse files Browse the repository at this point in the history
  • Loading branch information
amatkivskiy committed Sep 25, 2016
1 parent 4cbd0ca commit aa615f6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion library/rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ publish {
dependencies {
compile 'com.github.amatkivskiy:gitter.sdk.core:1.5'
// compile project(':library:core')
compile 'io.reactivex:rxjava:1.0.10'
compile 'io.reactivex:rxjava:1.1.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.io.BufferedReader;
import java.io.IOException;

import rx.Subscriber;
import rx.observables.AbstractOnSubscribe;
import rx.Observer;
import rx.observables.SyncOnSubscribe;

public class OnSubscribeBufferedReader extends AbstractOnSubscribe<String, BufferedReader> {
public class OnSubscribeBufferedReader extends SyncOnSubscribe<BufferedReader, String> {

private final BufferedReader reader;

Expand All @@ -15,29 +15,28 @@ public OnSubscribeBufferedReader(BufferedReader reader) {
}

@Override
protected BufferedReader onSubscribe(Subscriber<? super String> subscriber) {
protected BufferedReader generateState() {
return reader;
}

@Override
protected void next(SubscriptionState<String, BufferedReader> state) {
BufferedReader reader = state.state();
protected BufferedReader next(BufferedReader state, Observer<? super String> observer) {
try {
String line = reader.readLine();
if (line == null) {
state.onCompleted();
observer.onCompleted();
} else {
state.onNext(line);
observer.onNext(line);
}
} catch (IOException e) {
state.onError(e);
observer.onError(e);
}

return reader;
}

@Override
protected void onTerminated(BufferedReader state) {
super.onTerminated(state);

protected void onUnsubscribe(BufferedReader state) {
if (state != null) {
try {
state.close();
Expand Down

0 comments on commit aa615f6

Please sign in to comment.