mirror/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose.git synced 2025-12-23 23:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies, including our libs (#1822)

Browse Source
This commit is contained in:
Ricki Hirner
2025-11-19 15:35:06 +01:00
committed by GitHub
parent a3aac44775
commit 9bc46d4194
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/at/bitfire/davdroid/network/HttpClientBuilder.kt
View File

@@ -8,6 +8,7 @@ import android.accounts.Account
import android.content.Context
import androidx.annotation.WorkerThread
import at.bitfire.cert4android.CustomCertManager
import at.bitfire.cert4android.CustomCertStore
import at.bitfire.dav4jvm.okhttp.BasicDigestAuthHandler
import at.bitfire.dav4jvm.okhttp.UrlUtils
import at.bitfire.davdroid.BuildConfig
@@ -284,7 +285,7 @@ class HttpClientBuilder @Inject constructor(
if (BuildConfig.allowCustomCerts) {
// use cert4android for custom certificate handling
customTrustManager = CustomCertManager(
context = context,
certStore = CustomCertStore.getInstance(context),
trustSystemCerts = !settingsManager.getBoolean(Settings.DISTRUST_SYSTEM_CERTIFICATES),
appInForeground = ForegroundTracker.inForeground
)

6
app/src/main/kotlin/at/bitfire/davdroid/sync/CalendarSyncManager.kt
View File

@@ -33,7 +33,7 @@ import at.bitfire.synctools.icalendar.CalendarUidSplitter
import at.bitfire.synctools.icalendar.ICalendarGenerator
import at.bitfire.synctools.icalendar.ICalendarParser
import at.bitfire.synctools.mapping.calendar.AndroidEventBuilder
import at.bitfire.synctools.mapping.calendar.AndroidEventProcessor
import at.bitfire.synctools.mapping.calendar.AndroidEventHandler
import at.bitfire.synctools.mapping.calendar.DefaultProdIdGenerator
import at.bitfire.synctools.mapping.calendar.SequenceUpdater
import dagger.assisted.Assisted
@@ -189,11 +189,11 @@ class CalendarSyncManager @AssistedInject constructor(
val updatedSequence = SequenceUpdater().increaseSequence(localEvent.main)
// map Android event to iCalendar (also generates UID, if necessary)
val processor = AndroidEventProcessor(
val handler = AndroidEventHandler(
accountName = resource.recurringCalendar.calendar.account.name,
prodIdGenerator = DefaultProdIdGenerator(Constants.iCalProdId)
)
val mappedEvents = processor.mapToVEvents(localEvent)
val mappedEvents = handler.mapToVEvents(localEvent)
// persist UID if it was generated
if (mappedEvents.generatedUid)