Change preference handling in add-on to keep social.activeProviders p…

…reference clean
Standard8 · Feb 14, 2013 · babc9a7 · babc9a7
1 parent 31de95b
commit babc9a7
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 39 deletions.
diff --git a/addon/bootstrap.js b/addon/bootstrap.js
@@ -6,7 +6,7 @@ const kSidebarPage = "/sidebar.htm";
 const kSiteImageLocation = "/icon.png";
 const kPrefName = "social.manifest.webrtc-demo";
 const kUserImageLocation = "/icon.png";
-const kWrappsSiteURLPref = "addons.wrapps.siteURL";
+const kWrappsSiteURLPref = "addons.wrapps.social.siteURL";
 
 const BOOTSTRAP_REASONS = {
   APP_STARTUP     : 1,
@@ -20,6 +20,15 @@ const BOOTSTRAP_REASONS = {
 };
 
 let webrtcbrowser = {
+  currentSiteURL: null,
+
+  get siteURLPrefValue() {
+    let siteURL = kSiteURL;
+    if (Services.prefs.prefHasUserValue(kWrappsSiteURLPref))
+      siteURL = Services.prefs.getCharPref(kWrappsSiteURLPref);
+    return siteURL;
+  },
+
   get isCurrentProvider() {
     var currentProvider = "";
     try {
@@ -167,7 +176,36 @@ let webrtcbrowser = {
     }
   },
 
+  setDefaultProvider: function webrtcbrowser_setDefaultProvider(aSiteURL) {
+    if (!aSiteURL)
+      aSiteURL = kSiteURL;
+
+    if (this.currentSiteURL && this.currentSiteURL != aSiteURL)
+      removeActiveProvider(this.currentSiteURL);
+
+    this.currentSiteURL = aSiteURL;
+
+    Services.prefs.setCharPref(kPrefName, '{"location":"' + aSiteURL + '/manifest.json","name":"' + kSiteName + '","iconURL":"' + aSiteURL + kSiteImageLocation + '","workerURL":"' + aSiteURL + '/worker.js","sidebarURL":"' + aSiteURL + kSidebarPage + '","origin":"' + aSiteURL + '","enabled":true,"last_modified":135101330568}');
+    var activeProviders;
+    try {
+      activeProviders = JSON.parse(Services.prefs.getCharPref("social.activeProviders"));
+    } catch (x) {
+      activeProviders = {};
+    }
+
+    activeProviders[aSiteURL] = 1;
+    Services.prefs.setCharPref("social.activeProviders", JSON.stringify(activeProviders));
+    Services.prefs.setCharPref("social.provider.current", aSiteURL);
+
+    Services.prefs.setBoolPref("media.navigator.enabled", true);
+    Services.prefs.setBoolPref("media.navigator.permission.disabled", true);
+    Services.prefs.setBoolPref("media.peerconnection.enabled", true);
+    Services.prefs.setBoolPref("dom.disable_open_during_load", false);
+    Services.prefs.setBoolPref("social.enabled", true);
+  },
+
   init: function webrtcbrowser_init() {
+    this.currentSiteURL = this.siteURLPrefValue;
     Services.obs.addObserver(this, "social:profile-changed", false);
     this.setWidths();
     this.setStyle();
@@ -232,28 +270,8 @@ function shutdown(data, reason) {
 */
 }
 
-function setDefaultProvider(aSiteURL) {
-  Services.prefs.setCharPref(kPrefName, '{"location":"' + aSiteURL + '/manifest.json","name":"' + kSiteName + '","iconURL":"' + aSiteURL + kSiteImageLocation + '","workerURL":"' + aSiteURL + '/worker.js","sidebarURL":"' + aSiteURL + kSidebarPage + '","origin":"' + aSiteURL + '","enabled":true,"last_modified":135101330568}');
-  var activeProviders;
-  try {
-    activeProviders = JSON.parse(Services.prefs.getCharPref("social.activeProviders"));
-  } catch (x) {
-    activeProviders = {};
-  }
-
-  activeProviders[aSiteURL] = 1;
-  Services.prefs.setCharPref("social.activeProviders", JSON.stringify(activeProviders));
-  Services.prefs.setCharPref("social.provider.current", aSiteURL);
-
-  Services.prefs.setBoolPref("media.navigator.enabled", true);
-  Services.prefs.setBoolPref("media.navigator.permission.disabled", true);
-  Services.prefs.setBoolPref("media.peerconnection.enabled", true);
-  Services.prefs.setBoolPref("dom.disable_open_during_load", false);
-  Services.prefs.setBoolPref("social.enabled", true);
-}
-
 function prefChangeListener(aSubject, aTopic, aData) {
-  setDefaultProvider(Services.prefs.getCharPref(kWrappsSiteURLPref));
+  webrtcbrowser.setDefaultProvider(webrtcbrowser.siteURLPrefValue);
 }
 
 function install(data, reason) {
@@ -262,13 +280,8 @@ function install(data, reason) {
     case BOOTSTRAP_REASONS.ADDON_UPGRADE:
     case BOOTSTRAP_REASONS.ADDON_DOWNGRADE:
     {
-      var siteURL = kSiteURL;
-      if (Services.prefs.prefHasUserValue(kWrappsSiteURLPref))
-        siteURL = Services.prefs.getCharPref(kWrappsSiteURLPref);
-      else
-        Services.prefs.setCharPref(kWrappsSiteURLPref, siteURL);
-      setDefaultProvider(siteURL);
-
+      // Need to do this before init to ensure the preferences are set correctly
+      webrtcbrowser.setDefaultProvider(webrtcbrowser.siteURLPrefValue);
       webrtcbrowser.init();
       break;
     }
@@ -277,6 +290,15 @@ function install(data, reason) {
   }
 }
 
+function removeActiveProvider(providerURL) {
+  try {
+    var activeProviders = JSON.parse(Services.prefs.getCharPref("social.activeProviders"));
+    delete activeProviders[providerURL];
+    Services.prefs.setCharPref("social.activeProviders", JSON.stringify(activeProviders));
+  } catch (x) {
+  }
+}
+
 function uninstall(data, reason) {
   Services.prefs.clearUserPref("social.enabled");
   Services.prefs.clearUserPref("media.navigator.enabled");
@@ -287,13 +309,6 @@ function uninstall(data, reason) {
   Services.prefs.clearUserPref(kPrefName);
   Services.prefs.clearUserPref("social.provider.current");
 
-  var activeProviders;
-  try {
-    activeProviders = JSON.parse(Services.prefs.getCharPref("social.activeProviders"));
-    delete activeProviders[Services.prefs.getCharPref(kWrappsSiteURLPref)];
-    Services.prefs.setCharPref("social.activeProviders", JSON.stringify(activeProviders));
-  } catch (x) {
-    activeProviders = {};
-  }
+  removeActiveProvider(Services.prefs.getCharPref(kWrappsSiteURLPref));
   webrtcbrowser.uninit();
 }
diff --git a/addon/options.xul b/addon/options.xul
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <setting pref="addons.wrapps.siteURL" type="string" title="Demo site URL"/>
+  <setting pref="addons.wrapps.social.siteURL" type="string" title="Demo site URL"/>
 </vbox>
diff --git a/static/update.rdf b/static/update.rdf
@@ -18,7 +18,7 @@
         <em:maxVersion>21.0a1</em:maxVersion>
         <em:updateLink>https://webrtc-demo.vcap.mozillalabs.com/webrtc.xpi</em:updateLink>
         <em:updateInfoURL>https://webrtc-demo.vcap.mozillalabs.com/update.txt</em:updateInfoURL>
-        <em:updateHash>sha256:24f2459029905bfcdab14e6d3bc0562213281c0d7d5d8ce13b05f4dfe8a90168</em:updateHash>
+        <em:updateHash>sha256:df254a8428420c6a3028e08e2dd7adf4fd5d5dd086cca905491a361c265764f4</em:updateHash>
       </RDF:Description>
     </em:targetApplication>
   </RDF:Description>

diff --git a/static/webrtc.xpi b/static/webrtc.xpi