Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -4/+4 | |
| | ||||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 2 | -20/+54 | |
| | | | | 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 | 1 | -17/+47 | |
| | ||||||
* | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 1 | -6/+5 | |
| | ||||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 2 | -187/+189 | |
| | ||||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -1/+2 | |
| | ||||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 1 | -11/+17 | |
| | ||||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 1 | -0/+8 | |
| | ||||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 2 | -122/+52 | |
|\ | | | | | Improve file encrypt | |||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 1 | -1/+1 | |
| | | ||||||
| * | Fix merge | mar-v-in | 2014-07-31 | 1 | -3/+2 | |
| | | ||||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 5 | -150/+403 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 4 | -192/+55 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Encrypt/Decrypt UI work | mar-v-in | 2014-07-02 | 1 | -44/+15 | |
| | | | | ||||||
| * | | | 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 | 2 | -36/+90 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+217 | |
| |\ \ \ \ | ||||||
| * | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 2 | -82/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | -0/+268 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -7/+7 | |
| | | | | | ||||||
* | | | | | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 1 | -5/+0 | |
| | | | | | ||||||
* | | | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 1 | -111/+0 | |
| | | | | | ||||||
* | | | | | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 2 | -27/+92 | |
| | | | | | | | | | | | | | | | | | | | | versions... hopefully | |||||
* | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 1 | -3/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 1 | -3/+12 | |
| | | | | | | ||||||
* | | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 1 | -0/+187 | |
|/ / / / / | ||||||
* | | | / | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -0/+110 | |
| |_|_|/ |/| | | | ||||||
* | | | | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -3/+4 | |
| | | | | ||||||
* | | | | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -19/+46 | |
| | | | | ||||||
* | | | | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -5/+3 | |
| | | | | ||||||
* | | | | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 1 | -165/+0 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 1 | -30/+87 | |
|\ \ \ | ||||||
| * | | | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 1 | -30/+87 | |
| | |/ | |/| | ||||||
* / | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -4/+3 | |
|/ / | ||||||
* / | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 2 | -0/+217 | |
|/ | ||||||
* | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 1 | -0/+24 | |
| | ||||||
* | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -15/+43 | |
| | ||||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -1/+1 | |
| | ||||||
* | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 1 | -1/+1 | |
| | ||||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -10/+17 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 10 | -151/+74 | |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 10 | -23/+58 | |
| | |