aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-filemar-v-in2014-06-1874-2056/+3195
|\
| * 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-189-991/+315
| |\ \ \
| | * | | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-174-72/+158
| | * | | 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-184-21/+39
| | |/ / | |/| |
| * | | consolidate: almost sane loggingVincent Breitmoser2014-06-184-49/+63
| * | | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-187-53/+198
| * | | consolidate: make it workVincent Breitmoser2014-06-184-105/+126
| * | | code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-182-36/+22
| * | | consolidate: add loggingVincent Breitmoser2014-06-185-8/+61
| * | | 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-187-109/+265
| |\ \ \
| | * | | handle database error on secret key insertVincent Breitmoser2014-06-173-1/+6
| | * | | canonicalize: support secret keysVincent Breitmoser2014-06-174-14/+36
| | |/ /
| | * | 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-164-5/+23
| | * | 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-164-79/+150
| * | | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1830-458/+446
| |/ /
| * | 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
| * | Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
| * | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| * | Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
| * | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
| * | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1326-147/+802
| |\|
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 14:56:03 +0000