introduce ISignalLibHandle, add basic attachment methods

Author: Trolldemorted

Signal-Windows.Lib/SignalLibHandle.cs

@@ -26,12 +26,46 @@ public interface ISignalFrontend
         void HandleMessageUpdate(SignalMessage updatedMessage);
         void ReplaceConversationList(List<SignalConversation> conversations);
         void HandleAuthFailure();
+        void HandleAttachmentStatusChanged(SignalAttachment sa, SignalAttachmentStatus newStatus);
     }
 
-    public class SignalLibHandle
+    public interface ISignalLibHandle
     {
-        public static SignalLibHandle Instance;
-        public SignalStore Store;
+        //Frontend API
+        SignalStore Store { get; set; }
+        Task SendMessage(SignalMessage message, SignalConversation conversation);
+        void ResendMessage(SignalMessage message);
+        List<SignalMessageContainer> GetMessages(SignalConversation thread, int startIndex, int count);
+        void SaveAndDispatchSignalConversation(SignalConversation updatedConversation, SignalMessage updateMessage);
+        void PurgeAccountData();
+        Task Acquire(CoreDispatcher d, ISignalFrontend w);
+        Task Reacquire();
+        void Release();
+        void AddFrontend(CoreDispatcher d, ISignalFrontend w);
+        void RemoveFrontend(CoreDispatcher d);
+
+        // Background API
+        event EventHandler<SignalMessageEventArgs> SignalMessageEvent;
+        void BackgroundAcquire();
+        void BackgroundRelease();
+
+        // Attachment API
+        void StartAttachmentDownload(SignalAttachment sa);
+        //void AbortAttachmentDownload(SignalAttachment sa); TODO
+    }
+
+    public static class SignalHelper
+    {
+        public static ISignalLibHandle CreateSignalLibHandle(bool headless)
+        {
+            return new SignalLibHandle(headless);
+        }
+    }
+
+    internal class SignalLibHandle : ISignalLibHandle
+    {
+        internal static SignalLibHandle Instance;
+        public SignalStore Store { get; set; }
         private readonly ILogger Logger = LibsignalLogging.CreateLogger<SignalLibHandle>();
         public SemaphoreSlim SemaphoreSlim = new SemaphoreSlim(1, 1);
         private bool Headless;
@@ -214,6 +248,11 @@ await Task.Run(async () =>
             });
         }
 
+        public void ResendMessage(SignalMessage message)
+        {
+            OutgoingQueue.Add(message);
+        }
+
         public List<SignalMessageContainer> GetMessages(SignalConversation thread, int startIndex, int count)
         {
             return SignalDBContext.GetMessagesLocked(thread, startIndex, count);
@@ -230,7 +269,14 @@ public void SaveAndDispatchSignalConversation(SignalConversation updatedConversa
         }
         #endregion
 
-        #region backend api
+        #region attachment api
+        public void StartAttachmentDownload(SignalAttachment sa)
+        {
+            //TODO lock, check if already downloading, start a new download if not exists
+        }
+        #endregion
+
+        #region internal api
         internal void SaveAndDispatchSignalMessage(SignalMessage message, SignalConversation conversation)
         {
             conversation.MessagesCount += 1;

Signal-Windows.RC/SignalBackgroundTask.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -22,7 +23,7 @@ public sealed class SignalBackgroundTask : IBackgroundTask
         private const string TaskName = "SignalMessageBackgroundTask";
         private readonly ILogger Logger = LibsignalLogging.CreateLogger<SignalBackgroundTask>();
         private BackgroundTaskDeferral Deferral;
-        private SignalLibHandle Handle;
+        private ISignalLibHandle Handle;
         private ToastNotifier ToastNotifier;
         private AutoResetEvent ResetEvent = new AutoResetEvent(false);
         private EventWaitHandle GlobalResetEvent;
@@ -52,7 +53,7 @@ public void Run(IBackgroundTaskInstance taskInstance)
             });
             try
             {
-                Handle = new SignalLibHandle(true);
+                Handle = SignalHelper.CreateSignalLibHandle(true);
                 Handle.SignalMessageEvent += Handle_SignalMessageEvent;
                 Handle.BackgroundAcquire();
                 ResetEvent.WaitOne();
@@ -133,4 +134,4 @@ private IList<AdaptiveText> GetNotificationText(string authorName, string conten
             return text;
         }
     }
-}
+}

Signal-Windows/App.xaml.cs

@@ -39,7 +39,7 @@ sealed partial class App : Application
         public static bool MainPageActive = false;
         public static string USER_AGENT = "Signal-Windows";
         public static uint PREKEY_BATCH_SIZE = 100;
-        public static SignalLibHandle Handle = new SignalLibHandle(false);
+        public static ISignalLibHandle Handle = SignalHelper.CreateSignalLibHandle(false);
         private Dictionary<int, SignalWindowsFrontend> Views = new Dictionary<int, SignalWindowsFrontend>();
         public static int MainViewId;
         private IBackgroundTaskRegistration backgroundTaskRegistration;

Signal-Windows/Controls/Message.xaml.cs

@@ -103,7 +103,7 @@ private void MessageBox_DataContextChanged(FrameworkElement sender, DataContextC
 
         private void ResendTextBlock_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEventArgs e)
         {
-            App.Handle.OutgoingQueue.Add(Model.Message);
+            App.Handle.ResendMessage(Model.Message);
         }
 
         internal bool HandleUpdate(SignalMessage updatedMessage)

Signal-Windows/SignalWindowsFrontend.cs

@@ -48,5 +48,10 @@ public void HandleAuthFailure()
         {
             // TODO
         }
+
+        public void HandleAttachmentStatusChanged(SignalAttachment sa, SignalAttachmentStatus status)
+        {
+            //TODO
+        }
     }
 }

Signal-Windows/ViewModels/FinishRegistrationPageViewModel.cs

@@ -46,7 +46,7 @@ await Task.Run(() =>
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
                         App.Store = store;
-                        SignalLibHandle.Instance.Store = store;
+                        App.Handle.Store = store;
                     }).AsTask().Wait();
 
                     /* create prekeys */

Signal-Windows/ViewModels/LinkPageViewModel.cs

@@ -114,7 +114,7 @@ public async Task BeginLinking()
                     {
                         UIEnabled = false;
                         App.Store = store;
-                        SignalLibHandle.Instance.Store = store;
+                        App.Handle.Store = store;
                     }).AsTask().Wait();
 
                     /* create prekeys */
@@ -125,7 +125,7 @@ public async Task BeginLinking()
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
                         App.Store = store;
-                        SignalLibHandle.Instance.Store = store;
+                        App.Handle.Store = store;
                         View.Finish(true);
                     }).AsTask().Wait();
                 });

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -102,7 +102,7 @@ private async Task<bool> SendMessage(string messageText)
                         Read = true,
                         Type = SignalMessageType.Normal
                     };
-                    await SignalLibHandle.Instance.SendMessage(message, SelectedThread);
+                    await App.Handle.SendMessage(message, SelectedThread);
                     Debug.WriteLine("keydown lock released");
                 }
                 return true;