Misc (#614)

* Add locale log

* Add flyweight design for authenticator

* Add option to have instant messages only

* Update interceptor

* Add hd image model loader (#613)

* Launch image view for view full image

* Update changelog

* Greatly improve ImageActivity loading

* Update hashes

* Add back keyword filter

* Clean up

1 files changed, 62 insertions, 5 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
index 61a94ac5..fa78bbfa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt
@@ -1,9 +1,19 @@
 package com.pitchedapps.frost.facebook.requests
 
 import com.bumptech.glide.Priority
+import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.model.ModelLoader
+import com.bumptech.glide.load.model.ModelLoaderFactory
+import com.bumptech.glide.load.model.MultiModelLoaderFactory
+import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.Target
+import com.bumptech.glide.signature.ObjectKey
+import com.pitchedapps.frost.facebook.FB_IMAGE_ID_MATCHER
 import com.pitchedapps.frost.facebook.FB_URL_BASE
+import com.pitchedapps.frost.facebook.get
 import okhttp3.Call
 import okhttp3.Request
 import java.io.IOException
@@ -17,8 +27,54 @@ fun RequestAuth.getFullSizedImage(fbid: Long) = frostRequest(::getJsonUrl) {
     get()
 }
 
-class ImageFbidFetcher(private val fbid: Long,
-                       private val cookie: String) : DataFetcher<InputStream> {
+/**
+ * Request loader for a potentially hd version of a url
+ * In this case, each url may potentially return an id,
+ * which may potentially be used to fetch a higher res image url
+ * The following aims to allow such loading while adhering to Glide's lifecycle
+ */
+data class HdImageMaybe(val url: String, val cookie: String) {
+
+    val id: Long by lazy { FB_IMAGE_ID_MATCHER.find(url)[1]?.toLongOrNull() ?: -1 }
+
+    val isValid: Boolean by lazy {
+        id != -1L && cookie.isNotBlank()
+    }
+
+}
+
+/*
+ * The following was a test to see if hd image loading would work
+ *
+ * It's working and tested, though the improvements aren't really worth the extra data use
+ * and reload
+ */
+
+class HdImageLoadingFactory : ModelLoaderFactory<HdImageMaybe, InputStream> {
+
+    override fun build(multiFactory: MultiModelLoaderFactory) = HdImageLoading()
+
+    override fun teardown() = Unit
+}
+
+fun <T> RequestBuilder<T>.loadWithPotentialHd(model: HdImageMaybe) =
+        thumbnail(clone().load(model.url))
+                .load(model)
+                .apply(RequestOptions().override(Target.SIZE_ORIGINAL))
+
+class HdImageLoading : ModelLoader<HdImageMaybe, InputStream> {
+
+    override fun buildLoadData(model: HdImageMaybe,
+                               width: Int,
+                               height: Int,
+                               options: Options?): ModelLoader.LoadData<InputStream>? =
+            if (!model.isValid) null
+            else ModelLoader.LoadData(ObjectKey(model), HdImageFetcher(model))
+
+    override fun handles(model: HdImageMaybe) = model.isValid
+}
+
+class HdImageFetcher(private val model: HdImageMaybe) : DataFetcher<InputStream> {
 
     @Volatile private var cancelled: Boolean = false
     private var urlCall: Call? = null
@@ -33,10 +89,12 @@ class ImageFbidFetcher(private val fbid: Long,
     override fun getDataSource(): DataSource = DataSource.REMOTE
 
     override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        cookie.fbRequest(fail = { callback.fail("Invalid auth") }) {
+        if (!model.isValid) return callback.fail("Model is invalid")
+        model.cookie.fbRequest(fail = { callback.fail("Invalid auth") }) {
             if (cancelled) return@fbRequest callback.fail("Cancelled")
-            val url = getFullSizedImage(fbid).invoke() ?: return@fbRequest callback.fail("Null url")
+            val url = getFullSizedImage(model.id).invoke() ?: return@fbRequest callback.fail("Null url")
             if (cancelled) return@fbRequest callback.fail("Cancelled")
+            if (!url.contains("png") && !url.contains("jpg")) return@fbRequest callback.fail("Invalid format")
             urlCall = Request.Builder().url(url).get().call()
 
             inputStream = try {
@@ -44,7 +102,6 @@ class ImageFbidFetcher(private val fbid: Long,
             } catch (e: IOException) {
                 null
             }
-
             callback.onDataReady(inputStream)
         }
     }