Update product name

CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(VERSION.cmake)
-project(owncloud-client LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH})
+project(OpenCloudDesktop LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH})
 include(FeatureSummary)
 
 find_package(ECM 6.0.0 REQUIRED NO_MODULE)

admin/osx/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 # Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from OPENCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.

shell_integration/windows/OCOverlays/OverlayConstants.h

@@ -22,7 +22,7 @@
 #define OVERLAY_GUID_WARNING        L"{0960F096-F328-48A3-B746-276B1E3C3722}"
 #define OVERLAY_GUID_WARNING_SHARED L"{0960F097-F328-48A3-B746-276B1E3C3722}"
 
-#define OVERLAY_GENERIC_NAME        L"ownCloud overlay handler"
+#define OVERLAY_GENERIC_NAME L"OpenCloud overlay handler"
 
 // two spaces to put us ahead of the competition :/
 #define OVERLAY_NAME_ERROR          L"  OCError"

shell_integration/windows/OCUtil/CommunicationSocket.cpp

@@ -46,7 +46,7 @@ std::wstring getUserName() {
 std::wstring CommunicationSocket::DefaultPipePath()
 {
     auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud-";
+    pipename += L"OpenCloud-";
     pipename += getUserName();
     return pipename;
 }

shell_integration/windows/OCUtil/Log.h

@@ -22,7 +22,7 @@ template <typename T = std::wstring>
 void log(const std::wstring &msg, const T &error = {})
 {
     std::wstringstream tmp;
-    tmp << L"ownCloud ShellExtension: " << msg;
+    tmp << L"OpenCloud ShellExtension: " << msg;
     if (!error.empty()) {
         tmp << L" " << error.data();
     }

shell_integration/windows/OCUtil/UtilConstants.h

@@ -25,6 +25,5 @@
 #define QUOTE							L"\""
 #define VALUE							L"value"
 
-#define REGISTRY_ROOT_KEY			 L"SOFTWARE\\ownCloud Inc\\ownCloud"
 #define REGISTRY_ENABLE_OVERLAY		 L"EnableOverlay"
 #define REGISTRY_FILTER_FOLDER		 L"FilterFolder"

src/cmd/cmd.cpp

@@ -426,7 +426,6 @@ int main(int argc, char **argv)
             // Find the folder and the original owncloud URL
             QStringList splitted = tmp.path().split(ctx.account->davPath());
             tmp.setPath(splitted.value(0));
-            tmp.setScheme(tmp.scheme().replace(QLatin1String("owncloud"), QLatin1String("http")));
             return tmp;
         }();
 

src/common/plugin.cpp

@@ -24,7 +24,7 @@ PluginFactory::~PluginFactory() = default;
 
 QString pluginFileName(const QString &type, const QString &name)
 {
-    return QStringLiteral("ownCloud_%2_%3").arg(type, name);
+    return QStringLiteral("OpenCloud_%2_%3").arg(type, name);
 }
 
 }

src/common/plugin.h

@@ -45,4 +45,4 @@ QString pluginFileName(const QString &type, const QString &name);
 
 }
 
-Q_DECLARE_INTERFACE(OCC::PluginFactory, "org.owncloud.PluginFactory")
+Q_DECLARE_INTERFACE(OCC::PluginFactory, "eu.opencloud.PluginFactory")

src/common/vfs.cpp

@@ -205,7 +205,7 @@ bool OCC::VfsPluginManager::isVfsPluginAvailable(Vfs::Mode mode) const
             qCDebug(lcPlugin) << "Plugin doesn't exist:" << loader.fileName() << "LibraryPath:" << QCoreApplication::libraryPaths();
             return false;
         }
-        if (basemeta[QStringLiteral("IID")].toString() != QLatin1String("org.owncloud.PluginFactory")) {
+        if (basemeta[QStringLiteral("IID")].toString() != QLatin1String("eu.opencloud.PluginFactory")) {
             qCWarning(lcPlugin) << "Plugin has wrong IID" << loader.fileName() << basemeta[QStringLiteral("IID")];
             return false;
         }

src/gui/aboutdialog.cpp

@@ -85,8 +85,7 @@ void AboutDialog::setupUpdaterWidget()
     }
     // we want to attach the known english identifiers which are also used within the configuration file as user data inside the data model
     // that way, when we intend to reset to the original selection when the dialog, we can look up the config file's stored value in the data model
-    ui->updateChannel->addItem(QStringLiteral("ownCloud 10 LTS"), QStringLiteral("stable"));
-    ui->updateChannel->addItem(QStringLiteral("ownCloud Infinite Scale stable"), QStringLiteral("ocis"));
+    ui->updateChannel->addItem(QStringLiteral("stable"), QStringLiteral("stable"));
     if (!Resources::isVanillaTheme()) {
         ui->updateChannel->addItem(tr("beta"), QStringLiteral("beta"));
     }
@@ -158,8 +157,7 @@ void AboutDialog::slotUpdateChannelChanged([[maybe_unused]] int index)
 
     auto msgBox = new QMessageBox(QMessageBox::Warning, tr("Change update channel?"),
         tr("<html>The update channel determines which client updates will be offered for installation.<ul>"
-           "<li>\"ownCloud 10 LTS\" contains only upgrades that are considered reliable</li>"
-           "<li>\"ownCloud Infinite Scale stable\" contains only upgrades that are considered reliable but <b>removes support for \"ownCloud 10\"</b></li>"
+           "<li>\"stable\" contains only upgrades that are considered reliable</li>"
            "%1"
            "</ul>"
            "<br>⚠️Downgrades are not supported. If you switch to a stable channel this change will only be applied with the next major release.</html>")

src/gui/connectionvalidator.cpp

@@ -155,9 +155,7 @@ void ConnectionValidator::slotCheckServerAndAuth()
 void ConnectionValidator::slotStatusFound(const QUrl &url, const QJsonObject &info)
 {
     // status.php was found.
-    qCInfo(lcConnectionValidator) << "** Application: ownCloud found: "
-                                  << url << " with version "
-                                  << info.value(QLatin1String("versionstring")).toString();
+    qCInfo(lcConnectionValidator) << "** Application: OpenCloud found: " << url << " with version " << info.value(QLatin1String("versionstring")).toString();
 
     // Update server URL in case of redirection
     if (_account->url() != url) {

src/gui/folder.cpp

@@ -1208,7 +1208,7 @@ void Folder::registerFolderWatcher()
     connect(_folderWatcher.data(), &FolderWatcher::becameUnreliable,
         this, &Folder::slotWatcherUnreliable);
     _folderWatcher->init(path());
-    _folderWatcher->startNotificatonTest(path() + QLatin1String(".owncloudsync.log"));
+    _folderWatcher->startNotificatonTest(path() + QLatin1String(".OpenCloudSync.log"));
 }
 
 bool Folder::virtualFilesEnabled() const

src/gui/guiutility.cpp

@@ -32,12 +32,12 @@ Q_LOGGING_CATEGORY(lcGuiUtility, "gui.utility", QtInfoMsg)
 namespace {
 const QString dirTag()
 {
-    return QStringLiteral("com.owncloud.spaces.app");
+    return QStringLiteral("eu.opencloud.spaces.app");
 }
 
 const QString uuidTag()
 {
-    return QStringLiteral("com.owncloud.spaces.account-uuid");
+    return QStringLiteral("eu.opencloud.spaces.account-uuid");
 }
 } // anonymous namespace
 

src/gui/guiutility_unix.cpp

@@ -25,7 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QStringLiteral("%1/ownCloud/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation));
+    return QStringLiteral("%1/OpenCloud/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation));
 }
 
 } // namespace OCC

src/gui/guiutility_win.cpp

@@ -25,7 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QStringLiteral(R"(\\.\pipe\ownCloud-%1)").arg(qEnvironmentVariable("USERNAME"));
+    return QStringLiteral(R"(\\.\pipe\OpenCloud-%1)").arg(qEnvironmentVariable("USERNAME"));
 }
 
 } // namespace OCC

src/gui/main.cpp

@@ -100,11 +100,11 @@ CommandLineOptions parseOptions(const QStringList &arguments)
                                  .arg(Theme::instance()->appName(), OCC::Version::displayString())
                           << Qt::endl;
 
-    if (Theme::instance()->appName() == QLatin1String("ownCloud")) {
+    if (Resources::isVanillaTheme()) {
         descriptionTextStream
             << Qt::endl
             << Qt::endl
-            << QApplication::translate("CommandLine", "For more information, see %1", "link to homepage").arg(QStringLiteral("https://www.owncloud.com"));
+            << QApplication::translate("CommandLine", "For more information, see %1", "link to homepage").arg(QStringLiteral("https://www.opencloud.eu"));
     }
 
     parser.setApplicationDescription(descriptionText);

src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp

@@ -15,6 +15,7 @@
 #include "webfingeruserinfojobfactory.h"
 #include "common/utility.h"
 #include "creds/httpcredentials.h"
+#include "creds/webfinger.h"
 
 #include <QApplication>
 #include <QJsonArray>
@@ -83,7 +84,7 @@ CoreJob *WebFingerInstanceLookupJobFactory::startJob(const QUrl &url, QObject *p
             const QString rel = linkObject.value(QStringLiteral("rel")).toString();
             const QString href = linkObject.value(QStringLiteral("href")).toString();
 
-            if (rel != QStringLiteral("http://webfinger.owncloud/rel/server-instance")) {
+            if (rel != WebFinger::relId()) {
                 qCDebug(lcWebFingerUserInfoJob) << "skipping invalid link" << href << "with rel" << rel;
                 continue;
             }

src/gui/qmlutils.cpp

@@ -36,7 +36,7 @@ void OCC::QmlUtils::OCQuickWidget::setOCContext(const QUrl &src, QWidget *parent
     rootContext()->setContextProperty(QStringLiteral("ocQuickWidget"), this);
     rootContext()->setContextProperty(QStringLiteral("ocContext"), ocContext);
     engine()->setObjectOwnership(ocContext, ownership);
-    engine()->addImageProvider(QStringLiteral("ownCloud"), new OCC::Resources::CoreImageProvider());
+    engine()->addImageProvider(QStringLiteral("OpenCloud"), new OCC::Resources::CoreImageProvider());
     setResizeMode(QQuickWidget::SizeRootObjectToView);
 
     // Ensure the parent widget used OC_DECLARE_WIDGET_FOCUS

src/gui/socketapi/socketapi.cpp

@@ -499,7 +499,7 @@ void SocketApi::command_VERSION(const QString &, SocketListener *listener)
 
 void SocketApi::command_SHARE_MENU_TITLE(const QString &, SocketListener *listener)
 {
-    listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
+    listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is OpenCloud").arg(Theme::instance()->appNameGUI()));
 }
 
 class GetOrCreatePublicLinkShare : public QObject

src/gui/syncrunfilelog.cpp

@@ -38,7 +38,7 @@ void SyncRunFileLog::start(const QString &folderPath)
     const qint64 logfileMaxSize = 10 * 1024 * 1024; // 10MiB
 
     // Note; this name is ignored in csync_exclude.c
-    const QString filename = folderPath + QStringLiteral(".owncloudsync.log");
+    const QString filename = folderPath + QStringLiteral(".OpenCloud.log");
 
     // When the file is too big, just rename it to an old name.
     QFileInfo info(filename);

src/gui/updater/updateinfo.cpp

@@ -53,8 +53,8 @@ QString UpdateInfo::downloadUrl() const
 
 UpdateInfo UpdateInfo::parseElement(const QDomElement &element, bool *ok)
 {
-    if (element.tagName() != QLatin1String("owncloudclient")) {
-        qCCritical(lcUpdater) << "Expected 'owncloudclient', got '" << element.tagName() << "'.";
+    if (element.tagName() != QLatin1String("OpenCloud")) {
+        qCCritical(lcUpdater) << "Expected 'OpenCloud', got '" << element.tagName() << "'.";
         if (ok)
             *ok = false;
         return UpdateInfo();

src/libsync/configfile.cpp

@@ -739,7 +739,7 @@ bool ConfigFile::monoIcons() const
     bool monoDefault = false; // On Mac we want bw by default
 #ifdef Q_OS_MAC
     // OEM themes are not obliged to ship mono icons
-    monoDefault = Theme::instance()->appNameGUI() == QStringLiteral("ownCloud");
+    monoDefault = Resources::isVanillaTheme();
 #endif
     return settings.value(monoIconsC(), monoDefault).toBool();
 }

src/libsync/creds/httpcredentials.cpp

@@ -37,7 +37,7 @@ namespace {
 constexpr int TokenRefreshMaxRetries = 3;
 constexpr std::chrono::seconds TokenRefreshDefaultTimeout = 30s;
 constexpr int CredentialVersion = 1;
-const char authenticationFailedC[] = "owncloud-authentication-failed";
+const char authenticationFailedC[] = "opencloud-authentication-failed";
 
 auto isOAuthC()
 {

src/libsync/creds/webfinger.cpp

@@ -27,14 +27,6 @@
 
 Q_LOGGING_CATEGORY(lcWebFinger, "sync.credentials.webfinger", QtInfoMsg)
 
-namespace {
-
-auto relId()
-{
-    return QStringLiteral("http://webfinger.owncloud/rel/server-instance");
-}
-}
-
 using namespace OCC;
 
 WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
@@ -45,7 +37,7 @@ WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
 
 void WebFinger::start(const QUrl &url, const QString &resourceId)
 {
-    //    GET /.well-known/webfinger?rel=http://webfinger.owncloud/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
+    //    GET /.well-known/webfinger?rel=http://webfinger.opencloud.eu/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
     if (OC_ENSURE(url.scheme() == QLatin1String("https"))) {
         QUrlQuery query;
         query.setQueryItems({ { QStringLiteral("resource"), QString::fromUtf8(QUrl::toPercentEncoding(resourceId)) },
@@ -93,3 +85,8 @@ const QUrl &WebFinger::href() const
 {
     return _href;
 }
+
+QString WebFinger::relId()
+{
+    return QStringLiteral("http://webfinger.opencloud.eu/rel/server-instance");
+}

src/libsync/creds/webfinger.h

@@ -35,6 +35,11 @@ class OWNCLOUDSYNC_EXPORT WebFinger : public QObject
 
     const QUrl &href() const;
 
+    /***
+     * ID used to describe our rel attribute
+     */
+    static QString relId();
+
 Q_SIGNALS:
     void finished();
 

src/libsync/propagatedownload.cpp

@@ -706,7 +706,7 @@ void PropagateDownloadFile::slotGetFinished()
 
         if (!_item->_directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
             // If this was with a direct download, retry without direct download
-            qCWarning(lcPropagateDownload) << "Direct download of" << _item->_directDownloadUrl << "failed. Retrying through owncloud.";
+            qCWarning(lcPropagateDownload) << "Direct download of" << _item->_directDownloadUrl << "failed. Retrying through OpenCloud.";
             _item->_directDownloadUrl.clear();
             start();
             return;

src/plugins/vfs/off/vfs_off.h

@@ -60,7 +60,7 @@ public Q_SLOTS:
 class OffVfsPluginFactory : public QObject, public DefaultPluginFactory<VfsOff>
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.owncloud.PluginFactory" FILE "vfspluginmetadata.json")
+    Q_PLUGIN_METADATA(IID "eu.opencloud.PluginFactory" FILE "vfspluginmetadata.json")
     Q_INTERFACES(OCC::PluginFactory)
 };
 

test/manual/windows close event/main.cpp

@@ -81,8 +81,8 @@ int main()
     int argc;
     wchar_t **argv = CommandLineToArgvW(commandLine, &argc);
 
-    const auto process = getHWND(argc == 2 ? argv[1] : L"owncloud.exe");
-//    const auto process = getHWND(L"WINDOW_TEST.exe");
+    const auto process = getHWND(argc == 2 ? argv[1] : L"opencloud.exe");
+    //    const auto process = getHWND(L"WINDOW_TEST.exe");
 
     std::wcout << "Query: WM_QUERYENDSESSION" << std::endl;
     broadcast(process, WM_QUERYENDSESSION, 0, ENDSESSION_CLOSEAPP);

test/modeltests/testactivitymodel.cpp

@@ -32,19 +32,19 @@ private Q_SLOTS:
 
         model->setActivityList({
             Activity{Activity::ActivityType, QStringLiteral("1"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("2"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("021ad48a-80ae-4af6-b878-aeb836bd367d"), acc2->account(), QStringLiteral("test"),
-                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
         });
         model->setActivityList({
             Activity{Activity::ActivityType, QStringLiteral("1"), acc2->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("2"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("021ad48a-80ae-4af6-b878-aeb836bd367d"), acc2->account(), QStringLiteral("test"),
-                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
         });
         model->slotRemoveAccount(AccountManager::instance()->accounts().first());
     }

test/testexcludedfiles.cpp

@@ -76,7 +76,7 @@ private Q_SLOTS:
                 workPath += fileName;
                 QFile file(workPath);
                 QVERIFY(file.open(QFile::WriteOnly));
-                file.write("ownCloud");
+                file.write("OpenCloud");
                 file.close();
             };
             if (create) {