aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-122-44/+61
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-116-62/+262
|\
| * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| * Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
| |\
| * | Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
* | | modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
* | | modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-114-27/+64
* | | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-118-69/+66
* | | test: get rid of some SaveKeyringParcel boilerplateVincent Breitmoser2014-07-111-5/+11
* | | get rid of some inspection warningsVincent Breitmoser2014-07-112-4/+1
* | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-112-0/+11
* | | fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
* | | 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-112-2/+11
* | | tests: add testSubkeyAddVincent Breitmoser2014-07-102-0/+5
* | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads...Vincent Breitmoser2014-07-098-830/+1
|\ \ \
| * | | 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-076-7/+100
| * | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| * | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| * | | Actually test canonicalizeArt O Cathain2014-07-062-75/+160
| * | | data fixesArt O Cathain2014-07-061-13/+14
| * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| * | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| * | | work in progressArt O Cathain2014-07-063-1/+511
| | |/ | |/|
* | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
* | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
* | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-074-1/+530
|\ \ \ | |/ / |/| |
| * | add toString for test easeArt O Cathain2014-07-061-0/+10
| * | actually canonicalizeArt O Cathain2014-07-061-1/+10
| * | work in progressArt O Cathain2014-07-063-1/+511
| |/
* / Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
|/
* Use strings in edit keyDominik Schürmann2014-07-031-3/+4
* Remove old edit button, rename activitiesDominik Schürmann2014-07-036-801/+780
* 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-033-30/+60
* parcel newPassphraseDominik Schürmann2014-07-031-0/+4
* cleanupDominik Schürmann2014-07-032-0/+5
* edit key: subkey adapterDominik Schürmann2014-07-032-1/+361
* Work on editDominik Schürmann2014-07-035-48/+66
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
* merge KeychainIntentServiceDominik Schürmann2014-07-027-104/+339
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0211-378/+269
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 12:40:40 +0000