diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-12 15:32:16 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-01 15:12:20 +0200 |
| commit | 1803c596dc4490b0f6dc481dbdf8844655102998 (patch) | |
| tree | 0f23c685a373b8fa80653f635bec5954cc324ca1 | |
| parent | 6042fdd44c0ec532b3e33d4f4046826fa1548d13 (diff) | |
| download | uxp-1803c596dc4490b0f6dc481dbdf8844655102998.tar.gz | |
Issue #1822 - Part 2: Remove Google API key parsing in URLS.
| -rw-r--r-- | toolkit/components/urlformatter/api_keys.in | 1 | ||||
| -rw-r--r-- | toolkit/components/urlformatter/nsURLFormatter.js | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/toolkit/components/urlformatter/api_keys.in b/toolkit/components/urlformatter/api_keys.in index 3fa48dd9a7..0edbcf26ac 100644 --- a/toolkit/components/urlformatter/api_keys.in +++ b/toolkit/components/urlformatter/api_keys.in @@ -1,4 +1,3 @@ #define MOZ_MOZILLA_API_KEY @MOZ_MOZILLA_API_KEY@ -#define MOZ_GOOGLE_API_KEY @MOZ_GOOGLE_API_KEY@ #define MOZ_BING_API_KEY @MOZ_BING_API_KEY@ #define MOZ_BING_API_CLIENTID @MOZ_BING_API_CLIENTID@ diff --git a/toolkit/components/urlformatter/nsURLFormatter.js b/toolkit/components/urlformatter/nsURLFormatter.js index a4a8e1f475..8bb68bc45d 100644 --- a/toolkit/components/urlformatter/nsURLFormatter.js +++ b/toolkit/components/urlformatter/nsURLFormatter.js @@ -106,7 +106,6 @@ nsURLFormatterService.prototype = { OS_VERSION: function() { return this.OSVersion; }, CHANNEL: () => UpdateUtils.UpdateChannel, MOZILLA_API_KEY: () => "@MOZ_MOZILLA_API_KEY@", - GOOGLE_API_KEY: () => "@MOZ_GOOGLE_API_KEY@", BING_API_CLIENTID:() => "@MOZ_BING_API_CLIENTID@", BING_API_KEY: () => "@MOZ_BING_API_KEY@", DISTRIBUTION: function() { return this.distribution.id; }, @@ -146,13 +145,6 @@ nsURLFormatterService.prototype = { } return this.formatURL(format); - }, - - trimSensitiveURLs: function uf_trimSensitiveURLs(aMsg) { - // Only the google API key is sensitive for now. - return "@MOZ_GOOGLE_API_KEY@" ? aMsg.replace(/@MOZ_GOOGLE_API_KEY@/g, - "[trimmed-google-api-key]") - : aMsg; } }; |