Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 1 | -2/+28 |
| | |||||
* | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-28 | 1 | -0/+77 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -189/+0 |
| | |||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 1 | -5/+3 |
| | |||||
* | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 1 | -1/+0 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -3/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -3/+7 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+1 |
| | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -3/+4 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -4/+2 |
| | | |||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 1 | -4/+4 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -22/+27 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 1 | -1/+0 |
|\ | |||||
| * | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 1 | -1/+0 |
| | | |||||
* | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 |
|/ | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | Redesign of encrypt activites finished | Dominik Schürmann | 2015-03-09 | 1 | -0/+33 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -14/+22 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 1 | -1/+1 |
| | |||||
* | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -1/+1 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -2/+3 |
| | |||||
* | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 1 | -1/+0 |
| | |||||
* | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 1 | -1/+112 |
| | |||||
* | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 1 | -4/+0 |
| | | | | need to separate | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 1 | -10/+1 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | ||||
| * | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 1 | -4/+1 |
| | | |||||
| * | Implement buttons in DecryptTextFragment | Dominik Schürmann | 2014-09-23 | 1 | -7/+0 |
| | | |||||
* | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 1 | -1/+3 |
|/ | |||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -12/+18 |
| | |||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -0/+37 |
| | |||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -626/+0 |
| | |||||
* | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 |
| | |||||
* | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 |
| | |||||
* | Fix mime types, #781 | mar-v-in | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 1 | -21/+20 |
| | |||||
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -11/+15 |
| | |||||
* | remove bundle for symmetric/asymmetric fragment as it was useless | mar-v-in | 2014-08-13 | 1 | -13/+5 |
| | |||||
* | fix message and uri from encrypt intent | mar-v-in | 2014-08-13 | 1 | -8/+4 |
| | |||||
* | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 1 | -1/+0 |
| | |||||
* | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -5/+4 |
| | |||||
* | Fix compression setting for encryption of files | Dominik Schürmann | 2014-08-10 | 1 | -4/+7 |
| | |||||
* | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
| | |||||
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -12/+23 |
| | |||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -2/+74 |
| | |||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -1/+0 |
| | |||||
* | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 1 | -2/+1 |
| | |||||
* | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | Fix merge | mar-v-in | 2014-07-31 | 1 | -13/+17 |
| |