Move from library events to observables (win)

toggl-open-source · Mar 25, 2020 · 99f57b9 · 99f57b9
1 parent c9c5aa2
commit 99f57b9
Show file tree

Hide file tree

Showing 34 changed files with 553 additions and 735 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/BugsnagService.cs b/src/ui/windows/TogglDesktop/TogglDesktop/BugsnagService.cs
@@ -51,24 +51,26 @@ public static void Init()
             });
         });
 
-        Toggl.OnError += delegate(string errmsg, bool user_error)
-        {
-            Toggl.Debug(errmsg);
-            try
-            {
-                if (!user_error && bugsnag.Configuration.ReleaseStage != "development")
-                    NotifyBugsnag(new Exception(errmsg));
-            }
-            catch (Exception ex)
-            {
-                Toggl.Debug("Could not check if can notify bugsnag: " + ex);
-            }
-        };
+        Toggl.OnError.Subscribe(x => OnError(x.errorMessage, x.isUserError));
 
         Application.ThreadException += Application_ThreadException;
         AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
     }
 
+    private static void OnError(string errorMessage, bool isUserError)
+    {
+        Toggl.Debug(errorMessage);
+        try
+        {
+            if (!isUserError && bugsnag.Configuration.ReleaseStage != "development")
+                NotifyBugsnag(new Exception(errorMessage));
+        }
+        catch (Exception ex)
+        {
+            Toggl.Debug("Could not check if can notify bugsnag: " + ex);
+        }
+    }
+
     private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
     {
         NotifyBugsnag(e.ExceptionObject as Exception);

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/Program.cs b/src/ui/windows/TogglDesktop/TogglDesktop/Program.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
 using System.Reflection;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -10,10 +12,8 @@ namespace TogglDesktop
 static class Program
 {
     private static SingleInstanceManager<App> singleInstanceManager;
-    public static ulong UserId {
-        get;
-        private set;
-    }
+    private static readonly BehaviorSubject<ulong> UserIdSubject = new BehaviorSubject<ulong>(0);
+    public static ulong UserId => UserIdSubject.Value;
     public static bool IsLoggedIn => UserId > 0;
 
     [STAThread]
@@ -29,9 +29,7 @@ static void Main(string[] args)
 
     private static void OnBeforeStartup()
     {
-        Toggl.OnLogin += delegate (bool open, ulong user_id) {
-            UserId = user_id;
-        };
+        Toggl.OnLogin.Select(x => x.userId).Subscribe(UserIdSubject);
         BugsnagService.Init();
         singleInstanceManager.BeforeStartup -= OnBeforeStartup;
     }