aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* 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 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.
* | | 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
| * | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+0
| |/
* / work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+1
|/
* 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
|
* Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-9/+39
| | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828
* Work on Yubikey decryptionDominik Schürmann2014-09-081-0/+1
|
* make EditKeyFragment work with new PassphraseDialogVincent Breitmoser2014-09-071-40/+40
|
* add cancel support to edit key actionVincent Breitmoser2014-08-311-4/+6
|
* Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
|
* Fixes for expiry UIDominik Schürmann2014-08-181-2/+2
|
* Fix expiry when adding subkeysDominik Schürmann2014-08-161-1/+0
|
* handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+7
|
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-131-2/+8
|
* Edit key: prevent the combination of change to primary user id and revocationDominik Schürmann2014-08-071-0/+4
|
* Optimize importsDominik Schürmann2014-08-051-2/+1
|
* Edit key: key flagsDominik Schürmann2014-08-051-1/+0
|
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵Dominik Schürmann2014-08-051-4/+5
| | | | selection for adding new subkeys
* Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-2/+3
|
* Refactor expiry dialogDominik Schürmann2014-08-051-22/+11
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-10/+19
|
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-041-3/+16
|
* Add user id with dialogDominik Schürmann2014-08-011-9/+35
|
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-4/+3
|
* introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-6/+4
|
* some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-3/+11
|
* some fixes for editDominik Schürmann2014-07-151-3/+4
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 01:07:02 +0000