Fixes #161.

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 - Now using slack instead of gitter.
 
+- Moved completely to a webview to fix #161.
+
 **1.5.5.x (didn't last long) AND 1.5.6.x**
 
 - Toolbar in reader activity.

app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt

@@ -30,7 +30,6 @@ class ReaderActivity : AppCompatActivity() {
 
     private var markOnScroll: Boolean = false
     private var debugReadingItems: Boolean = false
-    private var useWebview: Boolean = false
     private var currentItem: Int = 0
     private lateinit var userIdentifier: String
 
@@ -66,8 +65,6 @@ class ReaderActivity : AppCompatActivity() {
         debugReadingItems = sharedPref.getBoolean("read_debug", false)
         userIdentifier = sharedPref.getString("unique_id", "")
         markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
-        useWebview = sharedPref.getBoolean("prefer_webview_in_article_viewer", false)
-
 
         if (allItems.isEmpty()) {
             Crashlytics.setUserIdentifier(userIdentifier)
@@ -184,7 +181,7 @@ class ReaderActivity : AppCompatActivity() {
         }
 
         override fun getItem(position: Int): ArticleFragment {
-            return ArticleFragment.newInstance(position, allItems, useWebview)
+            return ArticleFragment.newInstance(position, allItems)
         }
     }
 

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -51,8 +51,6 @@ class ArticleFragment : Fragment() {
     private lateinit var contentTitle: String
     private lateinit var fab: FloatingActionButton
 
-    private var useWebview: Boolean = false
-
     override fun onStop() {
         super.onStop()
         mCustomTabActivityHelper.unbindCustomTabsService(activity)
@@ -62,7 +60,6 @@ class ArticleFragment : Fragment() {
         super.onCreate(savedInstanceState)
         pageNumber = arguments!!.getInt(ARG_POSITION)
         allItems = arguments!!.getParcelableArrayList(ARG_ITEMS)
-        useWebview = arguments!!.getBoolean(ARG_WEBVIEW)
     }
 
     private lateinit var rootView: ViewGroup
@@ -122,11 +119,7 @@ class ArticleFragment : Fragment() {
             rootView.source.text = contentSource
             rootView.titleView.text = contentTitle
 
-            if (!useWebview) {
+            htmlToWebview(contentText, prefs)
-                htmlToTextview(contentText, customTabsIntent, prefs)
-            } else {
-                htmlToWebview(contentText, prefs)
-            }
 
             if (!contentImage.isEmptyOrNullOrNullString()) {
                 rootView.imageView.visibility = View.VISIBLE
@@ -151,10 +144,6 @@ class ArticleFragment : Fragment() {
                 }
         )
 
-        if (!useWebview) {
-            rootView.content.movementMethod = LinkMovementMethod.getInstance()
-        }
-
         return rootView
     }
 
@@ -180,15 +169,7 @@ class ArticleFragment : Fragment() {
                                 rootView.titleView.text = response.body()!!.title
                                 url = response.body()!!.url
 
-                                if (!useWebview) {
+                                htmlToWebview(response.body()!!.content, prefs)
-                                    htmlToTextview(
-                                            response.body()!!.content,
-                                            customTabsIntent,
-                                            prefs
-                                    )
-                                } else {
-                                    htmlToWebview(response.body()!!.content, prefs)
-                                }
 
                                 if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isEmpty()) {
                                     rootView.imageView.visibility = View.VISIBLE
@@ -227,26 +208,6 @@ class ArticleFragment : Fragment() {
         )
     }
 
-    private fun htmlToTextview(
-            c: String,
-            customTabsIntent: CustomTabsIntent,
-            prefs: SharedPreferences
-    ) {
-        try {
-            rootView.content.visibility = View.VISIBLE
-            rootView.content.text = Html.fromHtml(
-                    c,
-                    HtmlHttpImageGetter(rootView.content, null, true),
-                    null
-            )
-        } catch (e: Exception) {
-            Crashlytics.setUserIdentifier(prefs.getString("unique_id", ""))
-            Crashlytics.log(100, "CANT_TRANSFORM_TO_HTML", e.message)
-            Crashlytics.logException(e)
-            openInBrowserAfterFailing(customTabsIntent)
-        }
-    }
-
     private fun htmlToWebview(c: String, prefs: SharedPreferences) {
 
         val accentColor = ContextCompat.getColor(activity!!.baseContext, R.color.accent)
@@ -309,17 +270,14 @@ class ArticleFragment : Fragment() {
     companion object {
         private val ARG_POSITION = "position"
         private val ARG_ITEMS = "items"
-        private val ARG_WEBVIEW = "userWebview"
 
         fun newInstance(
                 position: Int,
-                allItems: ArrayList<Item>,
+                allItems: ArrayList<Item>
-                webview: Boolean
         ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
             args.putInt(ARG_POSITION, position)
-            args.putBoolean(ARG_WEBVIEW, webview)
             args.putParcelableArrayList(ARG_ITEMS, allItems)
             fragment.arguments = args
             return fragment

app/src/main/res/layout/fragment_article.xml

@@ -70,20 +70,6 @@
                 app:layout_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="24dp"
-                android:paddingBottom="48dp"
-                android:textColorLink="?attr/colorAccent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/source"
-                android:visibility="gone"/>
         </android.support.constraint.ConstraintLayout>
 
     </android.support.v4.widget.NestedScrollView>

app/src/main/res/values-af-rZA/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ar-rSA/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ca-rES/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
   <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-da-rDK/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-de-rDE/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-en-rID/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-es-rES/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Abrir en el navegador</string>
   <string name="reader_action_share">Compartir</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-fi-rFI/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-fr-rFR/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Ouvrir</string>
   <string name="reader_action_share">Partager</string>
   <string name="pref_switch_actions_pager_scroll">Marquer les articles comme lus à la navigation dans le lecteur d\'article.</string>
-  <string name="prefer_webview_in_article_viewer_title">Utiliser une \"Webview\" pour afficher les articles.</string>
+    <string name="add_to_favs_reader">Ajouter aux favoris</string>
-  <string name="prefer_webview_in_article_viewer_on">L\'utilisation d\'une \"Webview\" pour afficher les articles permettra d\'afficher les gifs, et mieux gérer les images et liens. Cette option peut être plus lente.</string>
-  <string name="prefer_webview_in_article_viewer_off">Le contenu de l\'article sera un simple teste avec images et liens. Certains liens peuvent ne pas fonctionner, et les gifs ne fonctionneront pas.</string>
-  <string name="add_to_favs_reader">Ajouter aux favoris</string>
   <string name="remove_to_favs_reader">Supprimer des favoris</string>
 </resources>

app/src/main/res/values-hu-rHU/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-in-rID/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Buka di peramban</string>
   <string name="reader_action_share">Bagikan</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-iw-rIL/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ja-rJP/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
   <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-nl-rNL/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Openen in browser</string>
   <string name="reader_action_share">Delen</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-no-rNO/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-pl-rPL/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Abrir no navegador</string>
   <string name="reader_action_share">Compartilhar</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Abrir no browser</string>
   <string name="reader_action_share">Compartilhar</string>
   <string name="pref_switch_actions_pager_scroll">Artigos de marca como lida quando passar entre artigos.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-ru-rRU/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-sr-rSP/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-sv-rSE/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Tarayıcıda aç</string>
   <string name="reader_action_share">Paylaş</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-uk-rUA/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-vi-rVN/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">在浏览器中打开</string>
   <string name="reader_action_share">分享</string>
   <string name="pref_switch_actions_pager_scroll">切换文章时将文章标记为已读。</string>
-  <string name="prefer_webview_in_article_viewer_title">在文章阅读器中使用 webview。</string>
+    <string name="add_to_favs_reader">添加到收藏</string>
-  <string name="prefer_webview_in_article_viewer_on">对文章阅读器的内容使用 webview。链接、动态图片及图像可得到更好的处理，但可能较慢。</string>
-  <string name="prefer_webview_in_article_viewer_off">文章内容将显示为带有链接和图片的简单文本。链接可能无法正常显示，GIF动态图片不会加载。</string>
-  <string name="add_to_favs_reader">添加到收藏</string>
   <string name="remove_to_favs_reader">从收藏中移除</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -159,9 +159,6 @@
   <string name="reader_action_open">在浏览器中打开</string>
   <string name="reader_action_share">分享</string>
   <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-  <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
+    <string name="add_to_favs_reader">Add to favorites</string>
-  <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-  <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
-  <string name="add_to_favs_reader">Add to favorites</string>
   <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -162,9 +162,6 @@
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
     <string name="pref_switch_actions_pager_scroll">Mark articles as read when swiping between articles.</string>
-    <string name="prefer_webview_in_article_viewer_title">Use a webview in the article viewer.</string>
-    <string name="prefer_webview_in_article_viewer_on">Using the webview for the content of the article viewer. Urls, gifs and images will be better handled, but may be slower.</string>
-    <string name="prefer_webview_in_article_viewer_off">The content of the article will be displayed as simple text with links and images. Urls may not work, and gifs won\'t load.</string>
     <string name="add_to_favs_reader">Add to favorites</string>
     <string name="remove_to_favs_reader">Remove from favorites</string>
 </resources>

app/src/main/res/xml/pref_general.xml

@@ -33,13 +33,6 @@
         android:summaryOff="@string/prefer_article_viewer_off"
         android:summaryOn="@string/prefer_article_viewer_on"
         android:title="@string/prefer_article_viewer_title" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:dependency="prefer_article_viewer"
-        android:key="prefer_webview_in_article_viewer"
-        android:summaryOff="@string/prefer_webview_in_article_viewer_off"
-        android:summaryOn="@string/prefer_webview_in_article_viewer_on"
-        android:title="@string/prefer_webview_in_article_viewer_title" />
 
     <PreferenceCategory
         android:title="@string/pref_general_category_displaying">