aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
| | | |
| * | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-293-1/+36
| |\ \ \ | | | | | | | | | | | | | | | into 007durgesh219-Issue#925
| | * | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-143-1/+36
| | | |/ | | |/| | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | Merge pull request #1816 from fiaxh/no_name_choose_emailDominik Schürmann2016-04-293-6/+15
| |\ \ \ | | | | | | | | | | Correctly handle keys only having an email address
| | * | | Better handle user_id sidecases while splittingfiaxh2016-04-122-2/+11
| | | | |
| | * | | Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | fixes #1699
| * | | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-297-85/+67
| |\ \ \ \ | | | | | | | | | | | | Handle user input on key creation more generously
| | * | | | Handle user input on key creation more generouslyfiaxh2016-04-157-85/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825
| * | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix Wrong file encrypted from cached input
| | * | | | | Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-295-43/+91
| |\ \ \ \ \
| | * | | | | api: allow caching of sessionKey in OpenPgpDecryptResultVincent Breitmoser2016-04-295-43/+91
| | | | | | |
| * | | | | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-291-1/+2
| |/ / / / /
| * | | | | New translations from transifexDominik Schürmann2016-04-2960-660/+2222
| | | | | |
| * | | | | Fix stringsDominik Schürmann2016-04-181-2/+2
| | | | | |
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-1812-29/+48
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1835 from nmikhailov/check_security_tokenDominik Schürmann2016-04-1612-29/+48
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Check security token
| | | * | | | | Check subkey id instead of masterkey id on security token operationsNikita Mikhailov2016-04-162-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint
| | | * | | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-163-5/+22
| | | | | | | |
| | | * | | | | Update obsolete Nfc class prefixesNikita Mikhailov2016-04-169-24/+24
| | | | | | | |
| * | | | | | | Fix delete_failDominik Schürmann2016-04-182-2/+3
| |/ / / / / /
| * / / / / / Fix stringDominik Schürmann2016-04-161-1/+1
| |/ / / / /
| * | | | | OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-155-29/+29
| | | | | |
| * | | | | OTG: Skip TokenWaitFragmen when otg device is connectedNikita Mikhailov2016-04-153-11/+27
| | | | | |
| * | | | | OTG: Fix connection issuesNikita Mikhailov2016-04-153-24/+17
| | | | | |
| * | | | | OTG: Replace colons with dashes in usb error messagesNikita Mikhailov2016-04-141-8/+8
| | | | | |
| * | | | | OTG: rename Smartcard -> SecurityTokenNikita Mikhailov2016-04-1413-129/+127
| | | | | |
| * | | | | OTG: rescan devices before next operationNikita Mikhailov2016-04-143-19/+58
| | | | | |
| * | | | | OTG: Add copyrightNikita Mikhailov2016-04-141-0/+17
| | | | | |
| * | | | | OTG: fix icc powering methodNikita Mikhailov2016-04-141-1/+1
| | | | | |
| * | | | | OTG: Add/Update copyrightsNikita Mikhailov2016-04-1410-0/+143
| | | | | |
| * | | | | OTG: Remove obsolete Pin classes, reenable changeKey methodNikita Mikhailov2016-04-144-93/+24
| | | | | |
| * | | | | OTG: move UsbConnectionDispatcher to utls packageNikita Mikhailov2016-04-143-11/+7
| | | | | |
| * | | | | OTG: UsbTransport minor refactoringNikita Mikhailov2016-04-141-11/+22
| | | | | |
| * | | | | OTG: Add/update javadoc; rename methods, exceptionsNikita Mikhailov2016-04-148-115/+173
| | | | | |
| * | | | | OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-147-66/+68
| | | | | |
| * | | | | OTG: Refactor persistent connections, namingNikita Mikhailov2016-04-149-118/+132
| | | | | |
| * | | | | OTG: Add support for persistent usb connectionNikita Mikhailov2016-04-148-111/+132
| | | | | | | | | | | | | | | | | | | | | | | | No need to reinsert token on each operation
| * | | | | OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-148-933/+108
| | | | | |
| * | | | | OTG: Rename 'javacard' package, methods, remove JavacardInterfaceNikita Mikhailov2016-04-1416-67/+770
| | | | | |
| * | | | | OTG: Fix usb transportNikita Mikhailov2016-04-143-43/+108
| | | | | |
| * | | | | OTG: Usb device manager fixesNikita Mikhailov2016-04-145-93/+74
| | | | | |
| * | | | | OTG: Add usb device manager prototypeNikita Mikhailov2016-04-145-28/+219
| | | | | |
| * | | | | OTG: update methodsNikita Mikhailov2016-04-148-707/+308
| | | | | |
| * | | | | OTG: port old primitives from otg_alt branchNikita Mikhailov2016-04-1411-0/+995
| |/ / / /
| * | | | Fix stringDominik Schürmann2016-04-131-1/+1
| | | | |
| * | | | Merge branch 'backup-code'Dominik Schürmann2016-04-128-187/+1605
| |\ \ \ \
| | * | | | Fix in-app help for backup codesDominik Schürmann2016-04-121-1/+1
| | | | | |
| | * | | | Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-127-186/+1604
| | | | | |
| * | | | | Fix stringsDominik Schürmann2016-04-121-3/+3
| |/ / / /