Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 | |
| | | ||||||
* | | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 4 | -9/+24 | |
| | | ||||||
* | | Improve strings | Dominik Schürmann | 2015-05-19 | 4 | -39/+37 | |
| | | ||||||
* | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 3 | -14/+28 | |
| | | | | | | | | Fixes #1281 | |||||
* | | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-17 | 4 | -9/+15 | |
| | | ||||||
* | | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 | |
| | | ||||||
* | | simplify MainActivity and fix backstack issues | Vincent Breitmoser | 2015-05-17 | 1 | -60/+33 | |
| | | ||||||
* | | re-parcel log in LogDisplayFragment | Vincent Breitmoser | 2015-05-17 | 1 | -6/+20 | |
| | | ||||||
* | | fingerprints are 20 bytes, not 40. duh. | Vincent Breitmoser | 2015-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 | |
| | | ||||||
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 7 | -9/+69 | |
| | | ||||||
* | | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-16 | 2 | -6/+9 | |
| | | ||||||
* | | 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 | 2 | -41/+53 | |
| | | | | | | | | | | 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 | |||||
* | | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 1 | -12/+0 | |
| | | ||||||
* | | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 2 | -2/+4 | |
| | | ||||||
* | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 3 | -0/+40 | |
| | | ||||||
* | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 5 | -36/+39 | |
| | | ||||||
* | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 4 | -32/+45 | |
| | | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | |||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 13 | -290/+239 | |
| | | ||||||
* | | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 4 | -50/+69 | |
| | | ||||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 27 | -34/+631 | |
|/ | ||||||
* | 3.2.1 | Dominik Schürmann | 2015-05-10 | 2 | -3/+3 | |
| | ||||||
* | Fixing rotate crashes in create key | Dominik Schürmann | 2015-05-10 | 2 | -9/+5 | |
| | ||||||
* | Fix crash with v3 key fingerprints | Dominik Schürmann | 2015-05-10 | 1 | -1/+10 | |
| | ||||||
* | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 | |
| | ||||||
* | Reformat manifest | Dominik Schürmann | 2015-05-10 | 1 | -23/+23 | |
| | ||||||
* | Add dontnote to proguard | Dominik Schürmann | 2015-05-10 | 1 | -1/+2 | |
| | ||||||
* | Workaround for Samsung Android 4.2 bug | Dominik Schürmann | 2015-05-10 | 2 | -0/+33 | |
| | ||||||
* | Use snackbar lib from maven repo | Dominik Schürmann | 2015-05-10 | 1 | -1/+2 | |
| | ||||||
* | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 4 | -38/+50 | |
| | ||||||
* | Add self-encrypt for old API | Dominik Schürmann | 2015-05-10 | 1 | -0/+14 | |
| | ||||||
* | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 3 | -1/+52 | |
| | ||||||
* | Version 3.2 | Dominik Schürmann | 2015-05-06 | 24 | -25/+25 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 | |
| | ||||||
* | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 | |
| | ||||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 2 | -62/+80 | |
| | ||||||
* | Rename for consistency | Dominik Schürmann | 2015-05-06 | 2 | -5/+4 | |
| | ||||||
* | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 2 | -11/+10 | |
| | ||||||
* | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 5 | -117/+181 | |
| | | | | in DecryptTextActivity | |||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 7 | -9/+8 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 3 | -9/+54 | |
|\ | | | | | | | development | |||||
| * | revert unneeded changes for short key ID | William Faulk | 2015-05-04 | 1 | -27/+3 | |
| | | ||||||
| * | revert unneeded changes for old temp Bluetooth share file | William Faulk | 2015-05-04 | 1 | -13/+0 | |
| | | ||||||
| * | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | ||||||
| * | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 2 | -32/+18 | |
| | | ||||||
| * | Use FILE_EXTENSION constants | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | ||||||
| * | Use primary user ID for filename instead of short key ID | William Faulk | 2015-05-04 | 1 | -2/+5 | |
| | | ||||||
| * | Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater | William Faulk | 2015-05-04 | 1 | -42/+44 | |
| | |