Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -1/+1 |
| | |||||
* | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 1 | -13/+6 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -4/+1 |
| | |||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -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-card | Vincent Breitmoser | 2015-01-24 | 1 | -5/+7 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 1 | -1/+2 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 1 | -25/+25 |
| | |||||
* | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -22/+25 |
| | |||||
* | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 1 | -3/+8 |
| | | | | capabilities | ||||
* | Use passphrase dialog activity instead of passphrase dialog | Dominik Schürmann | 2014-10-25 | 1 | -23/+32 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -5/+3 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -2/+3 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -0/+3 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -3/+0 |
| | |||||
* | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 1 | -1/+1 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -1/+1 |
| | |||||
* | Fix custom key configuration for primary user ids | Dominik Schürmann | 2014-09-21 | 1 | -5/+17 |
| | |||||
* | Feature to change key configuration in create key | Dominik Schürmann | 2014-09-21 | 1 | -29/+80 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -1/+1 |
| | | | | created ui.util for everything related to formatting | ||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -7/+7 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -4/+4 |
| | |||||
* | add ui support for stripping subkeys | Vincent Breitmoser | 2014-09-11 | 1 | -0/+8 |
| | |||||
* | introduce SingletonResult for... singleton results | Vincent Breitmoser | 2014-09-08 | 1 | -6/+2 |
| | |||||
* | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -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 decryption | Dominik Schürmann | 2014-09-08 | 1 | -0/+1 |
| | |||||
* | make EditKeyFragment work with new PassphraseDialog | Vincent Breitmoser | 2014-09-07 | 1 | -40/+40 |
| | |||||
* | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -4/+6 |
| | |||||
* | Fix nullpointer when revoking keys | Dominik Schürmann | 2014-08-21 | 1 | -1/+2 |
| | |||||
* | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 1 | -2/+2 |
| | |||||
* | Fix expiry when adding subkeys | Dominik Schürmann | 2014-08-16 | 1 | -1/+0 |
| | |||||
* | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+7 |
| | |||||
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -2/+8 |
| | |||||
* | Edit key: prevent the combination of change to primary user id and revocation | Dominik Schürmann | 2014-08-07 | 1 | -0/+4 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -2/+1 |
| | |||||
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -1/+0 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -4/+5 |
| | | | | selection for adding new subkeys | ||||
* | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 1 | -2/+3 |
| | |||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -22/+11 |
| | |||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -10/+19 |
| | |||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 1 | -3/+16 |
| | |||||
* | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -9/+35 |
| | |||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -4/+3 |
| | |||||
* | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -6/+4 |
| | |||||
* | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -3/+11 |
| | |||||
* | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -3/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -7/+35 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | more work on edit key | Dominik Schürmann | 2014-07-12 | 1 | -7/+35 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -2/+51 |
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | ||||
| * | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -1/+50 |
| | | |||||
* | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 1 | -11/+11 |
|/ |