moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity
4,302 Commits 12 Branches 24 Tags 116 MiB
66e7876abd
Commit Graph

2247 Commits

Author SHA1 Message Date
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
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
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
874da746ea Add dontnote to proguard 2015-05-10 10:44:04 +02:00
Dominik Schürmann
3c0f82970c Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
Dominik Schürmann
bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +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