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

691 Commits

Author SHA1 Message Date
Dominik Schürmann
c2ba7e2420 work on edit key 2014-06-30 22:01:17 +02:00
Daniel Albert
5dcbc07af9 Fixed Bootstrap resource 2014-06-30 21:32:40 +02:00
Daniel Albert
cc095a2098 (should have) fixed Travis builds 2014-06-30 21:24:31 +02:00
Daniel Albert
f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 2014-06-30 19:18:20 +02:00
Daniel Albert
158d19a945 Fixed, issue #702 2014-06-30 19:13:09 +02:00
Daniel Albert
df9af316b4 Merge branch 'master' of https://github.com/open-keychain/open-keychain 2014-06-30 19:09:56 +02:00
Daniel Albert
1e9789f5b4 Converted all other buttons 2014-06-30 19:09:13 +02:00
Vincent Breitmoser
de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Daniel Albert
2406842847 Ported even more buttons to use new design (Key and User editor) 
Added drawables for them
 2014-06-29 22:31:37 +02:00
Daniel Albert
e8bb14ca26 Converted AsymetricKeyFragment to new button style 2014-06-29 15:28:24 +02:00
Daniel Albert
9091c22240 Added new button style and converted account_settings and the select_secret_key_layout to use it 2014-06-29 13:59:51 +02:00
Daniel Albert
4beff43a83 Updated file_dialog to use the new buttons 2014-06-29 13:21:33 +02:00
Daniel Albert
e731dc139f Improved button style 
centered buttons
removed commented-out button
 2014-06-29 12:33:02 +02:00
Daniel Albert
bd44516576 Added button_rounded style 
converted decrypt_file_fragment to new style
 2014-06-28 21:12:56 +02:00
Vincent Breitmoser
6d7a9ec48a pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
Vincent Breitmoser
3acb7fb087 fix nullpointerexception in importkeyactivity 2014-06-28 20:54:13 +02:00
Vincent Breitmoser
d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Daniel Albert
2da5bfabd3 Merge remote-tracking branch 'upstream/master' 2014-06-28 12:30:30 +02:00
Daniel Albert
d19c97a714 Switched to the dark icons 2014-06-28 12:25:41 +02:00
Dominik Schürmann
3f3e1cdb05 Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
Dominik Schürmann
1d5606a1a3 More wizardry 2014-06-27 23:01:11 +02:00
Dominik Schürmann
8bfba0826f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-27 21:40:26 +02:00
Dominik Schürmann
9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
Daniel Albert
567e5cc6a5 Added unlock icon, fixed drawer items, switched to icons from resource in drawer 2014-06-27 21:03:19 +02:00
Daniel Albert
1b90b46b00 Swapped out FontawesomeText with normal ImageView 2014-06-26 21:33:42 +02:00
Daniel Albert
607af7bcca Temporary fix for #648 2014-06-25 19:20:17 +02:00
Dominik Schürmann
150090852b Merge pull request #690 from mar-v-in/hkps-by-default 
HKPS by default
 2014-06-25 08:48:40 +02:00
mar-v-in
f97ac83a89 Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
Dominik Schürmann
a1bcbe72a3 new edit key: first version to add user ids 2014-06-24 22:58:28 +02:00
Dominik Schürmann
94bd2a675e Merge pull request #688 from da-kid/master 
Fix for #687
 2014-06-24 20:22:50 +02:00
Dominik Schürmann
9ce7d29a2d Merge submodules 2014-06-24 20:16:46 +02:00
Daniel Albert
02bcd391bf Fix for #687 2014-06-24 20:15:48 +02:00
Dominik Schürmann
e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +02:00
mar-v-in
997faac90e Merge branch 'master' into hkps-by-default 2014-06-24 11:35:26 +02:00
mar-v-in
97de1592f0 Fix sks-keyservers.net sub pool 2014-06-24 11:27:35 +02:00
mar-v-in
04e64ac84e Update Keyservers to use hkps as needed 2014-06-24 11:26:52 +02:00
mar-v-in
f039ef81ae Use URLEncoder instead of Uri.encode 2014-06-24 01:31:06 +02:00
mar-v-in
9a7fc6d464 Rewrote hkp add to work with hkps as well. 
Also removes HttpClient dependency (deprecated for android)
 2014-06-24 00:57:04 +02:00
Vincent
c865de4002 Merge pull request #686 from mar-v-in/minidns 
Use minidns instead of dnsjava
 2014-06-23 23:16:25 +02:00
mar-v-in
e6629b53a2 Few fixes on hkps 
TODO: Fix add as well
 2014-06-23 22:46:59 +02:00
mar-v-in
3ebbaae253 Add hkps support for sks-keyservers.net 2014-06-23 22:27:58 +02:00
mar-v-in
b92a389ebc Add TlsHelper (designed to be used with sks-keyservers.net) 
We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
 2014-06-23 22:26:02 +02:00
mar-v-in
2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
Dominik Schürmann
804f811998 Merge pull request #684 from da-kid/master 
Fix of #683
 2014-06-23 19:35:27 +02:00
Daniel Albert
85bf24521d Merge branch 'master' of https://github.com/da-kid/open-keychain 2014-06-23 19:24:42 +02:00
Daniel Albert
f68cf2a435 Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs. 2014-06-23 19:10:50 +02:00
Art O Cathain
13f785d0b0 borrow tests from Haskell OpenPGP 2014-06-23 17:54:27 +01:00
Art O Cathain
a5d85b367d add OpenPGP-Haskell to test collateral 2014-06-23 17:54:27 +01:00
Dominik Schürmann
bfd7c03b0a remove margin in import keys (leftover from nav drawer) 2014-06-23 18:38:26 +02:00
Dominik Schürmann
8f4e66348d Merge pull request #681 from timbray/master 
Handle empty keybase.io query, should fix #675
 2014-06-23 13:42:58 +02:00
Dominik Schürmann
e8b96d1035 Disable pre-dexing, causes exceptions on some systems 2014-06-23 13:44:25 +02:00
Tim Bray
b48f727f98 Handle empty keybase.io query, should fix #675 2014-06-22 22:37:05 -07:00
Dominik Schürmann
514a4c668b new edit key: change passphrase 2014-06-22 18:26:17 +02:00
Dominik Schürmann
b43fb63753 new edit key: diff for existing user ids 2014-06-22 18:12:04 +02:00
Dominik Schürmann
4db0194e6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-22 16:03:13 +02:00
Dominik Schürmann
106e1fcf03 Rename adapter 2014-06-22 16:03:03 +02:00
Vincent Breitmoser
9f947aefe6 ditch outdated certifyKey operation 2014-06-22 14:46:14 +02:00
Vincent Breitmoser
4d091d1784 use arraylists instead of arrays in savekeyringparcel 2014-06-22 14:45:40 +02:00
Vincent Breitmoser
37cee1322b fix indentation in various key import methods 2014-06-22 14:17:08 +02:00
Vincent Breitmoser
002a391a68 Merge remote-tracking branch 'origin/master' 2014-06-22 13:42:03 +02:00
Vincent Breitmoser
22ea9c6047 fix parcel method in ParcelableKeyRing 2014-06-22 13:41:54 +02:00
Dominik Schürmann
c52828d247 add buttons in edit key 2014-06-22 13:33:50 +02:00
Vincent Breitmoser
857b15cbd5 use hashcode instead of keyid in import list (keyids may not be unique!) 2014-06-22 13:32:07 +02:00
Dominik Schürmann
9d20e68f11 Revert hint_keybase_search 2014-06-22 10:59:50 +02:00
Dominik Schürmann
4cc127e460 Merge pull request #672 from artbristol/functional-testing 
VERY basic test for save keyring
 2014-06-21 21:31:25 +02:00
Dominik Schürmann
0c3a478a43 Cleanup pull keybase code 2014-06-21 21:31:00 +02:00
Dominik Schürmann
4ae5c56b73 Merge pull request #668 from timbray/master 
Moved Keybase stuff into KeybaseLib submodule
 2014-06-21 21:25:03 +02:00
Dominik Schürmann
18430bef17 Start new designed activity 2014-06-21 20:25:51 +02:00
Art O Cathain
0af2b27cb3 VERY basic test for save keyring 2014-06-21 17:44:04 +01:00
Dominik Schürmann
a1525bffe2 Fix qr code finally 2014-06-20 23:01:35 +02:00
Vincent Breitmoser
0d644e37b1 import: forward motion events to activity regardless 2014-06-20 22:30:54 +02:00
Dominik Schürmann
0a790c7aa2 Work on Qr code import 2014-06-20 22:28:08 +02:00
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann
6b7aa2767a Fix keybase import 2014-06-20 15:58:32 +02:00
Dominik Schürmann
f0b8261ad3 Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
Dominik Schürmann
717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Dominik Schürmann
4aec28c237 Fix update from keyserver flow 2014-06-20 15:14:34 +02:00
Vincent
f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing 
Start on Robolectric integration test
 2014-06-20 00:44:31 +02:00
mar-v-in
58706425d6 Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file 2014-06-19 13:57:35 +02:00
Dominik Schürmann
48c96184dc Fix app name in PGP header, closing #663 2014-06-19 11:56:36 +02:00
Art O Cathain
b1815ef24a revert to previous min version 2014-06-19 07:52:37 +01:00
Dominik Schürmann
3d8e6b303c Fixing fingerprint search, part 1 2014-06-19 01:26:21 +02:00
Dominik Schürmann
47edcacf61 Remove unused code to import splitted qr codes 2014-06-19 00:54:52 +02:00
Dominik Schürmann
f0487b0ca7 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-19 00:38:47 +02:00
Dominik Schürmann
7fc188dbd6 New callback model for ImportKeysActivity 2014-06-19 00:38:36 +02:00
Vincent Breitmoser
b40b429bc0 remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
Dominik Schürmann
0db425b289 Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
Dominik Schürmann
bce874db09 decrease size of search icons in import 2014-06-18 23:06:58 +02:00
Vincent Breitmoser
5c6139f57a forward touch events to pager in import activity 2014-06-18 22:57:56 +02:00
Dominik Schürmann
a246dc9675 Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions 2014-06-18 22:30:54 +02:00
Dominik Schürmann
37a81af748 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 22:02:07 +02:00
Dominik Schürmann
d9ccef4899 consistent button design in import activity 2014-06-18 22:01:58 +02:00
Vincent Breitmoser
ada6a12174 fix key export 2014-06-18 21:54:59 +02:00
mar-v-in
d9c937bbe7 Merge branch 'master' into improve-file 2014-06-18 21:43:54 +02:00
Vincent Breitmoser
4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser
825f37eee4 Merge remote-tracking branch 'origin/master' 2014-06-18 21:14:39 +02:00
Vincent Breitmoser
5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00
Dominik Schürmann
8ffc959f07 Merge pull request #661 from mar-v-in/improve-contacts 
Improve contact sync
 2014-06-18 20:56:38 +02:00
Vincent Breitmoser
3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser
f8d895dea4 consolidate: almost sane logging 2014-06-18 20:27:59 +02:00
Vincent Breitmoser
134f8471c0 consolidate: add key import routines with consolidation 2014-06-18 19:39:16 +02:00
mar-v-in
a1c3c41073 Reset importDone at the beginning of sync 2014-06-18 17:06:46 +02:00
mar-v-in
b9d88de286 Wait for import to be done before writing contacts 2014-06-18 17:01:36 +02:00
mar-v-in
4bbaf6faa1 Remove abandoned contacts 2014-06-18 16:47:33 +02:00
mar-v-in
39a68c30f8 Code style 2014-06-18 16:14:12 +02:00
mar-v-in
0bcf7a39bf Continue contact db sync 
- Only add keyrings to contact db that are not expired nor revoked
- Merge all user ids of a key into one contact (#659)
- Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db

TODO:
- delete contact once keyring is removed from OK
- sync: wait for key downloads to complete before changing contact db
 2014-06-18 16:14:11 +02:00
Vincent Breitmoser
f80228a08d consolidate: make it work 2014-06-18 14:02:21 +02:00
Vincent Breitmoser
1e45e5cd9a code cleanup in ProviderHelper and UncachedKeyRing 2014-06-18 10:00:21 +02:00
Vincent Breitmoser
d8b0015d25 consolidate: add logging 2014-06-18 00:30:45 +02:00
Vincent Breitmoser
b4974d922e consolidate: first draft 2014-06-18 00:30:45 +02:00
Vincent Breitmoser
adf15d4d16 import-log: don't count self certs as unknown 2014-06-18 00:25:52 +02:00
Vincent Breitmoser
c63f3c8a5d prepare ProviderHelper for consolidation before insert 2014-06-18 00:21:11 +02:00
Dominik Schürmann
4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 00:03:19 +02:00
Dominik Schürmann
8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
Vincent Breitmoser
0013199b2d handle database error on secret key insert 2014-06-17 23:46:02 +02:00
Vincent Breitmoser
6e4d0dede1 canonicalize: support secret keys 2014-06-17 23:25:45 +02:00
Vincent Breitmoser
4bff50bffc new-edit: add logging to modifySecretKeyRing operation 2014-06-17 21:23:24 +02:00
Vincent Breitmoser
5c47143d64 new-edit: add new save keyring stuff 2014-06-17 20:11:54 +02:00
Vincent Breitmoser
a0f546739d new-edit: remove old save keyring stuff 2014-06-17 20:03:58 +02:00
Vincent Breitmoser
02fbaaf858 import-log: clean up progress messages 2014-06-17 12:18:41 +02:00
Vincent Breitmoser
9058291c05 canonicalize: fix NullPointerException 2014-06-17 11:57:14 +02:00
Vincent Breitmoser
ffea551afc drop invalid user ids and add fatal case(s) 2014-06-16 22:32:17 +02:00
Vincent Breitmoser
2f0e70587d add more progress info from import routine 2014-06-16 22:00:57 +02:00
Vincent Breitmoser
109bea7542 import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs 2014-06-16 22:00:57 +02:00
Art O Cathain
7ea57b7c89 Fix hard-coded size 2014-06-16 19:12:26 +01:00
Art O Cathain
d06ba72edc Start on Robolectric integration test 2014-06-16 18:58:41 +01:00
Daniel Haß
da28c000ad Changed license header 2014-06-16 13:19:34 +02:00
Daniel Haß
5bd0b5011e Moved Notify class to utils 2014-06-16 13:13:43 +02:00
Daniel Haß
eeff0c7150 Removed unused import 2014-06-16 13:06:42 +02:00
Daniel Haß
76d733cbc7 Added notification area to decrypt content 2014-06-16 12:38:19 +02:00
Daniel Haß
e48d5e4474 Replaced AppMsg with notify wrapper call 2014-06-16 12:37:51 +02:00
Daniel Haß
998f616607 Added notification area as reusable layout 2014-06-16 12:37:37 +02:00
Daniel Haß
41545e5e52 Added notification wrapper for toast like notifys 2014-06-16 12:37:22 +02:00
Art O Cathain
63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error 2014-06-14 13:16:39 +01:00
Vincent Breitmoser
ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser
073433fa74 canonicalize: require primary key binding certificates for signing subkeys 2014-06-12 23:10:44 +02:00
Vincent Breitmoser
79131be5f0 canonicalize: simplify import with info from canonicalization 2014-06-12 22:27:32 +02:00
Vincent Breitmoser
0594d9156e canonicalize: filter out future and local certificates 2014-06-12 21:57:03 +02:00
Vincent Breitmoser
9dd40b7238 import-log: more minor improvements 2014-06-12 21:12:21 +02:00
Vincent Breitmoser
59701250ba import: use wrapped keyring instead of uncached keyring for trust 2014-06-12 18:11:31 +02:00
Vincent Breitmoser
e4a7d4f6e5 import-log: minor improvements 2014-06-12 18:10:48 +02:00
Vincent Breitmoser
dae503284f canonicalize: more stuff 2014-06-12 17:38:48 +02:00
Vincent Breitmoser
466eddb005 canonicalize: implementation, first draft 2014-06-12 15:47:21 +02:00
Vincent Breitmoser
dea98a4a7e import-log: properly distinguish return states 2014-06-12 12:36:58 +02:00
Vincent Breitmoser
47368f1d24 import-log: better way to check self trust, and fix log level filtering 2014-06-12 01:37:49 +02:00
Vincent Breitmoser
8d75d3e00e import-log: use holder pattern in log fragment 2014-06-11 00:37:23 +02:00
mar-v-in
e106079b90 Delete using Document API (unsafe) 2014-06-10 21:53:02 +02:00
mar-v-in
f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +02:00
Vincent Breitmoser
3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser
f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser
e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser
eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser
7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser
d73a3e2fa8 import-log: use supertoast in ImportKeyActivity 2014-06-10 01:52:38 +02:00
Vincent Breitmoser
cdc61c4392 canonicalize: first step(s) 2014-06-10 01:51:16 +02:00
Vincent Breitmoser
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser
97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Dominik Schürmann
cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann
d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
mar-v-in
08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
Dominik Schürmann
90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann
a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann
d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann
341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in
5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in
55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser
c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser
118225d7d2 import-log: add output to logcat (for debugging) 2014-06-06 17:28:36 +02:00
Vincent Breitmoser
e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
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
36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +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
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
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
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
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
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
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
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
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
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
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
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