reverted UserInteractionIntegration changes, as it's called in register() in the main thread anyway

Author: stefanosiano

sentry-android-core/src/main/java/io/sentry/android/core/UserInteractionIntegration.java

@@ -29,16 +29,16 @@ public final class UserInteractionIntegration
   private @Nullable IScopes scopes;
   private @Nullable SentryAndroidOptions options;
 
-  private final @NotNull LazyEvaluator<Boolean> isAndroidXAvailable;
-  private final @NotNull LazyEvaluator<Boolean> isAndroidxLifecycleAvailable;
+  private final boolean isAndroidXAvailable;
+  private final boolean isAndroidxLifecycleAvailable;
 
   public UserInteractionIntegration(
       final @NotNull Application application, final @NotNull io.sentry.util.LoadClass classLoader) {
     this.application = Objects.requireNonNull(application, "Application is required");
     isAndroidXAvailable =
-        classLoader.isClassAvailableLazy("androidx.core.view.GestureDetectorCompat", options);
+        classLoader.isClassAvailable("androidx.core.view.GestureDetectorCompat", options);
     isAndroidxLifecycleAvailable =
-        classLoader.isClassAvailableLazy("androidx.lifecycle.Lifecycle", options);
+        classLoader.isClassAvailable("androidx.lifecycle.Lifecycle", options);
   }
 
   private void startTracking(final @NotNull Activity activity) {
@@ -129,13 +129,13 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) {
         .log(SentryLevel.DEBUG, "UserInteractionIntegration enabled: %s", integrationEnabled);
 
     if (integrationEnabled) {
-      if (isAndroidXAvailable.getValue()) {
+      if (isAndroidXAvailable) {
         application.registerActivityLifecycleCallbacks(this);
         this.options.getLogger().log(SentryLevel.DEBUG, "UserInteractionIntegration installed.");
         addIntegrationToSdkVersion("UserInteraction");
 
         // In case of a deferred init, we hook into any resumed activity
-        if (isAndroidxLifecycleAvailable.getValue()) {
+        if (isAndroidxLifecycleAvailable) {
           final @Nullable Activity activity = CurrentActivityHolder.getInstance().getActivity();
           if (activity instanceof LifecycleOwner) {
             if (((LifecycleOwner) activity).getLifecycle().getCurrentState()

sentry-android-core/src/test/java/io/sentry/android/core/UserInteractionIntegrationTest.kt

@@ -44,19 +44,19 @@ class UserInteractionIntegrationTest {
       isLifecycleAvailable: Boolean = true,
     ): UserInteractionIntegration {
       whenever(
-          loadClass.isClassAvailableLazy(
+          loadClass.isClassAvailable(
             eq("androidx.core.view.GestureDetectorCompat"),
             anyOrNull<SentryAndroidOptions>(),
           )
         )
-        .thenReturn(LazyEvaluator { isAndroidXAvailable })
+        .thenReturn(isAndroidXAvailable)
       whenever(
-          loadClass.isClassAvailableLazy(
+          loadClass.isClassAvailable(
             eq("androidx.lifecycle.Lifecycle"),
             anyOrNull<SentryAndroidOptions>(),
           )
         )
-        .thenReturn(LazyEvaluator { isLifecycleAvailable })
+        .thenReturn(isLifecycleAvailable)
       whenever(scopes.options).thenReturn(options)
       if (callback != null) {
         window.callback = callback