From 266cbcc6f49c55dd898015bdc77906134e930937 Mon Sep 17 00:00:00 2001 From: Skylot Date: Thu, 6 Oct 2022 19:42:54 +0100 Subject: [PATCH] fix(gui): migrate to fixed jdwp library fork (#1471) --- jadx-gui/build.gradle | 2 +- .../device/debugger/EventListenerAdapter.java | 36 +++---- .../jadx/gui/device/debugger/RuntimeType.java | 2 +- .../gui/device/debugger/SmaliDebugger.java | 100 +++++++++--------- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index b069e9f2..b2a6c381 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation "com.github.akarnokd:rxjava2-swing:0.3.7" implementation 'com.android.tools.build:apksig:7.3.0' - implementation 'io.github.hqktech:jdwp:1.0' + implementation 'io.github.skylot:jdwp:2.0.0' // TODO: Switch back to upstream once this PR gets merged: // https://github.com/FabricMC/mapping-io/pull/19 diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java index aad2ebee..f08cc7af 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java @@ -1,23 +1,23 @@ package jadx.gui.device.debugger; -import io.github.hqktech.JDWP.Event.Composite.BreakpointEvent; -import io.github.hqktech.JDWP.Event.Composite.ClassPrepareEvent; -import io.github.hqktech.JDWP.Event.Composite.ClassUnloadEvent; -import io.github.hqktech.JDWP.Event.Composite.ExceptionEvent; -import io.github.hqktech.JDWP.Event.Composite.FieldAccessEvent; -import io.github.hqktech.JDWP.Event.Composite.FieldModificationEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodEntryEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodExitEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodExitWithReturnValueEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorContendedEnterEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorContendedEnteredEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorWaitEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorWaitedEvent; -import io.github.hqktech.JDWP.Event.Composite.SingleStepEvent; -import io.github.hqktech.JDWP.Event.Composite.ThreadDeathEvent; -import io.github.hqktech.JDWP.Event.Composite.ThreadStartEvent; -import io.github.hqktech.JDWP.Event.Composite.VMDeathEvent; -import io.github.hqktech.JDWP.Event.Composite.VMStartEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.BreakpointEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ClassPrepareEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ClassUnloadEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ExceptionEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.FieldAccessEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.FieldModificationEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodEntryEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodExitEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodExitWithReturnValueEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorContendedEnterEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorContendedEnteredEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorWaitEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorWaitedEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.SingleStepEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ThreadDeathEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ThreadStartEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.VMDeathEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.VMStartEvent; abstract class EventListenerAdapter { void onVMStart(VMStartEvent event) { diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java index 6833085b..053829ab 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java @@ -1,6 +1,6 @@ package jadx.gui.device.debugger; -import io.github.hqktech.JDWP; +import io.github.skylot.jdwp.JDWP; public enum RuntimeType { ARRAY(91, "[]"), diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java index 263d1faa..a07063f8 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java @@ -21,56 +21,56 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.github.hqktech.JDWP; -import io.github.hqktech.JDWP.ArrayReference.Length.LengthReplyData; -import io.github.hqktech.JDWP.ByteBuffer; -import io.github.hqktech.JDWP.Event.Composite.BreakpointEvent; -import io.github.hqktech.JDWP.Event.Composite.ClassPrepareEvent; -import io.github.hqktech.JDWP.Event.Composite.ClassUnloadEvent; -import io.github.hqktech.JDWP.Event.Composite.EventData; -import io.github.hqktech.JDWP.Event.Composite.ExceptionEvent; -import io.github.hqktech.JDWP.Event.Composite.FieldAccessEvent; -import io.github.hqktech.JDWP.Event.Composite.FieldModificationEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodEntryEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodExitEvent; -import io.github.hqktech.JDWP.Event.Composite.MethodExitWithReturnValueEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorContendedEnterEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorContendedEnteredEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorWaitEvent; -import io.github.hqktech.JDWP.Event.Composite.MonitorWaitedEvent; -import io.github.hqktech.JDWP.Event.Composite.SingleStepEvent; -import io.github.hqktech.JDWP.Event.Composite.ThreadDeathEvent; -import io.github.hqktech.JDWP.Event.Composite.ThreadStartEvent; -import io.github.hqktech.JDWP.Event.Composite.VMDeathEvent; -import io.github.hqktech.JDWP.Event.Composite.VMStartEvent; -import io.github.hqktech.JDWP.EventRequest.Set.ClassMatchRequest; -import io.github.hqktech.JDWP.EventRequest.Set.CountRequest; -import io.github.hqktech.JDWP.EventRequest.Set.LocationOnlyRequest; -import io.github.hqktech.JDWP.EventRequest.Set.StepRequest; -import io.github.hqktech.JDWP.Method.VariableTableWithGeneric.VarTableWithGenericData; -import io.github.hqktech.JDWP.Method.VariableTableWithGeneric.VarWithGenericSlot; -import io.github.hqktech.JDWP.ObjectReference; -import io.github.hqktech.JDWP.ObjectReference.ReferenceType.ReferenceTypeReplyData; -import io.github.hqktech.JDWP.ObjectReference.SetValues.FieldValueSetter; -import io.github.hqktech.JDWP.Packet; -import io.github.hqktech.JDWP.ReferenceType.FieldsWithGeneric.FieldsWithGenericData; -import io.github.hqktech.JDWP.ReferenceType.FieldsWithGeneric.FieldsWithGenericReplyData; -import io.github.hqktech.JDWP.ReferenceType.MethodsWithGeneric.MethodsWithGenericData; -import io.github.hqktech.JDWP.ReferenceType.MethodsWithGeneric.MethodsWithGenericReplyData; -import io.github.hqktech.JDWP.ReferenceType.Signature.SignatureReplyData; -import io.github.hqktech.JDWP.StackFrame.GetValues.GetValuesReplyData; -import io.github.hqktech.JDWP.StackFrame.GetValues.GetValuesSlots; -import io.github.hqktech.JDWP.StackFrame.SetValues.SlotValueSetter; -import io.github.hqktech.JDWP.StackFrame.ThisObject.ThisObjectReplyData; -import io.github.hqktech.JDWP.StringReference.Value.ValueReplyData; -import io.github.hqktech.JDWP.ThreadReference.Frames.FramesReplyData; -import io.github.hqktech.JDWP.ThreadReference.Frames.FramesReplyDataFrames; -import io.github.hqktech.JDWP.ThreadReference.Name.NameReplyData; -import io.github.hqktech.JDWP.VirtualMachine.AllClassesWithGeneric.AllClassesWithGenericData; -import io.github.hqktech.JDWP.VirtualMachine.AllClassesWithGeneric.AllClassesWithGenericReplyData; -import io.github.hqktech.JDWP.VirtualMachine.AllThreads.AllThreadsReplyData; -import io.github.hqktech.JDWP.VirtualMachine.AllThreads.AllThreadsReplyDataThreads; -import io.github.hqktech.JDWP.VirtualMachine.CreateString.CreateStringReplyData; +import io.github.skylot.jdwp.JDWP; +import io.github.skylot.jdwp.JDWP.ArrayReference.Length.LengthReplyData; +import io.github.skylot.jdwp.JDWP.ByteBuffer; +import io.github.skylot.jdwp.JDWP.Event.Composite.BreakpointEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ClassPrepareEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ClassUnloadEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.EventData; +import io.github.skylot.jdwp.JDWP.Event.Composite.ExceptionEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.FieldAccessEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.FieldModificationEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodEntryEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodExitEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MethodExitWithReturnValueEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorContendedEnterEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorContendedEnteredEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorWaitEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.MonitorWaitedEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.SingleStepEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ThreadDeathEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.ThreadStartEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.VMDeathEvent; +import io.github.skylot.jdwp.JDWP.Event.Composite.VMStartEvent; +import io.github.skylot.jdwp.JDWP.EventRequest.Set.ClassMatchRequest; +import io.github.skylot.jdwp.JDWP.EventRequest.Set.CountRequest; +import io.github.skylot.jdwp.JDWP.EventRequest.Set.LocationOnlyRequest; +import io.github.skylot.jdwp.JDWP.EventRequest.Set.StepRequest; +import io.github.skylot.jdwp.JDWP.Method.VariableTableWithGeneric.VarTableWithGenericData; +import io.github.skylot.jdwp.JDWP.Method.VariableTableWithGeneric.VarWithGenericSlot; +import io.github.skylot.jdwp.JDWP.ObjectReference; +import io.github.skylot.jdwp.JDWP.ObjectReference.ReferenceType.ReferenceTypeReplyData; +import io.github.skylot.jdwp.JDWP.ObjectReference.SetValues.FieldValueSetter; +import io.github.skylot.jdwp.JDWP.Packet; +import io.github.skylot.jdwp.JDWP.ReferenceType.FieldsWithGeneric.FieldsWithGenericData; +import io.github.skylot.jdwp.JDWP.ReferenceType.FieldsWithGeneric.FieldsWithGenericReplyData; +import io.github.skylot.jdwp.JDWP.ReferenceType.MethodsWithGeneric.MethodsWithGenericData; +import io.github.skylot.jdwp.JDWP.ReferenceType.MethodsWithGeneric.MethodsWithGenericReplyData; +import io.github.skylot.jdwp.JDWP.ReferenceType.Signature.SignatureReplyData; +import io.github.skylot.jdwp.JDWP.StackFrame.GetValues.GetValuesReplyData; +import io.github.skylot.jdwp.JDWP.StackFrame.GetValues.GetValuesSlots; +import io.github.skylot.jdwp.JDWP.StackFrame.SetValues.SlotValueSetter; +import io.github.skylot.jdwp.JDWP.StackFrame.ThisObject.ThisObjectReplyData; +import io.github.skylot.jdwp.JDWP.StringReference.Value.ValueReplyData; +import io.github.skylot.jdwp.JDWP.ThreadReference.Frames.FramesReplyData; +import io.github.skylot.jdwp.JDWP.ThreadReference.Frames.FramesReplyDataFrames; +import io.github.skylot.jdwp.JDWP.ThreadReference.Name.NameReplyData; +import io.github.skylot.jdwp.JDWP.VirtualMachine.AllClassesWithGeneric.AllClassesWithGenericData; +import io.github.skylot.jdwp.JDWP.VirtualMachine.AllClassesWithGeneric.AllClassesWithGenericReplyData; +import io.github.skylot.jdwp.JDWP.VirtualMachine.AllThreads.AllThreadsReplyData; +import io.github.skylot.jdwp.JDWP.VirtualMachine.AllThreads.AllThreadsReplyDataThreads; +import io.github.skylot.jdwp.JDWP.VirtualMachine.CreateString.CreateStringReplyData; import io.reactivex.annotations.NonNull; import jadx.api.plugins.input.data.AccessFlags; -- GitLab