Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| |/ | ||||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | edit button with image | Dominik Schürmann | 2014-05-06 | 1 | -2/+3 | |
| | | ||||||
| * | Always use section style instead of custom class | Dominik Schürmann | 2014-05-06 | 1 | -69/+0 | |
| | | ||||||
| * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 16 | -48/+38 | |
| | | ||||||
| * | ui: apply purple theme (twi is best color) | Vincent Breitmoser | 2014-05-06 | 2 | -2/+2 | |
| | | ||||||
| * | ui: use textview buttons in decrypt verify dialogue | Vincent Breitmoser | 2014-05-06 | 2 | -6/+6 | |
| | | ||||||
| * | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 2 | -10/+9 | |
| | | ||||||
| * | Touch view only once | Dominik Schürmann | 2014-05-06 | 1 | -9/+11 | |
| | | ||||||
| * | ui: use primary icon color for certification status | Vincent Breitmoser | 2014-05-06 | 1 | -11/+8 | |
| | | ||||||
| * | ui: show revocation and expiry status on info tab | Vincent Breitmoser | 2014-05-06 | 1 | -31/+40 | |
| | | ||||||
| * | ui: subkey view redesign | Vincent Breitmoser | 2014-05-05 | 1 | -31/+13 | |
| | | ||||||
| * | ui: remove primary subkey info | Vincent Breitmoser | 2014-05-05 | 1 | -113/+7 | |
| | | ||||||
| * | Merge pull request #609 from Vadiml1024/master | Dominik Schürmann | 2014-05-05 | 1 | -2/+2 | |
| |\ | | | | | | | Avoid displaying double 0x before keyid in ViewCertActivity | |||||
| | * | Avoid displaying double 0x before keyid in ViewCertActivity | Vadim Lebedev | 2014-05-02 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix license header | Dominik Schürmann | 2014-05-05 | 1 | -12/+11 | |
| | | | ||||||
| * | | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 15 | -31/+621 | |
| |\ \ | | | | | | | | | Adds first level of keybase support |