Skip to content

Commit 18f71fa

Browse files
committed
feat: merge
1 parent 32f0057 commit 18f71fa

File tree

3 files changed

+41
-14
lines changed

3 files changed

+41
-14
lines changed

example/ios/CourierReactNativeExample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
14-
2776652129477EBF009787AF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2776652029477EBF009787AF /* GoogleService-Info.plist */; };
14+
2771A7B429539FA900769CE9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2771A7B329539FA900769CE9 /* GoogleService-Info.plist */; };
1515
411AE1611544DDFEA5AA69E9 /* libPods-CourierService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B457B43780DB2169A210BDF /* libPods-CourierService.a */; };
1616
4A072F5A28F71FD80067DE0D /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A072F5928F71FD80067DE0D /* NotificationService.swift */; };
1717
4A072F5E28F71FD80067DE0D /* CourierService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4A072F5728F71FD80067DE0D /* CourierService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -52,7 +52,7 @@
5252
274C7B6F28F72FB900537847 /* libCourier-iOS-iOS13.0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libCourier-iOS-iOS13.0.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5353
274C7B7128F7301E00537847 /* libCourier-iOS-iOS13.0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libCourier-iOS-iOS13.0.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5454
274C7B7328F7302900537847 /* libCourier-iOS-iOS16.0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libCourier-iOS-iOS16.0.a"; sourceTree = BUILT_PRODUCTS_DIR; };
55-
2776652029477EBF009787AF /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
55+
2771A7B329539FA900769CE9 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
5656
3B4392A12AC88292D35C810B /* Pods-CourierReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CourierReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-CourierReactNativeExample/Pods-CourierReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
5757
430BDE5C244AF69BE2C6541E /* Pods-CourierService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CourierService.debug.xcconfig"; path = "Target Support Files/Pods-CourierService/Pods-CourierService.debug.xcconfig"; sourceTree = "<group>"; };
5858
4A072F5728F71FD80067DE0D /* CourierService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = CourierService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -90,7 +90,7 @@
9090
13B07FAE1A68108700A75B9A /* CourierReactNativeExample */ = {
9191
isa = PBXGroup;
9292
children = (
93-
2776652029477EBF009787AF /* GoogleService-Info.plist */,
93+
2771A7B329539FA900769CE9 /* GoogleService-Info.plist */,
9494
4AC7137C28ECC99F00C31B3C /* CourierReactNativeExample.entitlements */,
9595
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
9696
13B07FB01A68108700A75B9A /* AppDelegate.mm */,
@@ -254,7 +254,7 @@
254254
files = (
255255
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
256256
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
257-
2776652129477EBF009787AF /* GoogleService-Info.plist in Resources */,
257+
2771A7B429539FA900769CE9 /* GoogleService-Info.plist in Resources */,
258258
);
259259
runOnlyForDeploymentPostprocessing = 0;
260260
};
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>98931983397-ff8an51kut1evkgtgjv59caagjkm6n30.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.98931983397-ff8an51kut1evkgtgjv59caagjkm6n30</string>
9+
<key>API_KEY</key>
10+
<string>AIzaSyAWnYV_4reQ_nSvr_q1P5WwBoJajVj8bFk</string>
11+
<key>GCM_SENDER_ID</key>
12+
<string>98931983397</string>
13+
<key>PLIST_VERSION</key>
14+
<string>1</string>
15+
<key>BUNDLE_ID</key>
16+
<string>com.courier.reactnative</string>
17+
<key>PROJECT_ID</key>
18+
<string>courier-testing-61c0b</string>
19+
<key>STORAGE_BUCKET</key>
20+
<string>courier-testing-61c0b.appspot.com</string>
21+
<key>IS_ADS_ENABLED</key>
22+
<false></false>
23+
<key>IS_ANALYTICS_ENABLED</key>
24+
<false></false>
25+
<key>IS_APPINVITE_ENABLED</key>
26+
<true></true>
27+
<key>IS_GCM_ENABLED</key>
28+
<true></true>
29+
<key>IS_SIGNIN_ENABLED</key>
30+
<true></true>
31+
<key>GOOGLE_APP_ID</key>
32+
<string>1:98931983397:ios:c5b9307749ebff33a4abcc</string>
33+
</dict>
34+
</plist>

ios/CourierReactNative.swift

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ class CourierReactNative: RCTEventEmitter {
2424
// Used to know the platform performing requests
2525
Courier.agent = CourierAgent.react_native_ios
2626

27+
// Reset Debugger
28+
Courier.shared.isDebugging = false
29+
2730
// Attach the listeners
2831
attachObservers()
29-
30-
// Reset Debugger
31-
resetDebugger()
3232

3333
}
3434

@@ -50,13 +50,6 @@ class CourierReactNative: RCTEventEmitter {
5050

5151
}
5252

53-
private func resetDebugger(){
54-
55-
isDebugListenerRegistered = false
56-
Courier.shared.isDebugging = false
57-
58-
}
59-
6053
private func sendMessage(name: String, message: [AnyHashable: Any]?) {
6154

6255
guard let message = message else {

0 commit comments

Comments
 (0)