Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 3 | -5/+2 | |
| | | | ||||||
* | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 3 | -0/+12 | |
| | | | ||||||
* | | | 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 | 3 | -18/+67 | |
| | | | ||||||
* | | | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | | ||||||
* | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 3 | -3/+19 | |
| | | | ||||||
* | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 | |
| | | | ||||||
* | | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| * | | | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 6 | -7/+100 | |
| | | | | ||||||
| * | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java | |||||
| * | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | ||||||
| * | | | Actually test canonicalize | Art O Cathain | 2014-07-06 | 2 | -75/+160 | |
| | | | | ||||||
| * | | | data fixes | Art O Cathain | 2014-07-06 | 1 | -13/+14 | |
| | | | | ||||||
| * | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 | |
| | | | | ||||||
| * | | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 | |
| | |/ | |/| | ||||||
* | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 4 | -1/+530 | |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |||||
| * | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | | | ||||||
| * | | actually canonicalize | Art O Cathain | 2014-07-06 | 1 | -1/+10 | |
| | | | ||||||
| * | | work in progress | Art O Cathain | 2014-07-06 | 3 | -1/+511 | |
| |/ | ||||||
* / | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 2 | -6/+27 | |
|/ | ||||||
* | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 | |
| | ||||||
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 3 | -7/+18 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 3 | -7/+30 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-07-03 | 25 | -352/+1289 | |
| | ||||||
* | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 | |
| | ||||||
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 8 | -819/+782 | |
| | ||||||
* | cleanup, debug for passphrase set | Dominik Schürmann | 2014-07-03 | 1 | -5/+4 | |
| | ||||||
* | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 | |
| | ||||||
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -2/+2 | |
| | ||||||
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 5 | -37/+152 | |
| | ||||||
* | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 | |
| | ||||||
* | cleanup | Dominik Schürmann | 2014-07-03 | 2 | -0/+5 | |
| | ||||||
* | edit key: subkey adapter | Dominik Schürmann | 2014-07-03 | 4 | -2/+458 | |
| | ||||||
* | Work on edit | Dominik Schürmann | 2014-07-03 | 8 | -60/+69 | |
| | ||||||
* | smaller dropdown items | Dominik Schürmann | 2014-07-03 | 2 | -4/+4 | |
| | ||||||
* | Remove unnecessary error logs | Dominik Schürmann | 2014-07-02 | 2 | -2/+2 | |
| | ||||||
* | A little bit less purple | Dominik Schürmann | 2014-07-02 | 2 | -7/+4 | |
| | ||||||
* | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 8 | -104/+343 | |
|\ | ||||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 16 | -461/+341 | |
| |\ | ||||||
| * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 8 | -103/+342 | |
| |\ \ | ||||||
| | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 3 | -4/+115 | |
| | | | | | | | | | | | | | | | | Closes #695 | |||||
| | * | | use expert create key for key creation testing (revert this later on!) | Vincent Breitmoser | 2014-07-02 | 1 | -5/+50 | |
| | | | | ||||||
| | * | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 2 | -37/+62 | |
| | | | | ||||||
| | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 6 | -60/+118 | |
| | | | |