Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent reconfiguration causing exception #419

Merged
merged 1 commit into from
Jun 8, 2020
Merged

Prevent reconfiguration causing exception #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/ios/AppDelegate+FirebasePlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,28 @@ - (BOOL)application:(UIApplication *)application swizzledDidFinishLaunchingWithO
@try{
instance = self;

// get GoogleService-Info.plist file path
NSString *filePath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];

// if file is successfully found, use it
if(filePath){
[FirebasePlugin.firebasePlugin _logMessage:@"GoogleService-Info.plist found, setup: [FIRApp configureWithOptions]"];
// create firebase configure options passing .plist as content
FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];
if(![FIRApp defaultApp]) {
// get GoogleService-Info.plist file path
NSString *filePath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];

// configure FIRApp with options
[FIRApp configureWithOptions:options];
if([FirebasePlugin.firebasePlugin _shouldEnableCrashlytics]){
[Fabric with:@[[Crashlytics class]]];
// if file is successfully found, use it
if(filePath){
[FirebasePlugin.firebasePlugin _logMessage:@"GoogleService-Info.plist found, setup: [FIRApp configureWithOptions]"];
// create firebase configure options passing .plist as content
FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];

// configure FIRApp with options
[FIRApp configureWithOptions:options];
if([FirebasePlugin.firebasePlugin _shouldEnableCrashlytics]){
[Fabric with:@[[Crashlytics class]]];
}
}else{
// no .plist found, try default App
[FirebasePlugin.firebasePlugin _logError:@"GoogleService-Info.plist NOT FOUND, setup: [FIRApp defaultApp]"];
[FIRApp configure];
}
}

// no .plist found, try default App
if (![FIRApp defaultApp] && !filePath) {
[FirebasePlugin.firebasePlugin _logError:@"GoogleService-Info.plist NOT FOUND, setup: [FIRApp defaultApp]"];
[FIRApp configure];
}

shouldEstablishDirectChannel = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"shouldEstablishDirectChannel"] boolValue];

// Set FCM messaging delegate
Expand Down