Cleanup background support and add logging

Also add timestamp to logs

Author: golf1052

Signal-Windows.Lib/SignalLogging.cs

@@ -49,7 +49,7 @@ public bool IsEnabled(LogLevel logLevel)
 
         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));
+            Debug.WriteLine(string.Format("{0:s} [{1}] [{2}] ", DateTime.UtcNow, logLevel, ClassName) + formatter(state, exception));
         }
     }
 
@@ -118,7 +118,7 @@ public void Log(string line)
             {
                 try
                 {
-                    Writer.WriteLine($"[{Prefix}] {line}");
+                    Writer.WriteLine($"{DateTime.UtcNow.ToString("s")} [{Prefix}] {line}");
                     Writer.Flush();
                 }
                 catch(Exception e)

Signal-Windows.RC/SignalBackgroundTask.cs

@@ -5,10 +5,13 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using libsignalservice;
+using Microsoft.Extensions.Logging;
 using Microsoft.Toolkit.Uwp.Notifications;
 using Signal_Windows.Lib;
 using Signal_Windows.Lib.Events;
 using Signal_Windows.Models;
+using Signal_Windows.Storage;
 using Windows.ApplicationModel.Background;
 using Windows.UI.Notifications;
 
@@ -19,6 +22,8 @@ public sealed class SignalBackgroundTask : IBackgroundTask
         private const string TaskName = "SignalMessageBackgroundTask";
         private const string SemaphoreName = "Signal_Windows_Semaphore";
 
+        private readonly ILogger Logger = LibsignalLogging.CreateLogger<SignalBackgroundTask>();
+
         private BackgroundTaskDeferral deferral;
 
         private Semaphore semaphore;
@@ -29,16 +34,17 @@ public sealed class SignalBackgroundTask : IBackgroundTask
 
         public async void Run(IBackgroundTaskInstance taskInstance)
         {
+            taskStartTime = DateTime.Now;
+            taskEndTime = taskStartTime + TimeSpan.FromSeconds(25);
             taskInstance.Canceled += TaskInstance_Canceled;
             deferral = taskInstance.GetDeferral();
+            SignalLogging.SetupLogging(false);
             toastNotifier = ToastNotificationManager.CreateToastNotifier();
-            ShowNotification("Background task starting");
-            taskStartTime = DateTime.Now;
-            taskEndTime = taskStartTime + TimeSpan.FromSeconds(10);
+            Logger.LogInformation("Background task starting");
             bool appRunning = IsAppRunning();
             if (appRunning)
             {
-                ShowNotification("App is running, background task shutting down");
+                Logger.LogWarning("App is running, background task shutting down");
                 deferral.Complete();
                 return;
             }
@@ -52,7 +58,7 @@ public async void Run(IBackgroundTaskInstance taskInstance)
 
         private async Task CheckTimer()
         {
-            ShowNotification("Started listening for messages");
+            Logger.LogInformation("Started listening for messages");
             while (true)
             {
                 if (DateTime.Now >= taskEndTime)
@@ -65,7 +71,7 @@ private async Task CheckTimer()
 
         private void TaskInstance_Canceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
         {
-            ShowNotification($"Background task cancelled: {reason}");
+            Logger.LogError($"Background task cancelled: {reason}");
             Shutdown();
             deferral.Complete();
         }
@@ -88,7 +94,7 @@ private bool IsAppRunning()
 
         private void Shutdown()
         {
-            ShowNotification("Background task shutting down");
+            Logger.LogInformation("Background task shutting down");
             handle.BackgroundRelease();
             semaphore.Release();
         }
@@ -141,29 +147,5 @@ private IList<AdaptiveText> GetNotificationText(string authorName, string conten
             text.Add(messageText);
             return text;
         }
-
-        private void ShowNotification(string content)
-        {
-            ToastContent toastContent = new ToastContent()
-            {
-                Visual = new ToastVisual()
-                {
-                    BindingGeneric = new ToastBindingGeneric()
-                    {
-                        Children =
-                        {
-                            new AdaptiveText()
-                            {
-                                Text = content,
-                                HintWrap = true
-                            }
-                        }
-                    }
-                }
-            };
-
-            ToastNotification toastNotification = new ToastNotification(toastContent.GetXml());
-            toastNotifier.Show(toastNotification);
-        }
     }
 }

Signal-Windows/App.xaml.cs

@@ -131,34 +131,24 @@ await Views[currentId].Dispatcher.RunTaskAsync(() =>
         protected override async void OnLaunched(LaunchActivatedEventArgs e)
         {
             string taskName = "SignalMessageBackgroundTask";
-            bool foundTask = false;
-            BackgroundExecutionManager.RemoveAccess("2383BenediktRadtke.SignalPrivateMessenger");
-            //foreach (var task in BackgroundTaskRegistration.AllTasks)
-            //{
-            //    if (task.Value.Name == taskName)
-            //    {
-            //        backgroundTaskRegistration = task.Value;
-            //        foundTask = true;
-            //    }
-            //}
+            BackgroundExecutionManager.RemoveAccess();
 
-            if (!foundTask)
+            var builder = new BackgroundTaskBuilder();
+            builder.Name = taskName;
+            builder.TaskEntryPoint = "Signal_Windows.RC.SignalBackgroundTask";
+            builder.IsNetworkRequested = true;
+            builder.SetTrigger(new TimeTrigger(15, false));
+            builder.AddCondition(new SystemCondition(SystemConditionType.InternetAvailable));
+            var requestStatus = await BackgroundExecutionManager.RequestAccessAsync();
+            if (requestStatus != BackgroundAccessStatus.DeniedBySystemPolicy ||
+                requestStatus != BackgroundAccessStatus.DeniedByUser ||
+                requestStatus != BackgroundAccessStatus.Unspecified)
             {
-                var builder = new BackgroundTaskBuilder();
-                builder.Name = taskName;
-                builder.TaskEntryPoint = "Signal_Windows.RC.SignalBackgroundTask";
-                builder.IsNetworkRequested = true;
-                builder.SetTrigger(new TimeTrigger(15, false));
-                //builder.SetTrigger(new SystemTrigger(SystemTriggerType.ServicingComplete, false));
-                //builder.SetTrigger(new SystemTrigger(SystemTriggerType.TimeZoneChange, false));
-                builder.AddCondition(new SystemCondition(SystemConditionType.InternetAvailable));
-                var requestStatus = await BackgroundExecutionManager.RequestAccessAsync();
-                if (requestStatus != BackgroundAccessStatus.DeniedBySystemPolicy ||
-                    requestStatus != BackgroundAccessStatus.DeniedByUser ||
-                    requestStatus != BackgroundAccessStatus.Unspecified)
-                {
-                    backgroundTaskRegistration = builder.Register();
-                }
+                backgroundTaskRegistration = builder.Register();
+            }
+            else
+            {
+                Logger.LogWarning($"Unable to register background task: {requestStatus}");
             }
 
             backgroundTaskRegistration.Completed += BackgroundTaskRegistration_Completed;