From d5ca4c12a1868e6f8340605584836638130128e5 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Fri, 22 Jan 2016 06:07:49 -0600
Subject: [PATCH] fix #1123

 - correctly handles @null in xml
 - added unit test
---
 .../java/brut/androlib/res/data/value/ResValueFactory.java     | 2 +-
 .../brut/apktool/testapp/res/values-mcc001/styles.xml          | 3 +++
 .../test/resources/brut/apktool/testapp/res/values/strings.xml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
index c77935e9..672ff832 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
@@ -34,7 +34,7 @@ public class ResValueFactory {
     public ResScalarValue factory(int type, int value, String rawValue) throws AndrolibException {
         switch (type) {
             case TypedValue.TYPE_NULL:
-                if (value == TypedValue.DATA_NULL_EMPTY) { // Special case $empty as explicitly defined empty value
+                if (value == TypedValue.DATA_NULL_UNDEFINED) { // Special case $empty as explicitly defined empty value
                     return new ResStringValue(null, value);
                 }
                 return new ResReferenceValue(mPackage, 0, null);
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml
index 3d000025..04866484 100644
--- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml
@@ -9,4 +9,7 @@
         <item name="@string/issue_477">?android:dividerVertical</item>
     </style>
     <style name="Foo.Bar" parent=""/>
+    <style name="IssueStyle">
+        <item name="@string/issue_1123">@null</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/strings.xml
index 70e30dbe..36c52b04 100644
--- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/strings.xml
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/strings.xml
@@ -3,4 +3,5 @@
     <string name="test1" />
     <string name="hello_world">Hello World</string>
     <string name="issue_477">divider</string>
+    <string name="issue_1123">divider</string>
 </resources>