diff --git a/android/app/src/main/java/aza/instant/UploadWorker.kt b/android/app/src/main/java/aza/instant/UploadWorker.kt index e751928..dbb8c61 100644 --- a/android/app/src/main/java/aza/instant/UploadWorker.kt +++ b/android/app/src/main/java/aza/instant/UploadWorker.kt @@ -6,7 +6,7 @@ import android.content.Context import androidx.core.app.NotificationCompat import androidx.work.CoroutineWorker import androidx.work.WorkerParameters -import aza.instant.BackendClient +import aza.instant.network.BackendClient import java.io.File class UploadWorker( diff --git a/android/app/src/main/java/aza/instant/BackendClient.kt b/android/app/src/main/java/aza/instant/network/BackendClient.kt similarity index 73% rename from android/app/src/main/java/aza/instant/BackendClient.kt rename to android/app/src/main/java/aza/instant/network/BackendClient.kt index 87c7851..b7f39f4 100644 --- a/android/app/src/main/java/aza/instant/BackendClient.kt +++ b/android/app/src/main/java/aza/instant/network/BackendClient.kt @@ -1,7 +1,6 @@ -package aza.instant +package aza.instant.network import io.ktor.client.HttpClient -import io.ktor.client.HttpClientConfig import io.ktor.client.engine.cio.CIO import io.ktor.client.plugins.HttpTimeoutConfig import io.ktor.client.plugins.contentnegotiation.ContentNegotiation @@ -21,7 +20,7 @@ import java.io.File class BackendClient { private val client = HttpClient(CIO) { - HttpClientConfig.install(ContentNegotiation) { + install(ContentNegotiation) { json(Json { prettyPrint = true isLenient = true @@ -47,21 +46,11 @@ class BackendClient { setBody( MultiPartFormDataContent(formData { append("owner_key", ownerKey) - append( - "\"photo\"", - originalPhoto.name, - ContentType.Image.JPEG, - origB.size.toLong() - ) { write(origB) } - append( - "\"edited_photo\"", - editedPhoto.name, - ContentType.Image.JPEG, - editB.size.toLong() - ) { write(editB) } + append("\"photo\"", originalPhoto.name, ContentType.Image.JPEG, origB.size.toLong()) { write(origB) } + append("\"edited_photo\"", editedPhoto.name, ContentType.Image.JPEG, editB.size.toLong()) { write(editB) } }) ) timeout { HttpTimeoutConfig(1 * 60 * 1000L) } } } -} \ No newline at end of file +}