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

Placeholders: Fixup clicking on placeholder after previous change

Browse Source 
Now that the name in the db is the name of the placeholder file,
we need to adjust the call to downloadPlaceholder
This commit is contained in:
Olivier Goffart 2018-01-25 16:25:11 +01:00 committed by Christian Kamm
parent 01bb241e48
commit 9bd583b0e5
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/application.cpp
View File

@ -633,15 +633,15 @@ void Application::openPlaceholder(const QString &filename)
qWarning(lcApplication) << "Can only handle file ending in .owncloud. Unable to open" << filename;
return;
}
QString normalName = filename.left(filename.size() - placeholderExt.size());
auto folder = FolderMan::instance()->folderForPath(filename);
if (!folder) {
qWarning(lcApplication) << "Can't find sync folder for" << filename;
// TODO: show a QMessageBox for errors
return;
}
QString relativePath = QDir::cleanPath(normalName).mid(folder->cleanPath().length() + 1);
QString relativePath = QDir::cleanPath(filename).mid(folder->cleanPath().length() + 1);
folder->downloadPlaceholder(relativePath);
QString normalName = filename.left(filename.size() - placeholderExt.size());
auto con = QSharedPointer<QMetaObject::Connection>::create();
*con = QObject::connect(folder, &Folder::syncFinished, [con, normalName] {
QObject::disconnect(*con);

1
src/gui/application.h
View File

@ -74,6 +74,7 @@ public slots:
void slotCrash();
/**
* Will download a placeholder file, and open the result.
* The argument is the filename of the placeholder file (including the extension)
*/
void openPlaceholder(const QString &filename);

1
src/gui/folder.h
View File

@ -286,6 +286,7 @@ public slots:
/**
* Mark a placeholder as being ready for download, and start a sync.
* relativePath is the patch to the placeholder file (includeing the extension)
*/
void downloadPlaceholder(const QString &relativepath);