aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Fix links to branchDominik Schürmann2015-06-012-2/+2
* | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-033-53/+86
* | | multi-decrypt: working context menuVincent Breitmoser2015-06-034-5/+93
* | | get back to a working stateVincent Breitmoser2015-06-031-3/+5
* | | update spongycastle with branch-specific patch stackVincent Breitmoser2015-06-031-0/+0
* | | multi-decrypt: working in principleVincent Breitmoser2015-06-025-69/+392
* | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in p...Vincent Breitmoser2015-06-025-243/+445
* | | check for cached session keys in some testsVincent Breitmoser2015-06-011-0/+12
* | | multi-decrypt: first steps, split up DecryptFilesFragmentVincent Breitmoser2015-06-015-247/+549
* | | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-018-319/+145
|/ /
* | switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-312-22/+26
* | fix small non-deterministic failure case in unit testVincent Breitmoser2015-05-311-1/+1
* | revert some accidentally committed cruftVincent Breitmoser2015-05-311-8/+0
* | handle empty passphrases in PassphraseDialogActivityVincent Breitmoser2015-05-312-0/+34
|/
* Merge pull request #1318 from adithyaphilip/remove-nanVincent2015-05-302-3/+8
|\
| * 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
* adapt unit tests to PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-78/+101
* 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
* branch infoDominik Schürmann2015-05-291-2/+6
* 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-282-13/+39
|\|
| * 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-2813-39/+75