Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 3 | -18/+27 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 17 | -186/+316 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Add license header to FixedDrawerLayout | Dominik Schürmann | 2014-05-18 | 1 | -0/+16 |
| | | |||||
| * | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 9 | -91/+128 |
| |\ | |||||
| | * | Rename mCurQuery to mQuery for consistency | Thialfihar | 2014-05-16 | 1 | -5/+5 |
| | | | |||||
| | * | Use Highlighter instead of HighlightQueryCursorAdapter | Thialfihar | 2014-05-16 | 3 | -79/+28 |
| | | | |||||
| | * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 5 | -5/+75 |
| | | | |||||
| | * | Support mutliple search words and highlight them | Thialfihar | 2014-05-16 | 3 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything. | ||||
| * | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 9 | -38/+34 |
| |/ | |||||
| * | keybase cleanups for revised search output format | Tim Bray | 2014-05-15 | 1 | -24/+7 |
| | | |||||
| * | keybase now has key info in search output | Tim Bray | 2014-05-15 | 1 | -0/+5 |
| | | |||||
| * | JWalk javadocs | Tim Bray | 2014-05-14 | 1 | -0/+48 |
| | | |||||
| * | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 5 | -16/+16 |
| | | |||||
| * | Add github, twitter, website info for keybase keys | Thialfihar | 2014-05-14 | 1 | -0/+17 |
| | | | | | | | | | | | | | | The very point of keybase.io is the identification and proven link to those identities, so it should be nice to have them. The display is a bit basic still, as it just adds them as userIds, I'm sure this can be prettified, perhaps with logos? | ||||
| * | Cleanup keybase query a bit | Thialfihar | 2014-05-14 | 1 | -15/+14 |
| | | | | | | | | | | | | | | Remove ctime and the cached key, making the query for the entire user object unnecessary. This should only be done when the user decides to import the key. Hopefully keybase.io can provide all info necessary in the search results. | ||||
| * | Don't guess keybase key algorithm and size | Thialfihar | 2014-05-14 | 2 | -5/+8 |
| | | | | | | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it. | ||||
| * | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 3 | -8/+20 |
| | | | | | | | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId. | ||||
| * | List full keybase id or strong key id matches on top | Thialfihar | 2014-05-14 | 1 | -1/+10 |
| | | |||||
| * | Make keybase lookup works for key ids starting with 0x | Thialfihar | 2014-05-14 | 1 | -1/+6 |
| | | |||||
* | | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 7 | -42/+44 |
| | | |||||
* | | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 13 | -37/+33 |
| | | |||||
* | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 23 | -211/+370 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 72 | -1048/+2531 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Removed unused Toast import | Daniel Haß | 2014-05-11 | 1 | -1/+0 |
| | | |||||
| * | Toast replacement | Daniel Haß | 2014-05-11 | 1 | -2/+4 |
| | | |||||
| * | Fixed wrong AppMsg-Style | Daniel Haß | 2014-05-11 | 1 | -2/+2 |
| | | |||||
| * | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 12 | -28/+63 |
| | | |||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 6 | -148/+189 |
| | | |||||
| * | use longsparsearrays instead of hashmaps in that one place | Vincent Breitmoser | 2014-05-08 | 1 | -16/+19 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-08 | 3 | -5/+1 |
| |\ | |||||
| | * | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 3 | -5/+1 |
| | | | | | | | | | | | | (tested and works, closes #569) | ||||
| * | | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 3 | -14/+10 |
| |/ | |||||
| * | use LoaderFragment in ViewKey tabs | Vincent Breitmoser | 2014-05-08 | 4 | -44/+32 |
| | | | | | | | | Closes #616 | ||||
| * | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 2 | -61/+88 |
| | | |||||
| * | Don't allow certification using keys where primary subkey is stripped | Vincent Breitmoser | 2014-05-07 | 1 | -4/+7 |
| | | | | | | | | Closes #596 | ||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 4 | -5/+5 |
| | | |||||
| * | Remove code for sharing whole key via qr code | Dominik Schürmann | 2014-05-07 | 2 | -129/+16 |
| | | |||||
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -4/+24 |
| | | |||||
| * | GET_KEY: also return PendingIntent to key view | Dominik Schürmann | 2014-05-07 | 2 | -2/+11 |
| | | |||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 6 | -46/+50 |
| | | |||||
| * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -44/+43 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 5 | -52/+102 |
| |\ | |||||
| | * | ui: use SlidingTabLayout in help activity | Vincent Breitmoser | 2014-05-07 | 1 | -20/+30 |
| | | | |||||
| | * | small fix for 6aafb3, forgot to commit this line | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| | * | ui: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+3 |
| | | | |||||
| | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 1 | -0/+12 |
| | | | |||||
| | * | ui: slight edit icon cosmetics in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+4 |
| | | | |||||
| | * | ui: move revocation/expiry notes above tab slider | Vincent Breitmoser | 2014-05-07 | 2 | -32/+32 |
| | | | |||||
| | * | ui: purplize edge overscroll glow effect | Vincent Breitmoser | 2014-05-07 | 1 | -0/+20 |
| | | | |||||
| * | | Clarify language | Dominik Schürmann | 2014-05-07 | 2 | -2/+2 |
| |/ |