aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
|\
| * use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
* | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
|/
* Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2124-198/+169
|\
| * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| * Reworked Notify classManoj Khanna2015-03-2024-197/+153
* | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
|/
* Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
|\
| * - 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
* | 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
| * contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
* | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
|/
* 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
|\ \ \
| * | | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-152-11/+15
| |/ /
* | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-153-14/+37
* | | Query for duplicate user idsDominik Schürmann2015-03-153-2/+14