open-keychain

Files

Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java

2015-03-24 13:19:43 +01:00

results

actually promote to divert, pass yubikey's AID

2015-03-22 03:58:01 +01:00

BaseOperation.java

New Passphrase class for safer passphrase handling in memory

2015-03-19 03:03:46 +01:00

CertifyOperation.java

more data in RequiredInputParcel, OperationResult notifications

2015-03-21 15:16:32 +01:00

DeleteOperation.java

Add missing license headers