From 9a4e8bdb483d5b53c271c68d48db943362ec4ce5 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Wed, 15 Aug 2018 15:25:09 +0300
Subject: [PATCH] set default deobfuscation min length to 3 (#332)

---
 jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java       |  2 +-
 .../src/main/java/jadx/gui/settings/JadxSettings.java  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java b/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
index 25eaed00b..4fb90ba91 100644
--- a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
+++ b/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
@@ -64,7 +64,7 @@ public class JadxCLIArgs {
 	protected boolean deobfuscationOn = false;
 
 	@Parameter(names = {"--deobf-min"}, description = "min length of name, renamed if shorter")
-	protected int deobfuscationMinLength = 4;
+	protected int deobfuscationMinLength = 3;
 
 	@Parameter(names = {"--deobf-max"}, description = "max length of name, renamed if longer")
 	protected int deobfuscationMaxLength = 64;
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
index 11f3b2468..cfebfe362 100644
--- a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+++ b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
@@ -24,7 +24,7 @@ public class JadxSettings extends JadxCLIArgs {
 
 	private static final String USER_HOME = System.getProperty("user.home");
 	private static final int RECENT_FILES_COUNT = 15;
-	private static final int CURRENT_SETTINGS_VERSION = 2;
+	private static final int CURRENT_SETTINGS_VERSION = 3;
 
 	private static final Font DEFAULT_FONT = FONT_HACK != null ? FONT_HACK : new RSyntaxTextArea().getFont();
 
@@ -236,7 +236,7 @@ public class JadxSettings extends JadxCLIArgs {
 	private void upgradeSettings(int fromVersion) {
 		LOG.debug("upgrade settings from version: {} to {}", fromVersion, CURRENT_SETTINGS_VERSION);
 		if (fromVersion == 0) {
-			setDeobfuscationMinLength(4);
+			setDeobfuscationMinLength(3);
 			setDeobfuscationUseSourceNameAsAlias(true);
 			setDeobfuscationForceSave(true);
 			setThreadsCount(1);
@@ -247,6 +247,12 @@ public class JadxSettings extends JadxCLIArgs {
 		}
 		if (fromVersion == 1) {
 			setEditorThemePath(CodeArea.getAllThemes()[0].getPath());
+			fromVersion++;
+		}
+		if (fromVersion == 2) {
+			if (getDeobfuscationMinLength() == 4) {
+				setDeobfuscationMinLength(3);
+			}
 		}
 		settingsVersion = CURRENT_SETTINGS_VERSION;
 		sync();