aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyYubiKeyImportFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-6/+5
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-8/+8
|
* merged servicesAdithya Abraham Philip2015-06-011-3/+2
|
* shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperationVincent Breitmoser2015-05-281-7/+8
|
* Fix language based on feedback from transifexDominik Schürmann2015-05-211-1/+1
|
* yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-171-2/+8
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* Rename for consistencyDominik Schürmann2015-05-061-0/+262