aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | fix unit testsVincent Breitmoser2015-06-101-5/+5
| * | | | | | | | | | | | | | | | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1020-245/+237
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-103-5/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
* | | | | | | | | | | | | | | | | Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
* | | | | | | | | | | | | | | | | Merge pull request #1333 from VPhantom/patch-1Dominik Schürmann2015-06-081-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Explicit mention of dependency on 3rd party toolStéphane Lavergne2015-06-081-1/+4
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
* | | | | | | | | | | | | | | | | Merge pull request #1327 from adithyaphilip/fix-nullDominik Schürmann2015-06-081-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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-0722-572/+505
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0623-682/+523
|/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0640-1380/+1393
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-037-32/+207
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| * | | | | | | | | | | | | | | | implement sticky preferencesVincent Breitmoser2015-05-317-32/+195
* | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge pull request #1320 from adithyaphilip/merge-services-newDominik Schürmann2015-06-0131-1333/+1153
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | corrected indentationAdithya Abraham Philip2015-06-011-271/+278
| * | | | | | | | | | | | | | | | | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0128-198/+196
| * | | | | | | | | | | | | | | | | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Better use HEAD instead of master to link to filesDominik Schürmann2015-06-012-3/+3
* | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | 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