| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 1 | -0/+1 |
| | | |||||
| * | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -5/+67 |
| | | |||||
| * | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -2/+2 |
| | | |||||
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 3 | -0/+51 |
| | | |||||
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -2/+2 |
| | | |||||
| * | 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! | ||||
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -40/+72 |
| |\ | | | | | Improve file encrypt | ||||
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -8/+14 |
| | |\ | |||||
| | * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -0/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | ||||
| | * \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 6 | -124/+414 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -48/+82 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 2 | -13/+107 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+5 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵ | mar-v-in | 2014-06-22 | 1 | -14/+14 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more | ||||
| | * | | | | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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) | ||||
| * | | | | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -3/+7 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | 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 update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 |
| |/ / / / / / | |||||
| * | | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | methods | ||||
| * | | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | file, fix #592 | ||||
| * | | | | | | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 3 | -12/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+9 |
| |/ / / / / / | |||||
| * | | | | | | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -42/+158 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -26/+69 |
| | | | | | | | | |||||
| | * | | | | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 3 | -20/+33 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 4 | -50/+224 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| | * | | | | | | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 |
| | | | | | | | | | |||||
| | * | | | | | | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -4/+3 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 2 | -13/+139 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | | | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -10/+10 |
| | | | | | | | | |||||
| | * | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 |
| | | | | | | | | |||||
| | * | | | | | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 |
| | | | | | | | | |||||
| | * | | | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 2 | -4/+71 |
| | | | | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |