From 3f5886ef4ada6fdd8b70a9258cb84d5015527c45 Mon Sep 17 00:00:00 2001
From: Daniel Svitan <daniel.svitan.team7274dev@gmail.com>
Date: Sat, 17 May 2025 11:15:40 +0200
Subject: [PATCH] :bug: Fixes ktor fetch not working

---
 frontend/app/build.gradle.kts                 |  4 ++-
 frontend/app/src/main/AndroidManifest.xml     |  1 +
 .../java/dev/svitan/antifed/AuthActivity.kt   | 29 ++++++++++++++-----
 frontend/gradle/libs.versions.toml            |  8 ++++-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/frontend/app/build.gradle.kts b/frontend/app/build.gradle.kts
index 575ce8c..0116533 100644
--- a/frontend/app/build.gradle.kts
+++ b/frontend/app/build.gradle.kts
@@ -52,7 +52,9 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.ktor.client.core)
-    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.client.android)
+    implementation(libs.ktor.client.content.negotiation)
+    implementation(libs.ktor.serialization.kotlinx.json)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/frontend/app/src/main/AndroidManifest.xml b/frontend/app/src/main/AndroidManifest.xml
index a2be4c3..f583f25 100644
--- a/frontend/app/src/main/AndroidManifest.xml
+++ b/frontend/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
diff --git a/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt b/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
index d8b54c6..a60de65 100644
--- a/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
+++ b/frontend/app/src/main/java/dev/svitan/antifed/AuthActivity.kt
@@ -34,6 +34,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import dev.svitan.antifed.ui.theme.AntiFedTheme
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.android.Android
+import io.ktor.client.request.get
+import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -45,8 +49,9 @@ class AuthActivity : ComponentActivity() {
             AntiFedTheme {
                 var serverUrl by remember { mutableStateOf("") }
                 var checkingUrl by remember { mutableStateOf(false) }
+                var isServerUrlOk by remember { mutableStateOf(false) }
 
-                fun isServerUrlOkay(): Boolean {
+                fun serverUrlMatches(): Boolean {
                     var re = Regex(
                         "(?:http[s]?:\\/\\/.)?(?:www\\.)?[-a-zA-Z0-9@%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b(?:[-a-zA-Z0-9@:%_\\+.~#?&\\/\\/=]*)",
                         RegexOption.DOT_MATCHES_ALL
@@ -55,15 +60,23 @@ class AuthActivity : ComponentActivity() {
                 }
 
                 LaunchedEffect(serverUrl) {
-                    if (serverUrl.isBlank()) return@LaunchedEffect
-                    if (!isServerUrlOkay()) return@LaunchedEffect
+                    if (serverUrl.isBlank()) {
+                        isServerUrlOk = false
+                        return@LaunchedEffect
+                    }
+                    if (!serverUrlMatches()) {
+                        isServerUrlOk = false
+                        return@LaunchedEffect
+                    }
 
-                    checkingUrl = true
                     delay(1000)
-//                    val client = HttpClient(CIO)
-//                    val response = client.get(serverUrl)
-//                    println(response.status)
+                    checkingUrl = true
+
+                    val client = HttpClient(Android)
+                    val response = client.get(serverUrl)
+
                     checkingUrl = false
+                    isServerUrlOk = response.status == HttpStatusCode.OK
                 }
 
                 Scaffold(
@@ -103,7 +116,7 @@ class AuthActivity : ComponentActivity() {
                             onValueChange = { serverUrl = it },
                             label = { Text(stringResource(R.string.server_url)) },
                             singleLine = true,
-                            isError = !isServerUrlOkay(),
+                            isError = !isServerUrlOk,
                             trailingIcon = {
                                 if (checkingUrl)
                                     CircularProgressIndicator(
diff --git a/frontend/gradle/libs.versions.toml b/frontend/gradle/libs.versions.toml
index b6deff7..c4bee55 100644
--- a/frontend/gradle/libs.versions.toml
+++ b/frontend/gradle/libs.versions.toml
@@ -13,6 +13,9 @@ material = "1.10.0"
 activity = "1.10.1"
 ktorClientCore = "3.1.3"
 ktorClientCio = "3.1.3"
+ktorClientAndroid = "3.1.3"
+ktorClientContentNegotiation = "3.1.3"
+ktorSerializationKotlinxJson = "3.1.3"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.16.0" }
@@ -26,7 +29,7 @@ androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version = "1.8.1" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
@@ -34,6 +37,9 @@ material = { group = "com.google.android.material", name = "material", version =
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktorClientCore" }
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorClientCio" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktorClientAndroid" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktorClientContentNegotiation" }
+ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktorSerializationKotlinxJson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }