Merge pull request #2015 from iBotPeaches/issue-1522

Add horizontal/vertical line support if missing for 9patch

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java

@@ -65,13 +65,21 @@ public class Res9patchStreamDecoder implements ResStreamDecoder {
             drawVLine(im2, w + 1, np.padTop + 1, h - np.padBottom);
 
             int[] xDivs = np.xDivs;
-            for (int i = 0; i < xDivs.length; i += 2) {
-                drawHLine(im2, 0, xDivs[i] + 1, xDivs[i + 1]);
+            if (xDivs.length == 0) {
+                drawHLine(im2, 0, 1, w);
+            } else {
+                for (int i = 0; i < xDivs.length; i += 2) {
+                    drawHLine(im2, 0, xDivs[i] + 1, xDivs[i + 1]);
+                }
             }
 
             int[] yDivs = np.yDivs;
-            for (int i = 0; i < yDivs.length; i += 2) {
-                drawVLine(im2, 0, yDivs[i] + 1, yDivs[i + 1]);
+            if (yDivs.length == 0) {
+                drawVLine(im2, 0, 1, h);
+            } else {
+                for (int i = 0; i < yDivs.length; i += 2) {
+                    drawVLine(im2, 0, yDivs[i] + 1, yDivs[i + 1]);
+                }
             }
 
             // Some images additionally use Optical Bounds

brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingDiv9PatchTest.java

@@ -0,0 +1,73 @@
+/**
+ *  Copyright (C) 2018 Ryszard Wiśniewski <brut.alll@gmail.com>
+ *  Copyright (C) 2018 Connor Tumbleson <connor.tumbleson@gmail.com>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package brut.androlib.decode;
+
+import brut.androlib.BaseTest;
+import brut.androlib.TestUtils;
+import brut.androlib.res.decoder.Res9patchStreamDecoder;
+import brut.common.BrutException;
+import brut.directory.ExtFile;
+import brut.util.OS;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+
+import static org.junit.Assert.*;
+
+public class MissingDiv9PatchTest extends BaseTest {
+
+    @BeforeClass
+    public static void beforeClass() throws Exception {
+        TestUtils.cleanFrameworkFile();
+        sTmpDir = new ExtFile(OS.createTempDirectory());
+        TestUtils.copyResourceDir(MissingDiv9PatchTest.class, "decode/issue1522/", sTmpDir);
+    }
+
+    @AfterClass
+    public static void afterClass() throws BrutException {
+        OS.rmdir(sTmpDir);
+    }
+
+    @Test
+    public void assertMissingDivAdded() throws Exception {
+        InputStream inputStream = getFileInputStream();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        Res9patchStreamDecoder decoder = new Res9patchStreamDecoder();
+        decoder.decode(inputStream, outputStream);
+
+        BufferedImage image = ImageIO.read(new ByteArrayInputStream(outputStream.toByteArray()));
+        int height = image.getHeight() - 1;
+
+        // First and last pixel will be invisible, so lets check the first column and ensure its all black
+        for (int y = 1; y < height; y++) {
+            assertEquals("y coordinate failed at: " + y, NP_COLOR, image.getRGB(0, y));
+        }
+
+    }
+
+    private FileInputStream getFileInputStream() throws IOException {
+        File file = new File(sTmpDir, "pip_dismiss_scrim.9.png");
+        return new FileInputStream(file.toPath().toString());
+    }
+
+    private static final int NP_COLOR = 0xff000000;
+}