only call method cahnnel on native platforms

getsentry · Dec 19, 2022 · f181dc0 · f181dc0
1 parent a1335fd
commit f181dc0
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 16 deletions.
diff --git a/flutter/ios/Classes/SentryFlutterPluginApple.swift b/flutter/ios/Classes/SentryFlutterPluginApple.swift
@@ -86,6 +86,11 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
             let value = arguments?["value"] as? Any
             setContexts(key: key, value: value, result: result)
 
+        case "removeContexts":
+            let arguments = call.arguments as? [String: Any?]
+            let key = arguments?["key"] as? String
+            removeContexts(key: key, result: result)
+
         case "setUser":
             let arguments = call.arguments as? [String: Any?]
             let user = arguments?["user"] as? [String: Any?]

diff --git a/flutter/lib/src/sentry_flutter.dart b/flutter/lib/src/sentry_flutter.dart
@@ -47,8 +47,10 @@ mixin SentryFlutter {
     }
 
     final nativeChannel = SentryNativeChannel(channel, flutterOptions);
-    final native = SentryNative();
-    native.setNativeChannel(nativeChannel);
+    if (flutterOptions.platformChecker.hasNativeIntegration) {
+      final native = SentryNative();
+      native.nativeChannel = nativeChannel;
+    }
 
     final platformDispatcher = PlatformDispatcher.instance;
     final wrapper = PlatformDispatcherWrapper(platformDispatcher);

diff --git a/flutter/lib/src/sentry_native.dart b/flutter/lib/src/sentry_native.dart
@@ -19,8 +19,10 @@ class SentryNative {
     return _instance;
   }
 
+  SentryNativeChannel? get nativeChannel => _instance._nativeChannel;
+
   /// Provide [nativeChannel] for native communication.
-  void setNativeChannel(SentryNativeChannel nativeChannel) {
+  set nativeChannel(SentryNativeChannel? nativeChannel) {
     _instance._nativeChannel = nativeChannel;
   }
 

diff --git a/flutter/test/integrations/native_app_start_integration_test.dart b/flutter/test/integrations/native_app_start_integration_test.dart
@@ -104,7 +104,7 @@ class Fixture {
   late final native = SentryNative();
 
   Fixture() {
-    native.setNativeChannel(wrapper);
+    native.nativeChannel = wrapper;
     native.reset();
     when(hub.options).thenReturn(options);
   }

diff --git a/flutter/test/mocks.mocks.dart b/flutter/test/mocks.mocks.dart
@@ -391,6 +391,14 @@ class MockSentryTracer extends _i1.Mock implements _i8.SentryTracer {
         ),
         returnValueForMissingStub: null,
       );
+  @override
+  void scheduleFinish() => super.noSuchMethod(
+        Invocation.method(
+          #scheduleFinish,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [MethodChannel].
@@ -496,20 +504,20 @@ class MockSentryNative extends _i1.Mock implements _i10.SentryNative {
         returnValueForMissingStub: null,
       );
   @override
-  bool get didFetchAppStart => (super.noSuchMethod(
-        Invocation.getter(#didFetchAppStart),
-        returnValue: false,
-      ) as bool);
-  @override
-  void setNativeChannel(_i11.SentryNativeChannel? nativeChannel) =>
+  set nativeChannel(_i11.SentryNativeChannel? nativeChannel) =>
       super.noSuchMethod(
-        Invocation.method(
-          #setNativeChannel,
-          [nativeChannel],
+        Invocation.setter(
+          #nativeChannel,
+          nativeChannel,
         ),
         returnValueForMissingStub: null,
       );
   @override
+  bool get didFetchAppStart => (super.noSuchMethod(
+        Invocation.getter(#didFetchAppStart),
+        returnValue: false,
+      ) as bool);
+  @override
   _i6.Future<_i11.NativeAppStart?> fetchNativeAppStart() => (super.noSuchMethod(
         Invocation.method(
           #fetchNativeAppStart,

diff --git a/flutter/test/sentry_flutter_test.dart b/flutter/test/sentry_flutter_test.dart
@@ -6,6 +6,7 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:sentry_flutter/src/integrations/integrations.dart';
 import 'package:sentry_flutter/src/integrations/screenshot_integration.dart';
 import 'package:sentry_flutter/src/renderer/renderer.dart';
+import 'package:sentry_flutter/src/sentry_native.dart';
 import 'package:sentry_flutter/src/version.dart';
 import 'mocks.dart';
 import 'mocks.mocks.dart';
@@ -46,6 +47,9 @@ void main() {
   group('Test platform integrations', () {
     setUp(() async {
       await Sentry.close();
+      final sentryNative = SentryNative();
+      sentryNative.nativeChannel = null;
+      sentryNative.reset();
     });
 
     test('Android', () async {
@@ -86,6 +90,8 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
+      expect(SentryNative().nativeChannel, isNotNull);
+
       await Sentry.close();
     }, testOn: 'vm');
 
@@ -125,6 +131,8 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
+      expect(SentryNative().nativeChannel, isNotNull);
+
       await Sentry.close();
     }, testOn: 'vm');
 
@@ -164,6 +172,8 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
+      expect(SentryNative().nativeChannel, isNotNull);
+
       await Sentry.close();
     }, testOn: 'vm');
 
@@ -205,6 +215,8 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
+      expect(SentryNative().nativeChannel, isNull);
+
       await Sentry.close();
     }, testOn: 'vm');
 
@@ -246,6 +258,8 @@ void main() {
           beforeIntegration: WidgetsFlutterBindingIntegration,
           afterIntegration: OnErrorIntegration);
 
+      expect(SentryNative().nativeChannel, isNull);
+
       await Sentry.close();
     }, testOn: 'vm');
 
@@ -288,6 +302,8 @@ void main() {
           beforeIntegration: RunZonedGuardedIntegration,
           afterIntegration: WidgetsFlutterBindingIntegration);
 
+      expect(SentryNative().nativeChannel, isNull);
+
       await Sentry.close();
     });
 

diff --git a/flutter/test/sentry_native_test.dart b/flutter/test/sentry_native_test.dart
@@ -136,7 +136,7 @@ class Fixture {
 
   SentryNative getSut() {
     final sut = SentryNative();
-    sut.setNativeChannel(channel);
+    sut.nativeChannel = channel;
     return sut;
   }
 }
diff --git a/flutter/test/sentry_navigator_observer_test.dart b/flutter/test/sentry_navigator_observer_test.dart
@@ -48,7 +48,7 @@ void main() {
       final mockHub = _MockHub();
       final native = SentryNative();
       final mockNativeChannel = MockNativeChannel();
-      native.setNativeChannel(mockNativeChannel);
+      native.nativeChannel = mockNativeChannel;
 
       final tracer = getMockSentryTracer();
       _whenAnyStart(mockHub, tracer);
@@ -75,7 +75,7 @@ void main() {
       mockNativeChannel.nativeFrames = nativeFrames;
 
       final mockNative = SentryNative();
-      mockNative.setNativeChannel(mockNativeChannel);
+      mockNative.nativeChannel = mockNativeChannel;
 
       final sut = fixture.getSut(
         hub: hub,