Properly compose observables to make sure they follow the lifecycle

app/build.gradle

@@ -86,15 +86,15 @@ android {
 }
 ext {
-    supportLibVersion = '25.1.0'
+    supportLibVersion = '25.1.1'
     retrofitVersion = '2.1.0'
-    okHttpVersion = '3.5.0'
-    butterknifeVersion = '8.5.0'
+    okHttpVersion = '3.6.0'
+    butterknifeVersion = '8.5.1'
     loganSquareVersion = '1.3.7'
     parcelerVersion = '1.1.6'
     reptarVersion = '2.2.1'
     adapterLayout = '1.1.0'
-    materialDialogsVersion = '0.9.2.3'
+    materialDialogsVersion = '0.9.3.0'
 }
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -145,6 +145,7 @@ dependencies {
     compile "com.github.Commit451.Reptar:reptar:$reptarVersion@aar"
     compile "com.github.Commit451.Reptar:reptar-retrofit:$reptarVersion@aar"
+    compile "com.github.Commit451.Reptar:reptar-kotlin:$reptarVersion@aar"
     compile 'com.github.Commit451:bypasses:1.0.4'
     compile 'com.github.Commit451:ElasticDragDismissLayout:1.0.4'
     compile "com.github.Commit451.AdapterLayout:adapterlayout:$adapterLayout"
@@ -156,7 +157,7 @@ dependencies {
     compile 'com.github.Commit451:Jounce:1.0.1'
     compile 'com.github.Commit451:ForegroundViews:2.3.1'
     compile 'com.github.Commit451:MorphTransitions:2.0.0'
-    compile 'com.github.Commit451.Alakazam:alakazam:1.0.0@aar'
+    compile 'com.github.Commit451.Alakazam:alakazam:1.0.1@aar'
     compile 'com.github.Commit451:Lift:1.2.0'
     compile 'com.github.Commit451:OkioProGuardRules:1.11.0.0'
     compile 'com.github.Commit451:RetrofitProguardRules:2.1.0.0'
@@ -175,7 +176,7 @@ dependencies {
     compile 'com.github.alorma:diff-textview:1.3.0'
-    compile 'com.wdullaer:materialdatetimepicker:3.1.0'
+    compile 'com.wdullaer:materialdatetimepicker:3.1.1'
     compile 'com.wefika:flowlayout:0.4.1'

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

@@ -20,6 +20,7 @@ import com.commit451.gimbal.Gimbal
 import com.commit451.gitlab.App
 import com.commit451.gitlab.BuildConfig
 import com.commit451.gitlab.R
+import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Contributor
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -30,8 +31,6 @@ import com.jawnnypoo.physicslayout.Physics
 import com.jawnnypoo.physicslayout.PhysicsConfig
 import com.wefika.flowlayout.FlowLayout
 import de.hdodenhof.circleimageview.CircleImageView
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.jbox2d.common.Vec2
 import timber.log.Timber
@@ -49,30 +48,16 @@ class AboutActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.contributors)
-    lateinit var textContributors: TextView
-    @BindView(R.id.physics_layout)
-    lateinit var physicsLayout: PhysicsFlowLayout
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.contributors) lateinit var textContributors: TextView
+    @BindView(R.id.physics_layout) lateinit var physicsLayout: PhysicsFlowLayout
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var sensorManager: SensorManager
     lateinit var gimbal: Gimbal
     var gravitySensor: Sensor? = null
-    @OnClick(R.id.sauce)
-    fun onSauceClick() {
-        if (getString(R.string.url_gitlab) == App.get().getAccount().serverUrl.toString()) {
-            Navigator.navigateToProject(this@AboutActivity, REPO_ID)
-        } else {
-            IntentUtil.openPage(this@AboutActivity, getString(R.string.source_url))
-        }
-    }
-
     val sensorEventListener = object : SensorEventListener {
         override fun onSensorChanged(event: SensorEvent) {
             if (event.sensor.type == Sensor.TYPE_GRAVITY) {
@@ -86,6 +71,15 @@ class AboutActivity : BaseActivity() {
         override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {}
     }
+    @OnClick(R.id.sauce)
+    fun onSauceClick() {
+        if (getString(R.string.url_gitlab) == App.get().getAccount().serverUrl.toString()) {
+            Navigator.navigateToProject(this@AboutActivity, REPO_ID)
+        } else {
+            IntentUtil.openPage(this@AboutActivity, getString(R.string.source_url))
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         gimbal = Gimbal(this)
@@ -100,9 +94,7 @@ class AboutActivity : BaseActivity() {
         sensorManager = getSystemService(Context.SENSOR_SERVICE) as SensorManager
         gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY)
         App.get().gitLab.getContributors(REPO_ID)
-                .compose(this.bindToLifecycle<List<Contributor>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<List<Contributor>>() {
                     override fun error(t: Throwable) {

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

@@ -73,7 +73,7 @@ class ActivityActivity : BaseActivity() {
     }
     @Subscribe
-    fun onCloseDrawerEvent(event: CloseDrawerEvent) {
+    fun onEvent(event: CloseDrawerEvent) {
         drawerLayout.closeDrawers()
     }
 }

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

@@ -28,6 +28,7 @@ import com.commit451.gitlab.adapter.AssigneeSpinnerAdapter
 import com.commit451.gitlab.adapter.MilestoneSpinnerAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueCreatedEvent
+import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
@@ -62,34 +63,20 @@ class AddIssueActivity : MorphActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: FrameLayout
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.title_text_input_layout)
-    lateinit var textInputLayoutTitle: TextInputLayout
-    @BindView(R.id.description)
-    lateinit var textDescription: EditText
-    @BindView(R.id.progress)
-    lateinit var progress: View
-    @BindView(R.id.assignee_progress)
-    lateinit var progressAssignee: View
-    @BindView(R.id.assignee_spinner)
-    lateinit var spinnerAssignee: Spinner
-    @BindView(R.id.milestone_progress)
-    lateinit var progressMilestone: View
-    @BindView(R.id.milestone_spinner)
-    lateinit var spinnerMilestone: Spinner
-    @BindView(R.id.label_label)
-    lateinit var textLabel: TextView
-    @BindView(R.id.labels_progress)
-    lateinit var progressLabels: View
-    @BindView(R.id.root_add_labels)
-    lateinit var rootAddLabels: ViewGroup
-    @BindView(R.id.list_labels)
-    lateinit var listLabels: AdapterFlowLayout
-    @BindView(R.id.confidential_switch)
-    lateinit var switchConfidential: SwitchCompat
+    @BindView(R.id.root) lateinit var root: FrameLayout
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.description) lateinit var textDescription: EditText
+    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.assignee_progress) lateinit var progressAssignee: View
+    @BindView(R.id.assignee_spinner) lateinit var spinnerAssignee: Spinner
+    @BindView(R.id.milestone_progress) lateinit var progressMilestone: View
+    @BindView(R.id.milestone_spinner) lateinit var spinnerMilestone: Spinner
+    @BindView(R.id.label_label) lateinit var textLabel: TextView
+    @BindView(R.id.labels_progress) lateinit var progressLabels: View
+    @BindView(R.id.root_add_labels) lateinit var rootAddLabels: ViewGroup
+    @BindView(R.id.list_labels) lateinit var listLabels: AdapterFlowLayout
+    @BindView(R.id.confidential_switch) lateinit var switchConfidential: SwitchCompat
     lateinit var adapterLabels: AddIssueLabelAdapter
     lateinit var teleprinter: Teleprinter
@@ -148,9 +135,7 @@ class AddIssueActivity : MorphActivity() {
     private fun load() {
         App.get().gitLab.getMilestones(project.id, getString(R.string.milestone_state_value_default))
-                .compose(this.bindToLifecycle<Response<List<Milestone>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<Milestone>>() {
                     override fun error(t: Throwable) {
@@ -188,8 +173,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)
-                                    .subscribeOn(Schedulers.io())
-                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .setup(bindToLifecycle())
                                     .subscribe(object : CustomResponseSingleObserver<List<Member>>() {
                                         override fun error(t: Throwable) {
@@ -209,9 +193,7 @@ class AddIssueActivity : MorphActivity() {
                     }
                 })
         App.get().gitLab.getLabels(project.id)
-                .compose(this.bindToLifecycle<List<Label>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<List<Label>>() {
                     override fun error(t: Throwable) {
@@ -359,8 +341,7 @@ class AddIssueActivity : MorphActivity() {
     }
     private fun observeUpdate(observable: Single<Issue>) {
-        observable.subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+        observable.setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<Issue>() {
                     override fun error(t: Throwable) {

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

@@ -18,12 +18,11 @@ 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.model.api.Label
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.viewHolder.LabelViewHolder
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import timber.log.Timber
@@ -46,16 +45,11 @@ class AddLabelActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.swipe_layout)
-    lateinit var swipeRefreshLayout: SwipeRefreshLayout
-    @BindView(R.id.list)
-    lateinit var list: RecyclerView
-    @BindView(R.id.message_text)
-    lateinit var textMessage: TextView
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list) lateinit var list: RecyclerView
+    @BindView(R.id.message_text) lateinit var textMessage: TextView
     lateinit var adapterLabel: LabelAdapter
@@ -110,9 +104,7 @@ class AddLabelActivity : BaseActivity() {
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getLabels(projectId)
-                .compose(this.bindToLifecycle<List<Label>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<List<Label>>() {
                     override fun error(t: Throwable) {

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

@@ -20,13 +20,12 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.MilestoneChangedEvent
 import com.commit451.gitlab.event.MilestoneCreatedEvent
+import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.teleprinter.Teleprinter
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import timber.log.Timber
 import java.util.*
@@ -48,20 +47,13 @@ class AddMilestoneActivity : MorphActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: FrameLayout
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.title_text_input_layout)
-    lateinit var textInputLayoutTitle: TextInputLayout
-    @BindView(R.id.title)
-    lateinit var textTitle: EditText
-    @BindView(R.id.description)
-    lateinit var textDescription: EditText
-    @BindView(R.id.due_date)
-    lateinit var buttonDueDate: Button
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: FrameLayout
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.title) lateinit var textTitle: EditText
+    @BindView(R.id.description) lateinit var textDescription: EditText
+    @BindView(R.id.due_date) lateinit var buttonDueDate: Button
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var teleprinter: Teleprinter
@@ -150,9 +142,7 @@ class AddMilestoneActivity : MorphActivity() {
     }
     fun createOrEditMilestone(observable: Single<Milestone>) {
-        observable.subscribeOn(Schedulers.io())
-                .compose(this.bindToLifecycle<Milestone>())
-                .observeOn(AndroidSchedulers.mainThread())
+        observable.setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<Milestone>() {
                     override fun error(t: Throwable) {

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

@@ -49,18 +49,12 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.title_text_input_layout)
-    lateinit var textInputLayoutTitle: TextInputLayout
-    @BindView(R.id.description)
-    lateinit var textDescription: TextView
-    @BindView(R.id.image_color)
-    lateinit var imageColor: ImageView
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.title_text_input_layout) lateinit var textInputLayoutTitle: TextInputLayout
+    @BindView(R.id.description) lateinit var textDescription: TextView
+    @BindView(R.id.image_color) lateinit var imageColor: ImageView
+    @BindView(R.id.progress) lateinit var progress: View
     var chosenColor = -1
@@ -97,6 +91,9 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
         imageColor.setImageDrawable(ColorDrawable(selectedColor))
     }
+    override fun onColorChooserDismissed(dialog: ColorChooserDialog) {
+    }
+
     private val projectId: Long
         get() = intent.getLongExtra(KEY_PROJECT_ID, -1)

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

@@ -21,6 +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.model.api.Group
 import com.commit451.gitlab.model.api.Member
 import com.commit451.gitlab.model.api.UserBasic
@@ -30,8 +31,6 @@ import com.commit451.gitlab.viewHolder.UserViewHolder
 import com.commit451.teleprinter.Teleprinter
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import retrofit2.Response
 import timber.log.Timber
@@ -59,18 +58,12 @@ class AddUserActivity : MorphActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.search)
-    lateinit var textSearch: EditText
-    @BindView(R.id.swipe_layout)
-    lateinit var swipeRefreshLayout: SwipeRefreshLayout
-    @BindView(R.id.list)
-    lateinit var list: RecyclerView
-    @BindView(R.id.clear)
-    lateinit var buttonClear: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.search) lateinit var textSearch: EditText
+    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list) lateinit var list: RecyclerView
+    @BindView(R.id.clear) lateinit var buttonClear: View
     lateinit var layoutManager: GridLayoutManager
     lateinit var adapter: UserAdapter
@@ -165,9 +158,7 @@ class AddUserActivity : MorphActivity() {
         swipeRefreshLayout.isRefreshing = true
         loading = true
         App.get().gitLab.searchUsers(query!!)
-                .compose(this.bindToLifecycle<Response<List<UserBasic>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<UserBasic>>() {
                     override fun error(t: Throwable) {
@@ -193,9 +184,7 @@ class AddUserActivity : MorphActivity() {
         adapter.setLoading(true)
         Timber.d("loadMore " + nextPageUrl!!.toString() + " " + query)
         App.get().gitLab.searchUsers(nextPageUrl!!.toString(), query!!)
-                .compose(this.bindToLifecycle<Response<List<UserBasic>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<UserBasic>>() {
                     override fun error(t: Throwable) {
@@ -213,9 +202,7 @@ class AddUserActivity : MorphActivity() {
     }
     private fun add(observable: Single<Response<Member>>) {
-        observable.subscribeOn(Schedulers.io())
-                .compose(this.bindToLifecycle<Response<Member>>())
-                .observeOn(AndroidSchedulers.mainThread())
+        observable.setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<Member>() {
                     override fun error(t: Throwable) {

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

@@ -14,13 +14,12 @@ 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.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.rx.FileObservableFactory
 import io.codetail.animation.ViewAnimationUtils
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import pl.aprilapps.easyphotopicker.DefaultCallback
 import pl.aprilapps.easyphotopicker.EasyImage
@@ -45,12 +44,9 @@ class AttachActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root_buttons)
-    lateinit var rootButtons: ViewGroup
-    @BindView(R.id.progress)
-    lateinit var progress: View
-    @BindView(R.id.attachCard)
-    lateinit var card: View
+    @BindView(R.id.root_buttons) lateinit var rootButtons: ViewGroup
+    @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.attachCard) lateinit var card: View
     var project: Project?= null
@@ -126,9 +122,7 @@ class AttachActivity : BaseActivity() {
         rootButtons.visibility = View.INVISIBLE
         FileObservableFactory.toPart(photo)
                 .flatMap { part -> App.get().gitLab.uploadFile(project!!.id, part) }
-                .compose(this.bindToLifecycle<FileUploadResponse>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<FileUploadResponse>() {
                     override fun success(fileUploadResponse: FileUploadResponse) {

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

@@ -55,16 +55,11 @@ class BuildActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.tabs)
-    lateinit var tabLayout: TabLayout
-    @BindView(R.id.pager)
-    lateinit var viewPager: ViewPager
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.pager) lateinit var viewPager: ViewPager
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var menuItemDownload: MenuItem

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

@@ -16,12 +16,11 @@ import butterknife.ButterKnife
 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.model.api.Diff
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.rx.CustomSingleObserver
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import timber.log.Timber
@@ -43,16 +42,11 @@ class DiffActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.swipe_layout)
-    lateinit var swipeRefreshLayout: SwipeRefreshLayout
-    @BindView(R.id.list)
-    lateinit var listDiff: RecyclerView
-    @BindView(R.id.message_text)
-    lateinit var textMessage: TextView
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list) lateinit var listDiff: RecyclerView
+    @BindView(R.id.message_text) lateinit var textMessage: TextView
     lateinit var adapterDiff: DiffAdapter
@@ -87,9 +81,7 @@ class DiffActivity : BaseActivity() {
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getCommitDiff(project.id, commit.id)
-                .compose(this.bindToLifecycle<List<Diff>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<List<Diff>>() {
                     override fun error(t: Throwable) {

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

@@ -32,6 +32,7 @@ import java.nio.charset.Charset
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.extension.setup
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
@@ -72,14 +73,10 @@ class FileActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.file_blob)
-    lateinit var webViewFileBlob: WebView
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.file_blob) lateinit var webViewFileBlob: WebView
+    @BindView(R.id.progress) lateinit var progress: View
     var projectId: Long = 0
     var path: String? = null
@@ -123,9 +120,7 @@ class FileActivity : BaseActivity() {
     private fun loadData() {
         progress.visibility = View.VISIBLE
         App.get().gitLab.getFile(projectId, path!!, ref!!)
-                .compose(this.bindToLifecycle<RepositoryFile>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<RepositoryFile>() {
                     override fun error(t: Throwable) {
@@ -156,9 +151,7 @@ class FileActivity : BaseActivity() {
     private fun loadBlob(repositoryFile: RepositoryFile) {
         DecodeObservableFactory.newDecode(repositoryFile.content)
-                .compose(this.bindToLifecycle<ByteArray>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<ByteArray>() {
                     override fun error(t: Throwable) {

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

@@ -23,12 +23,11 @@ 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.model.api.Group
 import com.commit451.gitlab.model.api.GroupDetail
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.transformation.PaletteTransformation
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
 import timber.log.Timber
@@ -55,20 +54,13 @@ class GroupActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: View
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.collapsing_toolbar)
-    lateinit var collapsingToolbarLayout: CollapsingToolbarLayout
-    @BindView(R.id.viewpager)
-    lateinit var viewPager: ViewPager
-    @BindView(R.id.tabs)
-    lateinit var tabLayout: TabLayout
-    @BindView(R.id.backdrop)
-    lateinit var backdrop: ImageView
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: View
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.collapsing_toolbar) lateinit var collapsingToolbarLayout: CollapsingToolbarLayout
+    @BindView(R.id.viewpager) lateinit var viewPager: ViewPager
+    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.backdrop) lateinit var backdrop: ImageView
+    @BindView(R.id.progress) lateinit var progress: View
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -87,9 +79,7 @@ class GroupActivity : BaseActivity() {
             progress.visibility = View.VISIBLE
             val groupId = intent.getLongExtra(KEY_GROUP_ID, -1)
             App.get().gitLab.getGroup(groupId)
-                    .compose(this.bindToLifecycle<GroupDetail>())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
+                    .setup(bindToLifecycle())
                     .subscribe(object : CustomSingleObserver<GroupDetail>() {
                         override fun error(t: Throwable) {

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

@@ -20,15 +20,13 @@ 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.model.api.Group
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.viewHolder.GroupViewHolder
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.Subscribe
-import retrofit2.Response
 import timber.log.Timber
 /**
@@ -106,9 +104,7 @@ class GroupsActivity : BaseActivity() {
         loading = true
         App.get().gitLab.getGroups()
-                .compose(this.bindToLifecycle<Response<List<Group>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<Group>>() {
                     override fun error(e: Throwable) {
@@ -147,9 +143,7 @@ class GroupsActivity : BaseActivity() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getGroups(nextPageUrl!!.toString())
-                .compose(this.bindToLifecycle<Response<List<Group>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<Group>>() {
                     override fun error(e: Throwable) {
@@ -166,12 +160,12 @@ class GroupsActivity : BaseActivity() {
     }
     @Subscribe
-    fun onCloseDrawerEvent(event: CloseDrawerEvent) {
+    fun onEvent(event: CloseDrawerEvent) {
         drawerLayout.closeDrawers()
     }
     @Subscribe
-    fun onReloadData(event: ReloadDataEvent) {
+    fun onEvent(event: ReloadDataEvent) {
         load()
     }
 }

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

@@ -24,6 +24,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.IssueDetailsAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueReloadEvent
+import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Note
@@ -74,20 +75,13 @@ class IssueActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.issue_title)
-    lateinit var textTitle: TextView
-    @BindView(R.id.swipe_layout)
-    lateinit var swipeRefreshLayout: SwipeRefreshLayout
-    @BindView(R.id.list)
-    lateinit var listNotes: RecyclerView
-    @BindView(R.id.send_message_view)
-    lateinit var sendMessageView: SendMessageView
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.issue_title) lateinit var textTitle: TextView
+    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list) lateinit var listNotes: RecyclerView
+    @BindView(R.id.send_message_view) lateinit var sendMessageView: SendMessageView
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var menuItemOpenClose: MenuItem
     lateinit var adapterIssueDetails: IssueDetailsAdapter
@@ -124,9 +118,7 @@ class IssueActivity : BaseActivity() {
             }
             R.id.action_delete -> {
                 App.get().gitLab.deleteIssue(project!!.id, issue!!.id)
-                        .compose(this@IssueActivity.bindToLifecycle<String>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<String>() {
                             override fun error(t: Throwable) {
@@ -326,9 +318,7 @@ class IssueActivity : BaseActivity() {
         sendMessageView.clearText()
         App.get().gitLab.addIssueNote(project!!.id, issue!!.id, message)
-                .compose(this.bindToLifecycle<Note>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<Note>() {
                     override fun error(t: Throwable) {
@@ -357,9 +347,7 @@ class IssueActivity : BaseActivity() {
     fun updateIssueStatus(observable: Single<Issue>) {
         observable
-                .compose(this.bindToLifecycle<Issue>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<Issue>() {
                     override fun error(t: Throwable) {
@@ -385,7 +373,7 @@ class IssueActivity : BaseActivity() {
     }
     @Subscribe
-    fun onIssueChanged(event: IssueChangedEvent) {
+    fun onEvent(event: IssueChangedEvent) {
         if (issue!!.id == event.issue.id) {
             issue = event.issue
             bindIssue()

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

@@ -29,8 +29,7 @@ class LaunchActivity : BaseActivity() {
         private val REQUEST_DEVICE_AUTH = 123
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
+    @BindView(R.id.root) lateinit var root: ViewGroup
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

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

@@ -10,11 +10,10 @@ 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.model.api.*
 import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
@@ -75,8 +74,7 @@ class LoadSomeInfoActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.progress) lateinit var progress: View
     private var loadType: Int = 0
@@ -100,8 +98,7 @@ class LoadSomeInfoActivity : BaseActivity() {
                 val namespace = intent.getStringExtra(EXTRA_PROJECT_NAMESPACE)
                 val project = intent.getStringExtra(EXTRA_PROJECT_NAME)
                 App.get().gitLab.getProject(namespace, project)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<Project>() {
                             override fun error(t: Throwable) {
@@ -128,9 +125,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_DIFF -> {
                 val sha = intent.getStringExtra(EXTRA_COMMIT_SHA)
                 App.get().gitLab.getCommit(response.id, sha)
-                        .compose(this@LoadSomeInfoActivity.bindToLifecycle<RepositoryCommit>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<RepositoryCommit>() {
                             override fun error(t: Throwable) {
@@ -148,9 +143,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_MERGE_REQUEST -> {
                 val mergeRequestId = intent.getStringExtra(EXTRA_MERGE_REQUEST)
                 App.get().gitLab.getMergeRequestsByIid(response.id, mergeRequestId)
-                        .compose(this@LoadSomeInfoActivity.bindToLifecycle<List<MergeRequest>>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<List<MergeRequest>>() {
                             override fun error(t: Throwable) {
@@ -172,9 +165,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_BUILD -> {
                 val buildId = intent.getLongExtra(EXTRA_BUILD_ID, -1)
                 App.get().gitLab.getBuild(response.id, buildId)
-                        .compose(this@LoadSomeInfoActivity.bindToLifecycle<Build>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<Build>() {
                             override fun error(t: Throwable) {
@@ -192,9 +183,7 @@ class LoadSomeInfoActivity : BaseActivity() {
             LOAD_TYPE_MILESTONE -> {
                 val milestoneId = intent.getStringExtra(EXTRA_MILESTONE_ID)
                 App.get().gitLab.getMilestonesByIid(response.id, milestoneId)
-                        .compose(this@LoadSomeInfoActivity.bindToLifecycle<List<Milestone>>())
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
+                        .setup(bindToLifecycle())
                         .subscribe(object : CustomSingleObserver<List<Milestone>>() {
                             override fun error(t: Throwable) {

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

@@ -29,6 +29,7 @@ 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.model.Account
 import com.commit451.gitlab.model.api.Message
 import com.commit451.gitlab.model.api.UserFull
@@ -42,8 +43,6 @@ import com.commit451.gitlab.ssl.X509Util
 import com.commit451.teleprinter.Teleprinter
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import okhttp3.Credentials
 import okhttp3.HttpUrl
 import okhttp3.logging.HttpLoggingInterceptor
@@ -74,32 +73,19 @@ class LoginActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: View
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.url_hint)
-    lateinit var textInputLayoutUrl: TextInputLayout
-    @BindView(R.id.url_input)
-    lateinit var textUrl: TextView
-    @BindView(R.id.user_input_hint)
-    lateinit var textInputLayoutUser: TextInputLayout
-    @BindView(R.id.user_input)
-    lateinit var textUser: EditText
-    @BindView(R.id.password_hint)
-    lateinit var textInputLayoutPassword: TextInputLayout
-    @BindView(R.id.password_input)
-    lateinit var textPassword: TextView
-    @BindView(R.id.token_hint)
-    lateinit var textInputLayoutToken: TextInputLayout
-    @BindView(R.id.token_input)
-    lateinit var textToken: TextView
-    @BindView(R.id.normal_login)
-    lateinit var rootNormalLogin: View
-    @BindView(R.id.token_login)
-    lateinit var rootTokenLogin: View
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: View
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.url_hint) lateinit var textInputLayoutUrl: TextInputLayout
+    @BindView(R.id.url_input) lateinit var textUrl: TextView
+    @BindView(R.id.user_input_hint) lateinit var textInputLayoutUser: TextInputLayout
+    @BindView(R.id.user_input) lateinit var textUser: EditText
+    @BindView(R.id.password_hint) lateinit var textInputLayoutPassword: TextInputLayout
+    @BindView(R.id.password_input) lateinit var textPassword: TextView
+    @BindView(R.id.token_hint) lateinit var textInputLayoutToken: TextInputLayout
+    @BindView(R.id.token_input) lateinit var textToken: TextView
+    @BindView(R.id.normal_login) lateinit var rootNormalLogin: View
+    @BindView(R.id.token_login) lateinit var rootTokenLogin: View
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var teleprinter: Teleprinter
@@ -244,9 +230,7 @@ class LoginActivity : BaseActivity() {
     fun attemptLogin(observable: Single<Response<UserLogin>>) {
         observable
-                .compose(this.bindToLifecycle<Response<UserLogin>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<UserLogin>() {
                     override fun error(e: Throwable) {
@@ -345,9 +329,7 @@ class LoginActivity : BaseActivity() {
         }
         val gitLab = GitLabFactory.create(account, gitlabClientBuilder.build())
         gitLab.getThisUser()
-                .compose(this.bindToLifecycle<Response<UserFull>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<UserFull>() {
                     override fun error(e: Throwable) {

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

@@ -16,14 +16,12 @@ 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.model.api.MergeRequest
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.parceler.Parcels
-import retrofit2.Response
 import timber.log.Timber
 /**
@@ -44,16 +42,11 @@ class MergeRequestActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: ViewGroup
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.tabs)
-    lateinit var tabLayout: TabLayout
-    @BindView(R.id.pager)
-    lateinit var viewPager: ViewPager
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: ViewGroup
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.tabs) lateinit var tabLayout: TabLayout
+    @BindView(R.id.pager) lateinit var viewPager: ViewPager
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var project: Project
     lateinit var mergeRequest: MergeRequest
@@ -95,9 +88,7 @@ class MergeRequestActivity : BaseActivity() {
     fun merge() {
         progress.visibility = View.VISIBLE
         App.get().gitLab.acceptMergeRequest(project.id, mergeRequest.id)
-                .compose(this@MergeRequestActivity.bindToLifecycle<Response<MergeRequest>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<MergeRequest>() {
                     override fun error(e: Throwable) {

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

@@ -22,6 +22,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.model.api.Issue
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.model.api.Project
@@ -30,11 +31,8 @@ import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.Subscribe
 import org.parceler.Parcels
-import retrofit2.Response
 import timber.log.Timber
 class MilestoneActivity : BaseActivity() {
@@ -52,18 +50,12 @@ class MilestoneActivity : BaseActivity() {
         }
     }
-    @BindView(R.id.root)
-    lateinit var root: View
-    @BindView(R.id.toolbar)
-    lateinit var toolbar: Toolbar
-    @BindView(R.id.swipe_layout)
-    lateinit var swipeRefreshLayout: SwipeRefreshLayout
-    @BindView(R.id.list)
-    lateinit var listIssues: RecyclerView
-    @BindView(R.id.message_text)
-    lateinit var textMessage: TextView
-    @BindView(R.id.progress)
-    lateinit var progress: View
+    @BindView(R.id.root) lateinit var root: View
+    @BindView(R.id.toolbar) lateinit var toolbar: Toolbar
+    @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.list) lateinit var listIssues: RecyclerView
+    @BindView(R.id.message_text) lateinit var textMessage: TextView
+    @BindView(R.id.progress) lateinit var progress: View
     lateinit var adapterMilestoneIssues: MilestoneIssueAdapter
     lateinit var layoutManagerIssues: LinearLayoutManager
@@ -151,9 +143,7 @@ class MilestoneActivity : BaseActivity() {
         loading = true
         swipeRefreshLayout.isRefreshing = true
         App.get().gitLab.getMilestoneIssues(project.id, milestone.id)
-                .compose(this.bindToLifecycle<Response<List<Issue>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<Issue>>() {
                     override fun error(t: Throwable) {
@@ -193,9 +183,7 @@ class MilestoneActivity : BaseActivity() {
         Timber.d("loadMore called for %s", nextPageUrl)
         App.get().gitLab.getMilestoneIssues(nextPageUrl!!.toString())
-                .compose(this.bindToLifecycle<Response<List<Issue>>>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+                .setup(bindToLifecycle())
                 .subscribe(object : CustomResponseSingleObserver<List<Issue>>() {
                     override fun error(e: Throwable) {
@@ -221,9 +209,7 @@ class MilestoneActivity : BaseActivity() {
     }
     fun updateMilestoneStatus(observable: Single<Milestone>) {
-        observable.compose(this.bindToLifecycle<Milestone>())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+        observable.setup(bindToLifecycle())
                 .subscribe(object : CustomSingleObserver<Milestone>() {
                     override fun error(e: Throwable) {
@@ -247,7 +233,7 @@ class MilestoneActivity : BaseActivity() {
     }
     @Subscribe
-    fun onMilestoneChanged(event: MilestoneChangedEvent) {
+    fun onEvent(event: MilestoneChangedEvent) {
         if (milestone.id == event.milestone.id) {
             milestone = event.milestone
             bind(milestone)