From 15041368287931e09cac95c36d06eea27626e150 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 26 May 2020 03:59:43 +0400 Subject: [PATCH 1/2] Don't spam logs if there are no dbus --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 718489156..b291c6d70 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -479,12 +479,17 @@ std::optional LastUserInputTime() { QDBusError::NotSupported, }; + const auto notSupportedErrorsToLog = { + QDBusError::Disconnected, + QDBusError::AccessDenied, + }; + if (reply.isValid()) { return (crl::now() - static_cast(reply.value())); } else if (ranges::contains(notSupportedErrors, reply.error().type())) { NotSupported = true; } else { - if (reply.error().type() == QDBusError::AccessDenied) { + if (ranges::contains(notSupportedErrorsToLog, reply.error().type())) { NotSupported = true; } From a37138aa52607ec32bf54e7f3f087b8f6c1335a9 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 1 Jun 2020 15:08:16 +0400 Subject: [PATCH 2/2] Fix signature key errors in snap action --- .github/workflows/snap.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index da451ea07..d39b12966 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -59,6 +59,9 @@ jobs: - name: First set up. run: | + # Workaround for permanent problems with third-party repository keys + sudo rm -rf /etc/apt/sources.list.d/* + sudo apt-get update sudo apt-get install gcc-8 g++-8 -y sudo snap install --classic snapcraft