mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui/macOS: Avoid need to retain/release things in file provider edit locally

Browse Source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2025-03-27 11:45:13 +01:00 committed by backportbot[bot]
parent 90a66f5a5d
commit de082e05f3
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/gui/macOS/fileprovidereditlocallyjob_mac.mm
View File

@ -44,8 +44,7 @@ void FileProviderEditLocallyJob::openFileProviderFile(const QString &ocId)
NSFileProviderDomain *const domain = (NSFileProviderDomain *)voidDomain;
if (domain == nil) {
qCWarning(lcFileProviderEditLocallyMacJob) << "Could not get domain for account:"
<< userId;
qCWarning(lcFileProviderEditLocallyMacJob) << "Could not get domain for account:" << userId;
emit notAvailable();
}
@ -56,40 +55,33 @@ void FileProviderEditLocallyJob::openFileProviderFile(const QString &ocId)
emit notAvailable();
}
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
__block NSError *receivedError;
__block NSURL *itemLocalUrl;
[manager getUserVisibleURLForItemIdentifier:nsOcId
completionHandler:^(NSURL *const url, NSError *const error) {
[url retain];
[error retain];
itemLocalUrl = url;
receivedError = error;
dispatch_semaphore_signal(semaphore);
dispatch_async(dispatch_get_main_queue(), ^{
Systray::instance()->destroyEditFileLocallyLoadingDialog();
});
if (error != nil) {
const auto errorMessage = QString::fromNSString(error.localizedDescription);
qCWarning(lcFileProviderEditLocallyMacJob) << "Error getting user visible URL for item:" << errorMessage;
dispatch_async(dispatch_get_main_queue(), ^{
emit notAvailable();
});
} else if (url != nil) {
const auto itemLocalPath = QString::fromNSString(url.path);
qCDebug(lcFileProviderEditLocallyMacJob) << "Got user visible URL for item:" << itemLocalPath;
[NSWorkspace.sharedWorkspace openURL:url];
dispatch_async(dispatch_get_main_queue(), ^{
emit finished();
});
} else {
qCWarning(lcFileProviderEditLocallyMacJob) << "Got nil user visible URL for item" << ocId;
dispatch_async(dispatch_get_main_queue(), ^{
emit notAvailable();
});
}
}];
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
Systray::instance()->destroyEditFileLocallyLoadingDialog();
if (receivedError != nil) {
const auto errorMessage = QString::fromNSString(receivedError.localizedDescription);
qCWarning(lcFileProviderEditLocallyMacJob) << "Error getting user visible URL for item"
<< ocId << ":" << errorMessage;
emit notAvailable();
} else if (itemLocalUrl != nil) {
const auto itemLocalPath = QString::fromNSString(itemLocalUrl.path);
qCDebug(lcFileProviderEditLocallyMacJob) << "Got user visible URL for item"
<< ocId << ":" << itemLocalPath;
[NSWorkspace.sharedWorkspace openURL:itemLocalUrl];
emit finished();
} else {
qCWarning(lcFileProviderEditLocallyMacJob) << "Got nil user visible URL for item"
<< ocId;
emit notAvailable();
}
[itemLocalUrl release];
[receivedError release];
}
} // namespace OCC::Mac