Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 2 | -2/+18 |
| | |||||
* | Merge pull request #1164 from kentnek/dev-nfc-advanced-view | Dominik Schürmann | 2015-03-20 | 9 | -158/+275 |
|\ | | | | | Implemented #1071: Invoke NFC in Advanced View | ||||
| * | 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 | 9 | -158/+261 |
|/ | | | | | | | - 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 | ||||
| * | Merge pull request #1158 from manojkhannakm/development | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 |
| |\ | | | | | | | Fixed a crash on ViewKeyActivity and Issue #1114 | ||||
| | * | 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 | 35 | -430/+455 |
|/ | |||||
* | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 |
| | |||||
* | Fix header | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| | |||||
* | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 10 | -45/+71 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 |
|\ | | | | | | | development | ||||
| * | Merge pull request #1160 from jellysheep/cloudsearch-show-main-email | Dominik Schürmann | 2015-03-18 | 1 | -1/+14 |
| |\ | | | | | | | Show HKP server results first in key cloud search. Fixes #1066 | ||||
| | * | 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 |
| |/ | |||||
| * | Merge pull request #1155 from adithyaphilip/development | Dominik Schürmann | 2015-03-17 | 1 | -16/+13 |
| |\ | | | | | | | Removed JellyBean restriction on Contact Sync | ||||
| | * | 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 |
|/ | |||||
* | Manifest cleanup | Dominik Schürmann | 2015-03-17 | 1 | -9/+12 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 |
|\ | | | | | | | development | ||||
| * | Merge pull request #1154 from adithyaphilip/development | Dominik Schürmann | 2015-03-16 | 1 | -6/+2 |
| |\ | | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper | ||||
| | * | 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 |
|/ | |||||
* | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 |
| | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 13 | -33/+133 |
| | |||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 7 | -11/+44 |
| | |||||
* | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -2/+0 |
| | |||||
* | Remove old info from readme | Dominik Schürmann | 2015-03-16 | 1 | -28/+5 |
| | |||||
* | Clarify certification help screen | Dominik Schürmann | 2015-03-16 | 1 | -2/+2 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Update api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+53 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 26 | -148/+139 |
| | |||||
* | Update openpgp-api lib | Dominik Schürmann | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | 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 | 2 | -2/+37 |
| | |||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-15 | 2 | -15/+22 |
|\ | | | | | | | development | ||||
| * | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 2 | -15/+22 |
| | | | | | | | | fixes #1141 | ||||
* | | Put API activites in normal process to allow hydrate/dehydrate of logs | Dominik Schürmann | 2015-03-15 | 1 | -4/+2 |
|/ | |||||
* | Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist | Dominik Schürmann | 2015-03-15 | 1 | -1/+7 |
| | |||||
* | Add ignore dirty to other git submodules | Dominik Schürmann | 2015-03-15 | 1 | -2/+9 |
| | |||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 6 | -19/+70 |
| | |||||
* | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | |||||
* | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 |
| | |||||
* | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 |
|\ | | | | | Preselected Suitable Key | ||||
| * | Merge branch 'development' of https://github.com/tdjogi010/open-keychain ↵ | tdjogi010@gmail.com | 2015-03-13 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | | | into development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java |