Skip to content
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

Jump to bottom

fix: [vault] The lock time not update #2039

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix: [vault] The lock time not update #2039

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ void PolicyManager::slotVaultPolicy()
break;
case VaultPageMark::kClipboardPage:
if (vaultVisiable) {
VaultHelper::instance()->lockVault(true);
if (!VaultHelper::instance()->lockVault(false)) {
fmWarning() << "Lock vault failed!";
return;
}
vaultVisiable = false;
VaultVisibleManager::instance()->removeSideBarVaultItem();
VaultVisibleManager::instance()->removeComputerVaultItem();
Expand All @@ -75,7 +78,10 @@ void PolicyManager::slotVaultPolicy()
break;
case VaultPageMark::kCopyFilePage:
if (vaultVisiable) {
VaultHelper::instance()->lockVault(true);
if (!VaultHelper::instance()->lockVault(false)) {
fmWarning() << "Lock vault failed!";
return;
}
vaultVisiable = false;
VaultVisibleManager::instance()->removeSideBarVaultItem();
VaultVisibleManager::instance()->removeComputerVaultItem();
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@

if (interval > threshold) {
// VaultAutoLock::killVaultTasks();
VaultHelper::instance()->lockVault(true);
if (!VaultHelper::instance()->lockVault(false))
fmWarning() << "Lock vault failed!";
}
}

Expand All @@ -126,10 +127,11 @@

void VaultAutoLock::processLockEvent()
{
VaultHelper::instance()->lockVault(true);
if (VaultHelper::instance()->lockVault(false))
fmWarning() << "Lock vault failed!";
}

void VaultAutoLock::slotLockEvent(const QString &user)

Check warning on line 134 in src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'slotLockEvent' is never used.

Check warning on line 134 in src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'slotLockEvent' is never used.

Check warning on line 134 in src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp

View workflow job for this annotation

GitHub Actions / static-check / Static-Check 

The function 'slotLockEvent' is never used.
{
char *loginUser = getlogin();
if (user == loginUser) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/server/serverplugin-vaultdaemon/serverplugin_vaultdaemon_global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ inline constexpr char kCryfsConfigFileName[] { "cryfs.config" };
inline constexpr char kCryfsType[] { "fuse.cryfs" };
inline constexpr char kVaultConfigFileName[] { "vaultConfig.ini" };
inline constexpr char kGroupPolicyKeyVaultAlgoName[] { "dfm.vault.algo.name" };
inline constexpr char kVaultTimeConfigFilePath[] { "/../dde-file-manager/vaultTimeConfig" };
inline constexpr char kVaultTimeConfigFileName[] { "vaultTimeConfig.json" };

inline constexpr char kNetWorkDBusServiceName[] { "org.deepin.service.SystemNetwork" };
inline constexpr char kNetWorkDBusPath[] { "/org/deepin/service/SystemNetwork" };
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/server/serverplugin-vaultdaemon/vaultcontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <QProcess>
#include <QFile>
#include <QDateTime>
#include <QCoreApplication>

extern "C" {
#include <libsecret/secret.h>
Expand Down Expand Up @@ -76,7 +77,8 @@ void VaultControl::responseLockScreenDBus(const QDBusMessage &msg)
} else {
lockVault(VaultHelper::instance()->vaultMountDirLocalPath(), false);

DFMBASE_NAMESPACE::Settings setting(kVaultTimeConfigFilePath);
QString filePath { QDir::homePath() + QString("/.config/%1/dde-file-manager/").arg(qApp->organizationName()) + kVaultTimeConfigFileName };
DFMBASE_NAMESPACE::Settings setting("", "", filePath);
setting.setValue(QString("VaultTime"), QString("LockTime"), QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
}
}
Expand Down
Loading