From 8d29f9762c7bf70953550e46555cbbec778efe6a Mon Sep 17 00:00:00 2001 From: Bernd Weymann Date: Thu, 30 Jan 2025 18:14:15 +0100 Subject: [PATCH 1/3] version update Signed-off-by: Bernd Weymann --- .../binding/mercedesme/internal/Constants.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/Constants.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/Constants.java index f8944871055c7..575a767cc1a01 100644 --- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/Constants.java +++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/Constants.java @@ -322,12 +322,12 @@ public class Constants { public static final String WEBSOCKET_USER_AGENT_CN = "MyStarCN/1.27.0 (com.daimler.ris.mercedesme.cn.ios; build:1758; iOS 16.3.1) Alamofire/5.4.0"; public static final String WEBSOCKET_USER_AGENT_PA = "mycar-store-ap v1.27.0, android 8.0.0, SDK 2.84.3"; - public static final String RIS_APPLICATION_VERSION_NA = "3.40.0"; - public static final String RIS_APPLICATION_VERSION_CN = "1.39.0"; - public static final String RIS_APPLICATION_VERSION_PA = "1.40.0"; - public static final String RIS_APPLICATION_VERSION = "1.42.0 (2168)"; - public static final String RIS_SDK_VERSION = "2.114.0"; - public static final String RIS_SDK_VERSION_CN = "2.109.2"; + public static final String RIS_APPLICATION_VERSION_NA = "3.51.0"; + public static final String RIS_APPLICATION_VERSION_CN = "1.51.0"; + public static final String RIS_APPLICATION_VERSION_PA = "1.51.0"; + public static final String RIS_APPLICATION_VERSION = "1.51.0"; + public static final String RIS_SDK_VERSION = "2.132.2"; + public static final String RIS_SDK_VERSION_CN = "2.132.2"; public static final String RIS_OS_VERSION = "17.4.1"; public static final String RIS_OS_NAME = "ios"; public static final String X_APPLICATIONNAME = "mycar-store-ece"; From 817e13cb6d23bc14514e72c1f3bf1d3357177cf9 Mon Sep 17 00:00:00 2001 From: Bernd Weymann Date: Fri, 31 Jan 2025 09:41:24 +0100 Subject: [PATCH 2/3] add catching JSONException Signed-off-by: Bernd Weymann --- .../binding/mercedesme/internal/handler/AccountHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java index 01d324dd2a869..ca46ce7f27208 100644 --- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java +++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java @@ -521,7 +521,7 @@ private Map getCapabilities(String vin) { // store in cache capabilitiesMap.put(vin, featureMap); return featureMap; - } catch (InterruptedException | TimeoutException | ExecutionException e) { + } catch (InterruptedException | TimeoutException | ExecutionException | JSONException e) { logger.trace("Error retrieving capabilities: {}", e.getMessage()); featureMap.clear(); } From 92c7f2ee6ac7e71ae8a8770c2cfd1da785c4ccc0 Mon Sep 17 00:00:00 2001 From: Bernd Weymann Date: Fri, 31 Jan 2025 10:18:06 +0100 Subject: [PATCH 3/3] add catching JSONException Signed-off-by: Bernd Weymann --- .../binding/mercedesme/internal/handler/AccountHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java index ca46ce7f27208..8e7e0f123124d 100644 --- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java +++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java @@ -33,6 +33,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.json.JSONArray; +import org.json.JSONException; import org.json.JSONObject; import org.openhab.binding.mercedesme.internal.Constants; import org.openhab.binding.mercedesme.internal.config.AccountConfiguration;