From 53e7ffd9a2538c1b55c86d6e0afa6ab0e726ce85 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 17 Sep 2012 17:49:36 -0500
Subject: [PATCH] adding parameter -o, pass apk file name as original

---
 .../src/main/java/brut/apktool/Main.java      | 22 +++++++++++++------
 .../src/main/java/brut/androlib/Androlib.java | 15 +++++++++++++
 .../main/java/brut/androlib/ApkDecoder.java   |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/apktool-cli/src/main/java/brut/apktool/Main.java b/apktool-cli/src/main/java/brut/apktool/Main.java
index 1fe42b6c..227d405a 100644
--- a/apktool-cli/src/main/java/brut/apktool/Main.java
+++ b/apktool-cli/src/main/java/brut/apktool/Main.java
@@ -164,19 +164,27 @@ public class Main {
         flags.put("update", false);
         
         int i;
+        int skip = 0;
+        File  mOrigApk = null;
         for (i = 0; i < args.length; i++) {
             String opt = args[i];
             if (! opt.startsWith("-")) {
                 break;
             }
             if ("-f".equals(opt) || "--force-all".equals(opt)) {
-               flags.put("forceBuildA", true);
+                flags.put("forceBuildAll", true);
             } else if ("-d".equals(opt) || "--debug".equals(opt)) {
                 flags.put("debug", true);
             } else if ("-v".equals(opt) || "--verbose".equals(opt)) {
                 flags.put("verbose", true);
-            } else if("-o".equals(opt) || "--original".equals(opt)) {
-                flags.put("injectOriginal", true);
+            } else if ("-o".equals(opt) || "--original".equals(opt)) {
+                if (args.length >= 4) {
+                    throw new InvalidArgsError();
+                } else {
+                    flags.put("injectOriginal", true);
+                    mOrigApk = new File(args[i + 1]);
+                    skip = 1;
+                }
             } else {
                 throw new InvalidArgsError();
             }
@@ -184,19 +192,19 @@ public class Main {
 
         String appDirName;
         File outFile = null;
-        switch (args.length - i) {
+        switch (args.length - i - skip) {
             case 0:
                 appDirName = ".";
                 break;
             case 2:
-                outFile = new File(args[i + 1]);
+                outFile = new File(args[i + 1 + skip]);
             case 1:
-                appDirName = args[i];
+                appDirName = args[i + skip];
                 break;
             default:
                 throw new InvalidArgsError();
         }
-
+        
         new Androlib().build(new File(appDirName), outFile, flags);
     }
 
diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index 62b4cd4f..240529d6 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -16,6 +16,7 @@
 
 package brut.androlib;
 
+import brut.androlib.err.InFileNotFoundException;
 import brut.androlib.java.AndrolibJava;
 import brut.androlib.res.AndrolibResources;
 import brut.androlib.res.data.ResPackage;
@@ -435,6 +436,13 @@ public class Androlib {
         }
         mAndRes.aaptPackage(outApk, null, null,
             new File(appDir, APK_DIRNAME), assetDir, null, flags);
+        
+        /* check for re-insert */
+        if (flags.get("injectOriginal")) {
+          //  if (!mApkFile.isFile() || !mApkFile.canRead()) {
+           //     throw new InFileNotFoundException();
+            //}
+        }
     }
 
     public void publicizeResources(File arscFile) throws AndrolibException {
@@ -508,7 +516,14 @@ public class Androlib {
         }
         return files;
     }
+    
+    public void setApkFile(File apkFile) {
+        mOrigApkFile = new ExtFile(apkFile);
+    }
+        
 
+    private ExtFile mOrigApkFile;
+    
     private final static Logger LOGGER =
         Logger.getLogger(Androlib.class.getName());
 
diff --git a/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index 217ae83c..e1ca29a4 100644
--- a/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -53,7 +53,7 @@ public class ApkDecoder {
         mApkFile = new ExtFile(apkFile);
         mResTable = null;
     }
-
+    
     public void setOutDir(File outDir) throws AndrolibException {
         mOutDir = outDir;
     }