Address review comments.

Author: rosalyntan

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheck.java

@@ -52,7 +52,6 @@ public class DefaultFirebaseAppCheck extends FirebaseAppCheck {
   private final StorageHelper storageHelper;
   private final TokenRefreshManager tokenRefreshManager;
   private final Executor backgroundExecutor;
-  private final ScheduledExecutorService scheduledExecutorService;
   private final Task<Void> retrieveStoredTokenTask;
   private final Clock clock;
 
@@ -74,9 +73,11 @@ public DefaultFirebaseAppCheck(
     this.storageHelper =
         new StorageHelper(firebaseApp.getApplicationContext(), firebaseApp.getPersistenceKey());
     this.tokenRefreshManager =
-        new TokenRefreshManager(firebaseApp.getApplicationContext(), /* firebaseAppCheck= */ this);
+        new TokenRefreshManager(
+            firebaseApp.getApplicationContext(),
+            /* firebaseAppCheck= */ this,
+            scheduledExecutorService);
     this.backgroundExecutor = backgroundExecutor;
-    this.scheduledExecutorService = scheduledExecutorService;
     this.retrieveStoredTokenTask = retrieveStoredAppCheckTokenInBackground(backgroundExecutor);
     this.clock = new Clock.DefaultClock();
   }
@@ -250,11 +251,6 @@ Provider<HeartBeatController> getHeartbeatControllerProvider() {
     return heartbeatControllerProvider;
   }
 
-  @NonNull
-  ScheduledExecutorService getScheduledExecutorService() {
-    return scheduledExecutorService;
-  }
-
   /** Sets the in-memory cached {@link AppCheckToken}. */
   @VisibleForTesting
   void setCachedToken(@NonNull AppCheckToken token) {

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultTokenRefresher.java

@@ -21,6 +21,7 @@
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import com.google.firebase.annotations.concurrent.Blocking;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 
@@ -40,14 +41,10 @@ public class DefaultTokenRefresher {
   private volatile ScheduledFuture<?> refreshFuture;
   private volatile long delayAfterFailureSeconds;
 
-  DefaultTokenRefresher(@NonNull DefaultFirebaseAppCheck firebaseAppCheck) {
-    this(checkNotNull(firebaseAppCheck), firebaseAppCheck.getScheduledExecutorService());
-  }
-
-  @VisibleForTesting
   DefaultTokenRefresher(
-      DefaultFirebaseAppCheck firebaseAppCheck, ScheduledExecutorService scheduledExecutorService) {
-    this.firebaseAppCheck = firebaseAppCheck;
+      @NonNull DefaultFirebaseAppCheck firebaseAppCheck,
+      @Blocking ScheduledExecutorService scheduledExecutorService) {
+    this.firebaseAppCheck = checkNotNull(firebaseAppCheck);
     this.scheduledExecutorService = scheduledExecutorService;
     this.delayAfterFailureSeconds = UNSET_DELAY;
   }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/TokenRefreshManager.java

@@ -22,8 +22,10 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.common.api.internal.BackgroundDetector;
 import com.google.android.gms.common.api.internal.BackgroundDetector.BackgroundStateChangeListener;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.appcheck.AppCheckToken;
 import com.google.firebase.appcheck.internal.util.Clock;
+import java.util.concurrent.ScheduledExecutorService;
 
 /** Class to manage whether or not to schedule an {@link AppCheckToken} refresh attempt. */
 public final class TokenRefreshManager {
@@ -41,10 +43,13 @@ public final class TokenRefreshManager {
   private volatile long nextRefreshTimeMillis;
   private volatile boolean isAutoRefreshEnabled;
 
-  TokenRefreshManager(@NonNull Context context, @NonNull DefaultFirebaseAppCheck firebaseAppCheck) {
+  TokenRefreshManager(
+      @NonNull Context context,
+      @NonNull DefaultFirebaseAppCheck firebaseAppCheck,
+      @Blocking ScheduledExecutorService scheduledExecutorService) {
     this(
         checkNotNull(context),
-        new DefaultTokenRefresher(checkNotNull(firebaseAppCheck)),
+        new DefaultTokenRefresher(checkNotNull(firebaseAppCheck), scheduledExecutorService),
         new Clock.DefaultClock());
   }
 

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultFirebaseAppCheckTest.java

@@ -43,12 +43,11 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
-import org.robolectric.annotation.LooperMode.Mode;
 
 /** Tests for {@link DefaultFirebaseAppCheck}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-@LooperMode(Mode.LEGACY)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class DefaultFirebaseAppCheckTest {
 
   private static final String EXCEPTION_TEXT = "exceptionText";