jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Skylot
2018-10-29 19:35:34 +03:00
parent 1d7bb43dfd
commit 557667b125
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/settings/ISettingsUpdater.java
+5
View File
@@ -0,0 +1,5 @@
package jadx.gui.settings;
public interface ISettingsUpdater {
void update(JadxSettings settings);
}
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+11 -5
View File
@@ -54,6 +54,12 @@ public class JadxSettings extends JadxCLIArgs {
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 class JadxSettings extends JadxCLIArgs {
public void setLastOpenFilePath(String lastOpenFilePath) {
this.lastOpenFilePath = lastOpenFilePath;
sync();
partialSync(settings -> settings.lastOpenFilePath = JadxSettings.this.lastOpenFilePath);
}
public String getLastSaveFilePath() {
@@ -84,7 +90,7 @@ public class JadxSettings extends JadxCLIArgs {
public void setLastSaveFilePath(String lastSaveFilePath) {
this.lastSaveFilePath = lastSaveFilePath;
sync();
partialSync(settings -> settings.lastSaveFilePath = JadxSettings.this.lastSaveFilePath);
}
public boolean isFlattenPackage() {
@@ -93,7 +99,7 @@ public class JadxSettings extends JadxCLIArgs {
public void setFlattenPackage(boolean flattenPackage) {
this.flattenPackage = flattenPackage;
sync();
partialSync(settings -> settings.flattenPackage = JadxSettings.this.flattenPackage);
}
public boolean isCheckForUpdates() {
@@ -116,7 +122,7 @@ public class JadxSettings extends JadxCLIArgs {
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 class JadxSettings extends JadxCLIArgs {
window.getWidth(), window.getHeight()
);
windowPos.put(pos.getWindowId(), pos);
sync();
partialSync(settings -> settings.windowPos = windowPos);
}
public boolean loadWindowPos(Window window) {