Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Add option to pass original filename to PgpSignEncrypt | Dominik Schürmann | 2014-08-11 | 1 | -12/+20 | |
| | | ||||||
| * | progress for signing binary | Dominik Schürmann | 2014-08-11 | 1 | -15/+27 | |
| | | ||||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-11 | 1 | -18/+11 | |
| | | ||||||
| * | Handle missing MDC as failed only if no valid signature is present | Dominik Schürmann | 2014-08-10 | 2 | -1/+9 | |
| | | ||||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-10 | 1 | -6/+4 | |
| | | ||||||
| * | Handle missing integrity protection MDC packet as if integrity check would ↵ | Dominik Schürmann | 2014-08-10 | 1 | -4/+5 | |
| | | | | | | | | | | | | have failed. An attacker could strip the MDC on its way to the receiver... | |||||
| * | Introduction of metadata api, starting to fix decryption progress | Dominik Schürmann | 2014-08-10 | 3 | -44/+84 | |
| | | ||||||
| * | Fix compression setting for encryption of files | Dominik Schürmann | 2014-08-10 | 1 | -4/+7 | |
| | | ||||||
| * | Edit key: prevent the combination of change to primary user id and revocation | Dominik Schürmann | 2014-08-07 | 1 | -0/+4 | |
| | | ||||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 85 | -3041/+2839 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | |||||
| * | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 7 | -31/+31 | |
| | | ||||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 41 | -66/+64 | |
| | | ||||||
| * | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | | ||||||
| * | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 5 | -16/+27 | |
| | | ||||||
| * | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 9 | -77/+101 | |
| | | | | | | | | selection for adding new subkeys | |||||
| * | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 1 | -3/+6 | |
| | | ||||||
| * | Work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 3 | -13/+39 | |
| | | ||||||
| * | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 3 | -19/+70 | |
| | | ||||||
| * | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 3 | -6/+7 | |
| | | ||||||
| * | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 5 | -226/+291 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-05 | 2 | -3/+7 | |
| |\ | ||||||
| | * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 2 | -3/+7 | |
| | | | ||||||
| * | | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 9 | -34/+55 | |
| |/ | ||||||
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 19 | -0/+323 | |
| | | ||||||
| * | Fix nullpointer, remove unused window feature | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
| | | ||||||
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 6 | -13/+15 | |
| | | ||||||
| * | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 | |
| | | ||||||
| * | 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 |