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

Got message retrieval working for genexchange across gxs chain

Browse source 
- fixed segv bugs for message retrieval and improved data service meta data retrieval 
- fixed compile for windows (exposed too many of rs internals in interface!)
- fixed msg signing functionality and id creation with ssl
- still need to complete photoservice gui and local meta change function

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-08-19 22:15:37 +00:00
parent 5425ab36b5
commit c17460d1b1
16 changed files with 254 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

30
retroshare-gui/src/gui/PhotoShare/PhotoAddDialog.cpp
View file

@ -304,11 +304,11 @@ void PhotoAddDialog::publishAlbum()
album.mShareOptions.mCommentMode = 0;
album.mShareOptions.mResizeMode = 0;
//album.mMeta.mGroupName = ui.lineEdit_Title->text().toStdString();
//album.mCategory = "Unknown";
//album.mCaption = ui.lineEdit_Caption->text().toStdString();
//album.mWhere = ui.lineEdit_Where->text().toStdString();
//album.mWhen = ui.lineEdit_When->text().toStdString();
album.mMeta.mGroupName = ui.lineEdit_Title->text().toStdString();
album.mCategory = "Unknown";
album.mCaption = ui.lineEdit_Caption->text().toStdString();
album.mWhere = ui.lineEdit_Where->text().toStdString();
album.mWhen = ui.lineEdit_When->text().toStdString();
/* grab the image from the AlbumDrop */
if (ui.AlbumDrop->getPhotoCount() > 0)
@ -325,6 +325,7 @@ void PhotoAddDialog::publishAlbum()
/* call publishPhotos directly */
publishPhotos(album.mMeta.mGroupId);
return;
}
@ -469,9 +470,8 @@ void PhotoAddDialog::loadAlbum(const std::string &albumId)
albumIds.push_back(albumId);
// We need both Album and Photo Data.
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
mPhotoQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, albumIds, 0);
}
@ -636,8 +636,20 @@ void PhotoAddDialog::loadRequest(const TokenQueueV2 *queue, const TokenRequestV2
}
break;
case TOKENREQ_MSGINFO:
loadPhotoData(req.mToken);
break;
switch(req.mAnsType)
{
case RS_TOKREQ_ANSTYPE_DATA:
loadPhotoData(req.mToken);
break;
case RS_TOKREQ_ANSTYPE_ACK:
acknowledgeMessage(req.mToken);
break;
default:
std::cerr << "PhotoAddDialog::loadRequest() ERROR: MESSAGE: INVALID ANS TYPE";
std::cerr << std::endl;
}
break;
default:
std::cerr << "PhotoAddDialog::loadRequest() ERROR: INVALID TYPE";
std::cerr << std::endl;

8
retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
View file

@ -487,8 +487,6 @@ bool PhotoDialog::loadAlbumData(const uint32_t &token)
std::cerr << "PhotoDialog::loadAlbumData()";
std::cerr << std::endl;
clearAlbums();
std::vector<RsPhotoAlbum> albums;
rsPhotoV2->getAlbum(token, albums);
@ -643,9 +641,9 @@ void PhotoDialog::loadRequest(const TokenQueueV2 *queue, const TokenRequestV2 &r
case RS_TOKREQ_ANSTYPE_ACK:
acknowledgeMessage(req.mToken);
break;
//case RS_TOKREQ_ANSTYPE_DATA:
// loadPhotoData(req.mToken);
// break;
case RS_TOKREQ_ANSTYPE_DATA:
loadPhotoData(req.mToken);
break;
default:
std::cerr << "PhotoDialog::loadRequest() ERROR: MSG: INVALID ANS TYPE";
std::cerr << std::endl;

2
retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
View file

@ -141,7 +141,7 @@ void PhotoItem::updateText()
if (mAlbumDetails.mSetFlags & RSPHOTO_FLAGS_ATTRIB_AUTHOR)
{
// This needs to be fixed!! TODO
fromLabel->setText(QString::fromStdString(mAlbumDetails.mMeta.mGroupId));
fromLabel->setText(QString::fromStdString(mAlbumDetails.mPhotographer));
}
if (mAlbumDetails.mSetFlags & RSPHOTO_FLAGS_ATTRIB_WHERE)