aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* tests: add testSubkeyAddVincent Breitmoser2014-07-102-0/+5
|
* Merge remote-tracking branch ↵Vincent Breitmoser2014-07-098-830/+1
|\ | | | | | | | | | | | | '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-098-232/+0
| | | | | | | | | | | | | | 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
| |
* | 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
|
* fix no passphrase checkDominik Schürmann2014-07-031-1/+3
|
* Cache passphrase for editDominik Schürmann2014-07-031-2/+2
|
* Cache passphrase for editDominik Schürmann2014-07-035-37/+152
|
* parcel newPassphraseDominik Schürmann2014-07-031-0/+4
|
* cleanupDominik Schürmann2014-07-032-0/+5
|
* edit key: subkey adapterDominik Schürmann2014-07-034-2/+458
|
* Work on editDominik Schürmann2014-07-038-60/+69
|
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
|
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
|
* A little bit less purpleDominik Schürmann2014-07-022-7/+4
|
* merge KeychainIntentServiceDominik Schürmann2014-07-029-105/+343
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0216-461/+341
| |\
| * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-029-104/+342
| |\ \
| | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-023-4/+115
| | | | | | | | | | | | | | | | Closes #695
| | * | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| | | |
| | * | fix subkey additionVincent Breitmoser2014-07-022-37/+62
| | | |
| | * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-297-61/+118
| | | |
* | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 16:06:01 +0000