wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 962790 - ensure registryReady before calling DOMApplicationRegistry methods; r=wesj

Browse Source 
--HG--
extra : rebase_source : 9dd0d855065a5d587f1344f023c855eb8593205d
This commit is contained in:
Myk Melez 2014-01-24 21:05:07 -08:00
parent 3cbf8b2cf6
commit 41ba2a06ba
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
mobile/android/modules/WebappManager.jsm
View File

@ -119,18 +119,20 @@ this.WebappManager = {
delete aData.app.manifest.appcache_path;
}
DOMApplicationRegistry.confirmInstall(aData, file, (function(aManifest) {
let localeManifest = new ManifestHelper(aManifest, aData.app.origin);
DOMApplicationRegistry.registryReady.then(() => {
DOMApplicationRegistry.confirmInstall(aData, file, (function(aManifest) {
let localeManifest = new ManifestHelper(aManifest, aData.app.origin);
// aData.app.origin may now point to the app: url that hosts this app.
sendMessageToJava({
type: "WebApps:PostInstall",
apkPackageName: aData.app.apkPackageName,
origin: aData.app.origin,
});
// aData.app.origin may now point to the app: url that hosts this app.
sendMessageToJava({
type: "WebApps:PostInstall",
apkPackageName: aData.app.apkPackageName,
origin: aData.app.origin,
});
this.writeDefaultPrefs(file, localeManifest);
}).bind(this));
this.writeDefaultPrefs(file, localeManifest);
}).bind(this));
});
},
launch: function({ manifestURL, origin }) {
@ -187,16 +189,18 @@ this.WebappManager = {
message.autoInstall = true;
message.mm = mm;
switch (aData.type) { // can be hosted or packaged.
case "hosted":
DOMApplicationRegistry.doInstall(message, mm);
break;
DOMApplicationRegistry.registryReady.then(() => {
switch (aData.type) { // can be hosted or packaged.
case "hosted":
DOMApplicationRegistry.doInstall(message, mm);
break;
case "packaged":
message.isPackage = true;
DOMApplicationRegistry.doInstallPackage(message, mm);
break;
}
case "packaged":
message.isPackage = true;
DOMApplicationRegistry.doInstallPackage(message, mm);
break;
}
});
},
autoUninstall: function(aData) {
@ -206,20 +210,23 @@ this.WebappManager = {
dump("autoUninstall sendAsyncMessage " + aMessageName + ": " + JSON.stringify(aData));
}
};
let installed = {};
DOMApplicationRegistry.doGetAll(installed, mm);
for (let app in installed.apps) {
if (aData.apkPackageNames.indexOf(installed.apps[app].apkPackageName) > -1) {
let appToRemove = installed.apps[app];
dump("should remove: " + appToRemove.name);
DOMApplicationRegistry.uninstall(appToRemove.manifestURL, function() {
dump(appToRemove.name + " uninstalled");
}, function() {
dump(appToRemove.name + " did not uninstall");
});
DOMApplicationRegistry.registryReady.then(() => {
let installed = {};
DOMApplicationRegistry.doGetAll(installed, mm);
for (let app in installed.apps) {
if (aData.apkPackageNames.indexOf(installed.apps[app].apkPackageName) > -1) {
let appToRemove = installed.apps[app];
dump("should remove: " + appToRemove.name);
DOMApplicationRegistry.uninstall(appToRemove.manifestURL, function() {
dump(appToRemove.name + " uninstalled");
}, function() {
dump(appToRemove.name + " did not uninstall");
});
}
}
}
});
},
writeDefaultPrefs: function(aProfile, aManifest) {