aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/org/connectbot/transport/SSH.java18
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));
}