aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-271-2/+28
|
* rewrite EncryptActivity data flowVincent Breitmoser2015-05-271-0/+77
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-189/+0
|
* pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-5/+3
|
* Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-1/+0
|
* 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
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-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 memoryDominik Schürmann2015-03-191-3/+4
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-4/+2
| |
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-4/+4
| |
* | generalize nfc crypto input structureVincent Breitmoser2015-03-181-22/+27
|/
* Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-091-1/+0
|\
| * Fix compression check in activitiesDominik Schürmann2015-03-091-1/+0
| |
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
|/ | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* Redesign of encrypt activites finishedDominik Schürmann2015-03-091-0/+33
|
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-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 fixesDominik Schürmann2015-01-271-1/+1
|
* Material Design DrawerDominik Schürmann2015-01-261-1/+1
|
* move around package structure a bitVincent Breitmoser2014-10-101-1/+1
|
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-2/+3
|
* Fix NfcActivity task stack problemDominik Schürmann2014-09-291-1/+0
|
* move more stuff into EncryptActivity superclassVincent Breitmoser2014-09-241-1/+112
|
* Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵Dominik Schürmann2014-09-241-4/+0
| | | | need to separate
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-241-10/+1
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
| * Yubikey decryptionDominik Schürmann2014-09-241-4/+1
| |
| * Implement buttons in DecryptTextFragmentDominik Schürmann2014-09-231-7/+0
| |
* | fix signing in OK with yubikeysVincent Breitmoser2014-09-241-1/+3
|/
* Passphrase handling in encryptDominik Schürmann2014-09-171-12/+18
|
* Result parcel refactorings (WIP)Dominik Schürmann2014-09-171-0/+37
|
* split EncryptActivity into Encrypt{Text,File}ActivityVincent Breitmoser2014-09-011-626/+0
|
* Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
|
* Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
|
* Fix mime types, #781mar-v-in2014-08-191-1/+1
|
* Remove NoSwipeWrapContentViewPagermar-v-in2014-08-171-21/+20
|
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-131-11/+15
|
* remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-131-13/+5
|
* fix message and uri from encrypt intentmar-v-in2014-08-131-8/+4
|
* Support mime type in metadataDominik Schürmann2014-08-111-1/+0
|
* Get original filename for decryptionDominik Schürmann2014-08-111-5/+4
|
* Fix compression setting for encryption of filesDominik Schürmann2014-08-101-4/+7
|
* More cleanupDominik Schürmann2014-08-041-3/+4
|
* Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
|
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-2/+74
|
* Smaller UI fixesDominik Schürmann2014-08-041-1/+1
|
* Minor cleanupmar-v-in2014-08-021-1/+0
|
* Encrypt UI (drop downs)mar-v-in2014-08-011-2/+1
|
* Fix string resourcesmar-v-in2014-07-311-1/+1
|
* Fix mergemar-v-in2014-07-311-13/+17
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 07:04:57 +0000