Merge pull request #26 from mvarnagiris/dev

v0.5.3
mvarnagiris · May 20, 2017 · 8c14287 · 8c14287
2 parents e36bfb8 + 0d18f39
commit 8c14287
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 523 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
+### v0.5.3
+- `fix` Even more crash fixes.
+
+### v0.5.2
+- `fix` More crash fixes.
+
 ### v0.5.1
-- `fix` Bug fixes.
+- `fix` Crash fixes.
 
 ### v0.5.0
 - `new` Added trends report when you tap on it on home screen.
@@ -40,4 +46,4 @@
 
 ### v0.2.0
 - `fix` Crash in transaction view related with tags.
-- `new` Tag ordering.
+- `new` Tag ordering.
diff --git a/app-core/src/main/kotlin/com/mvcoding/expensius/CachedDataProvider.kt b/app-core/src/main/kotlin/com/mvcoding/expensius/CachedDataProvider.kt
diff --git a/app-core/src/main/kotlin/com/mvcoding/expensius/CachedDataService.kt b/app-core/src/main/kotlin/com/mvcoding/expensius/CachedDataService.kt
diff --git a/app-core/src/main/kotlin/com/mvcoding/expensius/feature/Destroyable.kt b/app-core/src/main/kotlin/com/mvcoding/expensius/feature/Destroyable.kt
diff --git a/app-core/src/main/kotlin/com/mvcoding/expensius/feature/ErrorView.kt b/app-core/src/main/kotlin/com/mvcoding/expensius/feature/ErrorView.kt
@@ -14,10 +14,12 @@
 
 package com.mvcoding.expensius.feature
 
+import com.mvcoding.expensius.RxSchedulers
 import com.mvcoding.expensius.model.UserAlreadyLinkedException
 import com.mvcoding.mvp.Presenter
 import rx.Observable
 import rx.Observable.empty
+import rx.Observable.just
 
 interface ErrorView : Presenter.View {
     fun showError(error: Error)
@@ -37,4 +39,11 @@ data class Error(val throwable: Throwable) {
 
 fun Throwable.toError() = Error(this)
 
-fun <T> Observable<T>.ignoreError(): Observable<T> = onErrorResumeNext { empty() }
+fun <T> Observable<T>.ignoreError(): Observable<T> = onErrorResumeNext { empty() }
+fun <T> Observable<T>.handleError(
+        errorView: ErrorView,
+        schedulers: RxSchedulers,
+        doBeforeShowError: (Throwable) -> Unit = {}): Observable<T> = onErrorResumeNext {
+    just(it).observeOn(schedulers.main).doOnNext { doBeforeShowError(it) }.subscribe { errorView.showError(it.toError()) }
+    empty()
+}
diff --git a/app-core/src/main/kotlin/com/mvcoding/expensius/feature/premium/PremiumPresenter.kt b/app-core/src/main/kotlin/com/mvcoding/expensius/feature/premium/PremiumPresenter.kt
@@ -45,7 +45,7 @@ class PremiumPresenter(
                 .startWith(Unit)
                 .doOnNext { view.showLoading() }
                 .observeOn(schedulers.io)
-                .switchMap { billingData() }
+                .switchMap { billingData().handleError(view, schedulers, doBeforeShowError = { view.hideLoading() }) }
                 .doOnNext { it.updateToPremiumPaidIfNecessary() }
                 .map { it.billingProducts() }
                 .observeOn(schedulers.main)