aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #369 from hav3n/branch-fixesDominik Schürmann2014-03-092-2/+3
|\ | | | | Fix for #347
| * Revised fix for #347Nikhil Peter Raj2014-03-091-11/+1
| |
| * Fix for #347Nikhil Peter Raj2014-03-082-3/+14
| |
* | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-0910-88/+78
| |
* | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-083-6/+63
|\ \ | | | | | | Show error if file import has no content
| * | Fixed some namingDaniel Haß2014-03-041-7/+7
| | |
| * | Added exception is null option to display nothing if no error occuredDaniel Haß2014-03-041-4/+6
| | |
| * | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-033-4/+35
| | |
| * | Little fixesDaniel Haß2014-03-032-2/+1
| | |
| * | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+1
| | |
| * | Added exception for empty filesDaniel Haß2014-03-031-1/+17
| | |
| * | Added handler for FileHasNoContent exception, some clean upDaniel Haß2014-03-031-6/+13
| | |
* | | use parameter in updateFromKeyserverDominik Schürmann2014-03-081-1/+1
| | |
* | | beta4Dominik Schürmann2014-03-081-2/+2
| | |
* | | Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
| | | | | | | | | | | | This reverts commit dd80ddd6f95d7f659929a49d3bff62492692c4fa.
* | | Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0734-63/+38
|\ \ \ | | | | | | | | Minor code clean up
| * | | removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-0715-29/+23
| | | | | | | | | | | | | | | | simplified some conditionals
| * | | 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 #347
| * | | | 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, ↵Dominik Schürmann2014-03-074-26/+26
| | | | | | | | | | | | better reusability! Required for service activites
* | | 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
|\ \ | | | | | | #338
| * | corrected commitAnkush2014-03-0728-85/+85
| | | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* | | 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 dpi
| * | | 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
|\ \ \ | |/ / |/| | Implement search for KeyListPublicFragment and SelectPublicKeyFragment
| * | 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 ↵Miroojin Bakshi2014-03-0627-574/+930
|\ \ \ | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix
| * \ \ Merge pull request #328 from bhargavgolla/patch-1Dominik Schürmann2014-03-051-1/+20
| |\ \ \ | | |/ / | |/| | Issue #234 : Adding a min date not to go below creation date
| | * | 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 subscreen
| | * | | Put Preferences in subscreenuberspot2014-03-056-83/+323
| | |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 09:24:39 +0000