Merge pull request #324 from owncloud/last_minute_release-1.5.2

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncService.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java
index 3d81961..1e1e11f 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -3,9 +3,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc.\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   Copyright (C) 2012-2013 ownCloud Inc.\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r

- *   it under the terms of the GNU General Public License as published by\r
- *   the Free Software Foundation, either version 2 of the License, or\r
- *   (at your option) any later version.\r
+ *   it under the terms of the GNU General Public License version 2,\r
+ *   as published by the Free Software Foundation.\r

  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r


@@ -18,28 +17,46 @@
  */\r
 package com.owncloud.android.syncadapter;\r
 \r
  */\r
 package com.owncloud.android.syncadapter;\r
 \r

+import com.owncloud.android.utils.Log_OC;\r
+\r

 import android.app.Service;\r
 import android.content.Intent;\r
 import android.os.IBinder;\r
 \r
 /**\r
 import android.app.Service;\r
 import android.content.Intent;\r
 import android.os.IBinder;\r
 \r
 /**\r

- * Background service for syncing files to our local Database\r
+ * Background service for synchronizing remote files with their local state.\r

  * \r
  * \r

- * @author Bartek Przybylski\r
+ * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. \r

  * \r
  * \r

+ * @author Bartek Przybylski\r
+ * @author David A. Velasco\r

  */\r
 public class FileSyncService extends Service {\r
  */\r
 public class FileSyncService extends Service {\r

-    public static final String SYNC_MESSAGE = "ACCOUNT_SYNC";\r
+    \r
+    private 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
     public static final String SYNC_RESULT = "SYNC_RESULT";\r
 \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
     public static final String SYNC_RESULT = "SYNC_RESULT";\r
 \r

+    // Storage for an instance of the sync adapter\r
+    private static FileSyncAdapter sSyncAdapter = null;\r
+    // Object to use as a thread-safe lock\r
+    private static final Object sSyncAdapterLock = new Object();\r
+    \r
+    public static String getSyncMessage(){\r
+        return FileSyncService.class.getName().toString() + SYNC_MESSAGE;\r
+    }\r

     /*\r
      * {@inheritDoc}\r
      */\r
     @Override\r
     public void onCreate() {\r
     /*\r
      * {@inheritDoc}\r
      */\r
     @Override\r
     public void onCreate() {\r

+        synchronized (sSyncAdapterLock) {\r
+            if (sSyncAdapter == null) {\r
+                sSyncAdapter = new FileSyncAdapter(getApplicationContext(), true);\r
+            }\r
+        }\r

     }\r
 \r
     /*\r
     }\r
 \r
     /*\r


@@ -47,6 +64,7 @@ public class FileSyncService extends Service {
      */\r
     @Override\r
     public IBinder onBind(Intent intent) {\r
      */\r
     @Override\r
     public IBinder onBind(Intent intent) {\r

-       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();\r
+       return sSyncAdapter.getSyncAdapterBinder();\r

     }\r
     }\r

+    \r

 }\r
 }\r