Merge pull request livecode#6698 from livecodepanos/bugfix-21595

livecodepanos · web-flow · commit 102493752a07 · 2018-09-24T12:14:52.000+01:00
[[Android Browser]] Allow cross-origin requests for "file:" protocol scheme
diff --git a/docs/notes/bugfix-21595.md b/docs/notes/bugfix-21595.md
@@ -0,0 +1 @@
+# Android API 26: allow opening local files with JavaScript on Android Browser 
diff --git a/engine/src/java/com/runrev/android/libraries/LibBrowser.java b/engine/src/java/com/runrev/android/libraries/LibBrowser.java
@@ -358,6 +358,8 @@ public void onGeolocationPermissionsShowPrompt( String origin,  GeolocationPermi
 		
 		setWebChromeClient(m_chrome_client);
 		getSettings().setJavaScriptEnabled(true);
+        getSettings().setAllowFileAccessFromFileURLs(true);
+        getSettings().setAllowUniversalAccessFromFileURLs(true);
 		getSettings().setGeolocationEnabled(true);
 		getSettings().setDomStorageEnabled(true);
 		getSettings().setPluginState(WebSettings.PluginState.ON);
diff --git a/engine/src/java/com/runrev/android/nativecontrol/BrowserControl.java b/engine/src/java/com/runrev/android/nativecontrol/BrowserControl.java
@@ -322,6 +322,8 @@ public void onGeolocationPermissionsShowPrompt( String origin,  GeolocationPermi
 		};
 		t_view.setWebChromeClient(m_chrome_client);
         t_view.getSettings().setJavaScriptEnabled(true);
+        t_view.getSettings().setAllowFileAccessFromFileURLs(true);
+        t_view.getSettings().setAllowUniversalAccessFromFileURLs(true);
 		t_view.getSettings().setGeolocationEnabled(true);
 		t_view.getSettings().setDomStorageEnabled(true);
         t_view.getSettings().setPluginState(WebSettings.PluginState.ON);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Android API 26: allow opening local files with JavaScript on Android Browser`