From 418e922c78c365cd1c428f334de6814cbbc17b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 20 Aug 2014 23:26:01 +0200
Subject: [PATCH] Enable sync adapter, changelog

---
 CHANGELOG                                                 | 1 +
 .../sufficientlysecure/keychain/KeychainApplication.java  | 8 ++++++--
 .../keychain/service/ContactSyncAdapterService.java       | 1 +
 OpenKeychain/src/main/res/raw/help_changelog.html         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8804a9c63..196fc9937 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 * New icons to show status of key (by Brennan Novak)
 * Important bug fix: Importing of large key collections from a file is now possible
 * Notification showing cached passphrases
+* Keys are connected to Android's contacts
 
 This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index ead29e229..ca9af8a9d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -20,11 +20,13 @@ package org.sufficientlysecure.keychain;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Application;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Environment;
+import android.provider.ContactsContract;
 
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.helper.Preferences;
@@ -112,8 +114,10 @@ public class KeychainApplication extends Application {
         AccountManager manager = AccountManager.get(context);
         Account[] accounts = manager.getAccountsByType(Constants.PACKAGE_NAME);
         if (accounts == null || accounts.length == 0) {
-            Account dummy = new Account(context.getString(R.string.app_name), Constants.PACKAGE_NAME);
-            manager.addAccountExplicitly(dummy, null, null);
+            Account account = new Account(context.getString(R.string.app_name), Constants.PACKAGE_NAME);
+            manager.addAccountExplicitly(account, null, null);
+            ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
+            ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
         }
     }
 
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 e70e74d91..78d132df7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -51,6 +51,7 @@ public class ContactSyncAdapterService extends Service {
         @Override
         public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider,
                                   final SyncResult syncResult) {
+            Log.d(Constants.TAG, "Performing a sync!");
             // TODO: Import is currently disabled for 2.8, until we implement proper origin management
 //            importDone.set(false);
 //            KeychainApplication.setupAccountAsNeeded(ContactSyncAdapterService.this);
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 5f1798896..c8992ddab 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -16,6 +16,7 @@ And don't add newlines before or after p tags because of transifex -->
 <li>New icons to show status of key (by Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
 <li>Notification showing cached passphrases</li>
+<li>Keys are connected to Android's contacts</li>
 </ul>
 <p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>