15
15
import butterknife .ButterKnife ;
16
16
import butterknife .OnClick ;
17
17
import com .morihacky .android .rxjava .R ;
18
+ import io .reactivex .Observable ;
19
+ import io .reactivex .android .schedulers .AndroidSchedulers ;
20
+ import io .reactivex .disposables .CompositeDisposable ;
21
+ import io .reactivex .observers .DisposableObserver ;
22
+ import io .reactivex .schedulers .Schedulers ;
18
23
import java .util .ArrayList ;
19
24
import java .util .List ;
20
- import rx .Observable ;
21
- import rx .Observer ;
22
- import rx .Subscription ;
23
- import rx .android .schedulers .AndroidSchedulers ;
24
- import rx .schedulers .Schedulers ;
25
- import rx .subscriptions .CompositeSubscription ;
26
25
import timber .log .Timber ;
27
26
28
27
public class ConcurrencyWithSchedulersDemoFragment
@@ -33,13 +32,13 @@ public class ConcurrencyWithSchedulersDemoFragment
33
32
34
33
private LogAdapter _adapter ;
35
34
private List <String > _logs ;
36
- private CompositeSubscription _subscriptions = new CompositeSubscription ();
35
+ private CompositeDisposable _disposables = new CompositeDisposable ();
37
36
38
37
@ Override
39
38
public void onDestroy () {
40
39
super .onDestroy ();
41
40
ButterKnife .unbind (this );
42
- _subscriptions .clear ();
41
+ _disposables .clear ();
43
42
}
44
43
45
44
@ Override
@@ -63,12 +62,14 @@ public void startLongOperation() {
63
62
_progress .setVisibility (View .VISIBLE );
64
63
_log ("Button Clicked" );
65
64
66
- Subscription s = _getObservable ()//
65
+ DisposableObserver <Boolean > d = _getDisposableObserver ();
66
+
67
+ _getObservable ()
67
68
.subscribeOn (Schedulers .io ())
68
69
.observeOn (AndroidSchedulers .mainThread ())
69
- .subscribe (_getObserver ()); // Observer
70
+ .subscribe (d );
70
71
71
- _subscriptions .add (s );
72
+ _disposables .add (d );
72
73
}
73
74
74
75
private Observable <Boolean > _getObservable () {
@@ -86,11 +87,11 @@ private Observable<Boolean> _getObservable() {
86
87
* 2. onError
87
88
* 3. onNext
88
89
*/
89
- private Observer <Boolean > _getObserver () {
90
- return new Observer <Boolean >() {
90
+ private DisposableObserver <Boolean > _getDisposableObserver () {
91
+ return new DisposableObserver <Boolean >() {
91
92
92
93
@ Override
93
- public void onCompleted () {
94
+ public void onComplete () {
94
95
_log ("On complete" );
95
96
_progress .setVisibility (View .INVISIBLE );
96
97
}
0 commit comments