From 80f5751d9ada8cf75a6789001803ad7ca259efe1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 3 Dec 2014 16:51:00 +0300
Subject: add separate preference for fsvideo player

---
 org.fox.ttrss/src/main/AndroidManifest.xml                     | 4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 9 ++++++---
 org.fox.ttrss/src/main/res/values/strings.xml                  | 2 ++
 org.fox.ttrss/src/main/res/xml/preferences.xml                 | 6 ++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 27d16ac0..99636319 100644
--- 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="293"
-    android:versionName="1.84" >
+    android:versionCode="294"
+    android:versionName="1.85" >
 
     <uses-sdk
         android:minSdkVersion="10"
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 5ec70cc5..73279fb1 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -318,6 +318,7 @@ public class ArticleFragment extends Fragment  {
 				});
 
                 boolean acceleratedWebview = true;
+                boolean enableFullscreenVideo = m_prefs.getBoolean("enable_fs_video", false);
 
 			    // prevent flicker in ics
 			    if (!m_prefs.getBoolean("webview_hardware_accel", true) || useTitleWebView) {
@@ -375,9 +376,11 @@ public class ArticleFragment extends Fragment  {
                 } else {
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                         ws.setJavaScriptEnabled(true);
-                        m_chromeClient = new FSVideoChromeClient(view);
 
-                        m_web.setWebChromeClient(m_chromeClient);
+                        if (enableFullscreenVideo) {
+                            m_chromeClient = new FSVideoChromeClient(view);
+                            m_web.setWebChromeClient(m_chromeClient);
+                        }
                     }
                 }
 
@@ -442,7 +445,7 @@ public class ArticleFragment extends Fragment  {
 						//
 					}
 
-                    if (savedInstanceState == null || !acceleratedWebview)
+                    if (savedInstanceState == null || !acceleratedWebview || !enableFullscreenVideo)
                         m_web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null);
                     else
                         m_web.restoreState(savedInstanceState);
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index f5353153..3aeaf629 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -259,4 +259,6 @@
     <string name="headline_display_mode_default">Default</string>
     <string name="headline_display_mode_no_images">No images</string>
     <string name="headline_display_mode_compact">Compact</string>
+    <string name="prefs_enable_fs_video_summary">May cause graphical glitches on some devices.</string>
+    <string name="prefs_enable_fs_video">Fullscreen video support</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index b9087b22..df0d64b6 100644
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -143,6 +143,12 @@
             android:key="use_volume_keys"
             android:summary="@string/use_volume_keys_long"
             android:title="@string/use_volume_keys" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="enable_fs_video"
+            android:summary="@string/prefs_enable_fs_video_summary"
+            android:title="@string/prefs_enable_fs_video" />
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="full_screen_mode"
-- 
cgit v1.2.3