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

Merge pull request #16 from iAmGhost/master

Browse Source 
Fix for Contacts.apk and Camera.apk FC
This commit is contained in:
Connor Tumbleson 2012-08-26 20:39:35 -07:00
commit 62b2e6a03c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,11 +66,24 @@ 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;
} }
boolean hasDifferentTypeItem = false;
for (int i = 1; i < mItems.length; i++) { for (int i = 1; i < mItems.length; i++) {
if (! type.equals(mItems[i].getType())) { String itemType = mItems[i].getType();
return null;
if (itemType.equals("string")) {
//If there is at least one string item in mixed bag, it must be string-array.
return "string";
} else if (!type.equals(itemType)) {
hasDifferentTypeItem = true;
} }
} }
if (hasDifferentTypeItem) {
return null;
}
return type; return type;
} }