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

718 Commits

Author SHA1 Message Date
Vincent Breitmoser
d6f3b4b879 fix bug in canonicalization regarding subkey revocation 2014-07-11 03:27:44 +02:00
Vincent Breitmoser
f6e39b0a97 modifyKey: couple more fixes from tests 2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55 some UncachedKeyRing fixes, primary user id mostly 2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad modifyKey: preserve master key flags 2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113 add come createKey strings 2014-07-11 02:48:54 +02:00
Vincent Breitmoser
90f546a4e8 tests: add testSubkeyAdd 2014-07-10 01:38:57 +02:00
Vincent Breitmoser
a9c3d6b507 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
 2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954 put unit tests into external module (CAVEAT) 
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
 2014-07-09 16:03:30 +02:00
mar-v-in
5185492b04 Fix OperationResultParcel 
Naming conventions save lives... or atleast make addAll() work
 2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2 Fix nullpointer in API, fix #693 2014-07-08 04:24:27 +02:00
Dominik Schürmann
61d0e12e8a cleanup 2014-07-08 03:37:32 +02:00
Dominik Schürmann
daa1f5cf8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-08 03:34:53 +02:00
Dominik Schürmann
5adcb7885c Work on subkeys adapter 2014-07-08 03:34:27 +02:00
Art O Cathain
78b0c5e74a actually provide a tostring 2014-07-07 21:38:49 +01:00
Art O Cathain
37433bd282 prevent odd ambiguous method toString error 2014-07-07 21:37:48 +01:00
Art O Cathain
51bedc2e73 (c) headers, tidy imports 2014-07-07 21:35:10 +01:00
Vincent Breitmoser
9971f9ad4c use KeyringTestHelper.diffKeyrings method for unit test 
Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
 2014-07-07 21:12:50 +01:00
Vincent Breitmoser
83e5a3d341 add diffKeyrings method 2014-07-07 21:08:48 +01:00
Vincent Breitmoser
9320d2d8a2 use KeyringTestHelper.diffKeyrings method for unit test 2014-07-07 19:02:57 +02:00
Vincent Breitmoser
23524af81d add diffKeyrings method 2014-07-07 18:52:59 +02:00
Vincent Breitmoser
e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
 2014-07-07 18:19:52 +02:00
Vincent Breitmoser
d8f2782293 use SuperToast instead of AppMsg in code, part 2 2014-07-07 17:35:23 +02:00
Vincent Breitmoser
2c62aa90c0 use SuperToast instead of AppMsg in code, part 1 2014-07-07 17:34:41 +02:00
Vincent Breitmoser
d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
Art O Cathain
4fbffd7bb4 Actually test canonicalize 2014-07-06 19:43:38 +01:00
Art O Cathain
e906fe5387 add the GPG version 2014-07-06 19:43:24 +01:00
Art O Cathain
c05fd07986 data fixes 2014-07-06 19:43:24 +01:00
Art O Cathain
9032e032ff add toString for test ease 2014-07-06 19:43:17 +01:00
Art O Cathain
5479eafd4b actually canonicalize 2014-07-06 19:42:51 +01:00
Art O Cathain
cb64f8865c work in progress 2014-07-06 19:42:51 +01:00
Art O Cathain
b02519ce25 add toString for test ease 2014-07-06 15:50:07 +01:00
Art O Cathain
22108cf4e2 actually canonicalize 2014-07-06 15:50:07 +01:00
Art O Cathain
80e09bd05e work in progress 2014-07-06 15:50:07 +01:00
Art O Cathain
ccb1579864 Prefer composition to inheritance is the mantra these das 2014-07-06 15:23:39 +01:00
mar-v-in
fdf6411d5f Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
 2014-07-06 02:24:34 +02:00
mar-v-in
1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
Dominik Schürmann
3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann
e006d4762c Pull from transifex 2014-07-03 16:38:22 +02:00
Dominik Schürmann
9e56e53cf1 Pull from transifex 2014-07-03 16:30:41 +02:00
Dominik Schürmann
3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann
1ba41e7482 Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
Dominik Schürmann
bd7b4ccf2b cleanup, debug for passphrase set 2014-07-03 15:58:03 +02:00
Dominik Schürmann
6ca9d8a268 fix no passphrase check 2014-07-03 15:54:07 +02:00
Dominik Schürmann
b9d2ae938a Cache passphrase for edit 2014-07-03 15:49:46 +02:00
Dominik Schürmann
2988ac6e7b Cache passphrase for edit 2014-07-03 15:48:46 +02:00
Dominik Schürmann
85dde66804 parcel newPassphrase 2014-07-03 15:28:45 +02:00
Dominik Schürmann
9cbf78f7ad cleanup 2014-07-03 15:24:04 +02:00
Dominik Schürmann
42cc8b687b edit key: subkey adapter 2014-07-03 15:14:06 +02:00
Dominik Schürmann
55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Dominik Schürmann
8cbdf7b1c5 smaller dropdown items 2014-07-03 08:48:33 +02:00
mar-v-in
51a4b0466b Add support for multiple input/output URIs to KeychainIntentService 2014-07-03 00:34:41 +02:00
Dominik Schürmann
3512ac7199 Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
Dominik Schürmann
12db94abca A little bit less purple 2014-07-02 18:59:23 +02:00
Dominik Schürmann
d967c5d864 merge KeychainIntentService 2014-07-02 16:49:21 +02:00
Dominik Schürmann
13a13829a8 fix nullpointer, cleanup 2014-07-02 16:47:12 +02:00
Dominik Schürmann
94a58f3aa8 remove init methods from adapter 2014-07-02 16:33:30 +02:00
Vincent Breitmoser
a920f9ce0c Merge remote-tracking branch 'origin/master' 2014-07-02 16:05:58 +02:00
Vincent Breitmoser
100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser
ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Dominik Schürmann
3d34eb8ca4 edit key: work on saving 2014-07-02 15:42:38 +02:00
Dominik Schürmann
a66c6b5b7a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-02 15:11:13 +02:00
Dominik Schürmann
4f83a4f163 Edit key: adding user ids 2014-07-02 15:10:50 +02:00
Vincent Breitmoser
6f558add35 use expert create key for key creation testing (revert this later on!) 2014-07-02 15:05:02 +02:00
Vincent Breitmoser
9fb92c8642 fix subkey addition 2014-07-02 15:03:28 +02:00
Vincent Breitmoser
144a10a3d0 forgot a line in previous commit 2014-07-02 14:53:25 +02:00
Vincent Breitmoser
287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
mar-v-in
93eae114ea Encrypt/Decrypt UI work 2014-07-02 00:34:21 +02:00
mar-v-in
3564773410 Add temporary file storage as discussed in #665 
Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
 2014-07-01 14:50:15 +02:00
Dominik Schürmann
7408a35e19 edit key: part 3 2014-07-01 12:36:02 +02:00
mar-v-in
50e72b196f Missing import after merge 2014-07-01 01:26:50 +02:00
mar-v-in
d1d414c006 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
 2014-07-01 00:15:30 +02:00
Dominik Schürmann
a901004588 remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
Dominik Schürmann
7c84b1fffd Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-30 22:01:25 +02:00
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
38823b73a3 Merge branch 'master' into improve-file-more 2014-06-24 11:35:59 +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
mar-v-in
9e7e0be82c Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more 2014-06-22 16:45:07 +02:00
mar-v-in
79fb23b095 Improve file more, Part 1 
- Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be)
- Show sdcard in side menu in storage API #665
- Propose filename with gpg ending when storing it using the storage API #665
- Don't show output dialog on Android 4.4 #665
- Only show filename on Android < 4.4 #665

TODO:
- File deletion for Android < 4.4
- Testing (especially with Android < 4.4)
- Batch-encryption
- UI
- Temporary content provider (see #665 discussion)
 2014-06-22 16:31:28 +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