Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mypal] Account for users disabling off-line and memory caching.

master
Fedor 2021-02-07 17:33:44 +02:00
parent 3571ed761a
commit dbf82508cb
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/palemoon/base/content/browser.js
View File

@ -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;

58
application/palemoon/components/preferences/advanced.js
View File

@ -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();
var bundle = document.getElementById("bundlePreferences"); try {
var groups = cacheService.getGroups();
var enumerator = pm.enumerator; var bundle = document.getElementById("bundlePreferences");
while (enumerator.hasMoreElements()) {
var perm = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission); var enumerator = pm.enumerator;
if (perm.type == "offline-app" && while (enumerator.hasMoreElements()) {
perm.capability != Components.interfaces.nsIPermissionManager.DEFAULT_ACTION && var perm = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission);
perm.capability != Components.interfaces.nsIPermissionManager.DENY_ACTION) { if (perm.type == "offline-app" &&
var row = document.createElement("listitem"); perm.capability != Components.interfaces.nsIPermissionManager.DEFAULT_ACTION &&
row.id = ""; perm.capability != Components.interfaces.nsIPermissionManager.DENY_ACTION) {
row.className = "offlineapp"; var row = document.createElement("listitem");
row.setAttribute("origin", perm.principal.origin); row.id = "";
var converted = DownloadUtils. row.className = "offlineapp";
convertByteUnits(this._getOfflineAppUsage(perm, groups)); row.setAttribute("origin", perm.principal.origin);
row.setAttribute("usage", var converted = DownloadUtils.
bundle.getFormattedString("offlineAppUsage", convertByteUnits(this._getOfflineAppUsage(perm, groups));
converted)); row.setAttribute("usage",
list.appendChild(row); bundle.getFormattedString("offlineAppUsage",
converted));
list.appendChild(row);
}
} }
} catch(ex) {
// Cache service unavailable/errored, off-line app cache is disabled or 0
// Do nothing, just leave the box blank.
} }
}, },