aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-123-44/+66
|
* test: add algorithm choice testsVincent Breitmoser2014-07-123-3/+77
|
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-119-76/+296
|\ | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| * Merge pull request #710 from mar-v-in/patch-1Vincent2014-07-091-8/+8
| |\ | | | | | | Fix OperationResultParcel
| | * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| |/ | | | | Naming conventions save lives... or atleast make addAll() work
| * Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
| |
| * cleanupDominik Schürmann2014-07-081-30/+0
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
| |\
| * | Work on subkeys adapterDominik Schürmann2014-07-088-66/+310
| | |
* | | test: make testing optional in buildVincent Breitmoser2014-07-112-3/+3
| | |
* | | tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic buildVincent Breitmoser2014-07-111-0/+6
| | |
* | | travis: try running tests separately with info outputVincent Breitmoser2014-07-111-1/+3
| | |
* | | travis: get rid of lintVincent Breitmoser2014-07-111-1/+1
| | |
* | | tests: stronger subkey revocation test including re-certificationVincent Breitmoser2014-07-111-16/+69
| | |
* | | modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
| | |
* | | test: stronger SubkeyCreate testsVincent Breitmoser2014-07-111-3/+39
| | |
* | | modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-114-27/+64
| | |
* | | test: add SubkeyChange testsVincent Breitmoser2014-07-111-3/+94
| | |
* | | test: onlyX vars are lists now, use them as suchVincent Breitmoser2014-07-111-12/+8
| | |
* | | (whoops)Vincent Breitmoser2014-07-111-1/+1
| | |
* | | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-119-86/+83
| | |
* | | test: get rid of some SaveKeyringParcel boilerplateVincent Breitmoser2014-07-112-33/+21
| | |
* | | get rid of some inspection warningsVincent Breitmoser2014-07-114-11/+7
| | |
* | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-113-0/+12
| | |
* | | test: add more user id testsVincent Breitmoser2014-07-111-2/+85
| | |
* | | test: put more stuff in helper method for neater testsVincent Breitmoser2014-07-112-36/+36
| | |
* | | fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| | |
* | | test: test subkey revocationVincent Breitmoser2014-07-111-0/+35
| | |
* | | modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| | |
* | | some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-113-18/+67
| | |
* | | modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| | |
* | | add come createKey stringsVincent Breitmoser2014-07-113-3/+19
| | |
* | | test: implement a ton of PgpKeyOperation testsVincent Breitmoser2014-07-111-27/+191
| | |
* | | test: fix RawPacket comparatorVincent Breitmoser2014-07-111-7/+14
| | |
* | | test: finish testSubkeyAddVincent Breitmoser2014-07-102-23/+43
| | |
* | | Revert "test: add --info to travis thing, for testing"Vincent Breitmoser2014-07-101-1/+1
| | | | | | | | | | | | This reverts commit 7532baa6c7614d526d508f37c323e24edd788771.
* | | test: add --info to travis thing, for testingVincent Breitmoser2014-07-101-1/+1
| | |
* | | test: enable travis, disable dysfunctional tests to make it workVincent Breitmoser2014-07-102-4/+4
| | |
* | | tests: add testSubkeyAddVincent Breitmoser2014-07-104-17/+69
| | |
* | | test: move uncachedkeyring test setup into BeforeClass methodVincent Breitmoser2014-07-091-20/+25
| | |
* | | use openjdk7 in travisVincent Breitmoser2014-07-091-1/+1
| | |
* | | tests: fix createkey testVincent Breitmoser2014-07-091-6/+5
| | |
* | | Merge remote-tracking branch ↵Vincent Breitmoser2014-07-0914-220/+426
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
| * | | actually provide a tostringArt O Cathain2014-07-071-1/+1
| | | |
| * | | prevent odd ambiguous method toString errorArt O Cathain2014-07-071-1/+1
| | | |
| * | | (c) headers, tidy importsArt O Cathain2014-07-079-7/+151
| | | |
| * | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-072-1/+19
| | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
| * | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | |
| * | | Actually test canonicalizeArt O Cathain2014-07-063-87/+181
| | | |
| * | | add the GPG versionArt O Cathain2014-07-062-1/+10
| | | |