Vincent Breitmoser
|
e174b8af3b
|
Merge remote-tracking branch 'origin/master' into development
|
2015-05-29 11:41:02 +02:00 |
|
Vincent Breitmoser
|
25d0325c5f
|
Merge remote-tracking branch 'origin/development' into development
|
2015-05-29 11:31:48 +02:00 |
|
Dominik Schürmann
|
b794719020
|
Version 3.2.3
|
2015-05-29 02:33:04 +02:00 |
|
Dominik Schürmann
|
0bbd235380
|
Version 3.2.3
|
2015-05-29 02:27:30 +02:00 |
|
Vincent Breitmoser
|
4c1ddd7743
|
Partially revert "make masterKeyId and subKeyId strictly required in CryptoInputParcel"
We do need empty masterKeyIds for symmetric passphrases, whoops :)
|
2015-05-28 23:14:03 +02:00 |
|
Vincent Breitmoser
|
38d8f4be52
|
Merge remote-tracking branch 'origin/master' into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
OpenKeychain/src/main/res/values/strings.xml
|
2015-05-28 23:05:41 +02:00 |
|
Vincent Breitmoser
|
2bbb9b9608
|
update database to trigger consolidate
|
2015-05-28 22:43:10 +02:00 |
|
Vincent Breitmoser
|
c4d392051c
|
improve robustness of SecretKeyType handling
|
2015-05-28 22:34:02 +02:00 |
|
Vincent Breitmoser
|
c8f788b925
|
set to stripped by default, rather than "unavailable"
|
2015-05-28 22:22:24 +02:00 |
|
Vincent Breitmoser
|
b2f32827c6
|
allow user packets with only revocation packet
|
2015-05-28 22:00:08 +02:00 |
|
Vincent Breitmoser
|
007bbdda2b
|
respect cache in yubikey pin data flow
|
2015-05-28 19:27:56 +02:00 |
|
Vincent Breitmoser
|
18844a20bb
|
make masterKeyId and subKeyId strictly required in CryptoInputParcel
|
2015-05-28 19:16:36 +02:00 |
|
Vincent Breitmoser
|
1deb5dbfda
|
preserve state in DecryptTextActivity
|
2015-05-28 18:55:34 +02:00 |
|
Vincent Breitmoser
|
34c26fe5d1
|
shorten fp data to 20 bytes for convertFingerprintToHex in NfcBaseOperation
|
2015-05-28 17:33:42 +02:00 |
|
Vincent Breitmoser
|
1463bae1b4
|
fix merge problems (derp)
|
2015-05-28 17:32:21 +02:00 |
|
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 |
|
Dominik Schürmann
|
1fcd9d3fde
|
zxing lib is now on jcenter, see https://github.com/journeyapps/zxing-android-embedded/issues/39
|
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 |
|
Vincent
|
c4b774f7b8
|
Merge pull request #1293 from Yoshi64Bit/development
highlight currently selected item in navigation drawer
|
2015-05-23 11:14:20 +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 |
|