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 7fa4574..5396f58 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncService.java
@@ -22,35 +22,29 @@ import android.content.Intent;
 import android.os.IBinder;\r
 \r
 /**\r
- * Background service for syncing files to our\r
- * local Database\r
+ * Background service for syncing files to our local Database\r
+ * \r
  * @author Bartek Przybylski\r
- *\r
+ * \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(getApplicationContext(), true);\r
+    /*\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public void onCreate() {\r
     }\r
-  }\r
 \r
-  /*\r
-   * {@inheritDoc}\r
-   */\r
-  @Override\r
-  public IBinder onBind(Intent intent) {\r
-    return concretSyncAdapter.getSyncAdapterBinder();\r
-  }\r
+    /*\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public IBinder onBind(Intent intent) {\r
+       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();\r
+    }\r
 }\r