mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-26 06:15:48 +03:00
Code Issues Projects Releases Packages 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 Kevin Ottens
parent b1de184bc8
commit a2bdd5b9a5
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
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

@ -684,15 +684,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

@ -75,6 +75,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

@ -280,6 +280,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);