Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-15 01:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ID cleaning. Saving progress.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-02-16 22:38:50 +00:00
parent 6bc79709e3
commit e2a53924d4
27 changed files with 134 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/retroshare/rsdht.h
View file

@ -29,6 +29,7 @@
#include <inttypes.h>
#include <string>
#include <list>
#include <retroshare/rstypes.h>
/* The Main Interface Class - for information about your Peers */
class RsDht;

10
libretroshare/src/retroshare/rsgxsifacetypes.h
View file

@ -15,8 +15,8 @@
#include <retroshare/rstypes.h>
typedef std::string RsGxsGroupId;
typedef std::string RsGxsMessageId;
typedef GXSGroupId RsGxsGroupId;
typedef GXSMsgId RsGxsMessageId;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgIdResult;
typedef std::pair<RsGxsGroupId, RsGxsMessageId> RsGxsGrpMsgIdPair;
@ -54,13 +54,13 @@ public:
void operator =(const RsGxsGrpMetaData& rGxsMeta);
std::string mGroupId;
RsGxsGroupId mGroupId;
std::string mGroupName;
uint32_t mGroupFlags;
uint32_t mSignFlags; // Combination of RSGXS_GROUP_SIGN_PUBLISH_MASK & RSGXS_GROUP_SIGN_AUTHOR_MASK.
time_t mPublishTs; // Mandatory.
std::string mAuthorId; // Optional.
RsPeerId mAuthorId; // Optional.
// for circles
std::string mCircleId;
@ -109,7 +109,7 @@ public:
std::string mParentId;
std::string mOrigMsgId;
std::string mAuthorId;
RsPeerId mAuthorId;
std::string mMsgName;
time_t mPublishTs;

1
libretroshare/src/retroshare/rsrtt.h
View file

@ -29,6 +29,7 @@
#include <inttypes.h>
#include <string>
#include <list>
#include <retroshare/rstypes.h>
/* The Main Interface Class - for information about your Peers */
class RsRtt;

10
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -88,7 +88,7 @@ CreateCircleDialog::~CreateCircleDialog()
delete(mIdQueue);
}
void CreateCircleDialog::editExistingId(std::string circleId)
void CreateCircleDialog::editExistingId(const RsGxsGroupId& circleId)
{
/* load this circle */
mIsExistingCircle = true;
@ -261,7 +261,7 @@ void CreateCircleDialog::createCircle()
}
else
{
circle.mLocalFriends.push_back(keyId.toStdString());
circle.mLocalFriends.push_back(RsPgpId(keyId.toStdString()));
std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
std::cerr << std::endl;
}
@ -457,8 +457,8 @@ void CreateCircleDialog::getPgpIdentities()
QTreeWidget *tree = ui.treeWidget_IdList;
tree->clear();
std::list<std::string> ids;
std::list<std::string>::iterator it;
std::list<RsPgpId> ids;
std::list<RsPgpId>::iterator it;
rsPeers->getGPGAcceptedList(ids);
for(it = ids.begin(); it != ids.end(); it++)
@ -467,7 +467,7 @@ void CreateCircleDialog::getPgpIdentities()
rsPeers->getGPGDetails(*it, details);
QString keyId = QString::fromStdString(details.gpg_id);
QString keyId = QString::fromStdString(details.gpg_id.toStdString());
QString nickname = QString::fromUtf8(details.name.c_str());
QString idtype = tr("PGP Identity");

2
retroshare-gui/src/gui/Circles/CreateCircleDialog.h
View file

@ -40,7 +40,7 @@ public:
~CreateCircleDialog();
void editNewId(bool isExternal);
void editExistingId(std::string circleId);
void editExistingId(const RsGxsGroupId& circleId);
virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);

24
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -167,11 +167,11 @@ void IdDialog::filterChanged(const QString& /*text*/)
void IdDialog::updateSelection()
{
QTreeWidgetItem *item = ui.treeWidget_IdList->currentItem();
std::string id;
RsGxsGroupId id;
if (item)
{
id = item->text(RSID_COL_KEYID).toStdString();
id = RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString());
}
requestIdDetails(id);
@ -196,7 +196,7 @@ void IdDialog::requestIdList()
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, IDDIALOG_IDLIST);
}
bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const std::string &ownPgpId, int accept)
bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept)
{
bool isOwnId = (data.mPgpKnown && (data.mPgpId == ownPgpId)) || (data.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN);
@ -249,7 +249,7 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
item = new QTreeWidgetItem();
}
item->setText(RSID_COL_NICKNAME, QString::fromUtf8(data.mMeta.mGroupName.c_str()));
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId));
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId.toStdString()));
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
{
@ -300,7 +300,7 @@ void IdDialog::insertIdList(uint32_t token)
mStateHelper->setActive(IDDIALOG_IDLIST, true);
std::string ownPgpId = rsPeers->getGPGOwnId();
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
/* Update existing and remove not existing items */
QTreeWidgetItemIterator itemIterator(ui.treeWidget_IdList);
@ -310,7 +310,7 @@ void IdDialog::insertIdList(uint32_t token)
for (vit = datavector.begin(); vit != datavector.end(); ++vit)
{
if (vit->mMeta.mGroupId == item->text(RSID_COL_KEYID).toStdString())
if (vit->mMeta.mGroupId == RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString()))
{
break;
}
@ -345,11 +345,11 @@ void IdDialog::insertIdList(uint32_t token)
updateSelection();
}
void IdDialog::requestIdDetails(std::string &id)
void IdDialog::requestIdDetails(RsGxsGroupId &id)
{
mIdQueue->cancelActiveRequestTokens(IDDIALOG_IDDETAILS);
if (id.empty())
if (id.isNull())
{
mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
mStateHelper->setActive(IDDIALOG_REPLIST, false);
@ -368,7 +368,7 @@ void IdDialog::requestIdDetails(std::string &id)
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
uint32_t token;
std::list<std::string> groupIds;
std::list<RsGxsGroupId> groupIds;
groupIds.push_back(id);
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS);
@ -414,12 +414,12 @@ void IdDialog::insertIdDetails(uint32_t token)
data = datavector[0];
/* get GPG Details from rsPeers */
std::string ownPgpId = rsPeers->getGPGOwnId();
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId.toStdString()));
if (data.mPgpKnown)
{

6
retroshare-gui/src/gui/Identity/IdDialog.h
View file

@ -60,12 +60,12 @@ private slots:
void todo();
private:
void requestIdDetails(std::string &id);
void requestIdDetails(RsGxsGroupId &id);
void insertIdDetails(uint32_t token);
void requestIdList();
void requestIdData(std::list<std::string> &ids);
bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const std::string &ownPgpId, int accept);
void requestIdData(std::list<RsGxsGroupId> &ids);
bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept);
void insertIdList(uint32_t token);
void filterIds();

14
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -156,7 +156,7 @@ void NewsFeed::updateDisplay()
case RS_FEED_ITEM_SEC_MISSING_CERTIFICATE:
case RS_FEED_ITEM_SEC_INTERNAL_ERROR:
if (Settings->getMessageFlags() & RS_MESSAGE_CONNECT_ATTEMPT) {
MessageComposer::sendConnectAttemptMsg(fi.mId1, fi.mId2, QString::fromUtf8(fi.mId3.c_str()));
MessageComposer::sendConnectAttemptMsg(RsPgpId(fi.mId1), RsPeerId(fi.mId2), QString::fromUtf8(fi.mId3.c_str()));
}
if (flags & RS_FEED_TYPE_SECURITY)
addFeedItemSecurityConnectAttempt(fi);
@ -265,7 +265,7 @@ void NewsFeed::testFeeds(uint notifyFlags)
switch(type) {
case RS_FEED_TYPE_PEER:
fi.mId1 = rsPeers->getOwnId();
fi.mId1 = rsPeers->getOwnId().toStdString();
instance->addFeedItemPeerConnect(fi);
instance->addFeedItemPeerDisconnect(fi);
@ -274,8 +274,8 @@ void NewsFeed::testFeeds(uint notifyFlags)
break;
case RS_FEED_TYPE_SECURITY:
fi.mId1 = rsPeers->getGPGOwnId();
fi.mId2 = rsPeers->getOwnId();
fi.mId1 = rsPeers->getGPGOwnId().toStdString();
fi.mId2 = rsPeers->getOwnId().toStdString();
instance->addFeedItemSecurityConnectAttempt(fi);
instance->addFeedItemSecurityAuthDenied(fi);
@ -402,7 +402,7 @@ void NewsFeed::testFeeds(uint notifyFlags)
#endif
case RS_FEED_TYPE_CHAT:
fi.mId1 = rsPeers->getOwnId();
fi.mId1 = rsPeers->getOwnId().toStdString();
fi.mId2 = tr("This is a test.").toUtf8().constData();
instance->addFeedItemChatNew(fi, true);
@ -794,7 +794,7 @@ void NewsFeed::addFeedItemChatNew(RsFeedItem &fi, bool addWithoutCheck)
std::cerr << std::endl;
#endif
if (!addWithoutCheck && fi.mId1 == rsPeers->getOwnId()) {
if (!addWithoutCheck && fi.mId1 == rsPeers->getOwnId().toStdString()) {
/* chat message from myself */
return;
}
@ -857,7 +857,7 @@ void NewsFeed::openChat(std::string peerId)
std::cerr << std::endl;
#endif
ChatDialog::chatFriend(peerId);
ChatDialog::chatFriend(RsPeerId(peerId));
}
void NewsFeed::openComments(uint32_t /*type*/, const RsGxsGroupId &/*groupId*/, const RsGxsMessageId &/*msgId*/, const QString &/*title*/)

4
retroshare-gui/src/gui/channels/ShareKey.cpp
View file

@ -68,8 +68,8 @@ void ShareKey::changeEvent(QEvent *e)
void ShareKey::shareKey()
{
std::list<std::string> shareList;
ui->keyShareList->selectedSslIds(shareList, false);
std::list<RsPeerId> shareList;
ui->keyShareList->selectedIds<RsPeerId,FriendSelectionWidget::IDTYPE_SSL>(shareList, false);
if (shareList.empty()) {
QMessageBox::warning(this, "RetroShare", tr("Please select at least one peer"), QMessageBox::Ok, QMessageBox::Ok);

2
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -59,7 +59,7 @@ void PopupChatDialog::init(const RsPeerId &peerId, const QString &title)
showAvatarFrame(PeerSettings->getShowAvatarFrame(peerId));
ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatarWidget->setId(peerId.toStdString(), false);
ui.avatarWidget->setId(peerId);
ui.ownAvatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
ui.ownAvatarWidget->setOwnId();

60
retroshare-gui/src/gui/common/AvatarWidget.cpp
View file

@ -39,7 +39,7 @@ AvatarWidget::AvatarWidget(QWidget *parent) :
ui->setupUi(this);
mFlag.isOwnId = false;
mFlag.isGpg = false;
// mFlag.isGpg = false;
defaultAvatar = ":/images/no_avatar_background.png";
setFrameType(NO_FRAME);
@ -110,11 +110,11 @@ void AvatarWidget::setFrameType(FrameType type)
updateAvatar(QString::fromStdString(mId));
Rshare::refreshStyleSheet(this, false);
}
void AvatarWidget::setId(const std::string &id, bool isGpg)
void AvatarWidget::setId(const RsPeerId &id)
{
mId = id;
mFlag.isGpg = isGpg;
mPgpId = rsPeers->getGPGId(id) ;
// mFlag.isGpg = false ;
if (mId == rsPeers->getOwnId()) {
mFlag.isOwnId = true;
@ -123,12 +123,12 @@ void AvatarWidget::setId(const std::string &id, bool isGpg)
setPixmap(QPixmap());
if (mId.empty()) {
if (id.isNull()) {
setEnabled(false);
}
refreshStatus();
updateAvatar(QString::fromStdString(mId));
updateAvatar(QString::fromStdString(mId.toStdString()));
}
void AvatarWidget::setOwnId()
@ -202,30 +202,30 @@ void AvatarWidget::updateAvatar(const QString &peerId)
return;
}
if (mFlag.isGpg) {
if (mId == peerId.toStdString()) {
/* called from AvatarWidget with gpg id */
QPixmap avatar;
AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
setPixmap(avatar);
return;
}
/* Is this one of the ssl ids of the gpg id ? */
std::list<std::string> sslIds;
if (rsPeers->getAssociatedSSLIds(mId, sslIds) == false) {
return;
}
if (std::find(sslIds.begin(), sslIds.end(), peerId.toStdString()) != sslIds.end()) {
/* One of the ssl ids of the gpg id */
QPixmap avatar;
AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
setPixmap(avatar);
}
return;
}
//if (mFlag.isGpg) {
// if (mId == peerId.toStdString()) {
// /* called from AvatarWidget with gpg id */
// QPixmap avatar;
// AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
// setPixmap(avatar);
// return;
// }
//
// /* Is this one of the ssl ids of the gpg id ? */
// std::list<std::string> sslIds;
// if (rsPeers->getAssociatedSSLIds(mId, sslIds) == false) {
// return;
// }
//
// if (std::find(sslIds.begin(), sslIds.end(), peerId.toStdString()) != sslIds.end()) {
// /* One of the ssl ids of the gpg id */
// QPixmap avatar;
// AvatarDefs::getAvatarFromGpgId(mId, avatar, defaultAvatar);
// setPixmap(avatar);
// }
//
// return;
//}
if (mId == peerId.toStdString()) {
QPixmap avatar;

8
retroshare-gui/src/gui/common/AvatarWidget.h
View file

@ -24,6 +24,7 @@
#include <QLabel>
#include <stdint.h>
#include <retroshare/rstypes.h>
namespace Ui {
class AvatarWidget;
@ -47,7 +48,7 @@ public:
QString frameState();
void setFrameType(FrameType type);
void setId(const std::string &id, bool isGpg);
void setId(const RsPeerId &id) ;
void setOwnId();
void setDefaultAvatar(const QString &avatar);
@ -65,10 +66,11 @@ private:
QString defaultAvatar;
Ui::AvatarWidget *ui;
std::string mId;
RsPeerId mId;
struct {
bool isOwnId : 1;
bool isGpg : 1;
// bool isGpg : 1;
} mFlag;
FrameType mFrameType;
uint32_t mPeerState;

14
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -600,7 +600,7 @@ void FriendList::insertPeers()
}
// get ids of existing private chat messages
std::list<std::string> privateChatIds;
std::list<RsPeerId> privateChatIds;
rsMsgs->getPrivateChatQueueIds(true, privateChatIds);
// get existing groups
@ -608,13 +608,13 @@ void FriendList::insertPeers()
std::list<RsGroupInfo>::iterator groupIt;
rsPeers->getGroupInfoList(groupInfoList);
std::list<std::string> gpgFriends;
std::list<std::string>::iterator gpgIt;
std::list<RsPgpId> gpgFriends;
std::list<RsPgpId>::iterator gpgIt;
rsPeers->getGPGAcceptedList(gpgFriends);
//add own gpg id, if we have more than on location (ssl client)
std::list<std::string> ownSslContacts;
std::string ownId = rsPeers->getGPGOwnId();
std::list<RsPeerId> ownSslContacts;
RsPgpId ownId = rsPeers->getGPGOwnId();
rsPeers->getAssociatedSSLIds(ownId, ownSslContacts);
if (ownSslContacts.size() > 0) {
gpgFriends.push_back(ownId);
@ -700,7 +700,7 @@ void FriendList::insertPeers()
}
}
std::list<std::string> fillGpgIds;
std::list<RsPgpId> fillGpgIds;
// start with groups
groupIt = groupInfoList.begin();
@ -771,7 +771,7 @@ void FriendList::insertPeers()
// iterate through gpg friends
for (gpgIt = gpgFriends.begin(); gpgIt != gpgFriends.end(); gpgIt++) {
std::string gpgId = *gpgIt;
RsPgpId gpgId = *gpgIt;
if (mShowGroups) {
if (groupInfo) {

4
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -190,7 +190,7 @@ void ConfCertDialog::load()
ui.rsid->setToolTip(link.title());
if (!detail.isOnlyGPGdetail) {
ui.avatar->setId(peerId.toStdString(), false);
ui.avatar->setId(peerId);
ui.loc->setText(QString::fromUtf8(detail.location.c_str()));
// Dont Show a timestamp in RS calculate the day
@ -259,7 +259,7 @@ void ConfCertDialog::load()
ui.pgpfingerprint->show();
ui.pgpfingerprint_label->show();
} else {
ui.avatar->setId(pgpId.toStdString(), true);
//ui.avatar->setId(pgpId.toStdString(), true);
ui.rsid->show();
ui.peerid->hide();

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -565,7 +565,7 @@ bool ConnectFriendWizard::validateCurrentPage()
case Page_FriendRecommendations:
{
std::list<RsPeerId> recommendIds;
ui->frec_recommendList->selectedSslIds_SSL(recommendIds, false);
ui->frec_recommendList->selectedIds<RsPeerId,FriendSelectionWidget::IDTYPE_SSL>(recommendIds, false);
if (recommendIds.empty()) {
QMessageBox::warning(this, "RetroShare", tr("Please select at least one friend for recommendation."), QMessageBox::Ok, QMessageBox::Ok);
@ -573,7 +573,7 @@ bool ConnectFriendWizard::validateCurrentPage()
}
std::list<RsPeerId> toIds;
ui->frec_toList->selectedSslIds_SSL(toIds, false);
ui->frec_toList->selectedIds<RsPeerId,FriendSelectionWidget::IDTYPE_SSL>(toIds, false);
if (toIds.empty()) {
QMessageBox::warning(this, "RetroShare", tr("Please select at least one friend as recipient."), QMessageBox::Ok, QMessageBox::Ok);

6
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -780,7 +780,7 @@ void NotifyQt::UpdateGUI()
if (popupflags & RS_POPUP_MSG)
{
toaster = new Toaster(new MessageToaster(std::string(), tr("Encrypted message"), QString("[%1]").arg(tr("Encrypted message"))));
toaster = new Toaster(new MessageToaster("", tr("Encrypted message"), QString("[%1]").arg(tr("Encrypted message"))));
}
break;
case RS_POPUP_MSG:
@ -796,7 +796,7 @@ void NotifyQt::UpdateGUI()
if (popupflags & RS_POPUP_CONNECT)
{
toaster = new Toaster(new OnlineToaster(id));
toaster = new Toaster(new OnlineToaster(RsPeerId(id)));
}
break;
case RS_POPUP_DOWNLOAD:
@ -940,7 +940,7 @@ void NotifyQt::testToaster(uint notifyFlags, /*RshareSettings::enumToasterPositi
toaster = new Toaster(new MessageToaster(id.toStdString(), title, message));
break;
case RS_POPUP_CONNECT:
toaster = new Toaster(new OnlineToaster(id.toStdString()));
toaster = new Toaster(new OnlineToaster(id));
break;
case RS_POPUP_DOWNLOAD:
toaster = new Toaster(new DownloadToaster(id.toStdString(), title));

34
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -140,15 +140,15 @@ void ChatPage::collectedInvite_openDistantChat()
{
QList<QListWidgetItem*> selected = ui._collected_contacts_LW->selectedItems() ;
std::string hash = (*selected.begin())->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id( (*selected.begin())->data(Qt::UserRole).toString().toStdString() );
std::cerr << "Openning secured chat tunnel for hash " << hash << ". Please wait..." << std::endl;
std::cerr << "Openning secured chat tunnel for virtual peer id " << virtual_peer_id << ". Please wait..." << std::endl;
uint32_t error_code ;
if(!rsMsgs->initiateDistantChatConnexion(hash,error_code))
if(!rsMsgs->initiateDistantChatConnexion(virtual_peer_id,error_code))
QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot open distant chat. Error code=")+QString::number(error_code)) ;
else
ChatDialog::chatFriend(hash);
ChatDialog::chatFriend(virtual_peer_id);
}
void ChatPage::collectedInvite_delete()
@ -157,11 +157,11 @@ void ChatPage::collectedInvite_delete()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
std::cerr << "Removing chat invite for hash " << hash << std::endl;
std::cerr << "Removing chat invite for virtual_peer_id " << virtual_peer_id << std::endl;
if(!rsMsgs->removeDistantChatInvite(hash))
if(!rsMsgs->removeDistantChatInvite(virtual_peer_id))
QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot remove distant chat invite.")) ;
}
@ -198,15 +198,15 @@ void ChatPage::personalInvites_copyLink()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
bool found = false ;
for(uint32_t i=0;i<invites.size();++i)
if(invites[i].hash == hash)
if(invites[i].pid == virtual_peer_id)
{
RetroShareLink link ;
if(!link.createPrivateChatInvite(invites[i].time_of_validity,QString::fromStdString(invites[i].destination_pgp_id),QString::fromStdString(invites[i].encrypted_radix64_string)))
if(!link.createPrivateChatInvite(invites[i].time_of_validity,QString::fromStdString(invites[i].destination_pgp_id.toStdString()),QString::fromStdString(invites[i].encrypted_radix64_string)))
{
std::cerr << "Cannot create link." << std::endl;
continue;
@ -228,9 +228,9 @@ void ChatPage::personalInvites_delete()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
rsMsgs->removeDistantChatInvite(hash) ;
rsMsgs->removeDistantChatInvite(virtual_peer_id) ;
}
load() ;
}
@ -397,7 +397,7 @@ ChatPage::load()
for(uint32_t i=0;i<invites.size();++i)
{
RsPeerDetails detail ;
rsPeers->getPeerDetails(invites[i].destination_pgp_id,detail) ;
rsPeers->getGPGDetails(invites[i].destination_pgp_id,detail) ;
if(invites[i].encrypted_radix64_string.empty())
{
@ -406,7 +406,7 @@ ChatPage::load()
QString tt ;
tt += tr("Name : ") + QString::fromStdString(detail.name) ;
tt += "\n" + QString("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id) ;
tt += "\n" + QString("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ;
tt += "\n" + QString("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ;
if(invites[i].invite_flags & RS_DISTANT_CHAT_FLAG_SIGNED)
@ -426,7 +426,7 @@ ChatPage::load()
item->setIcon(QIcon(":images/stock_signature_missing.png")) ;
}
item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ;
item->setToolTip(tt) ;
ui._collected_contacts_LW->insertItem(0,item) ;
@ -434,8 +434,8 @@ ChatPage::load()
else
{
QListWidgetItem *item = new QListWidgetItem;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id.toStdString())+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ;
ui._personal_invites_LW->insertItem(0,item) ;
}

2
retroshare-gui/src/gui/toaster/ChatLobbyToaster.cpp
View file

@ -25,7 +25,7 @@
#include <retroshare/rsmsgs.h>
ChatLobbyToaster::ChatLobbyToaster(const std::string &peerId, const QString &name, const QString &message) : QWidget(NULL)
ChatLobbyToaster::ChatLobbyToaster(const RsPeerId &peerId, const QString &name, const QString &message) : QWidget(NULL)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);

4
retroshare-gui/src/gui/toaster/ChatLobbyToaster.h
View file

@ -34,13 +34,13 @@ class ChatLobbyToaster : public QWidget
Q_OBJECT
public:
ChatLobbyToaster(const std::string &peerId, const QString &name, const QString &message);
ChatLobbyToaster(const RsPeerId &peerId, const QString &name, const QString &message);
private slots:
void chatButtonSlot();
private:
std::string peerId;
RsPeerId peerId;
/** Qt Designer generated object */
Ui::ChatLobbyToaster ui;

4
retroshare-gui/src/gui/toaster/ChatToaster.cpp
View file

@ -25,7 +25,7 @@
#include <retroshare/rspeers.h>
ChatToaster::ChatToaster(const std::string &peerId, const QString &message) : QWidget(NULL)
ChatToaster::ChatToaster(const RsPeerId &peerId, const QString &message) : QWidget(NULL)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -39,7 +39,7 @@ ChatToaster::ChatToaster(const std::string &peerId, const QString &message) : QW
ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE));
ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str()));
ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatarWidget->setId(peerId, false);
ui.avatarWidget->setId(peerId);
}
void ChatToaster::chatButtonSlot()

4
retroshare-gui/src/gui/toaster/ChatToaster.h
View file

@ -34,13 +34,13 @@ class ChatToaster : public QWidget
Q_OBJECT
public:
ChatToaster(const std::string &peerId, const QString &message);
ChatToaster(const RsPeerId &peerId, const QString &message);
private slots:
void chatButtonSlot();
private:
std::string peerId;
RsPeerId peerId;
/** Qt Designer generated object */
Ui::ChatToaster ui;

2
retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
View file

@ -23,7 +23,7 @@
#include <retroshare/rspeers.h>
FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QString &sslName, const std::string &peerId)
FriendRequestToaster::FriendRequestToaster(const RsPgpId &gpgId, const QString &sslName, const RsPeerId &peerId)
: QWidget(NULL), mGpgId(gpgId), mSslId(peerId), mSslName(sslName)
{
/* Invoke the Qt Designer generated object setup routine */

6
retroshare-gui/src/gui/toaster/FriendRequestToaster.h
View file

@ -32,14 +32,14 @@ class FriendRequestToaster : public QWidget
Q_OBJECT
public:
FriendRequestToaster(const std::string &gpgId, const QString &sslName, const std::string &peerId);
FriendRequestToaster(const RsPgpId &gpgId, const QString &sslName, const RsPeerId &peerId);
private slots:
void friendrequestButtonSlot();
private:
std::string mGpgId;
std::string mSslId;
RsPgpId mGpgId;
RsPeerId mSslId;
QString mSslName;
/** Qt Designer generated object */

4
retroshare-gui/src/gui/toaster/GroupChatToaster.cpp
View file

@ -23,7 +23,7 @@
#include <retroshare/rspeers.h>
GroupChatToaster::GroupChatToaster(const std::string &peerId, const QString &message) : QWidget(NULL)
GroupChatToaster::GroupChatToaster(const RsPeerId &peerId, const QString &message) : QWidget(NULL)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -38,7 +38,7 @@ GroupChatToaster::GroupChatToaster(const std::string &peerId, const QString &mes
ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str()));
ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatarWidget->setDefaultAvatar(":/images/user/personal64.png");
ui.avatarWidget->setId(peerId, false);
ui.avatarWidget->setId(peerId);
}
void GroupChatToaster::chatButtonSlot()

4
retroshare-gui/src/gui/toaster/GroupChatToaster.h
View file

@ -32,13 +32,13 @@ class GroupChatToaster : public QWidget
Q_OBJECT
public:
GroupChatToaster(const std::string &peerId, const QString &message);
GroupChatToaster(const RsPeerId &peerId, const QString &message);
private slots:
void chatButtonSlot();
private:
std::string peerId;
RsPeerId peerId;
/** Qt Designer generated object */
Ui::GroupChatToaster ui;

4
retroshare-gui/src/gui/toaster/OnlineToaster.cpp
View file

@ -22,7 +22,7 @@
#include <retroshare/rspeers.h>
OnlineToaster::OnlineToaster(const std::string &peerId) : QWidget(NULL)
OnlineToaster::OnlineToaster(const RsPeerId &peerId) : QWidget(NULL)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -36,7 +36,7 @@ OnlineToaster::OnlineToaster(const std::string &peerId) : QWidget(NULL)
/* set informations */
ui.textLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str()));
ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatarWidget->setId(peerId, false);
ui.avatarWidget->setId(peerId);
}
void OnlineToaster::chatButtonSlot()

5
retroshare-gui/src/gui/toaster/OnlineToaster.h
View file

@ -20,6 +20,7 @@
#ifndef ONLINETOASTER_H
#define ONLINETOASTER_H
#include <retroshare/rstypes.h>
#include "ui_OnlineToaster.h"
/**
@ -32,13 +33,13 @@ class OnlineToaster : public QWidget
Q_OBJECT
public:
OnlineToaster(const std::string &peerId);
OnlineToaster(const RsPeerId &peerId);
private slots:
void chatButtonSlot();
private:
std::string peerId;
RsPeerId peerId;
/** Qt Designer generated object */
Ui::OnlineToaster ui;