Removed obsolete "Cryptography Strength" dialog; minor code improvements

kaikramer · Jan 6, 2024 · 864d674 · 864d674
1 parent 8e67d6e
commit 864d674
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 385 deletions.
diff --git a/kse/src/main/java/org/kse/gui/KseFrame.java b/kse/src/main/java/org/kse/gui/KseFrame.java
@@ -105,7 +105,6 @@
 import org.kse.gui.actions.CopyAction;
 import org.kse.gui.actions.CopyKeyPairAction;
 import org.kse.gui.actions.CopyTrustedCertificateAction;
-import org.kse.gui.actions.CryptographyStrengthAction;
 import org.kse.gui.actions.CutAction;
 import org.kse.gui.actions.CutKeyPairAction;
 import org.kse.gui.actions.CutTrustedCertificateAction;
@@ -470,7 +469,6 @@ public final class KseFrame implements StatusBar {
     private final CheckUpdateAction checkUpdateAction = new CheckUpdateAction(this);
     private final SecurityProvidersAction securityProvidersAction = new SecurityProvidersAction(this);
     private final SystemInformationAction systemInformationAction = new SystemInformationAction(this);
-    private final CryptographyStrengthAction cryptographyStrengthAction = new CryptographyStrengthAction(this);
     private final JarsAction jarsAction = new JarsAction(this);
     private final AboutAction aboutAction = new AboutAction(this);
     private final KeyPairCertificateChainDetailsAction keyPairCertificateChainDetailsAction =
@@ -1073,14 +1071,6 @@ private void initMenu() {
                                    (String) securityProvidersAction.getValue(Action.LONG_DESCRIPTION), this);
         jmHelp.add(jmiSecurityProviders);
 
-        jmiCryptographyStrength = new JMenuItem(cryptographyStrengthAction);
-        PlatformUtil.setMnemonic(jmiCryptographyStrength,
-                                 res.getString("KseFrame.jmiCryptographyStrength.mnemonic").charAt(0));
-        jmiCryptographyStrength.setToolTipText(null);
-        new StatusBarChangeHandler(jmiCryptographyStrength,
-                                   (String) cryptographyStrengthAction.getValue(Action.LONG_DESCRIPTION), this);
-        jmHelp.add(jmiCryptographyStrength);
-
         jmiJars = new JMenuItem(jarsAction);
         PlatformUtil.setMnemonic(jmiJars, res.getString("KseFrame.jmiJars.mnemonic").charAt(0));
         jmiJars.setToolTipText(null);

diff --git a/kse/src/main/java/org/kse/gui/actions/CloseAction.java b/kse/src/main/java/org/kse/gui/actions/CloseAction.java
@@ -109,9 +109,7 @@ public boolean closeKeyStore(KeyStoreHistory history) {
 
     private boolean needSave(KeyStoreState state) {
         if (state != null) {
-            if (!state.isSavedState() && !state.isInitialState()) {
-                return true;
-            }
+            return !state.isSavedState() && !state.isInitialState();
         }
         return false;
     }

diff --git a/kse/src/main/java/org/kse/gui/actions/CryptographyStrengthAction.java b/kse/src/main/java/org/kse/gui/actions/CryptographyStrengthAction.java
diff --git a/kse/src/main/java/org/kse/gui/actions/DetectFileTypeAction.java b/kse/src/main/java/org/kse/gui/actions/DetectFileTypeAction.java
@@ -85,8 +85,7 @@ protected void doAction() {
 
             CryptoFileType fileType = CryptoFileUtil.detectFileType(detectTypeFile);
 
-            String message = null;
-
+            String message;
             if (fileType != null) {
                 message = MessageFormat.format(res.getString("DetectFileTypeAction.DetectedFileType.message"),
                                                detectTypeFile.getName(), fileType.friendly());

diff --git a/kse/src/main/java/org/kse/gui/actions/ExamineClipboardAction.java b/kse/src/main/java/org/kse/gui/actions/ExamineClipboardAction.java
@@ -79,7 +79,7 @@
  */
 public class ExamineClipboardAction extends KeyStoreExplorerAction {
 
-    private static ResourceBundle resExt = ResourceBundle.getBundle("org/kse/gui/dialogs/extensions/resources");
+    private static final ResourceBundle resExt = ResourceBundle.getBundle("org/kse/gui/dialogs/extensions/resources");
 
     private static final long serialVersionUID = -4374420674229658652L;
 
@@ -211,23 +211,22 @@ private static byte[] decodeIfBase64(String data) {
     }
 
     private boolean isRedirect(int status) {
-		// normally, 3xx is redirect
-    	if (status != HttpURLConnection.HTTP_OK) {
-			if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM
-					|| status == HttpURLConnection.HTTP_SEE_OTHER)
-				return true;
-		}
-    	return false;
+        // normally, 3xx is redirect
+        if (status != HttpURLConnection.HTTP_OK) {
+            return status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM ||
+                   status == HttpURLConnection.HTTP_SEE_OTHER;
+        }
+        return false;
     }
 
     private void downloadCrl(URL url) throws IOException, CryptoException {
-    	HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
-		int status = urlConn.getResponseCode();
-		if (isRedirect(status)) {
-			String newUrl = urlConn.getHeaderField("Location");
-			url = new URL(newUrl);
-			urlConn = (HttpURLConnection) url.openConnection();
-		}
+        HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+        int status = urlConn.getResponseCode();
+        if (isRedirect(status)) {
+            String newUrl = urlConn.getHeaderField("Location");
+            url = new URL(newUrl);
+            urlConn = (HttpURLConnection) url.openConnection();
+        }
         try (InputStream is = urlConn.getInputStream()) {
             X509CRL crl = X509CertUtil.loadCRL(IOUtils.toByteArray(is));
             if (crl != null) {
@@ -262,7 +261,7 @@ private void downloadCert(URL url) throws IOException, CryptoException {
 
     private void showPrivateKey(byte[] data, CryptoFileType fileType) throws IOException, CryptoException {
         PrivateKey privKey = null;
-        Password password = null;
+        Password password;
         PrivateKeyFormat format = null;
 
         switch (fileType) {
@@ -320,7 +319,7 @@ private Password getPassword() {
         return dGetPassword.getPassword();
     }
 
-    private void showPublicKey(byte[] data) throws IOException, CryptoException {
+    private void showPublicKey(byte[] data) throws CryptoException {
         PublicKey publicKey = OpenSslPubUtil.load(data);
 
         DViewPublicKey dViewPublicKey = new DViewPublicKey(frame, res.getString(

diff --git a/kse/src/main/java/org/kse/gui/actions/GenerateDHParametersAction.java b/kse/src/main/java/org/kse/gui/actions/GenerateDHParametersAction.java
@@ -79,8 +79,6 @@ protected void doAction() {
 
     /**
      * Generate DH Parameters in the currently opened KeyStore.
-     *
-     * @return Does not return any value
      */
     public void generateDHParameters() {
 

diff --git a/kse/src/main/java/org/kse/gui/actions/GenerateKeyPairAction.java b/kse/src/main/java/org/kse/gui/actions/GenerateKeyPairAction.java
@@ -52,7 +52,7 @@
 public class GenerateKeyPairAction extends KeyStoreExplorerAction implements HistoryAction {
     private static final long serialVersionUID = 1L;
 
-    private KseFrame kseFrame;
+    private final KseFrame kseFrame;
     /**
      * Construct action.
      *

diff --git a/kse/src/main/java/org/kse/gui/actions/ImportTrustedCertificateAction.java b/kse/src/main/java/org/kse/gui/actions/ImportTrustedCertificateAction.java
@@ -47,7 +47,7 @@
  */
 public class ImportTrustedCertificateAction extends AuthorityCertificatesAction implements HistoryAction {
     private static final long serialVersionUID = 1L;
-    private X509Certificate trustCertFromConstructor;
+    private final X509Certificate trustCertFromConstructor;
     private File certFile;
 
     /**

diff --git a/kse/src/main/java/org/kse/gui/actions/OpenAction.java b/kse/src/main/java/org/kse/gui/actions/OpenAction.java
@@ -121,7 +121,7 @@ public void openKeyStore(File keyStoreFile, String defaultPassword) {
             // use (optional) default password for first try
             Password password = (defaultPassword != null) ? new Password(defaultPassword.toCharArray()) : null;
 
-            KeyStore openedKeyStore = null;
+            KeyStore openedKeyStore;
             boolean firstTry = true;
             while (true) {
 

diff --git a/kse/src/main/java/org/kse/gui/actions/PreferencesAction.java b/kse/src/main/java/org/kse/gui/actions/PreferencesAction.java
@@ -40,7 +40,7 @@
  */
 public class PreferencesAction extends ExitAction {
     private static final long serialVersionUID = 1L;
-    private KseFrame kseFrame;
+    private final KseFrame kseFrame;
 
     /**
      * Construct action.

diff --git a/kse/src/main/java/org/kse/gui/actions/RedoAction.java b/kse/src/main/java/org/kse/gui/actions/RedoAction.java
@@ -35,7 +35,7 @@
  */
 public class RedoAction extends KeyStoreExplorerAction {
     private static final long serialVersionUID = 1L;
-    private String defaultName;
+    private final String defaultName;
 
     /**
      * Construct action.

diff --git a/kse/src/main/java/org/kse/gui/actions/UndoAction.java b/kse/src/main/java/org/kse/gui/actions/UndoAction.java
@@ -35,7 +35,7 @@
  */
 public class UndoAction extends KeyStoreExplorerAction {
     private static final long serialVersionUID = 1L;
-    private String defaultName;
+    private final String defaultName;
 
     /**
      * Construct action.