merge fix

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / ContactSyncService.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/ContactSyncService.java b/src/eu/alefzero/owncloud/syncadapter/ContactSyncService.java
index 2dd7661..372c17c 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/ContactSyncService.java
+++ b/src/eu/alefzero/owncloud/syncadapter/ContactSyncService.java
@@ -5,27 +5,21 @@ import android.content.Intent;
 import android.os.IBinder;
 
 public class ContactSyncService extends Service {
-    private static final Object syncAdapterLock = new Object();
-    private static AbstractOwnCloudSyncAdapter concretSyncAdapter = null;
-
-    /*
-     * {@inheritDoc}
-     */
-    @Override
-    public void onCreate() {
-        synchronized (syncAdapterLock) {
-            if (concretSyncAdapter == null) {
-                concretSyncAdapter = new ContactSyncAdapter(getApplicationContext(), true);
-            }
-        }
-    }
-
-    /*
-     * {@inheritDoc}
-     */
-    @Override
-    public IBinder onBind(Intent intent) {
-        return concretSyncAdapter.getSyncAdapterBinder();
-    }
+  private static final Object syncAdapterLock = new Object();
+  private static AbstractOwnCloudSyncAdapter mSyncAdapter = null;
+  
+  @Override
+  public void onCreate() {
+      synchronized (syncAdapterLock) {
+          if (mSyncAdapter == null) {
+              mSyncAdapter = new ContactSyncAdapter(getApplicationContext(), true);
+          }
+      }
+  }
+  
+  @Override
+  public IBinder onBind(Intent arg0) {
+    return mSyncAdapter.getSyncAdapterBinder();
+  }
 
 }