ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 05:47:46 +01:00
Code Issues Projects Releases Wiki Activity

currently build errors. Trying to fix the <string-array> vs <array> problem.

Browse Source
This commit is contained in:
Connor Tumbleson 2012-08-27 07:56:33 -05:00
parent 036cce8df1
commit e716c0a972
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,18 +68,11 @@ public class ResArrayValue extends ResBagValue implements ResValuesXmlSerializab
if (!"string".equals(type) && !"integer".equals(type)) { if (!"string".equals(type) && !"integer".equals(type)) {
return null; return null;
} }
for (int i = 1; i < mItems.length; i++) { for (int i = 1; i < mItems.length; i++) {
if (! type.equals(mItems[i].getType())) {
if (StringUtils.containsIgnoreCase("@string", mItems[i].encodeAsResXmlItemValue()) || mItems[i].getType().equalsIgnoreCase("string")) {
return "string";
}
if (!type.equals(mItems[i].getType())) {
return null; return null;
} }
} }
return type; return type;
} }

1
apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
View File

@ -60,6 +60,7 @@ public class BuildAndDecodeTest {
@Test @Test
public void valuesArraysTest() throws BrutException { public void valuesArraysTest() throws BrutException {
compareValuesFiles("values-mcc001/arrays.xml"); compareValuesFiles("values-mcc001/arrays.xml");
compareValuesFiles("values-mcc002/arrays.xml");
} }
@Test @Test

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

@ -20,8 +20,4 @@
<item>10.0sp</item> <item>10.0sp</item>
<item>#ff123456</item> <item>#ff123456</item>
</array> </array>
<string-array name="test_array4">
<item>@string/test_string1</item>
<item>@string/test_string2</item>
</string-array>
</resources> </resources>

7
apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/arrays.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="test_array4">
<item>@string/test_string1</item>
<item>@string/test_string2</item>
</string-array>
</resources>