Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix minor logic error (haha) | Vincent Breitmoser | 2014-09-30 | 1 | -1/+1 |
| | |||||
* | fix ByteBuffer offset mistake in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -1/+2 |
| | |||||
* | pass (encryption) key id from Decrypt*Fragment to NfcActivity | Vincent Breitmoser | 2014-09-30 | 6 | -20/+42 |
| | |||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 3 | -4/+13 |
| | |||||
* | add (optional) keyId check in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -5/+20 |
| | |||||
* | revamp fingerprint and keyid methods in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -18/+47 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-30 | 13 | -82/+28 |
|\ | |||||
| * | Remove description, now in wiki | Dominik Schürmann | 2014-09-29 | 1 | -23/+0 |
| | | |||||
| * | Fix nullpointer in DecryptActivity | Dominik Schürmann | 2014-09-29 | 1 | -4/+8 |
| | | |||||
| * | 3.0 beta2 | Dominik Schürmann | 2014-09-29 | 1 | -2/+2 |
| | | |||||
| * | Disable NfcIntentActivity until we implement it properly | Dominik Schürmann | 2014-09-29 | 1 | -10/+10 |
| | | |||||
| * | Fixes for share to decrypt | Dominik Schürmann | 2014-09-29 | 2 | -4/+5 |
| | | |||||
| * | Remove unused layouts | Dominik Schürmann | 2014-09-29 | 2 | -35/+0 |
| | | |||||
| * | Maybe fixes encrypt files on tablets | Dominik Schürmann | 2014-09-29 | 6 | -5/+4 |
| | | |||||
* | | request passphrase for correct subkey in OpenPgpService | Vincent Breitmoser | 2014-09-30 | 1 | -7/+8 |
|/ | | | | fixes #811, hopefully | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-29 | 5 | -8/+12 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-29 | 7 | -126/+174 |
| |\ | |||||
| * | | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 5 | -8/+12 |
| | | | |||||
* | | | add barely functional nfc intent activity (WIP!) | Vincent Breitmoser | 2014-09-29 | 2 | -0/+324 |
| | | | |||||
* | | | add test class for Iso7816TLV class | Vincent Breitmoser | 2014-09-29 | 1 | -0/+99 |
| | | | |||||
* | | | add class for proper nfc tlv packet parsing | Vincent Breitmoser | 2014-09-29 | 1 | -0/+195 |
| |/ |/| | |||||
* | | fix method visibility for tests | Vincent Breitmoser | 2014-09-28 | 4 | -35/+40 |
| | | |||||
* | | move can.*() methods to CanonicalizedPublicKey, where they belong | Vincent Breitmoser | 2014-09-28 | 4 | -82/+83 |
| | | |||||
* | | be more mindful of algorithm and usage flag interaction | Vincent Breitmoser | 2014-09-28 | 4 | -16/+44 |
| | | | | | | | | Fixes #895 | ||||
* | | only check for primary binding certificate if key algorithm even supports ↵ | Vincent Breitmoser | 2014-09-28 | 1 | -9/+15 |
| | | | | | | | | signing | ||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-28 | 5 | -9/+22 |
|\| | |||||
| * | Hide keyboard after cloud search | Dominik Schürmann | 2014-09-27 | 1 | -0/+13 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-27 | 2 | -1/+11 |
| |\ | |||||
| * | | Dont show keyboard by default in key creation to allow the user to get an ↵ | Dominik Schürmann | 2014-09-27 | 4 | -9/+9 |
| | | | | | | | | | | | | overview what to type, use spannable where possible | ||||
* | | | Reject subkeys with no key flags and no primary key binding certificate | Vincent Breitmoser | 2014-09-28 | 1 | -27/+35 |
| |/ |/| | | | | | Closes #899 | ||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-26 | 6 | -48/+115 |
|\ \ | |||||
| * \ | Merge pull request #889 from timbray/master | Dominik Schürmann | 2014-09-25 | 1 | -0/+10 |
| |\ \ | | |/ | |/| | Fix bug where Keybase extraData gets lost when SKS wins the search race. | ||||
| | * | Fix bug where Keybase extraData gets lost when SKS wins the search race. | Tim Bray | 2014-09-25 | 1 | -0/+10 |
| |/ | |||||
| * | Fixes for new app list | Dominik Schürmann | 2014-09-24 | 2 | -43/+86 |
| | | |||||
| * | 3.0 beta1 | Dominik Schürmann | 2014-09-24 | 2 | -2/+16 |
| | | |||||
| * | Update CHANGELOG | Vincent | 2014-09-24 | 1 | -3/+3 |
| | | |||||
* | | nfc: use proper hex encoding for pin length | Vincent Breitmoser | 2014-09-26 | 1 | -1/+1 |
|/ | | | | Fixes #886 | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 38 | -213/+948 |
|\ | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-09-24 | 38 | -213/+948 |
| | | |||||
* | | disable pull to refresh (for now) | Vincent Breitmoser | 2014-09-24 | 1 | -2/+6 |
| | | |||||
* | | fix save button when no file is selected | Vincent Breitmoser | 2014-09-24 | 2 | -0/+5 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 5 | -35/+166 |
|\ | |||||
| * | Changelog | Dominik Schürmann | 2014-09-24 | 1 | -0/+11 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-24 | 1 | -5/+6 |
| |\ | |||||
| * | | propose apps in apps list | Dominik Schürmann | 2014-09-24 | 4 | -35/+155 |
| | | | |||||
* | | | show message about saving multiple files rather than hide the button | Vincent Breitmoser | 2014-09-24 | 2 | -23/+9 |
| | | | |||||
* | | | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 3 | -226/+147 |
| | | | |||||
* | | | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 4 | -3/+15 |
| | | | |||||
* | | | allow 1024 bit key signatures | Vincent Breitmoser | 2014-09-24 | 1 | -3/+2 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 3 | -27/+38 |
|\| |