From 238c263376d2db2ef7bff765155832fa95309cf1 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 20 Aug 2017 14:09:41 -0700
Subject: Update login logic

---
 .../main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt | 2 ++
 .../main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt  | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')

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) }
                                 }
                             }
                         }
-- 
cgit v1.2.3