aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-07-17 15:28:08 -0700
committerKenny Root <kenny@the-b.org>2015-07-17 15:28:08 -0700
commitad15d09a0734adc07324cba10527407c91c3d9b5 (patch)
tree3d54c9d6cfa0fad263e977e2c7dfc85a77d6e9f4 /app/src/main/java
parent86a528877cca24af39896ce01dedccd83f9aaf22 (diff)
parent97a73ae7ef79f4fec6e39c6eedd327a3e74d244d (diff)
downloadconnectbot-ad15d09a0734adc07324cba10527407c91c3d9b5.tar.gz
connectbot-ad15d09a0734adc07324cba10527407c91c3d9b5.tar.bz2
connectbot-ad15d09a0734adc07324cba10527407c91c3d9b5.zip
Merge pull request #102 from kruton/master
Fix some lint issues and add coverage reports
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/org/connectbot/transport/SSH.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/app/src/main/java/org/connectbot/transport/SSH.java b/app/src/main/java/org/connectbot/transport/SSH.java
index 1a7ef91..4bad2f1 100644
--- a/app/src/main/java/org/connectbot/transport/SSH.java
+++ b/app/src/main/java/org/connectbot/transport/SSH.java
@@ -193,15 +193,17 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC
// Users have no way to delete keys, so we'll prompt them for now.
result = bridge.promptHelper.requestBooleanPrompt(null, manager.res.getString(R.string.prompt_continue_connecting));
- if (result == null) return false;
- if (result.booleanValue()) {
+ if (result != null && result.booleanValue()) {
// save this key in known database
manager.hostdb.saveKnownHost(hostname, port, serverHostKeyAlgorithm, serverHostKey);
+ return true;
+ } else {
+ return false;
}
- return result.booleanValue();
- default:
- return false;
+ default:
+ bridge.outputLine(manager.res.getString(R.string.terminal_failed, algorithmName, fingerprint));
+ return false;
}
}