| Commit message (Expand) | Author | Age | Files | Lines |
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 11 | -159/+191 |
* | fix encrypt/decrypt classes | Vincent Breitmoser | 2014-09-17 | 1 | -3/+0 |
* | Dont copy encrypted file to clipboard (dont know how that code ended up there) | Dominik Schürmann | 2014-09-17 | 1 | -6/+1 |
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 14 | -184/+310 |
* | Fix construction of algorithmID in Keybase result lists | Tim Bray | 2014-09-15 | 1 | -2/+2 |
* | minor fix for passphrase test | Vincent Breitmoser | 2014-09-15 | 1 | -1/+1 |
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 92 | -942/+1900 |
|\ |
|
| * | Pull from transifex | Dominik Schürmann | 2014-09-15 | 43 | -162/+733 |
| * | ACCESS_NETWORK_STATE no longer needed | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 |
| * | 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 | 55 | -671/+668 |
| |\ |
|
| | * | 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 |
| | * | 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 |
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodab... | Dominik Schürmann | 2014-09-15 | 19 | -307/+532 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 8 | -214/+404 |
| |\ \ |
|
| * \ \ | 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 | 6 | -4/+166 |
* | | | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 19 | -501/+491 |
| |_|_|/
|/| | | |
|
* | | | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 27 | -113/+106 |
* | | | | 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 |
| |/
|/| |
|
* | | 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 |
* | | 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 | Vincent Breitmoser | 2014-09-13 | 1 | -1/+7 |
|\ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 3 | -0/+6 |
| |\ |
|
| * | | 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 |
| |/
|/| |
|
* | | 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 | 3 | -0/+7 |
|/ |
|
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 9 | -214/+382 |
|\ |
|
| * | 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 | 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 | 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 | 1 | -0/+1 |
* | | Add new PassphraseDialogActivity, a transparent activity that only holds the ... | Dominik Schürmann | 2014-09-13 | 2 | -2/+361 |
* | | 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 |