Monakeyの保存機能の実装 #6

onihusube · Apr 24, 2022 · 2e49b6b · 2e49b6b
1 parent b7d2e2a
commit 2e49b6b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/2chAPIProxy/AppSetting.cs b/2chAPIProxy/AppSetting.cs
@@ -60,6 +60,7 @@ public class AppSetting
         String _WANPW = "testpw";
         String _CESrcfilePath = "";
         private string postFieldOrder = "FROM&mail&MESSAGE&bbs&key&time&submit";
+        private string monaKey = "00000000-0000-0000-0000-000000000000";
 
         public bool change = false;
 
@@ -372,6 +373,11 @@ public bool AssumeReqBodyIsUTF8
             set { assumeReqBodyIsUTF8 = value; change = true; }
         }
 
+        public string Monakey
+        {
+            get => monaKey;
+            set { monaKey = value; change = true; }
+        }
 
         public String CryptData(String data, bool encrypt = true)
         {

diff --git a/2chAPIProxy/DatProxy.cs b/2chAPIProxy/DatProxy.cs
@@ -970,7 +970,7 @@ private void ResPost(Session oSession, bool is2ch)
         }
 
         private string monakey = "00000000-0000-0000-0000-000000000000";
-        private string Monakey
+        public string Monakey
         {
             get => monakey;
             set

diff --git a/2chAPIProxy/ViewModels/ViewModel.cs b/2chAPIProxy/ViewModels/ViewModel.cs
@@ -205,6 +205,7 @@ public void Init()
             DatProxy.AddX2chUAHeader = AddX2chUAHeader;
             DatProxy.AddMsToNonce = AddMsToNonce;
             DatProxy.AssumeReqBodyIsUTF8 = AssumeReqBodyIsUTF8;
+            DatProxy.Monakey = Setting.Monakey;
 
             //設定の適用、APIアクセスクラス
             DatProxy.APIMediator.AppKey = this.Appkey;
@@ -366,6 +367,10 @@ public void BeforeShutdown()
                     }
                     catch (ArgumentException) { }
                 }
+
+                // Monakeyが更新されてたら保存
+                if (Setting.Monakey != DatProxy.Monakey) Setting.Monakey = DatProxy.Monakey;
+
                 if (Setting.change)
                 {
                     XmlSerializer xser = new XmlSerializer(typeof(AppSetting));
@@ -1313,6 +1318,8 @@ public RelayCommand<String> OnClick
                                     }
                                 }));
                             });
+                            // Monakeyをリセット
+                            DatProxy.ResetMonakey();
                             break;
                         case "UpdateSID":
                             DatProxy.UpdateAsync()