diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index d70dd358171be..8de69d0f8985e 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -9,6 +9,9 @@ #include "accountmanager.h" #include "clientproxy.h" #include "common/utility.h" +#ifdef Q_OS_MACOS +#include "common/utility_mac_sandbox.h" +#endif #include "configfile.h" #include "filesystem.h" #include "folderman.h" @@ -118,7 +121,13 @@ void OwncloudSetupWizard::startWizard() // if its a relative path, prepend with users home dir, otherwise use as absolute path if (!QDir(localFolder).isAbsolute()) { - localFolder = QDir::homePath() + QLatin1Char('/') + localFolder; + const auto homeDirectory = +#ifdef Q_OS_MACOS + Utility::getRealHomeDirectory(); +#else + QDir::homePath(); +#endif + localFolder = QDir(homeDirectory).filePath(localFolder); } _ocWizard->setProperty("localFolder", localFolder); diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index af2b2900a5719..a778e67be2fb2 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -18,6 +18,9 @@ #include "wizard/owncloudwizardcommon.h" #include "wizard/owncloudadvancedsetuppage.h" #include "account.h" +#ifdef Q_OS_MACOS +#include "common/utility_mac_sandbox.h" +#endif #include "theme.h" #include "configfile.h" #include "selectivesyncdialog.h" @@ -487,7 +490,13 @@ void OwncloudAdvancedSetupPage::setRemoteFolder(const QString &remoteFolder) void OwncloudAdvancedSetupPage::slotSelectFolder() { - QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Local Sync Folder"), QDir::homePath()); + const auto homeDirectory = +#ifdef Q_OS_MACOS + Utility::getRealHomeDirectory(); +#else + QDir::homePath(); +#endif + QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Local Sync Folder"), homeDirectory); if (!dir.isEmpty()) { // TODO: remove when UX decision is made refreshVirtualFilesAvailibility(dir); @@ -588,8 +597,13 @@ void OwncloudAdvancedSetupPage::slotQuotaRetrievedWithError(QNetworkReply *reply qint64 OwncloudAdvancedSetupPage::availableLocalSpace() const { QString localDir = localFolder(); - QString path = !QDir(localDir).exists() && localDir.contains(QDir::homePath()) ? - QDir::homePath() : localDir; + const auto homeDirectory = +#ifdef Q_OS_MACOS + Utility::getRealHomeDirectory(); +#else + QDir::homePath(); +#endif + QString path = !QDir(localDir).exists() && localDir.contains(homeDirectory) ? homeDirectory : localDir; QStorageInfo storage(QDir::toNativeSeparators(path)); return storage.bytesAvailable();