Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 856440 - Use global preference object instead of a getter. r=nsm

Browse Source 
--HG--
extra : rebase_source : 1d828675c711d0d862a48370ebc207d4b7f0e205
This commit is contained in:
Doug Turner 2013-04-09 11:02:00 -07:00
parent 8e86e018e7
commit 6d0e972630
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dom/push/src/PushService.js
View File

@ -20,6 +20,8 @@ Cu.import("resource://gre/modules/Timer.jsm");
Cu.import("resource://gre/modules/services-common/preferences.js");
Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
const prefs = new Preferences("services.push.");
const kPUSHDB_DB_NAME = "push";
const kPUSHDB_DB_VERSION = 1; // Change this if the IndexedDB format changes
const kPUSHDB_STORE_NAME = "push";
@ -289,7 +291,8 @@ PushService.prototype = {
observe: function observe(aSubject, aTopic, aData) {
switch (aTopic) {
case "app-startup":
if (!this._prefs.get("enabled"))
if (!prefs.get("enabled"))
return;
Services.obs.addObserver(this, "final-ui-startup", false);
@ -326,7 +329,7 @@ PushService.prototype = {
case "nsPref:changed":
if (aData == "services.push.serverURL") {
debug("services.push.serverURL changed! websocket. new value " +
this._prefs.get("serverURL"));
prefs.get("serverURL"));
this._shutdownWS();
}
break;
@ -383,10 +386,8 @@ PushService.prototype = {
}
},
_prefs : new Preferences("services.push."),
get _UAID() {
return this._prefs.get("userAgentID");
return prefs.get("userAgentID");
},
set _UAID(newID) {
@ -396,7 +397,7 @@ PushService.prototype = {
return;
}
debug("New _UAID: " + newID);
this._prefs.set("userAgentID", newID);
prefs.set("userAgentID", newID);
},
// keeps requests buffered if the websocket disconnects or is not connected
@ -450,9 +451,9 @@ PushService.prototype = {
ppmm.addMessageListener(msgName, this);
}.bind(this));
this._requestTimeout = this._prefs.get("requestTimeout");
this._requestTimeout = prefs.get("requestTimeout");
this._udpPort = this._prefs.get("udp.port");
this._udpPort = prefs.get("udp.port");
this._db.getAllChannelIDs(
function(channelIDs) {
@ -469,7 +470,7 @@ PushService.prototype = {
// This is only used for testing. Different tests require connecting to
// slightly different URLs.
this._prefs.observe("serverURL", this);
prefs.observe("serverURL", this);
},
_shutdownWS: function() {
@ -506,13 +507,13 @@ PushService.prototype = {
debug("socketError()");
// Calculate new timeout, but cap it to
var retryTimeout = this._prefs.get("retryBaseInterval") *
Math.pow(2, this._retryFailCount);
var retryTimeout = prefs.get("retryBaseInterval") *
Math.pow(2, this._retryFailCount);
// It is easier to express the max interval as a pref in milliseconds,
// rather than have it as a number and make people do the calculation of
// retryBaseInterval * 2^maxRetryFailCount.
retryTimeout = Math.min(retryTimeout, this._prefs.get("maxRetryInterval"));
retryTimeout = Math.min(retryTimeout, prefs.get("maxRetryInterval"));
this._retryFailCount++;
@ -536,7 +537,7 @@ PushService.prototype = {
return;
}
var serverURL = this._prefs.get("serverURL");
var serverURL = prefs.get("serverURL");
if (!serverURL) {
debug("No services.push.serverURL found!");
return;
@ -567,7 +568,7 @@ PushService.prototype = {
debug("serverURL: " + uri.spec);
this._wsListener = new PushWebSocketListener(this);
this._ws.protocol = "push-notification";
this._ws.pingInterval = this._prefs.get("websocketPingInterval");
this._ws.pingInterval = prefs.get("websocketPingInterval");
this._ws.asyncOpen(uri, serverURL, this._wsListener, null);
this._currentState = STATE_WAITING_FOR_WS_START;
},
@ -1234,7 +1235,7 @@ PushService.prototype = {
return;
}
if (!this._prefs.get("udp.wakeupEnabled")) {
if (!prefs.get("udp.wakeupEnabled")) {
debug("UDP support disabled");
return;
}