aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/LuboViluda/open-keychain into Lub...Dominik Schürmann2016-04-291-0/+58
|\
| * unnecesary code removedLubo Viluda2016-04-121-1/+0
| * Unnecesary code removed and string repairedLubo Viluda2016-04-121-1/+1
| * Activity renamedLubo Viluda2016-04-041-2/+2
| * Changed activity during RedirectKeysActivityLubo Viluda2016-04-041-6/+1
| * Theme changeLubo Viluda2016-03-241-1/+0
| * upgrade of Redirect import activityLubo Viluda2016-03-241-23/+28
| * #1661 - Don't expose CertifyActivityLubo Viluda2016-03-201-0/+60
* | Use StringBuilder.append() according to lintDominik Schürmann2016-04-291-2/+6
* | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-294-89/+81
* | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
* | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain in...Dominik Schürmann2016-04-292-0/+27
|\ \
| * | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-142-0/+27
* | | Merge pull request #1816 from fiaxh/no_name_choose_emailDominik Schürmann2016-04-293-6/+15
|\ \ \
| * | | Better handle user_id sidecases while splittingfiaxh2016-04-122-2/+11
| * | | Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
* | | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-295-83/+60
|\ \ \ \
| * | | | Handle user input on key creation more generouslyfiaxh2016-04-155-83/+60
* | | | | 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-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
|/ / / / /
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 17:58:22 +0000