moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-04 14:32:16 -05:00
Code Issues Releases Wiki Activity
3,899 Commits 12 Branches 24 Tags 116 MiB
850a374788
Commit Graph

3899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
a59584f230 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:10:04 +02:00
Dominik Schürmann
700ee0f202 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:04:26 +02:00
Dominik Schürmann
b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann
f7d49a48cb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 01:49:50 +02:00
Dominik Schürmann
3850ddea08 DecryptFiles: Reset state for new file decrytion 2014-09-24 01:46:54 +02:00
Vincent Breitmoser
c871891f49 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
 2014-09-24 01:42:17 +02:00
Vincent Breitmoser
7654cd54fb fix signing in OK with yubikeys 2014-09-24 01:41:40 +02:00
Dominik Schürmann
6e0938aa93 Fix new decrypt button 2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e cleanup 2014-09-24 01:38:18 +02:00
Vincent Breitmoser
d588b13255 fix signatures produced by yubikey 
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.

Fixes #834
 2014-09-24 01:37:28 +02:00
Dominik Schürmann
42a7cd5eb0 Button text for decrypt 2014-09-24 01:37:00 +02:00
Dominik Schürmann
7f2640711e Fix yubikey file decryption 2014-09-24 01:18:14 +02:00
Dominik Schürmann
0182f7c951 Yubikey text decryption working 2014-09-24 00:57:57 +02:00
Dominik Schürmann
07704c2726 Yubikey decryption 2014-09-24 00:50:58 +02:00
Dominik Schürmann
7c82e1c728 DecryptFilesActivity 2014-09-24 00:02:00 +02:00
Vincent Breitmoser
07e8729abf fix nullpointer in previous swipetorefresh fix 2014-09-23 23:49:18 +02:00
Dominik Schürmann
0143b54e9e Implement buttons in DecryptTextFragment 2014-09-23 23:38:30 +02:00
Dominik Schürmann
b9347ea9aa Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-23 23:04:27 +02:00
Dominik Schürmann
9f67b0fe54 DecryptTextActivity rework 2014-09-23 23:04:18 +02:00
Vincent Breitmoser
ab4972b428 missed a secondary preference initialization 2014-09-23 19:17:54 +02:00
Vincent Breitmoser
5e090e6fb6 fix nullpointer ImportKeysListEntry (from pulltorefresh) 
Fixes #873
 2014-09-23 19:02:08 +02:00
Vincent Breitmoser
45b7b88b94 disable pull to refresh in upper right corner 
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.

Closes #858
 2014-09-23 18:48:39 +02:00
Vincent Breitmoser
c5239d6e9b be more precise on importresult overall error 2014-09-23 16:23:13 +02:00
Vincent Breitmoser
da1779816b take failed keys into account in importkeyresult notification 2014-09-23 16:19:01 +02:00
Vincent Breitmoser
bf9a708e84 fix test case for new PassphraeCacheInterface 2014-09-23 16:16:16 +02:00
Vincent Breitmoser
070017b12f passphrasecache: cache by master key, introduce preference for cache by subkey 2014-09-23 15:56:48 +02:00
Vincent Breitmoser
675e8e2015 add test case to make sure s2k IVs are different per subkey 2014-09-23 14:53:44 +02:00
Vincent Breitmoser
9d9d71f3db reject keys with duplicate subkeys altogether 
closes #870
 2014-09-23 01:36:46 +02:00
Vincent Breitmoser
3759d74ac8 add test case for duplicate keys in keyring (#870) 2014-09-23 01:32:36 +02:00
Vincent Breitmoser
862c9a8b3c log "unspecified" flags differently 2014-09-22 17:02:53 +02:00
Vincent Breitmoser
f6ac887ce0 nicer code in key import for flag log types 2014-09-22 16:47:29 +02:00
Vincent Breitmoser
029ce91670 show authenticate flag in logs 2014-09-22 16:27:42 +02:00
Vincent Breitmoser
3f39cf92c6 stronger divert-to-card test case 2014-09-22 16:27:26 +02:00
Dominik Schürmann
d63fabace7 Hack to fix #805 2014-09-22 00:10:55 +02:00
Dominik Schürmann
fc4cdaa24b Fix possible nullpointer in ImportKeysFileFragment 2014-09-21 23:25:41 +02:00
Dominik Schürmann
db7da6525e Fix custom key configuration for primary user ids 2014-09-21 23:19:21 +02:00
Dominik Schürmann
f50c0e1905 Fix LogDisplayFragment 2014-09-21 22:56:16 +02:00
Dominik Schürmann
65c3d69d9a Fix ConsolidateResult, needed parcelable methods 2014-09-21 22:31:28 +02:00
Dominik Schürmann
1dd68c7120 Merge pull request #871 from timbray/master 
Handle absence of personal information in Keybase search result
 2014-09-21 21:48:13 +02:00
Dominik Schürmann
bf0104af2e Feature to change key configuration in create key 2014-09-21 21:50:56 +02:00
Tim Bray
edf87d09cb Handle absence of personal information in Keybase search result 2014-09-21 10:24:48 -07:00
Dominik Schürmann
d4387c0179 Add null check to getSecretKeyType 2014-09-21 18:27:03 +02:00
Dominik Schürmann
1f5f937d00 Small UI fixes 2014-09-21 18:10:51 +02:00
Dominik Schürmann
9bd3383b49 Merge user ids in import list for better display 2014-09-21 17:58:26 +02:00
Dominik Schürmann
1d38365a61 key spinner fixes 2014-09-21 12:03:25 +02:00
Dominik Schürmann
08ad0cb305 settings code cleanup 2014-09-21 11:02:29 +02:00
Dominik Schürmann
0335b99516 update keybase lib 2014-09-21 09:28:38 +02:00
Dominik Schürmann
b06fe773cf New key flags icons, subkey adapter redesign, support authanticate flag in database 2014-09-20 20:36:37 +02:00
Dominik Schürmann
da4a70c513 no monospace for key ids 2014-09-20 18:12:13 +02:00
Vincent Breitmoser
6062b5ef68 fix isLocal logic (f*ck yeah unit tests!) 2014-09-20 00:32:50 +02:00