aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-08-04 23:29:45 -0700
committerAllan Wang <me@allanwang.ca>2019-08-04 23:29:45 -0700
commitde7b70da175832f55461764a601988d6639619a6 (patch)
tree8f18f176f9701925f1814e87e1d17d1a6d308152 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
parent2eacc8cb77b561eb1da11acb6ec8f620195fd24f (diff)
downloadfrost-de7b70da175832f55461764a601988d6639619a6.tar.gz
frost-de7b70da175832f55461764a601988d6639619a6.tar.bz2
frost-de7b70da175832f55461764a601988d6639619a6.zip
Format fb urls before intent
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt21
1 files changed, 15 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index 85914f33..ecedc997 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -54,7 +54,10 @@ import kotlinx.coroutines.channels.SendChannel
*/
open class BaseWebViewClient : WebViewClient() {
- override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? =
+ override fun shouldInterceptRequest(
+ view: WebView,
+ request: WebResourceRequest
+ ): WebResourceResponse? =
view.shouldFrostInterceptRequest(request)
}
@@ -173,12 +176,18 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
view.context.resolveActivityForUri(request.url)
return true
}
- if (path.startsWith("/composer/")) return launchRequest(request)
- if (url.isImageUrl)
- return launchImage(url.formattedFbUrl)
- if (url.isIndirectImageUrl)
+ if (path.startsWith("/composer/")) {
+ return launchRequest(request)
+ }
+ if (url.isIndirectImageUrl) {
return launchImage(url.formattedFbUrl, cookie = FbCookie.webCookie)
- if (Prefs.linksInDefaultApp && view.context.resolveActivityForUri(request.url)) return true
+ }
+ if (url.isImageUrl) {
+ return launchImage(url.formattedFbUrl)
+ }
+ if (Prefs.linksInDefaultApp && view.context.resolveActivityForUri(request.url)) {
+ return true
+ }
return super.shouldOverrideUrlLoading(view, request)
}
}