Added a call to provide user properties during init (#71)

* dding a call to provide user properties during init

* Removing filtering for user properties during init

* User details filtering implemented in iOS

* Config change in calling sequence

* Fixing iOS user details issue during init.

* Reverting SERVER_URL and APP_KEY values

Author: ijunaid

CHANGELOG.md

@@ -1,4 +1,6 @@
 ## 22.02.0
+* Fixed notification trampoline restrictions in Android 12 using reverse activity trampolining implementation.
+* Adding a call to provide user properties during initialization.
 * Updated underlying android SDK version to 22.02.1
 * Updated underlying iOS SDK version to 22.06.0
 

android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java

@@ -1149,6 +1149,11 @@ private void populateConfig(JSONObject _config) throws JSONException {
             Map<String, Object> customCrashSegment = toMap(_config.getJSONObject("customCrashSegment"));
             this.config.setCustomCrashSegment(customCrashSegment);
         }
+        if (_config.has("providedUserProperties")) {
+            Map<String, Object> providedUserProperties = toMap(_config.getJSONObject("providedUserProperties"));
+                this.config.setUserProperties(providedUserProperties);
+        }
+
         if (_config.has("consents")) {
             String[] consents = toStringArray(_config.getJSONArray("consents"));
             this.config.setConsentEnabled(consents);

example/lib/main.dart

@@ -44,7 +44,10 @@ class _MyAppState extends State<MyApp> {
     Countly.isInitialized().then((bool isInitialized) {
       if (!isInitialized) {
         Countly.pushTokenType(Countly.messagingMode['TEST']!); // Set messaging mode for push notifications
+        
         var crashSegment = {'Key': 'Value'};
+        var userProperties = {'customProperty': 'custom Value', 'username': 'USER_NAME', 'email': 'USER_EMAIL'};
+
         Map<String, String> attributionValues = {};
         if (Platform.isIOS) {
           attributionValues[AttributionKey.IDFA] = 'IDFA';
@@ -73,6 +76,7 @@ class _MyAppState extends State<MyApp> {
           ])
           ..setLocation(country_code: 'TR', city: 'Istanbul', ipAddress: '41.0082,28.9784', gpsCoordinates: '10.2.33.12') // Set user  location.
           ..setCustomCrashSegment(crashSegment)
+          ..setUserProperties(userProperties)
           ..recordIndirectAttribution(attributionValues)
           ..recordDirectAttribution('countly', campaignData)
           ..setRemoteConfigAutomaticDownload(true, (error) {

ios/Classes/CountlyFlutterPlugin.m

@@ -26,6 +26,17 @@ + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 
 NSArray<CountlyFeedbackWidget*>* feedbackWidgetList = nil;
 
+NSString* const NAME_KEY = @"name";
+NSString* const USERNAME_KEY = @"username";
+NSString* const EMAIL_KEY = @"email";
+NSString* const ORG_KEY = @"organization";
+NSString* const PHONE_KEY = @"phone";
+NSString* const PICTURE_KEY = @"picture";
+NSString* const PICTURE_PATH_KEY = @"picturePath";
+NSString* const GENDER_KEY = @"gender";
+NSString* const BYEAR_KEY = @"byear";
+NSString* const CUSTOM_KEY = @"custom";
+
 @implementation CountlyFlutterPlugin
 
 CountlyConfig* config = nil;
@@ -141,39 +152,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         dispatch_async(dispatch_get_main_queue(), ^ {
             NSDictionary* userData = [command objectAtIndex:0];
 
-            NSString* name = userData[@"name"];
-            NSString* username = userData[@"username"];
-            NSString* email = userData[@"email"];
-            NSString* organization = userData[@"organization"];
-            NSString* phone = userData[@"phone"];
-            NSString* picture = userData[@"picture"];
-            NSString* gender = userData[@"gender"];
-            NSString* byear = userData[@"byear"];
-            
-            if(name) {
-                Countly.user.name = name;
-            }
-            if(username) {
-                Countly.user.username = username;
-            }
-            if(email) {
-                Countly.user.email = email;
-            }
-            if(organization) {
-                Countly.user.organization = organization;
-            }
-            if(phone) {
-                Countly.user.phone = phone;
-            }
-            if(picture) {
-                Countly.user.pictureURL = picture;
-            }
-            if(gender) {
-                Countly.user.gender = gender;
-            }
-            if(byear) {
-                Countly.user.birthYear = @([byear integerValue]);
-            }
+            [self setUserData:userData];
 
             [Countly.user save];
             result(@"setuserdata!");
@@ -962,6 +941,51 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     }
 }
 
+-(NSDictionary*) removePredefinedUserProperties:(NSDictionary * __nullable) userData {
+    NSMutableDictionary* userProperties = [userData mutableCopy];
+    NSArray* nameFields = [[NSArray alloc] initWithObjects:NAME_KEY, USERNAME_KEY, EMAIL_KEY, ORG_KEY, PHONE_KEY, PICTURE_KEY, PICTURE_PATH_KEY, GENDER_KEY, BYEAR_KEY, nil];
+    
+    for (NSString* nameField in nameFields) {
+        [userProperties removeObjectForKey:nameField];
+    }
+    return userProperties;
+}
+
+-(void) setUserData:(NSDictionary * __nullable) userData {
+    NSString* name = userData[NAME_KEY];
+    NSString* username = userData[USERNAME_KEY];
+    NSString* email = userData[EMAIL_KEY];
+    NSString* organization = userData[ORG_KEY];
+    NSString* phone = userData[PHONE_KEY];
+    NSString* picture = userData[PICTURE_KEY];
+    NSString* gender = userData[GENDER_KEY];
+    NSString* byear = userData[BYEAR_KEY];
+    
+    if(name) {
+        Countly.user.name = name;
+    }
+    if(username) {
+        Countly.user.username = username;
+    }
+    if(email) {
+        Countly.user.email = email;
+    }
+    if(organization) {
+        Countly.user.organization = organization;
+    }
+    if(phone) {
+        Countly.user.phone = phone;
+    }
+    if(picture) {
+        Countly.user.pictureURL = picture;
+    }
+    if(gender) {
+        Countly.user.gender = gender;
+    }
+    if(byear) {
+        Countly.user.birthYear = @([byear integerValue]);
+    }
+}
 -(void) feedbackWidgetDataCallback:(NSDictionary * __nullable) widgetData error:(NSString * __nullable )error{
     NSMutableDictionary *feedbackWidgetData = [[NSMutableDictionary alloc] init];
     if(widgetData) {
@@ -971,7 +995,7 @@ -(void) feedbackWidgetDataCallback:(NSDictionary * __nullable) widgetData error:
         feedbackWidgetData[@"error"] = error;
     }
     [_channel invokeMethod:@"feedbackWidgetDataCallback" arguments: feedbackWidgetData];
-    }
+}
 
 - (CountlyFeedbackWidget*)getFeedbackWidget:(NSString*)widgetId
 {
@@ -1066,6 +1090,14 @@ - (void)populateConfig:(NSDictionary*)_config
         if(crashSegmentation) {
             config.crashSegmentation = crashSegmentation;
         }
+        
+        NSDictionary* providedUserProperties = _config[@"providedUserProperties"];
+        if(providedUserProperties) {
+            [self setUserData:providedUserProperties];
+            NSDictionary* customeProperties = [self removePredefinedUserProperties:providedUserProperties];
+            Countly.user.custom = customeProperties;
+        }
+        
         NSArray* consents = _config[@"consents"];
         if(consents) {
             config.consents = consents;

ios/Classes/CountlyiOS/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
     {

lib/countly_config.dart

@@ -29,6 +29,7 @@ class CountlyConfig {
   Map<String, String>? _iaAttributionValues;
   Map<String, dynamic>? _customCrashSegment;
   bool? _enableRemoteConfigAutomaticDownload;
+  Map<String, dynamic>? _providedUserProperties;
 
   CountlyConfig(this._serverURL, this._appKey);
 
@@ -85,6 +86,8 @@ class CountlyConfig {
 
   bool? get enableUnhandledCrashReporting => _enableUnhandledCrashReporting;
 
+  Map<String, dynamic>? get providedUserProperties => _providedUserProperties;
+
   bool? get enableRemoteConfigAutomaticDownload => _enableRemoteConfigAutomaticDownload;
 
   /// URL of the Countly server to submit data to.
@@ -240,4 +243,10 @@ class CountlyConfig {
     _iaAttributionValues = attributionValues;
     return this;
   }
+
+  /// Used to provide user properties that would be sent as soon as possible
+  CountlyConfig setUserProperties(Map<String, dynamic> userProperties) {
+    _providedUserProperties = userProperties;
+    return this;
+  }
 }

lib/countly_flutter.dart

@@ -309,6 +309,14 @@ class Countly {
     int optionsCount = options.length;
     log('Calling "setUserData" with options Count:[$optionsCount]');
     List<dynamic> args = [];
+    Map<String, String> userData = _getUserData(options);
+    args.add(userData);
+    final String? result = await _channel.invokeMethod('setuserdata', <String, dynamic>{'data': json.encode(args)});
+    return result;
+  }
+
+  static Map<String, String> _getUserData(Map<String, dynamic> options)
+  {
     Map<String, String> userData = {};
     if (options.containsKey('name')) {
       userData['name'] = options['name'].toString();
@@ -337,11 +345,8 @@ class Countly {
     if (options.containsKey('byear')) {
       userData['byear'] = options['byear'].toString();
     }
-    args.add(userData);
-    final String? result = await _channel.invokeMethod('setuserdata', <String, dynamic>{'data': json.encode(args)});
-    return result;
+    return userData;
   }
-
   /// This method will ask for permission, enables push notification and send push token to countly server.
   /// Should be call after Countly init
   static Future<String?> askForNotificationPermission() async {
@@ -1800,6 +1805,11 @@ class Countly {
       if (config.customCrashSegment != null) {
         countlyConfig['customCrashSegment'] = config.customCrashSegment;
       }
+
+      if (config.providedUserProperties != null) {
+        countlyConfig['providedUserProperties'] = config.providedUserProperties;
+      }
+
       if (config.consents != null) {
         countlyConfig['consents'] = config.consents;
       }