projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #740 from owncloud/revert-669-master
[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
662c8a6
..
3ba1676
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@
-24,8
+24,8
@@
import java.io.IOException;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
-import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
import android.accounts.Account;
import android.accounts.Account;
@@
-92,7
+92,7
@@
public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
AccountManager am = getAccountManager();
@SuppressWarnings("deprecation")
String uri = am.getUserData(getAccount(),
AccountManager am = getAccountManager();
@SuppressWarnings("deprecation")
String uri = am.getUserData(getAccount(),
-
AccountAuthenticator
.KEY_OC_URL).replace(
+
Constants
.KEY_OC_URL).replace(
AccountUtils.WEBDAV_PATH_2_0, AccountUtils.CARDDAV_PATH_2_0);
uri += "/addressbooks/"
+ getAccount().name.substring(0,
AccountUtils.WEBDAV_PATH_2_0, AccountUtils.CARDDAV_PATH_2_0);
uri += "/addressbooks/"
+ getAccount().name.substring(0,