From 4493b177233ea3303b8857e62303be14c27fc9b0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 2 Dec 2014 10:21:27 +0300
Subject: disable webview restorestate if not running on accelerated webview

---
 org.fox.ttrss/src/main/AndroidManifest.xml                     | 4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'org.fox.ttrss/src/main')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 63f0f76b..27d16ac0 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="292"
-    android:versionName="1.83" >
+    android:versionCode="293"
+    android:versionName="1.84" >
 
     <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 ce62656c..5ec70cc5 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
@@ -442,7 +442,7 @@ public class ArticleFragment extends Fragment  {
 						//
 					}
 
-                    if (savedInstanceState == null)
+                    if (savedInstanceState == null || !acceleratedWebview)
                         m_web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null);
                     else
                         m_web.restoreState(savedInstanceState);
-- 
cgit v1.2.3