From e4679b1663fa78a99c6c8225e454595c6c6f4e38 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 17 Jul 2017 12:38:42 -0700
Subject: Fix notifications and long press for albums (#69)

* Allow for album images to be viewed

* Update listing info

* Web refractoring

* Test message notifications

* Fix notifications and context press
---
 app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
index 875f1c49..3b0125be 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -94,12 +94,14 @@ object FbCookie {
      * When coming back to the main app, switch back to our original account before continuing
      */
     fun switchBackUser(callback: () -> Unit) {
-        if (Prefs.prevId != -1L && Prefs.prevId != Prefs.userId) {
-            switchUser(Prefs.prevId) {
-                L.d("Switch back user", "${Prefs.userId} to ${Prefs.prevId}")
+        if (Prefs.prevId == -1L) return callback()
+        val prevId = Prefs.prevId
+        Prefs.prevId = -1L
+        if (prevId != Prefs.userId) {
+            switchUser(prevId) {
+                L.d("Switch back user", "${Prefs.userId} to ${prevId}")
                 callback()
             }
         } else callback()
-        if (Prefs.prevId != -1L) Prefs.prevId = -1L
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3