Fix up blocking support

Author: golf1052

Signal-Windows.Lib/IncomingMessages.cs

@@ -184,6 +184,11 @@ private void HandleMessage(SignalServiceEnvelope envelope)
                         }
                     }
                 }
+                else if (content.SynchronizeMessage.BlockedList != null)
+                {
+                    List<string> blockedNumbers = content.SynchronizeMessage.BlockedList.Numbers;
+                    HandleBlockedNumbers(blockedNumbers);
+                }
                 else if (content.SynchronizeMessage.Groups != null)
                 {
                     Logger.LogInformation("HandleMessage() handling groups sync message from device {0}", envelope.GetSourceDevice());
@@ -382,6 +387,38 @@ private void HandleSessionResetMessage(SignalServiceEnvelope envelope, SignalSer
             SignalLibHandle.Instance.SaveAndDispatchSignalMessage(sm, conversation);
         }
 
+        /// <summary>
+        /// Handles a list of blocked numbers. This will update the database to match the
+        /// blocked numbers list.
+        /// </summary>
+        /// <param name="blockedNumbers">The list of blocked numbers.</param>
+        private void HandleBlockedNumbers(List<string> blockedNumbers)
+        {
+            List<SignalContact> blockedContacts = new List<SignalContact>();
+            List<SignalContact> contacts = SignalDBContext.GetAllContactsLocked();
+            foreach (var contact in contacts)
+            {
+                if (blockedNumbers.Contains(contact.ThreadId))
+                {
+                    if (!contact.Blocked)
+                    {
+                        contact.Blocked = true;
+                        SignalDBContext.UpdateBlockStatus(contact);
+                        blockedContacts.Add(contact);
+                    }
+                }
+                else
+                {
+                    if (contact.Blocked)
+                    {
+                        contact.Blocked = false;
+                        SignalDBContext.UpdateBlockStatus(contact);
+                    }
+                }
+            }
+            SignalLibHandle.Instance.DispatchHandleBlockedContacts(blockedContacts);
+        }
+
         private void HandleGroupLeaveMessage(SignalServiceEnvelope envelope, SignalServiceContent content, SignalServiceDataMessage dataMessage, bool isSync, long timestamp)
         {
             SignalServiceGroup sentGroup = dataMessage.Group;
@@ -575,7 +612,7 @@ private void HandleSignalMessage(SignalServiceEnvelope envelope, SignalServiceCo
             if (author != null && author.Blocked)
             {
                 // Don't save blocked messages
-                //return;
+                return;
             }
 
             List<SignalAttachment> attachments = new List<SignalAttachment>();

Signal-Windows.Lib/Signal-Windows.Lib.csproj

@@ -166,7 +166,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="libsignal-service-dotnet">
-      <Version>2.7.5.6</Version>
+      <Version>2.7.5.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore">
       <Version>1.1.4</Version>

Signal-Windows.Lib/SignalLibHandle.cs

@@ -47,6 +47,7 @@ public interface ISignalFrontend
         void ReplaceConversationList(List<SignalConversation> conversations);
         void HandleAuthFailure();
         void HandleAttachmentStatusChanged(SignalAttachment sa);
+        void HandleBlockedContacts(List<SignalContact> blockedContacts);
     }
 
     public interface ISignalLibHandle
@@ -56,6 +57,7 @@ public interface ISignalLibHandle
 
         void RequestSync();
         Task SendMessage(SignalMessage message, SignalConversation conversation);
+        void SendBlockedMessage();
         Task SetMessageRead(long index, SignalMessage message, SignalConversation conversation);
         void ResendMessage(SignalMessage message);
         List<SignalMessageContainer> GetMessages(SignalConversation thread, int startIndex, int count);
@@ -394,6 +396,19 @@ public void SaveAndDispatchSignalConversation(SignalConversation updatedConversa
             SemaphoreSlim.Release();
             Logger.LogTrace("SaveAndDispatchSignalConversation() released");
         }
+
+        public void SendBlockedMessage()
+        {
+            List<SignalContact> blockedContacts = SignalDBContext.GetAllContactsLocked().Where(c => c.Blocked).ToList();
+            List<string> blockedNumbers = new List<string>();
+            foreach (var contact in blockedContacts)
+            {
+                blockedNumbers.Add(contact.ThreadId);
+            }
+            var blockMessage = SignalServiceSyncMessage.ForBlocked(new BlockedListMessage(blockedNumbers));
+            OutgoingMessages.SendMessage(blockMessage);
+            DispatchHandleBlockedContacts(blockedContacts);
+        }
         #endregion
 
         #region attachment api
@@ -609,6 +624,24 @@ internal void HandleOutgoingKeyChangeLocked(string user, string identity)
             SemaphoreSlim.Release();
             Logger.LogTrace("HandleOutgoingKeyChange() released");
         }
+
+        /// <summary>
+        /// This will notify all windows of newly blocked numbers.
+        /// This does not save to the database.
+        /// </summary>
+        /// <param name="blockedContacts">The list of blocked contacts</param>
+        internal void DispatchHandleBlockedContacts(List<SignalContact> blockedContacts)
+        {
+            List<Task> operations = new List<Task>();
+            foreach (var dispatcher in Frames.Keys)
+            {
+                operations.Add(dispatcher.RunTaskAsync(() =>
+                {
+                    Frames[dispatcher].HandleBlockedContacts(blockedContacts);
+                }));
+            }
+            Task.WaitAll(operations.ToArray());
+        }
         #endregion
 
         #region private

Signal-Windows/Controls/Conversation.xaml.cs

@@ -161,12 +161,19 @@ private void UpdateHeader(SignalConversation thread)
         public void Load(SignalConversation conversation)
         {
             SignalConversation = conversation;
-            if (SignalConversation is SignalContact)
+            var contact = SignalConversation as SignalContact;
+            if (contact != null)
             {
-                SignalContact contact = (SignalContact)SignalConversation;
                 Blocked = contact.Blocked;
                 SendMessageVisible = !Blocked;
             }
+            else
+            {
+                // Need to make sure to reset the Blocked and SendMessageVisible values in case
+                // a group chat is selected. Group chats can never be blocked.
+                Blocked = false;
+                SendMessageVisible = !Blocked;
+            }
             LastMarkReadRequest = -1;
             InputTextBox.IsEnabled = false;
             DisposeCurrentThread();
@@ -383,7 +390,7 @@ private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEven
             }
         }
 
-        private void UnblockButton_Click(object sender, RoutedEventArgs e)
+        private async void UnblockButton_Click(object sender, RoutedEventArgs e)
         {
             if (SignalConversation is SignalContact)
             {
@@ -392,6 +399,10 @@ private void UnblockButton_Click(object sender, RoutedEventArgs e)
                 Blocked = false;
                 SendMessageVisible = !Blocked;
                 SignalDBContext.UpdateBlockStatus(contact);
+                await Task.Run(() =>
+                {
+                    App.Handle.SendBlockedMessage();
+                });
             }
         }
     }

Signal-Windows/SignalWindowsFrontend.cs

@@ -91,6 +91,11 @@ public void HandleUnreadMessage(SignalMessage message)
             }
         }
 
+        public void HandleBlockedContacts(List<SignalContact> blockedContacts)
+        {
+            Locator.MainPageInstance.HandleBlockedContacts(blockedContacts);
+        }
+
         private void CheckNotification(SignalConversation conversation)
         {
             if (ApplicationView.GetForCurrentView().Id == App.MainViewId)

Signal-Windows/ViewModels/ConversationSettingsPageViewModel.cs

@@ -129,11 +129,15 @@ internal void BackButton_Click(object sender, BackRequestedEventArgs e)
             e.Handled = true;
         }
 
-        internal void BlockButton_Click()
+        internal async void BlockButton_Click()
         {
             Contact.Blocked = !Contact.Blocked;
             Blocked = Contact.Blocked;
             SignalDBContext.UpdateBlockStatus(Contact);
+            await Task.Run(() =>
+            {
+                App.Handle.SendBlockedMessage();
+            });
         }
     }
 }

Signal-Windows/ViewModels/LinkPageViewModel.cs

@@ -82,7 +82,7 @@ await Task.Run(() =>
                 });
 
                 // fetch new device uuid
-                SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceConfiguration, CancelSource.Token, "Signal-Windows");
+                SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceConfiguration, "Signal-Windows");
                 string uuid = await accountManager.GetNewDeviceUuid(CancelSource.Token);
                 string tsdevice = "tsdevice:/?uuid=" + Uri.EscapeDataString(uuid) + "&pub_key=" + Uri.EscapeDataString(Base64.EncodeBytesWithoutPadding(tmpIdentity.getPublicKey().serialize()));
 

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -15,6 +15,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
@@ -316,6 +317,41 @@ public void HandleAttachmentStatusChanged(SignalAttachment sa)
                 View.Thread.UpdateAttachment(sa);
             }
         }
+
+        public void HandleBlockedContacts(List<SignalContact> blockedContacts)
+        {
+            // Signal sends a list of all blocked contacts, so if a blocked contacted was
+            // unblocked it won't appear in the list anymore. So, unblock any blocked
+            // contacts as well.
+            foreach (var conversation in ConversationsDictionary)
+            {
+                // "as" is more efficient than "is" and a cast because "as" only needs to
+                // type check once
+                var conversationContact = conversation.Value as SignalContact;
+                if (conversationContact != null)
+                {
+                    if (blockedContacts.FirstOrDefault(c => c.ThreadId == conversationContact.ThreadId) != null)
+                    {
+                        // Check if the contact is blocked and if so make sure it's blocked
+                        if (!conversationContact.Blocked)
+                        {
+                            conversationContact.Blocked = true;
+                            conversationContact.UpdateUI();
+                        }
+                    }
+                    else
+                    {
+                        // If the contact is not in the blocked list then check if it's blocked
+                        // and if so, unblock it.
+                        if (conversationContact.Blocked)
+                        {
+                            conversationContact.Blocked = false;
+                            conversationContact.UpdateUI();
+                        }
+                    }
+                }
+            }
+        }
         #endregion
     }
 }