RxLifecycle -> Autodispose

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

@@ -26,7 +26,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.ProjectPagerAdapter
 import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.fragment.BaseFragment
 import com.commit451.gitlab.model.Ref
 import com.commit451.gitlab.model.api.Project
@@ -191,7 +191,7 @@ class ProjectActivity : BaseActivity() {
     }
     fun loadProject(observable: Single<Project>) {
-        observable.setup(bindToLifecycle())
+        observable.with(this)
                 .subscribe(object : CustomSingleObserver<Project>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/extension/Completable.kt

 package com.commit451.gitlab.extension
+import com.commit451.gitlab.activity.BaseActivity
+import com.commit451.gitlab.fragment.BaseFragment
 import com.commit451.reptar.kotlin.fromIoToMainThread
-import com.trello.rxlifecycle2.LifecycleTransformer
+import com.uber.autodispose.CompletableSubscribeProxy
+import com.uber.autodispose.kotlin.autoDisposable
 import io.reactivex.Completable
-fun Completable.setup(transformer: LifecycleTransformer<Any>): Completable {
-    return this.compose(transformer).fromIoToMainThread()
+fun Completable.with(baseActivity: BaseActivity): CompletableSubscribeProxy {
+    return this.fromIoToMainThread().autoDisposable(baseActivity.scopeProvider)
+}
+
+fun Completable.with(baseFragment: BaseFragment): CompletableSubscribeProxy {
+    return this.fromIoToMainThread().autoDisposable(baseFragment.scopeProvider)
 }

app/src/main/java/com/commit451/gitlab/extension/Single.kt

 package com.commit451.gitlab.extension
+import com.commit451.gitlab.activity.BaseActivity
+import com.commit451.gitlab.fragment.BaseFragment
 import com.commit451.reptar.kotlin.fromIoToMainThread
-import com.trello.rxlifecycle2.LifecycleTransformer
+import com.uber.autodispose.SingleSubscribeProxy
+import com.uber.autodispose.kotlin.autoDisposable
 import io.reactivex.Single
-fun <T> Single<T>.setup(transformer: LifecycleTransformer<T>): Single<T> {
-    return this.compose(transformer).fromIoToMainThread()
+fun <T> Single<T>.with(baseActivity: BaseActivity): SingleSubscribeProxy<T> {
+    return this.fromIoToMainThread().autoDisposable(baseActivity.scopeProvider)
+}
+
+fun <T> Single<T>.with(baseFragment: BaseFragment): SingleSubscribeProxy<T> {
+    return this.fromIoToMainThread().autoDisposable(baseFragment.scopeProvider)
 }

app/src/main/java/com/commit451/gitlab/fragment/BaseFragment.kt

@@ -2,19 +2,21 @@ package com.commit451.gitlab.fragment
 import android.os.Bundle
+import android.support.v4.app.Fragment
 import android.view.View
-
 import com.commit451.gitlab.App
 import com.commit451.gitlab.activity.BaseActivity
 import com.commit451.gitlab.event.ReloadDataEvent
-import com.trello.rxlifecycle2.components.support.RxFragment
-
+import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
 import org.greenrobot.eventbus.Subscribe
-open class BaseFragment : RxFragment() {
+abstract class BaseFragment : Fragment() {
     private var baseEventReceiver: EventReceiver? = null
+
+    val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }
+
     val baseActivty by lazy {
         activity as BaseActivity
     }

app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.kt

@@ -13,11 +13,10 @@ import com.commit451.addendum.parceler.putParcelerParcelable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.BuildChangedEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.DateUtil
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
 import java.util.*
@@ -84,7 +83,7 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
     fun load() {
         App.get().gitLab.getBuild(project.id, build.id)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Build>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/BuildLogFragment.kt

@@ -13,11 +13,10 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.BuildChangedEvent
 import com.commit451.gitlab.extension.getRawBuildUrl
-import com.commit451.gitlab.extension.setup
+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.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -81,7 +80,7 @@ class BuildLogFragment : ButterKnifeFragment() {
         val url = build.getRawBuildUrl(App.get().getAccount().serverUrl!!, project)
         App.get().gitLab.getRaw(url)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<String>() {
                     override fun error(t: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/BuildsFragment.kt

@@ -21,13 +21,12 @@ import com.commit451.gitlab.adapter.BuildAdapter
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.event.BuildChangedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -134,7 +133,7 @@ class BuildsFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getBuilds(project!!.id, scope)
-                .setup(bindUntilEvent(FragmentEvent.STOP))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Build>>() {
                     override fun error(e: Throwable) {
@@ -172,7 +171,7 @@ class BuildsFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getBuilds(nextPageUrl!!.toString(), scope)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Build>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/CommitsFragment.kt

@@ -15,12 +15,11 @@ import com.commit451.gitlab.activity.ProjectActivity
 import com.commit451.gitlab.adapter.CommitAdapter
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -109,7 +108,7 @@ class CommitsFragment : ButterKnifeFragment() {
         loading = true
         App.get().gitLab.getCommits(project!!.id, branchName!!, page)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<RepositoryCommit>>() {
                     override fun error(t: Throwable) {
@@ -154,7 +153,7 @@ class CommitsFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for %s", page)
         App.get().gitLab.getCommits(project!!.id, branchName!!, page)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<RepositoryCommit>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/FeedFragment.kt

@@ -15,13 +15,12 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.FeedAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.rss.Entry
 import com.commit451.gitlab.model.rss.Feed
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs
-import com.trello.rxlifecycle2.android.FragmentEvent
 import timber.log.Timber
 /**
@@ -106,7 +105,7 @@ class FeedFragment : ButterKnifeFragment() {
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getFeed(feedUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Feed>() {
                     override fun success(feed: Feed) {
                         swipeRefreshLayout.isRefreshing = false

app/src/main/java/com/commit451/gitlab/fragment/FilesFragment.kt

@@ -22,13 +22,12 @@ import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.FileAdapter
 import com.commit451.gitlab.event.ProjectReloadEvent
 import com.commit451.gitlab.extension.getUrl
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryTreeObject
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.IntentUtil
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
 import java.util.*
@@ -157,7 +156,7 @@ class FilesFragment : ButterKnifeFragment() {
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getTree(project!!.id, ref, newPath)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<RepositoryTreeObject>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/GroupMembersFragment.kt

@@ -20,7 +20,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.GroupMembersAdapter
 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.navigation.Navigator
@@ -28,7 +28,6 @@ import com.commit451.gitlab.rx.CustomCompleteObserver
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.viewHolder.ProjectMemberViewHolder
-import com.trello.rxlifecycle2.android.FragmentEvent
 import io.reactivex.Single
 import org.greenrobot.eventbus.Subscribe
 import retrofit2.Response
@@ -83,7 +82,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
         override fun onUserRemoveClicked(member: User) {
             this@GroupMembersFragment.member = member
             App.get().gitLab.removeGroupMember(group.id, member.id)
-                    .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                    .with(this@GroupMembersFragment)
                     .subscribe(object : CustomCompleteObserver() {
                         override fun error(e: Throwable) {
@@ -180,7 +179,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
     private fun loadGroupMembers(observable: Single<Response<List<User>>>) {
         observable
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/IssueDiscussionFragment.kt

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.AttachActivity
 import com.commit451.gitlab.adapter.NotesAdapter
 import com.commit451.gitlab.api.response.FileUploadResponse
 import com.commit451.gitlab.event.IssueChangedEvent
-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.Note
 import com.commit451.gitlab.model.api.Project
@@ -31,7 +31,6 @@ import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.view.SendMessageView
 import com.commit451.teleprinter.Teleprinter
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -146,7 +145,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
     fun loadNotes() {
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getIssueNotes(project.id, issue.iid)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Note>>() {
                     override fun error(e: Throwable) {
@@ -169,7 +168,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
     fun loadMoreNotes() {
         adapter.setLoading(true)
         App.get().gitLab.getIssueNotes(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Note>>() {
                     override fun error(e: Throwable) {
@@ -203,7 +202,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
         sendMessageView.clearText()
         App.get().gitLab.addIssueNote(project.id, issue.iid, message)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Note>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/IssuesFragment.kt

@@ -24,14 +24,13 @@ import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueCreatedEvent
 import com.commit451.gitlab.event.IssueReloadEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
-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
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import retrofit2.Response
 import timber.log.Timber
@@ -145,7 +144,7 @@ class IssuesFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getIssues(project!!.id, state)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Issue>>() {
                     override fun error(e: Throwable) {
@@ -182,7 +181,7 @@ class IssuesFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for " + nextPageUrl!!)
         App.get().gitLab.getIssues(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Response<List<Issue>>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestCommitsFragment.kt

@@ -16,13 +16,12 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.CommitAdapter
 import com.commit451.gitlab.adapter.DividerItemDecoration
 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.model.api.RepositoryCommit
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -115,7 +114,7 @@ class MergeRequestCommitsFragment : ButterKnifeFragment() {
         loading = true
         App.get().gitLab.getMergeRequestCommits(project!!.id, mergeRequest!!.iid)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<RepositoryCommit>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.kt

@@ -21,7 +21,7 @@ import com.commit451.gitlab.activity.AttachActivity
 import com.commit451.gitlab.adapter.NotesAdapter
 import com.commit451.gitlab.api.response.FileUploadResponse
 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.Note
 import com.commit451.gitlab.model.api.Project
@@ -31,7 +31,6 @@ import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.view.SendMessageView
 import com.commit451.teleprinter.Teleprinter
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -146,7 +145,7 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
     fun loadNotes() {
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getMergeRequestNotes(project.id, mergeRequest.iid)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Note>>() {
                     override fun error(e: Throwable) {
@@ -169,7 +168,7 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
     fun loadMoreNotes() {
         adapterNotes.setLoading(true)
         App.get().gitLab.getMergeRequestNotes(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Note>>() {
                     override fun error(e: Throwable) {
@@ -203,7 +202,7 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
         sendMessageView.clearText()
         App.get().gitLab.addMergeRequestNote(project.id, mergeRequest.iid, message)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Note>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestsFragment.kt

@@ -20,13 +20,12 @@ import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.MergeRequestAdapter
 import com.commit451.gitlab.event.MergeRequestChangedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
-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.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -131,7 +130,7 @@ class MergeRequestsFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getMergeRequests(project!!.id, state)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<MergeRequest>>() {
                     override fun error(e: Throwable) {
@@ -169,7 +168,7 @@ class MergeRequestsFragment : ButterKnifeFragment() {
         loading = true
         Timber.d("loadMore called for " + nextPageUrl!!)
         App.get().gitLab.getMergeRequests(nextPageUrl!!.toString(), state)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<MergeRequest>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/MilestonesFragment.kt

@@ -23,13 +23,12 @@ import com.commit451.gitlab.adapter.MilestoneAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
 import com.commit451.gitlab.event.MilestoneCreatedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
@@ -137,7 +136,7 @@ class MilestonesFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getMilestones(project!!.id, state)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Milestone>>() {
                     override fun error(e: Throwable) {
@@ -174,7 +173,7 @@ class MilestonesFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for " + nextPageUrl!!)
         App.get().gitLab.getMilestones(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Milestone>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/PickBranchFragment.kt

@@ -17,11 +17,10 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.PickBranchOrTagActivity
 import com.commit451.gitlab.adapter.BranchAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.Ref
 import com.commit451.gitlab.model.api.Branch
 import com.commit451.gitlab.rx.CustomSingleObserver
-import com.trello.rxlifecycle2.android.FragmentEvent
 import timber.log.Timber
 /**
@@ -88,7 +87,7 @@ class PickBranchFragment : ButterKnifeFragment() {
         textMessage.visibility = View.GONE
         App.get().gitLab.getBranches(projectId)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Branch>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/PickTagFragment.kt

@@ -17,11 +17,10 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.PickBranchOrTagActivity
 import com.commit451.gitlab.adapter.TagAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.Ref
 import com.commit451.gitlab.model.api.Tag
 import com.commit451.gitlab.rx.CustomSingleObserver
-import com.trello.rxlifecycle2.android.FragmentEvent
 import timber.log.Timber
 /**
@@ -88,7 +87,7 @@ class PickTagFragment : ButterKnifeFragment() {
         textMessage.visibility = View.GONE
         App.get().gitLab.getTags(projectId)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<List<Tag>>() {
                     override fun error(e: Throwable) {

app/src/main/java/com/commit451/gitlab/fragment/PipelineDescriptionFragment.kt

@@ -13,13 +13,12 @@ import com.commit451.addendum.parceler.putParcelerParcelable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.PipelineChangedEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.CommitUser
 import com.commit451.gitlab.model.api.Pipeline
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.DateUtil
-import com.trello.rxlifecycle2.android.FragmentEvent
 import org.greenrobot.eventbus.Subscribe
 import timber.log.Timber
 import java.util.*
@@ -85,7 +84,7 @@ class PipelineDescriptionFragment : ButterKnifeFragment() {
     fun load() {
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getPipeline(project.id, pipeline.id)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Pipeline>() {
                     override fun error(t: Throwable) {