Adithya Abraham Philip
|
14a08361e5
|
merged services
|
2015-06-01 17:41:44 +05:30 |
|
Dominik Schürmann
|
b356df900f
|
Better use HEAD instead of master to link to files
|
2015-06-01 10:26:30 +02:00 |
|
Dominik Schürmann
|
af5fc66229
|
Merge pull request #1317 from adithyaphilip/master
Merge key from Keyserver with that from Keybase instead of replacing
|
2015-06-01 10:15:46 +02:00 |
|
Dominik Schürmann
|
784dbc087e
|
Fix links to branch
|
2015-06-01 09:43:56 +02:00 |
|
Vincent Breitmoser
|
403f74f558
|
switch to native DialogFragment, fix some nullpointers
|
2015-05-31 19:45:25 +02:00 |
|
Vincent Breitmoser
|
204893a025
|
fix small non-deterministic failure case in unit test
|
2015-05-31 05:41:18 +02:00 |
|
Vincent Breitmoser
|
1bc14ab6ae
|
revert some accidentally committed cruft
|
2015-05-31 05:22:14 +02:00 |
|
Vincent Breitmoser
|
3976eadf06
|
handle empty passphrases in PassphraseDialogActivity
|
2015-05-31 05:16:41 +02:00 |
|
Adithya Abraham Philip
|
93f3a98eae
|
prevent keybase key replacing keyserver key
|
2015-05-31 02:49:11 +05:30 |
|
Vincent
|
5d87872245
|
Merge pull request #1318 from adithyaphilip/remove-nan
Prevent NaN Progress Dialog on import with no selected keys
|
2015-05-30 23:16:07 +02:00 |
|
Adithya Abraham Philip
|
cfeffef80d
|
prevent NaN dialog on import with no selected keys
|
2015-05-31 02:36:45 +05:30 |
|
Vincent Breitmoser
|
3be44898db
|
only promote subkeys which are actually present
|
2015-05-30 14:08:49 +02:00 |
|
Vincent Breitmoser
|
ef209450c6
|
some decrypt/verify bug fixes
|
2015-05-30 13:52:56 +02:00 |
|
Vincent Breitmoser
|
99fe806ea3
|
adapt unit tests to PgpDecryptVerifyInputParcel
|
2015-05-30 13:52:35 +02:00 |
|
Vincent Breitmoser
|
0d8370be1d
|
rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel
|
2015-05-30 13:25:47 +02:00 |
|
Vincent Breitmoser
|
36ecd60c1b
|
better error handling for bad encrypted data checksum
|
2015-05-30 13:09:09 +02:00 |
|
Vincent Breitmoser
|
bde58c6ff1
|
delete correct cache entries (important for yubikey pins!)
|
2015-05-30 02:47:14 +02:00 |
|
Vincent Breitmoser
|
61a6346f89
|
show status indicators in EncryptFragment
|
2015-05-30 02:24:45 +02:00 |
|
Vincent Breitmoser
|
313b4ac7d3
|
rewrite data flow in EncryptFileFragment preserve state correctly
|
2015-05-30 00:20:11 +02:00 |
|
Vincent Breitmoser
|
b9563ff2ef
|
externalize caching functionality from CertifyKeyFragment
|
2015-05-30 00:17:00 +02:00 |
|
Vincent Breitmoser
|
1406eec2dc
|
make KeyItem serializble, for state in TokenTextCompleteView
|
2015-05-30 00:16:27 +02:00 |
|
Vincent Breitmoser
|
8be6450a36
|
preserve state in DecryptFilesActivity/-Fragment
|
2015-05-29 21:38:20 +02:00 |
|
Vincent Breitmoser
|
c9f9af6603
|
preserve state in CertifyKeyFragment
|
2015-05-29 21:07:56 +02:00 |
|
Vincent Breitmoser
|
dd94c70fbe
|
fix RequiredInputParcel handling in CertifyOperation
|
2015-05-29 20:26:06 +02:00 |
|
Dominik Schürmann
|
213798dde1
|
branch info
|
2015-05-29 12:19:30 +02:00 |
|
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 |
|