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,275 Commits 12 Branches 24 Tags 116 MiB
0505af7520
Commit Graph

4275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dominik Schürmann
b1ccfc6276 Merge pull request #1270 from adithyaphilip/linked-contact-crash 
Fixed sync on key import, crash for 'me' linked contact
 2015-05-09 18:17:37 +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
64a85721cb Update contrib section in README 2015-05-08 12:54:04 +02:00
Dominik Schürmann
63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann
dbff510783 Add screenshots 2015-05-06 14:22:53 +02:00
Dominik Schürmann
dad19454e9 Pull from transifex 2015-05-06 14:04:03 +02:00
Dominik Schürmann
c0c35d383e Update function graphic 2015-05-06 14:03:52 +02:00
Dominik Schürmann
13dff41350 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-06 13:56:36 +02:00
Dominik Schürmann
5ba071c61b Update openpgp-api lib 2015-05-06 13:55:40 +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