Update cert4android (#757)

* Update cert4android

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

* Apply transaction annotation to method with relation annotated return value

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

---------

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

Author: sunkup

app/src/main/java/at/bitfire/icsdroid/AppHttpClient.kt

@@ -6,6 +6,7 @@ package at.bitfire.icsdroid
 
 import android.content.Context
 import at.bitfire.cert4android.CustomCertManager
+import at.bitfire.cert4android.CustomCertStore
 import at.bitfire.icsdroid.ui.ForegroundTracker
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -57,7 +58,8 @@ class AppHttpClient @AssistedInject constructor(
     // CustomCertManager is Closeable, but HttpClient will live as long as the application is in memory,
     // so we don't need to close it
     private val certManager = CustomCertManager(
-        context = context,
+        certStore = CustomCertStore.getInstance(context),
+        trustSystemCerts = true,
         appInForeground = ForegroundTracker.inForeground
     )
 

app/src/main/java/at/bitfire/icsdroid/db/dao/SubscriptionsDao.kt

@@ -11,6 +11,7 @@ import androidx.room.Embedded
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Relation
+import androidx.room.Transaction
 import androidx.room.Update
 import at.bitfire.icsdroid.db.entity.Credential
 import at.bitfire.icsdroid.db.entity.Subscription
@@ -46,6 +47,7 @@ interface SubscriptionsDao {
     @Query("SELECT * FROM subscriptions WHERE url=:url")
     suspend fun getByUrl(url: String): Subscription?
 
+    @Transaction
     @Query("SELECT * FROM subscriptions WHERE id=:id")
     suspend fun getWithCredentialsById(id: Long): SubscriptionWithCredential?
 

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ androidx-test-junit = "1.3.0"
 androidx-test-rules = "1.7.0"
 androidx-test-runner = "1.7.0"
 androidx-work = "2.11.0"
-bitfire-cert4android = "41009d4"
+bitfire-cert4android = "b6b7ef3f10"
 bitfire-synctools = "7aa709f6b6"
 compose-dialogs = "1.3.0"
 compose-material = "1.7.8"