Fix code smells

RetGal · Nov 3, 2023 · ff0c34b · ff0c34b
1 parent 9af4d4f
commit ff0c34b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/mpo/dayon/assistant/gui/Assistant.java b/src/main/java/mpo/dayon/assistant/gui/Assistant.java
@@ -211,7 +211,7 @@ public void actionPerformed(ActionEvent ev) {
                         frame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                         try {
                             publicIp = UPnP.getExternalIP();
-                            if (publicIp == null || publicIp.startsWith("192.168") || publicIp.startsWith("10.")) {
+                            if (isValidPublicIp()) {
                                 final URL url = new URL(WHATSMYIP_SERVER_URL);
                                 try (final BufferedReader lines = new BufferedReader(new InputStreamReader(url.openStream()))) {
                                     publicIp = lines.readLine();
@@ -264,6 +264,10 @@ public void actionPerformed(ActionEvent ev) {
 
                 choices.setLocation(choicesLocation.x - xOffset, choicesLocation.y + yOffset);
             }
+
+            private boolean isValidPublicIp() {
+                return ! (publicIp == null || publicIp.startsWith("192.168") || publicIp.startsWith("10."));
+            }
         };
         ip.putValue("DISPLAY_NAME", "127.0.0.1"); // always a selection
         // ...

diff --git a/src/main/java/mpo/dayon/common/Runner.java b/src/main/java/mpo/dayon/common/Runner.java
@@ -114,6 +114,9 @@ static File getOrCreateAppHomeDir() {
     }
 
     static void prepareKeystore(File appHomeDir) {
+        if (appHomeDir == null) {
+            Log.error("Skipping keystore creation, application directory is missing!");
+        }
         Path keystore = Paths.get(format("%s%skeystore.jks", appHomeDir.getAbsolutePath(), File.separator));
         if (!Files.exists(keystore)) {
             Log.info(format("Creating new keystore [%s]", keystore));

diff --git a/src/main/java/mpo/dayon/common/security/CustomTrustManager.java b/src/main/java/mpo/dayon/common/security/CustomTrustManager.java
@@ -26,10 +26,12 @@ public X509Certificate[] getAcceptedIssuers() {
 
 	@Override
 	public void checkServerTrusted(X509Certificate[] chain, String authType) {
+		// we want to trust our self-signed certificates
 	}
 
 	@Override
 	public void checkClientTrusted(X509Certificate[] chain, String authType) {
+		// we want to trust our self-signed certificates
 	}
 
 	@java.lang.SuppressWarnings("squid:S6437") // pro forma password, without security relevance