From 8757548a3e5b5cc4d159d61eb4a12c7af1be548e Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 13 Apr 2019 11:22:15 -0400 Subject: Issue #991 Part 8: Toolkit everything else --- toolkit/modules/UpdateUtils.jsm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'toolkit/modules/UpdateUtils.jsm') diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index e92b1b797..fed7c7637 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -31,13 +31,9 @@ this.UpdateUtils = { * Whether or not to include the partner bits. Default: true. */ getUpdateChannel(aIncludePartners = true) { - let channel = AppConstants.MOZ_UPDATE_CHANNEL; + let channel = defaults.getCharPref("app.update.channel", + AppConstants.MOZ_UPDATE_CHANNEL); let defaults = Services.prefs.getDefaultBranch(null); - try { - channel = defaults.getCharPref("app.update.channel"); - } catch (e) { - // use default value when pref not found - } if (aIncludePartners) { try { @@ -93,15 +89,7 @@ this.UpdateUtils = { /* Get the distribution pref values, from defaults only */ function getDistributionPrefValue(aPrefName) { - var prefValue = "default"; - - try { - prefValue = Services.prefs.getDefaultBranch(null).getCharPref(aPrefName); - } catch (e) { - // use default when pref not found - } - - return prefValue; + return prefValue = Services.prefs.getDefaultBranch(null).getCharPref(aPrefName, "default"); } /** -- cgit v1.2.3 From bca1943ca7bc8282cbf83be4898ab1d7e9e5355f Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 21 Apr 2019 11:28:27 -0400 Subject: Fix variable used before being declared in UpdateUtils.jsm Fall out from #991 --- toolkit/modules/UpdateUtils.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit/modules/UpdateUtils.jsm') diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index fed7c7637..4e796a2da 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -31,9 +31,9 @@ this.UpdateUtils = { * Whether or not to include the partner bits. Default: true. */ getUpdateChannel(aIncludePartners = true) { + let defaults = Services.prefs.getDefaultBranch(null); let channel = defaults.getCharPref("app.update.channel", AppConstants.MOZ_UPDATE_CHANNEL); - let defaults = Services.prefs.getDefaultBranch(null); if (aIncludePartners) { try { -- cgit v1.2.3 From cb5d20deb7fed28887b9ea8edfad7792e59c1679 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 25 Apr 2019 06:02:08 -0400 Subject: Add application ID and widget toolkit placeholders to UpdateUtils.jsm --- toolkit/modules/UpdateUtils.jsm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'toolkit/modules/UpdateUtils.jsm') diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index 4e796a2da..4c6e7776d 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -2,6 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#filter substitution + this.EXPORTED_SYMBOLS = ["UpdateUtils"]; const { classes: Cc, interfaces: Ci, utils: Cu } = Components; @@ -65,23 +67,28 @@ this.UpdateUtils = { * @return The formatted URL. */ formatUpdateURL(url) { + url = url.replace(/%ID%/g, Services.appinfo.ID); url = url.replace(/%PRODUCT%/g, Services.appinfo.name); url = url.replace(/%VERSION%/g, Services.appinfo.version); url = url.replace(/%BUILD_ID%/g, Services.appinfo.appBuildID); url = url.replace(/%BUILD_TARGET%/g, Services.appinfo.OS + "_" + this.ABI); url = url.replace(/%OS_VERSION%/g, this.OSVersion); - url = url.replace(/%SYSTEM_CAPABILITIES%/g, gSystemCapabilities); + url = url.replace(/%WIDGET_TOOLKIT%/g, "@MOZ_WIDGET_TOOLKIT@"); + url = url.replace(/%CHANNEL%/g, this.UpdateChannel); + if (/%LOCALE%/.test(url)) { url = url.replace(/%LOCALE%/g, this.Locale); } - url = url.replace(/%CHANNEL%/g, this.UpdateChannel); + + url = url.replace(/%CUSTOM%/g, Preferences.get(PREF_APP_UPDATE_CUSTOM, "")); + url = url.replace(/\+/g, "%2B"); + + url = url.replace(/%SYSTEM_CAPABILITIES%/g, gSystemCapabilities); url = url.replace(/%PLATFORM_VERSION%/g, Services.appinfo.platformVersion); url = url.replace(/%DISTRIBUTION%/g, getDistributionPrefValue(PREF_APP_DISTRIBUTION)); url = url.replace(/%DISTRIBUTION_VERSION%/g, getDistributionPrefValue(PREF_APP_DISTRIBUTION_VERSION)); - url = url.replace(/%CUSTOM%/g, Preferences.get(PREF_APP_UPDATE_CUSTOM, "")); - url = url.replace(/\+/g, "%2B"); return url; } -- cgit v1.2.3