diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-06 17:13:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 17:13:04 -0400 |
| commit | 2586e947f769740dd8cb8bf8b1dd0473b51e50e4 (patch) | |
| tree | 3deedd5357cbf7f52a8576dd715babf7b5bd097d /app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt | |
| parent | bbe30297a216218ded4c2c6e3e8c2843652eb7a7 (diff) | |
| download | frost-2586e947f769740dd8cb8bf8b1dd0473b51e50e4.tar.gz frost-2586e947f769740dd8cb8bf8b1dd0473b51e50e4.tar.bz2 frost-2586e947f769740dd8cb8bf8b1dd0473b51e50e4.zip | |
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
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt | 15 |
1 files changed, 4 insertions, 11 deletions
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() }) |