X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6d83b3503b71b33f010a801a3f000341f8e91954..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/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 7d4dda68..1e1e11fd 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -17,15 +17,19 @@
  */
 package com.owncloud.android.syncadapter;
 
+import com.owncloud.android.utils.Log_OC;
+
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 
 /**
- * Background service for syncing files to our local Database
+ * Background service for synchronizing remote files with their local state.
  * 
- * @author Bartek Przybylski
+ * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. 
  * 
+ * @author Bartek Przybylski
+ * @author David A. Velasco
  */
 public class FileSyncService extends Service {
     
@@ -35,6 +39,11 @@ public class FileSyncService extends Service {
     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";
     public static final String SYNC_RESULT = "SYNC_RESULT";
 
+    // Storage for an instance of the sync adapter
+    private static FileSyncAdapter sSyncAdapter = null;
+    // Object to use as a thread-safe lock
+    private static final Object sSyncAdapterLock = new Object();
+    
     public static String getSyncMessage(){
         return FileSyncService.class.getName().toString() + SYNC_MESSAGE;
     }
@@ -43,6 +52,11 @@ public class FileSyncService extends Service {
      */
     @Override
     public void onCreate() {
+        synchronized (sSyncAdapterLock) {
+            if (sSyncAdapter == null) {
+                sSyncAdapter = new FileSyncAdapter(getApplicationContext(), true);
+            }
+        }
     }
 
     /*
@@ -50,6 +64,7 @@ public class FileSyncService extends Service {
      */
     @Override
     public IBinder onBind(Intent intent) {
-       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();
+       return sSyncAdapter.getSyncAdapterBinder();
     }
+    
 }