X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/017f9429c8820ae4c9cc3bf96abe21e97a5f2864..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/src/com/owncloud/android/syncadapter/FileSyncService.java?ds=sidebyside

diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java
index d3472658..9ae051ca 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -22,26 +22,39 @@ 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 {
-    public static final String SYNC_MESSAGE = "ACCOUNT_SYNC";
+    
+    private static final String SYNC_MESSAGE = "ACCOUNT_SYNC";
     public static final String SYNC_FOLDER_REMOTE_PATH = "SYNC_FOLDER_REMOTE_PATH";
     public static final String IN_PROGRESS = "SYNC_IN_PROGRESS";
     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";
     public static final String SYNC_RESULT = "SYNC_RESULT";
 
-    public String getSyncMessage(){
-        return getClass().getName().toString() + SYNC_MESSAGE;
+    // 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;
     }
     /*
      * {@inheritDoc}
      */
     @Override
     public void onCreate() {
+        synchronized (sSyncAdapterLock) {
+            if (sSyncAdapter == null) {
+                sSyncAdapter = new FileSyncAdapter(getApplicationContext(), true);
+            }
+        }
     }
 
     /*
@@ -49,6 +62,7 @@ public class FileSyncService extends Service {
      */
     @Override
     public IBinder onBind(Intent intent) {
-       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();
+       return sSyncAdapter.getSyncAdapterBinder();
     }
+    
 }