From a2f248a238f8ab4396f16fbd05ca2deed0ccb260 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 23 Nov 2015 14:19:41 +0300
Subject: offline article: allow mixed content to enable showing cached images
 on LP+

---
 org.fox.ttrss/build.gradle                                     | 10 +++++-----
 org.fox.ttrss/src/main/AndroidManifest.xml                     |  6 +++---
 .../java/org/fox/ttrss/offline/OfflineArticleFragment.java     |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 6088287f..3f9935dd 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "23"
 
     defaultConfig {
         applicationId "org.fox.ttrss"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 23
     }
 
     lintOptions {
@@ -29,10 +29,10 @@ dependencies {
     compile files('libs/dashclock-api-r1.1.jar')
     compile files('libs/jsoup-1.6.1.jar')
     compile files('libs/universal-image-loader-1.9.3.jar')
-    compile 'com.android.support:cardview-v7:23.0.0'
-    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
     compile 'com.google.code.gson:gson:2.3'
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.shamanland:fab:0.0.5'
     compile 'ch.acra:acra:4.5.0'
     compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
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);
 
-- 
cgit v1.2.3