aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * data fixesArt O Cathain2014-07-062-13/+18
| |
| * add toString for test easeArt O Cathain2014-07-061-0/+10
| |
| * actually canonicalizeArt O Cathain2014-07-062-5/+11
| |
| * work in progressArt O Cathain2014-07-064-1/+548
| |
* | put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-0914-16/+148
| | | | | | | | | | | | | | this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling.
* | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-072-2/+19
| |
* | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| |
* | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-075-1/+564
|\ \ | |/ |/| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
| * add toString for test easeArt O Cathain2014-07-061-0/+10
| |
| * actually canonicalizeArt O Cathain2014-07-062-5/+11
| |
| * work in progressArt O Cathain2014-07-064-1/+548
| |
* | Merge pull request #708 from artbristol/composition-not-inheritanceVincent2014-07-062-6/+27
|\ \ | |/ |/| Prefer composition to inheritance
| * Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
|
* Use strings in edit keyDominik Schürmann2014-07-033-7/+18
|
* Pull from transifexDominik Schürmann2014-07-033-7/+30
|
* Pull from transifexDominik Schürmann2014-07-0325-352/+1289
|
* Small strings fixDominik Schürmann2014-07-031-1/+1
|
* Remove old edit button, rename activitiesDominik Schürmann2014-07-038-819/+782
|
* cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
|