From 90b7d4b9b565ed77d77d788054b442c5ef2b9603 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Fri, 5 May 2017 07:51:24 -0400 Subject: [PATCH] move common output to fine LOG level - only visible in VERBOSE --- .../apktool-cli/src/main/java/brut/apktool/Main.java | 10 ++++++++-- .../brut/androlib/res/data/value/ResStyleValue.java | 2 +- 2 files changed, 9 insertions(+), 3 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 626d2bbd..590c72bf 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 @@ -486,7 +486,7 @@ public class Main { + "For smali/baksmali info, see: https://github.com/JesusFreke/smali"); } - private static void setupLogging(Verbosity verbosity) { + private static void setupLogging(final Verbosity verbosity) { Logger logger = Logger.getLogger(""); for (Handler handler : logger.getHandlers()) { logger.removeHandler(handler); @@ -509,7 +509,13 @@ public class Main { if (record.getLevel().intValue() >= Level.WARNING.intValue()) { System.err.write(message.getBytes()); } else { - System.out.write(message.getBytes()); + if (record.getLevel().intValue() >= Level.INFO.intValue()) { + System.out.write(message.getBytes()); + } else { + if (verbosity == Verbosity.VERBOSE) { + System.out.write(message.getBytes()); + } + } } } catch (Exception exception) { reportError(null, exception, ErrorManager.FORMAT_FAILURE); diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java index cc96e655..fe7bffc5 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java @@ -55,7 +55,7 @@ public class ResStyleValue extends ResBagValue implements ResResSpec spec = mItems[i].m1.getReferent(); if (spec == null) { - LOGGER.info(String.format("null reference: m1=0x%08x(%s), m2=0x%08x(%s)", + LOGGER.fine(String.format("null reference: m1=0x%08x(%s), m2=0x%08x(%s)", mItems[i].m1.getRawIntValue(), mItems[i].m1.getType(), mItems[i].m2.getRawIntValue(), mItems[i].m2.getType())); continue; }