diff --git a/app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt b/app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt index 12b16e4..6cf8248 100644 --- a/app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt +++ b/app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt @@ -19,7 +19,7 @@ object AndroidServerApi { val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) val serverID = sharedPreferences.getString("school", "0")?.toInt() ?: 0 - val server = ServerAPI.Companion.Servers.values()[serverID] + val server = ServerAPI.getServer(serverID) return instance ?: synchronized(this) { instance ?: ServerAPI(ServerAPI.createServer(server)).also { instance = it } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index f8b41f6..606e55d 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -38,7 +38,7 @@ kotlin { frameworkName = "Shared" - pod ("HTMLKit", "~> 3.1.0") + pod("HTMLKit", "~> 3.1.0") } sourceSets { diff --git a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseFactory.kt b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseFactory.kt index fa1be62..7db427e 100644 --- a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseFactory.kt +++ b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/data/DatabaseFactory.kt @@ -4,4 +4,4 @@ import com.squareup.sqldelight.db.SqlDriver object DatabaseFactory { fun createDatabase(sqlDriver: SqlDriver) = AppDatabase(sqlDriver) -} \ No newline at end of file +} diff --git a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt index 7ff8966..62c8347 100644 --- a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt +++ b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt @@ -54,6 +54,10 @@ class ServerAPI( SUCCESS, ERROR } + fun getServer(serverID: Int): Servers { + return Servers.values()[serverID] + } + fun getServerId(server: Servers): Int { return Servers.values().indexOf(server) } diff --git a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/utils/FlowUtils.kt b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/utils/FlowUtils.kt index 1b2e83c..552eea2 100644 --- a/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/utils/FlowUtils.kt +++ b/shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/utils/FlowUtils.kt @@ -24,4 +24,4 @@ class CFlow(private val origin: Flow) : Flow by origin { } } } -} \ No newline at end of file +} diff --git a/shared/src/iosMain/kotlin/net/underdesk/circolapp/shared/server/curie/SpecificCurieServer.kt b/shared/src/iosMain/kotlin/net/underdesk/circolapp/shared/server/curie/SpecificCurieServer.kt index 6d95a96..28611f8 100644 --- a/shared/src/iosMain/kotlin/net/underdesk/circolapp/shared/server/curie/SpecificCurieServer.kt +++ b/shared/src/iosMain/kotlin/net/underdesk/circolapp/shared/server/curie/SpecificCurieServer.kt @@ -12,7 +12,7 @@ actual class SpecificCurieServer actual constructor(private val curieServer: Cur val list = ArrayList() htmlList?.forEach { element -> - if (element.parentElement?.parentElement?.parentElement?.tagName == "li") { + if (element.parentElement?.parentElement?.parentElement?.tagName == "li") { list.last().attachmentsNames.add(element.textContent) list.last().attachmentsUrls.add(element.attributes.objectForKey("href").toString()) } else {