From 3c9aeda2561d6f04d9ab99fae73fa887d049cc42 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sun, 26 Oct 2025 17:11:03 +0800
Subject: [PATCH] [U] Update usage

---
 .../src/main/java/aza/instant/UploadWorker.kt |  4 +---
 .../java/aza/instant/network/BackendClient.kt | 20 ++++++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/android/app/src/main/java/aza/instant/UploadWorker.kt b/android/app/src/main/java/aza/instant/UploadWorker.kt
index 84f5c54..dbb8c61 100644
--- a/android/app/src/main/java/aza/instant/UploadWorker.kt
+++ b/android/app/src/main/java/aza/instant/UploadWorker.kt
@@ -18,7 +18,6 @@ class UploadWorker(
         val originalPhotoPath = inputData.getString("originalPhotoPath") ?: return Result.failure()
         val editedPhotoPath = inputData.getString("editedPhotoPath") ?: return Result.failure()
         val urlName = inputData.getString("urlName") ?: return Result.failure()
-        val ownerKey = "1234" // This should probably be passed as an input argument as well
 
         val originalPhoto = File(originalPhotoPath)
         val editedPhoto = File(editedPhotoPath)
@@ -26,8 +25,7 @@ class UploadWorker(
         return try {
             val backendClient = BackendClient()
             val response = backendClient.uploadImage(
-                id = urlName,
-                ownerKey = ownerKey,
+                ownerKey = urlName,
                 originalPhoto = originalPhoto,
                 editedPhoto = editedPhoto
             )
diff --git a/android/app/src/main/java/aza/instant/network/BackendClient.kt b/android/app/src/main/java/aza/instant/network/BackendClient.kt
index 8ea4aae..b7f39f4 100644
--- a/android/app/src/main/java/aza/instant/network/BackendClient.kt
+++ b/android/app/src/main/java/aza/instant/network/BackendClient.kt
@@ -34,12 +34,7 @@ class BackendClient {
         private const val SERVER_URL = "http://172.16.0.212:3000" // For Android emulator
     }
 
-    suspend fun uploadImage(
-        id: String,
-        ownerKey: String,
-        originalPhoto: File,
-        editedPhoto: File
-    ): HttpResponse {
+    suspend fun uploadImage(ownerKey: String, originalPhoto: File, editedPhoto: File): HttpResponse {
         val origB = originalPhoto.readBytes()
         val editB = editedPhoto.readBytes()
         println(origB.size)
@@ -49,14 +44,11 @@ class BackendClient {
                 append("x-instant-key", API_KEY)
             }
             setBody(
-                MultiPartFormDataContent(
-                    formData {
-                        append("id", id)
-                        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) }
-                    }
-                )
+                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) }
+                })
             )
             timeout { HttpTimeoutConfig(1 * 60 * 1000L) }
         }