Vincent Breitmoser
|
40703fe961
|
Merge branch 'master' into development
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
|
2015-05-28 16:37:15 +02:00 |
|
Vincent Breitmoser
|
ee02e110e7
|
don't keep an activity reference in CreateKeyFinalFragment
|
2015-05-28 16:35:03 +02:00 |
|
Vincent Breitmoser
|
8de0d9e6da
|
create keys with fixed timestamp
|
2015-05-28 16:34:41 +02:00 |
|
Vincent Breitmoser
|
eb830c6786
|
warn on signature earlier than key creation, err on significantly earlier
|
2015-05-28 16:33:45 +02:00 |
|
Vincent Breitmoser
|
5c8af1c5a5
|
don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes
|
2015-05-28 16:33:45 +02:00 |
|
Vincent Breitmoser
|
1fb7477a5a
|
correctly preserve state in EncryptTextFragment
|
2015-05-28 16:33:45 +02:00 |
|
Vincent Breitmoser
|
58583c0819
|
correctly preserve state in EncryptFilesFragment
|
2015-05-28 16:33:44 +02:00 |
|
Vincent Breitmoser
|
40ab96539c
|
move synchronous encryption into activity, and preserve checkbox state
|
2015-05-28 16:33:44 +02:00 |
|
Vincent Breitmoser
|
7c20c8df93
|
preserve state in KeySpinner, and some lint fixes
|
2015-05-28 16:33:44 +02:00 |
|
Vincent Breitmoser
|
8f3e0a9110
|
rewrite EncryptActivity data flow
|
2015-05-28 16:33:44 +02:00 |
|
Vincent Breitmoser
|
e03e1e5cfc
|
fix nullpointer in encrypttextactivity. fixes #1267
|
2015-05-28 16:33:44 +02:00 |
|
Yoshi64Bit
|
e378c47814
|
highlight currently selected item in navigation drawer
|
2015-05-28 16:33:44 +02:00 |
|
Dominik Schürmann
|
08afe42ea6
|
AssertionError instead of RuntimeException
|
2015-05-28 16:33:44 +02:00 |
|
Dominik Schürmann
|
79e356e04f
|
Change convertFingerprintToHex to use RuntimeException
|
2015-05-28 16:33:43 +02:00 |
|
Dominik Schürmann
|
0b5c66ad0d
|
Improve strings
|
2015-05-28 16:33:41 +02:00 |
|
Vincent Breitmoser
|
6e3ed1d2db
|
do nfc dispatching in MainActivity
|
2015-05-28 16:33:14 +02:00 |
|
Vincent Breitmoser
|
4ecd4389b3
|
don't keep an activity reference in CreateKeyFinalFragment
|
2015-05-28 15:02:50 +02:00 |
|
Vincent Breitmoser
|
62e65a8240
|
create keys with fixed timestamp
|
2015-05-28 14:41:26 +02:00 |
|
Vincent Breitmoser
|
724726a4fd
|
warn on signature earlier than key creation, err on significantly earlier
|
2015-05-28 11:40:35 +02:00 |
|
Vincent Breitmoser
|
a8e95f676e
|
don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes
|
2015-05-28 02:27:44 +02:00 |
|
Vincent Breitmoser
|
426d17bd0a
|
correctly preserve state in EncryptTextFragment
|
2015-05-27 23:03:04 +02:00 |
|
Vincent Breitmoser
|
56a75774d0
|
correctly preserve state in EncryptFilesFragment
|
2015-05-27 22:55:36 +02:00 |
|
Vincent Breitmoser
|
8dc9773c1e
|
move synchronous encryption into activity, and preserve checkbox state
|
2015-05-27 22:33:14 +02:00 |
|
Vincent Breitmoser
|
fed0e7db8d
|
preserve state in KeySpinner, and some lint fixes
|
2015-05-27 22:07:34 +02:00 |
|
Vincent Breitmoser
|
6c17734e73
|
rewrite EncryptActivity data flow
|
2015-05-27 21:15:36 +02:00 |
|
Vincent Breitmoser
|
08e0357471
|
fix nullpointer in encrypttextactivity. fixes #1267
|
2015-05-27 18:18:34 +02:00 |
|
Yoshi64Bit
|
8a15d28ed9
|
highlight currently selected item in navigation drawer
|
2015-05-23 07:49:45 +02:00 |
|
Dominik Schürmann
|
1651f9fb61
|
AssertionError instead of RuntimeException
|
2015-05-21 13:32:22 +02:00 |
|
Dominik Schürmann
|
0456e04c1a
|
Change convertFingerprintToHex to use RuntimeException
|
2015-05-21 11:00:52 +02:00 |
|
Dominik Schürmann
|
95875d727e
|
Version 3.2.2
|
2015-05-21 10:35:31 +02:00 |
|
Dominik Schürmann
|
43d9e2ba76
|
Version 3.2.2
|
2015-05-21 10:34:39 +02:00 |
|
Dominik Schürmann
|
7e55ba1b36
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2015-05-21 10:32:15 +02:00 |
|
Dominik Schürmann
|
6b6ca4c18e
|
Fix language based on feedback from transifex
|
2015-05-21 10:32:07 +02:00 |
|
Dominik Schürmann
|
ab63fa8091
|
Fix language based on feedback from transifex
|
2015-05-21 10:31:46 +02:00 |
|
Vincent Breitmoser
|
f30900d085
|
add user id flags to UserAttribute self signatures
|
2015-05-20 12:47:23 +02:00 |
|
Dominik Schürmann
|
0df51b6140
|
Fix fingerprint length check in QR Code import
|
2015-05-19 19:09:39 +02:00 |
|
Dominik Schürmann
|
79b7cec94a
|
Use Mode.ALPHANUMERIC for QR codes to save space
|
2015-05-19 19:09:32 +02:00 |
|
Dominik Schürmann
|
2cdaa75b01
|
Fix fingerprint length check in QR Code import
|
2015-05-19 19:07:58 +02:00 |
|
Dominik Schürmann
|
c8266203f8
|
Use Mode.ALPHANUMERIC for QR codes to save space
|
2015-05-19 18:27:04 +02:00 |
|
Dominik Schürmann
|
0f520975e4
|
Improve strings
|
2015-05-19 16:12:04 +02:00 |
|
Vincent Breitmoser
|
4885361cd2
|
check fingerprint length after scanning qr code
Fixes #1281
|
2015-05-17 10:37:03 +02:00 |
|
Vincent Breitmoser
|
b62ad4d79c
|
check fingerprint length after scanning qr code
Fixes #1281
|
2015-05-17 10:36:30 +02:00 |
|
Vincent Breitmoser
|
fb96b6dfa9
|
open ViewKeyActivity by subkey in NfcBaseActivity
|
2015-05-17 02:14:27 +02:00 |
|
Vincent Breitmoser
|
a79d7bd1c2
|
simplify MainActivity and fix backstack issues
|
2015-05-17 02:13:51 +02:00 |
|
Vincent Breitmoser
|
b430ba51eb
|
do nfc dispatching in MainActivity
|
2015-05-17 02:09:58 +02:00 |
|
Vincent Breitmoser
|
bd8e45b556
|
open ViewKeyActivity by subkey in NfcBaseActivity
|
2015-05-17 01:57:26 +02:00 |
|
Vincent Breitmoser
|
cd0d84d10d
|
simplify MainActivity and fix backstack issues
|
2015-05-17 01:46:00 +02:00 |
|
Vincent Breitmoser
|
064c9d461f
|
re-parcel log in LogDisplayFragment
|
2015-05-17 01:17:01 +02:00 |
|
Vincent Breitmoser
|
3a27a28c0a
|
re-parcel log in LogDisplayFragment
|
2015-05-17 01:13:41 +02:00 |
|
Vincent Breitmoser
|
765990ed13
|
fingerprints are 20 bytes, not 40. duh.
|
2015-05-17 01:04:34 +02:00 |
|
Vincent Breitmoser
|
9a6f581400
|
load yubikey fragment after mMasterKeyId is available
|
2015-05-17 01:04:32 +02:00 |
|
Vincent Breitmoser
|
158263f255
|
apply promote operation to specific subkeys present on yubikey only
|
2015-05-17 01:04:31 +02:00 |
|
Vincent Breitmoser
|
71818934ca
|
pass masterKeyId to yubikey fragment
|
2015-05-17 01:04:27 +02:00 |
|
Vincent Breitmoser
|
f6643962af
|
allow state loss when yubikey fragment is loaded
|
2015-05-17 01:04:25 +02:00 |
|
Vincent Breitmoser
|
d06ae7f691
|
yubikey: don't assume signing key is masterKeyId in ViewKeyActivity
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
|
2015-05-17 01:04:22 +02:00 |
|
Vincent Breitmoser
|
b509c3ed39
|
fix fragment handling in ViewKeyActivity
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
|
2015-05-17 01:04:19 +02:00 |
|
Vincent Breitmoser
|
7e5e0df0bc
|
fingerprints are 20 bytes, not 40. duh.
|
2015-05-17 00:59:50 +02:00 |
|
Vincent Breitmoser
|
48f6e20f6c
|
load yubikey fragment after mMasterKeyId is available
|
2015-05-17 00:54:14 +02:00 |
|
Vincent Breitmoser
|
c1e7fcf024
|
apply promote operation to specific subkeys present on yubikey only
|
2015-05-17 00:35:10 +02:00 |
|
Vincent Breitmoser
|
f554cc9c93
|
pass masterKeyId to yubikey fragment
|
2015-05-16 23:59:04 +02:00 |
|
Vincent Breitmoser
|
4b2c8a1309
|
allow state loss when yubikey fragment is loaded
|
2015-05-16 23:30:32 +02:00 |
|
Vincent Breitmoser
|
a81474b7a5
|
yubikey: don't assume signing key is masterKeyId in ViewKeyActivity
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
|
2015-05-16 23:30:32 +02:00 |
|
Vincent Breitmoser
|
022fde29ae
|
fix fragment handling in ViewKeyActivity
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
|
2015-05-16 23:30:32 +02:00 |
|
Joey Castillo
|
2d3f745c36
|
Removing unused SubkeyChange constructor.
|
2015-05-13 17:56:18 -04:00 |
|
Joey Castillo
|
aa75534e5b
|
Moving blank smart card messages to strings.xml
|
2015-05-13 17:56:17 -04:00 |
|
Joey Castillo
|
bc48ce4210
|
Add check for exporting two keys to same smart card slot.
|
2015-05-13 17:56:17 -04:00 |
|
Joey Castillo
|
de2006a61f
|
Bugfixes and changes based on feedback
|
2015-05-13 17:56:12 -04:00 |
|
Joey Castillo
|
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 |
|
Joey Castillo
|
d21fb77336
|
Moving keytocard process into PgpKeyOperation.
|
2015-05-13 14:36:30 -04:00 |
|
Joey Castillo
|
a0107afd3e
|
Moved checks from fragment to operation, impoved logging.
|
2015-05-12 17:31:14 -04:00 |
|
Joey Castillo
|
76241e90ad
|
Adding NFC Key to Card operation, accessible from Edit Key activity.
|
2015-05-12 14:44:26 -04:00 |
|
Dominik Schürmann
|
5c44f84009
|
3.2.1
|
2015-05-10 13:16:37 +02:00 |
|
Dominik Schürmann
|
a35594201a
|
Fixing rotate crashes in create key
|
2015-05-10 13:16:03 +02:00 |
|
Dominik Schürmann
|
e4b7920edc
|
Fix crash with v3 key fingerprints
|
2015-05-10 12:11:35 +02:00 |
|
Dominik Schürmann
|
0a29f6d3ac
|
Cleanup
|
2015-05-10 11:52:39 +02:00 |
|
Dominik Schürmann
|
5b1bf888b4
|
Reformat manifest
|
2015-05-10 11:15:10 +02:00 |
|
Dominik Schürmann
|
e14a2efcad
|
Fixes and clarifications to app signature (or better certificate) pinning
|
2015-05-10 03:31:19 +02:00 |
|
Dominik Schürmann
|
6e326fb000
|
Add self-encrypt for old API
|
2015-05-10 03:00:42 +02:00 |
|
Adithya Abraham Philip
|
797cd28997
|
fixed sync on key import, 'me' linked contact crash
|
2015-05-08 19:05:21 +05:30 |
|
Dominik Schürmann
|
63022aa96a
|
Version 3.2
|
2015-05-06 14:32:17 +02:00 |
|
Dominik Schürmann
|
dad19454e9
|
Pull from transifex
|
2015-05-06 14:04:03 +02:00 |
|
Vincent Breitmoser
|
91d500b20d
|
check for fingerprint of any subkey (arguable?)
|
2015-05-06 11:26:01 +02:00 |
|
Dominik Schürmann
|
a45aaa2277
|
Fix import of keyring with pub+sec key with same key id
|
2015-05-06 04:10:27 +02:00 |
|
Dominik Schürmann
|
d2998ea80d
|
Rename for consistency
|
2015-05-06 03:37:57 +02:00 |
|
Dominik Schürmann
|
8de6589c9d
|
Renaming for consisitency
|
2015-05-06 03:29:04 +02:00 |
|
Dominik Schürmann
|
f102ae5da5
|
Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity
|
2015-05-06 03:26:42 +02:00 |
|
Dominik Schürmann
|
afc91fb918
|
Switch to new library repos
|
2015-05-06 00:08:04 +02:00 |
|
Dominik Schürmann
|
f87d21a661
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-05-05 09:27:07 +02:00 |
|
Dominik Schürmann
|
e3f5c6d01e
|
Cleanup manifest
|
2015-05-05 09:26:57 +02:00 |
|
Dominik Schürmann
|
855b8c4ef9
|
Fix nullpointer in file decryption
|
2015-05-05 09:05:39 +02:00 |
|
William Faulk
|
aba9c884ce
|
revert unneeded changes for short key ID
|
2015-05-04 17:15:51 -04:00 |
|
William Faulk
|
7e7892ff2e
|
revert unneeded changes for old temp Bluetooth share file
|
2015-05-04 17:15:10 -04:00 |
|
William Faulk
|
44b47e185d
|
use single file extension
|
2015-05-04 17:09:59 -04:00 |
|
William Faulk
|
eabc6cd8d4
|
use TemporaryStorageProvider for Bluetooth Share
|
2015-05-04 16:49:30 -04:00 |
|
William Faulk
|
af1809eebc
|
Use FILE_EXTENSION constants
|
2015-05-04 16:46:16 -04:00 |
|
William Faulk
|
be3e52884f
|
Use primary user ID for filename instead of short key ID
|
2015-05-04 16:46:15 -04:00 |
|
William Faulk
|
6383d19dd3
|
Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater
|
2015-05-04 16:46:15 -04:00 |
|
William Faulk
|
b06e7cd737
|
Fix Bluetooth share without breaking others
|
2015-05-04 16:46:15 -04:00 |
|
Dominik Schürmann
|
291f95db5a
|
Fix revoked/expired state in decrypt activity
|
2015-05-04 21:13:07 +02:00 |
|
Dominik Schürmann
|
2583f77f07
|
Fix cancel/skip in create key wizard
|
2015-05-04 20:47:19 +02:00 |
|