cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,504 Commits 1 Branch 0 Tags
b3a8069f6a316a2313c92ae26dc0142ed083aadc
Commit Graph

6504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
b3a8069f6a strings: Generic -> Unknown 2017-10-28 12:44:04 +02:00
Dominik Schürmann
5b7851d6e7 Merge pull request #2195 from open-keychain/ccid-check 
Change USB filtering
 2017-10-28 12:42:43 +02:00
Vincent Breitmoser
95034e36b1 fix unit test 2017-10-26 17:44:13 +02:00
Vincent Breitmoser
b6236bde59 determine token type during connect 2017-10-26 17:20:13 +02:00
Vincent Breitmoser
8649332bdc don't distinguish unknown tokens by transport 2017-10-26 17:20:13 +02:00
Dominik Schürmann
ed4e21957c Better error handling for generic IOException 2017-10-26 17:20:13 +02:00
Dominik Schürmann
0920d97572 Check for security token support 2017-10-26 17:20:13 +02:00
Dominik Schürmann
e7705eaca8 Use constants for vendor and product IDs 2017-10-26 17:20:12 +02:00
Vincent Breitmoser
14b74b7590 add token transport and type to SecurityTokenInfo 2017-10-26 17:19:22 +02:00
Dominik Schürmann
0ca46c46aa Route all class 11 USB devices to OpenKeychain, some class 3 for info 2017-10-26 12:28:32 +02:00
Dominik Schürmann
60b970b060 Merge pull request #2186 from open-keychain/apdu-refactor 
Refactor OpenPGP applet communication code
 2017-10-26 12:26:55 +02:00
Dominik Schürmann
07243bcefe Merge pull request #2197 from hagau/fix_npe_dedup 
Fix NPE upon dialog dismissal in RemoteDeduplicatePresenter
 2017-10-26 12:02:11 +02:00
Christian Hagau
c435c3ec22 Fix NPE upon dialog dismissal 2017-10-25 00:00:00 +00:00
Vincent Breitmoser
0bb32fad2a Merge pull request #2194 from open-keychain/remove-fp-color 
Remove colorization of fingerprints
 2017-10-24 01:17:46 +02:00
Vincent Breitmoser
f41debb0e9 Merge pull request #2193 from hagau/fix_notifications 
Fix showing of some notifications
 2017-10-23 21:17:05 +02:00
Vincent Breitmoser
7eb37a89d8 reduce number of token roundtrips used to obtain SecurityTokenInfo 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
2812f07d34 add rudimentary unit test for SecurityTokenConnection 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
c295a6815f write nfc communication to debug output 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
edaa629f46 add unit tests for CommandApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
911d2a1c96 rewrite CommandApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
c89aab8802 reduce visibility where unnecessary 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
a4af2f7f5c rewrite ResponseApdu 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
e8103d8376 use reset instead of modify for changing pw1 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
9b292a4c70 rename CommandAPDUFactory -> OpenPgpCommandApduFactory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
b7723c1a4a replace magic constants in APDU factory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
8e9a62070d extract creation of CommandAPDUs into factory 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
46b69d45c4 explicitly pass around instance of SecurityTokenConnection 2017-10-23 20:40:25 +02:00
Vincent Breitmoser
e8f72718e9 rename SecurityTokenHelper to SecurityTokenConnection 2017-10-23 20:38:04 +02:00
Dominik Schürmann
cd65505890 Remove colorization of fingerprints 2017-10-23 18:43:41 +02:00
Dominik Schürmann
07b7936d0b Merge pull request #2183 from open-keychain/locate-hotspot 
Add "Where is my NFC reader?" button to nfc waiting dialog
 2017-10-23 18:37:15 +02:00
Dominik Schürmann
f876f08cf0 Re-enable Yubikey 4 USB filter 2017-10-23 18:08:17 +02:00
Christian Hagau
80be81adb3 Fix showing of some notifications 2017-10-23 14:57:36 +00:00
Christian Hagau
33bc407e7a Add @CheckResult to Notify.create() to prevent misuse 2017-10-23 14:57:36 +00:00
Dominik Schürmann
e18ca42789 Merge branch 'master' of github.com:open-keychain/open-keychain 2017-10-23 14:49:00 +02:00
Dominik Schürmann
96d856f2e6 Improve language based on comments on transifex 2017-10-23 14:48:52 +02:00
Vincent Breitmoser
476f756607 Merge pull request #2189 from open-keychain/disable-tokens 
Disable unsupported USB tokens
 2017-10-23 11:07:59 +02:00
Dominik Schürmann
992d5fb703 Merge pull request #2190 from wiktor-k/master 
Accept dash character (-) in GitHub user names when checking for Gist URL
 2017-10-20 13:02:16 +02:00
Wiktor Kwapisiewicz
f2cda5dd6c Accept dash character (-) in GitHub user names when checking for Gist URL 
GitHub allows dash / minus characters in usernames (e.g. "wiktor-k" or
"open-keychain"). This change extends the regular expression to capture
this missing character.
 2017-10-18 21:20:25 +02:00
Dominik Schürmann
fdbd89e094 Disable unsupported USB tokens 2017-10-18 14:56:32 +02:00
Dominik Schürmann
3a22c1f480 remove remember time from setting summary 2017-10-17 21:23:01 +02:00
Dominik Schürmann
0b950cae24 Merge pull request #2169 from open-keychain/travis-25 
WIP: Travis: use sys-img-armeabi-v7a-android-25
 2017-10-16 12:18:56 +02:00
Dominik Schürmann
60891958c2 Travis: disable androidTests 2017-10-16 10:35:57 +02:00
Dominik Schürmann
bd7afb95b8 Travis: use sys-img-armeabi-v7a-android-25 2017-10-15 13:14:42 +02:00
Dominik Schürmann
ebb6a8d4df Merge pull request #2174 from hagau/update_dependencies 
Update support libraries to 25.3.1 and update gradle-witness hashes
 2017-10-15 13:13:49 +02:00
Christian Hagau
a6b7fc836f Enable multidex for debug builds only 2017-10-13 15:11:08 +00:00
Christian Hagau
b373df2933 Update support libraries to 25.3.1 and update gradle-witness hashes 2017-10-13 15:11:08 +00:00
Dominik Schürmann
7525f54cbf 4.8-beta1 2017-10-13 13:47:02 +02:00
Dominik Schürmann
51109bdf5c Merge pull request #2182 from open-keychain/usb-refactor 
Usb refactoring
 2017-10-13 13:44:08 +02:00
Vincent Breitmoser
dfed7d3c93 Move decision of whether to show button into ShowNfcSweetspotActivity 2017-10-12 10:05:04 +02:00
Vincent Breitmoser
287d3251c5 Add "Where is my NFC reader?" feature to nfc waiting dialog 2017-10-10 05:06:40 +02:00