aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/bean
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-06-01 00:58:45 -0700
committerKenny Root <kenny@the-b.org>2015-06-01 00:58:45 -0700
commit44d5321ada8fce87ee56747c83b4c2b59b6b20f1 (patch)
treead4f46e48f8c6cf2fc7c5efe7f2401d66f3d37e7 /app/src/main/java/org/connectbot/bean
parentd0e73184b960283ea7db3f905170d49160f010f8 (diff)
parent4a5c1d379cfc7d7a2555b38c93149519e357c6db (diff)
downloadconnectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.gz
connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.bz2
connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/org/connectbot/bean')
-rw-r--r--app/src/main/java/org/connectbot/bean/PubkeyBean.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/org/connectbot/bean/PubkeyBean.java b/app/src/main/java/org/connectbot/bean/PubkeyBean.java
index 656c6af..faadb87 100644
--- a/app/src/main/java/org/connectbot/bean/PubkeyBean.java
+++ b/app/src/main/java/org/connectbot/bean/PubkeyBean.java
@@ -167,7 +167,7 @@ public class PubkeyBean extends AbstractBean {
if (description == null) {
final StringBuilder sb = new StringBuilder();
try {
- final PublicKey pubKey = PubkeyUtils.decodePublic(privateKey, type);
+ final PublicKey pubKey = PubkeyUtils.decodePublic(publicKey, type);
if (PubkeyDatabase.KEY_TYPE_RSA.equals(type)) {
int bits = ((RSAPublicKey) pubKey).getModulus().bitLength();
sb.append("RSA ");