Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 2 | -13/+13 | |
| | | | | | | | | Surrounded string with quotes | |||||
* | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 2 | -1/+379 | |
| | | ||||||
* | | corrected possible null pointer | Adithya Abraham Philip | 2015-04-22 | 1 | -1/+1 | |
| | | ||||||
* | | Simplify ImportKeysProxyActivity | Dominik Schürmann | 2015-04-21 | 1 | -29/+12 | |
| | | ||||||
* | | added log to QR code scan/import fail | Adithya Abraham Philip | 2015-04-21 | 1 | -12/+11 | |
| | | ||||||
* | | Fix for initialization failure when card returns FCI in data field. | Joey Castillo | 2015-04-20 | 1 | -1/+1 | |
| | | ||||||
* | | Track state of PIN verification on smart card; only verify when needed. | Joey Castillo | 2015-04-20 | 1 | -2/+33 | |
| | | ||||||
* | | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 5 | -37/+142 | |
| | | ||||||
* | | Format KeyListFragment | Dominik Schürmann | 2015-04-18 | 1 | -10/+9 | |
| | | ||||||
* | | Temporarily fix devices without nfc | Dominik Schürmann | 2015-04-18 | 1 | -0/+6 | |
| | | ||||||
* | | Use portrait mode for qr code scanning | Dominik Schürmann | 2015-04-15 | 1 | -10/+8 | |
| | | ||||||
* | | More cleanup | Dominik Schürmann | 2015-04-15 | 9 | -324/+28 | |
| | | ||||||
* | | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 7 | -53/+45 | |
| | | ||||||
* | | Clean up NfcOperationActivity | Dominik Schürmann | 2015-04-15 | 1 | -8/+6 | |
| | | ||||||
* | | Reformat nfcVerifyPIN | Dominik Schürmann | 2015-04-15 | 1 | -6/+6 | |
| | | ||||||
* | | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 | |
| | | ||||||
* | | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 | |
|/ | ||||||
* | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -21/+85 | |
|\ | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | |||||
| * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -9/+23 | |
| | | ||||||
| * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 1 | -20/+70 | |
| | | ||||||
* | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 2 | -8/+4 | |
| | | ||||||
* | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 2 | -8/+10 | |
| | | ||||||
* | | 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 | 5 | -105/+25 | |
| | | ||||||
* | | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 2 | -124/+58 | |
| | | ||||||
* | | 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 | 3 | -2/+16 | |
|\ \ | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel | |||||
| * | | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 3 | -2/+16 | |
| | | | ||||||
* | | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -2/+3 | |
|/ / | ||||||
* | | 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 | 11 | -281/+48 | |
| | | | ||||||
* | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 3 | -15/+8 | |
|/ / | ||||||
* | | 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 | 1 | -12/+36 | |
|\| | ||||||
| * | -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 | 3 | -32/+49 | |
| | | ||||||
* | | 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 | 24 | -142/+299 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 |