aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* Add license headersDominik Schürmann2014-08-0419-0/+323
* Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-046-13/+15
* More cleanupDominik Schürmann2014-08-041-3/+4
* Even more smaller nitpicksDominik Schürmann2014-08-041-12/+23
* Remove support for IO_FILE, this is no longer used and was never a good pract...Dominik Schürmann2014-08-041-29/+2
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-047-25/+98
* Fix debug backup/restore methodsDominik Schürmann2014-08-042-28/+23
* Remove old edit key stuffDominik Schürmann2014-08-043-1066/+0
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-048-325/+123
* button language in encryptDominik Schürmann2014-08-041-1/+0
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-041-102/+0
|\
| * delete unused PgpConversionHelperVincent Breitmoser2014-08-041-102/+0
* | Smaller UI fixesDominik Schürmann2014-08-043-1/+10
|/
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0424-1091/+1668
|\
| * Minor cleanupmar-v-in2014-08-022-2/+1
| * Fix focusing with To fieldmar-v-in2014-08-022-3/+18
| * Encrypt UI (drop downs)mar-v-in2014-08-014-21/+40
| * Cache input file thumbnail.mar-v-in2014-08-011-3/+20
| * Cache contact photos to make UI more fluidmar-v-in2014-08-011-0/+10
| * Fix first key is not used erroneouslymar-v-in2014-08-011-1/+0
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-8/+14
| |\
| * | Fixes after mergemar-v-in2014-08-011-2/+5
| * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0115-155/+200
| |\ \
| * | | Fix string resourcesmar-v-in2014-07-311-1/+1
| * | | Fix mergemar-v-in2014-07-313-37/+19
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-3168-2479/+3045
| |\ \ \
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-3110-94/+106
| * | | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-208-565/+554
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0632-1441/+1934
| |\ \ \ \
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0610-108/+635
| * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-028-73/+106
| * | | | | Add temporary file storage as discussed in #665mar-v-in2014-07-014-0/+192
| * | | | | Missing import after mergemar-v-in2014-07-011-0/+1
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0144-504/+1494
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-2412-69/+493
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-2230-445/+795
| |\ \ \ \ \ \ \
| * | | | | | | | Improve file more, Part 1mar-v-in2014-06-2214-496/+290
* | | | | | | | | small fix for MSG_MF_UID_ADD log entryVincent Breitmoser2014-08-011-1/+1
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-017-108/+192
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-012-6/+2
| * | | | | | | | | remove debug output about security providers (cleaner unit tests)Vincent Breitmoser2014-08-011-0/+2
| * | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-013-31/+35
| * | | | | | | | | move classes around a bitVincent Breitmoser2014-08-012-97/+179
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Add user id with dialogDominik Schürmann2014-08-018-158/+391
|/ / / / / / / /
* | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
* | | | | | | | Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Undo import changesmar-v-in2014-08-011-3/+27