Merge pull request #5924 from nextcloud/fix/noid/geocodingPolicy

Comply with Nominatim Usage Policy (aka Geocoding Policy)

Author: AndyScherzinger

app/src/main/java/com/nextcloud/talk/location/components/GeocodingScreen.kt

@@ -7,6 +7,7 @@
 package com.nextcloud.talk.location.components
 
 import android.content.res.Configuration
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -18,6 +19,8 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -48,9 +51,11 @@ fun GeocodingScreen(viewModel: GeoCodingViewModel, onBack: () -> Unit, onAddress
         mutableStateOf(TextFieldValue(initialQuery, TextRange(initialQuery.length)))
     }
     val keyboardController = LocalSoftwareKeyboardController.current
+    var autoSearchDone by rememberSaveable { mutableStateOf(false) }
 
     LaunchedEffect(Unit) {
-        if (viewModel.getQuery().isNotEmpty() && results.isEmpty()) {
+        if (!autoSearchDone && viewModel.getQuery().isNotEmpty() && results.isEmpty()) {
+            autoSearchDone = true
             viewModel.searchLocation()
         }
     }
@@ -129,7 +134,8 @@ private fun GeocodingScreenContent(
 @Preview(name = "Dark", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 private fun PreviewGeocodingScreen() {
-    MaterialTheme {
+    val colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()
+    MaterialTheme(colorScheme = colorScheme) {
         GeocodingScreenContent(
             query = TextFieldValue("Berlin", TextRange("Berlin".length)),
             results = listOf(

app/src/main/java/fr/dudie/nominatim/client/TalkJsonNominatimClient.java

@@ -13,6 +13,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nextcloud.talk.utils.ApiUtils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -147,16 +148,22 @@ public List<Address> search(final NominatimSearchRequest search) throws IOExcept
 
         Request requesthttp = new Request.Builder()
                 .addHeader("accept", "application/json")
+                .addHeader("User-Agent", ApiUtils.getUserAgent())
                 .url(apiCall)
                 .build();
 
         Response response = httpClient.newCall(requesthttp).execute();
+        ResponseBody responseBody = response.body();
         if (response.isSuccessful()) {
-            ResponseBody responseBody = response.body();
             if (responseBody != null) {
                 return gson.fromJson(responseBody.string(), new TypeToken<List<Address>>() {
                 }.getType());
             }
+        } else {
+            if (responseBody != null) {
+                Log.w(TAG, "search failed: " + response.code() + " " + responseBody);
+            }
+            Log.w(TAG, "search failed with HTTP-code: " + response.code());
         }
 
         return new ArrayList<>();
@@ -174,16 +181,22 @@ public Address getAddress(final NominatimReverseRequest reverse) throws IOExcept
         Log.d(TAG, "reverse geocoding url: " + apiCall);
 
         Request requesthttp = new Request.Builder()
-                .addHeader("accept", "application/json")
-                .url(apiCall)
-                .build();
+            .addHeader("accept", "application/json")
+            .addHeader("User-Agent", ApiUtils.getUserAgent())
+            .url(apiCall)
+            .build();
 
         Response response = httpClient.newCall(requesthttp).execute();
+        ResponseBody responseBody = response.body();
         if (response.isSuccessful()) {
-            ResponseBody responseBody = response.body();
             if (responseBody != null) {
                 return gson.fromJson(responseBody.string(), Address.class);
             }
+        } else {
+            if (responseBody != null) {
+                Log.w(TAG, "get address failed: " + response.code() + " " + responseBody);
+            }
+            Log.w(TAG, "get address failed with HTTP-code: " + response.code());
         }
 
         return null;
@@ -199,18 +212,25 @@ public List<Address> lookupAddress(final NominatimLookupRequest lookup) throws I
 
         final String apiCall = String.format("%s&%s", lookupUrl, lookup.getQueryString());
         Log.d(TAG, "lookup url: " + apiCall);
+
         Request requesthttp = new Request.Builder()
                 .addHeader("accept", "application/json")
+                .addHeader("User-Agent", ApiUtils.getUserAgent())
                 .url(apiCall)
                 .build();
 
         Response response = httpClient.newCall(requesthttp).execute();
+        ResponseBody responseBody = response.body();
         if (response.isSuccessful()) {
-            ResponseBody responseBody = response.body();
             if (responseBody != null) {
                 return gson.fromJson(responseBody.string(), new TypeToken<List<Address>>() {
                 }.getType());
             }
+        } else {
+            if (responseBody != null) {
+                Log.w(TAG, "address lookup failed: " + response.code() + " " + responseBody);
+            }
+            Log.w(TAG, "address lookup failed with HTTP-code: " + response.code());
         }
 
         return new ArrayList<>();