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 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle

Browse Source
This commit is contained in:
Myk Melez 2014-03-13 12:01:55 -07:00
parent 3d1d6e85e4
commit 2b0848ec69
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/webapp/EventListener.java
View File

@ -115,7 +115,7 @@ public class EventListener implements GeckoEventListener {
} else if (event.equals("Webapps:GetApkVersions")) {
JSONObject obj = new JSONObject();
obj.put("versions", getApkVersions(GeckoAppShell.getGeckoInterface().getActivity(),
message.getJSONArray("packageNames")).toString());
message.getJSONArray("packageNames")));
EventDispatcher.sendResponse(message, obj);
}
} catch (Exception e) {

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

@ -275,7 +275,7 @@ this.WebappManager = {
// Map APK names to APK versions.
let apkNameToVersion = yield this._getAPKVersions(installedApps.map(app =>
app.packageName).filter(packageName => !!packageName)
app.apkPackageName).filter(apkPackageName => !!apkPackageName)
);
// Map manifest URLs to APK versions, which is what the service needs
@ -286,7 +286,7 @@ this.WebappManager = {
let manifestUrlToApkVersion = {};
let manifestUrlToApp = {};
for (let app of installedApps) {
manifestUrlToApkVersion[app.manifestURL] = apkNameToVersion[app.packageName] || 0;
manifestUrlToApkVersion[app.manifestURL] = apkNameToVersion[app.apkPackageName] || 0;
manifestUrlToApp[app.manifestURL] = app;
}