From c1651e874ba879f8dd6bb4f12c2ab8c6955a6be3 Mon Sep 17 00:00:00 2001 From: Dmitry Isaenko Date: Fri, 17 Mar 2023 04:00:48 +0300 Subject: [PATCH] Correct AppPreferences class. Fix #139 --- src/main/java/nsusbloader/AppPreferences.java | 9 ++++++--- .../java/nsusbloader/Controllers/PatchesController.java | 2 +- .../Utilities/WindowsDrivers/DriversInstall.java | 2 +- .../Utilities/patches/es/finders/HeuristicEs1.java | 2 +- .../Utilities/patches/es/finders/HeuristicEs2.java | 2 +- .../Utilities/patches/es/finders/HeuristicEs3.java | 4 ++-- .../Utilities/patches/fs/finders/HeuristicFs1.java | 2 +- .../Utilities/patches/fs/finders/HeuristicFs2.java | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/nsusbloader/AppPreferences.java b/src/main/java/nsusbloader/AppPreferences.java index 0b54289..dfe8e49 100644 --- a/src/main/java/nsusbloader/AppPreferences.java +++ b/src/main/java/nsusbloader/AppPreferences.java @@ -32,7 +32,10 @@ public class AppPreferences { private AppPreferences(){ this.preferences = Preferences.userRoot().node("NS-USBloader"); String localeCode = preferences.get("locale", Locale.getDefault().toString()); - this.locale = new Locale(localeCode.substring(0, 2), localeCode.substring(3)); + if (localeCode.length() < 5) + this.locale = new Locale("en", "EN"); + else + this.locale = new Locale(localeCode.substring(0, 2), localeCode.substring(3)); } public String getTheme(){ @@ -147,6 +150,6 @@ public class AppPreferences { public boolean getPatchesTabInvisible(){return preferences.getBoolean("patches_tab_visible", true); } public void setPatchesTabInvisible(boolean value){preferences.putBoolean("patches_tab_visible", value);} - public String getPatchOffset(String type, int moduleNumber, int offsetId){ return preferences.get(String.format("%s_%02x_%02x", type, moduleNumber, offsetId), ""); } - public void setPatchOffset(String fullTypeSpecifier, String offset){ preferences.put(fullTypeSpecifier, offset); } + public String getPatchPattern(String type, int moduleNumber, int offsetId){ return preferences.get(String.format("%s_%02x_%02x", type, moduleNumber, offsetId), ""); } + public void setPatchPattern(String fullTypeSpecifier, String offset){ preferences.put(fullTypeSpecifier, offset); } } diff --git a/src/main/java/nsusbloader/Controllers/PatchesController.java b/src/main/java/nsusbloader/Controllers/PatchesController.java index 7395d3a..6afd267 100644 --- a/src/main/java/nsusbloader/Controllers/PatchesController.java +++ b/src/main/java/nsusbloader/Controllers/PatchesController.java @@ -169,7 +169,7 @@ public class PatchesController implements Initializable { continue; if (! lineValues[1].matches("^(([0-9A-Fa-f]{2})|\\.)+?$")) continue; - preferences.setPatchOffset(lineValues[0], lineValues[1]); + preferences.setPatchPattern(lineValues[0], lineValues[1]); System.out.println(pointer[0]+"_"+pointer[1]+"_"+pointer[2]+" = "+lineValues[1]); count++; diff --git a/src/main/java/nsusbloader/Utilities/WindowsDrivers/DriversInstall.java b/src/main/java/nsusbloader/Utilities/WindowsDrivers/DriversInstall.java index daa483e..5c5aa36 100644 --- a/src/main/java/nsusbloader/Utilities/WindowsDrivers/DriversInstall.java +++ b/src/main/java/nsusbloader/Utilities/WindowsDrivers/DriversInstall.java @@ -140,7 +140,7 @@ public class DriversInstall { return true; } catch (Exception e){ - runInstallerStatusLabel.setText("Error: "+e.toString()); + runInstallerStatusLabel.setText("Error: "+e); e.printStackTrace(); return false; } diff --git a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs1.java b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs1.java index 7130d2e..e32270c 100644 --- a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs1.java +++ b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs1.java @@ -27,7 +27,7 @@ import nsusbloader.Utilities.patches.SimplyFind; import java.util.List; class HeuristicEs1 extends AHeuristic { - private static final String PATTERN = AppPreferences.getInstance().getPatchOffset("ES", 1, 0); + private static final String PATTERN = AppPreferences.getInstance().getPatchPattern("ES", 1, 0); private final List findings; private final byte[] where; diff --git a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs2.java b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs2.java index 6ee3ce1..efa710d 100644 --- a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs2.java +++ b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs2.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; class HeuristicEs2 extends AHeuristic { - private static final String PATTERN = AppPreferences.getInstance().getPatchOffset("ES", 2, 0); + private static final String PATTERN = AppPreferences.getInstance().getPatchPattern("ES", 2, 0); private List findings; private final byte[] where; diff --git a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs3.java b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs3.java index ecc8149..e287ef0 100644 --- a/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs3.java +++ b/src/main/java/nsusbloader/Utilities/patches/es/finders/HeuristicEs3.java @@ -27,8 +27,8 @@ import nsusbloader.Utilities.patches.SimplyFind; import java.util.List; class HeuristicEs3 extends AHeuristic { - private static final String PATTERN0 = AppPreferences.getInstance().getPatchOffset("ES", 3, 0); - private static final String PATTERN1 = AppPreferences.getInstance().getPatchOffset("ES", 3, 1); + private static final String PATTERN0 = AppPreferences.getInstance().getPatchPattern("ES", 3, 0); + private static final String PATTERN1 = AppPreferences.getInstance().getPatchPattern("ES", 3, 1); private final List findings; private final byte[] where; diff --git a/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs1.java b/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs1.java index d5e6f67..a74c5d1 100644 --- a/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs1.java +++ b/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs1.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; class HeuristicFs1 extends AHeuristic { - private static final String PATTERN = AppPreferences.getInstance().getPatchOffset("FS", 1, 0); // TBZ + private static final String PATTERN = AppPreferences.getInstance().getPatchPattern("FS", 1, 0); // TBZ private final byte[] where; private final List findings; diff --git a/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs2.java b/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs2.java index bc8f5c8..a6e8ba9 100644 --- a/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs2.java +++ b/src/main/java/nsusbloader/Utilities/patches/fs/finders/HeuristicFs2.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; class HeuristicFs2 extends AHeuristic { - private static final String PATTERN = AppPreferences.getInstance().getPatchOffset("FS", 2, 0); + private static final String PATTERN = AppPreferences.getInstance().getPatchPattern("FS", 2, 0); private final byte[] where; private final List findings;