clean up base activity

2 files changed, 7 insertions, 27 deletions

diff --git a/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/BaseActivity.kt b/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/BaseActivity.kt
index 5ff85e9..dffe3a9 100644
--- a/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/BaseActivity.kt
+++ b/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/BaseActivity.kt
@@ -1,22 +1,10 @@
 package com.yodle.android.kotlindemo.activity
 
-import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
-import rx.Observable
-import rx.Observer
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import rx.subscriptions.CompositeSubscription
 
 abstract class BaseActivity : AppCompatActivity() {
 
-    val compositeSubscription = CompositeSubscription()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
@@ -26,17 +14,4 @@ abstract class BaseActivity : AppCompatActivity() {
         }
         return super.onOptionsItemSelected(item)
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        compositeSubscription.unsubscribe()
-    }
-
-    fun <T> subscribe(observable: Observable<T>, observer: Observer<T>) {
-        compositeSubscription.add(
-                observable.subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(observer)
-        )
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/RepositoryDetailActivity.kt b/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/RepositoryDetailActivity.kt
index d354365..d54f003 100644
--- a/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/RepositoryDetailActivity.kt
+++ b/app/src/main/kotlin/com/yodle/android/kotlindemo/activity/RepositoryDetailActivity.kt
@@ -14,6 +14,8 @@ import com.yodle.android.kotlindemo.model.RepositoryReadme
 import com.yodle.android.kotlindemo.service.GitHubService
 import kotlinx.android.synthetic.main.activity_repository_detail.*
 import rx.Observer
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -63,8 +65,11 @@ class RepositoryDetailActivity : BaseActivity(), Observer<RepositoryReadme> {
     }
 
     fun loadRepositoryDetails(owner: String, repository: String) {
-        repositoryDetailSpinner.show()
-        subscribe(gitHubService.getRepositoryReadme(owner, repository), this)
+        gitHubService.getRepositoryReadme(owner, repository)
+                .doOnSubscribe { repositoryDetailSpinner.show() }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(this)
     }
 
     fun loadRepositoryImage(imageUrl: String) {