fix: viewport loading and state info

android/app/src/main/java/com/neph/core/network/JsonHttpClient.kt

@@ -7,6 +7,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.net.HttpURLConnection
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.net.UnknownHostException
 
@@ -19,12 +20,17 @@ object JsonHttpClient {
         method: String = "GET",
         body: JSONObject? = null,
         token: String? = null,
-        headers: Map<String, String> = emptyMap()
+        headers: Map<String, String> = emptyMap(),
+        connectTimeoutMillis: Int = ConnectTimeoutMillis,
+        readTimeoutMillis: Int = ReadTimeoutMillis,
+        timeoutMessage: String = "Something went wrong while connecting to the server. Please try again.",
+        timeoutStatus: Int = 0,
+        timeoutCode: String = "NETWORK_ERROR"
     ): JSONObject = withContext(Dispatchers.IO) {
         val connection = (URL(buildUrl(path)).openConnection() as HttpURLConnection).apply {
             requestMethod = method
-            connectTimeout = ConnectTimeoutMillis
-            readTimeout = ReadTimeoutMillis
+            connectTimeout = connectTimeoutMillis
+            readTimeout = readTimeoutMillis
             doInput = true
             setRequestProperty("Accept", "application/json")
 
@@ -75,6 +81,12 @@ object JsonHttpClient {
             }
         } catch (error: ApiException) {
             throw error
+        } catch (_: SocketTimeoutException) {
+            throw ApiException(
+                message = timeoutMessage,
+                status = timeoutStatus,
+                code = timeoutCode
+            )
         } catch (_: UnknownHostException) {
             throw ApiException(
                 message = "Something went wrong while connecting to the server. Please try again.",

android/app/src/main/java/com/neph/features/gatheringareas/data/GatheringAreasRepository.kt

@@ -53,7 +53,10 @@ object GatheringAreasRepository {
     internal const val DefaultLimit = 50
     private const val MaxRadiusMeters = 10000
     private const val MaxLimit = 50
-    private const val NearbyRequestTimeoutMillis = 8000L
+    private const val NearbyRequestTimeoutMillis = 12_000L
+    private const val NearbyRequestHttpTimeoutMillis = 12_000
+    private const val NearbyRequestTimeoutMessage = "Gathering areas request timed out."
+    private const val NearbyRequestTimeoutCode = "OVERPASS_TIMEOUT"
     private const val DebugLogTag = "GatheringAreasRepo"
 
     suspend fun fetchNearbyGatheringAreas(
@@ -74,12 +77,17 @@ object GatheringAreasRepository {
                     longitude,
                     normalizedRadius,
                     normalizedLimit
-                )
+                ),
+                connectTimeoutMillis = NearbyRequestHttpTimeoutMillis,
+                readTimeoutMillis = NearbyRequestHttpTimeoutMillis,
+                timeoutMessage = NearbyRequestTimeoutMessage,
+                timeoutStatus = 504,
+                timeoutCode = NearbyRequestTimeoutCode
             )
         } ?: throw ApiException(
-            message = "Gathering areas request timed out.",
+            message = NearbyRequestTimeoutMessage,
             status = 504,
-            code = "OVERPASS_TIMEOUT"
+            code = NearbyRequestTimeoutCode
         )
 
         return parseNearbyGatheringAreasResponse(
@@ -105,12 +113,17 @@ object GatheringAreasRepository {
 
         val response = withTimeoutOrNull(NearbyRequestTimeoutMillis) {
             JsonHttpClient.request(
-                path = "/gathering-areas/viewport?bbox=${urlEncode(bbox)}&limit=$normalizedLimit"
+                path = "/gathering-areas/viewport?bbox=${urlEncode(bbox)}&limit=$normalizedLimit",
+                connectTimeoutMillis = NearbyRequestHttpTimeoutMillis,
+                readTimeoutMillis = NearbyRequestHttpTimeoutMillis,
+                timeoutMessage = NearbyRequestTimeoutMessage,
+                timeoutStatus = 504,
+                timeoutCode = NearbyRequestTimeoutCode
             )
         } ?: throw ApiException(
-            message = "Gathering areas request timed out.",
+            message = NearbyRequestTimeoutMessage,
             status = 504,
-            code = "OVERPASS_TIMEOUT"
+            code = NearbyRequestTimeoutCode
         )
 
         val parsed = parseNearbyGatheringAreasResponse(