1 files changed, 9 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index e9657934..2434c8c2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -62,7 +62,9 @@ class LoginActivity : BaseActivity() {
         setContentView(R.layout.activity_login)
         setSupportActionBar(toolbar)
         setTitle(R.string.kau_login)
-        setFrostColors(toolbar)
+        setFrostColors{
+            toolbar(toolbar)
+        }
         web.loadLogin({ refresh = it != 100 }) { cookie ->
             L.d { "Login found" }
             FbCookie.save(cookie.id)
@@ -97,10 +99,13 @@ class LoginActivity : BaseActivity() {
              * The user may have logged into an account that is already in the database
              * We will let the db handle duplicates and load it now after the new account has been saved
              */
-            loadFbCookiesAsync { cookies ->
+            loadFbCookiesAsync {
+                val cookies = ArrayList(it)
                 Handler().postDelayed({
-                    launchNewTask(if (Showcase.intro) IntroActivity::class.java else MainActivity::class.java,
-                            ArrayList(cookies), clearStack = true)
+                    if (Showcase.intro)
+                        launchNewTask<IntroActivity>(cookies, true)
+                    else
+                        launchNewTask<MainActivity>(cookies, true)
                 }, 1000)
             }
         }