Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Algorithmic darkening requires WebView 102.*

Browse Source
This commit is contained in:
M66B
2022-06-15 18:10:01 +02:00
parent 251695fb5d
commit eb5f72e466
7 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ActivityAMP.java
View File

@@ -95,7 +95,7 @@ public class ActivityAMP extends ActivityBase {
settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
if (WebViewEx.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE))
if (WebViewEx.isFeatureSupported(this, WebViewFeature.SAFE_BROWSING_ENABLE))
WebSettingsCompat.setSafeBrowsingEnabled(settings, safe_browsing);
setDarkMode();
@@ -127,7 +127,7 @@ public class ActivityAMP extends ActivityBase {
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
boolean dark = Helper.isDarkTheme(this);
boolean canDarken = WebViewEx.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING);
boolean canDarken = WebViewEx.isFeatureSupported(this, WebViewFeature.ALGORITHMIC_DARKENING);
menu.findItem(R.id.menu_force_light)
.setVisible(dark && canDarken)
.getIcon().setLevel(force_light ? 1 : 0);
@@ -160,7 +160,7 @@ public class ActivityAMP extends ActivityBase {
private void setDarkMode() {
WebSettings settings = wvAmp.getSettings();
boolean dark = (Helper.isDarkTheme(this) && !force_light);
boolean canDarken = WebViewEx.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING);
boolean canDarken = WebViewEx.isFeatureSupported(this, WebViewFeature.ALGORITHMIC_DARKENING);
if (canDarken)
WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, dark);
}