SDK's versions and changelog updated (#93)

ijunaid · web-flow · commit 965f3a38535b · 2022-09-06T12:07:31.000+03:00
* SDK's and changelog updated

* SDK version updated in all files
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 22.02.2
+* Added a way to add allowed package names for push notification intent security.
+* Added a way to add allowed class names for push notification intent security.
+* Updated underlying android SDK version to 22.02.3
+* Updated underlying iOS SDK version to 22.06.1
+
 ## 22.02.1
 * Fixed opening two intent for MainActivity when clicking on push notification with deep-link.
 * Updated underlying android SDK version to 22.02.1
diff --git a/CountlyReactNative.podspec b/CountlyReactNative.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '22.02.1'
+  s.version = '22.02.2'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE
diff --git a/android/build.gradle b/android/build.gradle
@@ -41,7 +41,7 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'ly.count.android:sdk:22.02.1'
+    implementation 'ly.count.android:sdk:22.02.3'
 
     // Import the BoM for the Firebase platform
     // The BoM version of 28.4.2 is the newest release that will target firebase-messaging version 22
diff --git a/android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java b/android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java
@@ -79,7 +79,7 @@ public String toString(){
 public class CountlyReactNative extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "22.02.1";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "22.02.2";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static final CountlyConfig config = new CountlyConfig();
diff --git a/example/install.sh b/example/install.sh
@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add countly-sdk-react-native-bridge@22.02.1
+yarn add countly-sdk-react-native-bridge@22.02.2
 
 cd ./ios
 pod install
diff --git a/ios/src/CHANGELOG.md b/ios/src/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 22.06.1
+- Fixed user details consent issue on SDK start
+- Updated feedback widget internal webview design and layout
+
+- Other various improvements
+  - Updated HeaderDocs, internal logs, inline notes and pragma marks
+
+
+
 ## 22.06.0
 - Added `CountlyAutoViewTrackingName` protocol for supporting custom view titles with AutoViewTracking
 - Added `setNewURLSessionConfiguration:` method to be able change URL session configuraion on the go (thanks @angelix)
diff --git a/ios/src/Countly-PL.podspec b/ios/src/Countly-PL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '22.06.0'
+  s.version = '22.06.1'
   s.license = { :type => 'MIT', :file => 'LICENSE.md' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'
diff --git a/ios/src/Countly.h b/ios/src/Countly.h
@@ -526,7 +526,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param widgetID ID of the feedback widget created on Countly Server.
  * @param completionHandler A completion handler block to be executed when feedback widget is dismissed by user or there is an error.
  */
-- (void)presentFeedbackWidgetWithID:(NSString *)widgetID completionHandler:(void (^)(NSError * __nullable error))completionHandler DEPRECATED_MSG_ATTRIBUTE("Use 'presentRatingWidgetWithID:' method instead!");
+- (void)presentFeedbackWidgetWithID:(NSString *)widgetID completionHandler:(void (^)(NSError * __nullable error))completionHandler DEPRECATED_MSG_ATTRIBUTE("Use 'presentRatingWidgetWithID:completionHandler' method instead!");
 
 /**
  * Presents rating widget with given ID in a WKWebView placed in a UIViewController.
@@ -599,7 +599,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Records indirect attribution with given key-value pairs.
- * @discussion Keys could be a predefined CLYAttributionKey or any non-zero length valid string.
+ * @discussion Keys could be a predefined @c CLYAttributionKey or any non-zero length valid string.
  * @discussion This method sends an immediate request.
  * @discussion Calls to this method will be ignored if:
  * @discussion - Consent for @c CLYConsentAttribution is not given, while @c requiresConsent flag is set on initial configuration.
diff --git a/ios/src/Countly.podspec b/ios/src/Countly.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '22.06.0'
+  s.version = '22.06.1'
   s.license = { :type => 'MIT', :file => 'LICENSE.md' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'
diff --git a/ios/src/Countly.xcodeproj/project.pbxproj b/ios/src/Countly.xcodeproj/project.pbxproj
@@ -410,7 +410,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 22.06.0;
+				MARKETING_VERSION = 22.06.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -439,7 +439,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 22.06.0;
+				MARKETING_VERSION = 22.06.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/ios/src/CountlyCommon.h b/ios/src/CountlyCommon.h
@@ -31,6 +31,7 @@
 
 #if (TARGET_OS_IOS)
 #import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
 #endif
 
 #if (TARGET_OS_WATCH)
@@ -104,6 +105,7 @@ void CountlyPrint(NSString *stringToPrint);
 
 #if (TARGET_OS_IOS)
 @interface CLYInternalViewController : UIViewController
+@property (nonatomic, weak) WKWebView* webView;
 @end
 
 @interface CLYButton : UIButton
diff --git a/ios/src/CountlyCommon.m b/ios/src/CountlyCommon.m
@@ -26,7 +26,7 @@ @interface CountlyCommon ()
 #endif
 @end
 
-NSString* const kCountlySDKVersion = @"22.06.0";
+NSString* const kCountlySDKVersion = @"22.06.1";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";
@@ -293,6 +293,28 @@ - (void)tryPresentingViewController:(UIViewController *)viewController withCompl
 #if (TARGET_OS_IOS)
 @implementation CLYInternalViewController : UIViewController
 
+- (void)viewWillLayoutSubviews
+{
+    [super viewWillLayoutSubviews];
+
+    if (self.webView)
+    {
+        CGRect frame = CGRectInset(self.view.bounds, 20.0, 20.0);
+
+        UIEdgeInsets insets = UIEdgeInsetsZero;
+        if (@available(iOS 11.0, *))
+        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+            insets = UIApplication.sharedApplication.keyWindow.safeAreaInsets;
+            #pragma GCC diagnostic pop
+        }
+
+        frame = UIEdgeInsetsInsetRect(frame, insets);
+        self.webView.frame = frame;
+    }
+}
+
 @end
 
 
diff --git a/ios/src/CountlyConsentManager.m b/ios/src/CountlyConsentManager.m
@@ -79,16 +79,16 @@ - (void)giveConsentForFeatures:(NSArray *)features
     //NOTE: Otherwise, if location consent is given after sessions consent, begin_session request will be sent with an empty string as location.
     if ([features containsObject:CLYConsentLocation] && !self.consentForLocation)
         self.consentForLocation = YES;
+    
+    if ([features containsObject:CLYConsentUserDetails] && !self.consentForUserDetails)
+        self.consentForUserDetails = YES;
 
     if ([features containsObject:CLYConsentSessions] && !self.consentForSessions)
         self.consentForSessions = YES;
 
     if ([features containsObject:CLYConsentEvents] && !self.consentForEvents)
         self.consentForEvents = YES;
 
-    if ([features containsObject:CLYConsentUserDetails] && !self.consentForUserDetails)
-        self.consentForUserDetails = YES;
-
     if ([features containsObject:CLYConsentCrashReporting] && !self.consentForCrashReporting)
         self.consentForCrashReporting = YES;
 
@@ -260,6 +260,7 @@ - (void)setConsentForUserDetails:(BOOL)consentForUserDetails
     if (consentForUserDetails)
     {
         CLY_LOG_D(@"Consent for UserDetails is given.");
+        [Countly.user save];
     }
     else
     {
diff --git a/ios/src/CountlyFeedbackWidget.m b/ios/src/CountlyFeedbackWidget.m
@@ -53,13 +53,17 @@ - (void)presentWithAppearBlock:(void(^ __nullable)(void))appearBlock andDismissB
         return;
 
     __block CLYInternalViewController* webVC = CLYInternalViewController.new;
-    webVC.view.backgroundColor = UIColor.whiteColor;
-    webVC.view.bounds = UIScreen.mainScreen.bounds;
+    webVC.view.backgroundColor = [UIColor.blackColor colorWithAlphaComponent:0.4];
     webVC.modalPresentationStyle = UIModalPresentationCustom;
 
     WKWebView* webView = [WKWebView.alloc initWithFrame:webVC.view.bounds];
+    webView.layer.shadowColor = UIColor.blackColor.CGColor;
+    webView.layer.shadowOpacity = 0.5;
+    webView.layer.shadowOffset = (CGSize){0.0f, 5.0f};
+    webView.layer.masksToBounds = NO;
     webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [webVC.view addSubview:webView];
+    webVC.webView = webView;
     NSURLRequest* request = [self displayRequest];
     [webView loadRequest:request];
 
@@ -76,8 +80,8 @@ - (void)presentWithAppearBlock:(void(^ __nullable)(void))appearBlock andDismissB
 
         [self recordReservedEventForDismissing];
     };
-    [webVC.view addSubview:dismissButton];
-    [dismissButton positionToTopRightConsideringStatusBar];
+    [webView addSubview:dismissButton];
+    [dismissButton positionToTopRight];
 
     [CountlyCommon.sharedInstance tryPresentingViewController:webVC withCompletion:appearBlock];
 }
diff --git a/ios/src/CountlyReactNative.m b/ios/src/CountlyReactNative.m
@@ -21,7 +21,7 @@ @interface CountlyFeedbackWidget ()
 + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 @end
 
-NSString* const kCountlyReactNativeSDKVersion = @"22.02.1";
+NSString* const kCountlyReactNativeSDKVersion = @"22.02.2";
 NSString* const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CountlyConfig* config = nil;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "countly-sdk-react-native-bridge",
-  "version": "22.02.1",
+  "version": "22.02.2",
   "author": "Countly <hello@count.ly> (https://count.ly/)",
   "bugs": {
     "url": "https://github.com/Countly/countly-sdk-react-native-bridge/issues"
