Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 1 | -0/+5 |
| | |||||
* | use arraylists instead of arrays in savekeyringparcel | Vincent Breitmoser | 2014-06-22 | 1 | -14/+14 |
| | |||||
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵ | mar-v-in | 2014-06-19 | 1 | -0/+1 |
|\ | | | | | | | improve-file | ||||
| * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 6 | -274/+464 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 2 | -6/+23 |
| |\ | |||||
| | * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 1 | -2/+20 |
| | |\ | | | | | | | | | 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 |
| | | | | |||||
| * | | | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 4 | -266/+53 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+26 |
| | | | | | |||||
| | * | | | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 3 | -263/+23 |
| | | | | | |||||
| * | | | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -2/+3 |
| | |/ / | |/| | | |||||
| * | | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| | | | | |||||
| * | | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+6 |
| | | | | |||||
| * | | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+11 |
| | | | | |||||
| * | | | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -1/+3 |
| |/ / | |||||
| * | | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+2 |
| | | | |||||
| * | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -7/+33 |
| | | | | | | | | | | | | more docs | ||||
| * | | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 3 | -33/+222 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -0/+3 |
| | | | |||||
| * | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 |
| | | | |||||
| * | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -2/+9 |
| | | | |||||
| * | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 |
| | | | |||||
| * | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -0/+2 |
| | | | |||||
| * | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
| | | | |||||
| * | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -2/+21 |
| | | | |||||
| * | | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 2 | -5/+5 |
| | | | |||||
| * | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 |
| | | | |||||
| * | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -3/+3 |
| | | | |||||
| * | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 2 | -16/+48 |
| | | | |||||
| * | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 2 | -7/+21 |
| | | | |||||
| * | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 3 | -6/+276 |
| | | | |||||
* | | | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -1/+1 |
| | | | |||||
* | | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 1 | -172/+105 |
| |/ |/| | | | | | output to/from different types (eg. encrypt file and return byte array) | ||||
* | | Fix TAG in account service as well | mar-v-in | 2014-06-06 | 1 | -7/+8 |
| | | |||||
* | | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -6/+6 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -6/+6 |
| | | |||||
* | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+4 |
| | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 4 | -254/+301 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -4/+5 |
| | | |||||
| * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -43/+11 |
| | | | | | | | | ImportKeysListEntry | ||||
| * | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -5/+4 |
| | | |||||
| * | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 3 | -69/+17 |
| | | |||||
| * | introduce new SaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -0/+113 |
| | |