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

Merge pull request #1306 from csoler/v0.6-TorOnly

Browse source 
V0.6 tor only
This commit is contained in:
csoler 2018-07-31 14:18:24 +02:00 • committed by GitHub
commit c948517c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 1171 additions and 1063 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/file_sharing/hash_cache.cc
View file

@ -27,6 +27,7 @@
#include "hash_cache.h"
#include "filelist_io.h"
#include "file_sharing_defaults.h"
#include "retroshare/rsinit.h"
//#define HASHSTORAGE_DEBUG 1
@ -478,7 +479,7 @@ bool HashStorage::try_load_import_old_hash_cache()
{
// compute file name
std::string base_dir = rsAccounts->PathAccountDirectory();
std::string base_dir = RsAccounts::AccountDirectory();
std::string old_cache_filename = base_dir + "/" + "file_cache.bin" ;
// check for unencrypted

4
libretroshare/src/file_sharing/p3filelists.cc
View file

@ -29,7 +29,7 @@
#include "retroshare/rsids.h"
#include "retroshare/rspeers.h"
#include "rsserver/rsaccounts.h"
#include "retroshare/rsinit.h"
#include "rsserver/p3face.h"
@ -48,7 +48,7 @@ p3FileDatabase::p3FileDatabase(p3ServiceControl *mpeers)
{
// make sure the base directory exists
std::string base_dir = rsAccounts->PathAccountDirectory();
std::string base_dir = RsAccounts::AccountDirectory();
if(base_dir.empty())
throw std::runtime_error("Cannot create base directory to store/access file sharing files.") ;