mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-16 02:19:34 -04:00
added the new token service in this file
This commit is contained in:
parent
685cc29415
commit
5433e85323
1 changed files with 126 additions and 62 deletions
|
@ -25,6 +25,7 @@
|
||||||
#include "gui/gxs/GxsIdDetails.h"
|
#include "gui/gxs/GxsIdDetails.h"
|
||||||
#include "gui/common/FilesDefs.h"
|
#include "gui/common/FilesDefs.h"
|
||||||
#include "util/misc.h"
|
#include "util/misc.h"
|
||||||
|
#include "util/qtthreadsutils.h"
|
||||||
|
|
||||||
#include "PulseAddDialog.h"
|
#include "PulseAddDialog.h"
|
||||||
|
|
||||||
|
@ -98,11 +99,32 @@ void PulseAddDialog::setGroup(RsWireGroup &group)
|
||||||
// set ReplyWith Group.
|
// set ReplyWith Group.
|
||||||
void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
|
void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
|
||||||
{
|
{
|
||||||
/* fetch in the background */
|
if(grpId.isNull()){
|
||||||
RsWireGroupSPtr pGroup;
|
return;
|
||||||
rsWire->getWireGroup(grpId, pGroup);
|
}
|
||||||
|
|
||||||
setGroup(*pGroup);
|
RsWireGroupSPtr pGroup;
|
||||||
|
|
||||||
|
RsThread::async([this,grpId,&pGroup](){
|
||||||
|
|
||||||
|
if(!rsWire->getWireGroup(grpId,pGroup))
|
||||||
|
{
|
||||||
|
std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve wire group info for wire id: " << grpId << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RsQThreadUtils::postToObject( [pGroup,this]()
|
||||||
|
{
|
||||||
|
/* Here it goes any code you want to be executed on the Qt Gui
|
||||||
|
* thread, for example to update the data model with new information
|
||||||
|
* after a blocking call to RetroShare API complete, note that
|
||||||
|
* Qt::QueuedConnection is important!
|
||||||
|
*/
|
||||||
|
|
||||||
|
setGroup(*pGroup);
|
||||||
|
}, this );
|
||||||
|
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void PulseAddDialog::cleanup()
|
void PulseAddDialog::cleanup()
|
||||||
|
@ -234,30 +256,46 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
|
||||||
|
|
||||||
void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId, uint32_t replyType)
|
void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId, uint32_t replyType)
|
||||||
{
|
{
|
||||||
|
if(grpId.isNull()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
/* fetch in the background */
|
/* fetch in the background */
|
||||||
RsWireGroupSPtr pGroup;
|
RsWireGroupSPtr pGroup;
|
||||||
if (!rsWire->getWireGroup(grpId, pGroup))
|
RsWirePulseSPtr pPulse;
|
||||||
{
|
|
||||||
std::cerr << "PulseAddDialog::setRplyTo() failed to fetch group";
|
|
||||||
std::cerr << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
RsWirePulseSPtr pPulse;
|
RsThread::async([this,grpId,&pGroup,&pPulse,msgId,replyType](){
|
||||||
if (!rsWire->getWirePulse(grpId, msgId, pPulse))
|
|
||||||
{
|
|
||||||
std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse";
|
|
||||||
std::cerr << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// update GroupPtr
|
if(!rsWire->getWireGroup(grpId,pGroup))
|
||||||
// TODO - this should be handled in libretroshare if possible.
|
{
|
||||||
if (pPulse->mGroupPtr == NULL) {
|
std::cerr << __PRETTY_FUNCTION__ << "PulseAddDialog::setRplyTo() failed to fetch group id: " << grpId << std::endl;
|
||||||
pPulse->mGroupPtr = pGroup;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!rsWire->getWirePulse(grpId, msgId, pPulse))
|
||||||
|
{
|
||||||
|
std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse of group id: " << grpId << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// update GroupPtr
|
||||||
|
// TODO - this should be handled in libretroshare if possible.
|
||||||
|
if (pPulse->mGroupPtr == NULL) {
|
||||||
|
pPulse->mGroupPtr = pGroup;
|
||||||
|
}
|
||||||
|
|
||||||
|
RsQThreadUtils::postToObject( [pGroup,this,pPulse,replyType]()
|
||||||
|
{
|
||||||
|
/* Here it goes any code you want to be executed on the Qt Gui
|
||||||
|
* thread, for example to update the data model with new information
|
||||||
|
* after a blocking call to RetroShare API complete, note that
|
||||||
|
* Qt::QueuedConnection is important!
|
||||||
|
*/
|
||||||
|
|
||||||
|
setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
|
||||||
|
}, this );
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PulseAddDialog::addURL()
|
void PulseAddDialog::addURL()
|
||||||
|
@ -307,26 +345,39 @@ void PulseAddDialog::postOriginalPulse()
|
||||||
std::cerr << "PulseAddDialog::postOriginalPulse()";
|
std::cerr << "PulseAddDialog::postOriginalPulse()";
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
|
|
||||||
RsWirePulseSPtr pPulse(new RsWirePulse());
|
RsWirePulseSPtr pPulse;
|
||||||
|
|
||||||
pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
|
pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
|
||||||
pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
|
pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
|
||||||
// set images here too.
|
// set images here too.
|
||||||
pPulse->mImage1 = mImage1;
|
pPulse->mImage1 = mImage1;
|
||||||
pPulse->mImage2 = mImage2;
|
pPulse->mImage2 = mImage2;
|
||||||
pPulse->mImage3 = mImage3;
|
pPulse->mImage3 = mImage3;
|
||||||
pPulse->mImage4 = mImage4;
|
pPulse->mImage4 = mImage4;
|
||||||
|
|
||||||
// this should be in async thread, so doesn't block UI thread.
|
RsThread::async([this,pPulse](){
|
||||||
if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
|
|
||||||
{
|
if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
|
||||||
std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
|
{
|
||||||
std::cerr << std::endl;
|
std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
|
||||||
return;
|
std::cerr << std::endl;
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RsQThreadUtils::postToObject( [this]()
|
||||||
|
{
|
||||||
|
/* Here it goes any code you want to be executed on the Qt Gui
|
||||||
|
* thread, for example to update the data model with new information
|
||||||
|
* after a blocking call to RetroShare API complete, note that
|
||||||
|
* Qt::QueuedConnection is important!
|
||||||
|
*/
|
||||||
|
|
||||||
|
clearDialog();
|
||||||
|
hide();
|
||||||
|
}, this );
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
clearDialog();
|
|
||||||
hide();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t PulseAddDialog::toPulseSentiment(int index)
|
uint32_t PulseAddDialog::toPulseSentiment(int index)
|
||||||
|
@ -356,15 +407,15 @@ void PulseAddDialog::postReplyPulse()
|
||||||
std::cerr << "PulseAddDialog::postReplyPulse()";
|
std::cerr << "PulseAddDialog::postReplyPulse()";
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
|
|
||||||
RsWirePulseSPtr pPulse(new RsWirePulse());
|
RsWirePulseSPtr pPulse;
|
||||||
|
|
||||||
pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
|
pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
|
||||||
pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
|
pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
|
||||||
// set images here too.
|
// set images here too.
|
||||||
pPulse->mImage1 = mImage1;
|
pPulse->mImage1 = mImage1;
|
||||||
pPulse->mImage2 = mImage2;
|
pPulse->mImage2 = mImage2;
|
||||||
pPulse->mImage3 = mImage3;
|
pPulse->mImage3 = mImage3;
|
||||||
pPulse->mImage4 = mImage4;
|
pPulse->mImage4 = mImage4;
|
||||||
|
|
||||||
if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
|
if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
|
||||||
// Copy details from parent, and override
|
// Copy details from parent, and override
|
||||||
|
@ -378,20 +429,33 @@ void PulseAddDialog::postReplyPulse()
|
||||||
pPulse->mImage4 = mReplyToPulse.mImage4;
|
pPulse->mImage4 = mReplyToPulse.mImage4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this should be in async thread, so doesn't block UI thread.
|
RsThread::async([this, pPulse](){
|
||||||
if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
|
|
||||||
mReplyToPulse.mMeta.mOrigMsgId,
|
if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
|
||||||
mGroup.mMeta.mGroupId,
|
mReplyToPulse.mMeta.mOrigMsgId,
|
||||||
mReplyType,
|
mGroup.mMeta.mGroupId,
|
||||||
pPulse))
|
mReplyType,
|
||||||
{
|
pPulse))
|
||||||
std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
|
{
|
||||||
std::cerr << std::endl;
|
std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
|
||||||
return;
|
std::cerr << std::endl;
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RsQThreadUtils::postToObject( [this]()
|
||||||
|
{
|
||||||
|
/* Here it goes any code you want to be executed on the Qt Gui
|
||||||
|
* thread, for example to update the data model with new information
|
||||||
|
* after a blocking call to RetroShare API complete, note that
|
||||||
|
* Qt::QueuedConnection is important!
|
||||||
|
*/
|
||||||
|
|
||||||
|
clearDialog();
|
||||||
|
hide();
|
||||||
|
}, this );
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
clearDialog();
|
|
||||||
hide();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PulseAddDialog::clearDialog()
|
void PulseAddDialog::clearDialog()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue