aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-013-12/+13
|\
| * prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-313-12/+13
* | switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-312-22/+26
* | revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
* | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-312-0/+34
|/
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-312-3/+8
* only promote subkeys which are actually presentVincent Breitmoser2015-05-301-8/+5
* some decrypt/verify bug fixesVincent Breitmoser2015-05-303-5/+12
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-3010-342/+323
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-303-1/+9
* delete correct cache entries (important for yubikey pins!)Vincent Breitmoser2015-05-301-2/+2
* show status indicators in EncryptFragmentVincent Breitmoser2015-05-304-17/+129
* rewrite data flow in EncryptFileFragment preserve state correctlyVincent Breitmoser2015-05-304-66/+91
* externalize caching functionality from CertifyKeyFragmentVincent Breitmoser2015-05-302-20/+75
* make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-302-2/+5
* preserve state in DecryptFilesActivity/-FragmentVincent Breitmoser2015-05-292-37/+26
* preserve state in CertifyKeyFragmentVincent Breitmoser2015-05-292-30/+73
* fix RequiredInputParcel handling in CertifyOperationVincent Breitmoser2015-05-291-6/+25
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-292-7/+19
|\
| * Version 3.2.3Dominik Schürmann2015-05-291-2/+2
| * Partially revert "make masterKeyId and subKeyId strictly required in CryptoIn...Vincent Breitmoser2015-05-281-6/+16
| * update database to trigger consolidateVincent Breitmoser2015-05-281-1/+3
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-05-291-2/+2
|\ \
| * | Version 3.2.3Dominik Schürmann2015-05-291-2/+2
* | | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-2814-80/+122
|\ \ \ | |/ / |/| / | |/
| * 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-285-27/+56
| * shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperationVincent Breitmoser2015-05-281-7/+8
| * fix merge problems (derp)Vincent Breitmoser2015-05-282-20/+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-283-0/+23
| * don't show allowed key list if no key exists, and some minor PgpDecryptVerify...Vincent Breitmoser2015-05-2812-35/+50
| * correctly preserve state in EncryptTextFragmentVincent Breitmoser2015-05-281-3/+15
| * correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-283-9/+38
| * move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-286-25/+42
| * 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-284-34/+48
| * do nfc dispatching in MainActivityVincent Breitmoser2015-05-284-9/+15
| * Version 3.2.2Dominik Schürmann2015-05-211-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 11:29:15 +0000