ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors in api calls, move base url to gradle properties

Browse Source
This commit is contained in:
Reimar 2025-04-30 12:31:54 +02:00
parent 0f791cc642
commit dfa9abc4b9
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app/build.gradle.kts
View File

@ -19,7 +19,7 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" 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 { buildTypes {

1
app/app/gradle.properties Normal file
View File

@ -0,0 +1 @@
API_BASE_URL="https://easyeat.mercantec.tech"

5
app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt
View File

@ -31,7 +31,10 @@ class RegisterActivity : AppCompatActivity() {
try { try {
register(email, username, password) register(email, username, password)
} catch (e: ApiRequestException) { } catch (e: ApiRequestException) {
Toast.makeText(this, e.message, Toast.LENGTH_LONG).show() runOnUiThread {
Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
}
return@thread return@thread
} }

4
app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
View File

@ -59,6 +59,8 @@ inline fun <reified Req, reified Res> requestJson(method: String, path: String,
throw ApiRequestException(error.message, null) throw ApiRequestException(error.message, null)
} catch (e: SerializationException) { } catch (e: SerializationException) {
if (e.message != null)
Log.e("EasyEat", e.message!!)
Log.e("EasyEat", response.body) Log.e("EasyEat", response.body)
throw ApiRequestException("Request failed with HTTP status code ${response.code}", e) 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 { try {
return Json.decodeFromString<Res>(response.body) return Json.decodeFromString<Res>(response.body)
} catch (e: SerializationException) { } catch (e: SerializationException) {
if (e.message != null)
Log.e("EasyEat", e.message!!)
Log.e("EasyEat", response.body) Log.e("EasyEat", response.body)
throw ApiRequestException("Failed to parse response: $response", e) throw ApiRequestException("Failed to parse response: $response", e)

2
app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
View File

@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
data class LoginRequest(val emailUsr: String, val password: String) data class LoginRequest(val emailUsr: String, val password: String)
@Serializable @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) { fun login(email: String, password: String) {
val request = LoginRequest(email, password) val request = LoginRequest(email, password)