Properly reset WebRTC disabled status when browser is closed

IsaacSchemm · Feb 28, 2018 · 54c40e0 · 54c40e0
1 parent 892864d
commit 54c40e0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/components/WebRTCToggle.js b/components/WebRTCToggle.js
@@ -13,18 +13,26 @@ Components.utils.import("resource://gre/modules/Console.jsm");
 AddonManager.addAddonListener({
 	onUninstalling: function(addon) {
 		if (addon.id == "webrtc-permissions-ui-toggle@lakora.us") {
-			Components.classes["@mozilla.org/preferences-service;1"]
-				.getService(Components.interfaces.nsIPrefService)
-				.getBranch("media.navigator.permission.")
+			var svc = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefService);
+			svc.getBranch("media.navigator.permission.")
 				.setBoolPref("disabled", false);
+			svc.getBranch("media.navigator.")
+				.clearUserPref("enabled");
+			svc.getBranch("media.peerconnection.")
+				.clearUserPref("enabled");
 		}
 	},
 	onDisabling: function(addon) {
 		if (addon.id == "webrtc-permissions-ui-toggle@lakora.us") {
-			Components.classes["@mozilla.org/preferences-service;1"]
-				.getService(Components.interfaces.nsIPrefService)
-				.getBranch("media.navigator.permission.")
+			var svc = Components.classes["@mozilla.org/preferences-service;1"]
+				.getService(Components.interfaces.nsIPrefService);
+			svc.getBranch("media.navigator.permission.")
 				.setBoolPref("disabled", false);
+			svc.getBranch("media.navigator.")
+				.clearUserPref("enabled");
+			svc.getBranch("media.peerconnection.")
+				.clearUserPref("enabled");
 		}
 	}
 });
@@ -81,10 +89,14 @@ WebRTCToggle.prototype = {
 				// Turn the override off when closing the application,
 				// regardless of whether or not the add-on is going to be
 				// uninstalled.
-				Components.classes["@mozilla.org/preferences-service;1"]
-					.getService(Components.interfaces.nsIPrefService)
-					.getBranch("media.navigator.permission.")
+				var svc = Components.classes["@mozilla.org/preferences-service;1"]
+					.getService(Components.interfaces.nsIPrefService);
+				svc.getBranch("media.navigator.permission.")
 					.setBoolPref("disabled", false);
+				svc.getBranch("media.navigator.")
+					.clearUserPref("enabled");
+				svc.getBranch("media.peerconnection.")
+					.clearUserPref("enabled");
 				break;
 			case "nsPref:changed":
 				var strings = Components.classes["@mozilla.org/intl/stringbundle;1"]

diff --git a/install.rdf b/install.rdf
@@ -11,7 +11,7 @@
     em:creator="Isaac Schemm"
 
     em:id="webrtc-permissions-ui-toggle@lakora.us"
-    em:version="1.3.1"
+    em:version="1.3.2"
     em:homepageURL="https://github.com/IsaacSchemm/webrtc-permissions-ui-toggle"
 
     em:iconURL="chrome://webrtc-permissions-ui-toggle/content/icon.png"