Upgrade autodispose

Author: nekocode

app/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     // ReactiveX
     implementation "io.reactivex.rxjava2:rxjava:2.1.8"
     implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
-    def AUTO_DISPOSE_VERSION = "0.4.0"
+    def AUTO_DISPOSE_VERSION = "0.8.0"
     implementation "com.uber.autodispose:autodispose:${AUTO_DISPOSE_VERSION}"
     implementation "com.uber.autodispose:autodispose-android:${AUTO_DISPOSE_VERSION}"
     implementation "com.uber.autodispose:autodispose-android-archcomponents:${AUTO_DISPOSE_VERSION}"

app/src/main/java/cn/nekocode/gank/base/BaseActivity.kt

@@ -19,6 +19,11 @@ package cn.nekocode.gank.base
 import android.support.v4.app.NavUtils
 import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
+import com.uber.autodispose.*
+import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
+import io.reactivex.*
+import io.reactivex.annotations.CheckReturnValue
+import io.reactivex.parallel.ParallelFlowable
 
 /**
  * @author nekocode ([email protected])
@@ -40,4 +45,28 @@ open class BaseActivity: AppCompatActivity() {
             }
         }
     }
+
+    private val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }
+
+    /**
+     * Modified from https://github.com/uber/AutoDispose
+     */
+    @CheckReturnValue
+    fun <T> Flowable<T>.autoDisposable(): FlowableSubscribeProxy<T>
+            = this.`as`(AutoDispose.autoDisposable(scopeProvider))
+    @CheckReturnValue
+    fun <T> Observable<T>.autoDisposable(): ObservableSubscribeProxy<T>
+            = this.`as`(AutoDispose.autoDisposable(scopeProvider))
+    @CheckReturnValue
+    fun <T> Single<T>.autoDisposable(): SingleSubscribeProxy<T>
+            = this.`as`(AutoDispose.autoDisposable(scopeProvider))
+    @CheckReturnValue
+    fun <T> Maybe<T>.autoDisposable(): MaybeSubscribeProxy<T>
+            = this.`as`(AutoDispose.autoDisposable(scopeProvider))
+    @CheckReturnValue
+    fun Completable.autoDisposable(): CompletableSubscribeProxy
+            = this.`as`(AutoDispose.autoDisposable<Any>(scopeProvider))
+    @CheckReturnValue
+    fun <T> ParallelFlowable<T>.autoDisposable(): ParallelFlowableSubscribeProxy<T>
+            = this.`as`(AutoDispose.autoDisposable(scopeProvider))
 }

app/src/main/java/cn/nekocode/gank/ui/pic/PicActivity.kt

@@ -26,8 +26,6 @@ import cn.nekocode.gank.gankIoService
 import com.evernote.android.state.State
 import com.evernote.android.state.StateSaver
 import com.squareup.picasso.Picasso
-import com.uber.autodispose.AutoDispose
-import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -63,7 +61,7 @@ class PicActivity : BaseActivity() {
                     }
         }
                 .observeOn(AndroidSchedulers.mainThread())
-                .to(AutoDispose.with(AndroidLifecycleScopeProvider.from(this)).forSingle())
+                .autoDisposable()
                 .subscribe({ pic ->
                     title = pic.id
                     Picasso.with(this).load(pic.url).centerCrop().fit().into(imageView)