aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* import-log: add LogDisplay activityVincent Breitmoser2014-06-103-4/+107
* import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
* canonicalize: first step(s)Vincent Breitmoser2014-06-103-3/+66
* import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-105-98/+251
* import-log: better stripped key loggingVincent Breitmoser2014-06-063-16/+41
* import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
* import-log: add log statements in import routineVincent Breitmoser2014-06-062-97/+225
* import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-062-10/+37
* import-log: add parcelable prototypeVincent Breitmoser2014-06-051-0/+123
* ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
* fix bug with bad verifying master keysVincent Breitmoser2014-06-041-3/+3
* do respect expectedFingerprint during key importVincent Breitmoser2014-06-042-9/+18
* neatness refactoringVincent Breitmoser2014-06-0433-241/+118
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-026-60/+51
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-236-37/+25
* | wrapped-key-ring: add documentationVincent Breitmoser2014-06-027-7/+83
* | make everything work againVincent Breitmoser2014-06-023-8/+22
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-029-183/+119
* | wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-029-61/+75
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-2716-356/+595
* | introduce new SaveKeyringParcelVincent Breitmoser2014-05-271-0/+113
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-274-14/+19
* | fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-272-4/+9
* | wrapped-key-ring: forgot a part in PgpDecryptVerifyVincent Breitmoser2014-05-231-2/+9
* | introduce WrappedSignature for the ViewCert* ui codeVincent Breitmoser2014-05-233-31/+149
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-238-101/+126
* | wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-223-18/+27
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2116-186/+300
|\|
| * Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
| |\
| | * Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| | * Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| | * Add highlighting to keyserver/keybase searchThialfihar2014-05-165-5/+75
| | * Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
| * | Rename KeyServer to KeyserverDominik Schürmann2014-05-189-38/+34
| |/
| * keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
| * keybase now has key info in search outputTim Bray2014-05-151-0/+5
| * JWalk javadocsTim Bray2014-05-141-0/+48
| * Rename fingerPrint to fingerprintThialfihar2014-05-145-16/+16
| * Add github, twitter, website info for keybase keysThialfihar2014-05-141-0/+17
| * Cleanup keybase query a bitThialfihar2014-05-141-15/+14
| * Don't guess keybase key algorithm and sizeThialfihar2014-05-142-5/+8
| * Add extraData property in ImportKeyListEntryThialfihar2014-05-143-8/+20
| * List full keybase id or strong key id matches on topThialfihar2014-05-141-1/+10
| * Make keybase lookup works for key ids starting with 0xThialfihar2014-05-141-1/+6
* | wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-217-42/+44
* | use long rather than String to build uris by keyVincent Breitmoser2014-05-2113-37/+33
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-2123-211/+370