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 -->

2.4