aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-027-103/+338
| |\ \
| | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-022-4/+113
| | * | 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-295-60/+116
* | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
* | | | remove init methods from adapterDominik Schürmann2014-07-024-88/+53
| |_|/ |/| |
* | | edit key: work on savingDominik Schürmann2014-07-023-23/+24
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-022-1/+6
|\| |
| * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| * | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
* | | Edit key: adding user idsDominik Schürmann2014-07-0210-221/+258
* | | edit key: part 3Dominik Schürmann2014-07-014-327/+180
|/ /
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-68/+52
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:39:19 +0000