| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 4 | -24/+69 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove unused AlgorithmNames | Dominik Schürmann | 2015-04-10 | 1 | -93/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add license headers | Dominik Schürmann | 2015-04-10 | 3 | -0/+51 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 2 | -59/+106 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix signing subkey selection in remote service | Dominik Schürmann | 2015-04-07 | 2 | -20/+52 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify ↵ | Dominik Schürmann | 2015-04-04 | 2 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when adding a range of input uris | |||||
| * | | | | | | | | | | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 15 | -276/+150 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 3 | -129/+79 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Better check if file is already added | Dominik Schürmann | 2015-03-31 | 1 | -19/+42 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'v/crypto-input-parcel' of ↵ | Dominik Schürmann | 2015-03-31 | 4 | -12/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel | |||||
| | * | | | | | | | | | | | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 4 | -12/+50 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -2/+3 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | update OpenPgpApi, re-add EXTRA_PASSPHRASE | Vincent Breitmoser | 2015-03-30 | 1 | -0/+13 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'v/crypto-input-parcel' of ↵ | Vincent Breitmoser | 2015-03-30 | 6 | -120/+332 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | |||||
| | * | | | | | | | | | | | Dont show slinger button in spinner | Dominik Schürmann | 2015-03-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 5 | -121/+331 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 2 | -574/+5 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 20 | -559/+185 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 10 | -90/+35 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 4 | -392/+400 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | |||||
| | * | | | | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 4 | -392/+400 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |||||
| * | | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 2 | -14/+41 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Corrected import error message, changed style to WARN | |||||
| | | * | | | | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | -Fixed a situation where additional emails could be duplicated when creating ↵ | Daniel Ramos | 2015-03-27 | 1 | -12/+36 | |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. | |||||
| * | | | | | | | | | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 5 | -41/+69 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 8 | -400/+415 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Modify break as return. | iseki | 2015-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Add brackets for if-else constructs and externalize the procedure as ↵ | iseki | 2015-03-26 | 1 | -26/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | showMultiExportDialog. | |||||
| | * | | | | | | | | | | Add a loop for multiple key export. | iseki | 2015-03-25 | 1 | -13/+68 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 6 | -506/+531 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 3 | -10/+6 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove backward compat in CertifyKeyFragment | Dominik Schürmann | 2015-03-25 | 1 | -17/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 32 | -186/+753 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |||||
| | * | | | | | | | | | | Pull from transifex | Dominik Schürmann | 2015-03-23 | 3 | -10/+10 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #1165 from kentnek/dev-yubikey-null | Dominik Schürmann | 2015-03-23 | 1 | -5/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed #1152: NullPointerException when signing with YubiKey | |||||
| | | * | | | | | | | | | | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding. | |||||
| | * | | | | | | | | | | | Merge pull request #1166 from adithyaphilip/multi-threaded | Dominik Schürmann | 2015-03-23 | 22 | -122/+681 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-threaded key import, update all feature | |||||
| | | * | | | | | | | | | | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 20 | -334/+608 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | |||||
| | | * | | | | | | | | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 4 | -35/+320 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | |||||
| | * | | | | | | | | | | | | Fix passphrase cache not clearing all passphrases | Dominik Schürmann | 2015-03-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #1174 from Jesperbk/development | Dominik Schürmann | 2015-03-23 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | Fixed symmetric encryption crash | |||||
| | | * | | | | | | | | | | | Fixed issue where setting a passphrase to null later causes a ↵ | JesperBK | 2015-03-23 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NullPointerException. | |||||
| | * | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-23 | 1 | -14/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | | | | | | | | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 3 | -17/+41 | |
| | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 4 | -24/+77 | |
| | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |