diff options
| author | Kenny Root <kenny@the-b.org> | 2015-06-01 00:58:45 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-06-01 00:58:45 -0700 |
| commit | 44d5321ada8fce87ee56747c83b4c2b59b6b20f1 (patch) | |
| tree | ad4f46e48f8c6cf2fc7c5efe7f2401d66f3d37e7 /app | |
| parent | d0e73184b960283ea7db3f905170d49160f010f8 (diff) | |
| parent | 4a5c1d379cfc7d7a2555b38c93149519e357c6db (diff) | |
| download | connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.gz connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.bz2 connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.zip | |
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/bean/PubkeyBean.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2c9c325..71f25e7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" - android:versionName="1.8.3" - android:versionCode="373" + android:versionName="1.8.4" + android:versionCode="374" android:installLocation="auto"> <uses-sdk android:targetSdkVersion="15" android:minSdkVersion="4" /> 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 "); |