Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | minor fix for passphrase test | Vincent Breitmoser | 2014-09-15 | 1 | -1/+1 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 30 | -665/+884 | |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-09-15 | 1 | -1/+1 | |
| | | ||||||
| * | Fix build | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 45 | -587/+571 | |
| |\ | ||||||
| | * | 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 | 5 | -27/+40 | |
| | | | ||||||
| | * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 3 | -5/+15 | |
| | | | | | | | | | | | | side is revoked/expired, the merge reflects that | |||||
| | * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 16 | -438/+407 | |
| | | | ||||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 9 | -139/+366 | |
| | | | | | | | | | | | | non-decodable characters) | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 7 | -213/+379 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 3 | -30/+34 | |
| |\ \ \ | ||||||
| * | | | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 2 | -2/+3 | |
| | | | | | ||||||
* | | | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 10 | -471/+461 | |
| |_|_|/ |/| | | | ||||||
* | | | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 26 | -111/+101 | |
| | | | | ||||||
* | | | | 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 | 6 | -213/+276 | |
| |/ |/| | ||||||
* | | 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 | 2 | -3/+10 | |
|\ | ||||||
| * | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 1 | -3/+6 | |
| | | ||||||
| * | 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 | 1 | -0/+51 | |
|/ | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-13 | 1 | -1/+7 | |
|\ | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 2 | -0/+5 | |
| |\ | ||||||
| * | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 | |
| | | | ||||||
* | | | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 5 | -6/+9 | |
| |/ |/| | | | | | Fixes #849 | |||||
* | | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 | |
| | | ||||||
* | | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 2 | -0/+6 | |
|/ | ||||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 8 | -214/+344 | |
|\ | ||||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 1 | -5/+13 | |
| | | ||||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 3 | -26/+128 | |
| | | ||||||
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 6 | -64/+113 | |
| | | ||||||
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 7 | -231/+202 | |
| | | ||||||
* | | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 1 | -0/+10 | |
| | | ||||||
* | | More smaller UI fixes | Dominik Schürmann | 2014-09-13 | 2 | -0/+6 | |
| | | ||||||
* | | 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 | 1 | -0/+1 | |
| | | ||||||
* | | Add new PassphraseDialogActivity, a transparent activity that only holds the ↵ | Dominik Schürmann | 2014-09-13 | 1 | -0/+357 | |
| | | | | | | | | 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 | |
| | | ||||||
* | | 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 | 4 | -5/+244 | |
|\ \ | | | | | | | 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 | 4 | -5/+201 | |
| | | | | | | | | | | | | | | | | | | 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 | 23 | -402/+483 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 23 | -402/+483 | |
| |/ | ||||||
* / | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 2 | -119/+138 | |
|/ |