Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 4 | -60/+102 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 15 | -625/+538 |
|\ | | | | | | | | | | | 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 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 16 | -473/+214 |
| |\ | |||||
| | * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 1 | -3/+3 |
| | | | | | | | | | | | | side is revoked/expired, the merge reflects that | ||||
| | * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 9 | -433/+175 |
| | | | |||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 5 | -132/+303 |
| | | | | | | | | | | | | non-decodable characters) | ||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 2 | -4/+17 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 2 | -4/+8 |
| |\ \ \ | |||||
| * | | | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -4/+4 |
| |_|_|/ |/| | | | |||||
* | | | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 7 | -37/+36 |
| | | | | |||||
* | | | | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 2 | -3/+3 |
| |_|/ |/| | | |||||
* | | | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 2 | -4/+17 |
| |/ |/| | |||||
* | | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 2 | -4/+8 |
|/ | |||||
* | Hack to disable overscroll effect of swipe to update | Dominik Schürmann | 2014-09-13 | 2 | -15/+13 |
| | |||||
* | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 1 | -0/+51 |
| | |||||
* | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 2 | -2/+4 |
| | | | | Fixes #849 | ||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 3 | -51/+70 |
|\ | |||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 1 | -2/+2 |
| | | |||||
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 2 | -14/+26 |
| | | |||||
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 3 | -52/+59 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 | 1 | -10/+20 |
| | | |||||
* | | Merge pull request #843 from da-kid/master | Dominik Schürmann | 2014-09-13 | 2 | -1/+116 |
|\ \ | |/ |/| | Implemented Pull2Refresh | ||||
| * | Removed unnecessary querying of keyservers, reimplemented the ↵ | Daniel Albert | 2014-09-13 | 2 | -21/+61 |
| | | | | | | | | ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers | ||||
| * | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 2 | -1/+76 |
| | | | | | | | | | | | | 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 | ||||
* | | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 7 | -17/+17 |
|/ | |||||
* | fix key upload after certification (hopefully?) | Vincent Breitmoser | 2014-09-12 | 1 | -4/+1 |
| | |||||
* | add ui support for stripping subkeys | Vincent Breitmoser | 2014-09-11 | 3 | -16/+35 |
| | |||||
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 1 | -0/+4 |
| | |||||
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 2 | -13/+23 |
| | | | | Should improve situation on #811 | ||||
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 2 | -9/+9 |
| | |||||
* | introduce SingletonResult for... singleton results | Vincent Breitmoser | 2014-09-08 | 1 | -6/+2 |
| | |||||
* | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -9/+39 |
| | | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828 | ||||
* | Revert changes in DecryptFileFragment | Dominik Schürmann | 2014-09-08 | 1 | -17/+1 |
| | |||||
* | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 2 | -1/+18 |
| | |||||
* | Yubikey: use PIN | Dominik Schürmann | 2014-09-08 | 1 | -1/+1 |
| | |||||
* | Dont show key_unavailable on pub keys | Dominik Schürmann | 2014-09-07 | 1 | -1/+2 |
| | |||||
* | Remove SelectSecretKey, not used anymore | Dominik Schürmann | 2014-09-07 | 3 | -519/+0 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-07 | 2 | -5/+54 |
|\ | |||||
| * | flag revoked, epired and unavailable keys in selection spinner | Vincent Breitmoser | 2014-09-07 | 2 | -5/+54 |
| | | |||||
* | | API fixes | Dominik Schürmann | 2014-09-07 | 3 | -4/+4 |
|/ | |||||
* | Update and fix Intent API | Dominik Schürmann | 2014-09-07 | 4 | -14/+16 |
| | |||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 6 | -22/+22 |
| | | | | http://developer.android.com/guide/components/intents-filters.html | ||||
* | add error text on bad passphrase | Vincent Breitmoser | 2014-09-07 | 1 | -1/+1 |
| |