Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 1 | -5/+14 |
| | |||||
* | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 1 | -9/+10 |
| | |||||
* | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -1/+1 |
| | |||||
* | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -1/+0 |
| | |||||
* | reformatted code | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+0 |
| | |||||
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -17/+3 |
| | |||||
* | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+15 |
| | |||||
* | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | |||||
* | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+0 |
| | |||||
* | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -45/+43 |
| | |||||
* | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -6/+4 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -7/+7 |
| | |||||
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -3/+3 |
| | |||||
* | 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 | ||||
* | 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. | ||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -1/+1 |
| | | | | | | | - 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 | ||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -2/+1 |
| | |||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -3/+6 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -1/+1 |
| | | | | created ui.util for everything related to formatting | ||||
* | Pull from transifex | Dominik Schürmann | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 1 | -1/+2 |
| | |||||
* | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 1 | -6/+4 |
| | |||||
* | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -0/+15 |
| | |||||
* | Fix upload of keys, closes #581 | Dominik Schürmann | 2014-04-18 | 1 | -2/+5 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -0/+2 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+127 |