From 80e99986401b635f4eeef5d13740911d10740aef Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Thu, 5 Jun 2014 23:22:21 +0200
Subject: 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.
---
 .../keychain/service/ContactSyncAdapterService.java                   | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
index 4d0397196..a52dbfa27 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -24,6 +24,8 @@ import android.content.ContentProviderClient;
 import android.content.Intent;
 import android.content.SyncResult;
 import android.os.*;
+import org.sufficientlysecure.keychain.KeychainApplication;
+import org.sufficientlysecure.keychain.helper.ContactHelper;
 import org.sufficientlysecure.keychain.helper.EmailKeyHelper;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -60,6 +62,8 @@ public class ContactSyncAdapterService extends Service {
                             }
                         }
                     })));
+            KeychainApplication.setupAccountAsNeeded(ContactSyncAdapterService.this);
+            ContactHelper.writeKeysToContacts(ContactSyncAdapterService.this);
         }
     }
 
-- 
cgit v1.2.3