RxLifecycle -> Autodispose

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

@@ -12,13 +12,12 @@ import com.commit451.addendum.parceler.getParcelerParcelable
 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 org.parceler.Parcels
 import timber.log.Timber
@@ -84,7 +83,7 @@ class PipelineJobsFragment : ButterKnifeFragment() {
     fun load() {
         App.get().gitLab.getPipeline(project.id, pipeline.id)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Pipeline>() {
                     override fun error(t: Throwable) {

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

@@ -21,13 +21,12 @@ import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.PipelineAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Pipeline
 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 PipelinesFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getPipelines(project!!.id, scope)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Pipeline>>() {
                     override fun error(e: Throwable) {
@@ -172,7 +171,7 @@ class PipelinesFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getPipelines(nextPageUrl!!.toString(), scope)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Pipeline>>() {
                     override fun error(e: Throwable) {

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

@@ -21,7 +21,6 @@ import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomCompleteObserver
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.InternalLinkMovementMethod
-import com.trello.rxlifecycle2.android.FragmentEvent
 import io.reactivex.Single
 import org.greenrobot.eventbus.Subscribe
 import retrofit2.Response
@@ -76,7 +75,7 @@ class ProjectFragment : ButterKnifeFragment() {
                     .setNegativeButton(R.string.cancel, null)
                     .setPositiveButton(R.string.ok) { _, _ ->
                         App.get().gitLab.forkProject(it.id)
-                                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                                .with(this)
                                 .subscribe(object : CustomCompleteObserver() {
                                     override fun error(t: Throwable) {
@@ -98,7 +97,7 @@ class ProjectFragment : ButterKnifeFragment() {
     fun onStarClicked() {
         if (project != null) {
             App.get().gitLab.starProject(project!!.id)
-                    .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                    .with(this)
                     .subscribe(object : CustomSingleObserver<Response<Project>>() {
                         override fun error(t: Throwable) {
@@ -172,7 +171,7 @@ class ProjectFragment : ButterKnifeFragment() {
                 }
                 Single.just(readmeResult)
             }
-                    .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                    .with(this)
                     .subscribe(object : CustomSingleObserver<ReadmeResult>() {
                         override fun error(t: Throwable) {
@@ -230,7 +229,7 @@ class ProjectFragment : ButterKnifeFragment() {
     fun unstarProject() {
         App.get().gitLab.unstarProject(project!!.id)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomSingleObserver<Project>() {
                     override fun error(t: Throwable) {

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

@@ -21,7 +21,7 @@ import com.commit451.gitlab.dialog.AccessDialog
 import com.commit451.gitlab.event.MemberAddedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
 import com.commit451.gitlab.extension.belongsToGroup
-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.User
 import com.commit451.gitlab.navigation.Navigator
@@ -29,7 +29,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
@@ -92,7 +91,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
             override fun onRemoveMember(member: User) {
                 this@ProjectMembersFragment.member = member
                 App.get().gitLab.removeProjectMember(project!!.id, member.id)
-                        .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                        .with(this@ProjectMembersFragment)
                         .subscribe(object : CustomCompleteObserver() {
                             override fun error(t: Throwable) {
@@ -180,7 +179,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
     fun load(observable: Single<Response<List<User>>>) {
         observable
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(t: Throwable) {

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

@@ -18,13 +18,12 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.ProjectAdapter
 import com.commit451.gitlab.api.GitLabService
-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.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 io.reactivex.Single
 import retrofit2.Response
 import timber.log.Timber
@@ -169,7 +168,7 @@ class ProjectsFragment : ButterKnifeFragment() {
     private fun actuallyLoadIt(observable: Single<Response<List<Project>>>) {
         observable
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Project>>() {
                     override fun error(e: Throwable) {
@@ -204,7 +203,7 @@ class ProjectsFragment : ButterKnifeFragment() {
         adapterProjects.setLoading(true)
         Timber.d("loadMore called for %s", nextPageUrl)
         getGitLab().getProjects(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Project>>() {
                     override fun error(e: Throwable) {

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

@@ -21,13 +21,12 @@ import com.commit451.gitlab.activity.ProjectActivity
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.SnippetAdapter
 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.Snippet
 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
@@ -141,7 +140,7 @@ class SnippetsFragment : ButterKnifeFragment() {
         nextPageUrl = null
         loading = true
         App.get().gitLab.getSnippets(project!!.id)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Snippet>>() {
                     override fun error(e: Throwable) {
@@ -182,7 +181,7 @@ class SnippetsFragment : ButterKnifeFragment() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getSnippets(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Snippet>>() {
                     override fun error(e: Throwable) {

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

@@ -14,12 +14,11 @@ import butterknife.BindView
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.TodoAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.Todo
 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 io.reactivex.Single
 import retrofit2.Response
 import timber.log.Timber
@@ -121,7 +120,7 @@ class TodoFragment : ButterKnifeFragment() {
     fun getTodos(observable: Single<Response<List<Todo>>>) {
         observable
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Todo>>() {
                     override fun error(e: Throwable) {
@@ -161,7 +160,7 @@ class TodoFragment : ButterKnifeFragment() {
         adapterTodos.setLoading(true)
         Timber.d("loadMore called for " + nextPageUrl!!)
         App.get().gitLab.getTodosByUrl(nextPageUrl!!.toString())
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<Todo>>() {
                     override fun error(e: Throwable) {

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

@@ -13,13 +13,12 @@ import butterknife.BindView
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.UserAdapter
-import com.commit451.gitlab.extension.setup
+import com.commit451.gitlab.extension.with
 import com.commit451.gitlab.model.api.User
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.viewHolder.UserViewHolder
-import com.trello.rxlifecycle2.android.FragmentEvent
 import timber.log.Timber
 class UsersFragment : ButterKnifeFragment() {
@@ -108,7 +107,7 @@ class UsersFragment : ButterKnifeFragment() {
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.searchUsers(query!!)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(e: Throwable) {
@@ -138,7 +137,7 @@ class UsersFragment : ButterKnifeFragment() {
         adapterUser.setLoading(true)
         Timber.d("loadMore called for %s %s", nextPageUrl!!.toString(), query)
         App.get().gitLab.searchUsers(nextPageUrl!!.toString(), query!!)
-                .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
+                .with(this)
                 .subscribe(object : CustomResponseSingleObserver<List<User>>() {
                     override fun error(e: Throwable) {

build.gradle

 apply plugin: 'com.github.ben-manes.versions'
 apply plugin: 'com.commit451.updatewrapper'
 buildscript {
-    ext.kotlinVersion = '1.1.60'
+    ext.kotlinVersion = '1.2.10'
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }