Merge pull request #53 from flagship-io/fixBetaSdkVersionAndBuild

ABTastyAdel · web-flow · commit 82946acd9da2 · 2025-06-24T12:58:01.000+02:00
Fix beta sdk version and build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
           flutter-version: ${{ matrix.flutter }}
       - run: flutter pub get
         working-directory: example
-      - run: flutter build apk --debug 
+      - run: flutter build apk --debug -v
         working-directory: example
       - name: Archive FlagshipQA APK
         uses: actions/upload-artifact@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+
+# 4.1.1-beta - 24/06/2025
+
+### Fix
+- Add information in visitor context: 'fs_users', 'fs_client', 'fs_version'.
+
 # 4.1.0-beta - 07/04/2025
 ### Added
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -60,4 +60,5 @@ flutter {
 
 dependencies {
   //  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
 }
diff --git a/example/android/gradle.properties b/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
diff --git a/example/lib/Providers/fs_data.dart b/example/lib/Providers/fs_data.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 
 class FSData extends ChangeNotifier {
   // Apikey
-  String _apiKey = "--"; //
+  String _apiKey = "DxAcxlnRB9yFBZYtLDue1q01dcXZCw6aM49CQB23"; //
   // EnvId
   String _envId = "bkk9glocmjcg0vtmdlng"; //
   // Mode
diff --git a/example/lib/widgets/subWidget/item.dart b/example/lib/widgets/subWidget/item.dart
@@ -72,7 +72,7 @@ class _ItemState extends State<ItemHit> {
     itemEvent.price = double.tryParse(_textControllerPrice.text) ?? 0;
     itemEvent.quantity = int.tryParse(_textControllerQuantity.text) ?? 1;
     itemEvent.category = _textControllerCategory.text;
-
+    itemEvent.location = "itemScreen";
     print(itemEvent);
 
     var text = "Item sent";
diff --git a/example/lib/widgets/subWidget/transaction.dart b/example/lib/widgets/subWidget/transaction.dart
@@ -101,6 +101,7 @@ class _TransactionState extends State<TransactionHit> {
     transacEvent.paymentMethod = _textControllerPaymentMethod.text;
     transacEvent.shippingMethod = _textControllerShippingMethod.text;
     transacEvent.itemCount = int.tryParse(_textControllerItemCount.text) ?? 0;
+    transacEvent.location = "screen_transac";
 
     print(transacEvent);
 
diff --git a/lib/flagshipContext/flagship_context.dart b/lib/flagshipContext/flagship_context.dart
@@ -59,10 +59,17 @@ enum FlagshipContext {
   APP_VERSION_CODE, // = "sdk_versionCode"
 
   /// Version FlagShip
+  @Deprecated('Use .FS_VERSION')
   FLAGSHIP_VERSION, //  = "sdk_fsVersion"
 
+  /// Version FlagShip
+  FS_VERSION, //  = "fs_Version"
+
   /// Name of the interface
   INTERFACE_NAME, // = "sdk_interfaceName"
+
+  /// Client
+  FS_CLIENT, // fs_client
 }
 
 // Get the key for the relative context
@@ -129,6 +136,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;
 }
diff --git a/lib/flagshipContext/flagship_context_manager.dart b/lib/flagshipContext/flagship_context_manager.dart
@@ -30,8 +30,10 @@ 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 +72,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:
diff --git a/lib/flagship_version.dart b/lib/flagship_version.dart
@@ -1,2 +1,2 @@
 /// This file is automatically updated
-const FlagshipVersion = "4.1.0";
+const FlagshipVersion = "4.1.1-beta";
diff --git a/lib/hits/hit.dart b/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) {
diff --git a/lib/hits/page.dart b/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;
diff --git a/lib/hits/screen.dart b/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;
diff --git a/lib/visitor.dart b/lib/visitor.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'package:flagship/Targeting/targeting_manager.dart';
 import 'package:flagship/api/service.dart';
 import 'package:flagship/cache/default_cache.dart';
 import 'package:flagship/dataUsage/data_usage_tracking.dart';
@@ -175,6 +176,9 @@ class Visitor with EmotionAiDelegate {
     // Load preset_Context
     this.updateContextWithMap(FlagshipContextManager.getPresetContextForApp());
 
+    // Set visitorId into the context
+    context.addEntries({FS_USERS: visitorId}.entries);
+
     // Update context
     this.updateContextWithMap(context);
 
@@ -339,23 +343,22 @@ class Visitor with EmotionAiDelegate {
   /// - Requires: Make sure that the experience continuity option is enabled on the flagship platform before using this method
 
   authenticate(String visitorId) {
-    // Update flagSyncStatus
-    this._flagSyncStatus = FlagSyncStatus.AUTHENTICATED;
-    this.flagStatus = FlagStatus.FETCH_REQUIRED;
-    this._fetchReasons = FetchFlagsRequiredStatusReason.VISITOR_AUTHENTICATED;
     _isAuthenticated = true;
     _visitorDelegate.getStrategy().authenticateVisitor(visitorId);
+    this.flagStatus = FlagStatus.FETCH_REQUIRED;
+    this._fetchReasons = FetchFlagsRequiredStatusReason.VISITOR_AUTHENTICATED;
+    // Update flagSyncStatus
+    this._flagSyncStatus = FlagSyncStatus.AUTHENTICATED;
   }
 
   /// Use authenticate methode to go from Logged in  session to logged out session
   unauthenticate() {
-    // Update flagSyncStatus
-    this._flagSyncStatus = FlagSyncStatus.UNAUTHENTICATED;
-    this.flagStatus = FlagStatus.FETCH_REQUIRED;
-    this._fetchReasons = FetchFlagsRequiredStatusReason.VISITOR_UNAUTHENTICATED;
-
     _isAuthenticated = false;
     _visitorDelegate.getStrategy().unAuthenticateVisitor();
+    this.flagStatus = FlagStatus.FETCH_REQUIRED;
+    this._fetchReasons = FetchFlagsRequiredStatusReason.VISITOR_UNAUTHENTICATED;
+    // Update flagSyncStatus
+    this._flagSyncStatus = FlagSyncStatus.UNAUTHENTICATED;
   }
 
 // Is the visitor is autenticated
diff --git a/lib/visitor/strategy/default_strategy.dart b/lib/visitor/strategy/default_strategy.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:flagship/Targeting/targeting_manager.dart';
 import 'package:flagship/dataUsage/data_usage_tracking.dart';
 import 'package:flagship/emotionAi/emotion_tools.dart';
 import 'package:flagship/emotionAi/fs_emotion.dart';
@@ -256,6 +257,8 @@ class DefaultStrategy implements IVisitor {
       if (visitor.anonymousId == null) {
         visitor.anonymousId = visitor.visitorId;
         visitor.visitorId = pVisitorId;
+        // Update fs_users
+        visitor.updateContext(FS_USERS, pVisitorId);
       }
 
       DataUsageTracking.sharedInstance()
@@ -278,6 +281,8 @@ class DefaultStrategy implements IVisitor {
       if (visitor.anonymousId != null) {
         visitor.visitorId = visitor.anonymousId as String;
         visitor.anonymousId = null;
+        // Update fs_users in context
+        visitor.updateContext(FS_USERS, visitor.visitorId);
       }
       DataUsageTracking.sharedInstance().processTSXpc(
           CriticalPoints.VISITOR_UNAUTHENTICATE.name, this.visitor);
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flagship
 description: Flutter SDK for Flagship Feature management & Experiment platform for modern engineering and product teams
-version: 4.1.0-beta
+version: 4.1.1-beta
 homepage: https://flagship.io
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,5 @@ flutter {`
`60`	`60`
`61`	`61`	`dependencies {`
`62`	`62`	`// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
	`63`	`+`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`/// This file is automatically updated`
`2`		`-const FlagshipVersion = "4.1.0";`
	`2`	`+const FlagshipVersion = "4.1.1-beta";`