Merge branch 'develop' into refactor_remote_operation_to_create_folder

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

diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 867eb53..74d2686 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -30,6 +30,7 @@ import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundEx
 import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;\r
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;\r
 \r
 import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;\r
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;\r
 \r

+\r

 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.accounts.AuthenticatorException;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.accounts.AuthenticatorException;\r


@@ -52,7 +53,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 \r
     private AccountManager accountManager;\r
     private Account account;\r
 \r
     private AccountManager accountManager;\r
     private Account account;\r

-    private ContentProviderClient contentProvider;\r
+    private ContentProviderClient mContentProviderClient;\r

     private FileDataStorageManager mStoreManager;\r
 \r
     private WebdavClient mClient = null;\r
     private FileDataStorageManager mStoreManager;\r
 \r
     private WebdavClient mClient = null;\r


@@ -62,6 +63,11 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         this.setAccountManager(AccountManager.get(context));\r
     }\r
 \r
         this.setAccountManager(AccountManager.get(context));\r
     }\r
 \r

+    public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, boolean allowParallelSyncs) {\r
+        super(context, autoInitialize, allowParallelSyncs);\r
+        this.setAccountManager(AccountManager.get(context));\r
+    }\r
+\r

     public AccountManager getAccountManager() {\r
         return accountManager;\r
     }\r
     public AccountManager getAccountManager() {\r
         return accountManager;\r
     }\r


@@ -78,12 +84,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         this.account = account;\r
     }\r
 \r
         this.account = account;\r
     }\r
 \r

-    public ContentProviderClient getContentProvider() {\r
-        return contentProvider;\r
+    public ContentProviderClient getContentProviderClient() {\r
+        return mContentProviderClient;\r

     }\r
 \r
     }\r
 \r

-    public void setContentProvider(ContentProviderClient contentProvider) {\r
-        this.contentProvider = contentProvider;\r
+    public void setContentProviderClient(ContentProviderClient contentProvider) {\r
+        this.mContentProviderClient = contentProvider;\r

     }\r
 \r
     public void setStorageManager(FileDataStorageManager storage_manager) {\r
     }\r
 \r
     public void setStorageManager(FileDataStorageManager storage_manager) {\r