From d117f5359bd9893fd2c05330f8e4fb4f6ab9951e Mon Sep 17 00:00:00 2001
From: ChessNineeee <709030194@qq.com>
Date: Thu, 27 May 2021 22:55:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:loadAllIdentifies=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0VersionMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/security/IdentityManager.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/security/IdentityManager.java b/src/main/java/security/IdentityManager.java
index 064daa1..ec0cdd5 100644
--- a/src/main/java/security/IdentityManager.java
+++ b/src/main/java/security/IdentityManager.java
@@ -76,10 +76,9 @@ public class IdentityManager {
 
     public void init() {
         try{
-            this.identifies = loadAllIdentifies();
+            loadAllIdentifies();
             this.defaultIdentity = Persist.getDefaultIdentityFromStorage("");
             this.privateKeyEncryptionAlgorithm = Common.SM4ECB;
-            this.versionMap = new ConcurrentHashMap<>(); // TODO versionMap初始化方式待定
         }catch (Exception ex){
             System.out.println(String.format("创建IdentifyManager实例失败：%s", ex.getMessage()));
         }
@@ -88,18 +87,22 @@ public class IdentityManager {
 
 
     /**
-     * 从sqlite中加载全部网络身份信息并封装成ConcurrentMap
+     * 从sqlite中加载全部网络身份信息并封装成identifies与versionMap
      * @return {ConcurrentMap}
      * @throws Exception
      */
-    private ConcurrentMap<String, Identity> loadAllIdentifies() throws Exception{
+    private void loadAllIdentifies() throws Exception{
         List<Identity> identities = Persist.getAllIdentityFromStorage("");
-        ConcurrentHashMap<String, Identity> res = new ConcurrentHashMap<>();
+        ConcurrentHashMap<String, Identity> tempIdentifiesMap = new ConcurrentHashMap<>();
+        ConcurrentHashMap<String, Long> tempVersionMap = new ConcurrentHashMap<>();
         for (Identity id:
              identities) {
-            res.put(id.getName(), id);
+            tempIdentifiesMap.put(id.getName(), id);
+            tempVersionMap.put(id.getName(), 0L);
         }
-        return res;
+
+        this.identifies = tempIdentifiesMap;
+        this.versionMap = tempVersionMap;
     }