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

refactor(groups): create Group on group join, assert Group exists on callbacks

Browse Source
This commit is contained in:
Anthony Bilinski 2018-12-06 23:14:52 -08:00
parent 63ef6e3ff4
commit 9b6019390b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/widget/widget.cpp
View File

@ -1749,9 +1749,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int peernumber, const QStri
bool isAction) bool isAction)
{ {
Group* g = GroupList::findGroup(groupnumber); Group* g = GroupList::findGroup(groupnumber);
if (!g) { assert(g);
return;
}
const Core* core = Core::getInstance(); const Core* core = Core::getInstance();
ToxPk author = core->getGroupPeerPk(groupnumber, peernumber); ToxPk author = core->getGroupPeerPk(groupnumber, peernumber);
@ -1780,26 +1778,14 @@ void Widget::onGroupMessageReceived(int groupnumber, int peernumber, const QStri
void Widget::onGroupPeerlistChanged(int groupnumber) void Widget::onGroupPeerlistChanged(int groupnumber)
{ {
Group* g = GroupList::findGroup(groupnumber); Group* g = GroupList::findGroup(groupnumber);
if (!g) { assert(g);
qDebug() << "onGroupNamelistChanged: Group " << groupnumber << " not found, creating it";
g = createGroup(groupnumber);
if (!g) {
return;
}
}
g->regeneratePeerList(); g->regeneratePeerList();
} }
void Widget::onGroupPeerNameChanged(int groupnumber, int peernumber, const QString& newName) void Widget::onGroupPeerNameChanged(int groupnumber, int peernumber, const QString& newName)
{ {
Group* g = GroupList::findGroup(groupnumber); Group* g = GroupList::findGroup(groupnumber);
if (!g) { assert(g);
qDebug() << "onGroupNamelistChanged: Group " << groupnumber << " not found, creating it";
g = createGroup(groupnumber);
if (!g) {
return;
}
}
QString setName = newName; QString setName = newName;
if (newName.isEmpty()) { if (newName.isEmpty()) {
@ -1812,9 +1798,7 @@ void Widget::onGroupPeerNameChanged(int groupnumber, int peernumber, const QStri
void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const QString& title) void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const QString& title)
{ {
Group* g = GroupList::findGroup(groupnumber); Group* g = GroupList::findGroup(groupnumber);
if (!g) { assert(g);
return;
}
GroupWidget* widget = groupWidgets[groupnumber]; GroupWidget* widget = groupWidgets[groupnumber];
if (widget->isActive()) { if (widget->isActive()) {
@ -1829,9 +1813,7 @@ void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const Q
void Widget::onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk) void Widget::onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk)
{ {
Group* g = GroupList::findGroup(groupnumber); Group* g = GroupList::findGroup(groupnumber);
if (!g) { assert(g);
return;
}
auto form = groupChatForms[g->getId()].data(); auto form = groupChatForms[g->getId()].data();
form->peerAudioPlaying(peerPk); form->peerAudioPlaying(peerPk);
@ -2095,9 +2077,7 @@ void Widget::setStatusBusy()
void Widget::onGroupSendFailed(int groupId) void Widget::onGroupSendFailed(int groupId)
{ {
Group* g = GroupList::findGroup(groupId); Group* g = GroupList::findGroup(groupId);
if (!g) { assert(g);
return;
}
const auto message = tr("Message failed to send"); const auto message = tr("Message failed to send");
const auto curTime = QDateTime::currentDateTime(); const auto curTime = QDateTime::currentDateTime();