From b928dd6952c22dc95c8ff351e64101d8b29aedec Mon Sep 17 00:00:00 2001
From: mueller-ma <mueller-ma@users.noreply.github.com>
Date: Mon, 23 Jul 2018 17:19:47 +0200
Subject: [PATCH] Change user agent to "openHAB client for Android" (#945)
* Change user agent to "openHAB client for Android"
Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
* Add test for HttpClient.buildUrl() when relative url starts with slash
Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
---
.../src/main/java/org/openhab/habdroid/util/HttpClient.java | 1 +
.../habdroid/core/connection/DefaultConnectionTest.java | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/mobile/src/main/java/org/openhab/habdroid/util/HttpClient.java b/mobile/src/main/java/org/openhab/habdroid/util/HttpClient.java
index ce953188..1e4d8582 100644
--- a/mobile/src/main/java/org/openhab/habdroid/util/HttpClient.java
+++ b/mobile/src/main/java/org/openhab/habdroid/util/HttpClient.java
@@ -63,6 +63,7 @@ public abstract class HttpClient {
long timeoutMillis, CachingMode caching) {
Request.Builder requestBuilder = new Request.Builder();
requestBuilder.url(buildUrl(url));
+ requestBuilder.addHeader("User-Agent", "openHAB client for Android");
if (mAuthHeader != null) {
requestBuilder.addHeader("Authorization", mAuthHeader);
}
diff --git a/mobile/src/test/java/org/openhab/habdroid/core/connection/DefaultConnectionTest.java b/mobile/src/test/java/org/openhab/habdroid/core/connection/DefaultConnectionTest.java
index b9b4040a..bbf789e5 100644
--- a/mobile/src/test/java/org/openhab/habdroid/core/connection/DefaultConnectionTest.java
+++ b/mobile/src/test/java/org/openhab/habdroid/core/connection/DefaultConnectionTest.java
@@ -130,6 +130,10 @@ public class DefaultConnectionTest {
assertFalse("The request should never succeed in tests", result.isSuccessful());
assertEquals(TEST_BASE_URL + "/rest/test", result.request.url().toString());
result.close();
+
+ result = testConnection.getSyncHttpClient().get("/rest/test");
+ assertEquals(TEST_BASE_URL + "/rest/test", result.request.url().toString());
+ result.close();
}
@Test
--
GitLab