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

Bug 813195 - [Apps] Cannot retry to download hosted apps with cache manifest [r=ferjm]

Browse Source
This commit is contained in:
Fabrice Desré 2012-11-26 20:03:43 -08:00
parent 047f75f8d3
commit 94357a1f78
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/apps/src/Webapps.js
View File

@ -540,6 +540,7 @@ WebappsApplication.prototype = {
this.installState = msg.installState;
if (this.installState == "installed") {
this._downloadError = null;
this.downloading = false;
this._fireEvent("downloadsuccess", this._ondownloadsuccess);
this._fireEvent("downloadapplied", this._ondownloadapplied);
} else {
@ -607,6 +608,7 @@ WebappsApplication.prototype = {
this.downloadAvailable = app.downloadAvailable;
this.readyToApplyDownload = app.readyToApplyDownload;
this.updateTime = app.updateTime;
this._manifest = msg.manifest;
this._fireEvent("downloadsuccess", this._ondownloadsuccess);
break;
case "applied":

33
dom/apps/src/Webapps.jsm
View File

@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
Cu.import("resource://gre/modules/OfflineCacheInstaller.jsm");
function debug(aMsg) {
//dump("-*-*- Webapps.jsm : " + aMsg + "\n");
dump("-*-*- Webapps.jsm : " + aMsg + "\n");
}
const WEBAPP_RUNTIME = Services.appinfo.ID == "webapprt@mozilla.org";
@ -783,6 +783,31 @@ this.DOMApplicationRegistry = {
let file = FileUtils.getFile(DIRECTORY_NAME,
["webapps", id, "update.webapp"], true);
if (!file.exists()) {
// This is a hosted app, let's check if it has an appcache
// and download it.
this._readManifests([{ id: id }], (function readManifest(aResults) {
let jsonManifest = aResults[0].manifest;
let manifest = new ManifestHelper(jsonManifest, app.origin);
if (manifest.appcache_path) {
debug("appcache found");
app.installState = "updating";
this.startOfflineCacheDownload(manifest, app);
} else {
// hosted app with no appcache, nothing to do, but we fire a
// downloaded event
DOMApplicationRegistry.broadcastMessage("Webapps:PackageEvent",
{ type: "downloaded",
manifestURL: aManifestURL,
app: app,
manifest: jsonManifest });
}
}).bind(this));
return;
}
this._loadJSONAsync(file, (function(aJSON) {
if (!aJSON) {
debug("startDownload: No update manifest found at " + file.path + " " + aManifestURL);
@ -1899,6 +1924,8 @@ this.DOMApplicationRegistry = {
* Appcache download observer
*/
let AppcacheObserver = function(aApp) {
debug("Creating AppcacheObserver for " + aApp.origin +
" - " + aApp.installState);
this.app = aApp;
this.startStatus = aApp.installState;
};
@ -1909,7 +1936,10 @@ AppcacheObserver.prototype = {
let mustSave = false;
let app = this.app;
debug("Offline cache state change for " + app.origin + " : " + aState);
let setStatus = function appObs_setStatus(aStatus) {
debug("Offlinecache setStatus to " + aStatus + " for " + app.origin);
mustSave = (app.installState != aStatus);
app.installState = aStatus;
app.downloading = false;
@ -1919,6 +1949,7 @@ AppcacheObserver.prototype = {
}
let setError = function appObs_setError(aError) {
debug("Offlinecache setError to " + aError);
DOMApplicationRegistry.broadcastMessage("Webapps:OfflineCache",
{ manifest: app.manifestURL,
error: aError });