Merge pull request #50 from flagship-io/sdkFixVersion

add keys context

Author: ABTastyAdel

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+# 4.0.2 - 24/06/2025
+
+### Fix
+Add information in visitor context: fs_users , fs_client , fs_version.
+
 # 4.0.1 - 18/04/2025
 
 ### Fixed

example/android/gradle.properties

@@ -1,3 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+kotlin.daemon.jvm.options=-Xmx2048m

example/lib/Providers/fs_data.dart

@@ -63,7 +63,7 @@ class FSData extends ChangeNotifier {
 }
 
 class UserData extends ChangeNotifier {
-  String _visitorId = "flutter_user253";
+  String _visitorId = "flutter_user196";
   Map<String, Object> context = {
     "testing_tracking_manager": true,
     "isQA": true,

example/lib/widgets/configuration.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:flagship/cache/interface_cache.dart';
 import 'package:flagship/flagship.dart';
+import 'package:flagship/flagshipContext/flagship_context.dart';
 import 'package:flagship/flagship_config.dart';
 import 'package:flagship/hits/event.dart';
 import 'package:flagship/hits/item.dart';

lib/flagshipContext/flagship_context.dart

@@ -59,10 +59,15 @@ enum FlagshipContext {
   APP_VERSION_CODE, // = "sdk_versionCode"
 
   /// Version FlagShip
+  @Deprecated('Use .FS_VERSION')
   FLAGSHIP_VERSION, //  = "sdk_fsVersion"
 
+  FS_VERSION, //  = "fs_Version"
+
   /// Name of the interface
   INTERFACE_NAME, // = "sdk_interfaceName"
+
+  FS_CLIENT, // fs_client
 }
 
 // Get the key for the relative context
@@ -129,6 +134,12 @@ String rawValue(FlagshipContext type) {
     case FlagshipContext.INTERFACE_NAME:
       ret = "sdk_interfaceName";
       break;
+    case FlagshipContext.FS_VERSION:
+      ret = "fs_version";
+      break;
+    case FlagshipContext.FS_CLIENT:
+      ret = "fs_client";
+      break;
   }
   return ret;
 }

lib/flagshipContext/flagship_context_manager.dart

@@ -30,8 +30,11 @@ class FlagshipContextManager {
       case FlagshipContext.OS_VERSION_CODE:
         return FSDevice.getSystemVersion();
       case FlagshipContext.FLAGSHIP_VERSION:
+      case FlagshipContext.FS_VERSION:
         return FlagshipVersion;
       // Set by the client
+      case FlagshipContext.FS_CLIENT:
+        return "flutter";
       case FlagshipContext.LOCATION_CITY:
       case FlagshipContext.LOCATION_REGION:
       case FlagshipContext.LOCATION_COUNTRY:
@@ -70,6 +73,8 @@ class FlagshipContextManager {
       case FlagshipContext.FLAGSHIP_VERSION:
       case FlagshipContext.INTERFACE_NAME:
       case FlagshipContext.IP:
+      case FlagshipContext.FS_VERSION:
+      case FlagshipContext.FS_CLIENT:
         return (value is String);
       // double
       case FlagshipContext.LOCATION_LAT:

lib/flagship_version.dart

@@ -1,2 +1,2 @@
 /// This file is automatically updated
-const FlagshipVersion = "4.0.1";
+const FlagshipVersion = "4.0.2";

lib/hits/hit.dart

@@ -75,6 +75,9 @@ class BaseHit extends Hit {
     /// Session number
     if (sessionNumber != null) result["sn"] = sessionNumber ?? 0;
 
+    /// Location
+    if (location != null) result["dl"] = location ?? "";
+
     /// Add qt entries
     /// Time difference between when the hit was created and when it was sent
     if (this.createdAt != null) {

lib/hits/page.dart

@@ -9,7 +9,7 @@ class Page extends BaseHit {
   @override
   Map<String, Object> get bodyTrack {
     var customBody = new Map<String, Object>();
-    customBody.addAll({"t": typeOfEvent, "dl": super.location ?? ""});
+    customBody.addAll({"t": typeOfEvent});
     // Add commun body
     customBody.addAll(super.communBodyTrack);
     return customBody;

lib/hits/screen.dart

@@ -9,7 +9,7 @@ class Screen extends BaseHit {
   @override
   Map<String, Object> get bodyTrack {
     var customBody = new Map<String, Object>();
-    customBody.addAll({"t": typeOfEvent, "dl": super.location ?? ""});
+    customBody.addAll({"t": typeOfEvent});
     // Add commun body
     customBody.addAll(super.communBodyTrack);
     return customBody;