mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-26 06:15:48 +03:00
Placeholders: Fixup clicking on placeholder after previous change
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:
parent
b1de184bc8
commit
a2bdd5b9a5
3 changed files with 4 additions and 2 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue