cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,668 Commits 1 Branch 0 Tags
5805cd4d0ac05438df5d740f7a1a46d431f65fe8
Commit Graph

5668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
5805cd4d0a Fix createUserId 2016-04-29 23:52:01 +02:00
Dominik Schürmann
adeb1bd3f8 Merge pull request #1819 from 007durgesh219/Issue#1817 
Fix Crash when no encryption subkey is available, Issue #1817
 2016-04-29 23:19:15 +02:00
Dominik Schürmann
6a8a10336b Merge branch 'LuboViluda-master' 2016-04-29 23:14:33 +02:00
Dominik Schürmann
b4af7a06a5 Use proper ImportKeysProxyActivity to scan QR Codes 2016-04-29 23:14:24 +02:00
Dominik Schürmann
67607933ad Merge branch 'master' of https://github.com/LuboViluda/open-keychain into LuboViluda-master 2016-04-29 23:03:13 +02:00
Dominik Schürmann
fad63cc76f Use StringBuilder.append() according to lint 2016-04-29 22:37:52 +02:00
Dominik Schürmann
7b24679094 Re-enable move-to-card option, improve strings 2016-04-29 22:22:10 +02:00
Dominik Schürmann
8e6326faf7 Merge branch '007durgesh219-Issue#925' 2016-04-29 21:51:10 +02:00
Dominik Schürmann
a242881da6 Include only add button in dropdown width 2016-04-29 21:50:54 +02:00
Dominik Schürmann
3cc92e6f61 Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain into 007durgesh219-Issue#925 2016-04-29 21:41:46 +02:00
Dominik Schürmann
0ef59e36ad Merge pull request #1816 from fiaxh/no_name_choose_email 
Correctly handle keys only having an email address
 2016-04-29 21:40:00 +02:00
Dominik Schürmann
0e67b49e1a Merge pull request #1831 from fiaxh/key_creation_flexible 
Handle user input on key creation more generously
 2016-04-29 21:36:53 +02:00
Dominik Schürmann
120f71d791 Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt 
Fix Wrong file encrypted from cached input
 2016-04-29 21:24:15 +02:00
Dominik Schürmann
32f16ee7c3 Fix travis 2016-04-29 21:17:08 +02:00
Dominik Schürmann
9930d67521 Update more libraries 2016-04-29 21:09:20 +02:00
Dominik Schürmann
8e0324dbd8 Update build config, gitignore after testing 2016-04-29 17:27:28 +02:00
Dominik Schürmann
111ca4435e Update build tools for travis 2016-04-29 17:06:00 +02:00
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
Dominik Schürmann
6126e3d9ae Merge pull request #1824 from nmikhailov/otg2 
[WIP] USB OTG Support for Yubikey
 2016-04-15 18:19:32 +02:00
Durgesh
38adb9c40e Fix Wrong file encrypted from cached input 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-04-15 15:40:29 +05:30
fiaxh
249b8d7d78 Handle user input on key creation more generously 
Allow empty name and do not regex-check email
fixes #1825
 2016-04-15 01:21:15 +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