aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-311-14/+7
|
* upload: identify key by masterKeyId onlyVincent Breitmoser2015-09-261-5/+14
|
* export: externalize upload into its own operationVincent Breitmoser2015-09-261-9/+10
|
* add pseudo-static id property to CryptoOperationHelperVincent Breitmoser2015-07-091-1/+1
|
* shifted proxy checking to ImportKeysListCloudLoaderAdithya Abraham Philip2015-07-081-1/+0
|
* reformatted codeAdithya Abraham Philip2015-07-031-1/+0
|
* added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-17/+3
|
* Rename package back to orbot because these are orbot utilsDominik Schürmann2015-07-031-1/+1
|
* Cleanup tor codeDominik Schürmann2015-07-031-1/+1
|
* added proxy to all import operations using KeychainServiceAdithya Abraham Philip2015-07-031-1/+15
|
* changed to work with multi-decryptAdithya Abraham Philip2015-06-271-0/+5
|
* deleted KeychainServiceAdithya Abraham Philip2015-06-271-1/+0
|
* added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-271-45/+43
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-6/+4
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-7/+7
|
* merged servicesAdithya Abraham Philip2015-06-011-3/+3
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-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 serviceAdithya Abraham Philip2015-03-231-3/+7
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | first steps toward yubikey activityVincent Breitmoser2015-03-211-0/+1
|/ | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-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 cleanupVincent Breitmoser2015-01-251-2/+1
|
* Refactor BaseActivityDominik Schürmann2015-01-131-2/+2
|
* Use Toolbar and new BaseActivityDominik Schürmann2015-01-131-3/+6
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-1/+1
| | | | created ui.util for everything related to formatting
* Pull from transifexDominik Schürmann2014-09-151-1/+1
|
* Fixes for uploadDominik Schürmann2014-07-311-1/+1
|
* fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-311-1/+2
|
* Use flat buttons where appropriateDominik Schürmann2014-05-081-6/+4
|
* Better handling of actionbars backDominik Schürmann2014-05-071-0/+15
|
* Fix upload of keys, closes #581Dominik Schürmann2014-04-181-2/+5
|
* Optimize importsDominik Schürmann2014-04-151-0/+2
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+127