Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

RsAutoUpdatePage

Browse source 
- Changed the timer of RsAutoUpdatePage to a single-shot timer.
  The update can take longer than the given timer interval.

Changed status service:
- send status when the peer connects (new monitor)
- send status to all online peers only when user changed it (not in every timer tick)

MessengerWindow:
- remove load and save of custom state string in settings

p3ChatService::sendCustomState
- send empty custom state string too

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-07-20 19:45:07 +00:00
parent f7282edf33
commit e3e4c97369
15 changed files with 145 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libretroshare/src/services/p3statusservice.cc
View file

@ -53,6 +53,23 @@ p3StatusService::~p3StatusService()
{
}
bool p3StatusService::getOwnStatus(StatusInfo& statusInfo)
{
std::map<std::string, StatusInfo>::iterator it;
std::string ownId = mConnMgr->getOwnId();
RsStackMutex stack(mStatusMtx);
it = mStatusInfoMap.find(ownId);
if (it == mStatusInfoMap.end()){
std::cerr << "p3StatusService::saveList() :" << "Did not find your status" << ownId << std::endl;
return false;
}
statusInfo = it->second;
return true;
}
bool p3StatusService::getStatus(std::list<StatusInfo>& statusInfo)
{
@ -128,15 +145,17 @@ bool p3StatusService::getStatus(std::list<StatusInfo>& statusInfo)
return true;
}
bool p3StatusService::sendStatus(StatusInfo& statusInfo)
/* id = "", status is sent to all online peers */
bool p3StatusService::sendStatus(const std::string &id, uint32_t status)
{
StatusInfo statusInfo;
std::list<std::string> onlineList;
{
RsStackMutex stack(mStatusMtx);
if(statusInfo.id != mConnMgr->getOwnId())
return false;
statusInfo.id = mConnMgr->getOwnId();
statusInfo.status = status;
// don't save inactive status
if(statusInfo.status != RS_STATUS_INACTIVE){
@ -147,15 +166,18 @@ bool p3StatusService::sendStatus(StatusInfo& statusInfo)
std::pair<std::string, StatusInfo> pr(statusInfo.id, statusInfo);
mStatusInfoMap.insert(pr);
IndicateConfigChanged();
}else
if(mStatusInfoMap[statusInfo.id].status != statusInfo.status){
} else if(mStatusInfoMap[statusInfo.id].status != statusInfo.status){
IndicateConfigChanged();
mStatusInfoMap[statusInfo.id] = statusInfo;
}
}
mConnMgr->getOnlineList(onlineList);
if (id.empty()) {
mConnMgr->getOnlineList(onlineList);
} else {
onlineList.push_back(id);
}
}
std::list<std::string>::iterator it;
@ -174,11 +196,9 @@ bool p3StatusService::sendStatus(StatusInfo& statusInfo)
sendItem(statusItem);
}
return true;
}
bool p3StatusService::statusAvailable(){
return receivedItems();
}
@ -301,5 +321,18 @@ int p3StatusService::status(){
return 1;
}
/*************** pqiMonitor callback ***********************/
void p3StatusService::statusChange(const std::list<pqipeer> &plist)
{
StatusInfo statusInfo;
std::list<pqipeer>::const_iterator it;
for (it = plist.begin(); it != plist.end(); it++) {
if ((it->state & RS_PEER_S_FRIEND) && (it->state & RS_PEER_CONNECTED)) {
/* send current status */
if (statusInfo.id.empty() == false || getOwnStatus(statusInfo)) {
sendStatus(it->id, statusInfo.status);
}
}
}
}