aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper
Commit message (Expand)AuthorAgeFilesLines
* Add account only on jelly bean and aboveDominik Schürmann2014-08-211-0/+3
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-2/+2
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-0/+31
* Remove subkeys.pgp.net keyserver, often down and no hkpsDominik Schürmann2014-08-151-7/+20
* Automcomplete names and emails in keyserver tabDominik Schürmann2014-08-141-0/+18
* Remove MD5 supportDominik Schürmann2014-08-141-0/+5
* Remove support for v3 sig generationDominik Schürmann2014-08-141-10/+0
* Dont write version header by defaultDominik Schürmann2014-08-141-4/+4
* Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-3/+10
* Optimize importsDominik Schürmann2014-08-055-9/+25
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-051-1/+5
|\
| * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-041-1/+5
* | KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
|/
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-1/+2
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-9/+12
* Cache contact photos to make UI more fluidmar-v-in2014-08-011-0/+10
* Merge branch 'master' into improve-file-moremar-v-in2014-07-311-0/+20
|\
| * Program flow fixesDominik Schürmann2014-07-251-1/+1
| * Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-161-0/+10
| |\
| | * New first time screenDominik Schürmann2014-07-161-0/+10
| * | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-121-0/+10
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-311-8/+9
* | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-201-8/+13
* | Many changes to file ... and still incompletemar-v-in2014-07-062-0/+55
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-013-2/+282
|\|
| * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-2/+135
| * Move sks-keyservers.net CA into assets foldermar-v-in2014-06-251-0/+46
| * Update Keyservers to use hkps as neededmar-v-in2014-06-241-0/+18
| * Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
* | Merge branch 'master' into improve-file-moremar-v-in2014-06-241-5/+7
|\|
| * Switch to dnsjavamar-v-in2014-06-231-5/+7
* | Improve file more, Part 1mar-v-in2014-06-222-105/+107
|/
* Merge branch 'master' into improve-filemar-v-in2014-06-182-51/+187
|\
| * Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-181-51/+178
| |\
| | * Remove abandoned contactsmar-v-in2014-06-181-26/+90
| | * Code stylemar-v-in2014-06-181-13/+26
| | * Continue contact db syncmar-v-in2014-06-181-39/+89
| * | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-181-0/+9
| |/
* / Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-101-0/+35
|/
* Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-3/+0
|\
| * neatness refactoringVincent Breitmoser2014-06-041-3/+0
* | Show keys with android contactsmar-v-in2014-06-051-2/+87
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-2/+4
|\|
| * wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-211-2/+4
* | First version of automatic contact discovery.mar-v-in2014-06-041-0/+97
* | ContactHelper can read email addresses from contact listmar-v-in2014-05-261-0/+21
|/
* proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-081-5/+7
* Better handling of actionbars backDominik Schürmann2014-05-071-19/+0
* Optimize importsDominik Schürmann2014-04-155-1/+5