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

Workaround a bug in recent versions of Androidâs WebView that prevented users from saving cookies when desired.

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

Workaround a bug in recent versions of Androidâs WebView that prevented users from saving cookies when desired.

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

Workaround a bug in recent versions of Androidâs WebView that prevented users from saving cookies when desired.

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

Workaround a bug in recent versions of Androidâs WebView that prevented users from saving cookies when desired.

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

SoluciÃ³n a un error en versiones recientes del WebView de Android que impedÃa a los usuarios guardar cookies cuando lo deseaban.

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

SoluciÃ³n a un error en versiones recientes del WebView de Android que impedÃa a los usuarios guardar cookies cuando lo deseaban.

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

Correzione di un baco dovuto alle piÃ¹ recenti versioni della WebView di Android che impediva il salvataggio dei cookies agli utenti quando desideravano farlo.

2.8.1 (versione codice 31)

1 Marzo 2018 - minima API 19, target API 27

Correzione di un baco dovuto alle piÃ¹ recenti versioni della WebView di Android che impediva il salvataggio dei cookies agli utenti quando desideravano farlo.

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)

1 Ð¼Ð°ÑÑÐ° 2018 - minimum API 19, target API 27

ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾ÑÐ¸Ð±ÐºÐ¸, Ð¿ÑÐµÐ¿ÑÑÑÑÐ²Ð¾Ð²Ð°Ð²ÑÐµÐ¹ Ð¿ÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¼Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² cookie Ð¿ÑÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð²ÐµÑÑÐ¸Ð¹ Android WebView.

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)

1 Ð¼Ð°ÑÑÐ° 2018 - minimum API 19, target API 27

ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾ÑÐ¸Ð±ÐºÐ¸, Ð¿ÑÐµÐ¿ÑÑÑÑÐ²Ð¾Ð²Ð°Ð²ÑÐµÐ¹ Ð¿ÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¼Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² cookie Ð¿ÑÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð²ÐµÑÑÐ¸Ð¹ Android WebView.

. + * Copyright Â© 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -49,7 +49,7 @@ public class GuideActivity extends AppCompatActivity { setContentView(R.layout.guide_coordinatorlayout); // We need to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar); + Toolbar guideAppBar = findViewById(R.id.guide_toolbar); setSupportActionBar(guideAppBar); // Display the home arrow on `ppBar`. @@ -58,12 +58,12 @@ public class GuideActivity extends AppCompatActivity { appBar.setDisplayHomeAsUpEnabled(true); // Setup the ViewPager. - ViewPager aboutViewPager = (ViewPager) findViewById(R.id.guide_viewpager); + ViewPager aboutViewPager = findViewById(R.id.guide_viewpager); assert aboutViewPager != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutViewPager might be null. aboutViewPager.setAdapter(new guidePagerAdapter(getSupportFragmentManager())); // Setup the TabLayout and connect it to the ViewPager. - TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.guide_tablayout); + TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout); assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null. aboutTabLayout.setupWithViewPager(aboutViewPager); } 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 0158996f..032aacb0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -301,6 +301,9 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD // `reapplyDomainSettingsOnRestart` is used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onRestart()`, and `onAddDomain()`, . private boolean reapplyDomainSettingsOnRestart; + // `returnFromSettings` is used in `onNavigationItemSelected()` and `onRestart()`. + private boolean returnFromSettings; + // `currentDomainName` is used in `onCreate()`, `onOptionsItemSelected()`, `onNavigationItemSelected()`, `onAddDomain()`, and `applyDomainSettings()`. private String currentDomainName; @@ -1162,7 +1165,7 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD @Override public void onPageFinished(WebView view, String url) { // Flush any cookies to persistent storage. `CookieManager` has become very lazy about flushing cookies in recent versions. - if (Build.VERSION.SDK_INT >= 21) { + if (firstPartyCookiesEnabled && Build.VERSION.SDK_INT >= 21) { cookieManager.flush(); } @@ -1332,22 +1335,23 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD // Sets the new intent as the activity intent, so that any future `getIntent()`s pick up this one instead of creating a new activity. setIntent(intent); + // Check to see if the intent contains a new URL. if (intent.getData() != null) { // Get the intent data and convert it to a string. final Uri intentUriData = intent.getData(); formattedUrlString = intentUriData.toString(); - } - // Close the navigation drawer if it is open. - if (drawerLayout.isDrawerVisible(GravityCompat.START)) { - drawerLayout.closeDrawer(GravityCompat.START); - } + // Load the website. + loadUrl(formattedUrlString); - // Load the website. - loadUrl(formattedUrlString); + // Close the navigation drawer if it is open. + if (drawerLayout.isDrawerVisible(GravityCompat.START)) { + drawerLayout.closeDrawer(GravityCompat.START); + } - // Clear the keyboard if displayed and remove the focus on the urlTextBar if it has it. - mainWebView.requestFocus(); + // Clear the keyboard if displayed and remove the focus on the urlTextBar if it has it. + mainWebView.requestFocus(); + } } @Override @@ -1355,25 +1359,19 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD // Run the default commands. super.onRestart(); - // Apply the app settings, which may have been changed in `SettingsActivity`. - applyAppSettings(); + // Apply the app settings if returning from the Settings activity.. + if (returnFromSettings) { + // Reset the return from settings flag. + returnFromSettings = false; - // Apply the domain settings if returning from the Domains Activity. - if (reapplyDomainSettingsOnRestart) { - // Reset `reapplyDomainSettingsOnRestart`. - reapplyDomainSettingsOnRestart = false; + // Apply the app settings. + applyAppSettings(); - // Reapply the domain settings. - applyDomainSettings(formattedUrlString); + // Set the display webpage images mode. + setDisplayWebpageImages(); } - // Update the privacy icon. `true` runs `invalidateOptionsMenu` as the last step. - updatePrivacyIcons(true); - - // Set the display webpage images mode. - setDisplayWebpageImages(); - - // Reload the webpage if displaying of images has been disabled in `SettingsFragment`. + // Reload the webpage if displaying of images has been disabled in the Settings activity. if (reloadOnRestart) { // Reload `mainWebView`. mainWebView.reload(); @@ -1382,6 +1380,15 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD reloadOnRestart = false; } + // Apply the domain settings if returning from the Domains activity. + if (reapplyDomainSettingsOnRestart) { + // Reset `reapplyDomainSettingsOnRestart`. + reapplyDomainSettingsOnRestart = false; + + // Reapply the domain settings. + applyDomainSettings(formattedUrlString); + } + // Load the URL on restart to apply changes to night mode. if (loadUrlOnRestart) { // Load the current `formattedUrlString`. @@ -1391,7 +1398,7 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD loadUrlOnRestart = false; } - // + // Update the bookmarks drawer if returning from the Bookmarks activity. if (restartFromBookmarksActivity) { // Close the bookmarks drawer. drawerLayout.closeDrawer(GravityCompat.END); @@ -1402,6 +1409,9 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD // Reset `restartFromBookmarksActivity`. restartFromBookmarksActivity = false; } + + // Update the privacy icon. `true` runs `invalidateOptionsMenu` as the last step. + updatePrivacyIcons(true); } // `onResume()` runs after `onStart()`, which runs after `onCreate()` and `onRestart()`. @@ -2029,6 +2039,9 @@ public class MainWebViewActivity extends AppCompatActivity implements AddDomainD reapplyDomainSettingsOnRestart = true; currentDomainName = ""; + // Mark a flag to reapply app settings on restart only when returning from Settings. + returnFromSettings = true; + // Launch `SettingsActivity`. Intent settingsIntent = new Intent(this, SettingsActivity.class); startActivity(settingsIntent); diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3c7696a7..af6d44dc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -292,7 +292,7 @@ Borrar el historial y el cachÃ© despuÃ©s de que cada pÃ¡gina web termine de cargar. No rastrear Enviar la cabecera de no rastrear (DNT) que educadamente sugiere que los servidores web no rastreen este navegador. - Bloquear listas + Listas de bloqueo EasyList Lista principal de bloqueo de anuncios. EasyPrivacy -- 2.45.2

2.8.1 (version code 31)

2.8.1 (version code 31)

2.8.1 (version code 31)

2.8.1 (version code 31)

2.8.1 (cÃ³digo de versiÃ³n 31)

2.8.1 (cÃ³digo de versiÃ³n 31)

2.8.1 (versione codice 31)

2.8.1 (versione codice 31)

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)

2.8.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 31)