cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,243 Commits 1 Branch 0 Tags
1406eec2dc0a1db72e7f69cd14642f4324eacf63
Commit Graph
4243 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent BreitmoserandVincent Breitmoser 46cc7f8174 tests: add attribute to PgpKeyOperationTest 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
Dominik Schürmann 8c97bee14c zxing lib is now on jcenter, see https://github.com/journeyapps/zxing-android-embedded/issues/39 2015-05-15 13:31:01 +02:00
Vincent 5f6421e82b Merge pull request #1278 from josecastillo/nfckeytocard 
Support for moving RSA keys to Yubikey or NFC smart card
 2015-05-15 12:42:42 +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 0504033c6b Adding unit tests for PgpKeyOperation keytocard functionality. 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