From 70e9677ced7410568297ec817dd4701d63ff2aad Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Sun, 20 Dec 2009 19:52:49 +0000 Subject: Switch pref of interactive and password methods git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@451 df292f66-193f-0410-a5fc-6d59da041ff2 --- src/org/connectbot/transport/SSH.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/org') diff --git a/src/org/connectbot/transport/SSH.java b/src/org/connectbot/transport/SSH.java index 3e6d62b..fa1d248 100644 --- a/src/org/connectbot/transport/SSH.java +++ b/src/org/connectbot/transport/SSH.java @@ -252,6 +252,15 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC } pubkeysExhausted = true; + } else if(connection.isAuthMethodAvailable(host.getUsername(), AUTH_KEYBOARDINTERACTIVE)) { + // this auth method will talk with us using InteractiveCallback interface + // it blocks until authentication finishes + bridge.outputLine(manager.res.getString(R.string.terminal_auth_ki)); + if(connection.authenticateWithKeyboardInteractive(host.getUsername(), this)) { + finishConnection(); + } else { + bridge.outputLine(manager.res.getString(R.string.terminal_auth_ki_fail)); + } } else if (connection.isAuthMethodAvailable(host.getUsername(), AUTH_PASSWORD)) { bridge.outputLine(manager.res.getString(R.string.terminal_auth_pass)); String password = bridge.getPromptHelper().requestStringPrompt(null, @@ -262,15 +271,6 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC } else { bridge.outputLine(manager.res.getString(R.string.terminal_auth_pass_fail)); } - } else if(connection.isAuthMethodAvailable(host.getUsername(), AUTH_KEYBOARDINTERACTIVE)) { - // this auth method will talk with us using InteractiveCallback interface - // it blocks until authentication finishes - bridge.outputLine(manager.res.getString(R.string.terminal_auth_ki)); - if(connection.authenticateWithKeyboardInteractive(host.getUsername(), this)) { - finishConnection(); - } else { - bridge.outputLine(manager.res.getString(R.string.terminal_auth_ki_fail)); - } } else { bridge.outputLine(manager.res.getString(R.string.terminal_auth_fail)); } -- cgit v1.2.3