diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-20 14:09:41 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-08-20 14:09:41 -0700 |
commit | 238c263376d2db2ef7bff765155832fa95309cf1 (patch) | |
tree | 202959e8969f0202fbe6c3a7e1f0a9e821e2609a /app/src/main/kotlin/com/pitchedapps/frost/activities | |
parent | 62e10aa1295bdcd99e307b22b4747bb5353cd5d7 (diff) | |
download | frost-238c263376d2db2ef7bff765155832fa95309cf1.tar.gz frost-238c263376d2db2ef7bff765155832fa95309cf1.tar.bz2 frost-238c263376d2db2ef7bff765155832fa95309cf1.zip |
Update login logic
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | 2 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | 8 |
2 files changed, 3 insertions, 7 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 6b1f2c5c..99f95469 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt @@ -21,6 +21,7 @@ import com.pitchedapps.frost.R import com.pitchedapps.frost.dbflow.CookieModel import com.pitchedapps.frost.dbflow.fetchUsername import com.pitchedapps.frost.dbflow.loadFbCookiesAsync +import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.web.LoginWebView @@ -64,6 +65,7 @@ class LoginActivity : BaseActivity() { web.loadLogin({ refresh = it != 100 }) { cookie -> L.d("Login found") + FbCookie.save(cookie.id) web.fadeOut(onFinish = { profile.fadeIn() loadInfo(cookie) diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt index 343829c0..80dbc3dc 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt @@ -273,13 +273,7 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract, content(String.format(string(R.string.kau_logout_confirm_as_x), currentCookie.name ?: Prefs.userId.toString())) positiveText(R.string.kau_yes) negativeText(R.string.kau_no) - onPositive { _, _ -> - FbCookie.logout(Prefs.userId) { - val allCookies = cookies() - allCookies.remove(currentCookie) - launchLogin(allCookies, true) - } - } + onPositive { _, _ -> FbCookie.logout(this@MainActivity) } } } } |