aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-03 15:19:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-03 15:19:49 +0200
commitc3091c2b5dbe350d7f7ed122f13ee5770efe2c33 (patch)
tree91d5eb3ea7c01ed3a3cb6e5d20198523e87be892
parent04b0425d45574cdf86219898ea25ce15c33341a7 (diff)
downloadopen-keychain-c3091c2b5dbe350d7f7ed122f13ee5770efe2c33.tar.gz
open-keychain-c3091c2b5dbe350d7f7ed122f13ee5770efe2c33.tar.bz2
open-keychain-c3091c2b5dbe350d7f7ed122f13ee5770efe2c33.zip
Changelog
-rw-r--r--CHANGELOG6
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java2
-rw-r--r--OpenPGP-Keychain/src/main/res/raw/help_changelog.html2
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e7f4c567a..45ad2e98c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+2.5
+* fix decryption of symmetric pgp messages/files
+* refactored edit key screen (thanks to Ash Hughes)
+* new modern design for encrypt/decrypt screens
+* OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+
2.4
Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index dc19bc5bb..fa673f695 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -373,7 +373,7 @@ public class OpenPgpService extends RemoteService {
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);
// TODO: also return PendingIntent that opens the key view activity
-
+
return result;
}
} catch (Exception e) {
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
index 221705579..64a91e5f1 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
@@ -9,8 +9,8 @@ And don't add newlines before or after p tags because of transifex -->
<ul>
<li>fix decryption of symmetric pgp messages/files</li>
<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
<li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
</ul>
<h2>2.4</h2>