gather all notification related stuff in one class

Author: Trolldemorted

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

@@ -108,7 +108,7 @@
   <ItemGroup>
     <Compile Include="Events\SignalMessageEventArgs.cs" />
     <Compile Include="IncomingMessages.cs" />
-    <Compile Include="LibUtils.cs" />
+    <Compile Include="Util\LibUtils.cs" />
     <Compile Include="Migrations\LibsignalDB\20170806145530_ls1.cs" />
     <Compile Include="Migrations\LibsignalDB\20170806145530_ls1.Designer.cs">
       <DependentUpon>20170806145530_ls1.cs</DependentUpon>
@@ -156,6 +156,7 @@
     <Compile Include="SignalMessageContainer.cs" />
     <Compile Include="Storage\DB.cs" />
     <Compile Include="Storage\Store.cs" />
+    <Compile Include="Util\SignalNotificationsUtils.cs" />
     <EmbeddedResource Include="Properties\Signal_Windows.Lib.rd.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -175,7 +176,7 @@
       <Version>1.1.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.1</Version>
+      <Version>6.0.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>2.1.1</Version>
@@ -184,6 +185,11 @@
       <Version>4.4.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
+      <Name>Windows Mobile Extensions for the UWP</Name>
+    </SDKReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

Signal-Windows.Lib/Util/LibUtils.cs

@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Windows.Foundation.Metadata;
 using Windows.Networking.BackgroundTransfer;
 using Windows.Storage;
 using Windows.UI.Core;

Signal-Windows/SignalNotifications.cs renamed to Signal-Windows.Lib/Util/NotificationsUtils.cs

@@ -8,10 +8,25 @@
 using Windows.Foundation.Metadata;
 using Windows.UI.Notifications;
 
-namespace Signal_Windows
+namespace Signal_Windows.Lib
 {
-    class SignalNotifications
+    public class NotificationsUtils
     {
+        public static void Notify(SignalMessage message)
+        {
+            TryVibrate(true);
+            SendMessageNotification(message);
+            SendTileNotification(message);
+        }
+
+        public static void TryVibrate(bool quick)
+        {
+            if (ApiInformation.IsTypePresent("Windows.Phone.Devices.Notification.VibrationDevice"))
+            {
+                Windows.Phone.Devices.Notification.VibrationDevice.GetDefault().Vibrate(TimeSpan.FromMilliseconds(quick ? 100 : 500));
+            }
+        }
+
         public static void SendMessageNotification(SignalMessage message)
         {
             // notification tags can only be 16 chars (64 after creators update)
@@ -69,14 +84,6 @@ private static IList<AdaptiveText> GetNotificationText(SignalMessage message)
             return text;
         }
 
-        public static void TryVibrate(bool quick)
-        {
-            if (ApiInformation.IsTypePresent("Windows.Phone.Devices.Notification.VibrationDevice"))
-            {
-                Windows.Phone.Devices.Notification.VibrationDevice.GetDefault().Vibrate(TimeSpan.FromMilliseconds(quick ? 100 : 500));
-            }
-        }
-
         public static void SendTileNotification(SignalMessage message)
         {
             TileBindingContentAdaptive tileBindingContent = new TileBindingContentAdaptive()

Signal-Windows.RC/SignalBackgroundTask.cs

@@ -81,33 +81,7 @@ private void Handle_SignalMessageEvent(object sender, SignalMessageEventArgs e)
         {
             if (e.MessageType == Lib.Events.SignalMessageType.NormalMessage)
             {
-                string notificationId = e.Message.ThreadId;
-                ToastBindingGeneric toastBinding = new ToastBindingGeneric();
-
-                var notificationText = GetNotificationText(e.Message.Author.ThreadDisplayName, e.Message.Content.Content);
-                foreach (var item in notificationText)
-                {
-                    toastBinding.Children.Add(item);
-                }
-
-                ToastContent toastContent = new ToastContent()
-                {
-                    Launch = notificationId,
-                    Visual = new ToastVisual()
-                    {
-                        BindingGeneric = toastBinding
-                    },
-                    DisplayTimestamp = DateTimeOffset.FromUnixTimeMilliseconds(e.Message.ReceivedTimestamp)
-                };
-
-                ToastNotification toastNotification = new ToastNotification(toastContent.GetXml());
-                uint expiresIn = e.Message.ExpiresAt;
-                if (expiresIn > 0)
-                {
-                    toastNotification.ExpirationTime = DateTime.Now.Add(TimeSpan.FromSeconds(expiresIn));
-                }
-                toastNotification.Tag = notificationId;
-                ToastNotifier.Show(toastNotification);
+                NotificationsUtils.Notify(e.Message);
             }
             else if (e.MessageType == Lib.Events.SignalMessageType.PipeEmptyMessage)
             {

Signal-Windows/Signal-Windows.csproj

@@ -168,7 +168,6 @@
     <Compile Include="Controls\Welcome.xaml.cs">
       <DependentUpon>Welcome.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SignalNotifications.cs" />
     <Compile Include="SignalWindowsFrontend.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="ViewModels\AddContactPageViewModel.cs" />

Signal-Windows/SignalWindowsFrontend.cs

@@ -86,9 +86,7 @@ public void HandleUnreadMessage(SignalMessage message)
             {
                 if (message.Author != null)
                 {
-                    SignalNotifications.TryVibrate(true);
-                    SignalNotifications.SendMessageNotification(message);
-                    SignalNotifications.SendTileNotification(message);
+                    NotificationsUtils.Notify(message);
                 }
             }
         }