Vincent Breitmoser
2946d442e5
do respect expectedFingerprint during key import
2014-06-04 21:35:03 +02:00
Vincent Breitmoser
cc1e4dce0a
neatness refactoring
2014-06-04 20:27:25 +02:00
Dominik Schürmann
52f1f30846
Use fixed gradle versions
2014-06-04 10:22:05 +02:00
Dominik Schürmann
6cb791d567
Use fixed gradle versions
2014-06-04 10:21:28 +02:00
Dominik Schürmann
84d03dd514
Merge pull request #643 from open-keychain/v/dev
...
wrap bouncycastle objects and don't use them in android-related code
2014-06-03 13:06:49 +02:00
Vincent Breitmoser
4a47126f05
Merge remote-tracking branch 'origin/master' into edit-key-rewrite
2014-06-02 18:49:24 +02:00
Vincent Breitmoser
80779defb1
spongycastle: expose pskr constructor
2014-06-02 18:48:46 +02:00
Vincent Breitmoser
58edc0af67
wrapped-key-ring: add documentation
2014-06-02 13:49:11 +02:00
Vincent Breitmoser
d891f75339
make everything work again
2014-06-02 13:47:48 +02:00
Vincent Breitmoser
e27048fe73
wrapped-key-ring: move key data around in ParcelableKeyRing instead of ImportKeysListEntry
2014-06-02 13:47:48 +02:00
Vincent Breitmoser
ed8b62c32b
wrapped-key-ring: no UncachedSecretKeyRing after all
2014-06-02 13:47:48 +02:00
Dominik Schürmann
39997a802e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-05-31 20:54:30 +02:00
Dominik Schürmann
6d1369be56
Pull from transifex
2014-05-31 20:49:56 +02:00
Vincent Breitmoser
a53da491c0
new savekeyring operation (mostly stub)
2014-05-27 13:56:30 +02:00
Vincent Breitmoser
6415290b2d
introduce new SaveKeyringParcel
2014-05-27 13:56:28 +02:00
Vincent Breitmoser
ce1c3d1a1e
rename SaveKeyringParcel to OldSaveKeyringParcel
2014-05-27 13:53:01 +02:00
Vincent Breitmoser
e7fa124108
update unit test support in build files
2014-05-27 13:52:58 +02:00
Vincent Breitmoser
4a6aaf1e83
fix missing userIds in ImportKeysListEntry
2014-05-27 13:49:39 +02:00
Dominik Schürmann
13d4a6d902
Merge pull request #632 from timbray/master
...
Refactor server query exceptions again
2014-05-25 13:55:29 +02:00
Tim Bray
58da3d12b0
Finished cleaning up rebase conflicts post Keyserver exception refactor
2014-05-23 09:42:32 -07:00
Tim Bray
1ff3962acc
Add Log.d for QueryFailedException
2014-05-23 09:34:37 -07:00
Tim Bray
dfd5aa65a5
Add Log.d for QueryFailedException
2014-05-23 09:33:34 -07:00
Vincent Breitmoser
97af8b2a01
wrapped-key-ring: forgot a part in PgpDecryptVerify
2014-05-23 17:04:15 +02:00
Vincent Breitmoser
c107fc668f
introduce WrappedSignature for the ViewCert* ui code
2014-05-23 16:48:41 +02:00
Vincent Breitmoser
91a8a6c2d1
wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader
2014-05-23 16:48:03 +02:00
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
