From 28bcad202a4fcf652e844777637d16d26ff50716 Mon Sep 17 00:00:00 2001 From: Skylot Date: Tue, 26 Feb 2019 20:09:05 +0300 Subject: [PATCH] refactor: resolve deprecation warning for TypeGen.literalToString method --- jadx-core/src/main/java/jadx/core/codegen/TypeGen.java | 8 +------- .../java/jadx/core/dex/instructions/args/LiteralArg.java | 6 +++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java b/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java index 7aa3b7707..3a68201e5 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java @@ -3,7 +3,6 @@ package jadx.core.codegen; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jadx.api.JadxArgs; import jadx.core.deobf.NameMapper; import jadx.core.dex.instructions.args.ArgType; import jadx.core.dex.instructions.args.PrimitiveType; @@ -38,12 +37,7 @@ public class TypeGen { return literalToString(lit, type, dexNode.root().getStringUtils()); } - @Deprecated - public static String literalToString(long lit, ArgType type) { - return literalToString(lit, type, new StringUtils(new JadxArgs())); - } - - private static String literalToString(long lit, ArgType type, StringUtils stringUtils) { + public static String literalToString(long lit, ArgType type, StringUtils stringUtils) { if (type == null || !type.isTypeKnown()) { String n = Long.toString(lit); if (Math.abs(lit) > 100) { diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java index 728372920..9d0892796 100644 --- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java +++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java @@ -1,6 +1,8 @@ package jadx.core.dex.instructions.args; +import jadx.api.JadxArgs; import jadx.core.codegen.TypeGen; +import jadx.core.utils.StringUtils; import jadx.core.utils.exceptions.JadxRuntimeException; public final class LiteralArg extends InsnArg { @@ -63,10 +65,12 @@ public final class LiteralArg extends InsnArg { return literal == that.literal && getType().equals(that.getType()); } + private static final StringUtils DEF_STRING_UTILS = new StringUtils(new JadxArgs()); + @Override public String toString() { try { - String value = TypeGen.literalToString(literal, getType()); + String value = TypeGen.literalToString(literal, getType(), DEF_STRING_UTILS); if (getType().equals(ArgType.BOOLEAN) && (value.equals("true") || value.equals("false"))) { return value; }