chore: update default --res-resolve-mode in usage (#4042)

Author: IgorEisberg

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

@@ -119,7 +119,7 @@ private enum Verbosity { NORMAL, VERBOSE, QUIET }
     private static final Option decodeResResolveModeOption = Option.builder()
         .longOpt("res-resolve-mode")
         .desc("Set the resolve mode for resources to <mode>.\n"
-            + "Possible values are: 'remove' (default), 'dummy' or 'keep'.")
+            + "Possible values are: 'keep' (default), 'remove' or 'dummy'.")
         .hasArg()
         .argName("mode")
         .build();

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

@@ -271,7 +271,6 @@ private void parsePackage(ResChunkPullParser parser) throws AndrolibException, I
 
         // Clean up.
         injectMissingEntrySpecs();
-        mMissingEntrySpecs.clear();
         mInvalidConfigs.clear();
         mKeyStrings = null;
         mTypeStrings = null;
@@ -807,25 +806,25 @@ private void skipUnreadHeader(ResChunkPullParser parser) throws IOException {
     }
 
     private void injectMissingEntrySpecs() throws AndrolibException {
-        if (mPackage == null || mTable.getConfig().getDecodeResolve() != Config.DecodeResolve.DUMMY) {
-            return;
-        }
+        if (mTable.getConfig().getDecodeResolve() == Config.DecodeResolve.DUMMY) {
+            for (ResId id : mMissingEntrySpecs) {
+                ResTypeSpec typeSpec = mPackage.getTypeSpec(id.getTypeId());
+                ResValue value;
+                switch (typeSpec.getName()) {
+                    case "attr":
+                    case "^attr-private":
+                        value = ResAttribute.DEFAULT;
+                        break;
+                    default:
+                        value = ResReference.NULL;
+                        break;
+                }
 
-        for (ResId id : mMissingEntrySpecs) {
-            ResTypeSpec typeSpec = mPackage.getTypeSpec(id.getTypeId());
-            ResValue value;
-            switch (typeSpec.getName()) {
-                case "attr":
-                case "^attr-private":
-                    value = ResAttribute.DEFAULT;
-                    break;
-                default:
-                    value = ResReference.NULL;
-                    break;
+                mPackage.addEntrySpec(id, ResEntrySpec.DUMMY_PREFIX + id);
+                mPackage.addEntry(id, ResConfig.DEFAULT, value);
             }
-
-            mPackage.addEntrySpec(id, ResEntrySpec.DUMMY_PREFIX + id);
-            mPackage.addEntry(id, ResConfig.DEFAULT, value);
         }
+
+        mMissingEntrySpecs.clear();
     }
 }