aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* A simple fix to clear the list of detected keys when parsing key file gives a...Alex Fong2016-05-071-0/+1
* Fix formattingDominik Schürmann2016-05-052-4/+4
* Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-051-27/+0
* Slight amendments for clarityAlex Fong2016-05-052-1/+4
* Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-052-4/+6
* Fixed warnings encounteredAlex Fong2016-05-052-2/+1
* Added warning dialog for importing keysAlex Fong2016-05-051-0/+27
* Refactoring: Removed PassphraseChangeParcel and placed its functionality into...Alex Fong2016-05-053-20/+15
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-043-10/+12
* Fix rotation crash in CreateSecurityTokenWaitFragmentNikita Mikhailov2016-05-011-2/+2
* Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-301-24/+49
* Remove lefover commentDominik Schürmann2016-04-301-1/+1
* Fix animation in manage keys for security tokensDominik Schürmann2016-04-306-24/+42
* Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-292-0/+11
|\
| * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-142-0/+11
* | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-291-5/+6
* | 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
* | | 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 #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-294-75/+50
|\ \ \
| * | | Handle user input on key creation more generouslyfiaxh2016-04-154-75/+50
* | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
|\ \ \ \
| * | | | Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
| | |/ / | |/| |
* | | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-291-1/+2
* | | | Check subkey id instead of masterkey id on security token operationsNikita Mikhailov2016-04-161-4/+4
* | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-161-0/+16
* | | | Update obsolete Nfc class prefixesNikita Mikhailov2016-04-161-1/+1
* | | | OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-153-17/+17
* | | | OTG: Skip TokenWaitFragmen when otg device is connectedNikita Mikhailov2016-04-153-11/+27
* | | | OTG: Fix connection issuesNikita Mikhailov2016-04-151-4/+9
* | | | OTG: rename Smartcard -> SecurityTokenNikita Mikhailov2016-04-145-115/+113
* | | | OTG: rescan devices before next operationNikita Mikhailov2016-04-141-7/+3
* | | | OTG: Add copyrightNikita Mikhailov2016-04-141-0/+17
* | | | OTG: Add/Update copyrightsNikita Mikhailov2016-04-142-0/+2
* | | | OTG: Remove obsolete Pin classes, reenable changeKey methodNikita Mikhailov2016-04-141-53/+1
* | | | OTG: move UsbConnectionDispatcher to utls packageNikita Mikhailov2016-04-141-3/+2
* | | | OTG: Add/update javadoc; rename methods, exceptionsNikita Mikhailov2016-04-141-17/+4
* | | | OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-145-54/+56
* | | | OTG: Refactor persistent connections, namingNikita Mikhailov2016-04-144-82/+36
* | | | OTG: Add support for persistent usb connectionNikita Mikhailov2016-04-143-72/+68
* | | | OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-142-8/+53