Skip to content

Commit a1bcd22

Browse files
committed
Removed GoogleParsingUtilities
1 parent d51fca6 commit a1bcd22

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

ios/Firestack.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@
456456
"$(PROJECT_DIR)/Pods/GoogleInterchangeUtilities/Frameworks",
457457
"$(PROJECT_DIR)/Pods/GoogleIPhoneUtilities/Frameworks",
458458
"$(PROJECT_DIR)/Pods/GoogleNetworkingUtilities/Frameworks",
459-
"$(PROJECT_DIR)/Pods/GoogleParsingUtilities/Frameworks",
460459
"$(PROJECT_DIR)/Pods/GoogleSymbolUtilities/Frameworks",
461460
"$(PROJECT_DIR)/Pods/GoogleUtilities/Frameworks",
462461
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks/frameworks",
@@ -502,7 +501,6 @@
502501
"$(PROJECT_DIR)/Pods/GoogleInterchangeUtilities/Frameworks",
503502
"$(PROJECT_DIR)/Pods/GoogleIPhoneUtilities/Frameworks",
504503
"$(PROJECT_DIR)/Pods/GoogleNetworkingUtilities/Frameworks",
505-
"$(PROJECT_DIR)/Pods/GoogleParsingUtilities/Frameworks",
506504
"$(PROJECT_DIR)/Pods/GoogleSymbolUtilities/Frameworks",
507505
"$(PROJECT_DIR)/Pods/GoogleUtilities/Frameworks",
508506
"$(PROJECT_DIR)/Pods/FirebaseAnalytics/Frameworks/frameworks",

ios/Firestack/AppDelegate+Firestack.m

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ - (BOOL) swizzled_application:(UIApplication *) application didFinishLaunchingWi
4040
BOOL res = [self swizzled_application:application didFinishLaunchingWithOptions:launchOptions];
4141
[FIRApp configure];
4242
[self setupListeners];
43+
[self dispatchFirestackConfigured];
4344
return res;
4445
}
4546

@@ -50,11 +51,6 @@ - (void) dealloc
5051

5152
- (void) setupListeners
5253
{
53-
// Post notification that we've initialized Firebase
54-
// [[NSNotificationCenter defaultCenter]
55-
// postNotificationName:kFirestackInitialized
56-
// object:nil];
57-
5854
[[NSNotificationCenter defaultCenter] addObserver:self
5955
selector:@selector(firestackConfigured:)
6056
name:kFirestackInitialized
@@ -67,6 +63,24 @@ - (void) setupListeners
6763
object:nil];
6864
}
6965

66+
- (void) dispatchFirestackConfigured
67+
{
68+
FIROptions *opts = [[FIRApp defaultApp] options];
69+
NSLog(@"opts: %@", opts);
70+
NSLog(@"googleAppID: %@", [opts googleAppID]);
71+
NSLog(@"GCMSenderID: %@", [opts GCMSenderID]);
72+
NSLog(@"APIKey: %@", [opts APIKey]);
73+
NSLog(@"databaseURL: %@", [opts databaseURL]);
74+
NSLog(@"trackingID: %@", [opts trackingID]);
75+
NSLog(@"storageBucket: %@", [opts storageBucket]);
76+
NSLog(@"clientID: %@", [opts clientID]);
77+
NSLog(@"androidClientID: %@", [opts androidClientID]);
78+
// Post notification that we've initialized Firebase
79+
// [[NSNotificationCenter defaultCenter]
80+
// postNotificationName:kFirestackInitialized
81+
// object:nil];
82+
}
83+
7084
- (void) reloadFirestack
7185
{
7286
// TODO:

ios/Firestack/Firestack.m

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@import Firebase;
1616

1717
static Firestack *_sharedInstance = nil;
18+
static dispatch_once_t * onceToken;
1819

1920
@implementation Firestack
2021

@@ -29,37 +30,27 @@ - (void)dealloc
2930
- (instancetype) init {
3031
self = [super init];
3132
if (self) {
32-
NSLog(@"Initializing Firestack: %@", self);
33-
[Firestack initializeFirestack:self];
33+
dispatch_once(&onceToken, ^{
34+
NSLog(@"Initializing Firestack: %@", self);
35+
[Firestack initializeFirestack:self];
36+
});
3437
}
3538
return self;
3639
}
3740

3841
+ (void) initializeFirestack:(Firestack *) instance
3942
{
40-
NSLog(@"Shared instance created on Firestack: %@", instance);
41-
// [FIRApp configureWithOptions:finalOptions];
42-
4343
_sharedInstance = instance;
4444

45-
[[NSNotificationCenter defaultCenter]
46-
postNotificationName:kFirestackInitialized
47-
object:[instance getConfig]];
48-
4945
[[NSNotificationCenter defaultCenter] addObserver:self
5046
selector:@selector(reloadFirestack)
5147
name:RCTReloadNotification
5248
object:nil];
5349

54-
// [[NSNotificationCenter defaultCenter]
55-
// postNotificationName:RCTReloadNotification
56-
// object:nil
57-
// userInfo:nil];
50+
[[NSNotificationCenter defaultCenter]
51+
postNotificationName:kFirestackInitialized
52+
object:nil];
5853

59-
// [[NSNotificationCenter defaultCenter] addObserver:self
60-
// selector:@selector(firestackConfigured:)
61-
// name:kFirestackInitialized
62-
// object:instance];
6354
}
6455

6556
+ (instancetype) sharedInstance
@@ -70,6 +61,7 @@ + (instancetype) sharedInstance
7061
+ (void) reloadFirestack
7162
{
7263
// Reloading firestack
64+
onceToken = 0; // not sure if this is a good idea or a bad idea...
7365
[[Firestack sharedInstance] debugLog:@"Firestack"
7466
msg:@"Reloading firestack"];
7567
}

0 commit comments

Comments
 (0)