diff options
| author | Allan Wang <me@allanwang.ca> | 2021-01-24 22:04:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 22:04:37 -0800 |
| commit | 94aa2dd8125f474570f366408645e5a81236c573 (patch) | |
| tree | 2952e3ca17872ef10545081a100f16b720f0072a /app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | |
| parent | 68db99597b68c87f1e0eb2d1feb6b6c63bbff1e9 (diff) | |
| parent | 35adc9529f1466e3ae45ee1934536f696bc24547 (diff) | |
| download | frost-94aa2dd8125f474570f366408645e5a81236c573.tar.gz frost-94aa2dd8125f474570f366408645e5a81236c573.tar.bz2 frost-94aa2dd8125f474570f366408645e5a81236c573.zip | |
Merge pull request #1742 from AllanWang/messenger
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt index 40a048af..12e10e10 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt @@ -18,6 +18,7 @@ package com.pitchedapps.frost.web import android.content.Context import android.webkit.JavascriptInterface +import ca.allanwang.kau.utils.ctxCoroutine import com.pitchedapps.frost.activities.MainActivity import com.pitchedapps.frost.activities.WebOverlayActivityBase import com.pitchedapps.frost.contracts.MainActivityContract @@ -28,7 +29,6 @@ import com.pitchedapps.frost.prefs.Prefs import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.WebContext import com.pitchedapps.frost.utils.cookies -import com.pitchedapps.frost.utils.ctxCoroutine import com.pitchedapps.frost.utils.isIndependent import com.pitchedapps.frost.utils.launchImageActivity import com.pitchedapps.frost.utils.showWebContextMenu @@ -97,7 +97,7 @@ class FrostJSI(val web: FrostWebView) { fun longClick(start: Boolean) { activity?.contentBinding?.viewpager?.enableSwipe = !start if (web.frostWebClient.urlSupportsRefresh) { - web.parent.swipeEnabled = !start + web.parent.swipeDisabledByAction = start } } @@ -109,7 +109,7 @@ class FrostJSI(val web: FrostWebView) { if (!web.frostWebClient.urlSupportsRefresh) { return } - web.parent.swipeEnabled = !disable + web.parent.swipeDisabledByAction = disable if (disable) { // locked onto an input field; ensure content is visible (context as? MainActivityContract)?.collapseAppBar() |