|
|
|
@ -11,24 +11,32 @@ import at.bitfire.dav4jvm.XmlUtils.NS_CALDAV
|
|
|
|
import at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV
|
|
|
|
import at.bitfire.dav4jvm.XmlUtils.NS_WEBDAV
|
|
|
|
import at.bitfire.dav4jvm.exception.DavException
|
|
|
|
import at.bitfire.dav4jvm.exception.DavException
|
|
|
|
import at.bitfire.dav4jvm.exception.HttpException
|
|
|
|
import at.bitfire.dav4jvm.exception.HttpException
|
|
|
|
import at.bitfire.dav4jvm.property.*
|
|
|
|
import at.bitfire.dav4jvm.property.CalendarColor
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.CalendarHomeSet
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.CurrentUserPrincipal
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.CurrentUserPrivilegeSet
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.DisplayName
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.GetCTag
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.ResourceType
|
|
|
|
import at.bitfire.dav4jvm.property.ResourceType.Companion.CALENDAR
|
|
|
|
import at.bitfire.dav4jvm.property.ResourceType.Companion.CALENDAR
|
|
|
|
import org.tasks.data.UUIDHelper
|
|
|
|
import at.bitfire.dav4jvm.property.SupportedCalendarComponentSet
|
|
|
|
|
|
|
|
import at.bitfire.dav4jvm.property.SyncToken
|
|
|
|
import kotlinx.coroutines.Dispatchers
|
|
|
|
import kotlinx.coroutines.Dispatchers
|
|
|
|
import kotlinx.coroutines.withContext
|
|
|
|
import kotlinx.coroutines.withContext
|
|
|
|
import okhttp3.HttpUrl
|
|
|
|
import okhttp3.HttpUrl
|
|
|
|
import okhttp3.HttpUrl.Companion.toHttpUrl
|
|
|
|
import okhttp3.HttpUrl.Companion.toHttpUrl
|
|
|
|
import okhttp3.Interceptor
|
|
|
|
|
|
|
|
import okhttp3.MediaType.Companion.toMediaType
|
|
|
|
import okhttp3.MediaType.Companion.toMediaType
|
|
|
|
import okhttp3.OkHttpClient
|
|
|
|
import okhttp3.OkHttpClient
|
|
|
|
import okhttp3.RequestBody.Companion.toRequestBody
|
|
|
|
import okhttp3.RequestBody.Companion.toRequestBody
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.Strings.isNullOrEmpty
|
|
|
|
import org.tasks.Strings.isNullOrEmpty
|
|
|
|
|
|
|
|
import org.tasks.caldav.property.CalendarIcon
|
|
|
|
import org.tasks.caldav.property.Invite
|
|
|
|
import org.tasks.caldav.property.Invite
|
|
|
|
import org.tasks.caldav.property.OCInvite
|
|
|
|
import org.tasks.caldav.property.OCInvite
|
|
|
|
import org.tasks.caldav.property.OCOwnerPrincipal
|
|
|
|
import org.tasks.caldav.property.OCOwnerPrincipal
|
|
|
|
import org.tasks.caldav.property.PropertyUtils.NS_OWNCLOUD
|
|
|
|
import org.tasks.caldav.property.PropertyUtils.NS_OWNCLOUD
|
|
|
|
import org.tasks.caldav.property.ShareAccess
|
|
|
|
import org.tasks.caldav.property.ShareAccess
|
|
|
|
|
|
|
|
import org.tasks.data.UUIDHelper
|
|
|
|
import org.tasks.data.entity.CaldavAccount
|
|
|
|
import org.tasks.data.entity.CaldavAccount
|
|
|
|
import org.tasks.data.entity.CaldavAccount.Companion.SERVER_NEXTCLOUD
|
|
|
|
import org.tasks.data.entity.CaldavAccount.Companion.SERVER_NEXTCLOUD
|
|
|
|
import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD
|
|
|
|
import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OWNCLOUD
|
|
|
|
@ -101,9 +109,12 @@ open class CaldavClient(
|
|
|
|
.findHomeset()
|
|
|
|
.findHomeset()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
suspend fun calendars(interceptor: (Interceptor.Chain) -> okhttp3.Response): List<Response> =
|
|
|
|
suspend fun calendars(interceptor: (okhttp3.Response) -> okhttp3.Response = { it }): List<Response> =
|
|
|
|
DavResource(
|
|
|
|
DavResource(
|
|
|
|
httpClient.newBuilder().addNetworkInterceptor(interceptor).build(),
|
|
|
|
httpClient
|
|
|
|
|
|
|
|
.newBuilder()
|
|
|
|
|
|
|
|
.addNetworkInterceptor { interceptor(it.proceed(it.request())) }
|
|
|
|
|
|
|
|
.build(),
|
|
|
|
httpUrl!!
|
|
|
|
httpUrl!!
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.propfind(1, *calendarProperties)
|
|
|
|
.propfind(1, *calendarProperties)
|
|
|
|
@ -120,33 +131,44 @@ open class CaldavClient(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class, HttpException::class)
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class, HttpException::class)
|
|
|
|
suspend fun makeCollection(displayName: String, color: Int): String = withContext(Dispatchers.IO) {
|
|
|
|
suspend fun makeCollection(displayName: String, color: Int, icon: String?): String = withContext(Dispatchers.IO) {
|
|
|
|
val davResource = DavResource(httpClient, httpUrl!!.resolve(UUIDHelper.newUUID() + "/")!!)
|
|
|
|
val davResource = DavResource(httpClient, httpUrl!!.resolve(UUIDHelper.newUUID() + "/")!!)
|
|
|
|
val mkcolString = getMkcolString(displayName, color)
|
|
|
|
val mkcolString = getMkcolString(displayName, color)
|
|
|
|
davResource.mkCol(mkcolString) {}
|
|
|
|
davResource.mkCol(mkcolString) {}
|
|
|
|
|
|
|
|
if (icon?.isNotBlank() == true) {
|
|
|
|
|
|
|
|
davResource.proppatch(CalendarIcon.NAME, icon)
|
|
|
|
|
|
|
|
}
|
|
|
|
davResource.location.toString()
|
|
|
|
davResource.location.toString()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class, HttpException::class)
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class, HttpException::class)
|
|
|
|
suspend fun updateCollection(displayName: String, color: Int): String =
|
|
|
|
suspend fun updateCollection(displayName: String, color: Int, icon: String?): String =
|
|
|
|
withContext(Dispatchers.IO) {
|
|
|
|
withContext(Dispatchers.IO) {
|
|
|
|
with(DavResource(httpClient, httpUrl!!)) {
|
|
|
|
with(DavResource(httpClient, httpUrl!!)) {
|
|
|
|
proppatch(
|
|
|
|
proppatch(DisplayName.NAME, displayName)
|
|
|
|
setProperties = mutableMapOf(DisplayName.NAME to displayName).apply {
|
|
|
|
|
|
|
|
if (color != 0) {
|
|
|
|
if (color != 0) {
|
|
|
|
put(
|
|
|
|
proppatch(
|
|
|
|
CalendarColor.NAME,
|
|
|
|
CalendarColor.NAME,
|
|
|
|
String.format("#%06X%02X", color and 0xFFFFFF, color ushr 24)
|
|
|
|
String.format("#%06X%02X", color and 0xFFFFFF, color ushr 24)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
if (icon?.isNotBlank() == true) {
|
|
|
|
removeProperties = if (color == 0) listOf(CalendarColor.NAME) else emptyList(),
|
|
|
|
proppatch(CalendarIcon.NAME, icon)
|
|
|
|
callback = { _, _ -> },
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
location.toString()
|
|
|
|
location.toString()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class, HttpException::class)
|
|
|
|
|
|
|
|
suspend fun updateIcon(url: HttpUrl, icon: String?, onFailure: () -> Unit) =
|
|
|
|
|
|
|
|
withContext(Dispatchers.IO) {
|
|
|
|
|
|
|
|
with(DavResource(httpClient, url)) {
|
|
|
|
|
|
|
|
if (icon?.isNotBlank() == true) {
|
|
|
|
|
|
|
|
proppatch(CalendarIcon.NAME, icon, onFailure)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class)
|
|
|
|
@Throws(IOException::class, XmlPullParserException::class)
|
|
|
|
private fun getMkcolString(displayName: String, color: Int): String {
|
|
|
|
private fun getMkcolString(displayName: String, color: Int): String {
|
|
|
|
val xmlPullParserFactory = XmlPullParserFactory.newInstance()
|
|
|
|
val xmlPullParserFactory = XmlPullParserFactory.newInstance()
|
|
|
|
@ -296,6 +318,7 @@ open class CaldavClient(
|
|
|
|
OCInvite.NAME,
|
|
|
|
OCInvite.NAME,
|
|
|
|
CurrentUserPrivilegeSet.NAME,
|
|
|
|
CurrentUserPrivilegeSet.NAME,
|
|
|
|
CurrentUserPrincipal.NAME,
|
|
|
|
CurrentUserPrincipal.NAME,
|
|
|
|
|
|
|
|
CalendarIcon.NAME,
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
private suspend fun DavResource.propfind(
|
|
|
|
private suspend fun DavResource.propfind(
|
|
|
|
@ -311,5 +334,22 @@ open class CaldavClient(
|
|
|
|
cont.resumeWith(Result.success(responses))
|
|
|
|
cont.resumeWith(Result.success(responses))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fun DavResource.proppatch(
|
|
|
|
|
|
|
|
property: Property.Name,
|
|
|
|
|
|
|
|
value: String,
|
|
|
|
|
|
|
|
onFailure: () -> Unit = {},
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
proppatch(
|
|
|
|
|
|
|
|
setProperties = mapOf(property to value),
|
|
|
|
|
|
|
|
removeProperties = emptyList(),
|
|
|
|
|
|
|
|
callback = { response, _ ->
|
|
|
|
|
|
|
|
if (!response.isSuccess()) {
|
|
|
|
|
|
|
|
Timber.e("${response.status} when updating $property: ${response.error}")
|
|
|
|
|
|
|
|
onFailure()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Samuel Born
4 months ago
committed by