diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index 32ba0cda8..e672a229d 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -66,6 +66,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 diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index f9281f366..e709b3a66 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -478,12 +478,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; }