Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 | |
|\ | ||||||
| * | add error text on bad passphrase | Vincent Breitmoser | 2014-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | Put quotes around all strings, should fix transifex consistency problems, ↵ | Dominik Schürmann | 2014-09-07 | 1 | -646/+646 | |
|/ | | | | also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes) | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-07 | 4 | -121/+212 | |
|\ | ||||||
| * | make EditKeyFragment work with new PassphraseDialog | Vincent Breitmoser | 2014-09-07 | 1 | -40/+40 | |
| | | ||||||
| * | add proper async check for correct passphrase to passphrasedialog | Vincent Breitmoser | 2014-09-07 | 3 | -81/+172 | |
| | | ||||||
* | | Two buttons to encrypt files and text, some fixes | Dominik Schürmann | 2014-09-07 | 6 | -33/+77 | |
|/ | ||||||
* | Better symmetric encryption layout | Dominik Schürmann | 2014-09-07 | 1 | -38/+23 | |
| | ||||||
* | Save account on back press and with notify | Dominik Schürmann | 2014-09-07 | 3 | -7/+25 | |
| | ||||||
* | More UI rework | Dominik Schürmann | 2014-09-07 | 10 | -118/+163 | |
| | ||||||
* | Fix width for encrypt to | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 | |
| | ||||||
* | Remove file menu items from text activity | Dominik Schürmann | 2014-09-06 | 3 | -5/+20 | |
| | ||||||
* | No inception with APG | Dominik Schürmann | 2014-09-06 | 2 | -2/+12 | |
| | ||||||
* | Fix AndroidManifest for new encrypt activities | Dominik Schürmann | 2014-09-06 | 3 | -3/+27 | |
| | ||||||
* | Share helper | Dominik Schürmann | 2014-09-06 | 3 | -129/+113 | |
| | ||||||
* | Drawer nav method cleanup | Dominik Schürmann | 2014-09-06 | 6 | -13/+12 | |
| | ||||||
* | Remove unused gmail clearup method | Dominik Schürmann | 2014-09-06 | 1 | -20/+0 | |
| | ||||||
* | Add experimental support for yubikey PINs, remove caching of empty passphrases | Dominik Schürmann | 2014-09-05 | 3 | -15/+34 | |
| | ||||||
* | Add yubikey default PIN preference | Dominik Schürmann | 2014-09-05 | 5 | -15/+47 | |
| | ||||||
* | Safeslinger: icon, about info | Dominik Schürmann | 2014-09-04 | 8 | -2/+499 | |
| | ||||||
* | Update safeslinger lib | Dominik Schürmann | 2014-09-04 | 1 | -0/+0 | |
| | ||||||
* | Safeslinger: more simplification | Dominik Schürmann | 2014-09-04 | 1 | -11/+7 | |
| | ||||||
* | Safeslinger: cleanup | Dominik Schürmann | 2014-09-04 | 1 | -16/+15 | |
| | ||||||
* | Safeslinger: get all bytes | Dominik Schürmann | 2014-09-04 | 1 | -2/+12 | |
| | ||||||
* | Use bytes to share via safeslinger, import on result | Dominik Schürmann | 2014-09-04 | 1 | -5/+56 | |
| | ||||||
* | Integrate safeslinger share | Dominik Schürmann | 2014-09-04 | 4 | -7/+42 | |
| | ||||||
* | Add safeslinger to build | Dominik Schürmann | 2014-09-04 | 4 | -3/+6 | |
| | ||||||
* | Add safeslinger submodule | Dominik Schürmann | 2014-09-04 | 2 | -1/+4 | |
| | ||||||
* | Fix mAllowedKeyIds | Dominik Schürmann | 2014-09-03 | 1 | -3/+3 | |
| | ||||||
* | ditch public divert-to-card test keyring | Vincent Breitmoser | 2014-09-03 | 2 | -46/+0 | |
| | ||||||
* | implement test case for mailvelope keyring with no key flags | Vincent Breitmoser | 2014-09-03 | 1 | -0/+25 | |
| | ||||||
* | fix tests for changed key flag semantics | Vincent Breitmoser | 2014-09-03 | 1 | -8/+8 | |
| | ||||||
* | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 5 | -86/+70 | |
| | ||||||
* | add getSecretKeyType method to CachedPublicKeyRing | Vincent Breitmoser | 2014-09-03 | 3 | -17/+46 | |
| | ||||||
* | Fix possible nullpointer in AppsListFragment | Dominik Schürmann | 2014-09-02 | 1 | -2/+1 | |
| | ||||||
* | Fix strings | Dominik Schürmann | 2014-09-02 | 1 | -2/+2 | |
| | ||||||
* | If no key flags subpacket is present allow all key flags, fixes mailvelope keys | Dominik Schürmann | 2014-09-02 | 2 | -24/+67 | |
| | ||||||
* | Remove version 3 checks, no longer supported in import | Dominik Schürmann | 2014-09-02 | 3 | -27/+24 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-09-02 | 47 | -378/+1229 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-02 | 6 | -46/+85 | |
|\ | ||||||
| * | add test for divert-to-card | Vincent Breitmoser | 2014-09-02 | 6 | -46/+85 | |
| | | ||||||
* | | Catch security exception, known problem... | Dominik Schürmann | 2014-09-02 | 2 | -13/+24 | |
|/ | ||||||
* | Add testkey for gnupg generated divert-to-card key with Yubikey NEO | Dominik Schürmann | 2014-09-02 | 1 | -0/+86 | |
| | ||||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 8 | -39/+113 | |
| | ||||||
* | Lock drawer in EncryptFileActivity if called from intent | Vincent Breitmoser | 2014-09-01 | 2 | -0/+6 | |
| | | | | Closes #810 | |||||
* | rename EncryptMessageFragment -> EncryptTextFragment | Vincent Breitmoser | 2014-09-01 | 2 | -2/+2 | |
| | ||||||
* | remove redundant check from EncryptFileActivity | Vincent Breitmoser | 2014-09-01 | 1 | -5/+0 | |
| | ||||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 16 | -175/+616 | |
| | ||||||
* | remove "sign" and "verify" from drawer texts | Vincent Breitmoser | 2014-09-01 | 1 | -2/+2 | |
| | ||||||
* | small ui changes in encrypt | Vincent Breitmoser | 2014-09-01 | 4 | -12/+13 | |
| |