aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0613-57/+580
|\ | | | | Automatic contact discovery and more
| * Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| |
| * Fixing TAG and string resourcemar-v-in2014-06-061-2/+3
| |
| * Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
| |
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0537-340/+214
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | Show keys with android contactsmar-v-in2014-06-055-8/+111
| | | | | | | | | | | | 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-0449-1662/+2686
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / /
| * | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
| | | |
| * | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-271-0/+38
| | | |
| * | | ContactHelper can read email addresses from contact listmar-v-in2014-05-261-0/+21
| | | |
* | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-064-4/+4
| | | |
* | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-062-10/+87
| |_|/ |/| |
* | | 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 result lists
| * | | 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
| | | | | | | | | | | | Closes #636
* | | 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 ↵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
| |
* | 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
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 05:46:52 +0000