aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* More cleanupDominik Schürmann2014-08-041-3/+4
|
* Even more smaller nitpicksDominik Schürmann2014-08-042-12/+24
|
* Remove support for IO_FILE, this is no longer used and was never a good ↵Dominik Schürmann2014-08-041-29/+2
| | | | practice, use IO_URI on Android!
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-047-25/+98
|
* Fix debug backup/restore methodsDominik Schürmann2014-08-044-30/+24
|
* Gradle troubleshooting infoDominik Schürmann2014-08-041-0/+4
|
* TokenAutoComplete: Do not abort build if lint finds errorsDominik Schürmann2014-08-041-0/+0
|
* Remove old edit key stuffDominik Schürmann2014-08-046-1375/+0
|
* Edit key: subkey adding, not finishedDominik Schürmann2014-08-0414-561/+259
|
* button language in encryptDominik Schürmann2014-08-042-3/+1
|
* 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-047-56/+59
|/
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-0455-1349/+2053
|\ | | | | Improve file encrypt
| * Minor cleanupmar-v-in2014-08-024-3/+3
| |
| * Fix focusing with To fieldmar-v-in2014-08-023-3/+20
| |
| * Encrypt UI (drop downs)mar-v-in2014-08-016-35/+75
| |
| * 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-012-9/+15
| |\
| * | Fixes after mergemar-v-in2014-08-011-2/+5
| | |
| * | Merge branch 'master' into improve-file-moremar-v-in2014-08-0125-206/+299
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * | | Fix string resourcesmar-v-in2014-07-313-6/+7
| | | |
| * | | Fix mergemar-v-in2014-07-314-37/+21
| | | |
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-31439-3168/+8194
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-3115-126/+136
| | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring
| * | | | Make DecryptFragment abstract, as it should bemar-v-in2014-07-251-4/+2
| | | | |
| * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-2011-578/+597
| | | | |
| * | | | Add TokenAutoComplete to gradlemar-v-in2014-07-151-0/+1
| | | | |
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0674-1927/+11695
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0638-346/+901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | | | | |
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-0212-152/+216
| | | | | |
| * | | | | Add temporary file storage as discussed in #665mar-v-in2014-07-015-0/+201
| | | | | | | | | | | | | | | | | | | | | | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
| * | | | | Missing import after mergemar-v-in2014-07-011-0/+1
| | | | | |
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-01121-630/+2186
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-2421-86/+587
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-2249-526/+997
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| * | | | | | | | Improve file more, Part 1mar-v-in2014-06-2215-496/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* | | | | | | | | 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-0114-147/+259
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-013-16/+10
| | | | | | | | | |
| * | | | | | | | | 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-014-31/+89
| | | | | | | | | |
| * | | | | | | | | move classes around a bitVincent Breitmoser2014-08-018-126/+184
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Again update submodulesDominik Schürmann2014-08-013-0/+0
| | | | | | | | |
* | | | | | | | | Add user id with dialogDominik Schürmann2014-08-0118-228/+455
|/ / / / / / / /
* | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-013-15/+72
|\ \ \ \ \ \ \ \