Vincent Breitmoser 2b5023a75d Merge branch 'development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

2015-03-08 01:49:22 +01:00

..

exception

Replace many PgpGeneralExceptions with PgpKeyNotFoundException

2014-10-09 01:37:44 +02:00

linked

prepare superclass extraction for final linked id creation fragment

2015-03-06 16:24:48 +01:00

CanonicalizedKeyRing.java

ignore revoked user ids for primary key expiry

2015-02-26 18:52:54 +01:00

CanonicalizedPublicKey.java

ignore revoked user ids for primary key expiry

2015-02-26 18:52:54 +01:00

CanonicalizedPublicKeyRing.java

lift language level to java 7, and some code cleanup

2015-01-25 12:36:00 +01:00

CanonicalizedSecretKey.java

add support for certification of user attributes

2015-03-08 01:46:30 +01:00

CanonicalizedSecretKeyRing.java

Better selection of preferred algorithm

2015-03-05 10:49:57 +01:00

KeyRing.java

Replace many PgpGeneralExceptions with PgpKeyNotFoundException

2014-10-09 01:37:44 +02:00

OpenPgpSignatureResultBuilder.java

split up and mark unsafe expiry-related methods

2015-02-26 18:53:42 +01:00

PassphraseCacheInterface.java

passphrasecache: cache by master key, introduce preference for cache by subkey

2014-09-23 15:56:48 +02:00

PgpConstants.java

Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator

2015-03-05 23:29:43 +01:00

PgpDecryptVerify.java

Check for insecure hash and symmetric encryption algos on decrypt

2015-03-05 17:46:43 +01:00

PgpHelper.java

Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists

2015-03-05 16:57:57 +01:00

PgpKeyOperation.java

Use static linked lists instead of arrays

2015-03-05 17:24:56 +01:00

PgpSignEncryptInput.java

Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists

2015-03-05 16:57:57 +01:00

PgpSignEncryptOperation.java

Use ArrayList instead of LinkedList

2015-03-05 17:59:53 +01:00

Progressable.java

prevent cancel dring consolidate, move logic into progressable

2014-10-26 22:00:57 +01:00

SignEncryptParcel.java

rewrite PgpSignEncrypt data flow

2015-02-01 23:14:26 +01:00

UncachedKeyRing.java

rewrite PgpSignEncrypt data flow

2015-02-01 23:14:26 +01:00

UncachedPublicKey.java

NON-WORKING Merge branch 'development' into linked-identities

2015-03-02 14:39:28 +01:00

UncachedSecretKey.java

…

WrappedSignature.java

ignore revoked user ids for primary key expiry

2015-02-26 18:52:54 +01:00

WrappedUserAttribute.java

do a TON of UI work

2015-03-05 01:58:36 +01:00