|
|
@@ -89,6 +89,9 @@ void EditLocallyJob::startTokenRemoteCheck()
|
|
|
<< "accountState:" << _accountState
|
|
|
<< "relPath:" << _relPath
|
|
|
<< "token:" << _token;
|
|
|
+
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("An error occurred trying to verify the request to edit locally."));
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -199,6 +202,8 @@ void EditLocallyJob::fetchRemoteFileParentInfo()
|
|
|
|
|
|
if (_relPathParent == QStringLiteral("/")) {
|
|
|
qCWarning(lcEditLocallyJob) << "LsColJob must only be used for nested folders.";
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("An error occurred during data retrieval."));
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -448,6 +453,8 @@ void EditLocallyJob::startEditLocally()
|
|
|
<< "fileName:" << _fileName
|
|
|
<< "localFilePath:" << _localFilePath
|
|
|
<< "folderForFile:" << _folderForFile;
|
|
|
+
|
|
|
+ showError(tr("Could not start editing locally."), tr("An error occurred during setup."));
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -504,6 +511,8 @@ void EditLocallyJob::slotDirectoryListingIterated(const QString &name, const QMa
|
|
|
|
|
|
if (_relPathParent == QStringLiteral("/")) {
|
|
|
qCWarning(lcEditLocallyJob) << "LsColJob must only be used for nested folders.";
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("An error occurred during data retrieval."));
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -511,6 +520,8 @@ void EditLocallyJob::slotDirectoryListingIterated(const QString &name, const QMa
|
|
|
Q_ASSERT(job);
|
|
|
if (!job) {
|
|
|
qCWarning(lcEditLocallyJob) << "Must call slotDirectoryListingIterated from a signal.";
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("An error occurred during data retrieval."));
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -534,8 +545,9 @@ void EditLocallyJob::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
|
|
|
Q_ASSERT(item && !item->isEmpty());
|
|
|
if (!item || item->isEmpty()) {
|
|
|
qCWarning(lcEditLocallyJob) << "invalid item";
|
|
|
- }
|
|
|
- if (item->_file == _relativePathToRemoteRoot) {
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("An error occurred trying to synchronise the file to edit locally."));
|
|
|
+ } else if (item->_file == _relativePathToRemoteRoot) {
|
|
|
disconnect(&_folderForFile->syncEngine(), &SyncEngine::itemDiscovered, this, &EditLocallyJob::slotItemDiscovered);
|
|
|
if (item->_instruction == CSYNC_INSTRUCTION_NONE) {
|
|
|
// return early if the file is already in sync
|
|
|
@@ -553,6 +565,8 @@ void EditLocallyJob::openFile()
|
|
|
|
|
|
if(_localFilePath.isEmpty()) {
|
|
|
qCWarning(lcEditLocallyJob) << "Could not edit locally. Invalid local file path.";
|
|
|
+ showError(tr("Could not start editing locally."),
|
|
|
+ tr("Invalid local file path."));
|
|
|
return;
|
|
|
}
|
|
|
|