aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-2813-78/+121
|\
| * improve robustness of SecretKeyType handlingVincent Breitmoser2015-05-283-9/+11
| * set to stripped by default, rather than "unavailable"Vincent Breitmoser2015-05-282-4/+4
| * allow user packets with only revocation packetVincent Breitmoser2015-05-281-4/+4
| * respect cache in yubikey pin data flowVincent Breitmoser2015-05-282-6/+21
| * make masterKeyId and subKeyId strictly required in CryptoInputParcelVincent Breitmoser2015-05-283-25/+17
| * preserve state in DecryptTextActivityVincent Breitmoser2015-05-284-25/+55
| * shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperationVincent Breitmoser2015-05-281-7/+8
| * fix merge problems (derp)Vincent Breitmoser2015-05-281-4/+2
* | Merge branch 'master' into developmentVincent Breitmoser2015-05-281-13/+20
|\|
| * don't keep an activity reference in CreateKeyFinalFragmentVincent Breitmoser2015-05-281-25/+19
| * create keys with fixed timestampVincent Breitmoser2015-05-281-6/+8
| * warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-282-0/+22
| * don't show allowed key list if no key exists, and some minor PgpDecryptVerify...Vincent Breitmoser2015-05-284-27/+42
| * correctly preserve state in EncryptTextFragmentVincent Breitmoser2015-05-281-3/+15
| * correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-282-7/+38
| * move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-283-15/+33
| * preserve state in KeySpinner, and some lint fixesVincent Breitmoser2015-05-285-22/+48
| * rewrite EncryptActivity data flowVincent Breitmoser2015-05-2810-477/+346
| * fix nullpointer in encrypttextactivity. fixes #1267Vincent Breitmoser2015-05-281-24/+18
| * highlight currently selected item in navigation drawerYoshi64Bit2015-05-281-10/+19
| * AssertionError instead of RuntimeExceptionDominik Schürmann2015-05-281-1/+1
| * Change convertFingerprintToHex to use RuntimeExceptionDominik Schürmann2015-05-281-7/+4
| * Improve stringsDominik Schürmann2015-05-282-6/+3
| * do nfc dispatching in MainActivityVincent Breitmoser2015-05-284-9/+15
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-05-211-13/+20
| |\
| | * add user id flags to UserAttribute self signaturesVincent Breitmoser2015-05-201-13/+20
| * | Fix language based on feedback from transifexDominik Schürmann2015-05-212-2/+2
| |/
| * Fix fingerprint length check in QR Code importDominik Schürmann2015-05-191-1/+1
| * Use Mode.ALPHANUMERIC for QR codes to save spaceDominik Schürmann2015-05-194-9/+24
| * check fingerprint length after scanning qr codeVincent Breitmoser2015-05-172-13/+26
| * open ViewKeyActivity by subkey in NfcBaseActivityVincent Breitmoser2015-05-171-3/+4
| * simplify MainActivity and fix backstack issuesVincent Breitmoser2015-05-171-60/+33
| * re-parcel log in LogDisplayFragmentVincent Breitmoser2015-05-171-6/+20
| * fingerprints are 20 bytes, not 40. duh.Vincent Breitmoser2015-05-171-1/+1
| * load yubikey fragment after mMasterKeyId is availableVincent Breitmoser2015-05-171-17/+33
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-176-9/+66
| * pass masterKeyId to yubikey fragmentVincent Breitmoser2015-05-172-6/+9
| * allow state loss when yubikey fragment is loadedVincent Breitmoser2015-05-171-1/+2
| * yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-172-41/+53
| * fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-171-28/+12
* | don't keep an activity reference in CreateKeyFinalFragmentVincent Breitmoser2015-05-281-26/+20
* | create keys with fixed timestampVincent Breitmoser2015-05-281-5/+7
* | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-282-0/+22
* | don't show allowed key list if no key exists, and some minor PgpDecryptVerify...Vincent Breitmoser2015-05-284-27/+42
* | correctly preserve state in EncryptTextFragmentVincent Breitmoser2015-05-271-3/+15
* | correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-272-7/+38
* | move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-273-15/+33
* | preserve state in KeySpinner, and some lint fixesVincent Breitmoser2015-05-275-22/+48
* | rewrite EncryptActivity data flowVincent Breitmoser2015-05-2710-477/+346
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:04:54 +0000