Vincent Breitmoser
10ad7be46b
wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type
2014-05-23 16:44:50 +02:00
Vincent Breitmoser
cd0aba9d43
wrapped-key-ring: encapsulate key flags
2014-05-22 13:05:02 +02:00
Vincent Breitmoser
952bb99a24
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-05-21 23:06:51 +02:00
Vincent Breitmoser
6d7daec37f
wrapped-key-ring: use CachedKeyRing where possible
2014-05-21 21:41:51 +02:00
Vincent Breitmoser
ab6c47a9b3
use long rather than String to build uris by key
2014-05-21 21:26:35 +02:00
Vincent Breitmoser
761d87b661
wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing
2014-05-21 21:07:32 +02:00
Dominik Schürmann
8a2ffd8f90
Layout fixes for key import
2014-05-19 00:10:34 +02:00
Dominik Schürmann
8e846dc132
Add license header to FixedDrawerLayout
2014-05-18 23:23:58 +02:00
Dominik Schürmann
c36565fc24
Merge branch 'thi-highlight-keyserver-search-results-as-well'
2014-05-18 23:19:35 +02:00
Dominik Schürmann
6e9acafc6d
Merge highlight keyserver pull request
2014-05-18 23:19:22 +02:00
Dominik Schürmann
19072824ba
Rename KeyServer to Keyserver
2014-05-18 23:06:50 +02:00
Thialfihar
1386282840
Rename mCurQuery to mQuery for consistency
2014-05-16 11:38:43 +02:00
Thialfihar
84b754341d
Use Highlighter instead of HighlightQueryCursorAdapter
2014-05-16 11:38:43 +02:00
Thialfihar
69ce66be94
Add highlighting to keyserver/keybase search
2014-05-16 11:38:43 +02:00
Thialfihar
ab81d8903a
Support mutliple search words and highlight them
...
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.
2014-05-16 11:38:12 +02:00
Dominik Schürmann
9025de2b74
Merge pull request #630 from timbray/master
...
Handle changed keybase.io search results format
2014-05-16 09:52:34 +02:00
Tim Bray
148a522694
keybase cleanups for revised search output format
2014-05-15 17:14:45 -07:00
Tim Bray
9b71791679
keybase now has key info in search output
2014-05-15 16:19:10 -07:00
Tim Bray
d9df048194
JWalk javadocs
2014-05-14 14:39:24 -07:00
Dominik Schürmann
bbc0694700
New screenshots
2014-05-14 22:28:41 +02:00
Dominik Schürmann
bbf19248ef
Merge pull request #627 from thi/improve-keybase.io-support
...
Improve keybase.io support
2014-05-14 20:19:44 +02:00
Dominik Schürmann
fd12f89ccb
Clarify help start
2014-05-14 18:01:40 +02:00
Thialfihar
b8462de6e5
Rename fingerPrint to fingerprint
2014-05-14 17:22:53 +02:00
Thialfihar
73acb69208
Add github, twitter, website info for keybase keys
...
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?
2014-05-14 17:21:27 +02:00
Thialfihar
2480844884
Cleanup keybase query a bit
...
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.
2014-05-14 17:21:27 +02:00
Vincent Breitmoser
2f95100d88
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
...
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
2014-05-14 16:02:28 +02:00
Thialfihar
056a6dd347
Don't guess keybase key algorithm and size
...
Once keybase reports them, we can display them. Until then we simply
don't know and shouldn't lie about it.
2014-05-14 14:28:54 +02:00
Thialfihar
6162247155
Add extraData property in ImportKeyListEntry
...
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.
2014-05-14 14:28:41 +02:00
Thialfihar
d50e798c13
List full keybase id or strong key id matches on top
2014-05-14 14:28:26 +02:00
Thialfihar
f4a8e71c33
Make keybase lookup works for key ids starting with 0x
2014-05-14 14:28:13 +02:00
Dominik Schürmann
638554f256
Update html-textview
2014-05-14 11:02:30 +02:00
Dominik Schürmann
05a3163f17
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-05-13 18:52:57 +02:00
Dominik Schürmann
be46eabdb5
Add pgpauth app to help, update html-textview
2014-05-13 18:52:48 +02:00
Dominik Schürmann
9c3a614ac5
Merge pull request #623 from danielhass/appmsg
...
Further Toast replacements
2014-05-12 09:59:09 +02:00
Daniel Haß
4ed8e45703
Removed unused Toast import
2014-05-11 22:20:44 +02:00
Daniel Haß
010dcf1887
Toast replacement
2014-05-11 22:15:45 +02:00
Daniel Haß
c0b48a616e
Fixed wrong AppMsg-Style
2014-05-11 20:28:16 +02:00
Dominik Schürmann
2aa3eb2bb5
Add Tim Bray to about
2014-05-09 11:38:40 +02:00
Dominik Schürmann
1daddfbaab
Version 2.7
2014-05-08 19:40:13 +02:00
Dominik Schürmann
37ad355d20
Translations from transifex
2014-05-08 19:39:44 +02:00
Dominik Schürmann
badfa9f7bc
Changelog 2.7
2014-05-08 19:32:07 +02:00
Dominik Schürmann
c2b75e3d2e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-05-08 18:44:58 +02:00
Dominik Schürmann
af4f32e2d7
Translations from transifex
2014-05-08 18:44:54 +02:00
Vincent Breitmoser
4ba06e7735
ui: purplize dialog headers (huge hack inside)
2014-05-08 18:12:55 +02:00
Vincent Breitmoser
cbc3988628
proper null checks and closing of cursors everywhere
2014-05-08 15:57:38 +02:00
Vincent Breitmoser
79117b1ef8
use longsparsearrays instead of hashmaps in that one place
2014-05-08 15:57:38 +02:00
Dominik Schürmann
956b9a12bb
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-05-08 15:47:06 +02:00
Dominik Schürmann
33cad382f9
Use flat buttons where appropriate
2014-05-08 15:46:57 +02:00
Vincent Breitmoser
9c5c013538
use setEncryptToSigner for asymmetric encryption
...
(tested and works, closes #569 )
2014-05-08 15:31:03 +02:00
Dominik Schürmann
5a1120e791
Merge pull request #619 from Valodim/loader-fragment
...
Introduce LoaderFragment
2014-05-08 14:20:07 +02:00
