diff options
author | Allan Wang <me@allanwang.ca> | 2018-01-07 02:43:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-07 02:43:57 -0500 |
commit | 8aece5e3f9209d7c161410c304655f0aec2d6054 (patch) | |
tree | 1a68d7289a7e67dfaba37a9152fc3942f944bc5e /app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | |
parent | 726d2a4dc3d3158490ca94b660b195898becb30a (diff) | |
download | frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.gz frost-8aece5e3f9209d7c161410c304655f0aec2d6054.tar.bz2 frost-8aece5e3f9209d7c161410c304655f0aec2d6054.zip |
Feature/website debug (#603)
* Create beginning of web downloader
* Clean up
* Update KAU for reified activity launching
* Update web attachments and setFrostColor
* Test other zipper
* Test simpler image saving model
* Finish up image activity
* Restore aggressive overlays
* Try new zipper
* Test again
* Fix tests
* Add working build
* Rename
* Support cancellation
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | 13 |
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) } } |