StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(group): set default group chat title when provided title is invalid

Browse Source 
Add handling logic for when a group exists but has an invalid title.
Title is created using the first 8 hexadecimals of the group chat id.
This commit is contained in:
jenli669 2019-06-12 15:58:37 +02:00
parent 6523ecc511
commit f77a062120
No known key found for this signature in database
GPG Key ID: 8267F9F7C2BF7E5E
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/core.cpp
View File

@ -1026,26 +1026,37 @@ void Core::loadGroups()
return; return;
} }
uint32_t* groupIds = new uint32_t[groupCount]; auto groupNumbers = new uint32_t[groupCount];
tox_conference_get_chatlist(tox.get(), groupIds); tox_conference_get_chatlist(tox.get(), groupNumbers);
for(size_t i = 0; i < groupCount; ++i) { for(size_t i = 0; i < groupCount; ++i) {
TOX_ERR_CONFERENCE_TITLE error; TOX_ERR_CONFERENCE_TITLE error;
const auto groupId = static_cast<int>(groupIds[i]); QByteArray nameByteArray;
size_t titleSize = tox_conference_get_title_size(tox.get(), groupId, &error); QString name;
if (LogConferenceTitleError(error)) { bool invalidTitle;
const auto groupNumber = groupNumbers[i];
size_t titleSize = tox_conference_get_title_size(tox.get(), groupNumber, &error);
invalidTitle = LogConferenceTitleError(error);
if (!invalidTitle)
{
nameByteArray = QByteArray(static_cast<int>(titleSize), Qt::Uninitialized);
tox_conference_get_title(tox.get(), groupNumber, reinterpret_cast<uint8_t*>(nameByteArray.data()), &error);
invalidTitle = LogConferenceTitleError(error);
}
if (error == TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND)
continue; continue;
if (invalidTitle)
{
name = tr("Groupchat %1").arg(getGroupPersistentId(groupNumber).toString().left(8));
} else {
name = ToxString(nameByteArray).getQString();
} }
QByteArray name(titleSize, Qt::Uninitialized); emit emptyGroupCreated(groupNumber, getGroupPersistentId(groupNumber), name);
if (!tox_conference_get_title(tox.get(), groupId, reinterpret_cast<uint8_t*>(name.data()), &error))
if (LogConferenceTitleError(error)) {
continue;
}
emit emptyGroupCreated(groupId, getGroupPersistentId(groupId), ToxString(name).getQString());
} }
delete[] groupIds; delete[] groupNumbers;
} }
void Core::checkLastOnline(uint32_t friendId) void Core::checkLastOnline(uint32_t friendId)