Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-30 09:13:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define empty service string as a valid case.

Browse Source
This commit is contained in:
Phenom 2016-02-22 19:07:49 +01:00
parent 3c3d23bf8a
commit 1a110e4ada
1 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libretroshare/src/services/p3gxschannels.cc
View File

@ -535,26 +535,6 @@ bool p3GxsChannels::getChannelDownloadDirectory(const RsGxsGroupId & groupId,std
/* extract from ServiceString */ /* extract from ServiceString */
SSGxsChannelGroup ss; SSGxsChannelGroup ss;
if (it->second.mServiceString.empty())
{
#ifdef GXSCHANNELS_DEBUG
std::cerr << "p3GxsChannels::getChannelDownloadDirectory() No ServiceString make new one." << std::endl;
#endif
std::string serviceString = ss.save();
uint32_t token;
it->second.mServiceString = serviceString; // update Local Cache.
RsGenExchange::setGroupServiceString(token, groupId, serviceString); // update dbase.
/* now reload it */
std::list<RsGxsGroupId> groups;
groups.push_back(groupId);
request_SpecificSubscribedGroups(groups);
return false;
}
ss.load(it->second.mServiceString); ss.load(it->second.mServiceString);
directory = ss.mDownloadDirectory; directory = ss.mDownloadDirectory;
@ -946,26 +926,6 @@ bool p3GxsChannels::autoDownloadEnabled(const RsGxsGroupId &groupId,bool& enable
/* extract from ServiceString */ /* extract from ServiceString */
SSGxsChannelGroup ss; SSGxsChannelGroup ss;
if (it->second.mServiceString.empty())
{
#ifdef GXSCHANNELS_DEBUG
std::cerr << "p3GxsChannels::autoDownloadEnabled() No ServiceString make new one." << std::endl;
#endif
std::string serviceString = ss.save();
uint32_t token;
it->second.mServiceString = serviceString; // update Local Cache.
RsGenExchange::setGroupServiceString(token, groupId, serviceString); // update dbase.
/* now reload it */
std::list<RsGxsGroupId> groups;
groups.push_back(groupId);
request_SpecificSubscribedGroups(groups);
return false;
}
ss.load(it->second.mServiceString); ss.load(it->second.mServiceString);
enabled = ss.mAutoDownload; enabled = ss.mAutoDownload;
@ -974,15 +934,17 @@ bool p3GxsChannels::autoDownloadEnabled(const RsGxsGroupId &groupId,bool& enable
bool SSGxsChannelGroup::load(const std::string &input) bool SSGxsChannelGroup::load(const std::string &input)
{ {
if(input.empty())
{
#ifdef GXSCHANNELS_DEBUG
std::cerr << "SSGxsChannelGroup::load() asked to load a null string." << std::endl;
#endif
return true ;
}
int download_val; int download_val;
mAutoDownload = false; mAutoDownload = false;
mDownloadDirectory.clear(); mDownloadDirectory.clear();
if(input.empty())
{
std::cerr << "(EE) SSGxsChannelGroup::load() asked to load a null string. Weird." << std::endl;
return false ;
}
RsTemporaryMemory tmpmem(input.length()); RsTemporaryMemory tmpmem(input.length());