aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Remove support for V3 signaturesDominik Schürmann2014-07-227-152/+14
* CleanupDominik Schürmann2014-07-221-12/+7
* Reuse signature creation timestamp for synchronous signingDominik Schürmann2014-07-223-33/+44
* Fix testDominik Schürmann2014-07-211-2/+1
* Merge branch 'master' into yubikeyDominik Schürmann2014-07-214-5/+9
|\
| * canonicalize: fix for testsVincent Breitmoser2014-07-194-5/+9
* | NFC Yubikey: only pass through hash of message and not whole contentDominik Schürmann2014-07-215-53/+119
* | Merge branch 'master' into yubikeyDominik Schürmann2014-07-184-1/+34
|\|
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1636-906/+728
| |\
| * | Final Commit for #662Daniel Albert2014-07-161-1/+6
| * | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-133-8/+223
| |\ \
| * | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-123-0/+28
* | | | FixesDominik Schürmann2014-07-176-24/+132
| |_|/ |/| |
* | | 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
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-123-16/+151
| |\ \
| | * | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | |/
| | * 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
| * | more work on edit keyDominik Schürmann2014-07-122-7/+222
| |/
* | 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
|\|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:56:21 +0000