1.优化批量导出时的体验。现在起记录为空的用户将不会被导出。

2.修复批量导出的部分问题。

Helpers/DecryptionHelper.cs

@@ -136,6 +136,10 @@ namespace WechatBakTool.Helpers
                     throw new Exception("搜索不到微信账号，请确认用户名是否正确，如错误请重新新建工作区，务必确认账号是否正确");
                 }
             }
+            else if (find_key_type == 3)
+            {
+                string searchString = "-----BEGIN PUBLIC KEY-----";
+            }
             return null;
         }
         public static string GetMD5(string text)
@@ -199,7 +203,6 @@ namespace WechatBakTool.Helpers
 
                         // 分页标志
                         var page_bytes = BitConverter.GetBytes(page_no + 1);
-                        page_bytes = page_bytes.Take(4).ToArray();
                         page_bytes.CopyTo(going_to_hashed, DEFAULT_PAGESIZE - reserved - offset + IV_SIZE);
                         var hash_mac_compute = hmac_sha1.ComputeHash(going_to_hashed, 0, going_to_hashed.Length);
 

Pages/Manager.xaml.cs

@@ -33,7 +33,6 @@ namespace WechatBakTool.Pages
         public WXUserReader? UserReader;
         private List<WXContact>? ExpContacts;
         private bool Suspend = false;
-        private int Status = 0;
         public Manager()
         {
             DataContext = workspaceViewModel;
@@ -52,21 +51,6 @@ namespace WechatBakTool.Pages
 
         private void btn_export_all_Click(object sender, RoutedEventArgs e)
         {
-            // 0 未开始
-            if(Status == 0 || Status == 2)
-            {
-                Suspend = false;
-                btn_export_all.Content = "暂停";
-            }
-            // 1 进行中
-            else if (Status == 1)
-            {
-                // 开启暂停
-                Suspend = true;
-                Status = 2;
-                btn_export_all.Content = "继续";
-                return;
-            }
             Task.Run(() =>
             {
                 bool group = false, user = false;
@@ -80,26 +64,19 @@ namespace WechatBakTool.Pages
                 });
                 if (UserReader != null)
                 {
-                    if (Status == 0)
+                    if (!Suspend)
                         ExpContacts = UserReader.GetWXContacts().ToList();
                     else
                         Suspend = false;
 
-                    List<WXContact> process = new List<WXContact>();
                     foreach (var contact in ExpContacts!)
                     {
-                        
                         if (Suspend)
                         {
-                            foreach(WXContact p in process)
-                            {
-                                ExpContacts.Remove(p);
-                            }
                             workspaceViewModel.ExportCount = "已暂停";
                             return;
                         }
-
-                        Status = 1;
+                            
                         if (group && contact.UserName.Contains("@chatroom"))
                         {
                             workspaceViewModel.WXContact = contact;
@@ -110,10 +87,7 @@ namespace WechatBakTool.Pages
                             workspaceViewModel.WXContact = contact;
                             ExportMsg(contact);
                         }
-                        process.Add(contact);
                     }
-                    Status = 0;
-                    btn_export_all.Content = "导出";
                     MessageBox.Show("批量导出完成", "提示");
                 }
             });

Pages/Workspace.xaml.cs

@@ -328,61 +328,6 @@ namespace WechatBakTool.Pages
                     MessageBox.Show("用户所有表情预下载完毕");
                 });
             }
-            /*
-            if (UserReader != null && ViewModel.WXContact != null)
-            {
-                Task.Run(() =>
-                {
-                    List<WXMsg> msgs = UserReader.GetWXMsgs(ViewModel.WXContact.UserName).ToList();
-                    List<WXContactHT> users = new List<WXContactHT>();
-                    if (File.Exists("WXContact.json"))
-                    {
-                        string text = File.ReadAllText("WXContact.json");
-                        text = text.Substring(8, text.Length - 8);
-                        users = JsonConvert.DeserializeObject<List<WXContactHT>>(text);
-                    }
-
-                    int i = 1; int all = 1;
-                    List<WXMsg> tmp = new List<WXMsg>();
-                    foreach (WXMsg m in msgs)
-                    {
-                        m.BytesExtra = null;
-                        tmp.Add(m);
-                        if (all % 10000 == 0)
-                        {
-                            File.WriteAllText(ViewModel.WXContact.UserName + "-" + i.ToString() + ".json", string.Format("showMsg({0})", JsonConvert.SerializeObject(tmp)));
-                            tmp.Clear();
-                            i++;
-                        }
-                        all++;
-                    }
-
-                    if (users!.Find(x => x.UserName == ViewModel.WXContact.UserName) == null)
-                    {
-                        WXContactHT html = new WXContactHT();
-                        html.NickName = ViewModel.WXContact.NickName;
-                        html.UserName = ViewModel.WXContact.UserName;
-                        html.LastMsg = ViewModel.WXContact.LastMsg;
-                        if (ViewModel.WXContact.Avatar != null)
-                        {
-                            using (var ms = new MemoryStream())
-                            {
-                                ViewModel.WXContact.Avatar.StreamSource.CopyTo(ms);
-                                byte[] bytes = new byte[ms.Length];
-                                ms.Write(bytes, 0, bytes.Length);
-                                html.AvatarString = Convert.ToBase64String(bytes);
-                            }
-                        }
-                        html.FileCount = i;
-                        users.Add(html);
-                    }
-
-                    File.WriteAllText(ViewModel.WXContact.UserName + "-" + i.ToString() + ".json", string.Format("showMsg({0})", JsonConvert.SerializeObject(tmp)));
-                    File.WriteAllText("WXContact.json", string.Format("getUser({0})", JsonConvert.SerializeObject(users)));
-                    MessageBox.Show("json已导出");
-                });
-            }
-            */
         }
 
         private void list_msg_ScrollChanged(object sender, ScrollChangedEventArgs e)

WechatBakTool.csproj

@@ -6,9 +6,9 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.9.7.2</AssemblyVersion>
-    <FileVersion>0.9.7.2</FileVersion>
-    <Version>0.9.7.2</Version>
+    <AssemblyVersion>0.9.6.4</AssemblyVersion>
+    <FileVersion>0.9.6.4</FileVersion>
+    <Version>0.9.6.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

version.json

@@ -14,8 +14,5 @@
 	},{
 		"Version":"3.9.8.25",
 		"BaseAddr": 65002192
-	},{
-		"Version":"3.9.9.27",
-		"BaseAddr": 68066576
 	}
 ]