mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-23 11:39:15 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Refactor queryHomeSets method for clarity (bitfireAT/davx5#270)

Browse source 
* Make it clear that the first call of recursive method queryHomeSets is for the current-user-principal home set

* Update whitespace in kdoc

* Update kdoc
This commit is contained in:
Sunik Kupfer 2023-05-22 15:08:36 +02:00 committed by Ricki Hirner
parent 38cfd200b1
commit ae303e3e8d
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/at/bitfire/davdroid/servicedetection/RefreshCollectionsWorker.kt
View file

@ -231,8 +231,13 @@ class RefreshCollectionsWorker @AssistedInject constructor(
/**
* Checks if the given URL defines home sets and adds them to given home set list.
*
* @param url Principal URL to query
* @param personal Whether this is the "outer" call of the recursion.
* @param principalUrl Principal URL to query
* @param forPersonalHomeset Whether this is the first call of this recursive method.
* Indicates that these found home sets are considered "personal", as they belong to the
* current-user-principal.
*
* Note: This is not be be confused with the DAV:owner attribute. Home sets can be owned by
* other principals and still be considered "personal" (belonging to the current-user-principal).
*
* *true* = found home sets belong to the current-user-principal; recurse if
* calendar proxies or group memberships are found
@ -243,7 +248,7 @@ class RefreshCollectionsWorker @AssistedInject constructor(
* @throws HttpException
* @throws at.bitfire.dav4jvm.exception.DavException
*/
internal fun queryHomeSets(url: HttpUrl, personal: Boolean = true) {
internal fun queryHomeSets(principalUrl: HttpUrl, forPersonalHomeset: Boolean = true) {
val related = mutableSetOf<HttpUrl>()
// Define homeset class and properties to look for
@ -261,7 +266,7 @@ class RefreshCollectionsWorker @AssistedInject constructor(
else -> throw IllegalArgumentException()
}
val dav = DavResource(httpClient, url)
val dav = DavResource(httpClient, principalUrl)
try {
// Query for the given service with properties
dav.propfind(0, *properties) { davResponse, _ ->
@ -271,12 +276,13 @@ class RefreshCollectionsWorker @AssistedInject constructor(
for (href in homeSet.hrefs)
dav.location.resolve(href)?.let {
val foundUrl = UrlUtils.withTrailingSlash(it)
db.homeSetDao().insertOrUpdateByUrl(HomeSet(0, service.id, personal, foundUrl))
// Save the homeset - personal if outer call of recursion
db.homeSetDao().insertOrUpdateByUrl(HomeSet(0, service.id, forPersonalHomeset, foundUrl))
}
}
// If personal (outer call of recursion), find/refresh related resources
if (personal) {
if (forPersonalHomeset) {
val relatedResourcesTypes = mapOf(
CalendarProxyReadFor::class.java to "read-only proxy for", // calendar-proxy-read-for
CalendarProxyWriteFor::class.java to "read/write proxy for ", // calendar-proxy-read/write-for
@ -463,4 +469,4 @@ class RefreshCollectionsWorker @AssistedInject constructor(
(collection.type == Collection.TYPE_WEBCAL && collection.source != null)
}
}
}