Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -3/+0 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -10/+10 |
| | |||||
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -0/+2 |
| | |||||
* | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 1 | -2/+5 |
| | |||||
* | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 |
| | |||||
* | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| | |||||
* | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-16 | 1 | -1/+2 |
| | |||||
* | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -39/+45 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -28/+12 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -4/+4 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -4/+4 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -2/+2 |
| | | |||||
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -1/+19 |
| | | |||||
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -4/+79 |
| | | |||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+1 |
|/ | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -5/+5 |
| | |||||
* | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 1 | -152/+17 |
| | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
* | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 1 | -40/+51 |
| | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | ||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -3/+3 |
| | |||||
* | Use notify instead of Toast for NFC check | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1133 from Rrego6/development | Dominik Schürmann | 2015-03-12 | 1 | -0/+6 |
|\ | | | | | Check if NFC is available on device | ||||
| * | Check if NFC is available on device | Raoul | 2015-03-10 | 1 | -0/+6 |
| | | |||||
* | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -3/+4 |
|/ | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | Merge pull request #1108 from tdjogi010/development | Vincent | 2015-03-06 | 1 | -38/+74 |
|\ | | | | | Asks Passphrase for key delete/export in ViewKeyActivity. | ||||
| * | Asks Passphrase for key delete/export in ViewKeyActivity. | tdjogi010@gmail.com | 2015-03-06 | 1 | -38/+74 |
| | | |||||
* | | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 1 | -4/+5 |
|\ \ | | | | | | | #1042 replaced some int constants with enums | ||||
| * | | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 1 | -4/+5 |
| |/ | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
* | | Show fingerprint menu item only if not revoked or expired | Dominik Schürmann | 2015-03-04 | 1 | -9/+12 |
| | | |||||
* | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | |||||
* | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -3/+2 |
| | | |||||
* | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -7/+1 |
| | | |||||
* | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 1 | -11/+9 |
|/ | | | | instead of EXPIRY where possible | ||||
* | Revert "rescale qr code bitmap in background" | Dominik Schürmann | 2015-03-03 | 1 | -6/+7 |
| | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864. | ||||
* | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 |
| | |||||
* | don't reload qr code for identical fingerprint | Vincent Breitmoser | 2015-03-02 | 1 | -1/+5 |
| | |||||
* | fix a couple lint errors | Vincent Breitmoser | 2015-02-28 | 1 | -3/+4 |
| | |||||
* | some changes to qr scan logic | Vincent Breitmoser | 2015-02-28 | 1 | -6/+46 |
| | |||||
* | pass through messenger to certify service from ViewKeyActivity | Vincent Breitmoser | 2015-02-28 | 1 | -1/+21 |
| | | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state. | ||||
* | slightly longer color fade duration | Vincent Breitmoser | 2015-02-27 | 1 | -3/+3 |
| | |||||
* | transition status color in key view | Vincent Breitmoser | 2015-02-27 | 1 | -3/+30 |
| | |||||
* | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 1 | -7/+125 |
| | |||||
* | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 1 | -2/+2 |
| | |||||
* | Simplify delete key dialog | Dominik Schürmann | 2015-02-27 | 1 | -2/+0 |
| | |||||
* | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 1 | -36/+24 |
| | |||||
* | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -16/+41 |
| | | | | keys | ||||
* | Invoke NFC button | Dominik Schürmann | 2015-02-25 | 1 | -0/+28 |
| | |||||
* | Other icon for key exchange | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 1 | -5/+42 |
| | |||||
* | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -12/+21 |
| |