diff options
| author | Kenny Root <kenny@the-b.org> | 2009-12-20 19:52:49 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2009-12-20 19:52:49 +0000 |
| commit | 70e9677ced7410568297ec817dd4701d63ff2aad (patch) | |
| tree | 28593f717dcb7a6ea143e1c087373e286c5d3aae | |
| parent | ba331216308cf87c8d0b0a2effe7f7bb5d2eb933 (diff) | |
| download | connectbot-70e9677ced7410568297ec817dd4701d63ff2aad.tar.gz connectbot-70e9677ced7410568297ec817dd4701d63ff2aad.tar.bz2 connectbot-70e9677ced7410568297ec817dd4701d63ff2aad.zip | |
Switch pref of interactive and password methods
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@451 df292f66-193f-0410-a5fc-6d59da041ff2
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/org/connectbot/transport/SSH.java | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9bd26e8..964bd20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="226"> + android:versionCode="227"> <application android:icon="@drawable/icon" 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)); } |