Patches for Github Issues (#159)

* Patch for Github Issue #144

* Patch for Github issue #147

* Patch for Github issue #147

* Patch for Github issue #144

* Patch for Github issue #147

* Patch for Github issue #147

* Patch for Github issue #138

* Patch for Github issue #138

* Patch for Github Issue #152

* Patch for Github Issue #152

* Testing patch for Github Issue #157

* Patch for Github Issue #157

Author: neelkanth-kaushik

packages/core/android/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace 'com.segment.analytics'
-    compileSdkVersion 31
+    compileSdkVersion 35 //Patch for for Github issue #147
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -44,4 +44,4 @@ android {
     defaultConfig {
         minSdkVersion 16
     }
-}
+}

packages/core/android/src/main/kotlin/com/segment/analytics/AnalyticsPlugin.kt

@@ -143,9 +143,17 @@ class AnalyticsPlugin : FlutterPlugin, NativeContextApi, EventChannel.StreamHand
                 NativeContext(
                     app = NativeContextApp(
                         build = appBuild,
-                        name = packageInfo.applicationInfo.loadLabel(
-                            packageManager
-                        ).toString(),
+
+                        /* Retrieves the application name from the package info, using the application's label
+                           (i.e., the app name displayed on the device). If the application name cannot be fetched
+                           (e.g., due to a missing label or other issues), the fallback value "Unknown" will be used
+                           to ensure the app doesn't break due to a null value.
+
+                           Patch for for Github issue #147 - Replaced following line:
+                           name = packageInfo.applicationInfo.loadLabel(packageManager).toString(), with the line below
+                         */
+                        name = packageInfo.applicationInfo?.loadLabel(packageManager)?.toString() ?: "Unknown",
+
                         namespace = packageInfo.packageName,
                         version = packageInfo.versionName
                     ),

packages/core/lib/analytics.dart

@@ -212,26 +212,30 @@ class Analytics with ClientMethods {
 
   @override
   Future track(String event, {Map<String, dynamic>? properties}) async {
-    await _process(TrackEvent(event, properties: properties ?? {}));
+    await _process(TrackEvent(event, properties: properties ?? {}, 
+    integrations: _state.integrations.state)); // Patch for Github Issue #152
   }
 
   @override
   Future screen(String name, {Map<String, dynamic>? properties}) async {
-    final event = ScreenEvent(name, properties: properties ?? {});
+    final event = ScreenEvent(name, properties: properties ?? {}, 
+    integrations: _state.integrations.state); // Patch for Github Issue #152
 
     await _process(event);
   }
 
   @override
   Future identify({String? userId, UserTraits? userTraits}) async {
-    final event = IdentifyEvent(userId: userId, traits: userTraits);
+    final event = IdentifyEvent(userId: userId, traits: userTraits, 
+    integrations: _state.integrations.state); // Patch for Github Issue #152
 
     await _process(event);
   }
 
   @override
   Future group(String groupId, {GroupTraits? groupTraits}) async {
-    final event = GroupEvent(groupId, traits: groupTraits);
+    final event = GroupEvent(groupId, traits: groupTraits, 
+    integrations: _state.integrations.state); // Patch for Github Issue #152
 
     await _process(event);
   }
@@ -240,7 +244,8 @@ class Analytics with ClientMethods {
   Future alias(String newUserId) async {
     final userInfo = await state.userInfo.state;
     final event =
-        AliasEvent(userInfo.userId ?? userInfo.anonymousId, userId: newUserId);
+        AliasEvent(userInfo.userId ?? userInfo.anonymousId, userId: newUserId, 
+        integrations: _state.integrations.state); // Patch for Github Issue #152
 
     await _process(event);
   }

packages/core/lib/analytics_web.dart

@@ -18,7 +18,7 @@ class AnalyticsPlatformImpl extends AnalyticsPlatform {
       NativeContext(
         app: NativeContextApp(
           name: web.window.navigator.appName,
-          version: web.window.navigator.appVersion,
+          version: getAppVersion(), // Patch Github Issue #138
           namespace: web.window.navigator.appCodeName,
         ),
         userAgent: web.window.navigator.userAgent,
@@ -28,6 +28,16 @@ class AnalyticsPlatformImpl extends AnalyticsPlatform {
           width: web.window.screen.width,
         ),
       );
+      
+      /*
+          - Checks for <meta name="app-version" content="1.2.3"> in <root>/web/index.html 
+             and return the value inside 'content'
+          - Returns the browser version as fallback
+      */
+      String getAppVersion() {
+        final meta = web.document.querySelector('meta[name="app-version"]');
+        return meta?.getAttribute('content') ?? web.window.navigator.appVersion;
+      }
 }
 
 class AnalyticsWeb {

packages/core/lib/event.dart

@@ -55,7 +55,7 @@ abstract class RawEvent with JSONSerialisable {
   @JsonKey(name: "_metadata")
   DestinationMetadata? metadata;
 
-  RawEvent(this.type, {this.anonymousId, this.userId});
+  RawEvent(this.type, {this.anonymousId, this.userId, this.integrations,}); // Patch for Github Issue #152
 }
 
 @JsonSerializable(explicitToJson: true)
@@ -79,7 +79,7 @@ class TrackEvent extends RawEvent {
   String event;
   Map<String, dynamic>? properties;
 
-  TrackEvent(this.event, {this.properties}) : super(EventType.track);
+  TrackEvent(this.event, {this.properties, Map<String, dynamic>? integrations,}) : super(EventType.track, integrations: integrations,); // Patch for Github Issue #152
 
   factory TrackEvent.fromJson(Map<String, dynamic> json) =>
       _$TrackEventFromJson(json);
@@ -90,8 +90,8 @@ class TrackEvent extends RawEvent {
 @JsonSerializable(explicitToJson: true)
 class IdentifyEvent extends RawEvent {
   UserTraits? traits;
-  IdentifyEvent({this.traits, String? userId})
-      : super(EventType.identify, userId: userId);
+  IdentifyEvent({this.traits, String? userId, Map<String, dynamic>? integrations})
+      : super(EventType.identify, userId: userId, integrations: integrations); // Patch for Github Issue #152
 
   factory IdentifyEvent.fromJson(Map<String, dynamic> json) =>
       _$IdentifyEventFromJson(json);
@@ -105,7 +105,7 @@ class GroupEvent extends RawEvent {
   String groupId;
   GroupTraits? traits;
 
-  GroupEvent(this.groupId, {this.traits}) : super(EventType.group);
+  GroupEvent(this.groupId, {this.traits, Map<String, dynamic>? integrations}) : super(EventType.group, integrations: integrations); // Patch for Github Issue #152
 
   factory GroupEvent.fromJson(Map<String, dynamic> json) =>
       _$GroupEventFromJson(json);
@@ -117,8 +117,8 @@ class GroupEvent extends RawEvent {
 class AliasEvent extends RawEvent {
   String previousId;
 
-  AliasEvent(this.previousId, {String? userId})
-      : super(EventType.alias, userId: userId);
+  AliasEvent(this.previousId, {String? userId, Map<String, dynamic>? integrations})
+      : super(EventType.alias, userId: userId, integrations: integrations); // Patch for Github Issue #152
 
   factory AliasEvent.fromJson(Map<String, dynamic> json) =>
       _$AliasEventFromJson(json);
@@ -131,7 +131,10 @@ class ScreenEvent extends RawEvent {
   String name;
   Map<String, dynamic>? properties;
 
-  ScreenEvent(this.name, {this.properties}) : super(EventType.screen);
+  ScreenEvent(
+    this.name, {
+    this.properties,
+    Map<String, dynamic>? integrations}) : super(EventType.screen, integrations: integrations); // Patch for Github Issue #152
 
   factory ScreenEvent.fromJson(Map<String, dynamic> json) =>
       _$ScreenEventFromJson(json);

packages/core/lib/state.dart

@@ -583,5 +583,6 @@ Configuration setFlushPolicies(
       trackApplicationLifecycleEvents: a.trackApplicationLifecycleEvents,
       trackDeeplinks: a.trackDeeplinks,
       storageJson: a.storageJson,
-      token: a.token);
+      token: a.token,
+      collectDeviceId: a.collectDeviceId); //Patch for for Github issue #144
 }

packages/core/lib/timeline.dart

@@ -99,8 +99,7 @@ class Timeline {
   Future<RawEvent?> applyPlugins(PluginType type, RawEvent event) async {
     RawEvent? result = event;
 
-    final plugins = _plugins[type];
-    if (plugins != null) {
+    final plugins = List<Plugin>.from(_plugins[type] ?? []); //Patch for Github issue #157
       for (var plugin in plugins) {
         if (result != null) {
           try {
@@ -122,7 +121,6 @@ class Timeline {
           }
         }
       }
-    }
     return result;
   }
 }