Ditch longrunning tasks (they don't work properly in the bg task), add more logging

Author: Trolldemorted

Signal-Windows.Lib/SignalLibHandle.cs

@@ -890,15 +890,17 @@ private void InitNetwork()
         {
             try
             {
+                Logger.LogTrace("InitNetwork() sync context = {0}", SynchronizationContext.Current);
                 MessageReceiver = new SignalServiceMessageReceiver(LibUtils.ServiceConfiguration, new StaticCredentialsProvider(Store.Username, Store.Password, Store.SignalingKey, (int)Store.DeviceId), LibUtils.USER_AGENT);
                 var pipeTask = Task.Run(async () =>
                 {
                     try
                     {
                         var pipe = await MessageReceiver.CreateMessagePipe(CancelSource.Token, new SignalWebSocketFactory());
-                        Logger.LogTrace("Messagepipe created");
-                        IncomingMessagesTask = await Task.Factory.StartNew(async () => await new IncomingMessages(CancelSource.Token, pipe, MessageReceiver).HandleIncomingMessages(), TaskCreationOptions.LongRunning);
-                        OutgoingMessagesTask = await Task.Factory.StartNew(async () => await new OutgoingMessages(CancelSource.Token, pipe, Store, this).HandleOutgoingMessages(), TaskCreationOptions.LongRunning);
+                        Logger.LogTrace("Starting IncomingMessagesTask");
+                        IncomingMessagesTask = Task.Run(() => new IncomingMessages(CancelSource.Token, pipe, MessageReceiver).HandleIncomingMessages());
+                        Logger.LogTrace("Starting OutgoingMessagesTask");
+                        OutgoingMessagesTask = Task.Run(() => new OutgoingMessages(CancelSource.Token, pipe, Store, this).HandleOutgoingMessages());
                         return pipe;
                     }
                     catch(Exception e)

Signal-Windows.Lib/SignalLogging.cs

@@ -96,6 +96,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
     public class SignalFileLoggerProvider : ILoggerProvider
     {
         private static readonly string UILog = ApplicationData.Current.LocalCacheFolder.Path + @"\Signal-Windows.ui.log";
+        private static readonly string BGLog = ApplicationData.Current.LocalCacheFolder.Path + @"\Signal-Windows.bg.log";
         private readonly string Filename;
         private readonly string OldFilename;
         private readonly string Prefix;
@@ -170,6 +171,21 @@ public static void ForceAddUILog(string msg)
             }
         }
 
+        public static void ForceAddBGLog(string msg)
+        {
+            lock (Lock)
+            {
+                try
+                {
+                    File.AppendAllText(BGLog, msg);
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine(string.Format("SignalFileLoggerProvider failed to write: {0}", e));
+                }
+            }
+        }
+
         public static void ExportUILog(StorageFile file)
         {
             lock(Lock)

Signal-Windows.Lib/Util/LibUtils.cs

@@ -10,6 +10,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Windows.ApplicationModel;
 using Windows.Foundation.Metadata;
 using Windows.Networking.BackgroundTransfer;
 using Windows.Storage;
@@ -114,6 +115,24 @@ public static FileStream CreateTmpFile(string name)
         {
             return File.Open(ApplicationData.Current.LocalCacheFolder.Path + Path.AltDirectorySeparatorChar + name, FileMode.Create, FileAccess.ReadWrite);
         }
+
+        public static string GetAppStartMessage()
+        {
+            var version = Package.Current.Id.Version;
+            return
+                "-------------------------------------------------\n" +
+                String.Format("    Signal-Windows {0}.{1}.{2}.{3} starting\n", version.Major, version.Minor, version.Build, version.Revision) +
+                "-------------------------------------------------\n";
+        }
+
+        public static string GetBGStartMessage()
+        {
+            var version = Package.Current.Id.Version;
+            return
+                "-------------------------------------------------\n" +
+                String.Format("    Signal-Windows BG {0}.{1}.{2}.{3} starting\n", version.Major, version.Minor, version.Build, version.Revision) +
+                "-------------------------------------------------\n";
+        }
     }
 
     public static class StringExt

Signal-Windows.RC/SignalBackgroundTask.cs

@@ -30,10 +30,9 @@ public sealed class SignalBackgroundTask : IBackgroundTask
 
         public void Run(IBackgroundTaskInstance taskInstance)
         {
-            
-            Logger.LogInformation("Background task starting");
-            Deferral = taskInstance.GetDeferral();
+            SignalFileLoggerProvider.ForceAddBGLog(LibUtils.GetBGStartMessage());
             SignalLogging.SetupLogging(false);
+            Deferral = taskInstance.GetDeferral();
             ToastNotifier = ToastNotificationManager.CreateToastNotifier();
             taskInstance.Canceled += OnCanceled;
             bool locked = LibUtils.Lock(5000);

Signal-Windows/App.xaml.cs

@@ -58,7 +58,7 @@ static App()
         /// </summary>
         public App()
         {
-            SignalFileLoggerProvider.ForceAddUILog(Utils.GetAppStartMessage());
+            SignalFileLoggerProvider.ForceAddUILog(LibUtils.GetAppStartMessage());
             Instance = this;
             SignalLogging.SetupLogging(true);
             this.InitializeComponent();

Signal-Windows/Utils.cs

@@ -273,16 +273,6 @@ public static String BytesToString(long byteCount) //https://stackoverflow.com/a
             return (Math.Sign(byteCount) * num).ToString() + suf[place];
         }
 
-
-        public static string GetAppStartMessage()
-        {
-            var version = Package.Current.Id.Version;
-            return
-                "-------------------------------------------------\n" +
-                String.Format("    Signal-Windows {0}.{1}.{2}.{3} starting\n", version.Major, version.Minor, version.Build, version.Revision) +
-                "-------------------------------------------------\n";
-        }
-
         public static string GetCountryCode(string ISO3166) //https://stackoverflow.com/questions/34837436/uwp-get-country-phone-number-prefix
         {
             var dictionary = new Dictionary<string, string>();