General chat fixes

UWPX · Mar 17, 2021 · cac5bd1 · cac5bd1
1 parent 8bb2ca4
commit cac5bd1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/Manager/Classes/Client.cs b/Manager/Classes/Client.cs
@@ -1,4 +1,5 @@
-using Shared.Classes;
+using System.ComponentModel;
+using Shared.Classes;
 using Storage.Classes;
 using Storage.Classes.Models.Account;
 using XMPP_API.Classes;
@@ -54,6 +55,7 @@ public Client(AccountModel dbAccount)
         private XMPPClient LoadXmppClient(AccountModel account)
         {
             XMPPAccount xmppAccount = account.ToXMPPAccount();
+            xmppAccount.PropertyChanged += OnXmppAccountPropertyChanged;
             Vault.LoadPassword(xmppAccount);
             XMPPClient client = new XMPPClient(xmppAccount);
             client.connection.TCP_CONNECTION.disableConnectionTimeout = Settings.GetSettingBoolean(SettingsConsts.DEBUG_DISABLE_TCP_TIMEOUT);
@@ -88,7 +90,29 @@ private void EnableOmemo(AccountModel account, XMPPClient client)
         #endregion
         //--------------------------------------------------------Events:---------------------------------------------------------------------\\
         #region --Events--
-
+        private void OnXmppAccountPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (sender is XMPPAccount account)
+            {
+                switch (e.PropertyName)
+                {
+                    case nameof(XMPPAccount.omemoDeviceId) when account.omemoDeviceId != dbAccount.omemoInfo.deviceId:
+                        dbAccount.omemoInfo.deviceId = account.omemoDeviceId;
+                        dbAccount.Update();
+                        break;
+
+                    case nameof(XMPPAccount.omemoBundleInfoAnnounced) when account.omemoBundleInfoAnnounced != dbAccount.omemoInfo.bundleInfoAnnounced:
+                        dbAccount.omemoInfo.bundleInfoAnnounced = account.omemoBundleInfoAnnounced;
+                        dbAccount.Update();
+                        break;
+
+                    case nameof(XMPPAccount.omemoDeviceLabel) when !string.Equals(account.omemoDeviceLabel, dbAccount.omemoInfo.deviceLabel):
+                        dbAccount.omemoInfo.deviceLabel = account.omemoDeviceLabel;
+                        dbAccount.Update();
+                        break;
+                }
+            }
+        }
 
         #endregion
     }

diff --git a/Manager/Classes/SpamHelper.cs b/Manager/Classes/SpamHelper.cs
@@ -40,7 +40,7 @@ public bool IsSpam(string msg)
                 if (spamMsg is null)
                 {
                     SPAM_SEMA.Wait();
-                    if (spamRegex is null || !spamRegex.IsMatch(msg))
+                    if (spamRegex is null || msg is null || !spamRegex.IsMatch(msg))
                     {
                         SPAM_SEMA.Release();
                         return false;

diff --git a/UWPX_UI_Context/Classes/Collections/AdvancedChatsCollection.cs b/UWPX_UI_Context/Classes/Collections/AdvancedChatsCollection.cs
@@ -181,7 +181,7 @@ private void OnChatsCollectionChanged(object sender, NotifyCollectionChangedEven
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
-                    foreach (ChatDataTemplate chat in e.NewItems)
+                    foreach (ChatDataTemplate chat in e.OldItems)
                     {
                         if (filter(chat))
                         {

diff --git a/XMPP_API/Classes/Network/OmemoHelper.cs b/XMPP_API/Classes/Network/OmemoHelper.cs
@@ -243,7 +243,7 @@ private async Task updateDevicesIfNeededAsync(OmemoXmlDevices devicesRemote)
             // Device id hasn't been set. Pick a random, unique one:
             if (CONNECTION.account.omemoDeviceId == 0)
             {
-                tmpDeviceId = Omemo.Classes.CryptoUtils.GenerateUniqueDeviceId(devicesRemote.DEVICES.Select(d => d.ID).ToList());
+                tmpDeviceId = CryptoUtils.GenerateUniqueDeviceId(devicesRemote.DEVICES.Select(d => d.ID).ToList());
                 devicesRemote.DEVICES.Add(new OmemoXmlDevice(tmpDeviceId, CONNECTION.account.omemoDeviceLabel));
                 updateDeviceList = true;
             }

diff --git a/XMPP_API/Classes/OmemoCommandHelper.cs b/XMPP_API/Classes/OmemoCommandHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Logging;
 using XMPP_API.Classes.Network;
 using XMPP_API.Classes.Network.XML.Messages;
 using XMPP_API.Classes.Network.XML.Messages.Helper;
@@ -82,6 +83,7 @@ public async Task<MessageResponseHelperResult<IQMessage>> requestBundleInformati
         /// <returns>The OmemoRequestDeviceListMessage result.</returns>
         public async Task<MessageResponseHelperResult<IQMessage>> requestDeviceListAsync(string toBareJid)
         {
+            Logger.Info($"Requesting OMEMO device list for {toBareJid} ...");
             Predicate<IQMessage> predicate = (x) => { return x is OmemoDeviceListResultMessage || x is IQErrorMessage; };
             AsyncMessageResponseHelper<IQMessage> helper = new AsyncMessageResponseHelper<IQMessage>(CONNECTION, predicate);
             OmemoRequestDeviceListMessage msg = new OmemoRequestDeviceListMessage(CONNECTION.account.getFullJid(), toBareJid);