From 0bbc8a21b3f89ef08226f5b7791766ecfafa1740 Mon Sep 17 00:00:00 2001 From: Nikola Zagorchev Date: Fri, 5 Apr 2024 16:45:08 +0300 Subject: [PATCH 1/5] Save events to be observed when ready --- ios/CleverTapReact.xcodeproj/project.pbxproj | 8 ++ .../CleverTapReactEventEmitter.h | 2 + .../CleverTapReactEventEmitter.m | 116 +++++------------- ios/CleverTapReact/CleverTapReactManager.m | 4 +- .../CleverTapReactPendingEvent.h | 14 +++ .../CleverTapReactPendingEvent.m | 14 +++ 6 files changed, 70 insertions(+), 88 deletions(-) create mode 100644 ios/CleverTapReact/CleverTapReactPendingEvent.h create mode 100644 ios/CleverTapReact/CleverTapReactPendingEvent.m diff --git a/ios/CleverTapReact.xcodeproj/project.pbxproj b/ios/CleverTapReact.xcodeproj/project.pbxproj index 83b94f5c..61043965 100644 --- a/ios/CleverTapReact.xcodeproj/project.pbxproj +++ b/ios/CleverTapReact.xcodeproj/project.pbxproj @@ -17,6 +17,8 @@ 5266DAB91E4B9C16000008F5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5266DAB61E4B9B8C000008F5 /* UIKit.framework */; }; 5266DABA1E4B9C20000008F5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52DFC6831E4B990A00EDC368 /* SystemConfiguration.framework */; }; 5266DADB1E4BB5BD000008F5 /* CleverTapSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5266DAD91E4BB598000008F5 /* CleverTapSDK.framework */; }; + 6B587A032BC02ECD0077493E /* CleverTapReactPendingEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B587A022BC02ECD0077493E /* CleverTapReactPendingEvent.m */; }; + 6B587A042BC02ECD0077493E /* CleverTapReactPendingEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B587A012BC02ECD0077493E /* CleverTapReactPendingEvent.h */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -45,6 +47,8 @@ 52DFC6831E4B990A00EDC368 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 52DFC6851E4B991000EDC368 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 5D72D2E81C16249000E22EC1 /* libCleverTapReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCleverTapReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6B587A012BC02ECD0077493E /* CleverTapReactPendingEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CleverTapReactPendingEvent.h; sourceTree = ""; }; + 6B587A022BC02ECD0077493E /* CleverTapReactPendingEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CleverTapReactPendingEvent.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,6 +75,8 @@ 52344FBC1E4CE7F000661762 /* CleverTapReactManager.m */, 52344FDE1E4D0F3700661762 /* CleverTapReactEventEmitter.h */, 52344FDF1E4D0F3700661762 /* CleverTapReactEventEmitter.m */, + 6B587A012BC02ECD0077493E /* CleverTapReactPendingEvent.h */, + 6B587A022BC02ECD0077493E /* CleverTapReactPendingEvent.m */, ); path = CleverTapReact; sourceTree = ""; @@ -111,6 +117,7 @@ buildActionMask = 2147483647; files = ( 52344FC21E4CEC3200661762 /* CleverTapReactManager.h in Headers */, + 6B587A042BC02ECD0077493E /* CleverTapReactPendingEvent.h in Headers */, 52344FE01E4D0F3700661762 /* CleverTapReactEventEmitter.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -176,6 +183,7 @@ 52344FBF1E4CE7F000661762 /* CleverTapReactManager.m in Sources */, 52344FE11E4D0F3700661762 /* CleverTapReactEventEmitter.m in Sources */, 52344FBE1E4CE7F000661762 /* CleverTapReact.m in Sources */, + 6B587A032BC02ECD0077493E /* CleverTapReactPendingEvent.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/CleverTapReact/CleverTapReactEventEmitter.h b/ios/CleverTapReact/CleverTapReactEventEmitter.h index c51caeec..b61dc8f6 100644 --- a/ios/CleverTapReact/CleverTapReactEventEmitter.h +++ b/ios/CleverTapReact/CleverTapReactEventEmitter.h @@ -2,4 +2,6 @@ @interface CleverTapReactEventEmitter : RCTEventEmitter ++ (void)sendEventOnObserving:(NSString *)name body:(id)body; + @end diff --git a/ios/CleverTapReact/CleverTapReactEventEmitter.m b/ios/CleverTapReact/CleverTapReactEventEmitter.m index ba968827..b06931eb 100644 --- a/ios/CleverTapReact/CleverTapReactEventEmitter.m +++ b/ios/CleverTapReact/CleverTapReactEventEmitter.m @@ -1,102 +1,46 @@ #import "CleverTapReactEventEmitter.h" +#import "CleverTapReactPendingEvent.h" #import "CleverTapReact.h" - #import +static NSMutableArray *pendingEvents; +static BOOL isObserving; + @implementation CleverTapReactEventEmitter RCT_EXPORT_MODULE(); ++ (void)sendEventOnObserving:(NSString *)name body:(id)body { + if (isObserving) { + [[NSNotificationCenter defaultCenter] postNotificationName:name object:nil userInfo:body]; + return; + } + + if (!pendingEvents) { + pendingEvents = [NSMutableArray array]; + } + + CleverTapReactPendingEvent *event = [[CleverTapReactPendingEvent alloc] initWithName:name body:body]; + [pendingEvents addObject:event]; +} + - (NSArray *)supportedEvents { return @[kCleverTapProfileDidInitialize, kCleverTapProfileSync, kCleverTapInAppNotificationDismissed, kCleverTapInboxDidInitialize, kCleverTapInboxMessagesDidUpdate, kCleverTapInAppNotificationButtonTapped, kCleverTapInboxMessageButtonTapped, kCleverTapInboxMessageTapped, kCleverTapDisplayUnitsLoaded, kCleverTapFeatureFlagsDidUpdate, kCleverTapProductConfigDidFetch, kCleverTapProductConfigDidActivate, kCleverTapProductConfigDidInitialize, kCleverTapPushNotificationClicked, kCleverTapPushPermissionResponseReceived, kCleverTapInAppNotificationShowed, kCleverTapOnVariablesChanged, kCleverTapOnValueChanged]; } - - (void)startObserving { - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapProfileDidInitialize - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapProfileSync - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInAppNotificationDismissed - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInboxDidInitialize - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInboxMessagesDidUpdate - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapDisplayUnitsLoaded - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInAppNotificationButtonTapped - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInboxMessageButtonTapped - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapInboxMessageTapped - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapFeatureFlagsDidUpdate - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapProductConfigDidFetch - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapProductConfigDidActivate - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapProductConfigDidInitialize - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapPushNotificationClicked - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapPushPermissionResponseReceived - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapOnVariablesChanged - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(emitEventInternal:) - name:kCleverTapOnValueChanged - object:nil]; + NSArray *eventNames = [self supportedEvents]; + for (NSString *eventName in eventNames) { + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(emitEventInternal:) + name:eventName + object:nil]; + } + + isObserving = YES; + for (CleverTapReactPendingEvent *ev in pendingEvents) { + [[NSNotificationCenter defaultCenter] postNotificationName:ev.name object:nil userInfo:ev.body]; + } } - (void)stopObserving { diff --git a/ios/CleverTapReact/CleverTapReactManager.m b/ios/CleverTapReact/CleverTapReactManager.m index d9212b1b..04de3383 100644 --- a/ios/CleverTapReact/CleverTapReactManager.m +++ b/ios/CleverTapReact/CleverTapReactManager.m @@ -17,7 +17,7 @@ #import "CleverTapPushNotificationDelegate.h" #import "CleverTapInAppNotificationDelegate.h" #import "CleverTap+PushPermission.h" - +#import "CleverTapReactEventEmitter.h" @interface CleverTapReactManager() { } @@ -75,7 +75,7 @@ - (void)applicationDidLaunchWithOptions:(NSDictionary *)options { #pragma mark - Private - (void)postNotificationWithName:(NSString *)name andBody:(NSDictionary *)body { - [[NSNotificationCenter defaultCenter] postNotificationName:name object:nil userInfo:body]; + [CleverTapReactEventEmitter sendEventOnObserving:name body:body]; } diff --git a/ios/CleverTapReact/CleverTapReactPendingEvent.h b/ios/CleverTapReact/CleverTapReactPendingEvent.h new file mode 100644 index 00000000..0cabb612 --- /dev/null +++ b/ios/CleverTapReact/CleverTapReactPendingEvent.h @@ -0,0 +1,14 @@ +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface CleverTapReactPendingEvent : NSObject + +@property (nonatomic, strong) NSString *name; +@property (nonatomic, strong) id body; + +- (instancetype)initWithName:(NSString *)name body:(id)body; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ios/CleverTapReact/CleverTapReactPendingEvent.m b/ios/CleverTapReact/CleverTapReactPendingEvent.m new file mode 100644 index 00000000..635d869b --- /dev/null +++ b/ios/CleverTapReact/CleverTapReactPendingEvent.m @@ -0,0 +1,14 @@ +#import "CleverTapReactPendingEvent.h" + +@implementation CleverTapReactPendingEvent + +- (instancetype)initWithName:(NSString *)name body:(id)body { + self = [super init]; + if (self) { + _name = name; + _body = body; + } + return self; +} + +@end From 30314d7dcb724e9122f57a5e108b916cf8eb5e17 Mon Sep 17 00:00:00 2001 From: Anush-Shand <127097095+Anush-Shand@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:53:26 +0530 Subject: [PATCH 2/5] task(SDK-3763) - Adds support for android v6.2.1 (#391) * task(SDK-3763) - Adds support for android v6.2.1 * task(SDK-3763) - Adds support for android v6.2.1 --- CHANGELOG.md | 15 +++++++++++++++ Example/android/app/build.gradle | 2 +- android/build.gradle | 6 +++--- index.js | 2 +- package.json | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c68c82d..7bee7286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,22 @@ Change Log ========== +Version 2.2.1 *(12 April 2024)* +------------------------------------------- +**What's new** + +* **[Android Platform]** + * Supports [CleverTap Android SDK v6.2.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md#version-620-april-3-2024). + +**Bug Fixes** +* **[Android Platform]** + * Fixes a crash due to `IllegalArgumentException` caused by allowedPushType `XPS` enum. + + Version 2.2.0 *(5 April 2024)* ------------------------------------------- +> ⚠️ **NOTE** +2.2.0 produces a crash, please update to 2.2.1 and above. + **What's new** * **[Android Platform]** diff --git a/Example/android/app/build.gradle b/Example/android/app/build.gradle index 8ec8f2c8..513f6659 100644 --- a/Example/android/app/build.gradle +++ b/Example/android/app/build.gradle @@ -218,7 +218,7 @@ dependencies { //clevertap - implementation 'com.clevertap.android:clevertap-android-sdk:6.2.0' + implementation 'com.clevertap.android:clevertap-android-sdk:6.2.1' implementation "com.clevertap.android:push-templates:1.2.3" implementation project(':clevertap-react-native') diff --git a/android/build.gradle b/android/build.gradle index 265d42a5..91f87e3b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,8 +20,8 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 34 - versionCode 220 - versionName "2.2.0" + versionCode 221 + versionName "2.2.1" } namespace 'com.clevertap.react' @@ -40,7 +40,7 @@ dependencies { maven { url "$rootDir/../node_modules/react-native/android" } } - api 'com.clevertap.android:clevertap-android-sdk:6.2.0' + api 'com.clevertap.android:clevertap-android-sdk:6.2.1' implementation 'com.android.installreferrer:installreferrer:2.2' //compile 'com.android.support:appcompat-v7:28.0.0' implementation 'com.facebook.react:react-native:+' diff --git a/index.js b/index.js index d22a2b02..f85cc5a6 100644 --- a/index.js +++ b/index.js @@ -9,7 +9,7 @@ const EventEmitter = NativeModules.CleverTapReactEventEmitter ? new NativeEventE * @param {int} libVersion - The updated library version. If current version is 1.1.0 then pass as 10100 */ const libName = 'React-Native'; -const libVersion = 20200; +const libVersion = 20201; CleverTapReact.setLibrary(libName,libVersion); function defaultCallback(method, err, res) { diff --git a/package.json b/package.json index d9469332..0f575783 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clevertap-react-native", - "version": "2.2.0", + "version": "2.2.1", "description": "CleverTap React Native SDK.", "main": "index.js", "types": "index.d.ts", From 491ff98b224c79c109b497084d3a00a0825977a6 Mon Sep 17 00:00:00 2001 From: Akash Malhotra <> Date: Fri, 12 Apr 2024 15:44:47 +0530 Subject: [PATCH 3/5] added support for ios sdk v6.2.1 --- clevertap-react-native.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clevertap-react-native.podspec b/clevertap-react-native.podspec index 46e6c81f..e50dbe91 100644 --- a/clevertap-react-native.podspec +++ b/clevertap-react-native.podspec @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.preserve_paths = 'LICENSE.md', 'README.md', 'package.json', 'index.js' s.source_files = 'ios/CleverTapReact/*.{h,m}' - s.dependency 'CleverTap-iOS-SDK', '6.2.0' + s.dependency 'CleverTap-iOS-SDK', '6.2.1' s.dependency 'React-Core' end From b9d15ab2f5b62f0aa97a0d0c37e355e5f38cafd3 Mon Sep 17 00:00:00 2001 From: Akash Malhotra <> Date: Fri, 12 Apr 2024 16:25:10 +0530 Subject: [PATCH 4/5] updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bee7286..7f50a3ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,16 @@ Version 2.2.1 *(12 April 2024)* * **[Android Platform]** * Supports [CleverTap Android SDK v6.2.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md#version-620-april-3-2024). +* **[iOS Platform]** + * Supports [CleverTap iOS SDK v6.2.1](https://github.com/CleverTap/clevertap-ios-sdk/blob/master/CHANGELOG.md#version-621-april-12-2024). + **Bug Fixes** * **[Android Platform]** * Fixes a crash due to `IllegalArgumentException` caused by allowedPushType `XPS` enum. +* **[iOS Platform]** + * Fixes a build error related to privacy manifests when statically linking the SDK using Cocoapods. + Version 2.2.0 *(5 April 2024)* ------------------------------------------- From 7876dc20b47cf348b0d00400dc3437c195776673 Mon Sep 17 00:00:00 2001 From: Anush-Shand <127097095+Anush-Shand@users.noreply.github.com> Date: Fri, 12 Apr 2024 17:08:04 +0530 Subject: [PATCH 5/5] task(SDK-3763) - Fixes typo (#394) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f50a3ab..857b4e00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ Version 2.2.1 *(12 April 2024)* **What's new** * **[Android Platform]** - * Supports [CleverTap Android SDK v6.2.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md#version-620-april-3-2024). + * Supports [CleverTap Android SDK v6.2.1](https://github.com/CleverTap/clevertap-android-sdk/blob/master/docs/CTCORECHANGELOG.md#version-621-april-11-2024). * **[iOS Platform]** * Supports [CleverTap iOS SDK v6.2.1](https://github.com/CleverTap/clevertap-ios-sdk/blob/master/CHANGELOG.md#version-621-april-12-2024).