aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Work on Qr code importDominik Schürmann2014-06-205-43/+70
* Fix keybase importDominik Schürmann2014-06-203-2/+5
* Use actionbar button for log activityDominik Schürmann2014-06-202-4/+48
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
* Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
* Merge pull request #658 from artbristol/functional-testingVincent2014-06-202-0/+92
|\
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| * Start on Robolectric integration testArt O Cathain2014-06-162-0/+89
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...mar-v-in2014-06-1914-379/+193
|\ \
| * | Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
| * | Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| * | Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-77/+1
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-193-124/+3
| |\ \
| | * | remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
| * | | New callback model for ImportKeysActivityDominik Schürmann2014-06-197-108/+95
| |/ /
| * | 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 branch 'master' into improve-filemar-v-in2014-06-1836-1803/+2673
|\| |
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:14:11 +0000