aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2710-53/+66
* Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2641-1050/+1505
|\
| * canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
| * generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-264-43/+48
| |\
| | * Program flow fixesDominik Schürmann2014-07-254-43/+48
| * | UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
| * | fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
| * | test and fix: adding an empty user id should failVincent Breitmoser2014-07-262-0/+6
| |/
| * canonicalize: fix for testsVincent Breitmoser2014-07-194-5/+9
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1636-906/+728
| |\
| | * Temporary program flow fixesDominik Schürmann2014-07-161-0/+3
| | * Simple create keyDominik Schürmann2014-07-161-1/+0
| | * Simple create keyDominik Schürmann2014-07-162-46/+57
| | * New first time screenDominik Schürmann2014-07-166-474/+241
| | * Fallback if no primary user id existsDominik Schürmann2014-07-1611-13/+34
| | * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-159-22/+21
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| | |\
| | | * signatures: a revocation reason does NOT determine if a cert is a revocation ...Vincent Breitmoser2014-07-151-1/+1
| | * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-153-3/+8
| | |\|
| | | * merge: different msg if nothing was mergedVincent Breitmoser2014-07-153-3/+8
| | * | some fixes for editDominik Schürmann2014-07-152-4/+5
| | |/
| | * Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-155-23/+373
| | |\
| | * | modifyKey: error out on integrity check failsVincent Breitmoser2014-07-122-10/+18
| | * | 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
| | |\ \
| | * | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 18:17:21 +0000