rename variables to help user understand, remove unneeded ones

This commit is contained in:
Connor Tumbleson 2014-01-07 13:08:48 -06:00
parent e254cec648
commit f6a61ba1b4
2 changed files with 4 additions and 7 deletions

View File

@ -318,13 +318,11 @@ public class ApkDecoder {
private void putPackageInfo(Map<String, Object> meta) private void putPackageInfo(Map<String, Object> meta)
throws AndrolibException { throws AndrolibException {
String renamed = getResTable().getPackageRenamed(); String renamed = getResTable().getPackageRenamed();
String original = getResTable().getPackageOriginal();
int id = getResTable().getPackageId(); int id = getResTable().getPackageId();
HashMap<String, String> packages = new HashMap<String, String>(); HashMap<String, String> packages = new HashMap<String, String>();
packages.put("renamed", renamed); packages.put("rename-manifest-package", renamed);
packages.put("original", original); packages.put("forced-package-id", String.valueOf(id));
packages.put("original_id", String.valueOf(id));
meta.put("packageInfo", packages); meta.put("packageInfo", packages);
} }

View File

@ -335,14 +335,13 @@ final public class AndrolibResources {
public void setPackageInfo(Map<String, String> map) { public void setPackageInfo(Map<String, String> map) {
if (map != null) { if (map != null) {
mPackageRenamed = map.get("renamed"); mPackageRenamed = map.get("rename-manifest-package");
mPackageOriginal = map.get("original");
} }
} }
public void setPackageId(Map<String, String> map) { public void setPackageId(Map<String, String> map) {
if (map != null) { if (map != null) {
mPackageId = map.get("original_id"); mPackageId = map.get("forced-package-id");
} }
} }