14a08361e5
merged services
2015-06-01 17:41:44 +05:30
de2006a61f
Bugfixes and changes based on feedback
2015-05-13 17:56:12 -04:00
28b9068ae0
Adding keytocard flag to SubkeyChange: UI sets this flag to initiate keytocard; operation unsets it and fills in dummyDivert to finish it.
2015-05-13 14:36:34 -04:00
d21fb77336
Moving keytocard process into PgpKeyOperation.
2015-05-13 14:36:30 -04:00
a0107afd3e
Moved checks from fragment to operation, impoved logging.
2015-05-12 17:31:14 -04:00
76241e90ad
Adding NFC Key to Card operation, accessible from Edit Key activity.
2015-05-12 14:44:26 -04:00
e332699c9c
More cleanup
2015-04-15 10:10:53 +02:00
1ef63f3187
Fix certify with CryptoInputParcel
2015-03-25 11:12:52 +01:00
040cf42cb0
Merge branch 'development' into v/crypto-input-parcel
...
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
2015-03-24 13:19:43 +01:00
9f5581463f
shifted multi-threading to own service
...
added multi-threaded cloud import, restored KeychainIntentService
eliminated code duplication in multi-threaded import
2015-03-23 15:37:05 +05:30
9ef2795fcd
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
4e4b8efd6e
Reworked Notify class
2015-03-20 19:49:42 +05:30
abce05d529
Merge remote-tracking branch 'origin/development' into development
...
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
2015-03-20 14:01:07 +01:00
3b04636f5d
support yubikeys in (some) edit key operations
2015-03-20 02:28:22 +01:00
9c9f95c7ac
New Passphrase class for safer passphrase handling in memory
2015-03-19 03:03:46 +01:00
a655664c0b
object oriented split user id
2015-03-16 13:54:01 +01:00
183457334f
Merge pull request #1117 from danielnelz/development
...
#1042 : Replaced ints with enums
2015-03-12 13:27:04 +01:00
bce0fe6221
Add additional email addresses in create key
2015-03-10 01:44:07 +01:00
17301be2ca
Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType
...
in KeychainIntentService and replaced int constants with them. Fixed some
typos.
2015-03-09 20:09:05 +01:00
e4e2d647c8
Material Design: Full screen dialogs
2015-01-26 00:50:35 +01:00
8d9c3c0534
lift language level to java 7, and some code cleanup
2015-01-25 12:36:00 +01:00
1516f951b7
work on divert-to-key and other keyring stuff
...
- 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
2015-01-25 01:57:58 +01:00
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
2b1c5358b7
make user_ids table typed, with attribute_data support
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2015-01-14 00:02:53 +01:00
6ec85b0550
Clearup after lockpattern experiments
2015-01-06 19:29:51 +01:00
e34ad18ed2
Passphrase wizard tests
2015-01-06 14:52:07 +01:00
576e6fd0cc
introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities
2014-12-29 23:12:11 +01:00
c1ef9ed149
Use passphrase dialog activity instead of passphrase dialog
2014-10-25 22:53:35 +02:00
fe981e5498
move around package structure a bit
2014-10-10 19:59:25 +02:00
45b02008fb
Replace many PgpGeneralExceptions with PgpKeyNotFoundException
2014-10-09 01:37:44 +02:00
b3f56c927b
Revert "Replace PgpGeneralException with NotFoundException where appropriate"
...
This reverts commit 49b4ff6312
2014-10-09 00:59:45 +02:00
49b4ff6312
Replace PgpGeneralException with NotFoundException where appropriate
2014-10-09 00:58:07 +02:00
9f67b0fe54
DecryptTextActivity rework
2014-09-23 23:04:18 +02:00
070017b12f
passphrasecache: cache by master key, introduce preference for cache by subkey
2014-09-23 15:56:48 +02:00
db7da6525e
Fix custom key configuration for primary user ids
2014-09-21 23:19:21 +02:00
bf0104af2e
Feature to change key configuration in create key
2014-09-21 21:50:56 +02:00
b09d222f34
package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting
2014-09-17 21:51:25 +02:00
36ef8a9a62
work on OperationResultParcel
2014-09-14 01:14:58 +02:00
19252380f1
promote all result parcels to top level classes in their own package
2014-09-13 14:36:23 +02:00
4e834d7833
add ui support for stripping subkeys
2014-09-11 22:50:44 +02:00
ceea2667e8
introduce SingletonResult for... singleton results
2014-09-08 14:50:16 +02:00
055fb59ec3
Properly handle uneditable key types in EditKeyFragment
...
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.
part of #828
2014-09-08 14:35:15 +02:00
518d7116e2
Work on Yubikey decryption
2014-09-08 14:04:46 +02:00
31cc004fe1
make EditKeyFragment work with new PassphraseDialog
2014-09-07 16:55:07 +02:00
e46bc24079
add cancel support to edit key action
2014-08-31 19:20:08 +02:00
562e379c56
Fix nullpointer when revoking keys
2014-08-21 11:40:48 +02:00
3e7ce0008f
Fixes for expiry UI
2014-08-18 11:02:41 +02:00
4d698c896a
Fix expiry when adding subkeys
2014-08-16 12:28:49 +02:00
9af301ec77
handle modify and save errors in KeychainIntentResult
2014-08-14 17:12:17 +02:00
38da2af0e8
Better error handling for passphrase cache if key is missing
2014-08-13 16:37:28 +02:00
Adithya Abraham Philip