determine whether the wallet lock screen requires a password from the storage encryption key on each lock and unlock

### src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java
@@ -2,6 +2,7 @@
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.SecureString;
+import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
@@ -190,6 +191,7 @@ private void initializeLockScreen() {
     }
 
     private void unlockWallet(CustomPasswordField passwordField) {
+        updateWalletEncryptedStatus();
         if(walletEncryptedProperty.get()) {
             String walletId = walletForm.getWalletId();
             SecureString password = new SecureString(passwordField.getText());
@@ -221,11 +223,8 @@ private void unlockWallet() {
     }
 
     private void updateWalletEncryptedStatus() {
-        try {
-            walletEncryptedProperty.set(getWalletForm().getStorage().isEncrypted());
-        } catch(IOException e) {
-            log.warn("Error determining if wallet is locked", e);
-        }
+        ECKey encryptionPubKey = getWalletForm().getStorage().getEncryptionPubKey();
+        walletEncryptedProperty.set(encryptionPubKey != null && !Storage.NO_PASSWORD_KEY.equals(encryptionPubKey));
     }
 
     @Subscribe
@@ -235,13 +234,6 @@ public void walletAddressesChanged(WalletAddressesChangedEvent event) {
         }
     }
 
-    @Subscribe
-    public void walletSettingsChanged(WalletSettingsChangedEvent event) {
-        if(event.getWalletId().equals(walletForm.getWalletId())) {
-            Platform.runLater(this::updateWalletEncryptedStatus);
-        }
-    }
-
     @Subscribe
     public void functionAction(FunctionActionEvent event) {
         if(event.selectFunction() && event.getWallet().equals(walletForm.getWallet())) {
@@ -252,8 +244,8 @@ public void functionAction(FunctionActionEvent event) {
     @Subscribe
     public void walletLock(WalletLockEvent event) {
         if(event.getWallet().equals(walletForm.getMasterWallet())) {
+            updateWalletEncryptedStatus();
             if(lockPane == null) {
-                updateWalletEncryptedStatus();
                 initializeLockScreen();
             }