aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1020-252/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1019-244/+237
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-102-4/+28
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
| | * | | | | | | | | | | | | | prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
* | | | | | | | | | | | | | | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
* | | | | | | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-0718-557/+495
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0619-667/+513
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0636-1376/+1379
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-036-32/+199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| | * | | | | | | | | | | | | | implement sticky preferencesVincent Breitmoser2015-05-316-32/+187
| * | | | | | | | | | | | | | | Partially revert "switch to native DialogFragment, fix some nullpointers", bu...Vincent Breitmoser2015-06-032-3/+6
| * | | | | | | | | | | | | | | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
| * | | | | | | | | | | | | | | Fix comments in serviceDominik Schürmann2015-06-011-8/+8
| * | | | | | | | | | | | | | | corrected indentationAdithya Abraham Philip2015-06-011-271/+278
| * | | | | | | | | | | | | | | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0127-197/+195
| * | | | | | | | | | | | | | | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
| * | | | | | | | | | | | | | | Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-012-12/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-312-12/+12
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-032-50/+81
* | | | | | | | | | | | | | | | multi-decrypt: working context menuVincent Breitmoser2015-06-031-5/+69
* | | | | | | | | | | | | | | | get back to a working stateVincent Breitmoser2015-06-031-3/+5
* | | | | | | | | | | | | | | | multi-decrypt: working in principleVincent Breitmoser2015-06-024-54/+375
* | | | | | | | | | | | | | | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in p...Vincent Breitmoser2015-06-023-243/+212
* | | | | | | | | | | | | | | | multi-decrypt: first steps, split up DecryptFilesFragmentVincent Breitmoser2015-06-013-118/+435
* | | | | | | | | | | | | | | | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-017-319/+145
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 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-311-3/+7
* | | | | | | | | | | | | | 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-302-1/+8
* | | | | | | | | | | | | | delete correct cache entries (important for yubikey pins!)Vincent Breitmoser2015-05-301-2/+2
* | | | | | | | | | | | | | show status indicators in EncryptFragmentVincent Breitmoser2015-05-301-0/+33
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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/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