wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-23 15:47:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1160 - Remove HotFix Preferences from Telemetry

Browse source
This commit is contained in:
Gaming4JC 2019-07-05 21:18:04 -04:00 • committed by Roy Tam
commit b4fa30b382
3 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
toolkit/components/telemetry/TelemetryEnvironment.jsm
View file

@ -196,7 +196,6 @@ const PREF_DISTRIBUTION_ID = "distribution.id";
const PREF_DISTRIBUTION_VERSION = "distribution.version"; const PREF_DISTRIBUTION_VERSION = "distribution.version";
const PREF_DISTRIBUTOR = "app.distributor"; const PREF_DISTRIBUTOR = "app.distributor";
const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel"; const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel";
const PREF_HOTFIX_LASTVERSION = "extensions.hotfix.lastVersion";
const PREF_APP_PARTNER_BRANCH = "app.partner."; const PREF_APP_PARTNER_BRANCH = "app.partner.";
const PREF_PARTNER_ID = "mozilla.partner.id"; const PREF_PARTNER_ID = "mozilla.partner.id";
const PREF_UPDATE_ENABLED = "app.update.enabled"; const PREF_UPDATE_ENABLED = "app.update.enabled";
@ -1050,7 +1049,6 @@ EnvironmentCache.prototype = {
vendor: Services.appinfo.vendor || null, vendor: Services.appinfo.vendor || null,
platformVersion: Services.appinfo.platformVersion || null, platformVersion: Services.appinfo.platformVersion || null,
xpcomAbi: Services.appinfo.XPCOMABI, xpcomAbi: Services.appinfo.XPCOMABI,
hotfixVersion: Preferences.get(PREF_HOTFIX_LASTVERSION, null),
}; };
// Add |architecturesInBinary| only for Mac Universal builds. // Add |architecturesInBinary| only for Mac Universal builds.

1
toolkit/components/telemetry/docs/data/environment.rst
View file

@ -31,7 +31,6 @@ Structure:
vendor: <string>, // e.g. "Mozilla" vendor: <string>, // e.g. "Mozilla"
platformVersion: <string>, // e.g. "35.0" platformVersion: <string>, // e.g. "35.0"
xpcomAbi: <string>, // e.g. "x86-msvc" xpcomAbi: <string>, // e.g. "x86-msvc"
hotfixVersion: <string>, // e.g. "20141211.01"
}, },
settings: { settings: {
addonCompatibilityCheckEnabled: <bool>, // Whether application compatibility is respected for add-ons addonCompatibilityCheckEnabled: <bool>, // Whether application compatibility is respected for add-ons

8
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View file

@ -33,7 +33,6 @@ const PLATFORM_VERSION = "1.9.2";
const APP_VERSION = "1"; const APP_VERSION = "1";
const APP_ID = "xpcshell@tests.mozilla.org"; const APP_ID = "xpcshell@tests.mozilla.org";
const APP_NAME = "XPCShell"; const APP_NAME = "XPCShell";
const APP_HOTFIX_VERSION = "2.3.4a";
const DISTRIBUTION_ID = "distributor-id"; const DISTRIBUTION_ID = "distributor-id";
const DISTRIBUTION_VERSION = "4.5.6b"; const DISTRIBUTION_VERSION = "4.5.6b";
@ -385,10 +384,8 @@ function checkBuildSection(data) {
Assert.equal(data.build[f], expectedInfo[f], f + " must have the correct value."); Assert.equal(data.build[f], expectedInfo[f], f + " must have the correct value.");
} }
// Make sure architecture and hotfixVersion are in the environment. // Make sure architecture is in the environment.
Assert.ok(checkString(data.build.architecture)); Assert.ok(checkString(data.build.architecture));
Assert.ok(checkString(data.build.hotfixVersion));
Assert.equal(data.build.hotfixVersion, APP_HOTFIX_VERSION);
if (gIsMac) { if (gIsMac) {
let macUtils = Cc["@mozilla.org/xpcom/mac-utils;1"].getService(Ci.nsIMacUtils); let macUtils = Cc["@mozilla.org/xpcom/mac-utils;1"].getService(Ci.nsIMacUtils);
@ -830,9 +827,6 @@ add_task(function* setup() {
gHttpServer.registerDirectory("/data/", do_get_cwd()); gHttpServer.registerDirectory("/data/", do_get_cwd());
do_register_cleanup(() => gHttpServer.stop(() => {})); do_register_cleanup(() => gHttpServer.stop(() => {}));
// Spoof the the hotfixVersion
Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
// Create the attribution data file, so that settings.attribution will exist. // Create the attribution data file, so that settings.attribution will exist.
// The attribution functionality only exists in Firefox. // The attribution functionality only exists in Firefox.
if (AppConstants.MOZ_BUILD_APP == "browser") { if (AppConstants.MOZ_BUILD_APP == "browser") {