Vincent Breitmoser d06ae7f691 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity ...

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

2015-05-17 01:04:22 +02:00

..

compatibility

…

keyimport

Cleanup in HkpKeyserver

2015-04-20 13:53:00 +02:00

operations

fixed sync on key import, 'me' linked contact crash

2015-05-08 19:05:21 +05:30

pgp

check for fingerprint of any subkey (arguable?)

2015-05-06 11:26:01 +02:00

provider

Cleanup

2015-05-10 11:52:39 +02:00

remote

Fixes and clarifications to app signature (or better certificate) pinning

2015-05-10 03:31:19 +02:00

service

Fix import of keyring with pub+sec key with same key id

2015-05-06 04:10:27 +02:00

ui

yubikey: don't assume signing key is masterKeyId in ViewKeyActivity

2015-05-17 01:04:22 +02:00

util

fixed sync on key import, 'me' linked contact crash

2015-05-08 19:05:21 +05:30

Constants.java

File extensions into Constants

2015-03-17 13:22:13 +01:00

KeychainApplication.java

revert unneeded changes for old temp Bluetooth share file

2015-05-04 17:15:10 -04:00