fix: Set the current update channel together with the enterprise channel

But only if it's more stable.

Signed-off-by: Tamás Bari <[email protected]>

Author: Aiiaiiio

src/libsync/configfile.cpp

@@ -6,11 +6,11 @@
 
 #include "config.h"
 
+#include "common/asserts.h"
+#include "common/utility.h"
 #include "configfile.h"
 #include "theme.h"
-#include "version.h"
-#include "common/utility.h"
-#include "common/asserts.h"
+#include "updatechannel.h"
 #include "version.h"
 
 #include "creds/abstractcredentials.h"
@@ -1216,6 +1216,9 @@ void ConfigFile::setDesktopEnterpriseChannel(const QString &channel)
 {
     QSettings settings(configFile(), QSettings::IniFormat);
     settings.setValue(QLatin1String(desktopEnterpriseChannelName), channel);
+    const auto currentUpdateChannel = UpdateChannel::fromString(this->currentUpdateChannel());
+    const auto newEnterpriseUpdateChannel = UpdateChannel::fromString(channel);
+    setUpdateChannel(UpdateChannel::mostStable(currentUpdateChannel, newEnterpriseUpdateChannel).toString());
 }
 
 QString ConfigFile::language() const

src/libsync/updatechannel.cpp

@@ -25,6 +25,11 @@ QString UpdateChannel::toString() const
 
 std::strong_ordering UpdateChannel::operator<=>(const UpdateChannel &rhs) const = default;
 
+UpdateChannel UpdateChannel::mostStable(const UpdateChannel &a, const UpdateChannel &b)
+{
+    return std::max(a, b);
+}
+
 UpdateChannel UpdateChannel::fromString(const QString &channelName) // static
 {
     using enum ChannelName;

src/libsync/updatechannel.h

@@ -27,6 +27,7 @@ class UpdateChannel
     std::strong_ordering operator<=>(const UpdateChannel &rhs) const;
 
     static UpdateChannel fromString(const QString &channelName);
+    static UpdateChannel mostStable(const UpdateChannel &a, const UpdateChannel &b);
 
 private:
     UpdateChannel();