Enhancement/proguard (#589)

* Add error log

* Rewrite logger

2 files changed, 6 insertions, 6 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
index cefece36..ca4aa4ac 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/FbRequest.kt
@@ -27,11 +27,11 @@ fun String?.fbRequest(fail: () -> Unit = {}, action: RequestAuth.() -> Unit) {
     } else {
         val auth = getAuth()
         if (!auth.isValid) {
-            L.e("Attempted fbrequest with invalid auth")
+            L.e { "Attempted fbrequest with invalid auth" }
             return fail()
         }
         authMap.put(this, auth)
-        L.i(null, "Found auth $auth")
+        L._i { "Found auth $auth" }
         auth.action()
     }
 }
@@ -106,14 +106,14 @@ fun String.getAuth(): RequestAuth {
             val text = StringEscapeUtils.unescapeEcmaScript(it)
             val fb_dtsg = FB_DTSG_MATCHER.find(text)[1]
             if (fb_dtsg != null) {
-                L.d(null, "fb_dtsg for ${auth.userId}: $fb_dtsg")
+                L._d { "fb_dtsg for ${auth.userId}: $fb_dtsg" }
                 auth = auth.copy(fb_dtsg = fb_dtsg)
                 if (auth.isValid) return auth
             }
 
             val rev = FB_REV_MATCHER.find(text)[1]
             if (rev != null) {
-                L.d(null, "rev for ${auth.userId}: $rev")
+                L._d { "rev for ${auth.userId}: $rev" }
                 auth = auth.copy(rev = rev)
                 if (auth.isValid) return auth
             }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Menu.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Menu.kt
index 59f87fbd..72b6e0a4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Menu.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Menu.kt
@@ -70,7 +70,7 @@ fun parseMenu(call: Call): MenuData? {
 
         return data.copy(footer = MenuFooter(footerData, footerSmallData))
     } catch (e: IOException) {
-        L.e(e, "Menu parse fail")
+        L.e(e) { "Menu parse fail" }
         null
     }
 }
@@ -83,7 +83,7 @@ data class MenuData(val data: List<MenuHeader> = emptyList(),
             @JsonProperty("data") data: List<MenuHeader>?
     ) : this(data ?: emptyList(), MenuFooter())
 
-    fun flatMapValid() : List<MenuItemData> {
+    fun flatMapValid(): List<MenuItemData> {
         val items = mutableListOf<MenuItemData>()
         data.forEach {
             if (it.isValid) items.add(it)