From 5f5f50f6fdc43d15565f6fbf428526ec72a5684c Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 1 Nov 2015 06:17:29 -0600
Subject: [PATCH] Fixes edge case where mnc = 1, with no mcc field. Fixes #1072

---
 .../src/main/java/brut/androlib/res/data/ResConfigFlags.java | 4 ++++
 .../src/test/java/brut/androlib/BuildAndDecodeTest.java      | 5 +++++
 .../brut/apktool/testapp/res/values-mnc1/strings.xml         | 4 ++++
 3 files changed, 13 insertions(+)
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mnc1/strings.xml

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index 6f3c6488..078e153b 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -178,6 +178,10 @@ public class ResConfigFlags {
             } else {
                 ret.append("-mnc00");
             }
+        } else {
+            if (mnc != 0) {
+                ret.append("-mnc").append(mnc);
+            }
         }
         ret.append(getLocaleString());
 
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index 86ebfd76..ff75096a 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -187,6 +187,11 @@ public class BuildAndDecodeTest {
         compareValuesFiles("values-mcc001-mnc01/strings.xml");
     }
 
+    @Test
+    public void shortMncHtcTest() throws BrutException {
+        compareValuesFiles("values-mnc1/strings.xml");
+    }
+
     @Test
     public void anyDpiTest() throws BrutException, IOException {
         compareValuesFiles("values-watch/strings.xml");
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mnc1/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mnc1/strings.xml
new file mode 100644
index 00000000..35eaf5ef
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mnc1/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="test1">test1</string>
+</resources>
\ No newline at end of file