Skip to content

fix: treat system-directory apps as pre-installed when InstalledTime is missing #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
18202781743 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: treat system-directory apps as pre-installed when InstalledTime is missing #380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/dbus/applicationservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,22 @@ void unescapeEnvs(QVariantMap &options) noexcept
options.insert(envKey, result);
}

static bool isFromSystemApplicationsDir(const QString &sourcePath)
{
const auto cleanSource = QDir::cleanPath(sourcePath);
const auto xdgDataHome = getXDGDataHome();
for (const auto &dir : getApplicationsDirs()) {
if (dir.startsWith(xdgDataHome)) {
continue; // skip user-level directory
}
const auto cleanDir = QDir::cleanPath(dir) + QLatin1Char('/');
if (cleanSource.startsWith(cleanDir)) {
return true;
}
}
return false;
}

} // namespace

void ApplicationService::appendExtraEnvironments(QVariantMap &runtimeOptions) const noexcept
Expand Down Expand Up @@ -237,7 +253,9 @@ ApplicationService::ApplicationService(DesktopFile source,
}
} else {
if (value.isNull()) {
auto newInstalledTime = QDateTime::currentMSecsSinceEpoch();
const auto newInstalledTime = isFromSystemApplicationsDir(m_desktopSource.sourcePath())
? 0
: QDateTime::currentMSecsSinceEpoch();
if (!storagePtr->createApplicationValue(
appId, fromStaticRaw(ApplicationPropertiesGroup), fromStaticRaw(InstalledTime), newInstalledTime)) {
m_installedTime = -1;
Expand Down
Loading