fix(gui): allow partial settings sync to not save command line options

skylot · Oct 29, 2018 · 557667b · 557667b
1 parent 1d7bb43
commit 557667b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ISettingsUpdater.java b/jadx-gui/src/main/java/jadx/gui/settings/ISettingsUpdater.java
@@ -0,0 +1,5 @@
+package jadx.gui.settings;
+
+public interface ISettingsUpdater {
+	void update(JadxSettings settings);
+}
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
@@ -54,6 +54,12 @@ public void sync() {
 		JadxSettingsAdapter.store(this);
 	}
 
+	public void partialSync(ISettingsUpdater updater) {
+		JadxSettings settings = JadxSettingsAdapter.load();
+		updater.update(settings);
+		JadxSettingsAdapter.store(settings);
+	}
+
 	public void fixOnLoad() {
 		if (threadsCount <= 0) {
 			threadsCount = JadxArgs.DEFAULT_THREADS_COUNT;
@@ -75,7 +81,7 @@ public String getLastOpenFilePath() {
 
 	public void setLastOpenFilePath(String lastOpenFilePath) {
 		this.lastOpenFilePath = lastOpenFilePath;
-		sync();
+		partialSync(settings -> settings.lastOpenFilePath = JadxSettings.this.lastOpenFilePath);
 	}
 
 	public String getLastSaveFilePath() {
@@ -84,7 +90,7 @@ public String getLastSaveFilePath() {
 
 	public void setLastSaveFilePath(String lastSaveFilePath) {
 		this.lastSaveFilePath = lastSaveFilePath;
-		sync();
+		partialSync(settings -> settings.lastSaveFilePath = JadxSettings.this.lastSaveFilePath);
 	}
 
 	public boolean isFlattenPackage() {
@@ -93,7 +99,7 @@ public boolean isFlattenPackage() {
 
 	public void setFlattenPackage(boolean flattenPackage) {
 		this.flattenPackage = flattenPackage;
-		sync();
+		partialSync(settings -> settings.flattenPackage = JadxSettings.this.flattenPackage);
 	}
 
 	public boolean isCheckForUpdates() {
@@ -116,7 +122,7 @@ public void addRecentFile(String filePath) {
 		if (count > RECENT_FILES_COUNT) {
 			recentFiles.subList(RECENT_FILES_COUNT, count).clear();
 		}
-		sync();
+		partialSync(settings -> settings.recentFiles = recentFiles);
 	}
 
 	public void saveWindowPos(Window window) {
@@ -125,7 +131,7 @@ public void saveWindowPos(Window window) {
 				window.getWidth(), window.getHeight()
 		);
 		windowPos.put(pos.getWindowId(), pos);
-		sync();
+		partialSync(settings -> settings.windowPos = windowPos);
 	}
 
 	public boolean loadWindowPos(Window window) {