1515import butterknife .ButterKnife ;
1616import butterknife .OnClick ;
1717import 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 ;
1823import java .util .ArrayList ;
1924import 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 ;
2625import timber .log .Timber ;
2726
2827public class ConcurrencyWithSchedulersDemoFragment
@@ -33,13 +32,13 @@ public class ConcurrencyWithSchedulersDemoFragment
3332
3433 private LogAdapter _adapter ;
3534 private List <String > _logs ;
36- private CompositeSubscription _subscriptions = new CompositeSubscription ();
35+ private CompositeDisposable _disposables = new CompositeDisposable ();
3736
3837 @ Override
3938 public void onDestroy () {
4039 super .onDestroy ();
4140 ButterKnife .unbind (this );
42- _subscriptions .clear ();
41+ _disposables .clear ();
4342 }
4443
4544 @ Override
@@ -63,12 +62,14 @@ public void startLongOperation() {
6362 _progress .setVisibility (View .VISIBLE );
6463 _log ("Button Clicked" );
6564
66- Subscription s = _getObservable ()//
65+ DisposableObserver <Boolean > d = _getDisposableObserver ();
66+
67+ _getObservable ()
6768 .subscribeOn (Schedulers .io ())
6869 .observeOn (AndroidSchedulers .mainThread ())
69- .subscribe (_getObserver ()); // Observer
70+ .subscribe (d );
7071
71- _subscriptions .add (s );
72+ _disposables .add (d );
7273 }
7374
7475 private Observable <Boolean > _getObservable () {
@@ -86,11 +87,11 @@ private Observable<Boolean> _getObservable() {
8687 * 2. onError
8788 * 3. onNext
8889 */
89- private Observer <Boolean > _getObserver () {
90- return new Observer <Boolean >() {
90+ private DisposableObserver <Boolean > _getDisposableObserver () {
91+ return new DisposableObserver <Boolean >() {
9192
9293 @ Override
93- public void onCompleted () {
94+ public void onComplete () {
9495 _log ("On complete" );
9596 _progress .setVisibility (View .INVISIBLE );
9697 }
0 commit comments