aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Show keys with android contactsmar-v-in2014-06-058-11/+119
| | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
* Make keylist case insensitivemar-v-in2014-06-051-3/+3
| | | | You want "michael" to be next to "Michael", don't you?
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-04145-2380/+4013
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0299-712/+1368
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-317-63/+54
| | |\
| | * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| | | |
| * | | 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 ↵Vincent Breitmoser2014-06-029-183/+119
| | | | | | | | | | | | | | | | ImportKeysListEntry
| * | | 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
| | | |
| * | | update unit test support in build filesVincent Breitmoser2014-05-273-69/+12
| | | |
| * | | 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-2127-253/+375
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | 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-14439-1993/+4652
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * | | | 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 ↵Vincent Breitmoser2014-05-0314-269/+209
| | | | | | | | | | | | | | | | | | | | KeychainIntentService!
| * | | | 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 ↵Vincent Breitmoser2014-05-0312-320/+744
| | | | | | | | | | | | | | | | | | | | signencrypt
* | | | | 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-049-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
* | | | | 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
| | | | |
* | | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
|\ \ \ \ \
| * | | | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
| * | | | | Add hkps supportmar-v-in2014-05-271-9/+37
| | | | | |
* | | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
| | | | | |
* | | | | | Make abstract methods in Keyserver public (implementations make them public ↵mar-v-in2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | anyway)
* | | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 13:00:55 +0000