Merge 939947e into 889ecea

Author: runningcode

sentry-android-distribution/api/sentry-android-distribution.api

@@ -1,6 +1,6 @@
 public final class io/sentry/android/distribution/DistributionIntegration : io/sentry/IDistributionApi, io/sentry/Integration {
 	public fun <init> (Landroid/content/Context;)V
-	public fun checkForUpdate (Lio/sentry/IDistributionApi$UpdateCallback;)V
+	public fun checkForUpdate ()Ljava/util/concurrent/Future;
 	public fun checkForUpdateBlocking ()Lio/sentry/UpdateStatus;
 	public fun downloadUpdate (Lio/sentry/UpdateInfo;)V
 	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionIntegration.kt

@@ -14,6 +14,7 @@ import io.sentry.UpdateInfo
 import io.sentry.UpdateStatus
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
+import java.util.concurrent.Future
 import org.jetbrains.annotations.ApiStatus
 
 /**
@@ -84,14 +85,12 @@ public class DistributionIntegration(context: Context) : Integration, IDistribut
   }
 
   /**
-   * Check for available updates asynchronously using a callback.
+   * Check for available updates asynchronously.
    *
-   * @param onResult Callback that will be called with the UpdateStatus result
+   * @return Future that will resolve to an UpdateStatus result
    */
-  public override fun checkForUpdate(onResult: IDistributionApi.UpdateCallback) {
-    // TODO implement this in a async way
-    val result = checkForUpdateBlocking()
-    onResult.onResult(result)
+  public override fun checkForUpdate(): Future<UpdateStatus> {
+    return sentryOptions.executorService.submit<UpdateStatus> { checkForUpdateBlocking() }
   }
 
   /**

sentry/api/sentry.api

@@ -776,15 +776,11 @@ public abstract interface class io/sentry/IContinuousProfiler {
 }
 
 public abstract interface class io/sentry/IDistributionApi {
-	public abstract fun checkForUpdate (Lio/sentry/IDistributionApi$UpdateCallback;)V
+	public abstract fun checkForUpdate ()Ljava/util/concurrent/Future;
 	public abstract fun checkForUpdateBlocking ()Lio/sentry/UpdateStatus;
 	public abstract fun downloadUpdate (Lio/sentry/UpdateInfo;)V
 }
 
-public abstract interface class io/sentry/IDistributionApi$UpdateCallback {
-	public abstract fun onResult (Lio/sentry/UpdateStatus;)V
-}
-
 public abstract interface class io/sentry/IEnvelopeReader {
 	public abstract fun read (Ljava/io/InputStream;)Lio/sentry/SentryEnvelope;
 }
@@ -1493,7 +1489,7 @@ public final class io/sentry/NoOpContinuousProfiler : io/sentry/IContinuousProfi
 }
 
 public final class io/sentry/NoOpDistributionApi : io/sentry/IDistributionApi {
-	public fun checkForUpdate (Lio/sentry/IDistributionApi$UpdateCallback;)V
+	public fun checkForUpdate ()Ljava/util/concurrent/Future;
 	public fun checkForUpdateBlocking ()Lio/sentry/UpdateStatus;
 	public fun downloadUpdate (Lio/sentry/UpdateInfo;)V
 	public static fun getInstance ()Lio/sentry/NoOpDistributionApi;

sentry/src/main/java/io/sentry/IDistributionApi.java

@@ -1,5 +1,6 @@
 package io.sentry;
 
+import java.util.concurrent.Future;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,20 +15,21 @@ public interface IDistributionApi {
 
   /**
    * Check for available updates synchronously (blocking call). This method will block the calling
-   * thread while making the network request. Consider using checkForUpdate with callback for
-   * non-blocking behavior.
+   * thread while making the network request. Consider using checkForUpdate for non-blocking
+   * behavior.
    *
    * @return UpdateStatus indicating if an update is available, up to date, or error
    */
   @NotNull
   UpdateStatus checkForUpdateBlocking();
 
   /**
-   * Check for available updates asynchronously using a callback.
+   * Check for available updates asynchronously.
    *
-   * @param onResult Callback that will be called with the UpdateStatus result
+   * @return Future that will resolve to an UpdateStatus result
    */
-  void checkForUpdate(@NotNull UpdateCallback onResult);
+  @NotNull
+  Future<UpdateStatus> checkForUpdate();
 
   /**
    * Download and install the provided update by opening the download URL in the default browser or
@@ -36,9 +38,4 @@ public interface IDistributionApi {
    * @param info Information about the update to download
    */
   void downloadUpdate(@NotNull UpdateInfo info);
-
-  /** Callback interface for receiving async update check results. */
-  interface UpdateCallback {
-    void onResult(@NotNull UpdateStatus status);
-  }
 }

sentry/src/main/java/io/sentry/NoOpDistributionApi.java

@@ -1,5 +1,9 @@
 package io.sentry;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -21,12 +25,50 @@ public static NoOpDistributionApi getInstance() {
   }
 
   @Override
-  public void checkForUpdate(@NotNull UpdateCallback onResult) {
-    // No-op implementation - do nothing
+  public @NotNull Future<UpdateStatus> checkForUpdate() {
+    return new CompletedFuture<>(UpdateStatus.UpToDate.getInstance());
   }
 
   @Override
   public void downloadUpdate(@NotNull UpdateInfo info) {
     // No-op implementation - do nothing
   }
+
+  /**
+   * A Future implementation that is already completed with a result. This is used instead of
+   * CompletableFuture.completedFuture() to maintain compatibility with Android API 21+.
+   */
+  private static final class CompletedFuture<T> implements Future<T> {
+    private final T result;
+
+    CompletedFuture(T result) {
+      this.result = result;
+    }
+
+    @Override
+    public boolean cancel(final boolean mayInterruptIfRunning) {
+      return false;
+    }
+
+    @Override
+    public boolean isCancelled() {
+      return false;
+    }
+
+    @Override
+    public boolean isDone() {
+      return true;
+    }
+
+    @Override
+    public T get() throws ExecutionException {
+      return result;
+    }
+
+    @Override
+    public T get(final long timeout, final @NotNull TimeUnit unit)
+        throws ExecutionException, TimeoutException {
+      return result;
+    }
+  }
 }