openharmony/account_os_account
1
0
Fork 0
mirror of https://gitee.com/openharmony/account_os_account synced 2024-11-26 19:50:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2206 [cj] fix bugs for distributedAccount

Browse Source 
Merge pull request !2206 from 梁俊（昏睡之萨满）/master
This commit is contained in:
openharmony_ci 2024-10-26 08:02:39 +00:00 committed by Gitee
commit 75692770ce
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frameworks/cj/distributed_account/src/cj_distributed_account.cpp
View File

@ -18,19 +18,26 @@
namespace OHOS {
namespace AccountSA {
char *convertStrToChar(std::string str)
char *MallocCString(const std::string &origin)
{
static char *res = const_cast<char *>(str.c_str());
return res;
if (origin.empty()) {
return nullptr;
}
auto len = origin.length() + 1;
char *res = static_cast<char *>(malloc(sizeof(char) * len));
if (res == nullptr) {
return nullptr;
}
return std::char_traits<char>::copy(res, origin.c_str(), len);
}
RetDistributedInfo convertToRet(AccountSA::OhosAccountInfo ohosInfo)
{
RetDistributedInfo retInfo{0};
retInfo.name = convertStrToChar(ohosInfo.name_);
retInfo.id = convertStrToChar(ohosInfo.uid_);
retInfo.nickname = convertStrToChar(ohosInfo.nickname_);
retInfo.avatar = convertStrToChar(ohosInfo.avatar_);
retInfo.name = MallocCString(ohosInfo.name_);
retInfo.id = MallocCString(ohosInfo.uid_);
retInfo.nickname = MallocCString(ohosInfo.nickname_);
retInfo.avatar = MallocCString(ohosInfo.avatar_);
retInfo.status = ohosInfo.status_;
return retInfo;
}
@ -55,7 +62,7 @@ extern "C"
if (errCode == nullptr) {
return convertToRet(ohosAccountInfo);
}
*errCode = OhosAccountKits::GetInstance().GetOhosAccountInfo(ohosAccountInfo);
*errCode = ConvertToJSErrCode(OhosAccountKits::GetInstance().GetOhosAccountInfo(ohosAccountInfo));
return convertToRet(ohosAccountInfo);
}
@ -65,7 +72,8 @@ extern "C"
if (errCode == nullptr) {
return;
}
*errCode = OhosAccountKits::GetInstance().SetOhosAccountInfo(ohosAccountInfo, retInfo.event);
*errCode = ConvertToJSErrCode(
OhosAccountKits::GetInstance().SetOhosAccountInfo(ohosAccountInfo, retInfo.event));
}
}
} // namespace AccountSA