Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 3 | -57/+201 |
|\ | |||||
| * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 2 | -53/+198 |
| |\ | | | | | | | Improve contact sync | ||||
| | * | Reset importDone at the beginning of sync | mar-v-in | 2014-06-18 | 1 | -0/+1 |
| | | | |||||
| | * | Wait for import to be done before writing contacts | mar-v-in | 2014-06-18 | 1 | -2/+19 |
| | | | |||||
| | * | Remove abandoned contacts | mar-v-in | 2014-06-18 | 1 | -26/+90 |
| | | | |||||
| | * | Code style | mar-v-in | 2014-06-18 | 1 | -13/+26 |
| | | | |||||
| | * | Continue contact db sync | mar-v-in | 2014-06-18 | 1 | -39/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db | ||||
* | | | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 9 | -991/+315 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 4 | -72/+158 |
| | | | | |||||
| * | | | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 3 | -151/+124 |
| | | | | |||||
| * | | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 6 | -819/+83 |
| | | | | |||||
* | | | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 5 | -21/+39 |
| |/ / |/| | | |||||
* | | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 4 | -49/+63 |
| | | | |||||
* | | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 7 | -53/+198 |
| | | | |||||
* | | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 4 | -105/+126 |
| | | | |||||
* | | | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 2 | -36/+22 |
| | | | |||||
* | | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 5 | -8/+61 |
| | | | |||||
* | | | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 2 | -4/+115 |
| | | | |||||
* | | | import-log: don't count self certs as unknown | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| | | | |||||
* | | | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 2 | -75/+87 |
| | | | |||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 7 | -109/+265 |
|\ \ \ | |||||
| * | | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 3 | -1/+6 |
| | | | | |||||
| * | | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 4 | -14/+36 |
| |/ / | |||||
| * | | import-log: clean up progress messages | Vincent Breitmoser | 2014-06-17 | 2 | -7/+6 |
| | | | |||||
| * | | canonicalize: fix NullPointerException | Vincent Breitmoser | 2014-06-17 | 1 | -1/+2 |
| | | | |||||
| * | | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 4 | -5/+23 |
| | | | |||||
| * | | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 3 | -3/+43 |
| | | | |||||
| * | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 4 | -79/+150 |
| | | | | | | | | | | | | more docs | ||||
* | | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 34 | -460/+1204 |
|/ / | |||||
* | | Merge pull request #656 from danielhass/supertoast-dev | Dominik Schürmann | 2014-06-16 | 4 | -1/+87 |
|\ \ | | | | | | | Added SuperToasts with new notify-wrapper | ||||
| * | | Changed license header | Daniel Haß | 2014-06-16 | 1 | -11/+11 |
| | | | |||||
| * | | Moved Notify class to utils | Daniel Haß | 2014-06-16 | 2 | -2/+2 |
| | | | |||||
| * | | Removed unused import | Daniel Haß | 2014-06-16 | 1 | -1/+0 |
| | | | |||||
| * | | Added notification area to decrypt content | Daniel Haß | 2014-06-16 | 1 | -0/+2 |
| | | | |||||
| * | | Replaced AppMsg with notify wrapper call | Daniel Haß | 2014-06-16 | 1 | -1/+4 |
| | | | |||||
| * | | Added notification area as reusable layout | Daniel Haß | 2014-06-16 | 1 | -0/+12 |
| | | | |||||
| * | | Added notification wrapper for toast like notifys | Daniel Haß | 2014-06-16 | 1 | -0/+70 |
|/ / | |||||
* | | Merge pull request #654 from artbristol/master | Dominik Schürmann | 2014-06-14 | 1 | -1/+1 |
|\ \ | | | | | | | Update JUnit version | ||||
| * | | Later version of Junit prevents 'Multiple dex files define ↵ | Art O Cathain | 2014-06-14 | 1 | -1/+1 |
|/ / | | | | | | | Lorg/hamcrest/Description' error | ||||
* | | Merge branch 'canonicalize' | Vincent Breitmoser | 2014-06-13 | 72 | -483/+2583 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 43 | -163/+823 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| | * | | Update example code instructions | Dominik Schürmann | 2014-06-09 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update README for build tools | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Really fix travis | Dominik Schürmann | 2014-06-09 | 1 | -3/+3 |
| | | | | |||||
| | * | | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 | Dominik Schürmann | 2014-06-09 | 3 | -9/+9 |
| | | | | |||||
| | * | | Fix travis for buildTools 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 8 | -0/+0 |
| | | | | |||||
| | * | | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 5 | -110/+463 |
| | |\ | | | | | | | | | Parcelable operation result with logging capabilities + import logging | ||||
| | * \ | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 22 | -57/+637 |
| | |\ \ | | | | | | | | | | | Automatic contact discovery and more |