Merge branch 'padlar-issue/1234'

brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java

@@ -22,10 +22,12 @@
 import brut.androlib.meta.MetaInfo;
 import brut.androlib.meta.PackageInfo;
 import brut.androlib.meta.UsesFramework;
+import brut.androlib.meta.VersionInfo;
 import brut.androlib.res.AndrolibResources;
 import brut.androlib.res.data.ResPackage;
 import brut.androlib.res.data.ResTable;
 import brut.androlib.res.util.ExtFile;
+import brut.androlib.res.xml.ResXmlPatcher;
 import brut.common.BrutException;
 import brut.directory.DirectoryException;
 import brut.util.OS;
@@ -354,7 +356,12 @@ private void putPackageInfo(MetaInfo meta) throws AndrolibException {
     }
 
     private void putVersionInfo(MetaInfo meta) throws AndrolibException {
-        meta.versionInfo = getResTable().getVersionInfo();
+        VersionInfo info = getResTable().getVersionInfo();
+        String refValue = ResXmlPatcher.pullValueFromStrings(mOutDir, info.versionName);
+        if (refValue != null) {
+            info.versionName = refValue;
+        }
+        meta.versionInfo = info;
     }
 
     private void putUnknownInfo(MetaInfo meta) throws AndrolibException {

brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java

@@ -0,0 +1,66 @@
+/**
+ *  Copyright 2014 Ryszard Wiśniewski <brut.alll@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;
+
+import brut.androlib.meta.MetaInfo;
+import brut.androlib.res.util.ExtFile;
+import brut.common.BrutException;
+import brut.util.OS;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Connor Tumbleson <connor.tumbleson@gmail.com>
+ */
+public class ReferenceVersionCodeTest {
+
+    @BeforeClass
+    public static void beforeClass() throws Exception, BrutException {
+        TestUtils.cleanFrameworkFile();
+        sTmpDir = new ExtFile(OS.createTempDirectory());
+        TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue1234/", sTmpDir);
+    }
+
+    @AfterClass
+    public static void afterClass() throws BrutException {
+        OS.rmdir(sTmpDir);
+    }
+
+    @Test
+    public void referenceBecomesLiteralTest() throws BrutException, IOException {
+        String apk = "issue1234.apk";
+
+        // decode issue1234.apk
+        ApkDecoder apkDecoder = new ApkDecoder(new File(sTmpDir + File.separator + apk));
+        ExtFile decodedApk = new ExtFile(sTmpDir + File.separator + apk + ".out");
+        apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out"));
+        apkDecoder.decode();
+
+        MetaInfo metaInfo = new Androlib().readMetaFile(decodedApk);
+        assertEquals("v1.0.0", metaInfo.versionInfo.versionName);
+    }
+
+    private static ExtFile sTmpDir;
+
+    private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName());
+}