Fixes edge case where mnc = 1, with no mcc field. Fixes iBotPeaches#1072

totoro1024 · Nov 1, 2015 · 5f5f50f · 5f5f50f
1 parent a4b5c92
commit 5f5f50f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
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
@@ -178,6 +178,10 @@ private String generateQualifiers() {
             } 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
@@ -187,6 +187,11 @@ public void shortendedMncTest() throws BrutException {
         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
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="test1">test1</string>
+</resources>