Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 3 | -3/+27 |
| | |||||
* | fix log entry for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -3/+3 |
| | |||||
* | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 7 | -17/+185 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-13 | 9 | -88/+120 |
| | |||||
* | certification of the first linked identity packet! | Vincent Breitmoser | 2015-01-13 | 7 | -45/+188 |
| | |||||
* | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 |
| | |||||
* | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -2/+47 |
| | |||||
* | add back button to wizard fragments | Vincent Breitmoser | 2015-01-13 | 6 | -0/+42 |
| | |||||
* | some work on twitter resource | Vincent Breitmoser | 2015-01-13 | 6 | -1/+670 |
| | |||||
* | forgot to commit WrappedUserAttribute | Vincent Breitmoser | 2015-01-12 | 1 | -0/+47 |
| | |||||
* | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 3 | -8/+57 |
| | |||||
* | work on affirmations (begin rename to LinkedIdentity | Vincent Breitmoser | 2015-01-12 | 5 | -176/+10 |
| | |||||
* | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 4 | -0/+350 |
| | |||||
* | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 11 | -266/+403 |
| | |||||
* | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 12 | -0/+1113 |
| | |||||
* | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 2 | -31/+26 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 22 | -200/+547 |
|\ | | | | | | | development | ||||
| * | minor stuff | Vincent Breitmoser | 2015-01-03 | 3 | -3/+6 |
| | | |||||
| * | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 3 | -0/+13 |
| | | |||||
| * | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 2 | -1/+2 |
| | | |||||
| * | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 7 | -144/+264 |
| | | |||||
| * | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 2 | -3/+6 |
| | | |||||
| * | throw exception if no data is found in getGenericData | Vincent Breitmoser | 2015-01-02 | 1 | -0/+3 |
| | | |||||
| * | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 2 | -26/+19 |
| | | |||||
| * | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -7/+13 |
| | | | | | | | | closes #1012 | ||||
| * | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 3 | -22/+72 |
| | | |||||
| * | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 2 | -0/+7 |
| | | |||||
| * | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 |
| | | |||||
| * | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 2 | -2/+2 |
| | | | | | | | | cache | ||||
| * | fix small merge conflict oversight | Vincent Breitmoser | 2014-12-30 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 2 | -33/+89 |
| |\ | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 2 | -10/+10 |
| | | | |||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 7 | -5/+36 |
| | | | |||||
| * | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 1 | -0/+3 |
| | | | |||||
| * | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 4 | -15/+115 |
| | | | | | | | | | | | | notation packet | ||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 5 | -22/+1609 |
| |/ |/| | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 5 | -65/+173 |
|\| | | | | | | | development | ||||
| * | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 5 | -65/+173 |
| | | | | | | | | capabilities | ||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 2 | -33/+91 |
|/ | |||||
* | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 |
| | | | | diverging clocks on different systems for fresh keys | ||||
* | Fix crash on first time wizard | Dominik Schürmann | 2014-12-28 | 1 | -2/+2 |
| | |||||
* | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 1 | -1/+1 |
| | |||||
* | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 |
| | |||||
* | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 4 | -11/+11 |
| | |||||
* | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 2 | -13/+11 |
|\ | | | | | | | development | ||||
| * | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 |
| |\ | | | | | | | | | | development | ||||
| * | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 |
| | | | |||||
* | | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| |/ |/| |