Merge cfb4bbd into cd268a3

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

@@ -8,13 +8,15 @@
 import io.sentry.DeduplicateMultithreadedEventProcessor;
 import io.sentry.DefaultTransactionPerformanceCollector;
 import io.sentry.ILogger;
+import io.sentry.NoOpConnectionStatusProvider;
 import io.sentry.SendFireAndForgetEnvelopeSender;
 import io.sentry.SendFireAndForgetOutboxSender;
 import io.sentry.SentryLevel;
 import io.sentry.android.core.cache.AndroidEnvelopeCache;
 import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
 import io.sentry.android.core.internal.gestures.AndroidViewGestureTargetLocator;
 import io.sentry.android.core.internal.modules.AssetsModulesLoader;
+import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
 import io.sentry.android.core.internal.util.AndroidMainThreadChecker;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.fragment.FragmentLifecycleIntegration;
@@ -130,14 +132,19 @@ static void initializeIntegrationsAndProcessors(
       options.setEnvelopeDiskCache(new AndroidEnvelopeCache(options));
     }
 
+    if (options.getConnectionStatusProvider() instanceof NoOpConnectionStatusProvider) {
+      options.setConnectionStatusProvider(
+          new AndroidConnectionStatusProvider(context, options.getLogger(), buildInfoProvider));
+    }
+
     options.addEventProcessor(new DeduplicateMultithreadedEventProcessor(options));
     options.addEventProcessor(
         new DefaultAndroidEventProcessor(context, buildInfoProvider, options));
     options.addEventProcessor(new PerformanceAndroidEventProcessor(options, activityFramesTracker));
     options.addEventProcessor(new ScreenshotEventProcessor(options, buildInfoProvider));
     options.addEventProcessor(new ViewHierarchyEventProcessor(options));
     options.addEventProcessor(new AnrV2EventProcessor(context, options, buildInfoProvider));
-    options.setTransportGate(new AndroidTransportGate(context, options.getLogger()));
+    options.setTransportGate(new AndroidTransportGate(options));
     final SentryFrameMetricsCollector frameMetricsCollector =
         new SentryFrameMetricsCollector(context, options, buildInfoProvider);
     options.setTransactionProfiler(

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

@@ -1,29 +1,26 @@
 package io.sentry.android.core;
 
-import android.content.Context;
-import io.sentry.ILogger;
-import io.sentry.android.core.internal.util.ConnectivityChecker;
+import io.sentry.IConnectionStatusProvider;
+import io.sentry.SentryOptions;
 import io.sentry.transport.ITransportGate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 final class AndroidTransportGate implements ITransportGate {
 
-  private final Context context;
-  private final @NotNull ILogger logger;
+  private final @NotNull SentryOptions options;
 
-  AndroidTransportGate(final @NotNull Context context, final @NotNull ILogger logger) {
-    this.context = context;
-    this.logger = logger;
+  AndroidTransportGate(final @NotNull SentryOptions options) {
+    this.options = options;
   }
 
   @Override
   public boolean isConnected() {
-    return isConnected(ConnectivityChecker.getConnectionStatus(context, logger));
+    return isConnected(options.getConnectionStatusProvider().getConnectionStatus());
   }
 
   @TestOnly
-  boolean isConnected(final @NotNull ConnectivityChecker.Status status) {
+  boolean isConnected(final @NotNull IConnectionStatusProvider.ConnectionStatus status) {
     // let's assume its connected if there's no permission or something as we can't really know
     // whether is online or not.
     switch (status) {

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

@@ -16,7 +16,6 @@
 import android.util.DisplayMetrics;
 import io.sentry.DateUtils;
 import io.sentry.SentryLevel;
-import io.sentry.android.core.internal.util.ConnectivityChecker;
 import io.sentry.android.core.internal.util.CpuInfoUtils;
 import io.sentry.android.core.internal.util.DeviceOrientations;
 import io.sentry.android.core.internal.util.RootChecker;
@@ -180,8 +179,8 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
     }
 
     Boolean connected;
-    switch (ConnectivityChecker.getConnectionStatus(context, options.getLogger())) {
-      case NOT_CONNECTED:
+    switch (options.getConnectionStatusProvider().getConnectionStatus()) {
+      case DISCONNECTED:
         connected = false;
         break;
       case CONNECTED:
@@ -223,8 +222,7 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
 
     if (device.getConnectionType() == null) {
       // wifi, ethernet or cellular, null if none
-      device.setConnectionType(
-          ConnectivityChecker.getConnectionType(context, options.getLogger(), buildInfoProvider));
+      device.setConnectionType(options.getConnectionStatusProvider().getConnectionType());
     }
   }
 

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

@@ -16,7 +16,7 @@
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.TypeCheckHint;
-import io.sentry.android.core.internal.util.ConnectivityChecker;
+import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
 import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
@@ -69,7 +69,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
 
       networkCallback = new NetworkBreadcrumbsNetworkCallback(hub, buildInfoProvider);
       final boolean registered =
-          ConnectivityChecker.registerNetworkCallback(
+          AndroidConnectionStatusProvider.registerNetworkCallback(
               context, logger, buildInfoProvider, networkCallback);
 
       // The specific error is logged in the ConnectivityChecker method
@@ -86,7 +86,7 @@ public void register(final @NotNull IHub hub, final @NotNull SentryOptions optio
   @Override
   public void close() throws IOException {
     if (networkCallback != null) {
-      ConnectivityChecker.unregisterNetworkCallback(
+      AndroidConnectionStatusProvider.unregisterNetworkCallback(
           context, logger, buildInfoProvider, networkCallback);
       logger.log(SentryLevel.DEBUG, "NetworkBreadcrumbsIntegration remove.");
     }
@@ -208,7 +208,7 @@ static class NetworkBreadcrumbConnectionDetail {
       this.signalStrength = strength > -100 ? strength : 0;
       this.isVpn = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN);
       String connectionType =
-          ConnectivityChecker.getConnectionType(networkCapabilities, buildInfoProvider);
+          AndroidConnectionStatusProvider.getConnectionType(networkCapabilities, buildInfoProvider);
       this.type = connectionType != null ? connectionType : "";
     }
 

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

@@ -1,23 +1,33 @@
 package io.sentry.android.core;
 
+import io.sentry.IConnectionStatusProvider;
 import io.sentry.IHub;
 import io.sentry.Integration;
 import io.sentry.SendCachedEnvelopeFireAndForgetIntegration;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.util.LazyEvaluator;
 import io.sentry.util.Objects;
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-final class SendCachedEnvelopeIntegration implements Integration {
+final class SendCachedEnvelopeIntegration
+    implements Integration, IConnectionStatusProvider.IConnectionStatusObserver, Closeable {
 
   private final @NotNull SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForgetFactory
       factory;
   private final @NotNull LazyEvaluator<Boolean> startupCrashMarkerEvaluator;
+  private final AtomicBoolean startupCrashHandled = new AtomicBoolean(false);
+  private @Nullable IConnectionStatusProvider connectionStatusProvider;
+  private @Nullable IHub hub;
+  private @Nullable SentryAndroidOptions options;
 
   public SendCachedEnvelopeIntegration(
       final @NotNull SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForgetFactory factory,
@@ -29,7 +39,8 @@ public SendCachedEnvelopeIntegration(
   @Override
   public void register(@NotNull IHub hub, @NotNull SentryOptions options) {
     Objects.requireNonNull(hub, "Hub is required");
-    final SentryAndroidOptions androidOptions =
+    this.hub = hub;
+    this.options =
         Objects.requireNonNull(
             (options instanceof SentryAndroidOptions) ? (SentryAndroidOptions) options : null,
             "SentryAndroidOptions is required");
@@ -40,51 +51,74 @@ public void register(@NotNull IHub hub, @NotNull SentryOptions options) {
       return;
     }
 
+    connectionStatusProvider = options.getConnectionStatusProvider();
+    connectionStatusProvider.addConnectionStatusObserver(this);
+
+    sendCachedEnvelopes(hub, this.options);
+  }
+
+  @Override
+  public void close() throws IOException {
+    if (connectionStatusProvider != null) {
+      connectionStatusProvider.removeConnectionStatusObserver(this);
+    }
+  }
+
+  @Override
+  public void onConnectionStatusChanged(IConnectionStatusProvider.ConnectionStatus status) {
+    if (hub != null && options != null) {
+      sendCachedEnvelopes(hub, options);
+    }
+  }
+
+  private synchronized void sendCachedEnvelopes(
+      final @NotNull IHub hub, final @NotNull SentryAndroidOptions options) {
+
     final SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForget sender =
-        factory.create(hub, androidOptions);
+        factory.create(hub, options);
 
     if (sender == null) {
-      androidOptions.getLogger().log(SentryLevel.ERROR, "SendFireAndForget factory is null.");
+      options.getLogger().log(SentryLevel.ERROR, "SendFireAndForget factory is null.");
       return;
     }
-
     try {
-      Future<?> future =
-          androidOptions
+      final Future<?> future =
+          options
               .getExecutorService()
               .submit(
                   () -> {
                     try {
                       sender.send();
                     } catch (Throwable e) {
-                      androidOptions
+                      options
                           .getLogger()
                           .log(SentryLevel.ERROR, "Failed trying to send cached events.", e);
                     }
                   });
 
-      if (startupCrashMarkerEvaluator.getValue()) {
-        androidOptions
-            .getLogger()
-            .log(SentryLevel.DEBUG, "Startup Crash marker exists, blocking flush.");
+      // startupCrashMarkerEvaluator remains true on subsequent runs, let's ensure we only block on
+      // the very first execution (=app start)
+      if (startupCrashMarkerEvaluator.getValue()
+          && startupCrashHandled.compareAndSet(false, true)) {
+        options.getLogger().log(SentryLevel.DEBUG, "Startup Crash marker exists, blocking flush.");
         try {
-          future.get(androidOptions.getStartupCrashFlushTimeoutMillis(), TimeUnit.MILLISECONDS);
+          future.get(options.getStartupCrashFlushTimeoutMillis(), TimeUnit.MILLISECONDS);
         } catch (TimeoutException e) {
-          androidOptions
+          options
               .getLogger()
               .log(SentryLevel.DEBUG, "Synchronous send timed out, continuing in the background.");
         }
       }
-      androidOptions.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed.");
+      options.getLogger().log(SentryLevel.DEBUG, "SendCachedEnvelopeIntegration installed.");
     } catch (RejectedExecutionException e) {
-      androidOptions
+      options
           .getLogger()
           .log(
               SentryLevel.ERROR,
               "Failed to call the executor. Cached events will not be sent. Did you call Sentry.close()?",
               e);
     } catch (Throwable e) {
-      androidOptions
+      options
           .getLogger()
           .log(SentryLevel.ERROR, "Failed to call the executor. Cached events will not be sent", e);
     }