Added unsubscribeUntilDetach with error handling.

mvarnagiris · mvarnagiris · commit ec2f963b255b · 2016-06-22T18:14:51.000+01:00
diff --git a/src/main/kotlin/com/mvcoding/mvp/Presenter.kt b/src/main/kotlin/com/mvcoding/mvp/Presenter.kt
@@ -33,6 +33,8 @@ abstract class Presenter<VIEW : Presenter.View> {
     }
 
     protected fun <T> Observable<T>.subscribeUntilDetached(onNext: (T) -> Unit) = subscribe(onNext).apply { unsubscribeOnDetach(this) }
+    protected fun <T> Observable<T>.subscribeUntilDetached(onNext: (T) -> Unit, onError: (Throwable) -> Unit) =
+            subscribe(onNext, onError).apply { unsubscribeOnDetach(this) }
 
     private fun ensureViewIsNotAttached(view: VIEW) {
         if (this.view != null) throw IllegalStateException("Cannot attach $view, because ${this.view} is already attached")

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ abstract class Presenter<VIEW : Presenter.View> {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`protected fun <T> Observable<T>.subscribeUntilDetached(onNext: (T) -> Unit) = subscribe(onNext).apply { unsubscribeOnDetach(this) }`
	`36`	`+ protected fun <T> Observable<T>.subscribeUntilDetached(onNext: (T) -> Unit, onError: (Throwable) -> Unit) =`
	`37`	`+ subscribe(onNext, onError).apply { unsubscribeOnDetach(this) }`
`36`	`38`
`37`	`39`	`private fun ensureViewIsNotAttached(view: VIEW) {`
`38`	`40`	`if (this.view != null) throw IllegalStateException("Cannot attach $view, because ${this.view} is already attached")`