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 | |
| parent | d0e73184b960283ea7db3f905170d49160f010f8 (diff) | |
| parent | 4a5c1d379cfc7d7a2555b38c93149519e357c6db (diff) | |
| download | connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.gz connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.tar.bz2 connectbot-44d5321ada8fce87ee56747c83b4c2b59b6b20f1.zip | |
Merge branch 'master' into gradle-conversion
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/bean/PubkeyBean.java | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c563ed..5e7991a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] + +## [1.8.4][1.8.4] - 2015-04-19 ### Fixed - Key exchange and host key algorithm preference order was not being respected. @@ -19,7 +21,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - All addresses for a particular host will be tried when connecting (including IPv6). -## [1.8.3][1.8.3] - 2014-04-02 +## [1.8.3][1.8.3] - 2015-04-02 ### Fixed - Only enable EC support when the device supports it. - Default font size scales with the device display density. @@ -27,5 +29,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Color picker color numbers are now localized -[unreleased]: https://github.com/connectbot/connectbot/compare/v1.8.3...HEAD +[unreleased]: https://github.com/connectbot/connectbot/compare/v1.8.4...HEAD +[1.8.4]: https://github.com/connectbot/connectbot/compare/v1.8.3...v1.8.4 [1.8.3]: https://github.com/connectbot/connectbot/compare/v1.8.2...v1.8.3 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 "); |