update libsignal, implement console logger

Author: Trolldemorted

Signal-Windows/App.xaml.cs

@@ -1,4 +1,5 @@
 using libsignalservice.push;
+using libsignalservice;
 using Signal_Windows.Models;
 using Signal_Windows.Storage;
 using Signal_Windows.ViewModels;
@@ -14,6 +15,8 @@
 using Windows.UI.Xaml.Navigation;
 using Microsoft.QueryStringDotNET;
 using Windows.UI.Notifications;
+using Microsoft.Extensions.Logging;
+using Windows.Foundation.Diagnostics;
 
 namespace Signal_Windows
 {
@@ -39,6 +42,7 @@ sealed partial class App : Application
         /// </summary>
         public App()
         {
+            LibsignalLogging.LoggerFactory.AddProvider(new SignalLoggerProvider());
             this.InitializeComponent();
             this.Suspending += OnSuspending;
             this.Resuming += App_Resuming;

Signal-Windows/Signal-Windows.csproj

@@ -196,8 +196,10 @@
     <Compile Include="Models\SignalSignedPreKey.cs" />
     <Compile Include="Models\SignalStore.cs" />
     <Compile Include="Models\SignalConversation.cs" />
+    <Compile Include="SignalLogging.cs" />
     <Compile Include="Signal\IncomingMessages.cs" />
     <Compile Include="Signal\OutgoingMessages.cs" />
+    <Compile Include="Storage\SignalLogging.cs" />
     <Compile Include="Storage\Store.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="ViewModels\AddContactPageViewModel.cs" />
@@ -311,7 +313,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="libsignal-service-dotnet">
-      <Version>2.5.10.5</Version>
+      <Version>2.5.10.6</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore">
       <Version>1.1.2</Version>

Signal-Windows/Storage/SignalLogging.cs

@@ -0,0 +1,47 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Signal_Windows.Storage
+{
+    class SignalConsoleLogger : ILogger
+    {
+        private readonly string ClassName;
+        public SignalConsoleLogger(string categoryName)
+        {
+            ClassName = categoryName;
+        }
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
+            Debug.WriteLine(string.Format("[{0}] [{1}] ", logLevel, ClassName) + formatter(state, exception));
+        }
+    }
+
+    class SignalLoggerProvider : ILoggerProvider
+    {
+        public ILogger CreateLogger(string categoryName)
+        {
+            return new SignalConsoleLogger(categoryName);
+        }
+
+        public void Dispose()
+        {
+            Debug.WriteLine("disposing SignalLoggerProvider");
+        }
+    }
+}