ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-05-01 14:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix array type values being misrepresented due to incorrect index

Browse Source
This commit is contained in:
Connor Tumbleson 2014-05-25 12:37:14 -05:00
parent db68deb41a
commit c29dffe554
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -39,6 +39,7 @@ v2.0.0 (TBA)
-Fixed (issue #609) - Fixed handling renamed manifests with ("android", "com.htc" and "miui"). -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 #626) - Fixed handling strange characters with unknown files.
-Fixed (issue #630) - Fixed handling renamed manifests with ("com.lge") -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) -Fixed issue with non-URI standard characters in apk name (Thanks rover12421)
-Added output to list Apktool version to help debugging. -Added output to list Apktool version to help debugging.
-Updated known bytes for configurations to 38 (from addition of layout direction) -Updated known bytes for configurations to 38 (from addition of layout direction)

3
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
View File

@ -66,8 +66,7 @@ public class ResArrayValue extends ResBagValue implements
return null; return null;
} }
String type = mItems[0].getType(); 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")) { if (mItems[i].encodeAsResXmlItemValue().startsWith("@string")) {
return "string"; return "string";
} else if (mItems[i].encodeAsResXmlItemValue().startsWith("@drawable")) { } else if (mItems[i].encodeAsResXmlItemValue().startsWith("@drawable")) {

5
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml
View File

@ -23,4 +23,9 @@
<item>10.0sp</item> <item>10.0sp</item>
<item>#ff123456</item> <item>#ff123456</item>
</array> </array>
<string-array name="issue_409">
<item>@string/test1</item>
<item>foo</item>
<item>foo2</item>
</string-array>
</resources> </resources>