From c29dffe55494cbc065a4ac8bece818cf75682396 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 25 May 2014 12:37:14 -0500 Subject: [PATCH] fix array type values being misrepresented due to incorrect index --- CHANGES | 1 + .../java/brut/androlib/res/data/value/ResArrayValue.java | 3 +-- .../brut/apktool/testapp/res/values-mcc001/arrays.xml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3078006d..f60e2e3f 100644 --- a/CHANGES +++ b/CHANGES @@ -39,6 +39,7 @@ v2.0.0 (TBA) -Fixed (issue #609) - Fixed handling renamed manifests with ("android", "com.htc" and "miui"). -Fixed (issue #626) - Fixed handling strange characters with unknown files. -Fixed (issue #630) - Fixed handling renamed manifests with ("com.lge") +-Fixed (issue #409) - Fixed array items incorrectly typed. -Fixed issue with non-URI standard characters in apk name (Thanks rover12421) -Added output to list Apktool version to help debugging. -Updated known bytes for configurations to 38 (from addition of layout direction) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java index 749cc054..e5033be1 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java @@ -66,8 +66,7 @@ public class ResArrayValue extends ResBagValue implements return null; } String type = mItems[0].getType(); - for (int i = 1; i < mItems.length; i++) { - + for (int i = 0; i < mItems.length; i++) { if (mItems[i].encodeAsResXmlItemValue().startsWith("@string")) { return "string"; } else if (mItems[i].encodeAsResXmlItemValue().startsWith("@drawable")) { diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml index 52c087c8..da3f4009 100644 --- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml @@ -23,4 +23,9 @@ 10.0sp #ff123456 + + @string/test1 + foo + foo2 +