From 6d27510aeca240a8357da1afc4e97eb142e7f2d5 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Fri, 6 Dec 2024 14:22:59 +0100 Subject: [PATCH] Update ServerConfigurationDAO.kt --- .../kalium/persistence/daokaliumdb/ServerConfigurationDAO.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/daokaliumdb/ServerConfigurationDAO.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/daokaliumdb/ServerConfigurationDAO.kt index 5fc7b42618..04c83e96f7 100644 --- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/daokaliumdb/ServerConfigurationDAO.kt +++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/daokaliumdb/ServerConfigurationDAO.kt @@ -125,12 +125,8 @@ interface ServerConfigurationDAO { suspend fun allConfig(): List fun configById(id: String): ServerConfigEntity? suspend fun configByLinks(links: ServerConfigEntity.Links): ServerConfigEntity? -<<<<<<< HEAD - suspend fun updateApiVersion(id: String, commonApiVersion: Int) suspend fun getCommonApiVersion(domain: String): Int -======= suspend fun updateServerMetaData(id: String, federation: Boolean, commonApiVersion: Int) ->>>>>>> 790b885dcf (fix: update federation flag when fetching server config [WPB-14728] (#3143)) suspend fun updateApiVersionAndDomain(id: String, domain: String, commonApiVersion: Int) suspend fun configForUser(userId: UserIDEntity): ServerConfigEntity? suspend fun setFederationToTrue(id: String)