Revert "No Issue - Hardcode XAI.platformVersion to 52.9.0 and add XAI.greVersion as the actual version"

This reverts commit 0c2396808491278981bec84e8998b29ec19d297d.

6 files changed, 11 insertions, 11 deletions

diff --git a/components/addons/src/AddonManager.jsm b/components/addons/src/AddonManager.jsm
index b1cc0978e..44aa11d65 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.greVersion);
+                                   Services.appinfo.platformVersion);
         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 8432886b6..41fb5c06d 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.greVersion;
+        appVersion = aPlatformVersion || Services.appinfo.platformVersion;
       else
         appVersion = aAppVersion || Services.appinfo.version;
 
diff --git a/components/addons/src/AddonUpdateChecker.jsm b/components/addons/src/AddonUpdateChecker.jsm
index 17c17c907..bfff493bf 100644
--- a/components/addons/src/AddonUpdateChecker.jsm
+++ b/components/addons/src/AddonUpdateChecker.jsm
@@ -494,7 +494,7 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
   }
 
   let appID = Services.appinfo.ID;
-  let platformVersion = Services.appinfo.greVersion;
+  let platformVersion = Services.appinfo.platformVersion;
 
   // The list of available updates
   let updates = getProperty(addon, "updates", "array", []);
@@ -854,7 +854,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     for (let update of aUpdates) {
       if (Services.vc.compare(update.version, aVersion) == 0) {
@@ -897,7 +897,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     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 e9e556f99..0a81e01db 100644
--- a/components/addons/src/XPIProvider.jsm
+++ b/components/addons/src/XPIProvider.jsm
@@ -6180,7 +6180,7 @@ UpdateChecker.prototype = {
     if ((this.appVersion &&
          Services.vc.compare(this.appVersion, Services.appinfo.version) != 0) ||
         (this.platformVersion &&
-         Services.vc.compare(this.platformVersion, Services.appinfo.greVersion) != 0)) {
+         Services.vc.compare(this.platformVersion, Services.appinfo.platformVersion) != 0)) {
       compatUpdate = AUC.getCompatibilityUpdate(aUpdates, this.addon.version,
                                                 false, this.appVersion,
                                                 this.platformVersion,
@@ -6362,7 +6362,7 @@ AddonInternal.prototype = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     let version;
     if (app.id == Services.appinfo.ID) {
diff --git a/components/blocklist/nsBlocklistService.js b/components/blocklist/nsBlocklistService.js
index 50de11038..188fdfb38 100644
--- a/components/blocklist/nsBlocklistService.js
+++ b/components/blocklist/nsBlocklistService.js
@@ -387,7 +387,7 @@ Blocklist.prototype = {
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
-      toolkitVersion = gApp.greVersion;
+      toolkitVersion = gApp.platformVersion;
 
     var blItem = this._findMatchingAddonEntry(addonEntries, addon);
     if (!blItem)
@@ -529,7 +529,7 @@ Blocklist.prototype = {
     dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
     dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
     dsURI = dsURI.replace(/%CHANNEL%/g, "@MOZ_UPDATE_CHANNEL@");
-    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.greVersion);
+    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
     dsURI = dsURI.replace(/%DISTRIBUTION%/g,
                       getDistributionPrefValue(PREF_APP_DISTRIBUTION));
     dsURI = dsURI.replace(/%DISTRIBUTION_VERSION%/g,
@@ -1137,7 +1137,7 @@ Blocklist.prototype = {
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
-      toolkitVersion = gApp.greVersion;
+      toolkitVersion = gApp.platformVersion;
 
     for (var blockEntry of pluginEntries) {
       var matchFailed = false;
diff --git a/components/urlformatter/nsURLFormatter.js b/components/urlformatter/nsURLFormatter.js
index 86ebf5961..8bb68bc45 100644
--- a/components/urlformatter/nsURLFormatter.js
+++ b/components/urlformatter/nsURLFormatter.js
@@ -97,7 +97,7 @@ nsURLFormatterService.prototype = {
     VERSION:          function() { return this.appInfo.version; },
     MAJOR_VERSION:    function() { return this.appInfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1"); },
     APPBUILDID:       function() { return this.appInfo.appBuildID; },
-    PLATFORMVERSION:  function() { return this.appInfo.greVersion; },
+    PLATFORMVERSION:  function() { return this.appInfo.platformVersion; },
     PLATFORMBUILDID:  function() { return this.appInfo.platformBuildID; },
     APP:              function() { return this.appInfo.name.toLowerCase().replace(/ /, ""); },
     OS:               function() { return this.appInfo.OS; },