mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-28 09:19:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set zrtp/lime database path in qt desktop app

Browse source
This commit is contained in:
Johan Pascal 2017-04-04 15:58:19 +07:00 • committed by Jehan Monnier
parent b8323378c7
commit 2826692c82
5 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-desktop/src/app/paths/Paths.cpp
View file

@ -43,6 +43,7 @@
#define PATH_FRIENDS_LIST "/friends.db"
#define PATH_MESSAGE_HISTORY_LIST "/message-history.db"
#define PATH_ZRTP_SECRETS "/zidcache"
#define PATH_ZRTP_DATA "/zrtp-lime.db"
using namespace std;
@ -199,6 +200,10 @@ string Paths::getZrtpSecretsFilepath () {
return getWritableFilePath(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + PATH_ZRTP_SECRETS);
}
string Paths::getZrtpDataFilepath () {
return getWritableFilePath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + PATH_ZRTP_DATA);
}
string Paths::getUserCertificatesDirpath () {
return getWritableDirectoryPath(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + PATH_USER_CERTIFICATES);
}

1
linphone-desktop/src/app/paths/Paths.hpp
View file

@ -45,6 +45,7 @@ namespace Paths {
std::string getFriendsListFilepath ();
std::string getMessageHistoryFilepath ();
std::string getZrtpSecretsFilepath ();
std::string getZrtpDataFilepath ();
void migrate ();
}

2
linphone-desktop/src/components/core/CoreManager.cpp
View file

@ -92,6 +92,8 @@ void CoreManager::setDatabasesPaths () {
void CoreManager::setOtherPaths () {
m_core->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath());
/* this one is actually a database but it MUST be set after the zrtp secrets as it allows automatic migration from old version(secrets, xml) to new version (data, sqlite)*/
m_core->setZrtpCacheDatabasePath(Paths::getZrtpDataFilepath());
m_core->setUserCertificatesPath(Paths::getUserCertificatesDirpath());
}

2
submodules/bzrtp

@ -1 +1 @@
Subproject commit 556335fee2bbb28e6cbe40510499ef15abef85fb
Subproject commit 8e9b45db8a5ab7deac4a3a2c122af3e5f6239695

2
submodules/linphone

@ -1 +1 @@
Subproject commit bfcda8ef5dae3297ed13e6485f6a85fff3e89a46
Subproject commit 9368df723805a7d79f53badb0b64f39a6f6bf978