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

Fix QT Keychain dependencies and Appimage build.

Browse source
This commit is contained in:
Julien Wadel 2022-12-19 13:07:10 +01:00
parent ca56368469
commit fd3db129a0
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone-app/src/app/main.cpp
View file

@ -30,9 +30,12 @@ FILE * gStream = NULL;
#endif #endif
#include "components/core/CoreManager.hpp" #include "components/core/CoreManager.hpp"
#include "components/vfs/VfsUtils.hpp"
#include "utils/Utils.hpp" #include "utils/Utils.hpp"
#ifdef ENABLE_QT_KEYCHAIN
#include "components/vfs/VfsUtils.hpp"
#endif
// ============================================================================= // =============================================================================
void cleanStream(){ void cleanStream(){
@ -57,7 +60,12 @@ int main (int argc, char *argv[]) {
freopen_s(&gStream, "CONOUT$", "w", stderr); freopen_s(&gStream, "CONOUT$", "w", stderr);
} }
#endif #endif
#ifdef ENABLE_QT_KEYCHAIN
bool vfsEncrypted = VfsUtils::updateSDKWithKey(); bool vfsEncrypted = VfsUtils::updateSDKWithKey();
#else
bool vfsEncrypted = false;
#endif
AppController controller(argc, argv); AppController controller(argc, argv);
#ifdef QT_QML_DEBUG #ifdef QT_QML_DEBUG

6
linphone-app/src/components/settings/SettingsModel.cpp
View file

@ -68,7 +68,7 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) {
connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::groupChatEnabledChanged); connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::groupChatEnabledChanged);
connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::videoConferenceEnabledChanged); connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::videoConferenceEnabledChanged);
connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::secureChatEnabledChanged); connect(coreManager->getAccountSettingsModel(), &AccountSettingsModel::accountSettingsUpdated, this, &SettingsModel::secureChatEnabledChanged);
#ifdef ENABLE_QT_KEYCHAIN
connect(&mVfsUtils, &VfsUtils::keyRead, this, [&](const QString& key, const QString& value){ connect(&mVfsUtils, &VfsUtils::keyRead, this, [&](const QString& key, const QString& value){
if(key == mVfsUtils.getApplicationVfsEncryptionKey()){ if(key == mVfsUtils.getApplicationVfsEncryptionKey()){
if(!getVfsEncrypted()){ if(!getVfsEncrypted()){
@ -100,7 +100,7 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) {
connect(&mVfsUtils, &VfsUtils::error, this, [&](){ connect(&mVfsUtils, &VfsUtils::error, this, [&](){
}); });
#endif
configureRlsUri(); configureRlsUri();
} }
@ -1735,6 +1735,7 @@ bool SettingsModel::getVfsEncrypted (){
} }
void SettingsModel::setVfsEncrypted (bool encrypted, const bool deleteUserData){ void SettingsModel::setVfsEncrypted (bool encrypted, const bool deleteUserData){
#ifdef ENABLE_QT_KEYCHAIN
if(getVfsEncrypted() != encrypted){ if(getVfsEncrypted() != encrypted){
if(encrypted) { if(encrypted) {
mVfsUtils.newEncryptionKey(); mVfsUtils.newEncryptionKey();
@ -1743,6 +1744,7 @@ void SettingsModel::setVfsEncrypted (bool encrypted, const bool deleteUserData){
mVfsUtils.deleteKey(mVfsUtils.getApplicationVfsEncryptionKey()); mVfsUtils.deleteKey(mVfsUtils.getApplicationVfsEncryptionKey());
} }
} }
#endif
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

7
linphone-app/src/components/settings/SettingsModel.hpp
View file

@ -29,9 +29,12 @@
#include "components/core/CoreHandlers.hpp" #include "components/core/CoreHandlers.hpp"
#include "components/contacts/ContactsImporterModel.hpp" #include "components/contacts/ContactsImporterModel.hpp"
#include "components/vfs/VfsUtils.hpp"
#include "utils/LinphoneEnums.hpp" #include "utils/LinphoneEnums.hpp"
#ifdef ENABLE_QT_KEYCHAIN
#include "components/vfs/VfsUtils.hpp"
#endif
// ============================================================================= // =============================================================================
class TunnelModel; class TunnelModel;
@ -815,7 +818,9 @@ private:
int mCurrentSettingsTab = 0; int mCurrentSettingsTab = 0;
MediastreamerUtils::SimpleCaptureGraph *mSimpleCaptureGraph = nullptr; MediastreamerUtils::SimpleCaptureGraph *mSimpleCaptureGraph = nullptr;
int mCaptureGraphListenerCount = 0; int mCaptureGraphListenerCount = 0;
#ifdef ENABLE_QT_KEYCHAIN
VfsUtils mVfsUtils; VfsUtils mVfsUtils;
#endif
std::shared_ptr<linphone::Config> mConfig; std::shared_ptr<linphone::Config> mConfig;
}; };

4
linphone-app/tools/create_appimage.sh
View file

@ -49,6 +49,10 @@ cp -f "${BIN_SOURCE_DIR}/lib"/libapp-plugin* "${WORK_DIR}/AppDir/usr/lib/"
cp -f "${BIN_SOURCE_DIR}/lib64"/libsoci_sqlite3* "${WORK_DIR}/AppDir/usr/lib/" cp -f "${BIN_SOURCE_DIR}/lib64"/libsoci_sqlite3* "${WORK_DIR}/AppDir/usr/lib/"
cp -f "${BIN_SOURCE_DIR}/lib64"/libapp-plugin* "${WORK_DIR}/AppDir/usr/lib/" cp -f "${BIN_SOURCE_DIR}/lib64"/libapp-plugin* "${WORK_DIR}/AppDir/usr/lib/"
cp -f "${BIN_SOURCE_DIR}/lib"/libEQt* "${WORK_DIR}/AppDir/usr/lib/"
cp -f "${BIN_SOURCE_DIR}/lib64"/libEQt* "${WORK_DIR}/AppDir/usr/lib/"
if [ -d "${BIN_SOURCE_DIR}/lib64/mediastreamer" ]; then if [ -d "${BIN_SOURCE_DIR}/lib64/mediastreamer" ]; then
mkdir -p "${WORK_DIR}/AppDir/usr/plugins/" mkdir -p "${WORK_DIR}/AppDir/usr/plugins/"
cp -rf "${BIN_SOURCE_DIR}"/lib64/mediastreamer "${WORK_DIR}/AppDir/usr/plugins/" cp -rf "${BIN_SOURCE_DIR}"/lib64/mediastreamer "${WORK_DIR}/AppDir/usr/plugins/"