diff options
| author | Andrew Dolgov <[email protected]> | 2015-11-23 14:19:41 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-11-23 14:19:41 +0300 |
| commit | a2f248a238f8ab4396f16fbd05ca2deed0ccb260 (patch) | |
| tree | 2ac11108c83d6cff32605ef32f206f7657796778 /org.fox.ttrss/src | |
| parent | 9ad2955c6ca001fbab16b97e8e4b0ab45eb8e30a (diff) | |
offline article: allow mixed content to enable showing cached images on LP+
Diffstat (limited to 'org.fox.ttrss/src')
| -rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 6 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 78723434..ece74610 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="378" - android:versionName="1.150" > + android:versionCode="379" + android:versionName="1.151" > <uses-sdk android:minSdkVersion="15" - android:targetSdkVersion="21" /> + android:targetSdkVersion="23" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 2a9daca3..9ec060a0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -290,6 +290,11 @@ public class OfflineArticleFragment extends Fragment { WebSettings ws = web.getSettings(); ws.setSupportZoom(false); + // we need to show "insecure" file:// urls + if (m_prefs.getBoolean("offline_image_cache_enabled", false)) { + ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + } + TypedValue tvBackground = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.articleBackground, tvBackground, true); |