RxLifecycle -> Autodispose

app/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.25.0'
+        classpath 'io.fabric.tools:gradle:1.25.1'
     }
 }
@@ -19,7 +19,6 @@ apply plugin: 'io.fabric'
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
     project.ext {
         LABCOAT_FABRIC_KEY = project.hasProperty("LABCOAT_FABRIC_KEY") ? project.LABCOAT_FABRIC_KEY : ""
@@ -101,13 +100,14 @@ ext {
     reptarVersion = '2.5.1'
     adapterLayout = '1.1.2'
     materialDialogsVersion = '0.9.6.0'
-    leakCanaryVersion = '1.5.3'
-    addendumVersion = '1.6.0'
+    leakCanaryVersion = '1.5.4'
+    addendumVersion = '1.7.1'
     moshiVersion = '1.5.0'
+    autodisposeVersion = '0.5.1'
 }
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation "com.android.support:support-v13:$supportLibVersion"
@@ -146,7 +146,9 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.1'
+    implementation "com.uber.autodispose:autodispose-kotlin:$autodisposeVersion"
+    implementation "com.uber.autodispose:autodispose-android-kotlin:$autodisposeVersion"
+    implementation "com.uber.autodispose:autodispose-android-archcomponents-kotlin:$autodisposeVersion"
     implementation "org.parceler:parceler-api:$parcelerVersion"
     kapt "org.parceler:parceler:$parcelerVersion"
@@ -210,7 +212,7 @@ dependencies {
     implementation 'com.atlassian.commonmark:commonmark:0.10.0'
-    normalImplementation('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
+    normalImplementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
         transitive = true
     }

app/src/main/java/com/commit451/gitlab/activity/AboutActivity.kt

@@ -20,7 +20,7 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.BuildConfig
 import com.commit451.gitlab.R
 import com.commit451.gitlab.api.GitLab
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.model.api.Contributor
 import com.commit451.gitlab.navigation.Navigator
@@ -102,7 +102,7 @@ class AboutActivity : BaseActivity() {
                     .build()
         }
         gitLab.getContributors(REPO_ID)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Contributor>>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt

@@ -29,16 +29,13 @@ import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueCreatedEvent
 import com.commit451.gitlab.extension.belongsToGroup
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.teleprinter.Teleprinter
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import retrofit2.Response
 import timber.log.Timber
 import java.util.*
@@ -135,7 +132,7 @@ class AddIssueActivity : MorphActivity() {
     private fun load() {
         App.get().gitLab.getMilestones(project.id, getString(R.string.milestone_state_value_default))
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Milestone>>() {
                     override fun error(t: Throwable) {
@@ -157,9 +154,7 @@ class AddIssueActivity : MorphActivity() {
                     }
                 })
         App.get().gitLab.getProjectMembers(project.id)
-                .compose(this.bindToLifecycle<Response<List<User>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(t: Throwable) {
@@ -173,7 +168,7 @@ class AddIssueActivity : MorphActivity() {
                         if (project.belongsToGroup()) {
                             Timber.d("Project belongs to a group, loading those users too")
                             App.get().gitLab.getGroupMembers(project.namespace.id)
-                                    .setup(bindToLifecycle())
+                                    .with(this@AddIssueActivity)
                                     .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                                         override fun error(t: Throwable) {
@@ -193,7 +188,7 @@ class AddIssueActivity : MorphActivity() {
                     }
                 })
         App.get().gitLab.getLabels(project.id)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Label>>() {
                     override fun error(t: Throwable) {
@@ -339,7 +334,7 @@ class AddIssueActivity : MorphActivity() {
     }
     private fun observeUpdate(observable: Single<Issue>) {
-        observable.setup(bindToLifecycle())
+        observable.with(this)
                 .subscribe(object : CustomSingleObserver<Issue>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt

@@ -19,7 +19,7 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.R.string.labels
 import com.commit451.gitlab.adapter.LabelAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -104,7 +104,7 @@ class AddLabelActivity : BaseActivity() {
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getLabels(projectId)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Label>>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt

@@ -16,14 +16,13 @@ import butterknife.OnClick
 import com.commit451.addendum.parceler.getParcelerParcelableExtra
 import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.addendum.themeAttrColor
-import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.api.converter.DashDateAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
 import com.commit451.gitlab.event.MilestoneCreatedEvent
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.teleprinter.Teleprinter
@@ -143,7 +142,7 @@ class AddMilestoneActivity : MorphActivity() {
     }
     fun createOrEditMilestone(observable: Single<Milestone>) {
-        observable.setup(bindToLifecycle())
+        observable.with(this)
                 .subscribe(object : CustomSingleObserver<Milestone>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt

@@ -22,13 +22,11 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.extension.checkValid
 import com.commit451.gitlab.extension.text
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.ColorUtil
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import retrofit2.HttpException
-import retrofit2.Response
 import timber.log.Timber
 /**
@@ -119,9 +117,7 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
             progress.alpha = 0.0f
             progress.animate().alpha(1.0f)
             App.get().gitLab.createLabel(projectId, title, color, description)
-                    .compose(this.bindToLifecycle<Response<Label>>())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
+                    .with(this)
                     .subscribe(object : CustomResponseSingleObserver<Label>() {
                         override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt

@@ -21,7 +21,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.UserAdapter
 import com.commit451.gitlab.dialog.AccessDialog
 import com.commit451.gitlab.event.MemberAddedEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.User
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
@@ -154,7 +154,7 @@ class AddUserActivity : MorphActivity() {
         swipeRefreshLayout.isRefreshing = true
         loading = true
         App.get().gitLab.searchUsers(query!!)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(t: Throwable) {
@@ -180,7 +180,7 @@ class AddUserActivity : MorphActivity() {
         adapter.setLoading(true)
         Timber.d("loadMore " + nextPageUrl!!.toString() + " " + query)
         App.get().gitLab.searchUsers(nextPageUrl!!.toString(), query!!)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(t: Throwable) {
@@ -198,7 +198,7 @@ class AddUserActivity : MorphActivity() {
     }
     private fun add(observable: Single<Response<User>>) {
-        observable.setup(bindToLifecycle())
+        observable.with(this)
                 .subscribe(object : CustomResponseSingleObserver<User>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt

@@ -18,9 +18,9 @@ import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.fadeIn
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.setup
-import com.commit451.gitlab.extension.toPart
 import com.commit451.gitlab.api.response.FileUploadResponse
+import com.commit451.gitlab.extension.toPart
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
 import pl.aprilapps.easyphotopicker.DefaultCallback
@@ -132,7 +132,7 @@ class AttachActivity : BaseActivity() {
         rootButtons.visibility = View.INVISIBLE
         photo.toPart()
                 .flatMap { part -> App.get().gitLab.uploadFile(project!!.id, part) }
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<FileUploadResponse>() {
                     override fun success(fileUploadResponse: FileUploadResponse) {

app/src/main/java/com/commit451/gitlab/activity/BaseActivity.kt

 package com.commit451.gitlab.activity
+import android.support.v7.app.AppCompatActivity
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs
-import com.trello.rxlifecycle2.components.support.RxAppCompatActivity
+import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
 /**
  * Base activity for others to derive from
  */
-open class BaseActivity : RxAppCompatActivity() {
+abstract class BaseActivity : AppCompatActivity() {
+
+    val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }
     open fun hasBrowsableLinks(): Boolean {
         return false

app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt

@@ -23,12 +23,11 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.BuildPagerAdapter
 import com.commit451.gitlab.event.BuildChangedEvent
 import com.commit451.gitlab.extension.getDownloadBuildUrl
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.DownloadUtil
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
 /**
@@ -67,9 +66,7 @@ class BuildActivity : BaseActivity() {
             R.id.action_retry -> {
                 progress.visibility = View.VISIBLE
                 App.get().gitLab.retryBuild(project.id, build.id)
-                        .compose(this@BuildActivity.bindToLifecycle<Build>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Build>() {
                             override fun error(t: Throwable) {
@@ -91,9 +88,7 @@ class BuildActivity : BaseActivity() {
             R.id.action_erase -> {
                 progress.visibility = View.VISIBLE
                 App.get().gitLab.eraseBuild(project.id, build.id)
-                        .compose(this@BuildActivity.bindToLifecycle<Build>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Build>() {
                             override fun error(t: Throwable) {
@@ -115,9 +110,7 @@ class BuildActivity : BaseActivity() {
             R.id.action_cancel -> {
                 progress.visibility = View.VISIBLE
                 App.get().gitLab.cancelBuild(project.id, build.id)
-                        .compose(this@BuildActivity.bindToLifecycle<Build>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Build>() {
                             override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt

@@ -17,7 +17,7 @@ import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DiffAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Diff
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryCommit
@@ -81,7 +81,7 @@ class DiffActivity : BaseActivity() {
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getCommitDiff(project.id, commit.id)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Diff>>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/FileActivity.kt

@@ -20,7 +20,7 @@ import butterknife.ButterKnife
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.extension.base64Decode
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.RepositoryFile
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.FileUtil
@@ -102,7 +102,7 @@ class FileActivity : BaseActivity() {
     private fun loadData() {
         progress.visibility = View.VISIBLE
         App.get().gitLab.getFile(projectId, path!!, ref!!)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<RepositoryFile>() {
                     override fun error(t: Throwable) {
@@ -133,7 +133,7 @@ class FileActivity : BaseActivity() {
     private fun loadBlob(repositoryFile: RepositoryFile) {
         repositoryFile.content.base64Decode()
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<ByteArray>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt

@@ -21,12 +21,11 @@ import com.commit451.addendum.parceler.getParcelerParcelableExtra
 import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.addendum.themeAttrColor
 import com.commit451.alakazam.navigationBarColorAnimator
-
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.GroupPagerAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.transformation.PaletteTransformation
@@ -80,7 +79,7 @@ class GroupActivity : BaseActivity() {
             progress.visibility = View.VISIBLE
             val groupId = intent.getLongExtra(KEY_GROUP_ID, -1)
             App.get().gitLab.getGroup(groupId)
-                    .setup(bindToLifecycle())
+                    .with(this)
                     .subscribe(object : CustomSingleObserver<Group>() {
                         override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.kt

@@ -20,7 +20,7 @@ import com.commit451.gitlab.adapter.GroupAdapter
 import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.event.CloseDrawerEvent
 import com.commit451.gitlab.event.ReloadDataEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
@@ -112,7 +112,7 @@ class GroupsActivity : BaseActivity() {
         loading = true
         App.get().gitLab.getGroups()
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Group>>() {
                     override fun error(e: Throwable) {
@@ -151,7 +151,7 @@ class GroupsActivity : BaseActivity() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getGroups(nextPageUrl!!.toString())
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Group>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt

@@ -22,7 +22,7 @@ import com.commit451.gitlab.adapter.IssuePagerAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueReloadEvent
 import com.commit451.gitlab.extension.getUrl
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.navigation.Navigator
@@ -76,7 +76,7 @@ class IssueActivity : BaseActivity() {
             }
             R.id.action_delete -> {
                 App.get().gitLab.deleteIssue(project.id, issue.iid)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomCompleteObserver() {
                             override fun error(t: Throwable) {
@@ -156,7 +156,7 @@ class IssueActivity : BaseActivity() {
     fun updateIssueStatus(observable: Single<Issue>) {
         observable
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Issue>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.kt

@@ -10,7 +10,7 @@ import butterknife.ButterKnife
 import butterknife.OnClick
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -109,7 +109,7 @@ class LoadSomeInfoActivity : BaseActivity() {
                 val namespace = intent.getStringExtra(EXTRA_PROJECT_NAMESPACE)
                 val project = intent.getStringExtra(EXTRA_PROJECT_NAME)
                 App.get().gitLab.getProject(namespace, project)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Project>() {
                             override fun error(t: Throwable) {
@@ -136,7 +136,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_ISSUE -> {
                 val issueId = intent.getStringExtra(EXTRA_ISSUE_ID)
                 App.get().gitLab.getIssue(response.id, issueId)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Issue>() {
                             override fun error(t: Throwable) {
@@ -154,7 +154,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_DIFF -> {
                 val sha = intent.getStringExtra(EXTRA_COMMIT_SHA)
                 App.get().gitLab.getCommit(response.id, sha)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<RepositoryCommit>() {
                             override fun error(t: Throwable) {
@@ -172,7 +172,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_MERGE_REQUEST -> {
                 val mergeRequestId = intent.getStringExtra(EXTRA_MERGE_REQUEST)
                 App.get().gitLab.getMergeRequestsByIid(response.id, mergeRequestId)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<List<MergeRequest>>() {
                             override fun error(t: Throwable) {
@@ -194,7 +194,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_BUILD -> {
                 val buildId = intent.getLongExtra(EXTRA_BUILD_ID, -1)
                 App.get().gitLab.getBuild(response.id, buildId)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Build>() {
                             override fun error(t: Throwable) {
@@ -212,7 +212,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_MILESTONE -> {
                 val milestoneId = intent.getStringExtra(EXTRA_MILESTONE_ID)
                 App.get().gitLab.getMilestonesByIid(response.id, milestoneId)
-                        .setup(bindToLifecycle())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<List<Milestone>>() {
                             override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/LoginActivity.kt

@@ -27,8 +27,8 @@ import com.commit451.gitlab.dialog.HttpLoginDialog
 import com.commit451.gitlab.event.LoginEvent
 import com.commit451.gitlab.event.ReloadDataEvent
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.extension.text
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.model.api.Message
 import com.commit451.gitlab.model.api.User
@@ -213,7 +213,7 @@ class LoginActivity : BaseActivity() {
         val gitLabService = GitLabFactory.create(account, gitlabClientBuilder.build())
         gitLabService.getThisUser()
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<User>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.kt

@@ -17,7 +17,7 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter
 import com.commit451.gitlab.event.MergeRequestChangedEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.MergeRequest
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
@@ -88,7 +88,7 @@ class MergeRequestActivity : BaseActivity() {
     fun merge() {
         progress.visibility = View.VISIBLE
         App.get().gitLab.acceptMergeRequest(project.id, mergeRequest.iid)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<MergeRequest>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.kt

@@ -23,7 +23,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.MilestoneIssueAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.model.api.Project
@@ -143,7 +143,7 @@ class MilestoneActivity : BaseActivity() {
         loading = true
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getMilestoneIssues(project.id, milestone.id)
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Issue>>() {
                     override fun error(t: Throwable) {
@@ -183,7 +183,7 @@ class MilestoneActivity : BaseActivity() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getMilestoneIssues(nextPageUrl!!.toString())
-                .setup(bindToLifecycle())
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Issue>>() {
                     override fun error(e: Throwable) {
@@ -209,7 +209,7 @@ class MilestoneActivity : BaseActivity() {
     }
     fun updateMilestoneStatus(observable: Single<Milestone>) {
-        observable.setup(bindToLifecycle())
+        observable.with(this)
                 .subscribe(object : CustomSingleObserver<Milestone>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/activity/PipelineActivity.kt

@@ -17,11 +17,10 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.PipelinePagerAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Pipeline
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
 /**
@@ -58,9 +57,7 @@ class PipelineActivity : BaseActivity() {
             R.id.action_retry -> {
                 progress.visibility = View.VISIBLE
                 App.get().gitLab.retryPipeline(project.id, pipeline.id)
-                        .compose(this@PipelineActivity.bindToLifecycle<Pipeline>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Pipeline>() {
                             override fun error(t: Throwable) {
@@ -82,9 +79,7 @@ class PipelineActivity : BaseActivity() {
             R.id.action_cancel -> {
                 progress.visibility = View.VISIBLE
                 App.get().gitLab.cancelPipeline(project.id, pipeline.id)
-                        .compose(this@PipelineActivity.bindToLifecycle<Pipeline>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .with(this)
                         .subscribe(object : CustomSingleObserver<Pipeline>() {
                             override fun error(t: Throwable) {