support rxjava2 and release to v2.0

Author: JessYanCoding

app/build.gradle

@@ -26,5 +26,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'me.jessyan:rxerrorhandler:1.0.1'
+//    compile 'me.jessyan:rxerrorhandler:1.0.1'
+    compile project(':rxerrorhandler')
 }

app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java

@@ -5,11 +5,11 @@
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
+import io.reactivex.Observable;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
 import me.jessyan.rxerrorhandler.handler.RetryWithDelay;
 import me.jessyan.rxerrorhandler.handler.listener.ResponseErroListener;
-import rx.Observable;
 
 public class MainActivity extends AppCompatActivity {
     private final String TAG = getClass().getSimpleName();
@@ -38,7 +38,6 @@ public void handleResponseError(Context context, Exception e) {
                     public void onNext(Object o) {
 
                     }
-
                 });
     }
 }

rxerrorhandler/bintray.gradle

@@ -19,7 +19,7 @@ publish {
     userOrg = 'jessyancoding'      //bintray注册的用户名
     groupId = 'me.jessyan'         //compile引用时的第1部分groupId
     artifactId = 'rxerrorhandler'     //compile引用时的第2部分项目名
-    publishVersion = '1.0.1'    //compile引用时的第3部分版本号
+    publishVersion = '2.0'    //compile引用时的第3部分版本号
     desc = 'Error Handle Of Rxjava'
     website = siteUrl
 }

rxerrorhandler/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 1
+        versionName "2.0"
     }
     buildTypes {
         release {
@@ -21,8 +21,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'io.reactivex:rxjava:1.2.6'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+
 }
 
 

rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandleSubscriber.java

@@ -1,30 +1,39 @@
 package me.jessyan.rxerrorhandler.handler;
 
+import io.reactivex.Observer;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
-import rx.Subscriber;
 
 /**
  * Created by jess on 9/2/16 14:41
  * Contact with jess.yan.effort@gmail.com
  */
 
-public abstract class ErrorHandleSubscriber<T> extends Subscriber<T> {
+public abstract class ErrorHandleSubscriber<T> implements Observer<T> {
     private ErrorHandlerFactory mHandlerFactory;
 
     public ErrorHandleSubscriber(RxErrorHandler rxErrorHandler){
         this.mHandlerFactory = rxErrorHandler.getHandlerFactory();
     }
 
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+
+    }
+
+
     @Override
-    public void onCompleted() {
+    public void onComplete() {
 
     }
 
+
     @Override
-    public void onError(Throwable e) {
+    public void onError(@NonNull Throwable e) {
         e.printStackTrace();
         mHandlerFactory.handleError(e);
     }
-
 }
 

rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/RetryWithDelay.java

@@ -4,15 +4,18 @@
 
 import java.util.concurrent.TimeUnit;
 
-import rx.Observable;
-import rx.functions.Func1;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.functions.Function;
 
 /**
  * Created by jess on 9/2/16 14:32
  * Contact with jess.yan.effort@gmail.com
  */
 public class RetryWithDelay implements
-        Func1<Observable<? extends Throwable>, Observable<?>> {
+        Function<Observable<Throwable>, ObservableSource<?>> {
+
     public final String TAG = this.getClass().getSimpleName();
     private final int maxRetries;
     private final int retryDelaySecond;
@@ -24,11 +27,12 @@ public RetryWithDelay(int maxRetries, int retryDelaySecond) {
     }
 
     @Override
-    public Observable<?> call(Observable<? extends Throwable> attempts) {
-        return attempts
-                .flatMap(new Func1<Throwable, Observable<?>>() {
+    public ObservableSource<?> apply(@NonNull Observable<Throwable> throwableObservable) throws Exception {
+
+        return throwableObservable
+                .flatMap(new Function<Throwable, ObservableSource<?>>() {
                     @Override
-                    public Observable<?> call(Throwable throwable) {
+                    public ObservableSource<?> apply(@NonNull Throwable throwable) throws Exception {
                         if (++retryCount <= maxRetries) {
                             // When this Observable calls onNext, the original Observable will be retried (i.e. re-subscribed).
                             Log.d(TAG, "get error, it will try after " + retryDelaySecond