Merge new auth flyweight and update hd image fetcher

1 files changed, 6 insertions, 8 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostRequestService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostRequestService.kt
index 989f1b24..c88f3946 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostRequestService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostRequestService.kt
@@ -25,7 +25,7 @@ import android.content.Intent
 import android.os.BaseBundle
 import android.os.PersistableBundle
 import com.pitchedapps.frost.facebook.requests.RequestAuth
-import com.pitchedapps.frost.facebook.requests.fbRequest
+import com.pitchedapps.frost.facebook.requests.fbAuth
 import com.pitchedapps.frost.facebook.requests.markNotificationRead
 import com.pitchedapps.frost.utils.EnumBundle
 import com.pitchedapps.frost.utils.EnumBundleCompanion
@@ -179,15 +179,13 @@ class FrostRequestService : BaseJobService() {
         }
         launch(Dispatchers.IO) {
             try {
-                var failed = true
-                cookie.fbRequest {
-                    L.d { "Requesting frost service for ${command.name}" }
-                    command.invoke(this, bundle)
-                    failed = false
-                }
+                val auth = fbAuth.fetch(cookie)
+                command.invoke(auth, bundle)
                 L.d {
-                    "${if (failed) "Failed" else "Finished"} frost service for ${command.name} in ${System.currentTimeMillis() - startTime} ms"
+                    "Finished frost service for ${command.name} in ${System.currentTimeMillis() - startTime} ms"
                 }
+            } catch (e: Exception) {
+                L.e(e) { "Failed frost service for ${command.name} in ${System.currentTimeMillis() - startTime} ms" }
             } finally {
                 jobFinished(params, false)
             }