Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-19 | 3 | -124/+3 | |
| |\ \ | ||||||
| | * | | remove obsolete subkey binding check from signature verification | Vincent Breitmoser | 2014-06-19 | 3 | -124/+3 | |
| | | | | ||||||
| * | | | New callback model for ImportKeysActivity | Dominik Schürmann | 2014-06-19 | 7 | -108/+95 | |
| |/ / | ||||||
| * | | Reference ic_launcher instead of icon | Dominik Schürmann | 2014-06-18 | 4 | -4/+4 | |
| | | | ||||||
| * | | decrease size of search icons in import | Dominik Schürmann | 2014-06-18 | 2 | -2/+2 | |
| | | | ||||||
| * | | forward touch events to pager in import activity | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 | |
| | | | ||||||
| * | | Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵ | Dominik Schürmann | 2014-06-18 | 16 | -3/+3 | |
| | | | | | | | | | | | | naming conventions | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 4 | -5/+9 | |
| |\ \ | ||||||
| | * | | fix key export | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 3 | -4/+8 | |
| | | | | ||||||
| * | | | consistent button design in import activity | Dominik Schürmann | 2014-06-18 | 2 | -18/+0 | |
| |/ / | ||||||
* | | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 75 | -2062/+3204 | |
|\| | | ||||||
| * | | 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 | 4 | -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 | 30 | -458/+446 | |
| |/ / | ||||||
| * | | 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 | |
| | | | ||||||
| * | | Later version of Junit prevents 'Multiple dex files define ↵ | Art O Cathain | 2014-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | Lorg/hamcrest/Description' error | |||||
| * | | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 27 | -152/+808 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |