From 2586e947f769740dd8cb8bf8b1dd0473b51e50e4 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 6 Jul 2017 17:13:04 -0400 Subject: Dev 1.1.4 - fixes for donations (#31) * Remove cookie from error log * Remove null check on login as it isn't possible * Add exception to profile loading * Remap billing logic * Display snackbar only for user prompts * Private disposed caller --- .../main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt index a42ee4fb..38d4ad8c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt @@ -44,17 +44,10 @@ class LoginWebView @JvmOverloads constructor( .subscribe { (url, cookie) -> L.d("Checking cookie for login", "$url\n\t$cookie") - val id = userMatcher.find(cookie!!)?.groups?.get(1)?.value - if (id != null) { - try { - FbCookie.save(id.toLong()) - //TODO proceed to next view - cookieObservable.onComplete() - loginObservable.onSuccess(CookieModel(id.toLong(), "", cookie)) - } catch (e: NumberFormatException) { - //todo send report that userId has changed - } - } + val id = userMatcher.find(cookie!!)?.groups?.get(1)?.value!! + FbCookie.save(id.toLong()) + cookieObservable.onComplete() + loginObservable.onSuccess(CookieModel(id.toLong(), "", cookie)) } setupWebview() }) -- cgit v1.2.3