fix: remove "updateChannel" from confg file upon 8.0 and until then force it to "ocis"

Author: DeepDiver1975

src/gui/updater/updater.cpp

@@ -36,12 +36,16 @@ Q_LOGGING_CATEGORY(lcUpdater, "gui.updater", QtInfoMsg)
 
 QString updateChannel()
 {
-    // remove deprecated updateChannel setting
+    // remove deprecated updateChannel setting once we hit 8.0
     auto settings = ConfigFile::makeQSettings();
     QString updateChannelKey = "updateChannel";
+    /*
     if (settings.contains(updateChannelKey)) {
         settings.remove(updateChannelKey);
     }
+    */
+    // until then, migrate old setting if present
+    settings.setValue(updateChannelKey, "ocis");
 
     // By now only two channels are supported: ocis and beta-ocis
     const QString suffix = OCC::Version::suffix();

src/libsync/configfile.cpp

@@ -59,6 +59,8 @@ const QString optionalDesktopNotificationsC()
 }
 const QString skipUpdateCheckC() { return QStringLiteral("skipUpdateCheck"); }
 const QString updateCheckIntervalC() { return QStringLiteral("updateCheckInterval"); }
+// deprecated - will be removed in 8.0
+// const QString updateChannelC() { return QStringLiteral("updateChannel"); }
 const QString uiLanguageC() { return QStringLiteral("uiLanguage"); }
 const QString geometryC() { return QStringLiteral("geometry"); }
 const QString timeoutC() { return QStringLiteral("timeout"); }