Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Rename advanced to extended | Dominik Schürmann | 2015-03-31 | 1 | -7/+7 |
| | |||||
* | 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 |
| | | |||||
* | | From passphrase to password | Dominik Schürmann | 2015-03-31 | 1 | -47/+47 |
| | | |||||
* | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 3 | -4/+4 |
|/ | |||||
* | 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 | 9 | -183/+392 |
|\ | | | | | | | | | | | | | 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 |
| | | |||||
| * | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 |
| | | |||||
| * | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 8 | -184/+390 |
| | | |||||
* | | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 3 | -580/+5 |
| | | |||||
* | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 21 | -560/+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 | 7 | -405/+423 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | ||||
| * | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -405/+423 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | ||||
* | | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 3 | -14/+42 |
|\| | |||||
| * | 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 | 2 | -12/+37 |
| |/ | | | | | | | 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 | 8 | -43/+70 |
| | | |||||
* | | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 |
| | | |||||
* | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 9 | -404/+418 |
| | | |||||
* | | 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 | 9 | -516/+539 |
| | | |||||
* | | 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 | 224 | -8054/+10116 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 2 | -3/+3 |
| | | |||||
| * | translation fixes | Dominik Schürmann | 2015-03-23 | 8 | -113/+93 |
| | | |||||
| * | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 4 | -11/+16 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2015-03-23 | 113 | -209/+8859 |
| | | |||||
| * | Remove remaining html entities in changelog | Dominik Schürmann | 2015-03-23 | 1 | -3/+3 |
| | | |||||
| * | 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 | 25 | -122/+691 |
| |\ \ | | | | | | | | | Multi-threaded key import, update all feature | ||||
| | * | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 21 | -334/+611 |
| | | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
| | * | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 6 | -35/+327 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Markdown comments | Dominik Schürmann | 2015-03-23 | 5 | -5/+5 |
| | | | | |||||
| * | | | Remove changelog in main folder, update comments | Dominik Schürmann | 2015-03-23 | 4 | -0/+4 |
| | | | |