Convert to local variables initialized when prompt is displayed on main thread.

Author: dkocher

osx/src/main/java/ch/cyberduck/ui/cocoa/callback/PromptPasswordCallback.java

@@ -16,9 +16,7 @@
  */
 
 import ch.cyberduck.binding.ProxyController;
-import ch.cyberduck.binding.application.NSControl;
 import ch.cyberduck.binding.application.SheetCallback;
-import ch.cyberduck.binding.foundation.NSNotification;
 import ch.cyberduck.core.Credentials;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.LoginOptions;
@@ -43,7 +41,6 @@ public void close(final String input) {
             return;
         }
         alert.setPasswordFieldText(input);
-        alert.passwordFieldTextDidChange(NSNotification.notificationWithName(NSControl.NSControlTextDidChangeNotification, input));
         alert.closeSheetWithOption(SheetCallback.ALTERNATE_OPTION);
     }
 

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/LoginController.java

@@ -61,15 +61,14 @@ public class LoginController extends AlertController {
     private final LoginOptions options;
 
     @Outlet
-    private final NSTextField usernameField = NSTextField.textFieldWithString(StringUtils.EMPTY);
+    private NSTextField usernameField = NSTextField.textFieldWithString(StringUtils.EMPTY);
     @Outlet
-    private final NSTextField passwordField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
+    private NSTextField passwordField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
     @Outlet
-    private final NSPopUpButton privateKeyPopup = NSPopUpButton.buttonPullsDown(false);
+    private NSPopUpButton privateKeyPopup = NSPopUpButton.buttonPullsDown(false);
     @Outlet
     private NSOpenPanel privateKeyOpenPanel;
 
-
     public LoginController(final Host bookmark, final String title, final String reason, final LoginOptions options) {
         super(new LoginInputValidator(bookmark, options));
         this.bookmark = bookmark;
@@ -102,6 +101,7 @@ public NSAlert loadAlert() {
     public NSView getAccessoryView(final NSAlert alert) {
         final NSView accessoryView = NSView.create();
         if(options.publickey) {
+            privateKeyPopup = NSPopUpButton.buttonPullsDown(false);
             privateKeyPopup.setTarget(this.id());
             privateKeyPopup.setAction(Foundation.selector("privateKeyPopupClicked:"));
             privateKeyPopup.removeAllItems();
@@ -130,6 +130,7 @@ public NSView getAccessoryView(final NSAlert alert) {
             this.addAccessorySubview(accessoryView, privateKeyPopup);
         }
         if(options.password) {
+            passwordField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
             this.updateField(passwordField, bookmark.getCredentials().getPassword());
             passwordField.cell().setPlaceholderString(options.getPasswordPlaceholder());
             NSNotificationCenter.defaultCenter().addObserver(this.id(),
@@ -139,6 +140,7 @@ public NSView getAccessoryView(final NSAlert alert) {
             this.addAccessorySubview(accessoryView, passwordField);
         }
         if(options.user) {
+            usernameField = NSTextField.textFieldWithString(StringUtils.EMPTY);
             this.updateField(usernameField, bookmark.getCredentials().getUsername());
             usernameField.cell().setPlaceholderString(options.getUsernamePlaceholder());
             NSNotificationCenter.defaultCenter().addObserver(this.id(),

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PasswordController.java

@@ -41,11 +41,12 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.rococoa.Foundation;
+import org.rococoa.Rococoa;
 
 public class PasswordController extends AlertController {
 
     @Outlet
-    private final NSTextField inputField;
+    private NSTextField inputField;
 
     private final Host bookmark;
     private final Credentials credentials;
@@ -59,12 +60,6 @@ public PasswordController(final Host bookmark, final Credentials credentials, fi
         this.title = title;
         this.reason = reason;
         this.options = options;
-        if(options.password) {
-            this.inputField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
-        }
-        else {
-            this.inputField = NSTextField.textFieldWithString(StringUtils.EMPTY);
-        }
     }
 
     @Override
@@ -106,6 +101,12 @@ public void passwordFieldTextDidChange(final NSNotification notification) {
 
     @Override
     public NSView getAccessoryView(final NSAlert alert) {
+        if(options.password) {
+            inputField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
+        }
+        else {
+            inputField = NSTextField.textFieldWithString(StringUtils.EMPTY);
+        }
         final NSView accessoryView = NSView.create();
         inputField.cell().setPlaceholderString(options.getPasswordPlaceholder());
         NSNotificationCenter.defaultCenter().addObserver(this.id(),
@@ -117,7 +118,7 @@ public NSView getAccessoryView(final NSAlert alert) {
     }
 
     public void setPasswordFieldText(final String input) {
-        inputField.setStringValue(input);
+        credentials.setPassword(input);
     }
 
     @Override

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java

@@ -46,11 +46,11 @@ public class VaultController extends FolderController {
     private final Callback callback;
 
     @Outlet
-    private final NSSecureTextField passwordField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
+    private NSSecureTextField passwordField;
     @Outlet
-    private final NSSecureTextField confirmField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
+    private NSSecureTextField confirmField;
     @Outlet
-    private final NSLevelIndicator strengthIndicator = NSLevelIndicator.levelIndicatorWithFrame(new NSRect(0, 18));
+    private NSLevelIndicator strengthIndicator;
 
     private final NSNotificationCenter notificationCenter
             = NSNotificationCenter.defaultCenter();
@@ -87,15 +87,17 @@ public void passwordFieldTextDidChange(final NSNotification notification) {
 
     public NSView getAccessoryView(final NSAlert alert) {
         final NSView accessoryView = NSView.create();
+        confirmField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
         confirmField.cell().setPlaceholderString(LocaleFactory.localizedString("Confirm Passphrase", "Cryptomator"));
         this.addAccessorySubview(accessoryView, confirmField);
 
+        strengthIndicator = NSLevelIndicator.levelIndicatorWithFrame(new NSRect(0, 18));
         strengthIndicator.setTickMarkPosition(1);
         if(strengthIndicator.respondsToSelector(Foundation.selector("setLevelIndicatorStyle:"))) {
             strengthIndicator.setLevelIndicatorStyle(NSLevelIndicator.NSDiscreteCapacityLevelIndicatorStyle);
         }
         this.addAccessorySubview(accessoryView, strengthIndicator);
-
+        passwordField = NSSecureTextField.textFieldWithString(StringUtils.EMPTY);
         passwordField.cell().setPlaceholderString(LocaleFactory.localizedString("Passphrase", "Cryptomator"));
         notificationCenter.addObserver(this.id(),
                 Foundation.selector("passwordFieldTextDidChange:"),