arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-13 19:29:01 +00:00
Code Issues Releases Wiki Activity

vcard4android: ignore raw contact data rows without MIMETYPE

Browse Source
This commit is contained in:
Ricki Hirner 2015-10-23 02:28:23 +02:00
parent 34de8431ae
commit 2ef278c336
No known key found for this signature in database
GPG Key ID: C4A212CF0B2B4566
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/at/bitfire/davdroid/HttpClient.java
View File

@ -33,7 +33,7 @@ import de.duenndns.ssl.MemorizingTrustManager;
import lombok.RequiredArgsConstructor;
public class HttpClient extends OkHttpClient {
private final int MAX_LOG_LINE_LENGTH = 80;
private final int MAX_LOG_LINE_LENGTH = 85;
final static UserAgentInterceptor userAgentInterceptor = new UserAgentInterceptor();

2
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
View File

@ -157,7 +157,7 @@ public class ContactsSyncManager extends SyncManager {
// only one contact, use GET
DavResource remote = bunch[0];
ResponseBody body = remote.get("text/vcard;q=0.5, text/vcard;charset=utf-8;q=0.8, text/vcard;version=4.0");
ResponseBody body = remote.get("text/vcard;version=4.0, text/vcard;charset=utf-8;q=0.8, text/vcard;q=0.5");
String eTag = ((GetETag) remote.properties.get(GetETag.NAME)).eTag;
@Cleanup InputStream stream = body.byteStream();

2
vcard4android

@ -1 +1 @@
Subproject commit 0d84afa1680c1ef35db52d63c4eee0b23607dd2b
Subproject commit 7b272fff46da28ace1bb277d50b5f1b3218c170e