From e716c0a9722fb450743e2434113c803ac2a284fe Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 27 Aug 2012 07:56:33 -0500
Subject: [PATCH] currently build errors. Trying to fix the <string-array> vs
 <array> problem.

---
 .../java/brut/androlib/res/data/value/ResArrayValue.java | 9 +--------
 .../src/test/java/brut/androlib/BuildAndDecodeTest.java  | 1 +
 .../brut/apktool/testapp/res/values-mcc001/arrays.xml    | 4 ----
 .../brut/apktool/testapp/res/values-mcc002/arrays.xml    | 7 +++++++
 4 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/arrays.xml

diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
index 76c35e14..dab53988 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
@@ -68,18 +68,11 @@ public class ResArrayValue extends ResBagValue implements ResValuesXmlSerializab
         if (!"string".equals(type) && !"integer".equals(type)) {
             return null;
         }
-
         for (int i = 1; i < mItems.length; i++) {
-
-            if (StringUtils.containsIgnoreCase("@string", mItems[i].encodeAsResXmlItemValue()) || mItems[i].getType().equalsIgnoreCase("string")) {
-                return "string";
-            }
-
-            if (!type.equals(mItems[i].getType())) {
+            if (! type.equals(mItems[i].getType())) {
                 return null;
             }
         }
-
         return type;
     }
 
diff --git a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index 70d12e85..577abf2a 100644
--- a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -60,6 +60,7 @@ public class BuildAndDecodeTest {
     @Test
     public void valuesArraysTest() throws BrutException {
         compareValuesFiles("values-mcc001/arrays.xml");
+        compareValuesFiles("values-mcc002/arrays.xml");
     }
 
     @Test
diff --git a/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml b/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml
index beb75d18..8cc3d152 100644
--- a/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml
+++ b/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/arrays.xml
@@ -20,8 +20,4 @@
         <item>10.0sp</item>
         <item>#ff123456</item>
     </array>
-    <string-array name="test_array4">
-        <item>@string/test_string1</item>
-        <item>@string/test_string2</item>
-    </string-array>
 </resources>
diff --git a/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/arrays.xml b/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/arrays.xml
new file mode 100644
index 00000000..96e27014
--- /dev/null
+++ b/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/arrays.xml
@@ -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>