X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/db87c22150ad8a0697ad5191f379647ca1c8ca50..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 06c8e850..1e1e11fd 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -17,6 +17,8 @@
  */
 package com.owncloud.android.syncadapter;
 
+import com.owncloud.android.utils.Log_OC;
+
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
@@ -31,20 +33,30 @@ import android.os.IBinder;
  */
 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);
+            }
+        }
     }
 
     /*
@@ -52,7 +64,7 @@ public class FileSyncService extends Service {
      */
     @Override
     public IBinder onBind(Intent intent) {
-       return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();
+       return sSyncAdapter.getSyncAdapterBinder();
     }
     
 }