122 lines
6.8 KiB
Diff
122 lines
6.8 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Sat, 7 Sep 2019 15:07:42 +0200
|
|
Subject: Add option to not persist tabs across sessions
|
|
|
|
---
|
|
.../java/res/xml/privacy_preferences.xml | 5 +++++
|
|
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
|
|
.../privacy/settings/PrivacySettings.java | 17 +++++++++++++++--
|
|
.../android/strings/android_chrome_strings.grd | 6 ++++++
|
|
4 files changed, 29 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
|
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
|
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
|
@@ -23,6 +23,11 @@
|
|
android:title="@string/always_incognito_title"
|
|
android:summary="@string/always_incognito_summary"
|
|
android:defaultValue="false" />
|
|
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
|
+ android:key="close_tabs_on_exit"
|
|
+ android:title="@string/close_tabs_on_exit_title"
|
|
+ android:summary="@string/close_tabs_on_exit_summary"
|
|
+ android:defaultValue="false" />
|
|
<Preference
|
|
android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
|
|
android:key="do_not_track"
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
|
@@ -1077,8 +1077,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
|
boolean hadCipherData =
|
|
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
|
|
|
|
+ String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
|
|
boolean noRestoreState =
|
|
- CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE);
|
|
+ CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE) ||
|
|
+ ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
|
|
if (noRestoreState) {
|
|
// Clear the state files because they are inconsistent and useless from now on.
|
|
mTabModelSelectorImpl.clearState();
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
|
|
@@ -4,6 +4,7 @@
|
|
|
|
package org.chromium.chrome.browser.privacy.settings;
|
|
|
|
+import android.content.SharedPreferences;
|
|
import android.os.Bundle;
|
|
import android.text.SpannableString;
|
|
import android.view.Menu;
|
|
@@ -14,6 +15,7 @@ import androidx.preference.Preference;
|
|
import androidx.preference.PreferenceFragmentCompat;
|
|
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
|
|
|
|
+import org.chromium.base.ContextUtils;
|
|
import org.chromium.base.BuildInfo;
|
|
import org.chromium.chrome.R;
|
|
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
|
|
@@ -41,6 +43,7 @@ import org.chromium.ui.text.SpanApplier;
|
|
*/
|
|
public class PrivacySettings
|
|
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
|
|
+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
|
|
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
|
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
|
|
private static final String PREF_SECURE_DNS = "secure_dns";
|
|
@@ -52,7 +55,8 @@ public class PrivacySettings
|
|
PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
|
|
PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
|
|
PREF_ALWAYS_INCOGNITO,
|
|
- PREF_ALLOW_CUSTOM_TAB_INTENTS
|
|
+ PREF_ALLOW_CUSTOM_TAB_INTENTS,
|
|
+ PREF_CLOSE_TABS_ON_EXIT
|
|
};
|
|
|
|
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
|
@@ -98,7 +102,11 @@ public class PrivacySettings
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
String key = preference.getKey();
|
|
- if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
|
+ if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
|
|
+ SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
|
|
+ sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
|
|
+ sharedPreferencesEditor.apply();
|
|
+ } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
|
|
UserPrefs.get(Profile.getLastUsedRegularProfile())
|
|
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
|
|
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
|
@@ -146,6 +154,11 @@ public class PrivacySettings
|
|
if (secureDnsPref != null && secureDnsPref.isVisible()) {
|
|
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
|
|
}
|
|
+
|
|
+ ChromeSwitchPreference closeTabsOnExitPref =
|
|
+ (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
|
|
+ closeTabsOnExitPref.setOnPreferenceChangeListener(this);
|
|
+ closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
|
}
|
|
|
|
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
|
|
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
|
@@ -3706,6 +3706,12 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
|
|
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
|
|
IMAGE
|
|
</message>
|
|
+ <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
|
|
+ Close all open tabs on exit
|
|
+ </message>
|
|
+ <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
|
|
+ Don't persist tabs between browsing sessions
|
|
+ </message>
|
|
<message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
|
|
LINK
|
|
</message>
|
|
--
|
|
2.17.1
|
|
|