Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-17 | 1 | -28/+12 | |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
* | | don't keep an activity reference in CreateKeyFinalFragment | Vincent Breitmoser | 2015-05-28 | 1 | -26/+20 | |
| | | ||||||
* | | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -5/+7 | |
| | | ||||||
* | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 3 | -0/+23 | |
| | | ||||||
* | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 13 | -39/+75 | |
| | | | | | | | | PgpDecryptVerify changes | |||||
* | | correctly preserve state in EncryptTextFragment | Vincent Breitmoser | 2015-05-27 | 1 | -3/+15 | |
| | | ||||||
* | | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-27 | 3 | -9/+38 | |
| | | ||||||
* | | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-27 | 6 | -25/+42 | |
| | | ||||||
* | | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-27 | 5 | -22/+48 | |
| | | ||||||
* | | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-27 | 10 | -477/+346 | |
| | | ||||||
* | | fix nullpointer in encrypttextactivity. fixes #1267 | Vincent Breitmoser | 2015-05-27 | 1 | -24/+18 | |
| | | ||||||
* | | Merge pull request #1293 from Yoshi64Bit/development | Vincent | 2015-05-23 | 1 | -10/+19 | |
|\ \ | | | | | | | highlight currently selected item in navigation drawer | |||||
| * | | highlight currently selected item in navigation drawer | Yoshi64Bit | 2015-05-23 | 1 | -10/+19 | |
|/ / | ||||||
* | | AssertionError instead of RuntimeException | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 | |
| | | ||||||
* | | Change convertFingerprintToHex to use RuntimeException | Dominik Schürmann | 2015-05-21 | 1 | -7/+4 | |
| | | ||||||
* | | Version 3.2.2 | Dominik Schürmann | 2015-05-21 | 1 | -2/+2 | |
| | | ||||||
* | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 3 | -3/+3 | |
| | | ||||||
* | | 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 | 8 | -11/+108 | |
| | | ||||||
* | | 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 | |||||
* | | zxing lib is now on jcenter, see ↵ | Dominik Schürmann | 2015-05-15 | 1 | -5/+0 | |
| | | | | | | | | https://github.com/journeyapps/zxing-android-embedded/issues/39 | |||||
* | | Merge pull request #1278 from josecastillo/nfckeytocard | Vincent | 2015-05-15 | 29 | -80/+734 | |
|\ \ | |/ |/| | Support for moving RSA keys to Yubikey or NFC smart card | |||||
| * | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 2 | -36/+4 | |
| | | ||||||
| * | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 2 | -2/+4 | |
| | | ||||||
| * | Adding unit tests for PgpKeyOperation keytocard functionality. | Joey Castillo | 2015-05-13 | 1 | -1/+64 | |
| | | ||||||
| * | 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 | |
| |