From a0cd772205a05bd3cb473bd9f210b383c690ca54 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Fri, 8 Dec 2017 16:31:25 -0500
Subject: [PATCH] Remove duplicate manifest-only parameter

---
 .../apktool-cli/src/main/java/brut/apktool/Main.java |  9 ---------
 .../src/main/java/brut/androlib/ApkDecoder.java      | 12 ------------
 2 files changed, 21 deletions(-)

diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
index 92962f0e..ae509349 100644
--- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
+++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
@@ -127,9 +127,6 @@ public class Main {
         if (cli.hasOption("force-manifest")) {
             decoder.setForceDecodeManifest(ApkDecoder.FORCE_DECODE_MANIFEST_FULL);
         }
-        if (cli.hasOption("manifest-only")) {
-            decoder.setManifestOnly(true);
-        }
         if (cli.hasOption("no-assets")) {
             decoder.setDecodeAssets(ApkDecoder.DECODE_ASSETS_NONE);
         }
@@ -297,11 +294,6 @@ public class Main {
                 .desc("Decode the APK's compiled manifest, even if decoding of resources is set to \"false\".")
                 .build();
 
-        Option manifestOnlyOption = Option.builder("mo")
-                .longOpt("manifest-only")
-                .desc("Only decode manifest.")
-                .build();
-
         Option noAssetOption = Option.builder()
                 .longOpt("no-assets")
                 .desc("Do not decode assets.")
@@ -439,7 +431,6 @@ public class Main {
         DecodeOptions.addOption(forceDecOption);
         DecodeOptions.addOption(noSrcOption);
         DecodeOptions.addOption(noResOption);
-        DecodeOptions.addOption(manifestOnlyOption);
 
         // add basic build options
         BuildOptions.addOption(outputBuiOption);
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index 5ef3f75c..1f4b2f0e 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -100,13 +100,6 @@ public class ApkDecoder {
 
             LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + mApkFile.getName());
 
-            if (mManifestOnly) {
-               setAnalysisMode(mAnalysisMode, true);
-               mAndrolib.decodeManifestWithResources(mApkFile, outDir, getResTable());
-               writeMetaFile();
-               return;
-            }
-
             if (hasResources()) {
                 switch (mDecodeResources) {
                     case DECODE_RESOURCES_NONE:
@@ -249,10 +242,6 @@ public class ApkDecoder {
         mForceDelete = forceDelete;
     }
 
-    public void setManifestOnly(boolean manifestOnly) {
-        mManifestOnly = manifestOnly;
-    }
-
     public void setFrameworkTag(String tag) throws AndrolibException {
         mAndrolib.apkOptions.frameworkTag = tag;
     }
@@ -448,7 +437,6 @@ public class ApkDecoder {
     private short mForceDecodeManifest = FORCE_DECODE_MANIFEST_NONE;
     private short mDecodeAssets = DECODE_ASSETS_FULL;
     private boolean mForceDelete = false;
-    private boolean mManifestOnly = false;
     private boolean mKeepBrokenResources = false;
     private boolean mBakDeb = true;
     private Collection<String> mUncompressedFiles;