Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 3 | -5/+7 | |
| | ||||||
* | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 10 | -130/+318 | |
|\ | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 5 | -6/+23 | |
| | | ||||||
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 5 | -15/+15 | |
| | | ||||||
| * | signatures: a revocation reason does NOT determine if a cert is a revocation ↵ | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | | | | | | type | |||||
| * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -2/+6 | |
| | | ||||||
| * | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 1 | -7/+9 | |
| | | ||||||
| * | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -44/+56 | |
| | | ||||||
| * | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 | |
| | | ||||||
| * | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 3 | -27/+63 | |
| | | ||||||
| * | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 1 | -15/+15 | |
| | | ||||||
| * | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 | |
| | | ||||||
| * | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+10 | |
| | | ||||||
| * | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | ||||||
| * | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 2 | -4/+34 | |
| | | ||||||
| * | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 2 | -12/+62 | |
| | | ||||||
| * | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | ||||||
| * | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+6 | |
| | | ||||||
| * | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+4 | |
| | | ||||||
* | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 | |
|/ | ||||||
* | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -4/+111 | |
| | | | | Closes #695 | |||||
* | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 1 | -37/+59 | |
| | ||||||
* | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 2 | -35/+67 | |
| | ||||||
* | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 1 | -2/+10 | |
| | ||||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 2 | -61/+52 | |
| | | | | closes #698 | |||||
* | ditch outdated certifyKey operation | Vincent Breitmoser | 2014-06-22 | 1 | -54/+0 | |
| | ||||||
* | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -0/+19 | |
| | ||||||
* | Fix keybase import | Dominik Schürmann | 2014-06-20 | 2 | -1/+3 | |
| | ||||||
* | Fix app name in PGP header, closing #663 | Dominik Schürmann | 2014-06-19 | 1 | -1/+1 | |
| | ||||||
* | remove obsolete subkey binding check from signature verification | Vincent Breitmoser | 2014-06-19 | 3 | -124/+3 | |
| | ||||||
* | fix key export | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 | |
| | ||||||
* | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -1/+3 | |
| | ||||||
* | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 2 | -714/+236 | |
|\ | | | | | | | | | | | | | 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 | 1 | -71/+113 | |
| | | ||||||
| * | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 2 | -148/+121 | |
| | | ||||||
| * | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -546/+53 | |
| | | ||||||
* | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -0/+16 | |
| | | ||||||
* | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 | |
| | | ||||||
* | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 4 | -6/+28 | |
| | | ||||||
* | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -93/+99 | |
| | | ||||||
* | | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 1 | -26/+20 | |
| | | ||||||
* | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 2 | -8/+35 | |
| | | ||||||
* | | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 1 | -3/+114 | |
| | | ||||||
* | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -12/+24 | |
|/ | ||||||
* | import-log: clean up progress messages | Vincent Breitmoser | 2014-06-17 | 1 | -6/+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 | 1 | -5/+16 | |
| | ||||||
* | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -2/+4 | |
| | ||||||
* | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -40/+59 | |
| | | | | more docs | |||||
* | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -3/+41 | |
| |