From 1ec4db87420eb1b562b1869dca167277d5c02b42 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 5 Mar 2018 21:17:42 -0700 Subject: [PATCH] Don't reload web pages on a new intent unless the intent contains a new URL. Fixes https://redmine.stoutner.com/issues/256. --- app/build.gradle | 2 +- .../main/assets/de/about_changelog_dark.html | 2 +- .../main/assets/de/about_changelog_light.html | 2 +- .../main/assets/en/about_changelog_dark.html | 2 +- .../main/assets/en/about_changelog_light.html | 2 +- .../main/assets/es/about_changelog_dark.html | 2 +- .../main/assets/es/about_changelog_light.html | 2 +- .../main/assets/it/about_changelog_dark.html | 2 +- .../main/assets/it/about_changelog_light.html | 2 +- .../main/assets/ru/about_changelog_dark.html | 2 +- .../main/assets/ru/about_changelog_light.html | 2 +- .../activities/GuideActivity.java | 8 +-- .../activities/MainWebViewActivity.java | 65 +++++++++++-------- app/src/main/res/values-es/strings.xml | 2 +- 14 files changed, 55 insertions(+), 42 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 47a6163b..55df3775 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:design:27.1.0' + implementation 'com.android.support:design:27.0.2' // Only compile `com.google.firebase:firebase-ads` for the free flavor. freeImplementation 'com.google.firebase:firebase-ads:11.8.0' } diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html index 7347ef3c..ac269426 100644 --- a/app/src/main/assets/de/about_changelog_dark.html +++ b/app/src/main/assets/de/about_changelog_dark.html @@ -30,7 +30,7 @@

2.8.1 (version code 31)

-

1 March 2018 - minimum API 19, target API 27

+

1 March 2018 - minimum API 19, target API 27

diff --git a/app/src/main/assets/de/about_changelog_light.html b/app/src/main/assets/de/about_changelog_light.html index 548e7e60..d355afaf 100644 --- a/app/src/main/assets/de/about_changelog_light.html +++ b/app/src/main/assets/de/about_changelog_light.html @@ -30,7 +30,7 @@

2.8.1 (version code 31)

-

1 March 2018 - minimum API 19, target API 27

+

1 March 2018 - minimum API 19, target API 27

diff --git a/app/src/main/assets/en/about_changelog_dark.html b/app/src/main/assets/en/about_changelog_dark.html index ec8df29d..b4184b88 100644 --- a/app/src/main/assets/en/about_changelog_dark.html +++ b/app/src/main/assets/en/about_changelog_dark.html @@ -25,7 +25,7 @@

2.8.1 (version code 31)

-

1 March 2018 - minimum API 19, target API 27

+

1 March 2018 - minimum API 19, target API 27

diff --git a/app/src/main/assets/en/about_changelog_light.html b/app/src/main/assets/en/about_changelog_light.html index 6144abba..49996b33 100644 --- a/app/src/main/assets/en/about_changelog_light.html +++ b/app/src/main/assets/en/about_changelog_light.html @@ -25,7 +25,7 @@

2.8.1 (version code 31)

-

1 March 2018 - minimum API 19, target API 27

+

1 March 2018 - minimum API 19, target API 27

diff --git a/app/src/main/assets/es/about_changelog_dark.html b/app/src/main/assets/es/about_changelog_dark.html index c442d7c2..605d8142 100644 --- a/app/src/main/assets/es/about_changelog_dark.html +++ b/app/src/main/assets/es/about_changelog_dark.html @@ -27,7 +27,7 @@

2.8.1 (código de versión 31)

-

1 de marzo de 2018 - API mínimo 19, API dirigido 27

+

1 de marzo de 2018 - API mínimo 19, API dirigido 27

diff --git a/app/src/main/assets/es/about_changelog_light.html b/app/src/main/assets/es/about_changelog_light.html index febf4544..f494f875 100644 --- a/app/src/main/assets/es/about_changelog_light.html +++ b/app/src/main/assets/es/about_changelog_light.html @@ -27,7 +27,7 @@

2.8.1 (código de versión 31)

-

1 de marzo de 2018 - API mínimo 19, API dirigido 27

+

1 de marzo de 2018 - API mínimo 19, API dirigido 27

diff --git a/app/src/main/assets/it/about_changelog_dark.html b/app/src/main/assets/it/about_changelog_dark.html index 4a0d448e..f7bc2968 100644 --- a/app/src/main/assets/it/about_changelog_dark.html +++ b/app/src/main/assets/it/about_changelog_dark.html @@ -27,7 +27,7 @@

2.8.1 (versione codice 31)

-

1 Marzo 2018 - minima API 19, target API 27

+

1 Marzo 2018 - minima API 19, target API 27