From dfa9abc4b93a42a17e3a298a5145fd411d70307a Mon Sep 17 00:00:00 2001
From: Reimar <mail@reim.ar>
Date: Wed, 30 Apr 2025 12:31:54 +0200
Subject: [PATCH] Fix errors in api calls, move base url to gradle properties

---
 app/app/build.gradle.kts                                     | 2 +-
 app/app/gradle.properties                                    | 1 +
 .../src/main/java/tech/mercantec/easyeat/RegisterActivity.kt | 5 ++++-
 app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt  | 4 ++++
 app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 app/app/gradle.properties

diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index 14fe66a..b51531c 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -19,7 +19,7 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        buildConfigField("String", "API_BASE_URL", gradleLocalProperties(projectDir, providers).getProperty("API_BASE_URL"))
+        buildConfigField("String", "API_BASE_URL", project.property("API_BASE_URL").toString())
     }
 
     buildTypes {
diff --git a/app/app/gradle.properties b/app/app/gradle.properties
new file mode 100644
index 0000000..7cf66d1
--- /dev/null
+++ b/app/app/gradle.properties
@@ -0,0 +1 @@
+API_BASE_URL="https://easyeat.mercantec.tech"
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt
index dcb4568..1b3eec9 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt
@@ -31,7 +31,10 @@ class RegisterActivity : AppCompatActivity() {
                 try {
                     register(email, username, password)
                 } catch (e: ApiRequestException) {
-                    Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
+                    runOnUiThread {
+                        Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
+                    }
+
                     return@thread
                 }
 
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
index 6df021f..0adb879 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
@@ -59,6 +59,8 @@ inline fun <reified Req, reified Res> requestJson(method: String, path: String,
 
             throw ApiRequestException(error.message, null)
         } catch (e: SerializationException) {
+            if (e.message != null)
+                Log.e("EasyEat", e.message!!)
             Log.e("EasyEat", response.body)
 
             throw ApiRequestException("Request failed with HTTP status code ${response.code}", e)
@@ -68,6 +70,8 @@ inline fun <reified Req, reified Res> requestJson(method: String, path: String,
     try {
         return Json.decodeFromString<Res>(response.body)
     } catch (e: SerializationException) {
+        if (e.message != null)
+            Log.e("EasyEat", e.message!!)
         Log.e("EasyEat", response.body)
 
         throw ApiRequestException("Failed to parse response: $response", e)
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
index 12b2b29..0467bc4 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 data class LoginRequest(val emailUsr: String, val password: String)
 
 @Serializable
-data class LoginResponse(val token: String, val username: String, val id: Int, val refreshToken: String)
+data class LoginResponse(val token: String, val userName: String, val id: Int, val refreshToken: String)
 
 fun login(email: String, password: String) {
     val request = LoginRequest(email, password)