aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Expand)AuthorAgeFilesLines
* Split api libs into OpenKeychain specific and OpenPGP Provider libDominik Schürmann2014-03-071-1/+2
* Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
* Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0734-63/+38
|\
| * removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-0715-29/+23
| * move hardcode strings to strings.xmluberspot2014-03-0710-10/+13
| * remove unused imports and unthrown exceptionsuberspot2014-03-0710-24/+2
* | Merge pull request #367 from hav3n/branch-fixesDominik Schürmann2014-03-071-0/+3
|\ \
| * | Fix for #347Nikhil Peter Raj2014-03-081-0/+3
* | | Move search view into onCreateView, fixes #365Dominik Schürmann2014-03-072-13/+91
| |/ |/|
* | move search view from activity to fragment by setting it as a list header, be...Dominik Schürmann2014-03-074-26/+26
* | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-073-78/+157
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-073-0/+26
|\
| * Add option for sharing encrypted file.Miroojin Bakshi2014-03-073-0/+26
* | Cleanup code, search with preceeding %Dominik Schürmann2014-03-072-34/+14
|/
* API: get keyDominik Schürmann2014-03-071-12/+45
* remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
* Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-0628-85/+85
|\
| * corrected commitAnkush2014-03-0728-85/+85
* | remove unused search definitions from manifestDominik Schürmann2014-03-061-40/+0
* | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-0610-12/+28
* | add lock icon for 'Encrypt to..' multiselect optionuberspot2014-03-065-0/+1
* | Merge pull request #349 from uberspot/masterDominik Schürmann2014-03-063-0/+0
|\ \
| * | Add search icon for other dpiuberspot2014-03-063-0/+0
* | | 2.3.1 beta3Dominik Schürmann2014-03-061-2/+2
* | | Fix documentation and variable naming in APIDominik Schürmann2014-03-062-8/+8
* | | Fix verify of cleartext signatures with unknown keysDominik Schürmann2014-03-061-3/+5
|/ /
* | Merge pull request #342 from mb-14/searchDominik Schürmann2014-03-065-11/+93
|\ \ | |/ |/|
| * Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| * Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-062-5/+39
| * Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-063-5/+49
* | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-0628-575/+931
|\ \
| * \ Merge pull request #328 from bhargavgolla/patch-1Dominik Schürmann2014-03-051-1/+20
| |\ \ | | |/ | |/|
| | * Removed log statements as per Dominik's suggestionsBhargav Golla2014-03-051-4/+0
| | * Set min date to one day after Created Date. Works on Honeycomb and aboveBhargav Golla2014-03-051-4/+25
| | * Adding a min date not to go below creation dateBhargav Golla2014-03-041-1/+3
| * | Merge pull request #339 from uberspot/masterDominik Schürmann2014-03-056-83/+323
| |\ \
| | * | Put Preferences in subscreenuberspot2014-03-056-83/+323
| | |/
| * | Lint Issue:Daniel Hammann2014-03-0510-263/+263
| * | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-0571-844/+1552
| |\|
| | * Fix passphrase retrievalDominik Schürmann2014-03-051-8/+10
| | * Code cleaning in PgpDecryptVerifyDominik Schürmann2014-03-041-42/+46
| | * Fix license header of key server filesDominik Schürmann2014-03-042-2/+6
| | * Remove unused importsDominik Schürmann2014-03-041-6/+0
| | * name KeychainIntentService properlyDominik Schürmann2014-03-041-1/+1
| | * Update from transifexDominik Schürmann2014-03-048-26/+26
| | * 2.3.1 beta2Dominik Schürmann2014-03-042-3/+3
| | * Enforce private key for applications, verify signed-only texts without passph...Dominik Schürmann2014-03-045-162/+250
| | * return SIGNATURE_SUCCESS_UNCERTIFIED from serviceDominik Schürmann2014-03-042-2/+4
| * | updated build.gradle-Files to current Versions of build-tools and SDK.Daniel Hammann2014-03-051-1/+1
* | | Use string from strings.xmlMiroojin Bakshi2014-03-062-1/+2