From 954e4d5df13b14aee9c1112db67a23729d12acfd Mon Sep 17 00:00:00 2001
From: Chen Liang <chliang@google.com>
Date: Mon, 9 Jul 2018 14:33:41 -0700
Subject: avoid calling [UIApplication sharedApplication] in app extensions
 (#1503)

---
 Firebase/Messaging/FIRMessaging.m | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Firebase/Messaging/FIRMessaging.m')

diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m
index 5dd7004..a92f185 100644
--- a/Firebase/Messaging/FIRMessaging.m
+++ b/Firebase/Messaging/FIRMessaging.m
@@ -378,7 +378,10 @@ NSString *const kFIRMessagingPlistAutoInitEnabled =
     });
     return;
   }
-  UIApplication *application = [UIApplication sharedApplication];
+  UIApplication *application = FIRMessagingUIApplication();
+  if (!application) {
+    return;
+  }
   id<UIApplicationDelegate> appDelegate = application.delegate;
   SEL continueUserActivitySelector =
       @selector(application:continueUserActivity:restorationHandler:);
@@ -611,7 +614,11 @@ NSString *const kFIRMessagingPlistAutoInitEnabled =
   // We require a token from Instance ID
   NSString *token = self.defaultFcmToken;
   // Only on foreground connections
-  UIApplicationState applicationState = [UIApplication sharedApplication].applicationState;
+  UIApplication *application = FIRMessagingUIApplication();
+  if (!application) {
+    return NO;
+  }
+  UIApplicationState applicationState = application.applicationState;
   BOOL shouldBeConnected = _shouldEstablishDirectChannel &&
                            (token.length > 0) &&
                            applicationState == UIApplicationStateActive;
-- 
cgit v1.2.3