1 files changed, 11 insertions, 9 deletions
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 6f08981c..ccb23b93 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -30,12 +30,13 @@ object FbCookie {
                     callback?.invoke()
                     return@removeAllCookies
                 }
-                L.d("Setting cookie", cookie)
+                L.d { "Setting cookie" }
                 val cookies = cookie.split(";").map { Pair(it, SingleSubject.create<Boolean>()) }
                 cookies.forEach { (cookie, callback) -> setCookie(FB_URL_BASE, cookie, { callback.onSuccess(it) }) }
                 Observable.zip<Boolean, Unit>(cookies.map { (_, callback) -> callback.toObservable() }, {}).subscribeOn(AndroidSchedulers.mainThread()).subscribe {
                     callback?.invoke()
-                    L.d("Cookies set", webCookie)
+                    L.d { "Cookies set" }
+                    L._d { cookie }
                     flush()
                 }
             }
@@ -43,19 +44,19 @@ object FbCookie {
     }
 
     operator fun invoke() {
-        L.d("FbCookie Invoke User", Prefs.userId.toString())
+        L.d { "FbCookie Invoke User" }
         with(CookieManager.getInstance()) {
             setAcceptCookie(true)
         }
         val dbCookie = loadFbCookie(Prefs.userId)?.cookie
         if (dbCookie != null && webCookie == null) {
-            L.d("DbCookie found & WebCookie is null; setting webcookie")
+            L.d { "DbCookie found & WebCookie is null; setting webcookie" }
             setWebCookie(dbCookie, null)
         }
     }
 
     fun save(id: Long) {
-        L.d("New cookie found", id.toString())
+        L.d { "New cookie found" }
         Prefs.userId = id
         CookieManager.getInstance().flush()
         val cookie = CookieModel(Prefs.userId, "", webCookie)
@@ -78,11 +79,11 @@ object FbCookie {
 
     fun switchUser(cookie: CookieModel?, callback: () -> Unit) {
         if (cookie == null) {
-            L.d("Switching User; null cookie")
+            L.d { "Switching User; null cookie" }
             callback()
             return
         }
-        L.d("Switching User", cookie.toString())
+        L.d { "Switching User" }
         Prefs.userId = cookie.id
         setWebCookie(cookie.cookie, callback)
     }
@@ -104,7 +105,7 @@ object FbCookie {
      * Clear the cookies of the given id
      */
     fun logout(id: Long, callback: () -> Unit) {
-        L.d("Logging out user $id")
+        L.d { "Logging out user" }
         removeCookie(id)
         reset(callback)
     }
@@ -119,7 +120,8 @@ object FbCookie {
         Prefs.prevId = -1L
         if (prevId != Prefs.userId) {
             switchUser(prevId) {
-                L.d("Switch back user", "${Prefs.userId} to ${prevId}")
+                L.d { "Switch back user" }
+                L._d { "${Prefs.userId} to $prevId" }
                 callback()
             }
         } else callback()