Fixed local state of file after a successful reupload

[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 6e81557..6dcf531 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -24,10 +24,11 @@ import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
 \r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
 \r

-import com.owncloud.android.authentication.AccountUtils;\r
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;\r

 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r

-import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.lib.accounts.AccountUtils;\r
+import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException;\r
+import com.owncloud.android.lib.network.OwnCloudClientFactory;\r
+import com.owncloud.android.lib.network.OwnCloudClient;\r

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


@@ -37,7 +38,6 @@ import android.accounts.OperationCanceledException;
 import android.content.AbstractThreadedSyncAdapter;\r
 import android.content.ContentProviderClient;\r
 import android.content.Context;\r
 import android.content.AbstractThreadedSyncAdapter;\r
 import android.content.ContentProviderClient;\r
 import android.content.Context;\r

-import eu.alefzero.webdav.WebdavClient;\r

 \r
 /**\r
  * Base synchronization adapter for ownCloud designed to be subclassed for different\r
 \r
 /**\r
  * Base synchronization adapter for ownCloud designed to be subclassed for different\r


@@ -56,7 +56,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     private ContentProviderClient mContentProviderClient;\r
     private FileDataStorageManager mStoreManager;\r
 \r
     private ContentProviderClient mContentProviderClient;\r
     private FileDataStorageManager mStoreManager;\r
 \r

-    private WebdavClient mClient = null;\r
+    private OwnCloudClient mClient = null;\r

 \r
     public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {\r
         super(context, autoInitialize);\r
 \r
     public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {\r
         super(context, autoInitialize);\r


@@ -102,10 +102,10 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 \r
     protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {\r
         AccountUtils.constructFullURLForAccount(getContext(), account);\r
 \r
     protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {\r
         AccountUtils.constructFullURLForAccount(getContext(), account);\r

-        mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());\r
+        mClient = OwnCloudClientFactory.createOwnCloudClient(account, getContext());\r

     }\r
     \r
     }\r
     \r

-    protected WebdavClient getClient() {\r
+    protected OwnCloudClient getClient() {\r

         return mClient;\r
     }\r
     \r
         return mClient;\r
     }\r
     \r