aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-1/+3
|
* added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-131-1/+0
|
* implemented revocation on deletionAdithya Abraham Philip2015-07-131-0/+1
|
* use QueueingCryptoOperationFragment in all other placesVincent Breitmoser2015-07-071-6/+9
|
* Disable move to card from edit screenDominik Schürmann2015-07-021-37/+43
|
* made CryptoOperationFragment implement OperationHelper.CallbackAdithya Abraham Philip2015-06-301-2/+2
|
* deleted KeychainServiceAdithya Abraham Philip2015-06-271-8/+6
|
* eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-061-74/+23
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-7/+7
|
* merged servicesAdithya Abraham Philip2015-06-011-4/+2
|
* Bugfixes and changes based on feedbackJoey Castillo2015-05-131-12/+22
|
* Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵Joey Castillo2015-05-131-10/+8
| | | | keytocard; operation unsets it and fills in dummyDivert to finish it.
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-44/+33
|
* Moved checks from fragment to operation, impoved logging.Joey Castillo2015-05-121-32/+9
|
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-1/+80
|
* More cleanupDominik Schürmann2015-04-151-3/+1
|
* Fix certify with CryptoInputParcelDominik Schürmann2015-03-251-1/+1
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-9/+6
|\ | | | | | | | | | | | | | | | | | | | | | | 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-9/+5
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-2/+2
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Reworked Notify classManoj Khanna2015-03-201-2/+2
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-1/+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-5/+6
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-64/+22
|/
* object oriented split user idDominik Schürmann2015-03-161-1/+1
|
* Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-121-1/+1
|\ | | | | #1042: Replaced ints with enums
| * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+0
|/
* Material Design: Full screen dialogsDominik Schürmann2015-01-261-13/+6
|
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-4/+1
|
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-1/+1
| | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-241-5/+7
|
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-1/+2
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* Clearup after lockpattern experimentsDominik Schürmann2015-01-061-25/+25
|
* Passphrase wizard testsDominik Schürmann2015-01-061-22/+25
|
* introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-291-3/+8
| | | | capabilities
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-251-23/+32
|
* move around package structure a bitVincent Breitmoser2014-10-101-5/+3
|
* Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-091-2/+3
|
* Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-0/+3
| | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.
* Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-3/+0
|
* DecryptTextActivity reworkDominik Schürmann2014-09-231-1/+1
|
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-1/+1
|
* Fix custom key configuration for primary user idsDominik Schürmann2014-09-211-5/+17
|
* Feature to change key configuration in create keyDominik Schürmann2014-09-211-29/+80
|
* 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
* work on OperationResultParcelVincent Breitmoser2014-09-141-7/+7
|
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-4/+4
|
* add ui support for stripping subkeysVincent Breitmoser2014-09-111-0/+8
|
* introduce SingletonResult for... singleton resultsVincent Breitmoser2014-09-081-6/+2
|