wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1139379 - Rename "Form & search history" to "Form history" and add "Search history" under clear private data. r=margaret

Browse Source
This commit is contained in:
Andy Pusch 2015-03-30 14:20:00 -04:00
parent 0e35050fb9
commit b3ed4d2eeb
10 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/app/mobile.js
View File

@ -344,6 +344,7 @@ pref("privacy.item.cache", true);
pref("privacy.item.cookies", true);
pref("privacy.item.offlineApps", true);
pref("privacy.item.history", true);
pref("privacy.item.searchHistory", true);
pref("privacy.item.formdata", true);
pref("privacy.item.downloads", true);
pref("privacy.item.passwords", true);

6
mobile/android/base/GeckoApp.java
View File

@ -523,12 +523,12 @@ public abstract class GeckoApp
outState.putString(SAVED_STATE_PRIVATE_SESSION, mPrivateBrowsingSession);
}
void handleClearHistory() {
void handleClearHistory(final boolean clearSearchHistory) {
final BrowserDB db = getProfile().getDB();
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
public void run() {
db.clearHistory(getContentResolver());
db.clearHistory(getContentResolver(), clearSearchHistory);
}
});
}
@ -626,7 +626,7 @@ public abstract class GeckoApp
mPrivateBrowsingSession = message.optString("session", null);
} else if ("Sanitize:ClearHistory".equals(event)) {
handleClearHistory();
handleClearHistory(message.optBoolean("clearSearchHistory", false));
callback.sendSuccess(true);
} else if ("Session:StatePurged".equals(event)) {

2
mobile/android/base/db/BrowserDB.java
View File

@ -101,7 +101,7 @@ public interface BrowserDB {
public abstract void removeHistoryEntry(ContentResolver cr, String url);
public abstract void clearHistory(ContentResolver cr);
public abstract void clearHistory(ContentResolver cr, boolean clearSearchHistory);
public abstract String getUrlForKeyword(ContentResolver cr, String keyword);

9
mobile/android/base/db/LocalBrowserDB.java
View File

@ -720,9 +720,12 @@ public class LocalBrowserDB implements BrowserDB {
}
@Override
public void clearHistory(ContentResolver cr) {
cr.delete(mHistoryUriWithProfile, null, null);
cr.delete(mSearchHistoryUri, null, null);
public void clearHistory(ContentResolver cr, boolean clearSearchHistory) {
if (clearSearchHistory) {
cr.delete(mSearchHistoryUri, null, null);
} else {
cr.delete(mHistoryUriWithProfile, null, null);
}
}
@Override

2
mobile/android/base/db/StubBrowserDB.java
View File

@ -217,7 +217,7 @@ public class StubBrowserDB implements BrowserDB {
public void removeHistoryEntry(ContentResolver cr, String url) {
}
public void clearHistory(ContentResolver cr) {
public void clearHistory(ContentResolver cr, boolean clearSearchHistory) {
}
@RobocopTarget

3
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -255,7 +255,8 @@ size. -->
<!ENTITY pref_import_android "Import from Android">
<!ENTITY pref_import_android_summary "Import bookmarks and history from the native browser">
<!ENTITY pref_private_data_history2 "Browsing history">
<!ENTITY pref_private_data_formdata "Form &amp; search history">
<!ENTITY pref_private_data_searchHistory "Search history">
<!ENTITY pref_private_data_formdata2 "Form history">
<!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">
<!ENTITY pref_private_data_passwords "Saved passwords">
<!ENTITY pref_private_data_cache "Cache">

7
mobile/android/base/resources/values/arrays.xml
View File

@ -73,8 +73,9 @@
</string-array>
<string-array name="pref_private_data_entries">
<item>@string/pref_private_data_history2</item>
<item>@string/pref_private_data_searchHistory</item>
<item>@string/pref_private_data_downloadFiles2</item>
<item>@string/pref_private_data_formdata</item>
<item>@string/pref_private_data_formdata2</item>
<item>@string/pref_private_data_cookies2</item>
<item>@string/pref_private_data_passwords</item>
<item>@string/pref_private_data_cache</item>
@ -90,9 +91,11 @@
<item>true</item>
<item>true</item>
<item>true</item>
<item>true</item>
</string-array>
<string-array name="pref_private_data_values">
<item>private.data.history</item>
<item>private.data.searchHistory</item>
<item>private.data.downloadFiles</item>
<item>private.data.formdata</item>
<item>private.data.cookies_sessions</item>
@ -103,6 +106,7 @@
</string-array>
<string-array name="pref_private_data_keys">
<item>private.data.history</item>
<item>private.data.searchHistory</item>
<item>private.data.downloadFiles</item>
<item>private.data.formdata</item>
<item>private.data.cookies_sessions</item>
@ -120,6 +124,7 @@
<item>false</item>
<item>false</item>
<item>false</item>
<item>false</item>
</string-array>
<string-array name="pref_restore_entries">
<item>@string/pref_restore_always</item>

3
mobile/android/base/strings.xml.in
View File

@ -224,7 +224,8 @@
<string name="pref_sync_summary">&pref_sync_summary;</string>
<string name="pref_search_suggestions">&pref_search_suggestions;</string>
<string name="pref_private_data_history2">&pref_private_data_history2;</string>
<string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
<string name="pref_private_data_searchHistory">&pref_private_data_searchHistory;</string>
<string name="pref_private_data_formdata2">&pref_private_data_formdata2;</string>
<string name="pref_private_data_cookies2">&pref_private_data_cookies2;</string>
<string name="pref_private_data_passwords">&pref_private_data_passwords;</string>
<string name="pref_private_data_cache">&pref_private_data_cache;</string>

2
mobile/android/base/tests/testSettingsMenuItems.java
View File

@ -67,7 +67,7 @@ public class testSettingsMenuItems extends PixelTest {
{ StringHelper.REMEMBER_PASSWORDS_LABEL },
MANAGE_LOGINS_ARR,
{ StringHelper.MASTER_PASSWORD_LABEL },
{ StringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Downloads", "Form & search history", "Cookies & active logins", "Saved passwords", "Cache", "Offline website data", "Site settings", "Clear data" },
{ StringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Search history", "Downloads", "Form history", "Cookies & active logins", "Saved passwords", "Cache", "Offline website data", "Site settings", "Clear data" },
};
// Mozilla/vendor menu items.

13
mobile/android/modules/Sanitizer.jsm
View File

@ -159,6 +159,19 @@ Sanitizer.prototype = {
}
},
searchHistory: {
clear: function ()
{
return Messaging.sendRequestForResult({ type: "Sanitize:ClearHistory", clearSearchHistory: true })
.catch(e => Cu.reportError("Java-side search history clearing failed: " + e))
},
get canClear()
{
return true;
}
},
formdata: {
clear: function ()
{