fix: merge conflict rxjava_2

Author: Kaushik Gopal

README.md

@@ -8,7 +8,6 @@ I've also been giving talks about Learning Rx using many of the examples listed
 * [Learning RxJava For Android by Example : Part 1](https://www.youtube.com/watch?v=k3D0cWyNno4) \[[slides](https://speakerdeck.com/kaushikgopal/learning-rxjava-for-android-by-example)\] (SF Android Meetup 2015)
 * [Learning Rx by Example : Part 2](https://vimeo.com/190922794) \[[slides](https://speakerdeck.com/kaushikgopal/learning-rx-by-example-2)\] (Øredev 2016)
 
-
 ## Examples:
 
 1. [Background work & concurrency (using Schedulers)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#1-background-work--concurrency-using-schedulers)
@@ -26,6 +25,7 @@ I've also been giving talks about Learning Rx using many of the examples listed
 13. [Networking with Volley](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#13-networking-with-volley)
 14. [Pagination with Rx (using Subjects)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#14-pagination-with-rx-using-subjects)
 15. [Orchestrating Observable: make parallel network calls, then combine the result into a single data point (using flatmap & zip)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#15-orchestrating-observable-make-parallel-network-calls-then-combine-the-result-into-a-single-data-point-using-flatmap--zip)
+16. [Simple Timeout example (using timeout)]()
 
 ## Description
 
@@ -215,12 +215,20 @@ The below ascii diagram expresses the intention of our next example with panache
 
 The code for this example has already been written by one Mr.skehlet in the interwebs. Head over to [the gist](https://gist.github.com/skehlet/9418379) for the code. It's written in pure Java (6) so it's pretty comprehensible if you've understood the previous examples. I'll flush it out here again when time permits or I've run out of other compelling examples.
 
-## Work in Progress:
+### 16. Simple Timeout example (using timeout)
+
+This is a simple example demonstrating the use of the `.timeout` operator. Button 1 will complete the task before the timeout constraint, while Button 2 will force a timeout error.
+
+Notice how we can provide a custom Observable that indicates how to react under a timeout Exception.
+
+## Rx 2.x
 
-_Examples that I would like to have here, but haven't found the time yet to flush out_
+All the examples here have been migrated to use RxJava 2.X.
 
-(queue is empty) 
+* Have a look at [PR #83 to see the diff of changes between RxJava 1 and 2](https://github.com/kaushikgopal/RxJava-Android-Samples/pull/83/files)
+* [What's different in Rx 2.x](https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0)
 
+We use [David Karnok's Interop library](https://github.com/akarnokd/RxJava2Interop) in some cases as certain libraries like RxBindings, RxRelays, RxJava-Math etc. have not been ported yet to 2.x.
 
 ## Contributing:
 

app/build.gradle

@@ -29,23 +29,34 @@ dependencies {
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
 
-    compile 'io.reactivex:rxandroid:1.2.0'
-    // Because RxAndroid releases are few and far between, it is recommended you also
-    // explicitly depend on RxJava's latest version for bug fixes and new features.
-    compile 'io.reactivex:rxjava:1.1.4'
-    compile 'io.reactivex:rxjava-math:1.0.0'
     compile 'com.github.kaushikgopal:CoreTextUtils:c703fa12b6'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     compile 'com.jakewharton.timber:timber:2.4.2'
     compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
-    compile "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
     compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     compile "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"
     compile 'com.mcxiaoke.volley:library:1.0.19'
 
+    // ----------------------------------
+    //  Rx dependencies
+
+    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+
+    // Because RxAndroid releases are few and far between, it is recommended you also
+    // explicitly depend on RxJava's latest version for bug fixes and new features.
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    // libs like rxbinding + rxjava-math haven't been ported to RxJava 2.x yet, so this helps
+    compile "com.github.akarnokd:rxjava2-interop:0.6.1"
+
+    compile 'io.reactivex:rxjava-math:1.0.0'
+    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
+    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
+    compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
+
+    // ----------------------------------
+
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
 }
@@ -71,4 +82,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    packagingOptions {
+        pickFirst  'META-INF/rxjava.properties'
+    }
 }

app/src/main/java/com/morihacky/android/rxjava/MainActivity.java

@@ -13,15 +13,6 @@ public class MainActivity
 
     private RxBus _rxBus = null;
 
-    // This is better done with a DI Library like Dagger
-    public RxBus getRxBusSingleton() {
-        if (_rxBus == null) {
-            _rxBus = new RxBus();
-        }
-
-        return _rxBus;
-    }
-
     @Override
     public void onBackPressed() {
         super.onBackPressed();
@@ -34,24 +25,37 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction()
-                  .replace(android.R.id.content, new MainFragment(), this.toString())
-                  .commit();
+                                       .replace(android.R.id.content, new MainFragment(), this.toString())
+                                       .commit();
         }
     }
 
+    // This is better done with a DI Library like Dagger
+    public RxBus getRxBusSingleton() {
+        if (_rxBus == null) {
+            _rxBus = new RxBus();
+        }
+
+        return _rxBus;
+    }
+
     private void _removeWorkerFragments() {
-        Fragment frag = getSupportFragmentManager()//
-              .findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
+        Fragment frag = getSupportFragmentManager().findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
 
         if (frag != null) {
-            getSupportFragmentManager().beginTransaction().remove(frag).commit();
+            getSupportFragmentManager()
+                  .beginTransaction()
+                  .remove(frag)
+                  .commit();
         }
 
-        frag = getSupportFragmentManager()//
-              .findFragmentByTag(RotationPersist2WorkerFragment.class.getName());
+        frag = getSupportFragmentManager().findFragmentByTag(RotationPersist2WorkerFragment.class.getName());
 
         if (frag != null) {
-            getSupportFragmentManager().beginTransaction().remove(frag).commit();
+            getSupportFragmentManager()
+                  .beginTransaction()
+                  .remove(frag)
+                  .commit();
         }
     }
 }

app/src/main/java/com/morihacky/android/rxjava/MyApp.java

@@ -1,7 +1,6 @@
 package com.morihacky.android.rxjava;
 
 import android.app.Application;
-
 import com.morihacky.android.rxjava.volley.MyVolley;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -28,6 +27,9 @@ public void onCreate() {
         _instance = (MyApp) getApplicationContext();
         _refWatcher = LeakCanary.install(this);
 
+        // for better RxJava debugging
+        //RxJavaHooks.enableAssemblyTracking();
+
         // Initialize Volley
         MyVolley.init(this);
 

app/src/main/java/com/morihacky/android/rxjava/RxUtils.java

@@ -20,9 +20,10 @@
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
+import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.observers.DisposableObserver;
 import timber.log.Timber;
 
 /**
@@ -48,18 +49,18 @@ public class BufferDemoFragment
     private LogAdapter _adapter;
     private List<String> _logs;
 
-    private Subscription _subscription;
+    private Disposable _disposable;
 
     @Override
     public void onResume() {
         super.onResume();
-        _subscription = _getBufferedSubscription();
+        _disposable = _getBufferedDisposable();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        _subscription.unsubscribe();
+        _disposable.dispose();
     }
 
     @Override
@@ -85,19 +86,19 @@ public View onCreateView(LayoutInflater inflater,
     // -----------------------------------------------------------------------------------
     // Main Rx entities
 
-    private Subscription _getBufferedSubscription() {
-        return RxView.clickEvents(_tapBtn)
+    private Disposable _getBufferedDisposable() {
+        return  RxJavaInterop.toV2Observable(RxView.clickEvents(_tapBtn))
               .map(onClickEvent -> {
                   Timber.d("--------- GOT A TAP");
                   _log("GOT A TAP");
                   return 1;
               })
               .buffer(2, TimeUnit.SECONDS)
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(new Observer<List<Integer>>() {
+              .subscribeWith(new DisposableObserver<List<Integer>>() {
 
                   @Override
-                  public void onCompleted() {
+                  public void onComplete() {
                       // fyi: you'll never reach here
                       Timber.d("----- onCompleted");
                   }

app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java

@@ -15,14 +15,13 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.morihacky.android.rxjava.R;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.observers.DisposableObserver;
+import io.reactivex.schedulers.Schedulers;
 import java.util.ArrayList;
 import java.util.List;
-import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-import rx.subscriptions.CompositeSubscription;
 import timber.log.Timber;
 
 public class ConcurrencyWithSchedulersDemoFragment
@@ -33,13 +32,13 @@ public class ConcurrencyWithSchedulersDemoFragment
 
     private LogAdapter _adapter;
     private List<String> _logs;
-    private CompositeSubscription _subscriptions = new CompositeSubscription();
+    private CompositeDisposable _disposables = new CompositeDisposable();
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         ButterKnife.unbind(this);
-        _subscriptions.clear();
+        _disposables.clear();
     }
 
     @Override
@@ -63,12 +62,14 @@ public void startLongOperation() {
         _progress.setVisibility(View.VISIBLE);
         _log("Button Clicked");
 
-        Subscription s = _getObservable()//
+        DisposableObserver<Boolean> d = _getDisposableObserver();
+
+        _getObservable()
               .subscribeOn(Schedulers.io())
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(_getObserver()); // Observer
+              .subscribe(d);
 
-        _subscriptions.add(s);
+        _disposables.add(d);
     }
 
     private Observable<Boolean> _getObservable() {
@@ -86,11 +87,11 @@ private Observable<Boolean> _getObservable() {
      * 2. onError
      * 3. onNext
      */
-    private Observer<Boolean> _getObserver() {
-        return new Observer<Boolean>() {
+    private DisposableObserver<Boolean> _getDisposableObserver() {
+        return new DisposableObserver<Boolean>() {
 
             @Override
-            public void onCompleted() {
+            public void onComplete() {
                 _log("On complete");
                 _progress.setVisibility(View.INVISIBLE);
             }

app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java

@@ -23,9 +23,10 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
+import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.observers.DisposableObserver;
 import timber.log.Timber;
 
 import static co.kaush.core.util.CoreNullnessUtils.isNotNullOrEmpty;
@@ -40,12 +41,12 @@ public class DebounceSearchEmitterFragment
     private LogAdapter _adapter;
     private List<String> _logs;
 
-    private Subscription _subscription;
+    private Disposable _disposable;
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        _subscription.unsubscribe();
+        _disposable.dispose();
         ButterKnife.unbind(this);
     }
 
@@ -70,20 +71,20 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         _setupLogger();
 
-        _subscription = RxTextView.textChangeEvents(_inputSearchText)
+        _disposable = RxJavaInterop.toV2Observable(RxTextView.textChangeEvents(_inputSearchText))
               .debounce(400, TimeUnit.MILLISECONDS)// default Scheduler is Computation
               .filter(changes -> isNotNullOrEmpty(_inputSearchText.getText().toString()))
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(_getSearchObserver());
+              .subscribeWith(_getSearchObserver());
     }
 
     // -----------------------------------------------------------------------------------
     // Main Rx entities
 
-    private Observer<TextViewTextChangeEvent> _getSearchObserver() {
-        return new Observer<TextViewTextChangeEvent>() {
+    private DisposableObserver<TextViewTextChangeEvent> _getSearchObserver() {
+        return new DisposableObserver<TextViewTextChangeEvent>() {
             @Override
-            public void onCompleted() {
+            public void onComplete() {
                 Timber.d("--------- onComplete");
             }