Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #844 from timbray/master | Dominik Schürmann | 2014-09-14 | 30 | -548/+550 |
|\ | | | | | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | ||||
| * | update for new plural origins on ImportKeyListEntry | Tim Bray | 2014-09-13 | 1 | -1/+1 |
| | | |||||
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 7 | -38/+49 |
| | | |||||
| * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 4 | -7/+17 |
| | | | | | | | | side is revoked/expired, the merge reflects that | ||||
| * | Restore Yubikey setting, lost in fumble-fingered merge | Tim Bray | 2014-09-13 | 1 | -0/+7 |
| | | |||||
| * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 26 | -527/+501 |
|/ | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 30 | -123/+116 |
| | |||||
* | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 6 | -10/+12 |
| | |||||
* | (forgot a file for previous commit) | Vincent Breitmoser | 2014-09-14 | 1 | -0/+103 |
| | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 7 | -214/+301 |
| | |||||
* | Merge pull request #850 from da-kid/master | Dominik Schürmann | 2014-09-14 | 3 | -30/+34 |
|\ | | | | | Fixed pull2refresh bugs | ||||
| * | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 3 | -30/+34 |
|/ | |||||
* | Hack to disable overscroll effect of swipe to update | Dominik Schürmann | 2014-09-13 | 3 | -15/+486 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 3 | -4/+11 |
|\ | |||||
| * | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 2 | -4/+7 |
| | | |||||
| * | just skip foreign uid certifications during import for now | Vincent Breitmoser | 2014-09-13 | 1 | -0/+4 |
| | | | | | | | | Related to #836, fix still pending | ||||
* | | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 3 | -0/+66 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 5 | -6/+9 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-13 | 2 | -3/+8 |
| |\ | |||||
| * | | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 5 | -6/+9 |
| | | | | | | | | | | | | Fixes #849 | ||||
* | | | Fix tests | Dominik Schürmann | 2014-09-13 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 3 | -0/+6 |
|\| | |||||
| * | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-13 | 1 | -8/+3 |
| |\ | |||||
| | * | Cleanup test | Dominik Schürmann | 2014-09-13 | 1 | -8/+3 |
| | | | |||||
| * | | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 3 | -0/+7 |
| |/ | |||||
* | | Cleanup tests | Dominik Schürmann | 2014-09-13 | 2 | -10/+4 |
| | | |||||
* | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 |
|/ | |||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 10 | -216/+384 |
|\ | |||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 2 | -7/+15 |
| | | |||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 4 | -26/+166 |
| | | |||||
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 6 | -64/+113 |
| | | |||||
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 8 | -233/+204 |
| | | |||||
* | | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 2 | -0/+11 |
| | | |||||
* | | More smaller UI fixes | Dominik Schürmann | 2014-09-13 | 3 | -0/+7 |
| | | |||||
* | | If expired/revoked, disable both encrypt buttons | Dominik Schürmann | 2014-09-13 | 1 | -0/+3 |
| | | |||||
* | | Test for badly encoded user ids | Dominik Schürmann | 2014-09-13 | 2 | -1/+31 |
| | | |||||
* | | Add new PassphraseDialogActivity, a transparent activity that only holds the ↵ | Dominik Schürmann | 2014-09-13 | 2 | -2/+361 |
| | | | | | | | | passphrase dialog | ||||
* | | Fix share to encrypt text | Dominik Schürmann | 2014-09-13 | 2 | -25/+22 |
| | | |||||
* | | Use spannable directly instead of html conversion in SubkeysAdapter | Dominik Schürmann | 2014-09-13 | 2 | -12/+20 |
| | | |||||
* | | Fix tests | Dominik Schürmann | 2014-09-13 | 2 | -2/+4 |
| | | |||||
* | | Add key with bad user id encoding | Dominik Schürmann | 2014-09-13 | 1 | -0/+60 |
| | | |||||
* | | Remove unused method in KeyUpdateHelper | Dominik Schürmann | 2014-09-13 | 1 | -17/+0 |
| | | |||||
* | | Merge pull request #843 from da-kid/master | Dominik Schürmann | 2014-09-13 | 5 | -80/+315 |
|\ \ | | | | | | | Implemented Pull2Refresh | ||||
| * | | Removed unnecessary querying of keyservers, reimplemented the ↵ | Daniel Albert | 2014-09-13 | 3 | -38/+81 |
| | | | | | | | | | | | | ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers | ||||
| * | | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 5 | -80/+272 |
| | | | | | | | | | | | | | | | | | | Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment | ||||
* | | | Get certificates by raw user ids, be more liberal about accepted user id ↵ | Dominik Schürmann | 2014-09-13 | 5 | -39/+72 |
| | | | | | | | | | | | | encodings | ||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 29 | -426/+494 |
|\ \ \ | | |/ | |/| | |||||
| * | | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 29 | -426/+494 |
| |/ | |||||
* / | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 2 | -119/+138 |
|/ |