Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
* | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 |
| | | | | |||||
* | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 |
| |/ / | |||||
* | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| | | | |||||
* | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 3 | -5/+49 |
| | | | |||||
* | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 7 | -198/+330 |
| | | | |||||
* | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 5 | -30/+21 |
| | | | |||||
* | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -11/+102 |
| | | | |||||
* | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 6 | -158/+259 |
| | | | |||||
* | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 6 | -67/+142 |
| | | | |||||
* | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 5 | -21/+278 |
| | | | |||||
* | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 28 | -451/+589 |
| | | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 25 | -193/+200 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 24 | -198/+169 |
| |\ \ | | | | | | | | | | | | | into manojkhannakm-development | ||||
| | * | | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 |
| | | | | |||||
| | * | | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 |
| | | | | |||||
| | * | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 24 | -197/+153 |
| | | | | |||||
| * | | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #1163 from kentnek/dev-list-footer | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 |
| |\ \ | | | | | | | | | Added a blank footer view to the list of keys | ||||
| | * | | - Added footer so that the Floating Action Button won't block the last few ↵ | Kent | 2015-03-20 | 1 | -2/+17 |
| | |/ | | | | | | | | | | items' content | ||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 |
| | | |