aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2021-11-19 21:09:43 -0800
committerAllan Wang <me@allanwang.ca>2021-11-19 21:09:43 -0800
commit4799eebdc642f740b55aad2e0d9a3624fc11c53f (patch)
treea6a0431c0cd1ada5f3e185ed7208c866b44a0029 /app/src
parent8c343fd09cdf80cfbcdf49fd5cc72bec759478cf (diff)
downloadfrost-4799eebdc642f740b55aad2e0d9a3624fc11c53f.tar.gz
frost-4799eebdc642f740b55aad2e0d9a3624fc11c53f.tar.bz2
frost-4799eebdc642f740b55aad2e0d9a3624fc11c53f.zip
Snapshot work
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt30
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/facebook/requests/Images.kt8
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt10
4 files changed, 29 insertions, 21 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index b5e41751..6d618347 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -43,6 +43,7 @@ import ca.allanwang.kau.utils.tint
import ca.allanwang.kau.utils.toast
import ca.allanwang.kau.utils.withAlpha
import ca.allanwang.kau.utils.withMinAlpha
+import com.github.piasy.biv.view.ImageShownCallback
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.mikepenz.iconics.typeface.IIcon
@@ -166,7 +167,9 @@ class ImageActivity : KauBaseActivity() {
val result = if (!imageUrl.isIndirectImageUrl) imageUrl
else cookie?.getFullSizedImageUrl(imageUrl) ?: imageUrl
if (result != imageUrl)
- L.v { "Launching with true url $result" }
+ L.v { "Launching image with true url $result" }
+ else
+ L.v { "Launching image with url $result" }
result
}
binding = ActivityImage2Binding.inflate(layoutInflater)
@@ -175,15 +178,22 @@ class ImageActivity : KauBaseActivity() {
launch(CoroutineExceptionHandler { _, throwable -> loadError(throwable) }) {
val tempFile = downloadTempImage()
this@ImageActivity.tempFile = tempFile
- binding.imageProgress.fadeOut()
-// binding.imagePhoto.setImageURI(frostUriFromFile(tempFile))
-// Glide.with(binding.imagePhoto).asFile().load(trueImageUrl)
- binding.imagePhoto.showImage(Uri.parse(trueImageUrl.await()))
-// binding.imagePhoto.setImage(ImageSource.uri(frostUriFromFile(tempFile)))
- binding.imagePhoto.animate().alpha(1f).scaleXY(1f).start()
+ binding.showImage(trueImageUrl.await())
}
}
+ private fun ActivityImage2Binding.showImage(url: String) {
+ imageProgress.fadeOut()
+ imagePhoto.showImage(Uri.parse(url))
+ imagePhoto.setImageShownCallback(object : ImageShownCallback {
+ override fun onThumbnailShown() {}
+
+ override fun onMainImageShown() {
+ imagePhoto.animate().alpha(1f).scaleXY(1f).start()
+ }
+ })
+ }
+
private fun ActivityImage2Binding.init() {
imageContainer.setBackgroundColor(baseBackgroundColor)
toolbar.setBackgroundColor(baseBackgroundColor)
@@ -228,12 +238,6 @@ class ImageActivity : KauBaseActivity() {
share.apply {
setState(FabStates.SHARE)
}
-// imagePhoto.setOnImageEventListener(object :
-// SubsamplingScaleImageView.DefaultOnImageEventListener() {
-// override fun onImageLoadError(e: Exception) {
-// loadError(e)
-// }
-// })
activityThemer.setFrostColors {
themeWindow = false
}
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 1a714374..ab041adc 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -60,7 +60,7 @@ class FbCookie @Inject internal constructor(
* Note that this is a synchronized call
*/
val webCookie: String?
- get() = CookieManager.getInstance().getCookie(FB_COOKIE_DOMAIN)
+ get() = CookieManager.getInstance().getCookie(HTTPS_FACEBOOK_COM)
val messengerCookie: String?
get() = CookieManager.getInstance().getCookie(HTTPS_MESSENGER_COM)
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 70f911a8..37f8fab3 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
@@ -31,12 +31,15 @@ import kotlinx.coroutines.withTimeout
/**
* Attempts to get the fbcdn url of the supplied image redirect url
*/
-suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): String? =
- withContext(Dispatchers.IO) {
+suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): String? {
+ L.v { "Image full size 1 from $url" }
+ return withContext(Dispatchers.IO) {
try {
withTimeout(timeout) {
+ L.v { "Image full size from $url" }
val redirect = requestBuilder().url(url).get().call()
.execute().body?.string() ?: return@withTimeout null
+ L.v { "Image full size from redirect $redirect" }
FB_REDIRECT_URL_MATCHER.find(redirect)[1]?.formattedFbUrl
}
} catch (e: Exception) {
@@ -44,3 +47,4 @@ suspend fun String.getFullSizedImageUrl(url: String, timeout: Long = 3000): Stri
null
}
}
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
index 94300348..a0842267 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -61,16 +61,16 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
context.runOnUiThread { context.showVideo(url) }
return true
}
- if (url.isImageUrl) {
- L.d { "Found fb image" }
- context.launchImageActivity(url)
- return true
- }
if (url.isIndirectImageUrl) {
L.d { "Found indirect fb image" }
context.launchImageActivity(url, cookie = fbCookie.webCookie)
return true
}
+ if (url.isImageUrl) {
+ L.d { "Found fb image" }
+ context.launchImageActivity(url)
+ return true
+ }
if (!url.isIndependent) {
L.d { "Forbid overlay switch" }
return false