From 0c2396808491278981bec84e8998b29ec19d297d Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 1 Jan 2022 17:22:20 -0600
Subject: No Issue - Hardcode XAI.platformVersion to 52.9.0 and add
 XAI.greVersion as the actual version

---
 components/addons/src/AddonManager.jsm       | 2 +-
 components/addons/src/AddonRepository.jsm    | 2 +-
 components/addons/src/AddonUpdateChecker.jsm | 6 +++---
 components/addons/src/XPIProvider.jsm        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'components/addons')

diff --git a/components/addons/src/AddonManager.jsm b/components/addons/src/AddonManager.jsm
index 44aa11d65..b1cc0978e 100644
--- a/components/addons/src/AddonManager.jsm
+++ b/components/addons/src/AddonManager.jsm
@@ -779,7 +779,7 @@ var AddonManagerInternal = {
         Services.prefs.setCharPref(PREF_EM_LAST_APP_VERSION,
                                    Services.appinfo.version);
         Services.prefs.setCharPref(PREF_EM_LAST_PLATFORM_VERSION,
-                                   Services.appinfo.platformVersion);
+                                   Services.appinfo.greVersion);
         Services.prefs.setIntPref(PREF_BLOCKLIST_PINGCOUNTVERSION,
                                   (appChanged === undefined ? 0 : -1));
         this.validateBlocklist();
diff --git a/components/addons/src/AddonRepository.jsm b/components/addons/src/AddonRepository.jsm
index 41fb5c06d..8432886b6 100644
--- a/components/addons/src/AddonRepository.jsm
+++ b/components/addons/src/AddonRepository.jsm
@@ -1545,7 +1545,7 @@ this.AddonRepository = {
 
       let appVersion = null;
       if (override.appID == TOOLKIT_ID)
-        appVersion = aPlatformVersion || Services.appinfo.platformVersion;
+        appVersion = aPlatformVersion || Services.appinfo.greVersion;
       else
         appVersion = aAppVersion || Services.appinfo.version;
 
diff --git a/components/addons/src/AddonUpdateChecker.jsm b/components/addons/src/AddonUpdateChecker.jsm
index 4fce84095..b09c221a8 100644
--- a/components/addons/src/AddonUpdateChecker.jsm
+++ b/components/addons/src/AddonUpdateChecker.jsm
@@ -496,7 +496,7 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
   }
 
   let appID = Services.appinfo.ID;
-  let platformVersion = Services.appinfo.platformVersion;
+  let platformVersion = Services.appinfo.greVersion;
 
   // The list of available updates
   let updates = getProperty(addon, "updates", "array", []);
@@ -858,7 +858,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.platformVersion;
+      aPlatformVersion = Services.appinfo.greVersion;
 
     for (let update of aUpdates) {
       if (Services.vc.compare(update.version, aVersion) == 0) {
@@ -901,7 +901,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.platformVersion;
+      aPlatformVersion = Services.appinfo.greVersion;
 
     let blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
                     getService(Ci.nsIBlocklistService);
diff --git a/components/addons/src/XPIProvider.jsm b/components/addons/src/XPIProvider.jsm
index 01f2abc69..d3948e8aa 100644
--- a/components/addons/src/XPIProvider.jsm
+++ b/components/addons/src/XPIProvider.jsm
@@ -6207,7 +6207,7 @@ UpdateChecker.prototype = {
     if ((this.appVersion &&
          Services.vc.compare(this.appVersion, Services.appinfo.version) != 0) ||
         (this.platformVersion &&
-         Services.vc.compare(this.platformVersion, Services.appinfo.platformVersion) != 0)) {
+         Services.vc.compare(this.platformVersion, Services.appinfo.greVersion) != 0)) {
       compatUpdate = AUC.getCompatibilityUpdate(aUpdates, this.addon.version,
                                                 false, this.appVersion,
                                                 this.platformVersion,
@@ -6400,7 +6400,7 @@ AddonInternal.prototype = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.platformVersion;
+      aPlatformVersion = Services.appinfo.greVersion;
 
     let version;
     if (app.id == Services.appinfo.ID) {
-- 
cgit v1.2.3