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 385ba946c661e29957d2649dcd7dd349a4d7161a..6258da37d06bac627a7401868f82b489e4e07342 100644 --- a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java +++ b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java @@ -25,6 +25,7 @@ import com.beust.jcommander.Parameter; import jadx.api.JadxArgs; import jadx.cli.JadxCLIArgs; import jadx.cli.LogHelper; +import jadx.core.utils.exceptions.JadxRuntimeException; import jadx.gui.ui.MainWindow; import jadx.gui.ui.codearea.EditorTheme; import jadx.gui.utils.FontUtils; @@ -36,7 +37,7 @@ public class JadxSettings extends JadxCLIArgs { private static final Path USER_HOME = Paths.get(System.getProperty("user.home")); private static final int RECENT_PROJECTS_COUNT = 15; - private static final int CURRENT_SETTINGS_VERSION = 10; + private static final int CURRENT_SETTINGS_VERSION = 11; private static final Font DEFAULT_FONT = new RSyntaxTextArea().getFont(); @@ -485,6 +486,11 @@ public class JadxSettings extends JadxCLIArgs { if (fromVersion == 10) { srhResourceSkipSize = 3; srhResourceFileExt = ".xml|.html|.js|.json|.txt"; + fontStr = fontStr.replace('-', '/'); + fromVersion++; + } + if (fromVersion != CURRENT_SETTINGS_VERSION) { + throw new JadxRuntimeException("Incorrect settings upgrade"); } settingsVersion = CURRENT_SETTINGS_VERSION; sync(); diff --git a/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java b/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java index b4a3b974aec71f180a6a859a301eb4a8d3a2e9ac..67b56f8a1f5cbfb6bd9c7e6a528fde71a73b971d 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java @@ -24,7 +24,7 @@ public class FontUtils { } public static Font loadByStr(String fontDesc) { - String[] parts = fontDesc.split("-"); + String[] parts = fontDesc.split("/"); if (parts.length != 3) { throw new JadxRuntimeException("Unsupported font description format: " + fontDesc); } @@ -42,8 +42,8 @@ public class FontUtils { public static String convertToStr(Font font) { return font.getFontName() - + '-' + convertFontStyleToString(font.getStyle()) - + '-' + font.getSize(); + + '/' + convertFontStyleToString(font.getStyle()) + + '/' + font.getSize(); } public static String convertFontStyleToString(int style) {