Adding cancellation to uploads (WIP)

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

diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index 2508dcd..2ce0b22 100644 (file)
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@ -3,14 +3,11 @@ package com.owncloud.android.syncadapter;
 import java.io.FileInputStream;
 import java.io.IOException;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 

-import org.apache.http.HttpResponse;

 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authenticator.AccountAuthenticator;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authenticator.AccountAuthenticator;

-import com.owncloud.android.db.ProviderMeta;
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;

 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;


@@ -24,7 +21,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;

-import android.util.Log;

 
 public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private String mAddrBookUri;
 
 public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private String mAddrBookUri;


@@ -53,7 +49,7 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     byte[] b = new byte[f.available()];
                     f.read(b);
                     query.setEntity(new ByteArrayEntity(b));
                     byte[] b = new byte[f.available()];
                     f.read(b);
                     query.setEntity(new ByteArrayEntity(b));

-                    HttpResponse response = fireRawRequest(query);
+                    fireRawRequest(query);

                 } catch (IOException e) {
                     e.printStackTrace();
                     return;
                 } catch (IOException e) {
                     e.printStackTrace();
                     return;


@@ -75,6 +71,7 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
             return mAddrBookUri;
 
         AccountManager am = getAccountManager();
             return mAddrBookUri;
 
         AccountManager am = getAccountManager();

+        @SuppressWarnings("deprecation")

         String uri = am.getUserData(getAccount(),
                 AccountAuthenticator.KEY_OC_URL).replace(
                 AccountUtils.WEBDAV_PATH_2_0, AccountUtils.CARDDAV_PATH_2_0);
         String uri = am.getUserData(getAccount(),
                 AccountAuthenticator.KEY_OC_URL).replace(
                 AccountUtils.WEBDAV_PATH_2_0, AccountUtils.CARDDAV_PATH_2_0);