[Pale-Moon] Issue #1854 - Account for users disabling off-line and memory caching.

Resolves #1854
This commit is contained in:
Moonchild 2020-12-19 21:56:53 +00:00 • committed by roytam1
commit 48f962a66f
2 changed files with 45 additions and 24 deletions

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) {
try {
groups = cacheService.getGroups(); groups = cacheService.getGroups();
} catch(ex) {
// Cache disabled.
return 0;
}
} }
var usage = 0; var usage = 0;

View file

@ -283,7 +283,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);
try {
storage.asyncVisitStorage(visitor, false); storage.asyncVisitStorage(visitor, false);
} catch(ex) {
// Service unavailable: user most likely crippled the cache.
}
}, },
updateCacheSizeUI: function(smartSizeEnabled) updateCacheSizeUI: function(smartSizeEnabled)
@ -393,8 +397,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) {
try {
groups = cacheService.getGroups(); 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);
@ -426,6 +436,8 @@ 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);
try {
var groups = cacheService.getGroups(); var groups = cacheService.getGroups();
var bundle = document.getElementById("bundlePreferences"); var bundle = document.getElementById("bundlePreferences");
@ -448,6 +460,10 @@ var gAdvancedPane = {
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.
}
}, },
offlineAppSelected: function() offlineAppSelected: function()