From 7c6357ee65d140de710ab95d78942c62546f64bc Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 1 May 2019 09:57:07 -0700 Subject: [PATCH] Fix a rare crash in `onPageFinished()`. https://redmine.stoutner.com/issues/424 --- .idea/dictionaries/soren.xml | 1 + app/src/main/assets/de/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/de/about_changelog_light.html | 8 ++++++++ app/src/main/assets/en/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/en/about_changelog_light.html | 8 ++++++++ app/src/main/assets/es/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/es/about_changelog_light.html | 8 ++++++++ app/src/main/assets/it/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/it/about_changelog_light.html | 8 ++++++++ app/src/main/assets/ru/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/ru/about_changelog_light.html | 8 ++++++++ app/src/main/assets/tr/about_changelog_dark.html | 8 ++++++++ app/src/main/assets/tr/about_changelog_light.html | 8 ++++++++ .../activities/MainWebViewActivity.java | 14 +++++++++++--- fastlane/metadata/android/en-US/changelogs/44.txt | 3 +++ 15 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/44.txt diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 36ddf6a6..b99112e2 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -76,6 +76,7 @@ gdpr gerlach gitweb + glitchy googleplay homescreen huawei diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html index 549037f2..36c5cbd6 100644 --- a/app/src/main/assets/de/about_changelog_dark.html +++ b/app/src/main/assets/de/about_changelog_dark.html @@ -30,6 +30,14 @@ +

3.0.1 (version code 44)

1. Mai 2019 - Mindest-API 19, Ziel-API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26. April 2019 - Mindest-API 19, Ziel-API 28

3.0.1 (version code 44)

1. Mai 2019 - Mindest-API 19, Ziel-API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26. April 2019 - Mindest-API 19, Ziel-API 28

3.0.1 (version code 44)

1 May 2019 - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26 April 2019 - minimum API 19, target API 28

3.0.1 (version code 44)

1 May 2019 - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26 April 2019 - minimum API 19, target API 28

3.0.1 (cÃ³digo de versiÃ³n 44)

1 de mayo de 2019 - API mÃnimo 19, API dirigido 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (cÃ³digo de versiÃ³n 43)

26 de abril de 2019 - API mÃnimo 19, API dirigido 28

3.0.1 (cÃ³digo de versiÃ³n 44)

1 de mayo de 2019 - API mÃnimo 19, API dirigido 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (cÃ³digo de versiÃ³n 43)

26 de abril de 2019 - API mÃnimo 19, API dirigido 28

3.0.1 (versione codice 44)

1 Maggio 2019 - minima API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (versione codice 43)

26 Aprile 2019 - minima API 19, target API 28

3.0.1 (versione codice 44)

1 Maggio 2019 - minima API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (versione codice 43)

26 Aprile 2019 - minima API 19, target API 28

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

1 Ð¼Ð°Ñ 2019 Ð³Ð¾Ð´Ð° - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)

26 Ð°Ð¿ÑÐµÐ»Ñ 2019 Ð³Ð¾Ð´Ð° - minimum API 19, target API 28

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

1 Ð¼Ð°Ñ 2019 Ð³Ð¾Ð´Ð° - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)

26 Ð°Ð¿ÑÐµÐ»Ñ 2019 Ð³Ð¾Ð´Ð° - minimum API 19, target API 28

3.0.1 (version code 44)

1 May 2019 - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26 Nisan 2019 - minimum API 19, target API 28

3.0.1 (version code 44)

1 May 2019 - minimum API 19, target API 28

Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +
Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank.
Make the back button close a tab if the WebView is at the beginning of the history list.

3.0 (version code 43)

26 Nisan 2019 - minimum API 19, target API 28

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index b6ba8097..8a2a32ca 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -3160,6 +3160,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } else { // There isn't anything to do in Privacy Browser. // Run the default commands. super.onBackPressed(); + + // Manually kill Privacy Browser. Otherwise, it is glitchy when restarted. + System.exit(0); } } @@ -5374,10 +5377,15 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook CheckPinnedMismatchHelper.checkPinnedMismatch(getSupportFragmentManager(), nestedScrollWebView); } + // Get the current URL from the nested scroll WebView. This is more accurate than using the URL passed into the method, which is sometimes not the final one. + String currentUrl = nestedScrollWebView.getUrl(); + // Update the URL text bar if the page is currently selected and the user is not currently typing in the URL edit text. - if ((tabLayout.getSelectedTabPosition() == currentPagePosition) && !urlEditText.hasFocus()) { + // Crash records show that, in some crazy way, it is possible for the current URL to be blank at this point. + // Probably some sort of race condition when Privacy Browser is being resumed. + if ((tabLayout.getSelectedTabPosition() == currentPagePosition) && !urlEditText.hasFocus() && (currentUrl != null)) { // Check to see if the URL is `about:blank`. - if (nestedScrollWebView.getUrl().equals("about:blank")) { // The WebView is blank. + if (currentUrl.equals("about:blank")) { // The WebView is blank. // Display the hint in the URL edit text. urlEditText.setText(""); @@ -5394,7 +5402,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook applyDomainSettings(nestedScrollWebView, "", true, false); } else { // The WebView has loaded a webpage. // Display the final URL. Getting the URL from the WebView instead of using the one provided by `onPageFinished()` makes websites like YouTube function correctly. - urlEditText.setText(nestedScrollWebView.getUrl()); + urlEditText.setText(currentUrl); // Apply text highlighting to the URL. highlightUrlText(); diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt new file mode 100644 index 00000000..957c8451 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/44.txt @@ -0,0 +1,3 @@ +â¢ Fix a bug that allowed the app bar to be scrolled off the screen when app bar scrolling was disabled, with no way to scroll it back. +â¢ Fix a bug that prevented the app bar from being displayed after a tab was deleted if the new active tab was blank. +â¢ Make the back button close a tab if the WebView is at the beginning of the history list. \ No newline at end of file -- 2.45.2

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (cÃ³digo de versiÃ³n 44)

3.0 (cÃ³digo de versiÃ³n 43)

3.0.1 (cÃ³digo de versiÃ³n 44)

3.0 (cÃ³digo de versiÃ³n 43)

3.0.1 (versione codice 44)

3.0 (versione codice 43)

3.0.1 (versione codice 44)

3.0 (versione codice 43)

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (version code 44)

3.0 (version code 43)

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)

3.0.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 44)

3.0 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 43)