summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-07-06 21:29:25 +0300
committerAndrew Dolgov <[email protected]>2015-07-06 21:29:25 +0300
commitd7677ec893e5003e16ae39595d59a1f82f629cd5 (patch)
tree847e4501a3361d76b21baabd99e92e3fbbec60e8 /org.fox.ttrss
parentae3b87ff91d74de177d5557c093d61f4ea63d440 (diff)
allow <video> elements to autoplay
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java6
2 files changed, 8 insertions, 2 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index cc6b9edc..8ed9ebb6 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="354"
- android:versionName="1.127" >
+ android:versionCode="355"
+ android:versionName="1.128" >
<uses-sdk
android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index f09f2ef5..de604dda 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -458,6 +458,12 @@ public class ArticleFragment extends Fragment {
m_chromeClient = new FSVideoChromeClient(getView());
m_web.setWebChromeClient(m_chromeClient);
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+ }
+
+ ws.setMediaPlaybackRequiresUserGesture(false);
}
if (m_prefs.getBoolean("justify_article_text", true)) {