introduced constants for keyserver sync, fixed sync issue

1 files changed, 3 insertions, 17 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 1d6de260d..311ef2d3b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -23,12 +23,10 @@ import android.app.Application;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
 import android.provider.ContactsContract;
 import android.widget.Toast;
@@ -36,7 +34,7 @@ import android.widget.Toast;
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider;
-import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService;
 import org.sufficientlysecure.keychain.ui.ConsolidateDialogActivity;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.util.Log;
@@ -45,7 +43,6 @@ import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.util.TlsHelper;
 
 import java.security.Security;
-import java.util.Arrays;
 import java.util.HashMap;
 
 
@@ -99,7 +96,7 @@ public class KeychainApplication extends Application {
         setupAccountAsNeeded(this);
 
         // Update keyserver list as needed
-        Preferences.getPreferences(this).upgradePreferences();
+        Preferences.getPreferences(this).upgradePreferences(this);
 
         TlsHelper.addStaticCA("pool.sks-keyservers.net", getAssets(), "sks-keyservers.netCA.cer");
 
@@ -151,18 +148,7 @@ public class KeychainApplication extends Application {
                     // for contact sync
                     ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
                     ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
-                    // for keyserver sync
-                    ContentResolver.setIsSyncable(account, Constants.PROVIDER_AUTHORITY, 1);
-                    ContentResolver.setSyncAutomatically(account, Constants.PROVIDER_AUTHORITY,
-                            true);
-                    // TODO: Increase periodic update time after testing
-                    Log.e("PHILIP", "enabled periodic keyserversync");
-                    ContentResolver.addPeriodicSync(
-                            new Account(Constants.ACCOUNT_NAME, Constants.ACCOUNT_TYPE),
-                            Constants.PROVIDER_AUTHORITY,
-                            new Bundle(),
-                            60
-                    );
+                    KeyserverSyncAdapterService.enableKeyserverSync(context);
                 } else {
                     Log.e(Constants.TAG, "Adding account failed!");
                 }