summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/strings.xml2
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml5
3 files changed, 8 insertions, 1 deletions
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 70f0f232..8c34c268 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
@@ -274,7 +274,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment {
String articleContent = m_article.content;
- ws.setJavaScriptEnabled(false);
+ ws.setJavaScriptEnabled(m_prefs.getBoolean("article_javascript_enabled", false));
m_web.setBackgroundColor(Color.TRANSPARENT);
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 46001904..304283fd 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -315,4 +315,6 @@
<string name="enable_icon_tinting">Enable icon tinting</string>
<string name="enable_icon_tinting_summary">Disable if you have trouble distinguishing icons because of their color</string>
<string name="expand_special_cat">Expand Special category</string>
+ <string name="article_enable_javascript">Enable JavaScript</string>
+ <string name="article_enable_javascript_summary">Some iframe-based video players require JavaScript, enable with caution</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 df3dbc42..fe9f1477 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -190,6 +190,11 @@
android:key="enable_article_fab"
android:summary="@string/prefs_enable_fab_long"
android:title="@string/prefs_enable_fab" />
+ <SwitchPreferenceCompat
+ android:defaultValue="false"
+ android:key="article_javascript_enabled"
+ android:summary="@string/article_enable_javascript_summary"
+ android:title="@string/article_enable_javascript" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_opening_links" >
<SwitchPreferenceCompat