Bug 1472715 - Show actual state of Telemetry upload on about:telemetry r=gfritzsche

Differential Revision: https://phabricator.services.mozilla.com/D2029

--HG--
extra : moz-landing-system : lando

toolkit/components/telemetry/TelemetrySend.jsm

@@ -221,6 +221,18 @@ var TelemetrySend = {
     return TelemetrySendImpl.submitPing(ping, options);
   },
 
+  /**
+   * Check if sending is disabled. If Telemetry is not allowed to upload,
+   * pings are not sent to the server.
+   * If trying to send a deletion ping, don't block it.
+   *
+   * @param {Object} [ping=null] A ping to be checked.
+   * @return {Boolean} True if pings can be send to the servers, false otherwise.
+   */
+  sendingEnabled(ping = null) {
+    return TelemetrySendImpl.sendingEnabled(ping)
+  },
+
   /**
    * Notify that we can start submitting data to the servers.
    */
@@ -1224,10 +1236,9 @@ var TelemetrySendImpl = {
   },
 
   /**
-   * Check if sending is disabled. If FHR is not allowed to upload,
-   * pings are not sent to the server (Telemetry is a sub-feature of FHR). If trying
-   * to send a deletion ping, don't block it.
-   * If unified telemetry is off, don't send pings if Telemetry is disabled.
+   * Check if sending is disabled. If Telemetry is not allowed to upload,
+   * pings are not sent to the server.
+   * If trying to send a deletion ping, don't block it.
    *
    * @param {Object} [ping=null] A ping to be checked.
    * @return {Boolean} True if pings can be send to the servers, false otherwise.

toolkit/content/aboutTelemetry.js

@@ -10,6 +10,7 @@ ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm");
 ChromeUtils.import("resource://gre/modules/TelemetryController.jsm");
 ChromeUtils.import("resource://gre/modules/TelemetryArchive.jsm");
 ChromeUtils.import("resource://gre/modules/TelemetryUtils.jsm");
+ChromeUtils.import("resource://gre/modules/TelemetrySend.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -206,8 +207,7 @@ var Settings = {
     }
   },
 
-  getStatusStringForSetting(setting) {
-    let enabled = Preferences.get(setting.pref, setting.defaultPrefValue);
+  getStatusString(enabled) {
     let status = bundle.GetStringFromName(enabled ? "telemetryUploadEnabled" : "telemetryUploadDisabled");
     return status;
   },
@@ -217,7 +217,7 @@ var Settings = {
    */
   render() {
     let settingsExplanation = document.getElementById("settings-explanation");
-    let uploadEnabled = this.getStatusStringForSetting(this.SETTINGS[0]);
+    let uploadEnabled = this.getStatusString(TelemetrySend.sendingEnabled());
     let extendedEnabled = Services.telemetry.canRecordExtended;
     let collectedData = bundle.GetStringFromName(extendedEnabled ? "prereleaseData" : "releaseData");
     let explanation = bundle.GetStringFromName("settingsExplanation");