1 files changed, 54 insertions, 38 deletions
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 43ed2dad0..fbe914b78 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -21,6 +21,8 @@ import android.accounts.Account;
 import android.app.Service;
 import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
@@ -29,9 +31,11 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
+import android.provider.ContactsContract;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.KeychainApplication;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.ContactHelper;
 import org.sufficientlysecure.keychain.helper.EmailKeyHelper;
 import org.sufficientlysecure.keychain.util.Log;
@@ -42,7 +46,7 @@ public class ContactSyncAdapterService extends Service {
 
     private class ContactSyncAdapter extends AbstractThreadedSyncAdapter {
 
-        private final AtomicBoolean importDone = new AtomicBoolean(false);
+//        private final AtomicBoolean importDone = new AtomicBoolean(false);
 
         public ContactSyncAdapter() {
             super(ContactSyncAdapterService.this, true);
@@ -51,47 +55,59 @@ public class ContactSyncAdapterService extends Service {
         @Override
         public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider,
                                   final SyncResult syncResult) {
-            importDone.set(false);
-            KeychainApplication.setupAccountAsNeeded(ContactSyncAdapterService.this);
-            EmailKeyHelper.importContacts(getContext(), new Messenger(new Handler(Looper.getMainLooper(),
-                    new Handler.Callback() {
-                        @Override
-                        public boolean handleMessage(Message msg) {
-                            Bundle data = msg.getData();
-                            switch (msg.arg1) {
-                                case KeychainIntentServiceHandler.MESSAGE_OKAY:
-                                    Log.d(Constants.TAG, "Syncing... Done.");
-                                    synchronized (importDone) {
-                                        importDone.set(true);
-                                        importDone.notifyAll();
-                                    }
-                                    return true;
-                                case KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS:
-                                    if (data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS) &&
-                                            data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS_MAX)) {
-                                        Log.d(Constants.TAG, "Syncing... Progress: " +
-                                                data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS) + "/" +
-                                                data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX));
-                                        return false;
-                                    }
-                                default:
-                                    Log.d(Constants.TAG, "Syncing... " + msg.toString());
-                                    return false;
-                            }
-                        }
-                    })));
-            synchronized (importDone) {
-                try {
-                    if (!importDone.get()) importDone.wait();
-                } catch (InterruptedException e) {
-                    Log.w(Constants.TAG, e);
-                    return;
-                }
-            }
+            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);
+//            EmailKeyHelper.importContacts(getContext(), new Messenger(new Handler(Looper.getMainLooper(),
+//                    new Handler.Callback() {
+//                        @Override
+//                        public boolean handleMessage(Message msg) {
+//                            Bundle data = msg.getData();
+//                            switch (msg.arg1) {
+//                                case KeychainIntentServiceHandler.MESSAGE_OKAY:
+//                                    Log.d(Constants.TAG, "Syncing... Done.");
+//                                    synchronized (importDone) {
+//                                        importDone.set(true);
+//                                        importDone.notifyAll();
+//                                    }
+//                                    return true;
+//                                case KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS:
+//                                    if (data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS) &&
+//                                            data.containsKey(KeychainIntentServiceHandler.DATA_PROGRESS_MAX)) {
+//                                        Log.d(Constants.TAG, "Syncing... Progress: " +
+//                                                data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS) + "/" +
+//                                                data.getInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX));
+//                                        return false;
+//                                    }
+//                                default:
+//                                    Log.d(Constants.TAG, "Syncing... " + msg.toString());
+//                                    return false;
+//                            }
+//                        }
+//                    })));
+//            synchronized (importDone) {
+//                try {
+//                    if (!importDone.get()) importDone.wait();
+//                } catch (InterruptedException e) {
+//                    Log.w(Constants.TAG, e);
+//                    return;
+//                }
+//            }
             ContactHelper.writeKeysToContacts(ContactSyncAdapterService.this);
         }
     }
 
+    public static void requestSync() {
+        Bundle extras = new Bundle();
+        // no need to wait for internet connection!
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+        ContentResolver.requestSync(
+                new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE),
+                ContactsContract.AUTHORITY,
+                extras);
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
         return new ContactSyncAdapter().getSyncAdapterBinder();