[Mypal] Account for users disabling off-line and memory caching.
parent
3571ed761a
commit
dbf82508cb
|
@ -5893,7 +5893,12 @@ var OfflineApps = {
|
||||||
var cacheService = Cc["@mozilla.org/network/application-cache-service;1"]
|
var cacheService = Cc["@mozilla.org/network/application-cache-service;1"]
|
||||||
.getService(Ci.nsIApplicationCacheService);
|
.getService(Ci.nsIApplicationCacheService);
|
||||||
if (!groups) {
|
if (!groups) {
|
||||||
groups = cacheService.getGroups();
|
try {
|
||||||
|
groups = cacheService.getGroups();
|
||||||
|
} catch(ex) {
|
||||||
|
// Cache disabled.
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var usage = 0;
|
var usage = 0;
|
||||||
|
|
|
@ -286,7 +286,11 @@ var gAdvancedPane = {
|
||||||
Components.classes["@mozilla.org/netwerk/cache-storage-service;1"]
|
Components.classes["@mozilla.org/netwerk/cache-storage-service;1"]
|
||||||
.getService(Components.interfaces.nsICacheStorageService);
|
.getService(Components.interfaces.nsICacheStorageService);
|
||||||
var storage = cacheService.appCacheStorage(LoadContextInfo.default, null);
|
var storage = cacheService.appCacheStorage(LoadContextInfo.default, null);
|
||||||
storage.asyncVisitStorage(visitor, false);
|
try {
|
||||||
|
storage.asyncVisitStorage(visitor, false);
|
||||||
|
} catch(ex) {
|
||||||
|
// Service unavailable: user most likely crippled the cache.
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
updateCacheSizeUI: function(smartSizeEnabled)
|
updateCacheSizeUI: function(smartSizeEnabled)
|
||||||
|
@ -396,8 +400,14 @@ var gAdvancedPane = {
|
||||||
{
|
{
|
||||||
var cacheService = Components.classes["@mozilla.org/network/application-cache-service;1"].
|
var cacheService = Components.classes["@mozilla.org/network/application-cache-service;1"].
|
||||||
getService(Components.interfaces.nsIApplicationCacheService);
|
getService(Components.interfaces.nsIApplicationCacheService);
|
||||||
if (!groups)
|
if (!groups) {
|
||||||
groups = cacheService.getGroups();
|
try {
|
||||||
|
groups = cacheService.getGroups();
|
||||||
|
} catch(ex) {
|
||||||
|
// Cache disabled.
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var ios = Components.classes["@mozilla.org/network/io-service;1"].
|
var ios = Components.classes["@mozilla.org/network/io-service;1"].
|
||||||
getService(Components.interfaces.nsIIOService);
|
getService(Components.interfaces.nsIIOService);
|
||||||
|
@ -429,27 +439,33 @@ var gAdvancedPane = {
|
||||||
|
|
||||||
var cacheService = Components.classes["@mozilla.org/network/application-cache-service;1"].
|
var cacheService = Components.classes["@mozilla.org/network/application-cache-service;1"].
|
||||||
getService(Components.interfaces.nsIApplicationCacheService);
|
getService(Components.interfaces.nsIApplicationCacheService);
|
||||||
var groups = cacheService.getGroups();
|
|
||||||
|
try {
|
||||||
|
var groups = cacheService.getGroups();
|
||||||
|
|
||||||
var bundle = document.getElementById("bundlePreferences");
|
var bundle = document.getElementById("bundlePreferences");
|
||||||
|
|
||||||
var enumerator = pm.enumerator;
|
var enumerator = pm.enumerator;
|
||||||
while (enumerator.hasMoreElements()) {
|
while (enumerator.hasMoreElements()) {
|
||||||
var perm = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission);
|
var perm = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission);
|
||||||
if (perm.type == "offline-app" &&
|
if (perm.type == "offline-app" &&
|
||||||
perm.capability != Components.interfaces.nsIPermissionManager.DEFAULT_ACTION &&
|
perm.capability != Components.interfaces.nsIPermissionManager.DEFAULT_ACTION &&
|
||||||
perm.capability != Components.interfaces.nsIPermissionManager.DENY_ACTION) {
|
perm.capability != Components.interfaces.nsIPermissionManager.DENY_ACTION) {
|
||||||
var row = document.createElement("listitem");
|
var row = document.createElement("listitem");
|
||||||
row.id = "";
|
row.id = "";
|
||||||
row.className = "offlineapp";
|
row.className = "offlineapp";
|
||||||
row.setAttribute("origin", perm.principal.origin);
|
row.setAttribute("origin", perm.principal.origin);
|
||||||
var converted = DownloadUtils.
|
var converted = DownloadUtils.
|
||||||
convertByteUnits(this._getOfflineAppUsage(perm, groups));
|
convertByteUnits(this._getOfflineAppUsage(perm, groups));
|
||||||
row.setAttribute("usage",
|
row.setAttribute("usage",
|
||||||
bundle.getFormattedString("offlineAppUsage",
|
bundle.getFormattedString("offlineAppUsage",
|
||||||
converted));
|
converted));
|
||||||
list.appendChild(row);
|
list.appendChild(row);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} catch(ex) {
|
||||||
|
// Cache service unavailable/errored, off-line app cache is disabled or 0
|
||||||
|
// Do nothing, just leave the box blank.
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue