Merge pull request #11469 from adobe/prafulVaishnav/fixIssue

Checking the registry if theme is present and then logging it.
adobe · Jul 24, 2015 · 00123c4 · 00123c4
2 parents aa2ae69 + 22a99f7
commit 00123c4
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/src/extensions/default/HealthData/HealthDataManager.js b/src/extensions/default/HealthData/HealthDataManager.js
@@ -36,7 +36,6 @@ define(function (require, exports, module) {
         uuid                = require("thirdparty/uuid");
 
     var prefs      = PreferencesManager.getExtensionPrefs("healthData");
-    var themesPref = PreferencesManager.getExtensionPrefs("themes");
 
     prefs.definePreference("healthDataTracking", "boolean", true, {
         description: Strings.DESCRIPTION_HEALTH_DATA_TRACKING
@@ -71,15 +70,21 @@ define(function (require, exports, module) {
         oneTimeHealthData.osLanguage = brackets.app.language;
         oneTimeHealthData.bracketsLanguage = brackets.getLocale();
         oneTimeHealthData.bracketsVersion = brackets.metadata.version;
-        oneTimeHealthData.bracketsTheme = themesPref.get("theme");
         $.extend(oneTimeHealthData, HealthLogger.getAggregatedHealthData());
 
         HealthDataUtils.getUserInstalledExtensions()
             .done(function (userInstalledExtensions) {
                 oneTimeHealthData.installedExtensions = userInstalledExtensions;
             })
             .always(function () {
-                return result.resolve(oneTimeHealthData);
+                HealthDataUtils.getUserInstalledTheme()
+                    .done(function (bracketsTheme) {
+                        oneTimeHealthData.bracketsTheme = bracketsTheme;
+                    })
+                    .always(function () {
+                        return result.resolve(oneTimeHealthData);
+                    });
+
             });
 
         return result.promise();

diff --git a/src/extensions/default/HealthData/HealthDataUtils.js b/src/extensions/default/HealthData/HealthDataUtils.js
@@ -27,8 +27,11 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var ExtensionManager = brackets.getModule("extensibility/ExtensionManager"),
-        _                = brackets.getModule("thirdparty/lodash");
+    var _                   = brackets.getModule("thirdparty/lodash"),
+        ExtensionManager    = brackets.getModule("extensibility/ExtensionManager"),
+        PreferencesManager  = brackets.getModule("preferences/PreferencesManager");
+
+    var themesPref          = PreferencesManager.getExtensionPrefs("themes");
 
 
     /**
@@ -67,5 +70,43 @@ define(function (require, exports, module) {
         return result.promise();
     }
 
-    exports.getUserInstalledExtensions   = getUserInstalledExtensions;
-});
+    /**
+     * Utility function to get the user installed theme which are present in the registry
+     */
+    function getUserInstalledTheme() {
+        var result = new $.Deferred();
+
+        var installedTheme = themesPref.get("theme"),
+            bracketsTheme;
+
+        if (installedTheme === "light-theme" || installedTheme === "dark-theme") {
+            return result.resolve(installedTheme);
+        }
+
+        if (!ExtensionManager.hasDownloadedRegistry) {
+            ExtensionManager.downloadRegistry().done(function () {
+                bracketsTheme = ExtensionManager.extensions[installedTheme];
+                if (bracketsTheme && bracketsTheme.installInfo && bracketsTheme.installInfo.locationType === ExtensionManager.LOCATION_USER && bracketsTheme.registryInfo) {
+                    result.resolve(installedTheme);
+                } else {
+                    result.reject();
+                }
+            })
+                .fail(function () {
+                    result.reject();
+                });
+        } else {
+            bracketsTheme = ExtensionManager.extensions[installedTheme];
+            if (bracketsTheme && bracketsTheme.installInfo && bracketsTheme.installInfo.locationType === ExtensionManager.LOCATION_USER && bracketsTheme.registryInfo) {
+                result.resolve(installedTheme);
+            } else {
+                result.reject();
+            }
+        }
+
+        return result.promise();
+    }
+
+    exports.getUserInstalledExtensions      = getUserInstalledExtensions;
+    exports.getUserInstalledTheme           = getUserInstalledTheme;
+});