aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
| | * | - Added footer so that the Floating Action Button won't block the last few it...Kent2015-03-201-2/+17
| | |/
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-201-2/+18
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
* | | add edit key unit test for no-opVincent Breitmoser2015-03-203-0/+10
* | | fix unit tests (for real)Vincent Breitmoser2015-03-204-5/+15
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-206-17/+17
* | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
* | | fix unit tests (syntax)Vincent Breitmoser2015-03-203-3/+13
* | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2047-603/+996
|\| |
| * | Updated GNU headerKent2015-03-201-1/+2
| * | Removed create and added GPLv3 headerKent2015-03-201-4/+17
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-203-154/+240
| |/
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-193-60/+81
| |\
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-192-55/+51
| * | Manage my keys wizardDominik Schürmann2015-03-1911-263/+323
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| * Fix tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-17/+27
| |\
| | * Added comments for server result sorting in key searchMax Mertens2015-03-181-0/+6
| | * Show HKP server results first in key cloud search. Fixes #1066Max Mertens2015-03-181-1/+8
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
* | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-2016-247/+294
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
* | | yubikey certifications!Vincent Breitmoser2015-03-1814-239/+474
* | | generalize nfc crypto input structureVincent Breitmoser2015-03-1816-230/+872
* | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
| |/ |/|
* | contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-171-6/+2
|\
| * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
* | File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
|/
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-169-31/+117
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
* object oriented split user idDominik Schürmann2015-03-1625-148/+139
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-2/+15
* Clarify MIME usageDominik Schürmann2015-03-153-2/+7
* fix expiry of master keysVincent Breitmoser2015-03-151-15/+16
* Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
* Remove display of key id in other listsDominik Schürmann2015-03-155-18/+69
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
* Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
* Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
|\
| * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
* | Merge pull request #1148 from manojkhannakm/developmentDominik Schürmann2015-03-152-5/+5
|\ \
| * | Fixed a ClassCastExceptionManoj Khanna2015-03-152-5/+5
* | | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-152-11/+15
|\ \ \