[miio] avoid Invalid URI host: null error (#8867)

* [miio] avoid Invalid URI host: null error

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
index 731b3d86ea54fb2f58fc24ef8f4ab3d9246e0bf3..e3660dada0e203b8640c6b279da3b8f57dff550a 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java
@@ -137,14 +137,22 @@ public class CloudConnector {
             mapCountry = country.trim().toLowerCase();
             mapUrl = cl.getMapUrl(mapId, mapCountry);
         }
-        @Nullable
-        RawType mapData = HttpUtil.downloadData(mapUrl, null, false, -1);
-        if (mapData != null) {
-            return mapData;
-        } else {
-            logger.debug("Could not download '{}'", mapUrl);
+        if (mapUrl.isBlank()) {
+            logger.debug("Cannot download map data: Returned map URL is empty");
             return null;
         }
+        try {
+            RawType mapData = HttpUtil.downloadData(mapUrl, null, false, -1);
+            if (mapData != null) {
+                return mapData;
+            } else {
+                logger.debug("Could not download '{}'", mapUrl);
+                return null;
+            }
+        } catch (IllegalArgumentException e) {
+            logger.debug("Error downloading map: {}", e.getMessage());
+        }
+        return null;
     }
 
     public void setCredentials(@Nullable String username, @Nullable String password, @Nullable String country) {

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
index 0e446b6a73c48207a46fff19a46092a6e5644ac0..085542f11ae4314b3409a7c80481f53359f3a0f7 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java
@@ -160,7 +160,8 @@ public class MiCloudConnector {
             if (response.getAsJsonObject().has("result") && response.getAsJsonObject().get("result").isJsonObject()) {
                 JsonObject jo = response.getAsJsonObject().get("result").getAsJsonObject();
                 if (jo.has("url")) {
-                    return jo.get("url").getAsString();
+                    String mapUrl = jo.get("url").getAsString();
+                    return mapUrl != null ? mapUrl : "";
                 } else {
                     errorMsg = "Could not get url";
                 }