Use DispatchQueue.main.async

madsrode · Aug 26, 2020 · f775dbc · f775dbc
1 parent 5776423
commit f775dbc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/ios/GameAuth.swift b/ios/GameAuth.swift
@@ -11,22 +11,22 @@ class GameAuth: RCTEventEmitter {
 
     @objc
     func initAuth(_ showUIIfUnauthenticated: Bool) {
-        let ui = UIApplication.shared.keyWindow?.rootViewController;
-
         let player = GKLocalPlayer.local
         if(player.authenticateHandler == nil) {
-            player.authenticateHandler = { vc, error in
+                player.authenticateHandler = { vc, error in
                 self.loginUI = vc;
                 if(vc != nil) {
                     if(showUIIfUnauthenticated) {
-                        ui?.present(vc!, animated: true, completion: nil);
+                        DispatchQueue.main.async {
+                            UIApplication.shared.keyWindow?.rootViewController?.present(self.loginUI!, animated: true, completion: nil);
+                        }
                     }
                     else {
-                        self.sendEvent(withName: self.C_OnAuthenticated, body: ["isAuthenticated":false, "error": error])
+                        self.sendEvent(withName: self.C_OnAuthenticated, body: ["isAuthenticated":false, "error": error?.localizedDescription as Any])
                     }
                 }
                 else {
-                    self.sendEvent(withName: self.C_OnAuthenticated, body: ["isAuthenticated":player.isAuthenticated, "error": error])
+                    self.sendEvent(withName: self.C_OnAuthenticated, body: ["isAuthenticated":player.isAuthenticated, "error": error?.localizedDescription as Any])
                 }
             }
         }
@@ -36,7 +36,9 @@ class GameAuth: RCTEventEmitter {
             }
             else {
                 if(showUIIfUnauthenticated && self.loginUI != nil) {
-                    ui?.present(self.loginUI!, animated: true, completion: nil);
+                    DispatchQueue.main.async {
+                        UIApplication.shared.keyWindow?.rootViewController?.present(self.loginUI!, animated: true, completion: nil);
+                    }
                 }
             }
         }

diff --git a/src/index.tsx b/src/index.tsx
@@ -6,16 +6,16 @@ import {
 } from 'react-native';
 
 interface Player {
-  alias: String;
-  displayName: String;
-  playerID: String;
+  alias: string;
+  displayName: string;
+  playerID: string;
 }
 
 export interface IdentityVerificationSignature {
-  publicKeyUrl: String;
-  signature: String;
-  salt: String;
-  timestamp: Number;
+  publicKeyUrl: string;
+  signature: string;
+  salt: string;
+  timestamp: number;
 }
 
 type PlayGamesAuthType = {
@@ -44,7 +44,7 @@ if (PlayGamesAuth) {
   PlayGamesAuth.onAuthTokenChanged = (callback: any) => {
     return DeviceEventEmitter.addListener(
       PlayGamesAuth.AUTH_TOKEN_CHANGED_EVENT,
-      (token: String) => {
+      (token: string) => {
         callback(token);
       }
     );
@@ -64,11 +64,11 @@ if (NativeModules.GameAuth) {
 
 type GameCenterAuthType = {
   initAuth(showUIIfUnauthenticated: boolean): void;
-  isAuthenticated(): Promise<Boolean>;
+  isAuthenticated(): Promise<boolean>;
   getPlayer(): Promise<Player>;
   getServerAuth(): Promise<IdentityVerificationSignature>;
   onAuthenticate(
-    callback: (isAuthenticated: boolean) => void
+    callback: (isAuthenticated: boolean, error?: string) => void
   ): EmitterSubscription;
 };