Merge branch 'main' into feat/windows-native

getsentry · Sep 24, 2024 · 5136aaa · 5136aaa
2 parents 4701791 + 48c3cf1
commit 5136aaa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*       @krystofwoldrich @stefanosiano @buenaflor
+*       @krystofwoldrich @stefanosiano @buenaflor @martinhaintz
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- Blocking app starts if "appLaunchedInForeground" is false. (Android only) ([#2291](https://github.com/getsentry/sentry-dart/pull/2291)
 - Windows native error & obfuscation support ([#2286](https://github.com/getsentry/sentry-dart/pull/2286))
 
 ### Enhancements

diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt
@@ -65,7 +65,7 @@ class SentryFlutter(
     }
     data.getIfNotNull<String>("diagnosticLevel") {
       if (options.isDebug) {
-        val sentryLevel = SentryLevel.valueOf(it.toUpperCase(Locale.ROOT))
+        val sentryLevel = SentryLevel.valueOf(it.uppercase(Locale.ROOT))
         options.setDiagnosticLevel(sentryLevel)
       }
     }

diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt b/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt
@@ -34,6 +34,8 @@ import io.sentry.protocol.User
 import io.sentry.transport.CurrentDateProvider
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
   private lateinit var channel: MethodChannel
@@ -171,6 +173,16 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
     val appStartMetrics = AppStartMetrics.getInstance()
 
+    if (!appStartMetrics.isAppLaunchedInForeground ||
+      appStartMetrics.appStartTimeSpan.durationMs > 1.toDuration(DurationUnit.MINUTES).inWholeMilliseconds
+    ) {
+      Log.w(
+        "Sentry",
+        "Invalid app start data: app not launched in foreground or app start took too long (>60s)",
+      )
+      result.success(null)
+    }
+
     val appStartTimeSpan = appStartMetrics.appStartTimeSpan
     val appStartTime = appStartTimeSpan.startTimestamp
     val isColdStart = appStartMetrics.appStartType == AppStartMetrics.AppStartType.COLD