Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | factor KeySpinner out | mar-v-in | 2014-08-14 | 4 | -136/+229 |
| | |||||
* | Remove MD5 support | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -18/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -9/+9 |
| | |||||
* | Add user info dialog | Dominik Schürmann | 2014-08-13 | 3 | -20/+128 |
| | |||||
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 3 | -14/+31 |
| | |||||
* | remove bundle for symmetric/asymmetric fragment as it was useless | mar-v-in | 2014-08-13 | 2 | -31/+16 |
| | |||||
* | fix message and uri from encrypt intent | mar-v-in | 2014-08-13 | 2 | -18/+4 |
| | |||||
* | Only show relevant keys in encrypt, fix #756 #757 | mar-v-in | 2014-08-12 | 2 | -13/+27 |
| | |||||
* | Only show keyrings that have a valid sign key in from field, fixes #756 | mar-v-in | 2014-08-12 | 1 | -10/+2 |
| | |||||
* | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 1 | -1/+0 |
| | |||||
* | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 2 | -10/+94 |
| | |||||
* | 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 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -8/+9 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 23 | -30/+16 |
| | |||||
* | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 4 | -15/+26 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 6 | -53/+87 |
| | | | | 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 | 2 | -6/+6 |
| | |||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 4 | -221/+224 |
| | |||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 5 | -13/+32 |
| | |||||
* | Add license headers | Dominik Schürmann | 2014-08-04 | 2 | -0/+34 |
| | |||||
* | 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 | 2 | -3/+4 |
| | |||||
* | More cleanup | Dominik Schürmann | 2014-08-04 | 1 | -3/+4 |
| | |||||
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -12/+23 |
| | |||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 4 | -10/+82 |
| | |||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -6/+6 |
| | |||||
* | 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 |
| | |||||
* | 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 | 16 | -941/+1220 |
|\ | | | | | 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 |
| | | |||||
| * | Fix first key is not used erroneously | mar-v-in | 2014-08-01 | 1 | -1/+0 |
| | | |||||
| * | 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 | 11 | -132/+171 |
| |\ | | | | | | | | | | | | | | | | 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 | 31 | -1706/+1688 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -86/+95 |
| | | | | | | | | | | | | | | | | | | | | - 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 | 7 | -557/+541 |
| | | | |