diff --git a/src/app/lrcinstance.cpp b/src/app/lrcinstance.cpp
index cbb2cb653976156ab651fec11ac4fbb7270acae9..7e7162d8ee61a26d5d7b0db795b74eadfd26fbea 100644
--- a/src/app/lrcinstance.cpp
+++ b/src/app/lrcinstance.cpp
@@ -31,12 +31,14 @@ LRCInstance::LRCInstance(migrateCallback willMigrateCb,
migrateCallback didMigrateCb,
const QString& updateUrl,
ConnectivityMonitor* connectivityMonitor,
- bool muteDring)
- : lrc_(std::make_unique<Lrc>(willMigrateCb, didMigrateCb, muteDring))
+ bool debugMode,
+ bool muteDaemon)
+ : lrc_(std::make_unique<Lrc>(willMigrateCb, didMigrateCb, !debugMode || muteDaemon))
, updateManager_(std::make_unique<UpdateManager>(updateUrl, connectivityMonitor, this))
, threadPool_(new QThreadPool(this))
{
- debugMode_ = !muteDring;
+ debugMode_ = debugMode;
+ muteDaemon_ = muteDaemon;
threadPool_->setMaxThreadCount(1);
connect(this, &LRCInstance::currentAccountIdChanged, [this] {
diff --git a/src/app/lrcinstance.h b/src/app/lrcinstance.h
index 19ee68903acd4b6c2f05a15b7f27518cd4796a50..4acf94884e7a6ccc421975f6235a8ad9ed132534 100644
--- a/src/app/lrcinstance.h
+++ b/src/app/lrcinstance.h
@@ -65,7 +65,8 @@ public:
migrateCallback didMigrateCb,
const QString& updateUrl,
ConnectivityMonitor* connectivityMonitor,
- bool muteDring);
+ bool debugMode,
+ bool muteDaemon);
~LRCInstance() = default;
void finish();
@@ -153,6 +154,7 @@ private:
conversation::Info invalid {};
bool debugMode_ {false};
+ bool muteDaemon_ {true};
QThreadPool* threadPool_;
};
diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
index a98bd4607135b28d4b85b57d75c2998042942c13..6d2f4e4f1f0608d496c2cb494b1ba51875cdb546 100644
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -149,7 +149,8 @@ MainApplication::init()
initLrc(runOptions_[Option::UpdateUrl].toString(),
connectivityMonitor_.get(),
- runOptions_[Option::Debug].toBool() && !runOptions_[Option::MuteJamid].toBool());
+ runOptions_[Option::Debug].toBool(),
+ runOptions_[Option::MuteDaemon].toBool());
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
using namespace Interfaces;
@@ -227,7 +228,10 @@ MainApplication::handleUriAction(const QString& arg)
}
void
-MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon)
+MainApplication::initLrc(const QString& downloadUrl,
+ ConnectivityMonitor* cm,
+ bool debugMode,
+ bool muteDaemon)
{
lrc::api::Lrc::cacheAvatars.store(false);
/*
@@ -252,7 +256,8 @@ MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bo
},
downloadUrl,
cm,
- !logDaemon));
+ debugMode,
+ muteDaemon));
lrcInstance_->subscribeToDebugReceived();
}
@@ -318,7 +323,7 @@ MainApplication::parseArguments()
runOptions_[Option::UpdateUrl] = parser.value(updateUrlOption);
#endif
runOptions_[Option::TerminationRequested] = parser.isSet(terminateOption);
- runOptions_[Option::MuteJamid] = parser.isSet(muteDaemonOption);
+ runOptions_[Option::MuteDaemon] = parser.isSet(muteDaemonOption);
}
void
diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h
index f8e24da21e77a82fffbc5c0f45a476cd13295be3..fa8c12b91a5ab721985751ee54c279635bcebe97 100644
--- a/src/app/mainapplication.h
+++ b/src/app/mainapplication.h
@@ -73,7 +73,7 @@ public:
StartMinimized = 0,
Debug,
UpdateUrl,
- MuteJamid,
+ MuteDaemon,
TerminationRequested,
StartUri
};
@@ -99,7 +99,10 @@ Q_SIGNALS:
void searchAndSelect(const QString& request);
private:
- void initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon);
+ void initLrc(const QString& downloadUrl,
+ ConnectivityMonitor* cm,
+ bool debugMode,
+ bool muteDaemon);
void parseArguments();
void setApplicationFont();
void initQmlLayer();
diff --git a/src/app/mainview/components/SwarmDetailsPanel.qml b/src/app/mainview/components/SwarmDetailsPanel.qml
index f56675589b07c6af2a15e7e1d618249253db79bd..1e668d4fd78712fd34492cc31ed635efdb975f0b 100644
--- a/src/app/mainview/components/SwarmDetailsPanel.qml
+++ b/src/app/mainview/components/SwarmDetailsPanel.qml
@@ -509,14 +509,12 @@ Rectangle {
RowLayout {
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.preferredHeight: JamiTheme.settingsFontSize + 2 * JamiTheme.preferredMarginSize + 4
- Layout.maximumWidth: parent.width
visible: LRCInstance.debugMode()
Text {
- id: idLabel
+ Layout.fillWidth: true
Layout.preferredHeight: 30
Layout.rightMargin: JamiTheme.preferredMarginSize
- Layout.maximumWidth: parent.width / 2
text: JamiStrings.identifier
font.pixelSize: JamiTheme.settingsDescriptionPixelSize
@@ -530,12 +528,11 @@ Rectangle {
Text {
Layout.alignment: Qt.AlignRight
- Layout.rightMargin: JamiTheme.settingsMarginSize
-
- Layout.maximumWidth: parent.width / 2
+ Layout.rightMargin: JamiTheme.preferredMarginSize
color: JamiTheme.textColor
font.pixelSize: JamiTheme.settingsDescriptionPixelSize
+ font.weight: Font.Medium
text: CurrentConversation.id
elide: Text.ElideRight
diff --git a/src/libclient/api/lrc.h b/src/libclient/api/lrc.h
index 0c6c6e71e7c5779d3fcc7234dcb03da428dd2d90..41149c9d61c7719fea5b57147b771f1fd5b133e3 100644
--- a/src/libclient/api/lrc.h
+++ b/src/libclient/api/lrc.h
@@ -47,7 +47,7 @@ public:
* @param willMigrateCb
* @param didMigrateCb
*/
- Lrc(MigrationCb willMigrateCb = {}, MigrationCb didMigrateCb = {}, bool muteDring = false);
+ Lrc(MigrationCb willMigrateCb = {}, MigrationCb didMigrateCb = {}, bool muteDaemon = false);
~Lrc();
/**
* get a reference on account model.
diff --git a/src/libclient/dbus/instancemanager.cpp b/src/libclient/dbus/instancemanager.cpp
index 2c9452745fc28946ae1cc056790dad55ed854ce1..8b81e7c6c1c3bf7a8a6b48963bc6874adffa8f7a 100644
--- a/src/libclient/dbus/instancemanager.cpp
+++ b/src/libclient/dbus/instancemanager.cpp
@@ -27,14 +27,14 @@
#include "../interfaces/dbuserrorhandleri.h"
InstanceManagerInterface&
-InstanceManager::instance(bool muteDring)
+InstanceManager::instance(bool muteDaemon)
{
#ifdef ENABLE_LIBWRAP
- static auto interface = new InstanceManagerInterface(muteDring);
+ static auto interface = new InstanceManagerInterface(muteDaemon);
#else
if (!dbus_metaTypeInit)
registerCommTypes();
- Q_UNUSED(muteDring)
+ Q_UNUSED(muteDaemon)
static auto interface = new InstanceManagerInterface("cx.ring.Ring",
"/cx/ring/Ring/Instance",
diff --git a/src/libclient/dbus/instancemanager.h b/src/libclient/dbus/instancemanager.h
index 1e82d5caee19eb72fcd232c5b0c013f930049496..14236e203b3391d66a6cdc7eb8ff555698641ad4 100644
--- a/src/libclient/dbus/instancemanager.h
+++ b/src/libclient/dbus/instancemanager.h
@@ -32,6 +32,6 @@
namespace InstanceManager {
-LIB_EXPORT InstanceManagerInterface& instance(bool muteDring = false);
+LIB_EXPORT InstanceManagerInterface& instance(bool muteDaemon = false);
}
diff --git a/src/libclient/lrc.cpp b/src/libclient/lrc.cpp
index 77b496648700c9c0d153989985a70bb5e1aa8764..f63d9b9774365ea36eee2bcf968ef5fd41da58f7 100644
--- a/src/libclient/lrc.cpp
+++ b/src/libclient/lrc.cpp
@@ -63,7 +63,7 @@ public:
std::unique_ptr<PluginModel> PluginModel_;
};
-Lrc::Lrc(MigrationCb willDoMigrationCb, MigrationCb didDoMigrationCb, bool muteDring)
+Lrc::Lrc(MigrationCb willDoMigrationCb, MigrationCb didDoMigrationCb, bool muteDaemon)
{
lrc::api::Lrc::holdConferences.store(true);
#ifndef ENABLE_LIBWRAP
@@ -77,7 +77,7 @@ Lrc::Lrc(MigrationCb willDoMigrationCb, MigrationCb didDoMigrationCb, bool muteD
#endif
// Ensure Daemon is running/loaded (especially on non-DBus platforms)
// before instantiating LRC and its members
- InstanceManager::instance(muteDring);
+ InstanceManager::instance(muteDaemon);
lrcPimpl_ = std::make_unique<LrcPimpl>(*this, willDoMigrationCb, didDoMigrationCb);
}
diff --git a/src/libclient/qtwrapper/instancemanager.cpp b/src/libclient/qtwrapper/instancemanager.cpp
index c6f23dd30e1f782553ff04369e2f1aa4bb48582e..bb18c0b09ea197431ac0ffb9392e3a7628f90d6b 100644
--- a/src/libclient/qtwrapper/instancemanager.cpp
+++ b/src/libclient/qtwrapper/instancemanager.cpp
@@ -27,7 +27,7 @@
static int ringFlags = 0;
-InstanceManagerInterface::InstanceManagerInterface(bool muteDring)
+InstanceManagerInterface::InstanceManagerInterface(bool muteDaemon)
{
using namespace std::placeholders;
@@ -44,7 +44,7 @@ InstanceManagerInterface::InstanceManagerInterface(bool muteDring)
#endif
#ifndef MUTE_LIBJAMI
- if (!muteDring) {
+ if (!muteDaemon) {
ringFlags |= libjami::LIBJAMI_FLAG_DEBUG;
ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
}
diff --git a/src/libclient/qtwrapper/instancemanager_wrap.h b/src/libclient/qtwrapper/instancemanager_wrap.h
index 1cdeec9274eb9fa02d20cb68462c322fe92306ff..9b0f3215135120c5375132cc55d5c758d2f893aa 100644
--- a/src/libclient/qtwrapper/instancemanager_wrap.h
+++ b/src/libclient/qtwrapper/instancemanager_wrap.h
@@ -38,7 +38,7 @@ class InstanceManagerInterface : public QObject
{
Q_OBJECT
public:
- InstanceManagerInterface(bool muteDring = false);
+ InstanceManagerInterface(bool muteDaemon = false);
~InstanceManagerInterface();
// TODO: These are not present in jami.h
diff --git a/tests/qml/main.cpp b/tests/qml/main.cpp
index 4ab0725d47b51acabbf5a7dba085928e2896a31d..0e92ed184aa9a6e6223018cff35cdb6a0d0a66f6 100644
--- a/tests/qml/main.cpp
+++ b/tests/qml/main.cpp
@@ -45,8 +45,8 @@ class Setup : public QObject
Q_OBJECT
public:
- Setup(bool muteDring = false)
- : muteDring_(muteDring)
+ Setup(bool muteDaemon = false)
+ : muteDaemon_(muteDaemon)
{}
public Q_SLOTS:
@@ -64,7 +64,7 @@ public Q_SLOTS:
QFontDatabase::addApplicationFont(":/images/FontAwesome.otf");
lrcInstance_.reset(
- new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), muteDring_));
+ new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), true, muteDaemon_));
lrcInstance_->subscribeToDebugReceived();
auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
@@ -118,7 +118,7 @@ private:
QScopedPointer<PreviewEngine> previewEngine_;
ScreenInfo screenInfo_;
- bool muteDring_ {false};
+ bool muteDaemon_ {false};
};
int
@@ -141,10 +141,10 @@ main(int argc, char** argv)
if (!envSet)
return 1;
- bool muteDring {false};
+ bool muteDaemon {false};
// We likely want to mute the daemon for log clarity.
- Utils::remove_argument(argv, argc, "--mutejamid", [&]() { muteDring = true; });
+ Utils::remove_argument(argv, argc, "--mutejamid", [&]() { muteDaemon = true; });
// Allow the user to enable fatal warnings for certain tests.
Utils::remove_argument(argv, argc, "--failonwarn", [&]() { qputenv("QT_FATAL_WARNINGS", "1"); });
@@ -153,7 +153,7 @@ main(int argc, char** argv)
QtWebEngineQuick::initialize();
#endif
QTEST_SET_MAIN_SOURCE_PATH
- Setup setup(muteDring);
+ Setup setup(muteDaemon);
return quick_test_main_with_setup(argc, argv, "qml_test", nullptr, &setup);
}
diff --git a/tests/unittests/globaltestenvironment.h b/tests/unittests/globaltestenvironment.h
index 8a45c229e41da5b23688df3abab0bd8d9ad47f0e..7d362a1790fcc044e14652a279c9ef8158445a3f 100644
--- a/tests/unittests/globaltestenvironment.h
+++ b/tests/unittests/globaltestenvironment.h
@@ -48,7 +48,7 @@ public:
std::atomic_bool isMigrating(false);
lrcInstance.reset(
- new LRCInstance(nullptr, nullptr, "", connectivityMonitor.get(), muteDring));
+ new LRCInstance(nullptr, nullptr, "", connectivityMonitor.get(), debugMode, muteDaemon));
lrcInstance->subscribeToDebugReceived();
// setup the adapters (their lifetimes are that of MainApplication)
@@ -71,7 +71,8 @@ public:
connectivityMonitor.reset();
}
- bool muteDring {false};
+ bool debugMode {false};
+ bool muteDaemon {false};
QScopedPointer<AccountAdapter> accountAdapter;
diff --git a/tests/unittests/main_unittest.cpp b/tests/unittests/main_unittest.cpp
index 36f54d918a86b5594a587b7e45b6054aae0b030e..c0a20031335d9e30fb83926747749764fee2c4e7 100644
--- a/tests/unittests/main_unittest.cpp
+++ b/tests/unittests/main_unittest.cpp
@@ -40,7 +40,7 @@ main(int argc, char* argv[])
return 1;
// We likely want to mute the daemon for log clarity.
- Utils::remove_argument(argv, argc, "--mutejamid", [&]() { globalEnv.muteDring = true; });
+ Utils::remove_argument(argv, argc, "--mutejamid", [&]() { globalEnv.muteDaemon = true; });
// Allow the user to enable fatal warnings for certain tests.
Utils::remove_argument(argv, argc, "--failonwarn", [&]() { qputenv("QT_FATAL_WARNINGS", "1"); });