Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | 9 | -7/+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 | |
| | | ||||||
* | | Implement buttons in DecryptTextFragment | Dominik Schürmann | 2014-09-23 | 7 | -68/+155 | |
| | | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-23 | 1 | -0/+3 | |
|\| | ||||||
| * | missed a secondary preference initialization | Vincent Breitmoser | 2014-09-23 | 1 | -0/+3 | |
| | | ||||||
* | | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 10 | -62/+112 | |
|/ | ||||||
* | fix nullpointer ImportKeysListEntry (from pulltorefresh) | Vincent Breitmoser | 2014-09-23 | 1 | -2/+5 | |
| | | | | Fixes #873 | |||||
* | disable pull to refresh in upper right corner | Vincent Breitmoser | 2014-09-23 | 2 | -1/+26 | |
| | | | | | | | | While at the top of the list, the scroll bar handle is in the top right corner. Previously, dragging the handle from this position was difficult because touch events were intercepted by the pull to refresh handler. Closes #858 | |||||
* | be more precise on importresult overall error | Vincent Breitmoser | 2014-09-23 | 2 | -4/+7 | |
| | ||||||
* | take failed keys into account in importkeyresult notification | Vincent Breitmoser | 2014-09-23 | 2 | -1/+16 | |
| | ||||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 13 | -154/+208 | |
| | ||||||
* | reject keys with duplicate subkeys altogether | Vincent Breitmoser | 2014-09-23 | 3 | -1/+17 | |
| | | | | closes #870 | |||||
* | add test case for duplicate keys in keyring (#870) | Vincent Breitmoser | 2014-09-23 | 2 | -4/+4 | |
| | ||||||
* | log "unspecified" flags differently | Vincent Breitmoser | 2014-09-22 | 3 | -2/+14 | |
| | ||||||
* | nicer code in key import for flag log types | Vincent Breitmoser | 2014-09-22 | 1 | -75/+27 | |
| | ||||||
* | show authenticate flag in logs | Vincent Breitmoser | 2014-09-22 | 3 | -54/+128 | |
| | ||||||
* | Hack to fix #805 | Dominik Schürmann | 2014-09-22 | 4 | -18/+71 | |
| | ||||||
* | Fix possible nullpointer in ImportKeysFileFragment | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 | |
| | ||||||
* | Fix custom key configuration for primary user ids | Dominik Schürmann | 2014-09-21 | 6 | -11/+38 | |
| | ||||||
* | Fix LogDisplayFragment | Dominik Schürmann | 2014-09-21 | 3 | -13/+14 | |
| | ||||||
* | Fix ConsolidateResult, needed parcelable methods | Dominik Schürmann | 2014-09-21 | 2 | -2/+21 | |
| | ||||||
* | Merge pull request #871 from timbray/master | Dominik Schürmann | 2014-09-21 | 1 | -1/+4 | |
|\ | | | | | Handle absence of personal information in Keybase search result |