Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | ||||||
* | Merge pull request #859 from timbray/master | Dominik Schürmann | 2014-09-16 | 1 | -2/+2 | |
|\ | | | | | Fix construction of algorithmID in Keybase result lists | |||||
| * | Fix construction of algorithmID in Keybase result lists | Tim Bray | 2014-09-15 | 1 | -2/+2 | |
|/ | ||||||
* | start work on encrypt/decrypt test classes | Vincent Breitmoser | 2014-09-15 | 6 | -138/+134 | |
| | ||||||
* | minor fix for passphrase test | Vincent Breitmoser | 2014-09-15 | 2 | -3/+1 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 94 | -942/+1900 | |
|\ | | | | | | | | | | | 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 | 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 | |
| | | ||||||
| * | Update libs | Dominik Schürmann | 2014-09-15 | 2 | -0/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 58 | -681/+678 | |
| |\ | ||||||
| | * | 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 | |
| | |/ | ||||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 19 | -307/+532 | |
| | | | | | | | | | | | | non-decodable characters) | |||||
| * | | 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 | 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 | |
| | |