aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | 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
| | | | |_|/ | | | |/| |
| * | | | | Final Commit for #662Daniel Albert2014-07-161-1/+6
| * | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-133-8/+223
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-123-16/+151
| | |\ \ \ \
| | | * | | | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | * | | | | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | | |_|_|/ | | |/| | |
| * | | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-123-0/+28
| | |/ / / | |/| | |
| * | | | Fixed issues discussed in #713Daniel Albert2014-07-122-12/+12
| * | | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-6/+6
| * | | | Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
| * | | | Implemented Notification, no fallback yetDaniel Albert2014-07-123-7/+83
| * | | | new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
| |/ / /
| * | | 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
| |\| |
| | * | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
| | |/
| * / Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-3110-94/+106
* | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
* | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-208-565/+554
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-0632-1441/+1934
|\|
| * Use strings in edit keyDominik Schürmann2014-07-031-3/+4