aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix for #347"Dominik Schürmann2014-03-071-3/+0
* Merge pull request #366 from uberspot/masterDominik Schürmann2014-03-0724-53/+25
|\
| * removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-0715-29/+23
| * 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-071-6/+91
| |/ |/|
* | move search view from activity to fragment by setting it as a list header, be...Dominik Schürmann2014-03-072-18/+19
* | Reworking main KeyListPublicFragment to get progress indicatorDominik Schürmann2014-03-072-24/+72
|/
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-071-0/+11
|\
| * Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+11
* | 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-0614-65/+65
|\
| * corrected commitAnkush2014-03-0714-65/+65
* | Multiselect: Create 'select all' in public and secret keylistuberspot2014-03-063-12/+19
* | 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-062-10/+79
|\ \ | |/ |/|
| * Use selectionArgs parameter to pass mCurquery.Miroojin Bakshi2014-03-062-8/+12
| * Implement search for SelectPublicKeyFragmentMiroojin Bakshi2014-03-061-5/+31
| * Implement search for KeyListPublicFragmentMiroojin Bakshi2014-03-061-4/+43
* | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain...Miroojin Bakshi2014-03-069-265/+540
|\ \
| * \ 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
| * | Put Preferences in subscreenuberspot2014-03-051-66/+226
| |/
| * 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
| * 2.3.1 beta2Dominik Schürmann2014-03-041-1/+1
| * 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-041-1/+2
* | Use string from strings.xmlMiroojin Bakshi2014-03-061-1/+1
* | Add documentationMiroojin Bakshi2014-03-061-3/+8
* | Hide CalendarView in tabletsMiroojin Bakshi2014-03-041-0/+3
* | Extend DatePickerDialog and override setTitle() method.Miroojin Bakshi2014-03-041-1/+12
|/
* Merge pull request #322 from mj7007/smooth_activity_switchDominik Schürmann2014-03-041-8/+15
|\
| * Smooth Activity Switch Fixedmj70072014-03-041-8/+15
* | Merge pull request #315 from jessicayuen/masterDominik Schürmann2014-03-046-11/+86
|\ \
| * | #226: Small fix to prevent message from being sent if IntentService is canceledJessica Yuen2014-03-031-0/+16
| * | #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-025-17/+40
| * | #226: Activity no longer closes if progress is canceled for key creation in E...Jessica Yuen2014-03-025-10/+17
| * | #226: Added cancel option to ProgressDialogFragments. Create Key is now cance...Jessica Yuen2014-03-025-9/+38
* | | Fix NewApi Lint ErrorsEmantor2014-03-033-3/+8
* | | Fix DefaultLocale Lint WarningsEmantor2014-03-031-3/+4