Commit Graph

3473 Commits

Author SHA1 Message Date
Dominik Schürmann
ab7f6fa992 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-29 17:03:57 +02:00
Dominik Schürmann
19e6103e5f Update libraries, add proguard filters to be under 64K limit 2016-04-29 17:03:50 +02:00
Vincent Breitmoser
8e4d68c55a api: allow caching of sessionKey in OpenPgpDecryptResult 2016-04-29 15:46:17 +02:00
Dominik Schürmann
5fdc312b2d Version 3.9.5 2016-04-29 13:16:32 +02:00
Dominik Schürmann
af15e87477 New translations from transifex 2016-04-29 12:49:54 +02:00
Dominik Schürmann
afeaf5c457 Fix strings 2016-04-18 07:39:02 +02:00
Dominik Schürmann
ed82c362e6 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-18 07:31:38 +02:00
Dominik Schürmann
15ed1c9a63 Fix delete_fail 2016-04-18 07:31:31 +02:00
Dominik Schürmann
b9df34468b Merge pull request #1835 from nmikhailov/check_security_token
Check security token
2016-04-16 11:50:23 +02:00
Nikita Mikhailov
935f88131e Check subkey id instead of masterkey id on security token operations
Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint
2016-04-16 15:45:43 +06:00
Nikita Mikhailov
a87c65c3f4 Check if security token keys match required once before signing/decryption 2016-04-16 11:13:57 +06:00
Nikita Mikhailov
163aef4c6b Update obsolete Nfc class prefixes 2016-04-16 11:13:51 +06:00
Dominik Schürmann
f1b14d338c Fix string 2016-04-16 00:51:31 +02:00
Nikita Mikhailov
28a352a288 OTG: Rename smartcard -> security token 2016-04-15 02:02:11 +06:00
Nikita Mikhailov
db57cf3e7e OTG: Skip TokenWaitFragmen when otg device is connected 2016-04-15 01:54:17 +06:00
Nikita Mikhailov
263799ec96 OTG: Fix connection issues 2016-04-15 01:54:09 +06:00
Nikita Mikhailov
784bf2322c OTG: Replace colons with dashes in usb error messages 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
df57ecde47 OTG: rename Smartcard -> SecurityToken 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
4e543e5368 OTG: rescan devices before next operation 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
8cb94c446b OTG: Add copyright 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
7caceee92f OTG: fix icc powering method 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
0077f3a3b8 OTG: Add/Update copyrights 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
0c9ead62a0 OTG: Remove obsolete Pin classes, reenable changeKey method 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
b37b171908 OTG: move UsbConnectionDispatcher to utls package 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
409c38ba2a OTG: UsbTransport minor refactoring 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
6ad2676e8c OTG: Add/update javadoc; rename methods, exceptions 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
38a1c2d3ab OTG: refactor, change nfc prefix to smartcard 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
4d9ce8e95b OTG: Refactor persistent connections, naming 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
b5eb6468fe OTG: Add support for persistent usb connection
No need to reinsert token on each operation
2016-04-14 22:48:01 +06:00
Nikita Mikhailov
3798249570 OTG: Implement hidden activity usb detection technique 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
5e18b15775 OTG: Rename 'javacard' package, methods, remove JavacardInterface 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
79a0918072 OTG: Fix usb transport 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
3d538d885e OTG: Usb device manager fixes 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
bd2906a887 OTG: Add usb device manager prototype 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
834440199a OTG: update methods 2016-04-14 22:48:01 +06:00
Nikita Mikhailov
65f17d7449 OTG: port old primitives from otg_alt branch 2016-04-14 22:48:01 +06:00
Dominik Schürmann
a16c4bcc30 Version 3.95 beta 2016-04-13 17:12:48 +02:00
Dominik Schürmann
ab323bddab Fix string 2016-04-13 17:00:24 +02:00
Dominik Schürmann
8bcd4003a9 KeybaseLib workaround 2016-04-12 19:42:54 +02:00
Dominik Schürmann
115c46d015 Update Android Gradle Plugin to 2.0 with workarounds 2016-04-12 19:28:00 +02:00
Dominik Schürmann
060a5a1815 Merge branch 'backup-code' 2016-04-12 19:08:32 +02:00
Dominik Schürmann
ef355aa001 Fix in-app help for backup codes 2016-04-12 19:08:20 +02:00
Dominik Schürmann
f7654af00b Revert usage of masked-edittext, back to plain edittexts for backup codes 2016-04-12 19:06:08 +02:00
Dominik Schürmann
ff9226c25c Fix strings 2016-04-12 16:15:07 +02:00
Vincent
b55c505054 Merge pull request #1772 from runnerway/importkey-encrypted
Handle encrypted files in "import key" file selection
2016-04-12 10:13:30 +02:00
Nikita Mikhailov
8476999922 Add missing keyholder string param 2016-04-11 00:02:05 +06:00
Dominik Schürmann
c8e5395d4e Use cert pinning only if available 2016-04-09 18:34:00 +02:00
Dominik Schürmann
2d762e55da Okhttp3 cleanups, docs, and fix timeouts for default client 2016-04-09 11:53:37 +02:00
Michal Kepkowski
7b97c2bbed KeyBaseLib response Client 2016-04-08 19:10:59 +02:00
Michal Kepkowski
26bfe06d80 cleaning 2016-04-06 19:25:10 +02:00