Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change user_id primary key in database, use keyring rather than unified ↵ | Vincent Breitmoser | 2015-03-11 | 1 | -0/+9 |
| | | | | query in consolidate | ||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -1/+0 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -3/+22 |
| | |||||
* | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -3/+18 |
| | |||||
* | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -0/+90 |
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java |