aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
Commit message (Expand)AuthorAgeFilesLines
...
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
* Upload key workingDominik Schürmann2014-08-201-0/+2
* Upload key workingDominik Schürmann2014-08-201-0/+3
* Work on upload keyDominik Schürmann2014-08-201-14/+24
* Optimize importsDominik Schürmann2014-08-051-5/+5
* Add license headersDominik Schürmann2014-08-041-0/+17
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-5/+5
* move classes around a bitVincent Breitmoser2014-08-011-97/+0
* lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
* Robots like coffee too...Dominik Schürmann2014-07-311-4/+0
* Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-311-0/+101
* Keyserver exception translateableDominik Schürmann2014-07-312-1/+8
* Smaller notesDominik Schürmann2014-07-311-0/+8
* Even better Exception handling with keyserver queriesDominik Schürmann2014-07-311-8/+10
* Exception handling with keyserver queriesDominik Schürmann2014-07-311-5/+13
* Fallback if no primary user id existsDominik Schürmann2014-07-161-1/+1
* Move sks-keyservers.net CA into assets foldermar-v-in2014-06-251-6/+4
* Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-242-0/+9
|\
| * Merge pull request #686 from mar-v-in/minidnsVincent2014-06-231-10/+11
| |\
| * \ Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-231-0/+3
| |\ \
| | * | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| * | | Fixed Issue #683 which caused OK to crash upon importing keys which contain p...Daniel Albert2014-06-231-0/+6
| |/ /
* | | Use URLEncoder instead of Uri.encodemar-v-in2014-06-241-2/+6
* | | Rewrote hkp add to work with hkps as well.mar-v-in2014-06-241-24/+13
* | | Few fixes on hkpsmar-v-in2014-06-231-4/+3
* | | Add hkps support for sks-keyservers.netmar-v-in2014-06-231-65/+42
| |/ |/|
* | Switch to dnsjavamar-v-in2014-06-231-10/+11
|/
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-221-103/+26
|\
| * Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| * Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-101/+29
* | fix parcel method in ParcelableKeyRingVincent Breitmoser2014-06-221-1/+3
* | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-221-0/+10
|/
* Fix keybase importDominik Schürmann2014-06-201-1/+2
* New callback model for ImportKeysActivityDominik Schürmann2014-06-191-9/+10
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-134-78/+182
|\
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-053-72/+71
| |\
| | * Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-58/+58
| | * Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-1/+2
| | |\
| | | * fixed error messageTim Bray2014-06-041-1/+2
| * | | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-042-60/+61
| |\ \ \ | | | |/ | | |/|
| * | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
| * | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
| * | | 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
| | * | | 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 a...mar-v-in2014-05-291-3/+3
| |/ / /
| * | | 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
* | | | canonicalize: more stuffVincent Breitmoser2014-06-121-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 08:29:31 +0000