fix: [vault] The lock time not update

The config path is error, fix the path. Log: fix issue Bug: https://pms.uniontech.com/bug-view-261069.html
linuxdeepin · Jun 25, 2024 · 1f31030 · 1f31030
1 parent 9d4345d
commit 1f31030
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp
@@ -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();
@@ -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();

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp
@@ -104,7 +104,8 @@ void VaultAutoLock::processAutoLock()
 
     if (interval > threshold) {
         //        VaultAutoLock::killVaultTasks();
-        VaultHelper::instance()->lockVault(true);
+        if (!VaultHelper::instance()->lockVault(false))
+            fmWarning() << "Lock vault failed!";
     }
 }
 
@@ -126,7 +127,8 @@ void VaultAutoLock::slotLockVault(int state)
 
 void VaultAutoLock::processLockEvent()
 {
-    VaultHelper::instance()->lockVault(true);
+    if (VaultHelper::instance()->lockVault(false))
+        fmWarning() << "Lock vault failed!";
 }
 
 void VaultAutoLock::slotLockEvent(const QString &user)

diff --git a/src/plugins/server/serverplugin-vaultdaemon/serverplugin_vaultdaemon_global.h b/src/plugins/server/serverplugin-vaultdaemon/serverplugin_vaultdaemon_global.h
@@ -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" };

diff --git a/src/plugins/server/serverplugin-vaultdaemon/vaultcontrol.cpp b/src/plugins/server/serverplugin-vaultdaemon/vaultcontrol.cpp
@@ -20,6 +20,7 @@
 #include <QProcess>
 #include <QFile>
 #include <QDateTime>
+#include <QCoreApplication>
 
 extern "C" {
 #include <libsecret/secret.h>
@@ -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"));
             }
         }