moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-18 14:55:11 -05:00
Code Issues Releases Wiki Activity
2,092 Commits 12 Branches 24 Tags 116 MiB
f8d895dea4
Commit Graph

309 Commits

Author SHA1 Message Date
Vincent Breitmoser
787f6edf32 import-log: add log statements in import routine 2014-06-06 16:15:27 +02:00
Vincent Breitmoser
b995b836a3 import-log: improve operationresultparcel, add indentation 2014-06-06 16:14:15 +02:00
mar-v-in
9d02bc85e2 Fix compile error introduced during merge 2014-06-06 00:51:24 +02:00
mar-v-in
e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-05 23:56:29 +02:00
mar-v-in
80e9998640 Show keys with android contacts 
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
 2014-06-05 23:22:21 +02:00
Tim Bray
5466adee41 Clean up keyimport.ImportKeysListEntry 2014-06-05 11:58:18 -07:00
Dominik Schürmann
fc3a692002 Merge pull request #645 from timbray/master 
Don't show full fingerprint in key search result lists
 2014-06-05 18:16:29 +02:00
Tim Bray
7811970218 Don't show full fingerprint in key search results 2014-06-05 08:51:55 -07:00
Vincent Breitmoser
c84a1ecfff import-log: add parcelable prototype 2014-06-05 14:17:49 +02:00
mar-v-in
dc1e26f39c Make keylist case insensitive 
You want "michael" to be next to "Michael", don't you?
 2014-06-05 00:59:39 +02:00
Vincent Breitmoser
5ab0d76c69 ui: do show Certify identities button even for secret keys 
Closes #636
 2014-06-04 21:38:30 +02:00
Vincent Breitmoser
36bc0ae676 fix bug with bad verifying master keys 2014-06-04 21:35:36 +02:00
Vincent Breitmoser
2946d442e5 do respect expectedFingerprint during key import 2014-06-04 21:35:03 +02:00
mar-v-in
cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
Vincent Breitmoser
cc1e4dce0a neatness refactoring 2014-06-04 20:27:25 +02:00
mar-v-in
6a63746278 Fix regex for hkp parsing to support multiple uids 2014-06-04 18:07:28 +02:00
mar-v-in
dd959876f4 First version of automatic contact discovery. 
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
 2014-06-04 18:05:16 +02:00
mar-v-in
cc2ef0c17c Store expired state within ImportKeysListEntry 2014-06-04 18:05:16 +02:00
Tim Bray
54b7b0e522 fixed error message 2014-06-04 08:04:26 -07:00
Vincent Breitmoser
4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +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
mar-v-in
34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS 2014-05-29 11:43:41 +02:00
mar-v-in
d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery 2014-05-29 11:33:53 +02:00
mar-v-in
3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) 2014-05-29 10:34:50 +02:00
mar-v-in
518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) 2014-05-29 10:33:15 +02:00
mar-v-in
be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +02:00
mar-v-in
c676e53479 Fix url building to support certificate check on hkps servers 
Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
 2014-05-28 20:44:01 +02:00
mar-v-in
cb92c9ccc8 Add hkps support 2014-05-27 21:16:52 +02:00
mar-v-in
8e5767f967 Store origin with ImportKeysListEntry 2014-05-27 20:17:49 +02:00
mar-v-in
3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +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
4a6aaf1e83 fix missing userIds in ImportKeysListEntry 2014-05-27 13:49:39 +02:00
mar-v-in
7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +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
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
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
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
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
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
Vincent Breitmoser
185c4eed43 use LoaderFragment in ViewKey tabs 
Closes #616
 2014-05-08 13:58:52 +02:00
Vincent Breitmoser
596478a212 extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
Vincent Breitmoser
346b5dbb28 Don't allow certification using keys where primary subkey is stripped 
Closes #596
 2014-05-07 22:43:14 +02:00
Dominik Schürmann
b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann
377edfb310 Remove code for sharing whole key via qr code 2014-05-07 15:40:19 +02:00
Dominik Schürmann
b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann
2a33eae9eb GET_KEY: also return PendingIntent to key view 2014-05-07 14:53:35 +02:00
Dominik Schürmann
e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann
f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann
a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann
dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser
12f1162a1e ui: use SlidingTabLayout in help activity 2014-05-07 03:48:03 +02:00
Vincent Breitmoser
992d37819c small fix for 6aafb3, forgot to commit this line 2014-05-07 03:18:41 +02:00
Vincent Breitmoser
65274f6c16 ui: purplize searchtext in keylist 2014-05-07 03:07:24 +02:00
Vincent Breitmoser
873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Vincent Breitmoser
0bb11be749 ui: slight edit icon cosmetics in keylist 2014-05-07 02:15:09 +02:00
Vincent Breitmoser
6aafb31412 ui: move revocation/expiry notes above tab slider 2014-05-07 02:14:47 +02:00
Vincent Breitmoser
96125b1976 ui: purplize edge overscroll glow effect 2014-05-07 01:39:28 +02:00
Dominik Schürmann
e97cdbd9ad Clarify language 2014-05-06 23:16:08 +02:00
Dominik Schürmann
1c2919f07f edit button with image 2014-05-06 22:52:50 +02:00
Dominik Schürmann
274326f780 Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
Dominik Schürmann
ad791fd8f8 Move logic classes for import into own sub-package 2014-05-06 22:29:57 +02:00
Vincent Breitmoser
797aeaf6e8 ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
e0985878d7 ui: use textview buttons in decrypt verify dialogue 2014-05-06 19:18:32 +02:00