From 6e648bfc6b596eb4e49f8b37ca436e5ca12e9512 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Wed, 10 Jan 2018 22:15:17 -0500
Subject: Fix login webview

---
 .../main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'app')

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 a2f341ef..44172416 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -31,12 +31,8 @@ class LoginWebView @JvmOverloads constructor(
     private lateinit var loginCallback: (CookieModel) -> Unit
     private lateinit var progressCallback: (Int) -> Unit
 
-    init {
-        FbCookie.reset(this::setupWebview)
-    }
-
     @SuppressLint("SetJavaScriptEnabled")
-    fun setupWebview() {
+    private fun setupWebview() {
         settings.javaScriptEnabled = true
         setLayerType(View.LAYER_TYPE_HARDWARE, null)
         webViewClient = LoginClient()
@@ -47,7 +43,10 @@ class LoginWebView @JvmOverloads constructor(
         this.progressCallback = progressCallback
         this.loginCallback = loginCallback
         L.d { "Begin loading login" }
-        loadUrl(FB_LOGIN_URL)
+        FbCookie.reset {
+            setupWebview()
+            loadUrl(FB_LOGIN_URL)
+        }
     }
 
     private inner class LoginClient : BaseWebViewClient() {
@@ -86,7 +85,7 @@ class LoginWebView @JvmOverloads constructor(
         }
     }
 
-    inner class LoginChromeClient : WebChromeClient() {
+    private inner class LoginChromeClient : WebChromeClient() {
         override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
             L.v { "Login Console ${consoleMessage.lineNumber()}: ${consoleMessage.message()}" }
             return true
-- 
cgit v1.2.3