Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-29 | 5 | -123/+171 | |
| |\ | ||||||
| * | | 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 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 | 2 | -33/+37 | |
| | | ||||||
* | | move can.*() methods to CanonicalizedPublicKey, where they belong | Vincent Breitmoser | 2014-09-28 | 3 | -81/+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 | 5 | -45/+112 | |
|\ \ | ||||||
| * | | 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 | |
| | | ||||||
* | | 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 | 4 | -35/+155 | |
|\ | ||||||
| * | 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 | 2 | -27/+38 | |
|\| | ||||||
| * | Fix logging in NFcActivity | Dominik Schürmann | 2014-09-24 | 2 | -27/+38 | |
| | | ||||||
* | | fix Le fields in APDUs | Vincent Breitmoser | 2014-09-24 | 1 | -5/+6 | |
|/ | ||||||
* | Fix yubikey pin lengths other than 6 | Vincent Breitmoser | 2014-09-24 | 1 | -1/+1 | |
| | | | | Closes #883 | |||||
* | add subtle attention seeker to decryptactivity with available clipboard data | Vincent Breitmoser | 2014-09-24 | 3 | -0/+139 | |
| | | | | | | Thanks Cyril Mottier https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy | |||||
* | Fix strings reported by yahoe.001 | Dominik Schürmann | 2014-09-24 | 2 | -3/+3 | |
| | ||||||
* | Fix NfcActivity typo | Dominik Schürmann | 2014-09-24 | 1 | -1/+1 | |
| | ||||||
* | Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no ↵ | Dominik Schürmann | 2014-09-24 | 10 | -8/+951 | |
| | | | | need to separate | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-24 | 5 | -32/+62 | |
|\ | ||||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 18 | -200/+331 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | |||||
| * | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 3 | -15/+37 | |
| | | | ||||||
| * | | fix signatures produced by yubikey | Vincent Breitmoser | 2014-09-24 | 1 | -12/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The timestamp was only set on a second run. This led to a race condition whether the signature could be completed within the same timestamp. Fixes #834 | |||||
| * | | fix nullpointer in previous swipetorefresh fix | Vincent Breitmoser | 2014-09-23 | 1 | -5/+9 | |
| | | | ||||||
* | | | DecryptFiles: Reset state for new file decrytion | Dominik Schürmann | 2014-09-24 | 1 | -1/+3 | |
| |/ |/| | ||||||
* | | Fix new decrypt button | Dominik Schürmann | 2014-09-24 | 1 | -3/+0 | |
| | | ||||||
* | | cleanup | Dominik Schürmann | 2014-09-24 | 1 | -28/+0 | |
| | | ||||||
* | | Button text for decrypt | Dominik Schürmann | 2014-09-24 | 2 | -13/+79 | |
| | | ||||||
* | | Fix yubikey file decryption | Dominik Schürmann | 2014-09-24 | 4 | -25/+17 | |
| | | ||||||
* | | Yubikey text decryption working | Dominik Schürmann | 2014-09-24 | 5 | -11/+12 | |
| | | ||||||
* | | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 8 | -92/+50 | |
| | | ||||||
* | | DecryptFilesActivity | Dominik Schürmann | 2014-09-24 | 3 | -14/+21 | |
| | |