diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 99636319..31626cc4 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="295" + android:versionName="1.86" > = Build.VERSION_CODES.KITKAT) { ws.setJavaScriptEnabled(true); - if (enableFullscreenVideo) { - m_chromeClient = new FSVideoChromeClient(view); - m_web.setWebChromeClient(m_chromeClient); - } + m_chromeClient = new FSVideoChromeClient(view); + m_web.setWebChromeClient(m_chromeClient); } } @@ -445,10 +443,16 @@ public class ArticleFragment extends Fragment { // } - if (savedInstanceState == null || !acceleratedWebview || !enableFullscreenVideo) + if (savedInstanceState == null || !acceleratedWebview) { m_web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null); - else - m_web.restoreState(savedInstanceState); + } else { + WebBackForwardList rc = m_web.restoreState(savedInstanceState); + + if (rc == null) { + // restore failed... + m_web.loadDataWithBaseURL(baseUrl, content, "text/html", "utf-8", null); + } + } } catch (RuntimeException e) { e.printStackTrace(); diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 3aeaf629..f5353153 100644 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -259,6 +259,4 @@ Default No images Compact - May cause graphical glitches on some devices. - Fullscreen video support diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index df0d64b6..b9087b22 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -143,12 +143,6 @@ android:key="use_volume_keys" android:summary="@string/use_volume_keys_long" android:title="@string/use_volume_keys" /> - -