Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

started removal of GxsBroadcastBase class

Browse Source
This commit is contained in:
csoler 2020-02-06 19:57:23 +01:00
parent 595df99310
commit 8e153b4acc
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
40 changed files with 94 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -1112,6 +1112,7 @@ static void addMessageChanged(std::map<RsGxsGroupId, std::set<RsGxsMessageId> >
void RsGenExchange::receiveChanges(std::vector<RsGxsNotify*>& changes) void RsGenExchange::receiveChanges(std::vector<RsGxsNotify*>& changes)
{ {
std::cerr << "*********************************** RsGenExchange::receiveChanges()" << std::endl;
#ifdef GEN_EXCH_DEBUG #ifdef GEN_EXCH_DEBUG
std::cerr << "RsGenExchange::receiveChanges()" << std::endl; std::cerr << "RsGenExchange::receiveChanges()" << std::endl;
#endif #endif

1
libretroshare/src/retroshare/rsidentity.h
View File

@ -309,6 +309,7 @@ enum class RsGxsIdentityEventCode: uint8_t
UNKNOWN = 0x00, UNKNOWN = 0x00,
NEW_IDENTITY = 0x01, NEW_IDENTITY = 0x01,
DELETED_IDENTITY = 0x02, DELETED_IDENTITY = 0x02,
UPDATED_IDENTITY = 0x03,
}; };
struct RsGxsIdentityEvent: public RsEvent struct RsGxsIdentityEvent: public RsEvent

12
libretroshare/src/services/p3postbase.cc
View File

@ -174,11 +174,6 @@ void p3PostBase::notifyChanges(std::vector<RsGxsNotify *> &changes)
delete *it; delete *it;
} }
#ifdef POSTBASE_DEBUG
std::cerr << "p3PostBase::notifyChanges() -> receiveChanges()";
std::cerr << std::endl;
#endif
} }
void p3PostBase::service_tick() void p3PostBase::service_tick()
@ -615,7 +610,9 @@ void p3PostBase::background_loadMsgs(const uint32_t &token, bool unprocessed)
#endif #endif
changes.push_back(msgChanges); changes.push_back(msgChanges);
receiveHelperChanges(changes); //receiveHelperChanges(changes);
notifyChanges(changes);
} }
else else
{ {
@ -768,7 +765,8 @@ void p3PostBase::background_updateVoteCounts(const uint32_t &token)
#endif #endif
changes.push_back(msgChanges); changes.push_back(msgChanges);
receiveHelperChanges(changes); //receiveHelperChanges(changes);
notifyChanges(changes);
} }
else else
{ {

3
libretroshare/src/services/p3postbase.h
View File

@ -72,9 +72,6 @@ class p3PostBase: public RsGenExchange, public GxsTokenQueue, public RsTickEvent
virtual void service_tick(); virtual void service_tick();
// This should be overloaded to call RsGxsIfaceHelper::receiveChanges().
virtual void receiveHelperChanges(std::vector<RsGxsNotify*>& changes) = 0;
protected: protected:
virtual void notifyChanges(std::vector<RsGxsNotify*>& changes); virtual void notifyChanges(std::vector<RsGxsNotify*>& changes);

5
libretroshare/src/services/p3posted.h
View File

@ -53,11 +53,6 @@ virtual void notifyChanges(std::vector<RsGxsNotify*>& changes)
public: public:
virtual void receiveHelperChanges(std::vector<RsGxsNotify*>& changes)
{
return RsGxsIfaceHelper::receiveChanges(changes);
}
// Posted Specific DataTypes. // Posted Specific DataTypes.
virtual bool getGroupData(const uint32_t &token, std::vector<RsPostedGroup> &groups); virtual bool getGroupData(const uint32_t &token, std::vector<RsPostedGroup> &groups);
virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts, std::vector<RsGxsComment> &cmts); virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts, std::vector<RsGxsComment> &cmts);

2
libretroshare/src/services/p3wiki.cc
View File

@ -102,8 +102,6 @@ void p3Wiki::notifyChanges(std::vector<RsGxsNotify*>& changes)
{ {
std::cerr << "p3Wiki::notifyChanges() New stuff"; std::cerr << "p3Wiki::notifyChanges() New stuff";
std::cerr << std::endl; std::cerr << std::endl;
RsGxsIfaceHelper::receiveChanges(changes);
} }
/* Specific Service Data */ /* Specific Service Data */

2
libretroshare/src/services/p3wire.cc
View File

@ -88,8 +88,6 @@ void p3Wire::notifyChanges(std::vector<RsGxsNotify*>& changes)
{ {
std::cerr << "p3Wire::notifyChanges() New stuff"; std::cerr << "p3Wire::notifyChanges() New stuff";
std::cerr << std::endl; std::cerr << std::endl;
RsGxsIfaceHelper::receiveChanges(changes);
} }
/* Specific Service Data */ /* Specific Service Data */

2
retroshare-gui/src/gui/Circles/CirclesDialog.cpp
View File

@ -50,7 +50,7 @@
/** Constructor */ /** Constructor */
CirclesDialog::CirclesDialog(QWidget *parent) CirclesDialog::CirclesDialog(QWidget *parent)
: RsGxsUpdateBroadcastPage(rsGxsCircles, parent) : MainPage(parent)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);

2
retroshare-gui/src/gui/Circles/CirclesDialog.h
View File

@ -31,7 +31,7 @@
class UIStateHelper; class UIStateHelper;
class CirclesDialog : public RsGxsUpdateBroadcastPage, public TokenResponse class CirclesDialog : public MainPage, public TokenResponse
{ {
Q_OBJECT Q_OBJECT

38
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -37,7 +37,7 @@
#include "gui/common/UIStateHelper.h" #include "gui/common/UIStateHelper.h"
#include "gui/common/UserNotify.h" #include "gui/common/UserNotify.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/gxs/RsGxsUpdateBroadcastBase.h" //#include "gui/gxs/RsGxsUpdateBroadcastBase.h"
#include "gui/msgs/MessageComposer.h" #include "gui/msgs/MessageComposer.h"
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
@ -142,9 +142,7 @@ class TreeWidgetItem : public QTreeWidgetItem
}; };
/** Constructor */ /** Constructor */
IdDialog::IdDialog(QWidget *parent) : IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog)
RsGxsUpdateBroadcastPage(rsIdentity, parent),
ui(new Ui::IdDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -156,9 +154,9 @@ IdDialog::IdDialog(QWidget *parent) :
mEventHandlerId_circles = 0; mEventHandlerId_circles = 0;
rsEvents->registerEventsHandler(RsEventType::GXS_CIRCLES, [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [=]() { handleEvent_main_thread(event); }, this ); }, mEventHandlerId_circles ); rsEvents->registerEventsHandler(RsEventType::GXS_CIRCLES, [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [=]() { handleEvent_main_thread(event); }, this ); }, mEventHandlerId_circles );
// This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only. // This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only.
mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); //mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this);
connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); //connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool)));
ownItem = new QTreeWidgetItem(); ownItem = new QTreeWidgetItem();
ownItem->setText(0, tr("My own identities")); ownItem->setText(0, tr("My own identities"));
@ -419,8 +417,14 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
{ {
case RsGxsIdentityEventCode::DELETED_IDENTITY: case RsGxsIdentityEventCode::DELETED_IDENTITY:
case RsGxsIdentityEventCode::NEW_IDENTITY: case RsGxsIdentityEventCode::NEW_IDENTITY:
case RsGxsIdentityEventCode::UPDATED_IDENTITY:
requestIdList(); requestIdList();
if(!mId.isNull() && mId == e->mIdentityId)
requestIdDetails();
break;
default: default:
break; break;
} }
@ -2205,16 +2209,16 @@ void IdDialog::updateDisplay(bool complete)
} }
requestCircleGroupMeta(); requestCircleGroupMeta();
std::set<RsGxsGroupId> grpIds; // std::set<RsGxsGroupId> grpIds;
getAllGrpIds(grpIds); // getAllGrpIds(grpIds);
if (!getGrpIds().empty()) { // if (!getGrpIds().empty()) {
requestIdList(); // requestIdList();
//
if (!mId.isNull() && grpIds.find(mId)!=grpIds.end()) { // if (!mId.isNull() && grpIds.find(mId)!=grpIds.end()) {
requestIdDetails(); // requestIdDetails();
requestRepList(); // requestRepList();
} // }
} // }
} }
void IdDialog::addIdentity() void IdDialog::addIdentity()

2
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -45,7 +45,7 @@ struct CircleUpdateOrder
uint32_t action ; uint32_t action ;
}; };
class IdDialog : public RsGxsUpdateBroadcastPage, public TokenResponse class IdDialog : public MainPage, public TokenResponse
{ {
Q_OBJECT Q_OBJECT

8
retroshare-gui/src/gui/People/PeopleDialog.cpp
View File

@ -25,7 +25,7 @@
#include "gui/msgs/MessageComposer.h" #include "gui/msgs/MessageComposer.h"
#include "gui/RetroShareLink.h" #include "gui/RetroShareLink.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/gxs/RsGxsUpdateBroadcastBase.h" //#include "gui/gxs/RsGxsUpdateBroadcastBase.h"
#include "gui/Identity/IdDetailsDialog.h" #include "gui/Identity/IdDetailsDialog.h"
#include "gui/Identity/IdDialog.h" #include "gui/Identity/IdDialog.h"
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
@ -53,7 +53,7 @@ const uint32_t PeopleDialog::PD_CIRCLES = 0x0004 ;
/** Constructor */ /** Constructor */
PeopleDialog::PeopleDialog(QWidget *parent) PeopleDialog::PeopleDialog(QWidget *parent)
: RsGxsUpdateBroadcastPage(rsIdentity, parent) : MainPage(parent)
{ {
setupUi(this); setupUi(this);
@ -61,8 +61,8 @@ PeopleDialog::PeopleDialog(QWidget *parent)
mIdentityQueue = new TokenQueue(rsIdentity->getTokenService(), this); mIdentityQueue = new TokenQueue(rsIdentity->getTokenService(), this);
mCirclesQueue = new TokenQueue(rsGxsCircles->getTokenService(), this); mCirclesQueue = new TokenQueue(rsGxsCircles->getTokenService(), this);
// This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only. // This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only.
mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this); //mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this);
connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool))); //connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool)));
tabWidget->removeTab(1); tabWidget->removeTab(1);

4
retroshare-gui/src/gui/People/PeopleDialog.h
View File

@ -33,7 +33,7 @@
#define IMAGE_IDENTITY ":/icons/png/people.png" #define IMAGE_IDENTITY ":/icons/png/people.png"
class PeopleDialog : public RsGxsUpdateBroadcastPage, public Ui::PeopleDialog, public TokenResponse class PeopleDialog : public MainPage, public Ui::PeopleDialog, public TokenResponse
{ {
Q_OBJECT Q_OBJECT
@ -97,7 +97,7 @@ private:
TokenQueue *mIdentityQueue; TokenQueue *mIdentityQueue;
TokenQueue *mCirclesQueue; TokenQueue *mCirclesQueue;
RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ; //RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ;
FlowLayout *_flowLayoutExt; FlowLayout *_flowLayoutExt;
std::map<RsGxsId,IdentityWidget *> _gxs_identity_widgets ; std::map<RsGxsId,IdentityWidget *> _gxs_identity_widgets ;

6
retroshare-gui/src/gui/Posted/PostedDialog.cpp
View File

@ -60,13 +60,7 @@ void PostedDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
switch(e->mPostedEventCode) switch(e->mPostedEventCode)
{ {
case RsPostedEventCode::NEW_MESSAGE: case RsPostedEventCode::NEW_MESSAGE:
updateMessageSummaryList(e->mPostedGroupId);
break;
case RsPostedEventCode::UPDATED_MESSAGE: // [[fallthrough]]; case RsPostedEventCode::UPDATED_MESSAGE: // [[fallthrough]];
updateDisplay(false);
break;
case RsPostedEventCode::READ_STATUS_CHANGED: // [[fallthrough]]; case RsPostedEventCode::READ_STATUS_CHANGED: // [[fallthrough]];
updateMessageSummaryList(e->mPostedGroupId); updateMessageSummaryList(e->mPostedGroupId);
break; break;

2
retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
View File

@ -80,7 +80,7 @@ static void setSelected(FriendSelectionWidget::Modus modus, QTreeWidgetItem *ite
} }
FriendSelectionWidget::FriendSelectionWidget(QWidget *parent) FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
: RsGxsUpdateBroadcastPage(rsIdentity,parent), ui(new Ui::FriendSelectionWidget) : QWidget(parent), ui(new Ui::FriendSelectionWidget)
{ {
ui->setupUi(this); ui->setupUi(this);

2
retroshare-gui/src/gui/common/FriendSelectionWidget.h
View File

@ -34,7 +34,7 @@ class FriendSelectionWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
class RSTreeWidgetItemCompareRole; class RSTreeWidgetItemCompareRole;
class FriendSelectionWidget : public RsGxsUpdateBroadcastPage, public TokenResponse class FriendSelectionWidget : public QWidget, public TokenResponse
{ {
Q_OBJECT Q_OBJECT

2
retroshare-gui/src/gui/gxs/GxsFeedItem.cpp
View File

@ -86,6 +86,7 @@ void GxsFeedItem::copyMessageLink()
} }
} }
#ifdef TO_REMOVE
void GxsFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete) void GxsFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete)
{ {
GxsGroupFeedItem::fillDisplay(updateBroadcastBase, complete); GxsGroupFeedItem::fillDisplay(updateBroadcastBase, complete);
@ -101,6 +102,7 @@ void GxsFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, boo
requestMessage(); requestMessage();
} }
} }
#endif
void GxsFeedItem::requestMessage() void GxsFeedItem::requestMessage()
{ {

2
retroshare-gui/src/gui/gxs/GxsFeedItem.h
View File

@ -50,7 +50,7 @@ protected:
/* GxsGroupFeedItem */ /* GxsGroupFeedItem */
virtual bool isLoading(); virtual bool isLoading();
virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); //virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete);
/* TokenResponse */ /* TokenResponse */
virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);

9
retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp
View File

@ -51,6 +51,7 @@ GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, cons
mLoadQueue = NULL; mLoadQueue = NULL;
#ifdef TO_REMOVE
if (mGxsIface && autoUpdate) { if (mGxsIface && autoUpdate) {
/* Connect to update broadcast */ /* Connect to update broadcast */
mUpdateBroadcastBase = new RsGxsUpdateBroadcastBase(mGxsIface); mUpdateBroadcastBase = new RsGxsUpdateBroadcastBase(mGxsIface);
@ -58,6 +59,7 @@ GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, cons
} else { } else {
mUpdateBroadcastBase = NULL; mUpdateBroadcastBase = NULL;
} }
#endif
} }
GxsGroupFeedItem::~GxsGroupFeedItem() GxsGroupFeedItem::~GxsGroupFeedItem()
@ -71,10 +73,12 @@ GxsGroupFeedItem::~GxsGroupFeedItem()
delete mLoadQueue; delete mLoadQueue;
} }
#ifdef TO_REMOVE
if (mUpdateBroadcastBase) if (mUpdateBroadcastBase)
{ {
delete(mUpdateBroadcastBase); delete(mUpdateBroadcastBase);
} }
#endif
} }
bool GxsGroupFeedItem::initLoadQueue() bool GxsGroupFeedItem::initLoadQueue()
@ -139,9 +143,11 @@ void GxsGroupFeedItem::copyGroupLink()
void GxsGroupFeedItem::fillDisplaySlot(bool complete) void GxsGroupFeedItem::fillDisplaySlot(bool complete)
{ {
fillDisplay(mUpdateBroadcastBase, complete); requestGroup();
// fillDisplay(mUpdateBroadcastBase, complete);
} }
#ifdef TO_REMOVE
void GxsGroupFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool /*complete*/) void GxsGroupFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool /*complete*/)
{ {
std::set<RsGxsGroupId> grpIds; std::set<RsGxsGroupId> grpIds;
@ -150,6 +156,7 @@ void GxsGroupFeedItem::fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase
if (grpIds.find(groupId()) != grpIds.end()) if (grpIds.find(groupId()) != grpIds.end())
requestGroup(); requestGroup();
} }
#endif
/***********************************************************/ /***********************************************************/

4
retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h
View File

@ -56,7 +56,7 @@ protected:
virtual void loadGroup(const uint32_t &token) = 0; virtual void loadGroup(const uint32_t &token) = 0;
virtual RetroShareLink::enumType getLinkType() = 0; virtual RetroShareLink::enumType getLinkType() = 0;
virtual QString groupName() = 0; virtual QString groupName() = 0;
virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete); //virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete);
/* TokenResponse */ /* TokenResponse */
virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
@ -77,7 +77,7 @@ private slots:
private: private:
RsGxsGroupId mGroupId; RsGxsGroupId mGroupId;
RsGxsUpdateBroadcastBase *mUpdateBroadcastBase; // RsGxsUpdateBroadcastBase *mUpdateBroadcastBase;
uint32_t mNextTokenType; uint32_t mNextTokenType;
uint32_t mTokenTypeGroup; uint32_t mTokenTypeGroup;
}; };

22
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View File

@ -68,7 +68,7 @@
/** Constructor */ /** Constructor */
GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, QWidget *parent,bool allow_dist_sync) GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, QWidget *parent,bool allow_dist_sync)
: RsGxsUpdateBroadcastPage(ifaceImpl, parent) : MainPage(parent)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui = new Ui::GxsGroupFrameDialog(); ui = new Ui::GxsGroupFrameDialog();
@ -179,7 +179,9 @@ void GxsGroupFrameDialog::showEvent(QShowEvent *event)
initUi(); initUi();
} }
RsGxsUpdateBroadcastPage::showEvent(event); updateDisplay(true);
// RsGxsUpdateBroadcastPage::showEvent(event);
} }
void GxsGroupFrameDialog::processSettings(bool load) void GxsGroupFrameDialog::processSettings(bool load)
@ -239,25 +241,15 @@ void GxsGroupFrameDialog::setHideTabBarWithOneTab(bool hideTabBarWithOneTab)
void GxsGroupFrameDialog::updateDisplay(bool complete) void GxsGroupFrameDialog::updateDisplay(bool complete)
{ {
if (complete || !getGrpIds().empty() || !getGrpIdsMeta().empty()) { if(complete) // || !getGrpIds().empty() || !getGrpIdsMeta().empty()) {
/* Update group list */ requestGroupSummary(); /* Update group list */
requestGroupSummary();
} else {
/* Update all groups of changed messages */
std::map<RsGxsGroupId, std::set<RsGxsMessageId> > msgIds;
getAllMsgIds(msgIds);
for (auto msgIt = msgIds.begin(); msgIt != msgIds.end(); ++msgIt) {
updateMessageSummaryList(msgIt->first);
}
}
updateSearchResults() ; updateSearchResults() ;
} }
void GxsGroupFrameDialog::updateSearchResults() void GxsGroupFrameDialog::updateSearchResults()
{ {
const std::set<TurtleRequestId>& reqs = getSearchResults(); const std::set<TurtleRequestId>& reqs = getSearchRequests();
for(auto it(reqs.begin());it!=reqs.end();++it) for(auto it(reqs.begin());it!=reqs.end();++it)
{ {

3
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h
View File

@ -44,7 +44,7 @@ class UIStateHelper;
struct RsGxsCommentService; struct RsGxsCommentService;
class GxsCommentDialog; class GxsCommentDialog;
class GxsGroupFrameDialog : public RsGxsUpdateBroadcastPage, public TokenResponse class GxsGroupFrameDialog : public MainPage, public TokenResponse
{ {
Q_OBJECT Q_OBJECT
@ -98,6 +98,7 @@ protected:
void updateMessageSummaryList(RsGxsGroupId groupId); void updateMessageSummaryList(RsGxsGroupId groupId);
virtual const std::set<TurtleRequestId> getSearchRequests() const { return std::set<TurtleRequestId>(); } // overload this for subclasses that provide distant search
private slots: private slots:
void todo(); void todo();

7
retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
View File

@ -51,8 +51,8 @@
GxsIdChooser::GxsIdChooser(QWidget *parent) GxsIdChooser::GxsIdChooser(QWidget *parent)
: QComboBox(parent), mFlags(IDCHOOSER_ANON_DEFAULT) : QComboBox(parent), mFlags(IDCHOOSER_ANON_DEFAULT)
{ {
mBase = new RsGxsUpdateBroadcastBase(rsIdentity, this); // mBase = new RsGxsUpdateBroadcastBase(rsIdentity, this);
connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool))); // connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool)));
/* Initialize ui */ /* Initialize ui */
setSizeAdjustPolicy(QComboBox::AdjustToContents); setSizeAdjustPolicy(QComboBox::AdjustToContents);
@ -94,7 +94,8 @@ void GxsIdChooser::fillDisplay(bool complete)
void GxsIdChooser::showEvent(QShowEvent *event) void GxsIdChooser::showEvent(QShowEvent *event)
{ {
mBase->showEvent(event); // mBase->showEvent(event);
updateDisplay(true);
QComboBox::showEvent(event); QComboBox::showEvent(event);
} }

2
retroshare-gui/src/gui/gxs/GxsIdChooser.h
View File

@ -86,7 +86,7 @@ private:
uint32_t mAllowedCount ; uint32_t mAllowedCount ;
std::set<RsGxsId> mConstraintIdsSet ; // leave empty if all allowed std::set<RsGxsId> mConstraintIdsSet ; // leave empty if all allowed
RsGxsUpdateBroadcastBase *mBase; // RsGxsUpdateBroadcastBase *mBase;
}; };
#endif #endif

4
retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp
View File

@ -55,7 +55,7 @@ void GxsMessageFramePostWidget::groupIdChanged()
emit groupChanged(this); emit groupChanged(this);
fillComplete(); updateDisplay(true);
} }
QString GxsMessageFramePostWidget::groupName(bool /*withUnreadCount*/) QString GxsMessageFramePostWidget::groupName(bool /*withUnreadCount*/)
@ -107,6 +107,7 @@ void GxsMessageFramePostWidget::updateDisplay(bool complete)
return; return;
} }
#ifdef TO_REMOVE
bool updateGroup = false; bool updateGroup = false;
const std::set<RsGxsGroupId> &grpIdsMeta = getGrpIdsMeta(); const std::set<RsGxsGroupId> &grpIdsMeta = getGrpIdsMeta();
@ -133,6 +134,7 @@ void GxsMessageFramePostWidget::updateDisplay(bool complete)
if (updateGroup) { if (updateGroup) {
requestGroupData(); requestGroupData();
} }
#endif
} }
void GxsMessageFramePostWidget::fillThreadAddPost(const QVariant &post, bool related, int current, int count) void GxsMessageFramePostWidget::fillThreadAddPost(const QVariant &post, bool related, int current, int count)

2
retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
View File

@ -24,7 +24,7 @@
#include <retroshare/rsgxsifacehelper.h> #include <retroshare/rsgxsifacehelper.h>
GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidget *parent) GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidget *parent)
: RsGxsUpdateBroadcastWidget(ifaceImpl, parent) : QWidget(parent)
{ {
mNextTokenType = 0; mNextTokenType = 0;

2
retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
View File

@ -27,7 +27,7 @@
struct RsGxsIfaceHelper; struct RsGxsIfaceHelper;
class UIStateHelper; class UIStateHelper;
class GxsMessageFrameWidget : public RsGxsUpdateBroadcastWidget, public TokenResponse class GxsMessageFrameWidget : public QWidget, public TokenResponse
{ {
Q_OBJECT Q_OBJECT

12
retroshare-gui/src/gui/gxs/GxsUserNotify.cpp
View File

@ -19,7 +19,7 @@
*******************************************************************************/ *******************************************************************************/
#include "GxsUserNotify.h" #include "GxsUserNotify.h"
#include "gui/gxs/RsGxsUpdateBroadcastBase.h" //#include "gui/gxs/RsGxsUpdateBroadcastBase.h"
#include "retroshare/rsgxsifacehelper.h" #include "retroshare/rsgxsifacehelper.h"
@ -36,8 +36,8 @@ GxsUserNotify::GxsUserNotify(RsGxsIfaceHelper *ifaceImpl, QObject *parent) :
mTokenService = mInterface->getTokenService(); mTokenService = mInterface->getTokenService();
mTokenQueue = new TokenQueue(mInterface->getTokenService(), this); mTokenQueue = new TokenQueue(mInterface->getTokenService(), this);
mBase = new RsGxsUpdateBroadcastBase(ifaceImpl); //mBase = new RsGxsUpdateBroadcastBase(ifaceImpl);
connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateIcon())); //connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateIcon()));
} }
GxsUserNotify::~GxsUserNotify() GxsUserNotify::~GxsUserNotify()
@ -45,9 +45,9 @@ GxsUserNotify::~GxsUserNotify()
if (mTokenQueue) { if (mTokenQueue) {
delete(mTokenQueue); delete(mTokenQueue);
} }
if (mBase) { //if (mBase) {
delete(mBase); //delete(mBase);
} //}
} }
void GxsUserNotify::startUpdate() void GxsUserNotify::startUpdate()

2
retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastBase.h
View File

@ -47,7 +47,7 @@ public:
const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIds() { return mMsgIds; } const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIds() { return mMsgIds; }
const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta() { return mMsgIdsMeta; } const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta() { return mMsgIdsMeta; }
void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds); void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds);
const std::set<TurtleRequestId>& getSearchResults() { return mTurtleResults ; } const std::set<TurtleRequestId>& getSearchRequests() { return mTurtleResults ; }
protected: protected:
void fillComplete(); void fillComplete();

2
retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h
View File

@ -52,7 +52,7 @@ public:
const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta(); const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta();
void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds); void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds);
virtual const std::set<TurtleRequestId> getSearchResults() const { return std::set<TurtleRequestId>(); } // overload this for subclasses that provide distant search virtual const std::set<TurtleRequestId> getSearchRequests() const { return std::set<TurtleRequestId>(); } // overload this for subclasses that provide distant search
protected: protected:
virtual void showEvent(QShowEvent *event); virtual void showEvent(QShowEvent *event);

2
retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp
View File

@ -49,10 +49,12 @@ const std::set<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIds()
return mBase->getGrpIds(); return mBase->getGrpIds();
} }
#ifdef TO_REMOVE
const std::set<TurtleRequestId>& RsGxsUpdateBroadcastWidget::getSearchResults() const std::set<TurtleRequestId>& RsGxsUpdateBroadcastWidget::getSearchResults()
{ {
return mBase->getSearchResults(); return mBase->getSearchResults();
} }
#endif
const std::set<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIdsMeta() const std::set<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIdsMeta()
{ {
return mBase->getGrpIdsMeta(); return mBase->getGrpIdsMeta();

2
retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.h
View File

@ -51,7 +51,7 @@ public:
const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIds(); const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIds();
const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta(); const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &getMsgIdsMeta();
void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds); void getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds);
const std::set<TurtleRequestId>& getSearchResults() ; const std::set<TurtleRequestId>& getSearchquests() ;
RsGxsIfaceHelper *interfaceHelper() { return mInterfaceHelper; } RsGxsIfaceHelper *interfaceHelper() { return mInterfaceHelper; }

6
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
View File

@ -65,13 +65,7 @@ void GxsChannelDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> ev
switch(e->mChannelEventCode) switch(e->mChannelEventCode)
{ {
case RsChannelEventCode::NEW_MESSAGE: case RsChannelEventCode::NEW_MESSAGE:
updateMessageSummaryList(e->mChannelGroupId);
break;
case RsChannelEventCode::UPDATED_MESSAGE: // [[fallthrough]]; case RsChannelEventCode::UPDATED_MESSAGE: // [[fallthrough]];
updateDisplay(false);
break;
case RsChannelEventCode::READ_STATUS_CHANGED: case RsChannelEventCode::READ_STATUS_CHANGED:
updateMessageSummaryList(e->mChannelGroupId); updateMessageSummaryList(e->mChannelGroupId);
break; break;

2
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h
View File

@ -48,7 +48,7 @@ protected:
virtual QString getHelpString() const ; virtual QString getHelpString() const ;
virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata); virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata);
virtual bool getDistantSearchResults(TurtleRequestId id, std::map<RsGxsGroupId,RsGxsGroupSummary>& group_infos); virtual bool getDistantSearchResults(TurtleRequestId id, std::map<RsGxsGroupId,RsGxsGroupSummary>& group_infos);
virtual const std::set<TurtleRequestId> getSearchResults() const override { return mSearchResults ; } virtual const std::set<TurtleRequestId> getSearchRequests() const override { return mSearchResults ; }
virtual TurtleRequestId distantSearch(const QString& search_string) ; virtual TurtleRequestId distantSearch(const QString& search_string) ;
virtual void checkRequestGroup(const RsGxsGroupId& grpId) ; virtual void checkRequestGroup(const RsGxsGroupId& grpId) ;

4
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -311,7 +311,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
{ {
ui->setupUi(this); ui->setupUi(this);
setUpdateWhenInvisible(true); //setUpdateWhenInvisible(true);
//mUpdating = false; //mUpdating = false;
mUnreadCount = 0; mUnreadCount = 0;
@ -680,6 +680,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
complete = true; complete = true;
} }
#ifdef TO_REMOVE
if(!complete) if(!complete)
{ {
#ifdef DEBUG_FORUMS #ifdef DEBUG_FORUMS
@ -725,6 +726,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
} }
} }
} }
#endif
if(complete) // need to update the group data, reload the messages etc. if(complete) // need to update the group data, reload the messages etc.
{ {

6
retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
View File

@ -60,13 +60,7 @@ void GxsForumsDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
switch(e->mForumEventCode) switch(e->mForumEventCode)
{ {
case RsForumEventCode::NEW_MESSAGE: case RsForumEventCode::NEW_MESSAGE:
updateMessageSummaryList(e->mForumGroupId);
break;
case RsForumEventCode::UPDATED_MESSAGE: // [[fallthrough]]; case RsForumEventCode::UPDATED_MESSAGE: // [[fallthrough]];
updateDisplay(false);
break;
case RsForumEventCode::READ_STATUS_CHANGED: case RsForumEventCode::READ_STATUS_CHANGED:
updateMessageSummaryList(e->mForumGroupId); updateMessageSummaryList(e->mForumGroupId);
break; break;

2
retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp
View File

@ -78,7 +78,7 @@
//#define DEBUG_GXSTRANS_STATS 1 //#define DEBUG_GXSTRANS_STATS 1
GxsTransportStatistics::GxsTransportStatistics(QWidget *parent) GxsTransportStatistics::GxsTransportStatistics(QWidget *parent)
: RsGxsUpdateBroadcastPage(rsGxsTrans,parent) : MainPage(parent)
{ {
setupUi(this) ; setupUi(this) ;

2
retroshare-gui/src/gui/statistics/GxsTransportStatistics.h
View File

@ -60,7 +60,7 @@ public:
std::map<RsGxsMessageId,RsMsgMetaData> messages_metas ; std::map<RsGxsMessageId,RsMsgMetaData> messages_metas ;
}; };
class GxsTransportStatistics: public RsGxsUpdateBroadcastPage, public TokenResponse, public Ui::GxsTransportStatistics class GxsTransportStatistics: public MainPage, public TokenResponse, public Ui::GxsTransportStatistics
{ {
Q_OBJECT Q_OBJECT

12
retroshare-gui/src/retroshare-gui.pro
View File

@ -1394,9 +1394,9 @@ gxsgui {
gui/gxs/GxsMessageFramePostWidget.h \ gui/gxs/GxsMessageFramePostWidget.h \
gui/gxs/GxsGroupFeedItem.h \ gui/gxs/GxsGroupFeedItem.h \
gui/gxs/GxsFeedItem.h \ gui/gxs/GxsFeedItem.h \
gui/gxs/RsGxsUpdateBroadcastBase.h \ # gui/gxs/RsGxsUpdateBroadcastBase.h \
gui/gxs/RsGxsUpdateBroadcastWidget.h \ # gui/gxs/RsGxsUpdateBroadcastWidget.h \
gui/gxs/RsGxsUpdateBroadcastPage.h \ # gui/gxs/RsGxsUpdateBroadcastPage.h \
gui/gxs/GxsGroupShareKey.h \ gui/gxs/GxsGroupShareKey.h \
gui/gxs/GxsUserNotify.h \ gui/gxs/GxsUserNotify.h \
gui/gxs/GxsFeedWidget.h \ gui/gxs/GxsFeedWidget.h \
@ -1431,9 +1431,9 @@ gxsgui {
gui/gxs/GxsMessageFramePostWidget.cpp \ gui/gxs/GxsMessageFramePostWidget.cpp \
gui/gxs/GxsGroupFeedItem.cpp \ gui/gxs/GxsGroupFeedItem.cpp \
gui/gxs/GxsFeedItem.cpp \ gui/gxs/GxsFeedItem.cpp \
gui/gxs/RsGxsUpdateBroadcastBase.cpp \ # gui/gxs/RsGxsUpdateBroadcastBase.cpp \
gui/gxs/RsGxsUpdateBroadcastWidget.cpp \ # gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
gui/gxs/RsGxsUpdateBroadcastPage.cpp \ # gui/gxs/RsGxsUpdateBroadcastPage.cpp \
gui/gxs/GxsUserNotify.cpp \ gui/gxs/GxsUserNotify.cpp \
gui/gxs/GxsFeedWidget.cpp \ gui/gxs/GxsFeedWidget.cpp \
util/TokenQueue.cpp \ util/TokenQueue.cpp \

2
tests/unittests/libretroshare/services/gxs/gxstestservice.cc
View File

@ -82,8 +82,6 @@ void GxsTestService::notifyChanges(std::vector<RsGxsNotify*>& changes)
{ {
std::cerr << "GxsTestService::notifyChanges() New stuff"; std::cerr << "GxsTestService::notifyChanges() New stuff";
std::cerr << std::endl; std::cerr << std::endl;
RsGxsIfaceHelper::receiveChanges(changes);
} }
/* Specific Service Data */ /* Specific Service Data */