aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0537-340/+214
|\
| * Clean up keyimport.ImportKeysListEntryTim Bray2014-06-052-67/+66
| * Merge pull request #645 from timbray/masterDominik Schürmann2014-06-052-7/+4
| |\
| | * Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | * fixed error messageTim Bray2014-06-042-4/+3
| * | 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
| |/
* | Show keys with android contactsmar-v-in2014-06-055-8/+111
* | Make keylist case insensitivemar-v-in2014-06-051-3/+3
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0449-1662/+2686
|\|
| * Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-026-60/+51
| |\
| * | 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-2117-186/+316
| |\ \
| * | | 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
| * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-1472-1048/+2531
| |\ \ \
| * | | | wrapped-key-ring: remove more unneeded methodsVincent Breitmoser2014-05-043-112/+4
| * | | | wrapped-key-ring: get rid of bc objects in key editorVincent Breitmoser2014-05-0410-100/+98
| * | | | wrapped-key-ring: more work on passphrase caching and certificationVincent Breitmoser2014-05-044-98/+56
| * | | | wrapped-key-ring: introduce Uncached*Key objectsVincent Breitmoser2014-05-045-129/+179
| * | | | wrapped-key-ring: redesign underlying CachedKeyRingVincent Breitmoser2014-05-046-191/+153
| * | | | wrapped-key-ring: cached data revampVincent Breitmoser2014-05-041-33/+37
| * | | | wrapped-key-ring: view certifyVincent Breitmoser2014-05-042-17/+18
| * | | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-046-87/+61
| * | | | wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentSer...Vincent Breitmoser2014-05-0313-269/+208
| * | | | wrapped-key-ring: small fix to make it work againVincent Breitmoser2014-05-032-14/+12
| * | | | wrapped-key-ring: forgot to add UncachedKeyRing classVincent Breitmoser2014-05-031-0/+29
| * | | | wrapped-key-ring: move more helper methods into keysVincent Breitmoser2014-05-035-15/+153
| * | | | wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-037-125/+118
| * | | | certification is always done with the master keyVincent Breitmoser2014-05-032-56/+1
| * | | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and si...Vincent Breitmoser2014-05-0312-320/+744
* | | | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
* | | | | First version of automatic contact discovery.mar-v-in2014-06-044-0/+311
* | | | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
* | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:15:50 +0000