aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-051-2/+3
|
* Fixed warnings encounteredAlex Fong2016-05-051-1/+1
|
* Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-051-4/+2
| | | | into ChangeUnlockParcel.
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-1/+1
| | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
* Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-291-43/+39
|
* Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-041-8/+2
|\ | | | | Refer to issue #1600 Limit create key options
| * Redesigned subkey creation dialog and changed default key type created to ↵Alex Fong2016-04-011-8/+2
| | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
* | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-231-2/+1
|/
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-4/+4
| | | | what tokens are supported
* Edit identities designDominik Schürmann2015-12-311-3/+3
|
* inline subkey editing (wip commit)Vincent Breitmoser2015-12-271-1/+2
|
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-271-1/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-64/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-9/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-8/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+1
| | | | | | |
* | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 22:57:38 +0000