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(groups): avoid having to lookup peer pk

Browse Source 
Caused race where peer plays audio, then is removed from group, then we
process audio played signal and lookup their peerId in core where it
doesn't exist. Now Group will effectively contain the peer until the
peer list changed slot is processed.

Partial fix for #5511
This commit is contained in:
Anthony Bilinski 2019-01-29 02:43:49 -08:00
parent 013771c13a
commit 13afbf7ec6
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
7 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.cpp
View File

@ -1175,10 +1175,10 @@ QString Core::getGroupPeerName(int groupId, int peerId) const
QByteArray name(length, Qt::Uninitialized);
uint8_t* namePtr = reinterpret_cast<uint8_t*>(name.data());
bool success = tox_conference_peer_get_name(tox.get(), groupId, peerId, namePtr, &error);
if (!parsePeerQueryError(error) || !success) {
qWarning() << "getGroupPeerName: Unknown error";
if (!parsePeerQueryError(error)) {
return QString{};
}
assert(success);
return ToxString(name).getQString();
}
@ -1193,10 +1193,10 @@ ToxPk Core::getGroupPeerPk(int groupId, int peerId) const
uint8_t friendPk[TOX_PUBLIC_KEY_SIZE] = {0x00};
Tox_Err_Conference_Peer_Query error;
bool success = tox_conference_peer_get_public_key(tox.get(), groupId, peerId, friendPk, &error);
if (!parsePeerQueryError(error) || !success) {
qWarning() << "getGroupPeerToxId: Unknown error";
if (!parsePeerQueryError(error)) {
return ToxPk{};
}
assert(success);
return ToxPk(friendPk);
}

2
src/core/core.h
View File

@ -199,7 +199,7 @@ signals:
void groupPeerlistChanged(int groupnumber);
void groupPeerNameChanged(int groupnumber, int peernumber, const QString& newName);
void groupTitleChanged(int groupnumber, const QString& author, const QString& title);
void groupPeerAudioPlaying(int groupnumber, int peernumber);
void groupPeerAudioPlaying(int groupnumber, ToxPk peerPk);
void groupSentFailed(int groupId);
void actionSentResult(uint32_t friendId, const QString& action, int success);

2
src/core/coreav.cpp
View File

@ -485,7 +485,7 @@ void CoreAV::groupCallCallback(void* tox, uint32_t group, uint32_t peer, const i
return;
}
emit c->groupPeerAudioPlaying(group, peer);
emit c->groupPeerAudioPlaying(group, peerPk);
CoreAV* cav = c->getAv();

13
src/model/group.cpp
View File

@ -82,19 +82,6 @@ QString Group::getDisplayedName() const
return getName();
}
/**
* @brief performs a peerId to ToxPk lookup
* @param peerId peerId to lookup
* @return ToxPk if peerId found
* @note should not be used, reference peers by their ToxPk instead
* @todo remove this function
*/
const ToxPk Group::resolvePeerId(int peerId) const
{
const Core* core = Core::getInstance();
return core->getGroupPeerPk(groupId, peerId);
}
void Group::regeneratePeerList()
{
const Core* core = Core::getInstance();

2
src/model/group.h
View File

@ -53,8 +53,6 @@ public:
void setTitle(const QString& author, const QString& newTitle);
QString getName() const;
QString getDisplayedName() const override;
const ToxPk resolvePeerId(int peerId) const;
QString resolveToxId(const ToxPk& id) const;
void setSelfName(const QString& name);
QString getSelfName() const;

4
src/widget/widget.cpp
View File

@ -1810,7 +1810,7 @@ void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const Q
widget->searchName(ui->searchContactText->text(), filterGroups(filter));
}
void Widget::onGroupPeerAudioPlaying(int groupnumber, int peernumber)
void Widget::onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk)
{
Group* g = GroupList::findGroup(groupnumber);
if (!g) {
@ -1819,7 +1819,7 @@ void Widget::onGroupPeerAudioPlaying(int groupnumber, int peernumber)
auto form = groupChatForms[g->getId()].data();
// TODO(sudden6): switch to ToxPk here
form->peerAudioPlaying(g->resolvePeerId(peernumber));
form->peerAudioPlaying(peerPk);
}
void Widget::removeGroup(Group* g, bool fake)

2
src/widget/widget.h
View File

@ -175,7 +175,7 @@ public slots:
void onGroupPeerlistChanged(int groupnumber);
void onGroupPeerNameChanged(int groupnumber, int peernumber, const QString& newName);
void onGroupTitleChanged(int groupnumber, const QString& author, const QString& title);
void onGroupPeerAudioPlaying(int groupnumber, int peernumber);
void onGroupPeerAudioPlaying(int groupnumber, ToxPk peerPk);
void onGroupSendFailed(int groupId);
void onFriendTypingChanged(int friendId, bool isTyping);
void nextContact();