PR comments

aws-amplify · Jan 10, 2023 · f2f9e28 · f2f9e28
1 parent 99e6d4d
commit f2f9e28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/analytics/amplify_analytics_pinpoint/Makefile b/packages/analytics/amplify_analytics_pinpoint/Makefile
@@ -0,0 +1,4 @@
+.PHONY: pigeons
+pigeons:
+	flutter pub run pigeon --input pigeons/pigeon_config_android.dart
+	flutter format --fix lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
diff --git a/...ics_pinpoint/lib/src/legacy_native_data_provider/flutter_legacy_native_data_provider.dart b/...ics_pinpoint/lib/src/legacy_native_data_provider/flutter_legacy_native_data_provider.dart
@@ -7,6 +7,7 @@ import 'dart:io' show Platform;
 import 'package:amplify_analytics_pinpoint/src/legacy_native_data_provider/data_provider.android.dart';
 import 'package:amplify_analytics_pinpoint/src/legacy_native_data_provider/data_provider.ios.dart';
 import 'package:amplify_analytics_pinpoint_dart/amplify_analytics_pinpoint_dart.dart';
+import 'package:aws_common/aws_common.dart';
 
 /// {@template amplify_analytics_pinpoint.flutter_legacy_native_data_provider}
 /// Provides legacy data stored by Amplify Analytics iOS and Android.
@@ -16,7 +17,9 @@ class FlutterLegacyNativeDataProvider implements LegacyNativeDataProvider {
   factory FlutterLegacyNativeDataProvider() {
     LegacyNativeDataProvider? provider;
 
-    if (Platform.isIOS) {
+    if (zIsWeb) {
+      return FlutterLegacyNativeDataProvider._(provider);
+    } else if (Platform.isIOS) {
       provider = DataProviderIos();
     } else if (Platform.isAndroid) {
       provider = DataProviderAndroid();

diff --git a/...ges/analytics/amplify_analytics_pinpoint_dart/test/analytics_legacy_native_data_test.dart b/...ges/analytics/amplify_analytics_pinpoint_dart/test/analytics_legacy_native_data_test.dart
@@ -5,10 +5,10 @@ import 'dart:async';
 
 import 'package:amplify_analytics_pinpoint_dart/amplify_analytics_pinpoint_dart.dart';
 import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/endpoint_client/endpoint_store_keys.dart';
+import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
-import 'package:uuid/uuid.dart';
 
 void main() {
   group('Analytics Legacy Native Data Tests', () {
@@ -74,7 +74,7 @@ void main() {
       when(() => legacyDataProvider.getEndpointId(appId))
           .thenAnswer((_) => Future.value(legacyEndpointId));
 
-      final endpointId = const Uuid().v1();
+      final endpointId = UUID.getUUID();
       store.seedData({
         EndpointStoreKey.version.name: EndpointStoreVersion.v1.name,
         AmplifyAnalyticsPinpointDart.endpointIdStorageKey: endpointId
@@ -91,7 +91,7 @@ void main() {
       );
       expect(migratedEndpointId, endpointId);
 
-      verifyNever(() => legacyDataProvider.getEndpointId(captureAny()));
+      verifyNever(() => legacyDataProvider.getEndpointId(any()));
     });
   });
 }