Skip to content

[stable-33.0] fix(macOS): Always use un-sandboxed path for sync folder location in wizard(s) #10720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claucambra wants to merge 1 commit into
base: stable-33.0
Choose a base branch
from
+27 −4
Open

[stable-33.0] fix(macOS): Always use un-sandboxed path for sync folder location in wizard(s) #10720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/gui/owncloudsetupwizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include "accessmanager.h"

Check failure on line 7 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:7:10 [clang-diagnostic-error] 

'accessmanager.h' file not found
#include "account.h"
#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"
Expand Down Expand Up @@ -118,7 +121,13 @@
// 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);
Expand Down
20 changes: 17 additions & 3 deletions src/gui/wizard/owncloudadvancedsetuppage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <QDir>

Check failure on line 7 in src/gui/wizard/owncloudadvancedsetuppage.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/wizard/owncloudadvancedsetuppage.cpp:7:10 [clang-diagnostic-error] 

'QDir' file not found
#include <QFileDialog>
#include <QUrl>
#include <QTimer>
Expand All @@ -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"
Expand Down Expand Up @@ -487,8 +490,14 @@

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);

Check warning on line 499 in src/gui/wizard/owncloudadvancedsetuppage.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "dir" of type "class QString" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AaBitZSFJlv6RvM4yJL9&open=AaBitZSFJlv6RvM4yJL9&pullRequest=10720
if (!dir.isEmpty()) {

Check warning on line 500 in src/gui/wizard/owncloudadvancedsetuppage.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use the init-statement to declare "dir" inside the if statement. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AaBitZSFJlv6RvM4yJL8&open=AaBitZSFJlv6RvM4yJL8&pullRequest=10720
// TODO: remove when UX decision is made
refreshVirtualFilesAvailibility(dir);

Expand Down Expand Up @@ -588,8 +597,13 @@
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;

Check warning on line 606 in src/gui/wizard/owncloudadvancedsetuppage.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "path" of type "class QString" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AaBitZSFJlv6RvM4yJL-&open=AaBitZSFJlv6RvM4yJL-&pullRequest=10720
QStorageInfo storage(QDir::toNativeSeparators(path));

return storage.bytesAvailable();
Expand Down
Loading