Merge pull request #340 from github-for-unity/fixes/ui-thread-check-of-doom

Fix ui thread check

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -17,7 +17,7 @@ public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         {
             SynchronizationContext = synchronizationContext;
             SynchronizationContext.SetSynchronizationContext(SynchronizationContext);
-            ThreadingHelper.SetMainThread();
+            ThreadingHelper.SetUIThread();
             UIScheduler = TaskScheduler.FromCurrentSynchronizationContext();
             ThreadingHelper.MainThreadScheduler = UIScheduler;
             TaskManager = new TaskManager(UIScheduler);

src/GitHub.Api/Threading/ThreadingHelper.cs

@@ -10,14 +10,14 @@ static class ThreadingHelper
         public static TaskScheduler MainThreadScheduler { get; set; }
 
         public static int MainThread { get; set; }
-        public static bool InMainThread { get { return MainThread == 0 || Thread.CurrentThread.ManagedThreadId == MainThread; } }
+        static bool InMainThread { get { return MainThread == 0 || Thread.CurrentThread.ManagedThreadId == MainThread; } }
 
-        public static void SetMainThread()
+        public static void SetUIThread()
         {
             MainThread = Thread.CurrentThread.ManagedThreadId;
         }
 
-        public static bool InUIThread => (!Guard.InUnitTestRunner && InMainThread) || !(Guard.InUnitTestRunner);
+        public static bool InUIThread => InMainThread || Guard.InUnitTestRunner;
 
         /// <summary>
         /// Switch to the UI thread
@@ -97,7 +97,7 @@ public bool IsCompleted
             {
                 get
                 {
-                    return (this.scheduler == TaskManager.Instance.UIScheduler && InMainThread) || (this.scheduler != TaskManager.Instance.UIScheduler && !InMainThread);
+                    return (this.scheduler == TaskManager.Instance.UIScheduler && InUIThread) || (this.scheduler != TaskManager.Instance.UIScheduler && !InUIThread);
                 }
             }