From 7d737fcb844fbf9b0e8cbcb05fc09ef122d708a8 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 1 Jan 2019 18:46:16 -0500 Subject: Fix login deadlock --- .../main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 9540636a..b5521e3e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt @@ -93,7 +93,7 @@ class LoginActivity : BaseActivity() { FbCookie.save(cookie.id) web.fadeOut(onFinish = { profile.fadeIn() - launch { loadInfo(cookie) } + this@LoginActivity.launch { loadInfo(cookie) } }) } } @@ -108,9 +108,10 @@ class LoginActivity : BaseActivity() { val imageDeferred = async { loadProfile(cookie.id) } val nameDeferred = async { loadUsername(cookie) } - val foundImage = imageDeferred.await() - val name = nameDeferred.await() + val name: String = nameDeferred.await() + val foundImage: Boolean = imageDeferred.await() + L._d { "Logged in and received data" } refresh(false) if (!foundImage) { -- cgit v1.2.3