Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mercedesme] bugfix auth problem causing http 412 error #18208

Merged
merged 3 commits into from
Feb 2, 2025
Merged

[mercedesme] bugfix auth problem causing http 412 error #18208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d29f97
version update
weymann Jan 30, 2025
817e13c
add catching JSONException
weymann Jan 31, 2025
92c7f2e
add catching JSONException
weymann Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...b.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion ...cedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/AccountHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -521,7 +522,7 @@ private Map<String, Object> 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();
}
Expand Down