| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -12/+23 |
| | | |||||
| * | Remove support for IO_FILE, this is no longer used and was never a good ↵ | Dominik Schürmann | 2014-08-04 | 1 | -29/+2 |
| | | | | | practice, use IO_URI on Android! | ||||
| * | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 7 | -25/+98 |
| | | |||||
| * | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 2 | -28/+23 |
| | | |||||
| * | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -1066/+0 |
| | | |||||
| * | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 8 | -325/+123 |
| | | |||||
| * | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-04 | 1 | -102/+0 |
| |\ | |||||
| | * | delete unused PgpConversionHelper | Vincent Breitmoser | 2014-08-04 | 1 | -102/+0 |
| | | | |||||
| * | | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -1/+10 |
| |/ | |||||
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 24 | -1091/+1668 |
| |\ | | | | | Improve file encrypt | ||||
| | * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -2/+1 |
| | | | |||||
| | * | Fix focusing with To field | mar-v-in | 2014-08-02 | 2 | -3/+18 |
| | | | |||||
| | * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 4 | -21/+40 |
| | | | |||||
| | * | Cache input file thumbnail. | mar-v-in | 2014-08-01 | 1 | -3/+20 |
| | | | |||||
| | * | Cache contact photos to make UI more fluid | mar-v-in | 2014-08-01 | 1 | -0/+10 |
| | | | |||||
| | * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -8/+14 |
| | |\ | |||||
| | * | | Fixes after merge | mar-v-in | 2014-08-01 | 1 | -2/+5 |
| | | | | |||||
| | * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 15 | -155/+200 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | ||||
| | * | | | Fix string resources | mar-v-in | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix merge | mar-v-in | 2014-07-31 | 3 | -37/+19 |
| | | | | | |||||
| | * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 68 | -2479/+3045 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-in | 2014-07-31 | 10 | -94/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring | ||||
| | * | | | | Make DecryptFragment abstract, as it should be | mar-v-in | 2014-07-25 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 8 | -565/+554 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 32 | -1441/+1934 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 incomplete | mar-v-in | 2014-07-06 | 10 | -108/+635 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | ||||
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| | | | | | | | |||||
| | * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 8 | -73/+106 |
| | | | | | | | |||||
| | * | | | | | Add temporary file storage as discussed in #665 | mar-v-in | 2014-07-01 | 4 | -0/+192 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 merge | mar-v-in | 2014-07-01 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 44 | -504/+1494 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-more | mar-v-in | 2014-06-24 | 12 | -69/+493 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 30 | -445/+795 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | ||||
| | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 14 | -496/+290 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 entry | Vincent Breitmoser | 2014-08-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-01 | 7 | -108/+192 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | fix dumb mistake in modifySecretKey | Vincent Breitmoser | 2014-08-01 | 2 | -6/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove debug output about security providers (cleaner unit tests) | Vincent Breitmoser | 2014-08-01 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 3 | -31/+35 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 2 | -97/+179 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * / | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 8 | -158/+391 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix import from server | ||||
| | * | | | | | | | | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 |
| | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable | ||||
| * | | | | | | | | Fix CachedPublicKeyring | mar-v-in | 2014-08-01 | 2 | -12/+58 |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out. | ||||
| * | | | | | | | Start fixing CachedPublicKeyRing | Dominik Schürmann | 2014-08-01 | 2 | -22/+26 |
| | | | | | | | | |||||
| * | | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 |
| | | | | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |