From 39912398fc32a5737f2d376126dd080b5486cb0c Mon Sep 17 00:00:00 2001
From: pubiqq <82187521+pubiqq@users.noreply.github.com>
Date: Fri, 1 Nov 2024 00:24:19 +0300
Subject: [PATCH] fix: unwrap consts in switch-over-string (PR #2332)

---
 .../regions/SwitchOverStringVisitor.java      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java
index 07c4f134..83eab68c 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java
@@ -12,6 +12,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.jetbrains.annotations.Nullable;
 
+import jadx.api.plugins.input.data.annotations.EncodedType;
+import jadx.api.plugins.input.data.attributes.JadxAttrType;
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.attributes.IAttributeNode;
 import jadx.core.dex.attributes.nodes.CodeFeaturesAttr;
@@ -26,6 +28,7 @@ import jadx.core.dex.instructions.args.InsnWrapArg;
 import jadx.core.dex.instructions.args.LiteralArg;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.instructions.args.SSAVar;
+import jadx.core.dex.nodes.FieldNode;
 import jadx.core.dex.nodes.IContainer;
 import jadx.core.dex.nodes.IRegion;
 import jadx.core.dex.nodes.InsnNode;
@@ -217,8 +220,8 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
 		for (SwitchRegion.CaseInfo caseInfo : codeSwitch.getCases()) {
 			CaseData prevCase = null;
 			for (Object key : caseInfo.getKeys()) {
-				if (key instanceof Integer) {
-					Integer intKey = (Integer) key;
+				final Integer intKey = unwrapIntKey(key);
+				if (intKey != null) {
 					CaseData caseData = casesMap.get(intKey);
 					if (caseData == null) {
 						return false;
@@ -246,6 +249,21 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
 		return true;
 	}
 
+	private Integer unwrapIntKey(Object key) {
+		if (key instanceof Integer) {
+			return (Integer) key;
+		} else if (key instanceof FieldNode) {
+			final var encodedValue = ((FieldNode) key).get(JadxAttrType.CONSTANT_VALUE);
+			if (encodedValue != null && encodedValue.getType() == EncodedType.ENCODED_INT) {
+				return (Integer) encodedValue.getValue();
+			} else {
+				return null;
+			}
+		}
+
+		return null;
+	}
+
 	private static Map<InsnNode, String> collectEqualsInsns(MethodNode mth, SSAVar strVar) {
 		Map<InsnNode, String> map = new IdentityHashMap<>(strVar.getUseCount() - 1);
 		for (RegisterArg useReg : strVar.getUseList()) {