Quick patch to fix operations not ready for HTTPS

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncService.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
index e4112d7..5396f58 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
@@ -28,23 +28,16 @@ import android.os.IBinder;
  * \r
  */\r
 public class FileSyncService extends Service {\r
-    public static final String SYNC_MESSAGE = "eu.alefzero.owncloud.files.ACCOUNT_SYNC";\r
-    public static final String IN_PROGRESS = "sync_in_progress";\r
-    public static final String ACCOUNT_NAME = "account_name";\r
-\r
-    private static final Object syncAdapterLock = new Object();\r
-    private static AbstractOwnCloudSyncAdapter concretSyncAdapter = null;\r
+    public static final String SYNC_MESSAGE = "ACCOUNT_SYNC";\r
+    public static final String SYNC_FOLDER_REMOTE_PATH = "SYNC_FOLDER_REMOTE_PATH";\r
+    public static final String IN_PROGRESS = "SYNC_IN_PROGRESS";\r
+    public static final String ACCOUNT_NAME = "ACCOUNT_NAME";\r
 \r
     /*\r
      * {@inheritDoc}\r
      */\r
     @Override\r
     public void onCreate() {\r
-        synchronized (syncAdapterLock) {\r
-            if (concretSyncAdapter == null)\r
-                concretSyncAdapter = new FileSyncAdapter(\r
-                        getApplicationContext(), true);\r
-        }\r
     }\r
 \r
     /*\r
@@ -52,6 +45,6 @@ public class FileSyncService extends Service {
      */\r
     @Override\r
     public IBinder onBind(Intent intent) {\r
-        return concretSyncAdapter.getSyncAdapterBinder();\r
+       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();\r
     }\r
 }\r