Skip to content

bug fix: honor customOSType instead of overwriting with platform OS. #215

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

Open
jinanzhuan wants to merge 7 commits into
base: new
Choose a base branch
from
Open

bug fix: honor customOSType instead of overwriting with platform OS. #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d65f69
bug fix: honor customOSType instead of overwriting with platform OS.
jinanzhuan Jul 24, 2026
03bcbd0
Merge remote-tracking branch 'upstream/new' into new
jinanzhuan Jul 24, 2026
f79cbc0
Merge remote-tracking branch 'upstream/new' into new
jinanzhuan Aug 3, 2026
7324e21
fix: align muteList JSON format with agora 1.4.0 (Object + keys extra…
Aug 3, 2026
57ead6a
feat: bump easemob Unity SDK version to 1.4.2
jinanzhuan Aug 14, 2026
17d14fb
fix: align UnityChatDemo mirror with canonical AgoraChat source (line…
jinanzhuan Aug 17, 2026
7f37f64
fix: align Android/iOS wrapper to read customOSType JSON key
jinanzhuan Aug 17, 2026
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
2 changes: 1 addition & 1 deletion AgoraChatSDK/AgoraChat/SDKClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ internal MessageManager MessageManager
* \~english
* The SDK version.
*/
public string SdkVersion { get => "1.4.0"; }
public string SdkVersion { get => "1.4.2"; }


/**
Expand Down
4 changes: 2 additions & 2 deletions ...d/JavaWrapperDemo/wrapper/src/main/java/com/hyphenate/wrapper/helper/EMOptionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public static EMOptions fromJson(JSONObject json, Context context) throws JSONEx
if (json.has("deviceName")) {
options.setCustomDeviceName(json.optString("deviceName"));
}
if (json.has("osType")) {
options.setCustomOSPlatform(json.optInt("osType"));
if (json.has("customOSType")) {
options.setCustomOSPlatform(json.optInt("customOSType"));
}
if (json.has("regardImportMsgAsRead")) {
options.setRegardImportedMsgAsRead(json.optBoolean("regardImportMsgAsRead"));
Expand Down
20 changes: 10 additions & 10 deletions AgoraChatSDK/CWrapper/Wrapper/Wrapper_Common/sdk_wrapper/models.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,13 @@ namespace sdk_wrapper
configs->setUseReplacedMessageContents(use_replaced_message_contents);
}

bool os_custom_set = false;
if (jnode.HasMember("customOSType") && jnode["customOSType"].IsInt()) {
int custom_os_type = jnode["customOSType"].GetInt();
if (-1 != custom_os_type) {
configs->setOs(EMChatConfigs::OSType::OS_CUSTOM);
configs->setOSCustomValue(custom_os_type);
os_custom_set = true;
}
}

Expand All @@ -484,7 +486,9 @@ namespace sdk_wrapper
//TODO: need to Area code later

#ifndef _WIN32
configs->setOs(EMChatConfigs::OS_OSX);
if (!os_custom_set) {
configs->setOs(EMChatConfigs::OS_OSX);
}

string uuid = GetMacUuid();
if (uuid.size() > 0)
Expand All @@ -494,7 +498,9 @@ namespace sdk_wrapper
if (did.size() > 0)
configs->setDid(did);
#else
configs->setOs(EMChatConfigs::OS_MSWIN);
if (!os_custom_set) {
configs->setOs(EMChatConfigs::OS_MSWIN);
}

string did = GetWinDid(false);
if (did.size() > 0)
Expand Down Expand Up @@ -2433,18 +2439,12 @@ namespace sdk_wrapper

void Group::ToJsonObject(Writer<StringBuffer>& writer, const EMMucMuteList& vec)
{
writer.StartArray();

@lixm1988 lixm1988 Aug 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里相当于把输出从数组结构改成了map结构，确定没有问题吗

@jinanzhuan jinanzhuan Aug 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这是从agora 1.4.0 版本合并到new分支后遇到的冲突，然后根据现在对外的结构修改的。这个得测试。

for (const auto& it : vec)
{
writer.String(it.first.c_str());
}
writer.EndArray();
/*writer.StartObject();
writer.StartObject();
for (int i = 0; i < vec.size(); i++) {
writer.Key(vec[i].first.c_str());
writer.Int64(vec[i].second);
}
writer.EndObject();*/
writer.EndObject();
}

void Group::ToJsonObjectWithGroupInfo(Writer<StringBuffer>& writer, EMGroupPtr group)
Expand Down
6 changes: 3 additions & 3 deletions AgoraChatSDK/CWrapper/Wrapper/Wrapper_iOS/wrapper/wrapper/helper/EMOptions+Helper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ - (NSDictionary *)toJson {
data[@"dnsUrl"] = self.dnsURL;
data[@"areaCode"] = @(self.area);
data[@"enableEmptyConversation"] = @(self.loadEmptyConversations);
data[@"osType"] = @(self.customOSType);
data[@"customOSType"] = @(self.customOSType);
data[@"deviceName"] = self.customDeviceName;
data[@"useReplacedMessageContents"] = @(self.useReplacedMessageContents);
data[@"regardImportMsgAsRead"] = @(self.regardImportMessagesAsRead);
Expand Down Expand Up @@ -86,8 +86,8 @@ + (EMOptions *)fromJson:(NSDictionary *)aJson {
options.loadEmptyConversations = [aJson[@"enableEmptyConversation"] boolValue];
}
options.customDeviceName = aJson[@"deviceName"];
if(aJson[@"osType"]) {
options.customOSType = [aJson[@"osType"] intValue];
if(aJson[@"customOSType"]) {
options.customOSType = [aJson[@"customOSType"] intValue];
}

if(aJson[@"useReplacedMessageContents"]) {
Expand Down
2 changes: 1 addition & 1 deletion UnityChatDemo/Assets/AgoraChat/AgoraChat/Models/FetchServerMessagesOption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using AgoraChat.SimpleJSON;
#if !_WIN32
Expand Down
2 changes: 1 addition & 1 deletion UnityChatDemo/Assets/AgoraChat/AgoraChat/Models/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,4 @@ internal override JSONObject ToJsonObject()
return jo;
}
}
}
}
2 changes: 1 addition & 1 deletion UnityChatDemo/Assets/AgoraChat/AgoraChat/SDKClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ internal MessageManager MessageManager
* \~english
* The SDK version.
*/
public string SdkVersion { get => "1.4.0"; }
public string SdkVersion { get => "1.4.2"; }


/**
Expand Down