aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Update buildTools to 19.1Dominik Schürmann2014-06-098-0/+0
| | * | | Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
| | |/ /
| * | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-123-5/+49
| * | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-123-43/+9
| * | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-124-19/+98
| * | | import-log: more minor improvementsVincent Breitmoser2014-06-123-17/+12
| * | | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-122-26/+20
| * | | import-log: minor improvementsVincent Breitmoser2014-06-125-56/+77
| * | | canonicalize: more stuffVincent Breitmoser2014-06-125-47/+70
| * | | canonicalize: implementation, first draftVincent Breitmoser2014-06-125-29/+337
| * | | import-log: properly distinguish return statesVincent Breitmoser2014-06-125-26/+25
| * | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-123-17/+6
| * | | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| * | | import-log: work on log fragment uiVincent Breitmoser2014-06-106-21/+113
| * | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1016-160/+205
| * | | import-log: more interface workVincent Breitmoser2014-06-107-50/+94
| * | | import-log: some cosmeticsVincent Breitmoser2014-06-108-26/+33
| * | | import-log: add LogDisplay activityVincent Breitmoser2014-06-108-21/+204
| * | | 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-106-101/+260
| * | | import-log: add SuperToast external libraryVincent Breitmoser2014-06-104-0/+7
| | | * Delete using Document API (unsafe)mar-v-in2014-06-103-5/+43
| | | * Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-106-54/+200
| | | * Modify KeychainIntentService to support I/O with URIs, allow input and output...mar-v-in2014-06-085-176/+109
| | |/
| | * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
| | |\ | | |/ | |/|
| * | import-log: better stripped key loggingVincent Breitmoser2014-06-064-17/+43
| * | import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| * | import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
| * | 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
|/ /
| * Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0622-57/+637
| |\
| | * Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| | * Fixing TAG and string resourcemar-v-in2014-06-062-4/+4
| | * 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
| | |\
| | * | Add dnsjava as submodulemar-v-in2014-06-054-1/+5
| | * | Show keys with android contactsmar-v-in2014-06-058-11/+119
| | * | Make keylist case insensitivemar-v-in2014-06-051-3/+3
| | * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-04149-2417/+4042
| | |\ \
| | * | | 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
| | * | | 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
| | | * | | 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