aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
* forward touch events to pager in import activityVincent Breitmoser2014-06-181-0/+13
* fix key exportVincent Breitmoser2014-06-181-1/+1
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-182-1/+4
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-183-57/+201
|\
| * Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-182-53/+198
| |\
| | * Reset importDone at the beginning of syncmar-v-in2014-06-181-0/+1
| | * Wait for import to be done before writing contactsmar-v-in2014-06-181-2/+19
| | * Remove abandoned contactsmar-v-in2014-06-181-26/+90
| | * Code stylemar-v-in2014-06-181-13/+26
| | * Continue contact db syncmar-v-in2014-06-181-39/+89
* | | Merge branch 'new-edit'Vincent Breitmoser2014-06-188-990/+296
|\ \ \
| * | | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-173-72/+139
| * | | new-edit: add new save keyring stuffVincent Breitmoser2014-06-173-151/+124
| * | | new-edit: remove old save keyring stuffVincent Breitmoser2014-06-176-819/+83
* | | | generate public keyring from secret if not availableVincent Breitmoser2014-06-183-20/+37
| |/ / |/| |
* | | consolidate: almost sane loggingVincent Breitmoser2014-06-183-46/+59
* | | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-186-50/+195
* | | consolidate: make it workVincent Breitmoser2014-06-183-99/+118
* | | code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-182-36/+22
* | | consolidate: add loggingVincent Breitmoser2014-06-184-8/+54
* | | consolidate: first draftVincent Breitmoser2014-06-182-4/+115
* | | import-log: don't count self certs as unknownVincent Breitmoser2014-06-181-0/+1
* | | prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-182-75/+87
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-186-99/+242
|\ \ \
| * | | handle database error on secret key insertVincent Breitmoser2014-06-172-1/+5
| * | | canonicalize: support secret keysVincent Breitmoser2014-06-173-13/+33
| |/ /
| * | import-log: clean up progress messagesVincent Breitmoser2014-06-172-7/+6
| * | canonicalize: fix NullPointerExceptionVincent Breitmoser2014-06-171-1/+2
| * | drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-163-5/+21
| * | add more progress info from import routineVincent Breitmoser2014-06-163-3/+43
| * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more...Vincent Breitmoser2014-06-163-70/+133
* | | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1811-322/+236
|/ /
* | Changed license headerDaniel Haß2014-06-161-11/+11
* | Moved Notify class to utilsDaniel Haß2014-06-162-2/+2
* | Removed unused importDaniel Haß2014-06-161-1/+0
* | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
* | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
* | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1318-145/+741
|\|
| * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-064-110/+424
| |\
| * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0613-57/+580
| |\ \
| | * | 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
| | |\ \
| | * | | 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
| | |\ \ \
| | * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 03:05:21 +0000