Change ServerApi constructor

app/src/main/java/net/underdesk/circolapp/server/AndroidServerApi.kt

@@ -11,7 +11,7 @@ object AndroidServerApi {
 
     fun getInstance(server: ServerAPI.Companion.Servers): ServerAPI {
         return instance ?: synchronized(this) {
-            instance ?: ServerAPI(ServerAPI.createServer(server)).also { instance = it }
+            instance ?: ServerAPI(server).also { instance = it }
         }
     }
 
@@ -22,7 +22,7 @@ object AndroidServerApi {
         val server = ServerAPI.getServer(serverID)
 
         return instance ?: synchronized(this) {
-            instance ?: ServerAPI(ServerAPI.createServer(server)).also { instance = it }
+            instance ?: ServerAPI(server).also { instance = it }
         }
     }
 
@@ -36,6 +36,6 @@ object AndroidServerApi {
         if (notifyNewCirculars && !enablePolling)
             FirebaseTopicUtils.selectTopic(newServer.toString(), context)
 
-        instance?.changeServer(ServerAPI.createServer(newServer))
+        instance?.changeServer(newServer)
     }
 }

shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/Server.kt

@@ -18,9 +18,12 @@
 
 package net.underdesk.circolapp.shared.server
 
+import io.ktor.client.*
 import net.underdesk.circolapp.shared.data.Circular
 
-abstract class Server {
+abstract class Server(
+    val ktorClient: HttpClient
+) {
     abstract val serverID: Int
     abstract suspend fun getCircularsFromServer(): Pair<List<Circular>, ServerAPI.Companion.Result>
     abstract suspend fun newCircularsAvailable(): Pair<Boolean, ServerAPI.Companion.Result>

shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/ServerAPI.kt

@@ -18,17 +18,23 @@
 
 package net.underdesk.circolapp.shared.server
 
+import io.ktor.client.*
 import kotlinx.coroutines.withContext
 import net.underdesk.circolapp.shared.PlatformDispatcher
 import net.underdesk.circolapp.shared.data.Circular
 import net.underdesk.circolapp.shared.server.curie.CurieServer
 import net.underdesk.circolapp.shared.server.porporato.PorporatoServer
 
-class ServerAPI(
+class ServerAPI(serverName: Servers) {
+    private val ktorClient = KtorFactory().createClient()
     private var server: Server
-) {
+
     fun serverID(): Int = server.serverID
 
+    init {
+        server = createServer(serverName, ktorClient)
+    }
+
     suspend fun getCircularsFromServer(): Pair<List<Circular>, Result> = withContext(PlatformDispatcher.IO) {
         val newCircularsAvailable = server.newCircularsAvailable()
 
@@ -41,8 +47,8 @@ class ServerAPI(
         server.getCircularsFromServer()
     }
 
-    fun changeServer(server: Server) {
+    fun changeServer(serverName: Servers) {
-        this.server = server
+        server = createServer(serverName, ktorClient)
     }
 
     companion object {
@@ -67,9 +73,9 @@ class ServerAPI(
             Servers.PORPORATO -> "Liceo G.F. Porporato"
         }
 
-        fun createServer(server: Servers) = when (server) {
+        fun createServer(server: Servers, ktorClient: HttpClient) = when (server) {
-            Servers.CURIE -> CurieServer()
+            Servers.CURIE -> CurieServer(ktorClient)
-            Servers.PORPORATO -> PorporatoServer()
+            Servers.PORPORATO -> PorporatoServer(ktorClient)
         }
     }
 }

shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/curie/CurieServer.kt

@@ -1,19 +1,17 @@
 package net.underdesk.circolapp.shared.server.curie
 
+import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.utils.io.errors.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import net.underdesk.circolapp.shared.data.Circular
-import net.underdesk.circolapp.shared.server.KtorFactory
 import net.underdesk.circolapp.shared.server.Server
 import net.underdesk.circolapp.shared.server.ServerAPI
 import net.underdesk.circolapp.shared.server.pojo.Response
 import kotlin.coroutines.cancellation.CancellationException
 
-class CurieServer : Server() {
+class CurieServer(ktorClient: HttpClient) : Server(ktorClient) {
-    private val client = KtorFactory().createClient()
-
     override val serverID = ServerAPI.getServerId(ServerAPI.Companion.Servers.CURIE)
 
     override suspend fun getCircularsFromServer(): Pair<List<Circular>, ServerAPI.Companion.Result> {
@@ -35,7 +33,7 @@ class CurieServer : Server() {
     @OptIn(ExperimentalStdlibApi::class)
     @Throws(IOException::class, CancellationException::class)
     private suspend fun retrieveDataFromServer(): Response {
-        return client.get(ENDPOINT_URL)
+        return ktorClient.get(ENDPOINT_URL)
     }
 
     fun generateFromString(string: String, url: String): Circular {

shared/src/commonMain/kotlin/net/underdesk/circolapp/shared/server/porporato/PorporatoServer.kt

@@ -1,5 +1,6 @@
 package net.underdesk.circolapp.shared.server.porporato
 
+import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.utils.io.charsets.*
@@ -7,14 +8,11 @@ import io.ktor.utils.io.errors.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import net.underdesk.circolapp.shared.data.Circular
-import net.underdesk.circolapp.shared.server.KtorFactory
 import net.underdesk.circolapp.shared.server.Server
 import net.underdesk.circolapp.shared.server.ServerAPI
 import kotlin.coroutines.cancellation.CancellationException
 
-class PorporatoServer : Server() {
+class PorporatoServer(ktorClient: HttpClient) : Server(ktorClient) {
-    private val client = KtorFactory().createClient()
-
     private val baseUrl = "https://www.liceoporporato.edu.it/ARCHIVIO/PR/VP/"
     private val endpointUrls = listOf(
         "https://www.liceoporporato.edu.it/ARCHIVIO/PR/VP/circolari.php?dirname=CIRCOLARIP/- CIRCOLARI 2020-21/-01-Settembre/",
@@ -99,7 +97,7 @@ class PorporatoServer : Server() {
     @OptIn(ExperimentalStdlibApi::class)
     @Throws(IOException::class, CancellationException::class)
     private suspend fun retrieveDataFromServer(url: String): String {
-        return client.request<HttpResponse>(url).readText(Charsets.ISO_8859_1)
+        return ktorClient.request<HttpResponse>(url).readText(Charsets.ISO_8859_1)
     }
 
     fun generateFromString(string: String, path: String, index: Long): Circular {