From b6cfd6d6837fe967888e057ffc08c52f797e449d Mon Sep 17 00:00:00 2001 From: Iva Horn Date: Fri, 7 Nov 2025 14:44:46 +0100 Subject: [PATCH] fix(macOS): Writable check on debug archive destination directory. Signed-off-by: Iva Horn --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- src/gui/generalsettings.cpp | 16 +++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 76d1b34741..ac8d029e18 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nextcloud/NextcloudFileProviderKit.git", "state" : { - "revision" : "3ff19ffdda3361ec3446266aa757653a8b272898", - "version" : "3.2.11" + "revision" : "cb9c976ccc040946067f98079ca9091d8c6cb05b", + "version" : "4.0.0" } }, { @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nextcloud/NextcloudKit", "state" : { - "revision" : "67f3cf59a5e6ae11c061815a05197e2b2cbcb3ad", - "version" : "7.2.2" + "revision" : "8ac6f9e08d112b51a9b7a7189fa144009a6f382d", + "version" : "7.2.3" } }, { diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index bc6e01809f..ff5a8d03e0 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -121,24 +121,18 @@ QVector createDebugArchiveFileList() bool createDebugArchive(const QString &filename) { - const auto fileInfo = QFileInfo(filename); - const auto dirInfo = QFileInfo(fileInfo.dir().absolutePath()); - if (!dirInfo.isWritable()) { + const auto entries = createDebugArchiveFileList(); + + KZip zip(filename); + + if (!zip.open(QIODevice::WriteOnly)) { QMessageBox::critical( nullptr, QObject::tr("Failed to create debug archive"), QObject::tr("Could not create debug archive in selected location!"), QMessageBox::Ok ); - return false; - } - const auto entries = createDebugArchiveFileList(); - - KZip zip(filename); - const auto opennResult = zip.open(QIODevice::WriteOnly); - if (!opennResult) { - qCWarning(lcGeneralSettings) << "failed to open zip archive to create a debug archive"; return false; }