pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Move recovery:update to private class' (#450) from fix/recovery-update into release/v9.1.0

Browse Source
This commit is contained in:
Maxim Kadushkin
2025-09-17 11:11:20 +00:00
parent 1cf50ad7d0 2f88b890fd
commit 3590c60776
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
win-linux/src/cascapplicationmanagerwrapper.cpp
View File

@ -497,29 +497,6 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE
QJsonObject objRoot = jdoc.object();
SetRecentPin(objRoot["id"].toInt(), objRoot["pinned"].toBool(false));
}
} else
if ( !(cmd.find(L"recovery:update") == std::wstring::npos) ) {
QJsonParseError jerror;
QJsonDocument jdoc = QJsonDocument::fromJson(QString::fromStdWString(pData->get_Param()).toUtf8(), &jerror);
if( jerror.error == QJsonParseError::NoError ) {
if (jdoc.isArray()) {
const QJsonArray arr = jdoc.array();
for (const auto &val : arr) {
QJsonObject obj = val.toObject();
if (obj.contains("path")) {
QString path = obj["path"].toString();
QFileInfo _info(path);
COpenOptions opts{_info.fileName(), etLocalFile};
opts.parent_id = event->get_SenderId();
opts.url = path;
opts.wurl = path.toStdWString();
m_private->openDocument(opts);
}
}
}
}
}
break; }

25
win-linux/src/cascapplicationmanagerwrapper_private.h
View File

@ -268,6 +268,31 @@ public:
return true;
} else
if ( cmd.compare(L"recovery:update") == 0 ) {
QJsonParseError jerror;
QJsonDocument jdoc = QJsonDocument::fromJson(QString::fromStdWString(data.get_Param()).toUtf8(), &jerror);
if( jerror.error == QJsonParseError::NoError ) {
if (jdoc.isArray()) {
const QJsonArray arr = jdoc.array();
for (const auto &val : arr) {
QJsonObject obj = val.toObject();
if (obj.contains("path")) {
QString path = obj["path"].toString();
QFileInfo _info(path);
COpenOptions opts{_info.fileName(), etLocalFile};
opts.parent_id = event.m_nSenderId;
opts.url = path;
opts.wurl = path.toStdWString();
openDocument(opts);
}
}
}
}
return true;
} else
if ( cmd.compare(L"open:document") == 0 ) {
const std::wstring & _url = data.get_Param();
if ( !_url.empty() ) {