Skip to content

Fix warnings in SentryFlutter.kt and SentryFlutterPlugin.kt #3274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2025
Merged

Fix warnings in SentryFlutter.kt and SentryFlutterPlugin.kt #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class SentryFlutter {
}
data.getIfNotNull<String>("diagnosticLevel") {
if (options.isDebug) {
val sentryLevel = SentryLevel.valueOf(it.toUpperCase(Locale.ROOT))
val sentryLevel = SentryLevel.valueOf(it.uppercase())
options.setDiagnosticLevel(sentryLevel)
}
}
Expand Down Expand Up @@ -165,7 +165,7 @@ class SentryFlutter {
?.let {
type =
try {
Type.valueOf(it.toUpperCase(Locale.ROOT))
Type.valueOf(it.uppercase())
} catch (_: IllegalArgumentException) {
Log.w("Sentry", "Could not parse `type` from proxy json: $proxyJson")
null
Expand Down
19 changes: 10 additions & 9 deletions packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler
import io.flutter.plugin.common.MethodChannel.Result
import io.sentry.Breadcrumb
import io.sentry.DateUtils
import io.sentry.HubAdapter
import io.sentry.ScopesAdapter
import io.sentry.Sentry
import io.sentry.android.core.InternalSentrySdk
import io.sentry.android.core.LoadClass
import io.sentry.android.core.SentryAndroid
import io.sentry.android.core.SentryAndroidOptions
import io.sentry.android.core.performance.AppStartMetrics
import io.sentry.android.core.performance.TimeSpan
import io.sentry.android.replay.ReplayIntegration
import io.sentry.android.replay.ScreenshotRecorderConfig
import io.sentry.protocol.DebugImage
import io.sentry.protocol.SentryId
import io.sentry.protocol.User
import io.sentry.transport.CurrentDateProvider
import org.json.JSONObject
Expand Down Expand Up @@ -289,7 +287,7 @@ class SentryFlutterPlugin :
result: Result,
) {
if (user != null) {
val options = HubAdapter.getInstance().options
val options = ScopesAdapter.getInstance().options
val userInstance = User.fromMap(user, options)
Sentry.setUser(userInstance)
} else {
Expand All @@ -303,7 +301,7 @@ class SentryFlutterPlugin :
result: Result,
) {
if (breadcrumb != null) {
val options = HubAdapter.getInstance().options
val options = ScopesAdapter.getInstance().options
val breadcrumbInstance = Breadcrumb.fromMap(breadcrumb, options)
Sentry.addBreadcrumb(breadcrumbInstance)
}
Expand Down Expand Up @@ -371,7 +369,7 @@ class SentryFlutterPlugin :
}

private fun closeNativeSdk(result: Result) {
HubAdapter.getInstance().close()
ScopesAdapter.getInstance().close()

result.success("")
}
Expand All @@ -385,15 +383,17 @@ class SentryFlutterPlugin :

private const val NATIVE_CRASH_WAIT_TIME = 500L

@Suppress("unused") // Used by native/jni bindings
@JvmStatic
fun privateSentryGetReplayIntegration(): ReplayIntegration? = replay

@JvmStatic
fun getApplicationContext(): Context? = applicationContext

@Suppress("unused") // Used by native/jni bindings
@JvmStatic
fun loadContextsAsBytes(): ByteArray? {
val options = HubAdapter.getInstance().options
val options = ScopesAdapter.getInstance().options
val context = getApplicationContext()
if (options !is SentryAndroidOptions || context == null) {
return null
Expand All @@ -409,9 +409,10 @@ class SentryFlutterPlugin :
return json.toByteArray(Charsets.UTF_8)
}

@Suppress("unused") // Used by native/jni bindings
@JvmStatic
fun loadDebugImagesAsBytes(addresses: Set<String>): ByteArray? {
val options = HubAdapter.getInstance().options as SentryAndroidOptions
val options = ScopesAdapter.getInstance().options as SentryAndroidOptions

val debugImages =
if (addresses.isEmpty()) {
Expand Down Expand Up @@ -447,7 +448,7 @@ class SentryFlutterPlugin :
private fun crash() {
val exception = RuntimeException("FlutterSentry Native Integration: Sample RuntimeException")
val mainThread = Looper.getMainLooper().thread
mainThread.uncaughtExceptionHandler.uncaughtException(mainThread, exception)
mainThread.uncaughtExceptionHandler?.uncaughtException(mainThread, exception)
mainThread.join(NATIVE_CRASH_WAIT_TIME)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
languageVersion = "1.4"
languageVersion = "1.8"
}

compileSdkVersion 35
Expand Down
Loading