From b11310a5bc41e23c23d487e901f10da3b5987dd5 Mon Sep 17 00:00:00 2001 From: Myk Melez Date: Thu, 13 Mar 2014 12:01:55 -0700 Subject: [PATCH] bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle --- mobile/android/base/webapp/EventListener.java | 2 +- mobile/android/modules/WebappManager.jsm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/webapp/EventListener.java b/mobile/android/base/webapp/EventListener.java index 03fa1de4113..d319b9eaf40 100644 --- a/mobile/android/base/webapp/EventListener.java +++ b/mobile/android/base/webapp/EventListener.java @@ -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) { diff --git a/mobile/android/modules/WebappManager.jsm b/mobile/android/modules/WebappManager.jsm index f21d05c49b4..ff3fca8d435 100644 --- a/mobile/android/modules/WebappManager.jsm +++ b/mobile/android/modules/WebappManager.jsm @@ -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; }