Get AndroidClient.SignOut method on the main thread.

PiperOrigin-RevId: 309932650 Change-Id: I63e742543bca6535d1ebe08ccb36f106726f8119
playgameservices · May 5, 2020 · b5a2ab5 · b5a2ab5
1 parent 75454b3
commit b5a2ab5
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidClient.cs b/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidClient.cs
@@ -261,6 +261,19 @@ private static Action<T> AsOnGameThreadCallback<T>(Action<T> callback)
             return result => InvokeCallbackOnGameThread(callback, result);
         }
 
+        private static void InvokeCallbackOnGameThread(Action callback)
+        {
+            if (callback == null)
+            {
+                return;
+            }
+
+            PlayGamesHelperObject.RunOnGameThread(() =>
+            {
+                callback();
+            });
+        }
+
         private static void InvokeCallbackOnGameThread<T>(Action<T> callback, T data)
         {
             if (callback == null)
@@ -444,6 +457,7 @@ public void SignOut(Action uiCallback)
         {
             if (mTokenClient == null)
             {
+                InvokeCallbackOnGameThread(uiCallback);
                 return;
             }
 
@@ -462,7 +476,7 @@ public void SignOut(Action uiCallback)
                             mAuthState = AuthState.Unauthenticated;
                             if (uiCallback != null)
                             {
-                                uiCallback();
+                                InvokeCallbackOnGameThread(uiCallback);
                             }
                         });
                 }
@@ -473,11 +487,11 @@ public void SignOut(Action uiCallback)
                 mAuthState = AuthState.Unauthenticated;
                 if (uiCallback != null)
                 {
-                    uiCallback();
+                    InvokeCallbackOnGameThread(uiCallback);
                 }
             }
 
-            SignInHelper.SetPromptUiSignIn(true);
+            PlayGamesHelperObject.RunOnGameThread(() => SignInHelper.SetPromptUiSignIn(true));
         }
 
         ///<summary></summary>