Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 6949764

Browse files
committed
Update dav4android and fix timestamp error depending on locale
1 parent c5891b0 commit 6949764

File tree

3 files changed

+10
-349
lines changed

3 files changed

+10
-349
lines changed

owncloudComLibrary/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-allopen'
66
dependencies {
77
api 'com.squareup.okhttp3:okhttp:4.6.0'
88
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
9-
api 'com.gitlab.ownclouders:dav4android:oc_support_2.1'
9+
api 'com.gitlab.ownclouders:dav4android:oc_support_2.1.2'
1010
api 'com.github.hannesa2:Logcat:1.6.0'
1111
api 'net.openid:appauth:0.7.1'
1212

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package com.owncloud.android.lib.common.http.methods.webdav
2525

2626
import at.bitfire.dav4jvm.Dav4jvm.log
27+
import at.bitfire.dav4jvm.DavOCResource
2728
import at.bitfire.dav4jvm.exception.HttpException
2829
import at.bitfire.dav4jvm.exception.RedirectException
2930
import com.owncloud.android.lib.common.http.HttpConstants
@@ -43,11 +44,11 @@ import java.util.concurrent.TimeUnit
4344
* @author David González Verdugo
4445
*/
4546
abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
46-
protected var mDavResource: OCDavResource
47+
protected var mDavResource: DavOCResource
4748

4849
init {
4950
val httpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException()
50-
mDavResource = OCDavResource(
51+
mDavResource = DavOCResource(
5152
okHttpClient,
5253
httpUrl,
5354
log
@@ -95,7 +96,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
9596
// Connection parameters
9697
override fun setReadTimeout(readTimeout: Long, timeUnit: TimeUnit) {
9798
super.setReadTimeout(readTimeout, timeUnit)
98-
mDavResource = OCDavResource(
99+
mDavResource = DavOCResource(
99100
okHttpClient,
100101
httpUrl,
101102
log
@@ -107,7 +108,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
107108
timeUnit: TimeUnit
108109
) {
109110
super.setConnectionTimeout(connectionTimeout, timeUnit)
110-
mDavResource = OCDavResource(
111+
mDavResource = DavOCResource(
111112
okHttpClient,
112113
httpUrl,
113114
log
@@ -116,7 +117,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
116117

117118
override fun setFollowRedirects(followRedirects: Boolean) {
118119
super.setFollowRedirects(followRedirects)
119-
mDavResource = OCDavResource(
120+
mDavResource = DavOCResource(
120121
okHttpClient,
121122
httpUrl,
122123
log
@@ -125,7 +126,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
125126

126127
override fun setUrl(url: HttpUrl) {
127128
super.setUrl(url)
128-
mDavResource = OCDavResource(
129+
mDavResource = DavOCResource(
129130
okHttpClient,
130131
httpUrl,
131132
log
@@ -134,7 +135,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
134135

135136
override fun setRequestHeader(name: String, value: String) {
136137
super.setRequestHeader(name, value)
137-
mDavResource = OCDavResource(
138+
mDavResource = DavOCResource(
138139
okHttpClient,
139140
httpUrl,
140141
log
@@ -150,7 +151,7 @@ abstract class DavMethod protected constructor(url: URL) : HttpBaseMethod(url) {
150151
//////////////////////////////
151152
override fun setRetryOnConnectionFailure(retryOnConnectionFailure: Boolean) {
152153
super.setRetryOnConnectionFailure(retryOnConnectionFailure)
153-
mDavResource = OCDavResource(
154+
mDavResource = DavOCResource(
154155
okHttpClient,
155156
httpUrl,
156157
log

0 commit comments

Comments
 (0)