From fb02e32a6a72001cd53003b3628009a85ee98aba Mon Sep 17 00:00:00 2001
From: Skylot <118523+skylot@users.noreply.github.com>
Date: Sat, 24 May 2025 22:16:10 +0100
Subject: [PATCH] chore: don't use nullable annotations from RxJava

---
 config/checkstyle/checkstyle.xml                               | 3 +++
 jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java | 3 ---
 jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java     | 3 ---
 jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java   | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index dfae95396..68407bc35 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -126,6 +126,9 @@
 		</module>
 		<module name="IllegalImport">
 			<property name="illegalClasses" value="jadx.core.utils.DebugUtils"/>
+			<!-- don't use nullable annotations from RxJava -->
+			<property name="illegalClasses" value="io.reactivex.rxjava3.annotations.NonNull"/>
+			<property name="illegalClasses" value="io.reactivex.rxjava3.annotations.Nullable"/>
 		</module>
 		<module name="RegexpSinglelineJava">
 			<property name="id" value="printstacktrace"/>
diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
index 2a052679f..5fe82c24f 100644
--- a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
+++ b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
@@ -16,8 +16,6 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.reactivex.rxjava3.annotations.NonNull;
-
 import jadx.core.utils.StringUtils;
 import jadx.core.utils.log.LogUtils;
 import jadx.gui.device.protocol.ADB.JDWPProcessListener;
@@ -208,7 +206,6 @@ public class ADBDevice {
 		return getProcessList("ps | grep " + pkg);
 	}
 
-	@NonNull
 	public List<Process> getProcessList() throws IOException {
 		return getProcessList("ps");
 	}
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java b/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java
index 2433694e1..ce36acd57 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java
@@ -8,8 +8,6 @@ import java.util.stream.Collectors;
 
 import javax.swing.ImageIcon;
 
-import io.reactivex.rxjava3.annotations.NonNull;
-
 import jadx.gui.utils.NLS;
 import jadx.gui.utils.UiUtils;
 import jadx.gui.utils.shortcut.Shortcut;
@@ -165,7 +163,6 @@ public enum ActionModel {
 		return null;
 	}
 
-	@NonNull
 	public Shortcut getDefaultShortcut() {
 		return defaultShortcut;
 	}
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
index bd2a028c8..a21d7fb3c 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
@@ -40,11 +40,10 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.reactivex.rxjava3.annotations.Nullable;
-
 import jadx.core.utils.StringUtils;
 import jadx.gui.device.debugger.DebugController;
 import jadx.gui.device.protocol.ADBDevice;