From 5be7b1b7280c053ea8712c4c5bbe66a06d26d9f6 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 9 Jan 2021 23:23:17 +0900 Subject: [PATCH 1/3] store cache for WidgetWebView between loads --- .../im/vector/app/features/widgets/webview/WidgetWebView.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt index 446bc1663f..dc59f2694f 100644 --- a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt @@ -36,10 +36,6 @@ fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) { // clear caches clearHistory() clearFormData() - clearCache(true) - - // does not cache the data - settings.cacheMode = WebSettings.LOAD_NO_CACHE // Enable Javascript settings.javaScriptEnabled = true @@ -77,8 +73,6 @@ fun WebView.clearAfterWidget() { webChromeClient = null webViewClient = null clearHistory() - // NOTE: clears RAM cache, if you pass true, it will also clear the disk cache. - clearCache(true) // Loading a blank page is optional, but will ensure that the WebView isn't doing anything when you destroy it. loadUrl("about:blank") removeAllViews() From b411e8f0093e3de47108d95c1b3227421ae40b1a Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 12 Jan 2021 11:42:45 +0900 Subject: [PATCH 2/3] update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 1315d006e0..5e8ae6ab77 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Features ✨: Improvements 🙌: - Add System theme option and set as default (#904, #2387) + - Use WebView cache for widgets to avoid excessive data use (#2648) - Warn user when they are leaving a not public room (#1460) Bugfix 🐛: From bc6eb565a3b14c94f4f93d13ccf3c346b67463ac Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 12 Jan 2021 23:19:33 +0900 Subject: [PATCH 3/3] remove unused import --- .../java/im/vector/app/features/widgets/webview/WidgetWebView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt index dc59f2694f..b1908d87de 100644 --- a/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt @@ -21,7 +21,6 @@ import android.view.ViewGroup import android.webkit.CookieManager import android.webkit.PermissionRequest import android.webkit.WebChromeClient -import android.webkit.WebSettings import android.webkit.WebView import im.vector.app.R import im.vector.app.features.themes.ThemeUtils