Skip to content

Commit 2d2ad4c

Browse files
authoredJun 29, 2022
fix: accept file cookies only if AndroidInsecureFileModeEnabled (#1449)
1 parent 26b2121 commit 2d2ad4c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

‎framework/src/org/apache/cordova/engine/SystemCookieManager.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Licensed to the Apache Software Foundation (ASF) under one
1919

2020
package org.apache.cordova.engine;
2121

22-
import android.annotation.TargetApi;
23-
import android.os.Build;
2422
import android.webkit.CookieManager;
2523
import android.webkit.WebView;
2624

@@ -35,10 +33,14 @@ public SystemCookieManager(WebView webview) {
3533
webView = webview;
3634
cookieManager = CookieManager.getInstance();
3735

38-
cookieManager.setAcceptFileSchemeCookies(true);
3936
cookieManager.setAcceptThirdPartyCookies(webView, true);
4037
}
4138

39+
@SuppressWarnings("deprecation")
40+
public void setAcceptFileSchemeCookies() {
41+
cookieManager.setAcceptFileSchemeCookies(true);
42+
}
43+
4244
public void setCookiesEnabled(boolean accept) {
4345
cookieManager.setAcceptCookie(accept);
4446
}

‎framework/src/org/apache/cordova/engine/SystemWebViewEngine.java

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ private void initWebViewSettings() {
165165
LOG.d(TAG, "Enabled insecure file access");
166166
settings.setAllowFileAccess(true);
167167
settings.setAllowUniversalAccessFromFileURLs(true);
168+
cookieManager.setAcceptFileSchemeCookies();
168169
}
169170

170171
settings.setMediaPlaybackRequiresUserGesture(false);

0 commit comments

Comments
 (0)