Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
6
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
DAVx⁵
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
bitfire web engineering
DAVx⁵
Commits
34de8431
Unverified
Commit
34de8431
authored
Oct 21, 2015
by
Ricki Hirner
🐑
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fallback to PROPFIND when REPORT addressbook-query returns 400, 403, 500 or 501
* increase max. log line length to 80 characters
parent
9d19d975
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/src/main/java/at/bitfire/davdroid/HttpClient.java
app/src/main/java/at/bitfire/davdroid/HttpClient.java
+1
-1
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
.../at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
+7
-1
No files found.
app/src/main/java/at/bitfire/davdroid/HttpClient.java
View file @
34de8431
...
...
@@ -33,7 +33,7 @@ import de.duenndns.ssl.MemorizingTrustManager;
import
lombok.RequiredArgsConstructor
;
public
class
HttpClient
extends
OkHttpClient
{
private
final
int
MAX_LOG_LINE_LENGTH
=
71
;
private
final
int
MAX_LOG_LINE_LENGTH
=
80
;
final
static
UserAgentInterceptor
userAgentInterceptor
=
new
UserAgentInterceptor
();
...
...
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
View file @
34de8431
...
...
@@ -117,7 +117,13 @@ public class ContactsSyncManager extends SyncManager {
try
{
davAddressBook
().
addressbookQuery
();
}
catch
(
HttpException
e
)
{
if
(
e
.
status
/
100
==
4
)
{
/* non-successful responses to CARDDAV:addressbook-query with empty filter, tested on 2015/10/21
* fastmail.com 403 Forbidden (DAV:error CARDDAV:supported-filter)
* mailbox.org (OpenXchange) 400 Bad Request
* SOGo 207 Multi-status, but without entries http://www.sogo.nu/bugs/view.php?id=3370
* Zimbra ZCS 500 Server Error https://bugzilla.zimbra.com/show_bug.cgi?id=101902
*/
if
(
e
.
status
==
400
||
e
.
status
==
403
||
e
.
status
==
500
||
e
.
status
==
501
)
{
log
.
warn
(
"Server error on REPORT addressbook-query, falling back to PROPFIND"
,
e
);
davAddressBook
().
propfind
(
1
,
GetETag
.
NAME
);
}
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment