mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-14 08:59:50 -05:00
Fix Compil with Photo Service
CONFIG+=gxsphotoshare
This commit is contained in:
parent
d6f02e28a7
commit
31acef55d3
@ -322,7 +322,7 @@ bool p3PhotoService::createAlbum(RsPhotoAlbum &album)
|
|||||||
return submitAlbumDetails(token, album) && waitToken(token) == RsTokenService::COMPLETE;
|
return submitAlbumDetails(token, album) && waitToken(token) == RsTokenService::COMPLETE;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool p3PhotoService::updateAlbum(const RsPhotoAlbum &album)
|
bool p3PhotoService::updateAlbum(const RsPhotoAlbum &/*album*/)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return false;
|
return false;
|
||||||
|
@ -31,7 +31,7 @@ class p3PhotoService : public RsGenExchange, public RsPhoto
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs);
|
p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs);
|
||||||
virtual RsServiceInfo getServiceInfo();
|
virtual RsServiceInfo getServiceInfo() override;
|
||||||
|
|
||||||
static uint32_t photoAuthenPolicy();
|
static uint32_t photoAuthenPolicy();
|
||||||
|
|
||||||
@ -40,38 +40,38 @@ public:
|
|||||||
/*!
|
/*!
|
||||||
* @return true if a change has occured
|
* @return true if a change has occured
|
||||||
*/
|
*/
|
||||||
bool updated();
|
bool updated() override;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void service_tick();
|
void service_tick() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
void notifyChanges(std::vector<RsGxsNotify*>& changes);
|
void notifyChanges(std::vector<RsGxsNotify*>& changes) override;
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/** Requests **/
|
/** Requests **/
|
||||||
|
|
||||||
void groupsChanged(std::list<RsGxsGroupId>& grpIds);
|
void groupsChanged(std::list<RsGxsGroupId>& grpIds) override;
|
||||||
|
|
||||||
|
|
||||||
void msgsChanged(GxsMsgIdResult& msgs);
|
void msgsChanged(GxsMsgIdResult& msgs) override;
|
||||||
|
|
||||||
RsTokenService* getTokenService();
|
RsTokenService* getTokenService() override;
|
||||||
|
|
||||||
bool getGroupList(const uint32_t &token, std::list<RsGxsGroupId> &groupIds);
|
bool getGroupList(const uint32_t &token, std::list<RsGxsGroupId> &groupIds) override;
|
||||||
bool getMsgList(const uint32_t &token, GxsMsgIdResult& msgIds);
|
bool getMsgList(const uint32_t &token, GxsMsgIdResult& msgIds) override;
|
||||||
|
|
||||||
/* Generic Summary */
|
/* Generic Summary */
|
||||||
bool getGroupSummary(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo);
|
bool getGroupSummary(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo) override;
|
||||||
|
|
||||||
bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo);
|
bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo) override;
|
||||||
|
|
||||||
/* Specific Service Data */
|
/* Specific Service Data */
|
||||||
bool getAlbum(const uint32_t &token, std::vector<RsPhotoAlbum> &albums);
|
bool getAlbum(const uint32_t &token, std::vector<RsPhotoAlbum> &albums) override;
|
||||||
bool getPhoto(const uint32_t &token, PhotoResult &photos);
|
bool getPhoto(const uint32_t &token, PhotoResult &photos) override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */
|
/* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */
|
||||||
@ -109,6 +109,13 @@ public:
|
|||||||
return acknowledgeMsg(token, msgId);
|
return acknowledgeMsg(token, msgId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Not currently used
|
||||||
|
virtual bool setCommentAsRead(uint32_t& /*token*/,const RsGxsGroupId& /*gid*/,const RsGxsMessageId& /*comment_msg_id*/) override
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Blocking versions.
|
// Blocking versions.
|
||||||
virtual bool createComment(RsGxsComment &msg) override
|
virtual bool createComment(RsGxsComment &msg) override
|
||||||
{
|
{
|
||||||
@ -126,7 +133,7 @@ public:
|
|||||||
* @param token token to redeem for acknowledgement
|
* @param token token to redeem for acknowledgement
|
||||||
* @param album album to be submitted
|
* @param album album to be submitted
|
||||||
*/
|
*/
|
||||||
bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album);
|
bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album) override;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* submits photo, which returns a token that needs
|
* submits photo, which returns a token that needs
|
||||||
@ -134,7 +141,7 @@ public:
|
|||||||
* @param token token to redeem for acknowledgement
|
* @param token token to redeem for acknowledgement
|
||||||
* @param photo photo to be submitted
|
* @param photo photo to be submitted
|
||||||
*/
|
*/
|
||||||
bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo);
|
bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo) override;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* submits photo comment, which returns a token that needs
|
* submits photo comment, which returns a token that needs
|
||||||
@ -152,7 +159,7 @@ public:
|
|||||||
* @param token token to redeem for acknowledgement
|
* @param token token to redeem for acknowledgement
|
||||||
* @param grpId the id of the group to subscribe to
|
* @param grpId the id of the group to subscribe to
|
||||||
*/
|
*/
|
||||||
bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe);
|
bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe) override;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* This allows the client service to acknowledge that their msgs has
|
* This allows the client service to acknowledge that their msgs has
|
||||||
@ -161,7 +168,7 @@ public:
|
|||||||
* @param msgIds map of grpid->msgIds of message created/modified
|
* @param msgIds map of grpid->msgIds of message created/modified
|
||||||
* @return true if token exists false otherwise
|
* @return true if token exists false otherwise
|
||||||
*/
|
*/
|
||||||
bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId);
|
bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* This allows the client service to acknowledge that their grps has
|
* This allows the client service to acknowledge that their grps has
|
||||||
@ -170,7 +177,7 @@ public:
|
|||||||
* @param msgIds vector of ids of groups created/modified
|
* @param msgIds vector of ids of groups created/modified
|
||||||
* @return true if token exists false otherwise
|
* @return true if token exists false otherwise
|
||||||
*/
|
*/
|
||||||
bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId);
|
bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId) override;
|
||||||
|
|
||||||
// Blocking versions.
|
// Blocking versions.
|
||||||
/*!
|
/*!
|
||||||
|
Loading…
Reference in New Issue
Block a user