Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -1/+2 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | Add user info dialog | Dominik Schürmann | 2014-08-13 | 1 | -0/+8 |
| | |||||
* | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 1 | -0/+1 |
| | |||||
* | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | | | | selection for adding new subkeys | ||||
* | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 1 | -0/+5 |
| | |||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -75/+0 |
| | |||||
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -0/+1 |
| | |||||
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -2/+1 |
| | |||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -2/+3 |
| | |||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -2/+10 |
|\ | | | | | Improve file encrypt | ||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -18/+18 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | 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 | -4/+5 |
| | | | | |||||
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -15/+88 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring | ||||
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -7/+20 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI | ||||
| * | | | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -12/+26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 1 | -8/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | ||||
| * | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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) | ||||
* | | | | | | | | Add user id with dialog | Dominik Schürmann | 2014-08-01 | 1 | -3/+3 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | identity instead of credentials | Dominik Schürmann | 2014-08-01 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | move upload/update buttons from menu to buttons | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Remove private/secret key language from strings | Dominik Schürmann | 2014-07-31 | 1 | -9/+5 |
| | | | | | | |||||
* | | | | | | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Create key: design fixes | Dominik Schürmann | 2014-07-31 | 1 | -7/+9 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix animations in create key | Dominik Schürmann | 2014-07-31 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-31 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | methods | ||||
* | | | | | | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+10 |
|/ / / / / | |||||
* | | | | | Fix string | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -5/+7 |
| | | | | | |||||
* | | | | | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 2 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| * | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -1/+1 |
| | | | | | |