| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt | Dominik Schürmann | 2016-04-29 | 1 | -0/+2 |
| |\ |
|
| | * | Fix Wrong file encrypted from cached input | Durgesh | 2016-04-15 | 1 | -0/+2 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-29 | 4 | -40/+83 |
| |\ \ |
|
| | * | | api: allow caching of sessionKey in OpenPgpDecryptResult | Vincent Breitmoser | 2016-04-29 | 4 | -40/+83 |
| * | | | Update libraries, add proguard filters to be under 64K limit | Dominik Schürmann | 2016-04-29 | 1 | -1/+2 |
| |/ / |
|
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 11 | -29/+47 |
| |\ \ |
|
| | * | | Check subkey id instead of masterkey id on security token operations | Nikita Mikhailov | 2016-04-16 | 2 | -8/+10 |
| | * | | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 2 | -5/+21 |
| | * | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 9 | -24/+24 |
| * | | | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 1 | -1/+2 |
| |/ / |
|
| * | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 5 | -29/+29 |
| * | | OTG: Skip TokenWaitFragmen when otg device is connected | Nikita Mikhailov | 2016-04-15 | 3 | -11/+27 |
| * | | OTG: Fix connection issues | Nikita Mikhailov | 2016-04-15 | 3 | -24/+17 |
| * | | OTG: Replace colons with dashes in usb error messages | Nikita Mikhailov | 2016-04-14 | 1 | -8/+8 |
| * | | OTG: rename Smartcard -> SecurityToken | Nikita Mikhailov | 2016-04-14 | 13 | -129/+127 |
| * | | OTG: rescan devices before next operation | Nikita Mikhailov | 2016-04-14 | 3 | -19/+58 |
| * | | OTG: Add copyright | Nikita Mikhailov | 2016-04-14 | 1 | -0/+17 |
| * | | OTG: fix icc powering method | Nikita Mikhailov | 2016-04-14 | 1 | -1/+1 |
| * | | OTG: Add/Update copyrights | Nikita Mikhailov | 2016-04-14 | 10 | -0/+143 |
| * | | OTG: Remove obsolete Pin classes, reenable changeKey method | Nikita Mikhailov | 2016-04-14 | 4 | -93/+24 |
| * | | OTG: move UsbConnectionDispatcher to utls package | Nikita Mikhailov | 2016-04-14 | 3 | -11/+7 |
| * | | OTG: UsbTransport minor refactoring | Nikita Mikhailov | 2016-04-14 | 1 | -11/+22 |
| * | | OTG: Add/update javadoc; rename methods, exceptions | Nikita Mikhailov | 2016-04-14 | 8 | -115/+173 |
| * | | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 7 | -66/+68 |
| * | | OTG: Refactor persistent connections, naming | Nikita Mikhailov | 2016-04-14 | 9 | -118/+132 |
| * | | OTG: Add support for persistent usb connection | Nikita Mikhailov | 2016-04-14 | 8 | -111/+132 |
| * | | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 6 | -932/+66 |
| * | | OTG: Rename 'javacard' package, methods, remove JavacardInterface | Nikita Mikhailov | 2016-04-14 | 16 | -67/+770 |
| * | | OTG: Fix usb transport | Nikita Mikhailov | 2016-04-14 | 3 | -43/+108 |
| * | | OTG: Usb device manager fixes | Nikita Mikhailov | 2016-04-14 | 5 | -93/+74 |
| * | | OTG: Add usb device manager prototype | Nikita Mikhailov | 2016-04-14 | 3 | -28/+210 |
| * | | OTG: update methods | Nikita Mikhailov | 2016-04-14 | 8 | -707/+308 |
| * | | OTG: port old primitives from otg_alt branch | Nikita Mikhailov | 2016-04-14 | 11 | -0/+995 |
| |/ |
|
| * | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 2 | -118/+177 |
| * | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 3 | -10/+135 |
| |\ |
|
| | * | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 3 | -10/+135 |
| * | | Use cert pinning only if available | Dominik Schürmann | 2016-04-09 | 7 | -41/+36 |
| * | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 5 | -29/+41 |
| * | | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 2 | -10/+10 |
| * | | cleaning | Michal Kepkowski | 2016-04-06 | 2 | -8/+6 |
| * | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 33 | -726/+852 |
| |\ \ |
|
| | * \ | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 1 | -0/+3 |
| | |\ \ |
|
| | | * | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 1 | -1/+2 |
| | | * | | Fixes #1298 | Victor Hazali | 2016-03-30 | 1 | -0/+2 |
| | | |/ |
|
| | * | | Fix Unusable signing key not properly disabled, Issue #1468 | Durgesh | 2016-04-05 | 2 | -10/+0 |
| | * | | Merge pull request #1808 from vhazali/warn-when-stripping-master-key | Vincent | 2016-04-04 | 1 | -5/+28 |
| | |\ \ |
|
| | | * | | setTitle now uses resource id directly | Victor Hazali | 2016-04-01 | 1 | -1/+1 |
| | | * | | Refactored switch statements to use constants | Victor Hazali | 2016-03-30 | 1 | -5/+9 |
| | | * | | Extracted method | Victor Hazali | 2016-03-30 | 1 | -16/+20 |
| | | * | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp... | Victor Hazali | 2016-03-30 | 1 | -1/+16 |
| | | |\ \
| | | |/
| | |/| |
|
