Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add license headers | Dominik Schürmann | 2014-08-04 | 11 | -0/+187 |
| | |||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -2/+2 |
| | |||||
* | delete unused PgpConversionHelper | Vincent Breitmoser | 2014-08-04 | 1 | -102/+0 |
| | |||||
* | small fix for MSG_MF_UID_ADD log entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 2 | -6/+2 |
|\ | |||||
| * | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 |
| | | |||||
* | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -3/+25 |
|/ | |||||
* | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 2 | -21/+22 |
| | |||||
* | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -15/+81 |
| | | | | methods | ||||
* | fix fromStream method, properly recognize multiple concatenated streams | Vincent Breitmoser | 2014-07-31 | 1 | -17/+20 |
| | |||||
* | always return an EditKeyResult in modifyKey method | Vincent Breitmoser | 2014-07-31 | 1 | -25/+25 |
| | |||||
* | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 1 | -26/+65 |
| | |||||
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+3 |
| | |||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 12 | -111/+98 |
| | |||||
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -5/+5 |
| | |||||
* | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 2 | -20/+29 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -9/+18 |
| | | |||||
| * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -11/+11 |
| | | |||||
* | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 3 | -10/+19 |
|/ | | | | fixes #721 | ||||
* | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 |
| | |||||
* | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
| | |||||
* | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
| | |||||
* | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 |
| | |||||
* | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+5 |
| | |||||
* | 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 |
| |