Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 |
|\ | | | | | Corrected import error message, changed style to WARN | ||||
| * | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 |
| | | |||||
* | | -Fixed a situation where additional emails could be duplicated when creating ↵ | Daniel Ramos | 2015-03-27 | 1 | -12/+36 |
|/ | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. | ||||
* | Modify break as return. | iseki | 2015-03-26 | 1 | -1/+1 |
| | |||||
* | Add brackets for if-else constructs and externalize the procedure as ↵ | iseki | 2015-03-26 | 1 | -26/+33 |
| | | | | showMultiExportDialog. | ||||
* | Add a loop for multiple key export. | iseki | 2015-03-25 | 1 | -13/+68 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2015-03-23 | 3 | -10/+10 |
| | |||||
* | Merge pull request #1165 from kentnek/dev-yubikey-null | Dominik Schürmann | 2015-03-23 | 1 | -5/+11 |
|\ | | | | | Fixed #1152: NullPointerException when signing with YubiKey | ||||
| * | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 |
| | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding. | ||||
* | | Merge pull request #1166 from adithyaphilip/multi-threaded | Dominik Schürmann | 2015-03-23 | 22 | -122/+681 |
|\ \ | | | | | | | Multi-threaded key import, update all feature | ||||
| * | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 20 | -334/+608 |
| | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
| * | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 4 | -35/+320 |
| | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
* | | | Fix passphrase cache not clearing all passphrases | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1174 from Jesperbk/development | Dominik Schürmann | 2015-03-23 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Fixed symmetric encryption crash | ||||
| * | | Fixed issue where setting a passphrase to null later causes a ↵ | JesperBK | 2015-03-23 | 1 | -1/+3 |
| | | | | | | | | | | | | NullPointerException. | ||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-23 | 1 | -14/+23 |
|\ \ \ | | | | | | | | | | | | | development | ||||
| * | | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 |
| |/ / | |||||
* / / | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 3 | -17/+41 |
|/ / | |||||
* | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 24 | -198/+169 |
|\ \ | | | | | | | | | | into manojkhannakm-development | ||||
| * | | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | | | |||||
| * | | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 |
| | | | |||||
| * | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 24 | -197/+153 |
| | | | |||||
* | | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #1163 from kentnek/dev-list-footer | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 |
|\ \ | | | | | | | Added a blank footer view to the list of keys | ||||
| * | | - Added footer so that the Floating Action Button won't block the last few ↵ | Kent | 2015-03-20 | 1 | -2/+17 |
| |/ | | | | | | | items' content | ||||
* | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 |
| | | |||||
* | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 1 | -2/+18 |
| | | |||||
* | | Updated GNU header | Kent | 2015-03-20 | 1 | -1/+2 |
| | | |||||
* | | Removed create and added GPLv3 header | Kent | 2015-03-20 | 1 | -4/+17 |
| | | |||||
* | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 3 | -154/+240 |
|/ | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
* | Remove on click on icon | Dominik Schürmann | 2015-03-19 | 1 | -0/+2 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 |
|\ | | | | | | | development | ||||
| * | Fix for Issue #1114 | Manoj Khanna | 2015-03-19 | 1 | -5/+30 |
| | | | | | | | | Displays the snackbar above the keyboard on all activities. | ||||
| * | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 2 | -55/+51 |
| | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | ||||
* | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 11 | -263/+323 |
|/ | |||||
* | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 |
| | |||||
* | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 1 | -0/+4 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
|\ | | | | | | | development | ||||
| * | Added comments for server result sorting in key search | Max Mertens | 2015-03-18 | 1 | -0/+6 |
| | | |||||
| * | Show HKP server results first in key cloud search. Fixes #1066 | Max Mertens | 2015-03-18 | 1 | -1/+8 |
| | | |||||
| * | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 |
| | | |||||
* | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 34 | -140/+307 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 |
|\ | | | | | | | development | ||||
| * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 |
| | | |||||
* | | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 |
|/ | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 9 | -31/+117 |
| | |||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 4 | -6/+27 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 25 | -148/+139 |
| | |||||
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 1 | -2/+15 |
| |