aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
|\
| * Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-294-40/+83
|\ \
| * | api: allow caching of sessionKey in OpenPgpDecryptResultVincent Breitmoser2016-04-294-40/+83
* | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-291-1/+2
|/ /
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-1811-29/+47
|\ \
| * | Check subkey id instead of masterkey id on security token operationsNikita Mikhailov2016-04-162-8/+10
| * | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-162-5/+21
| * | Update obsolete Nfc class prefixesNikita Mikhailov2016-04-169-24/+24
* | | Fix delete_failDominik Schürmann2016-04-181-1/+2
|/ /
* | 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
* | OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-146-932/+66
* | 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-143-28/+210
* | OTG: update methodsNikita Mikhailov2016-04-148-707/+308
* | OTG: port old primitives from otg_alt branchNikita Mikhailov2016-04-1411-0/+995
|/
* Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-122-118/+177
* Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-123-10/+135
|\
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-273-10/+135
* | Use cert pinning only if availableDominik Schürmann2016-04-097-41/+36
* | Okhttp3 cleanups, docs, and fix timeouts for default clientDominik Schürmann2016-04-095-29/+41
* | KeyBaseLib response ClientMichal Kepkowski2016-04-082-10/+10
* | cleaningMichal Kepkowski2016-04-062-8/+6
* | Merge branch 'master' into okhttp3Michal Kepkowski2016-04-0633-726/+852
|\ \
| * \ Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+3
| |\ \
| | * | Used a constant instead of magic number for colourVictor Hazali2016-04-041-1/+2
| | * | Fixes #1298Victor Hazali2016-03-301-0/+2
| | |/
| * | Fix Unusable signing key not properly disabled, Issue #1468Durgesh2016-04-052-10/+0
| * | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-041-5/+28
| |\ \
| | * | setTitle now uses resource id directlyVictor Hazali2016-04-011-1/+1
| | * | Refactored switch statements to use constantsVictor Hazali2016-03-301-5/+9
| | * | Extracted methodVictor Hazali2016-03-301-16/+20
| | * | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp...Victor Hazali2016-03-301-1/+16
| | |\ \ | | | |/ | | |/|