Making firebase installations lazy to initialize (#3272)

* Making firebase installations lazy to initialize

* Change main class to take in a provider

* Passing provider down to classes

* Fixing tests

* responding to comments renaming fields

* Changing gradle file

* Changing gradle file to not have path in the dependencies

Co-authored-by: Manny Jimenez <[email protected]>

Author: manny-jimenez

firebase-app-distribution/firebase-app-distribution.gradle

@@ -39,10 +39,10 @@ android {
 
 dependencies {
     implementation 'org.jetbrains:annotations:15.0'
-    implementation project(path: ':firebase-components')
-    implementation project(path: ':firebase-installations-interop')
-    implementation project(path: ':firebase-common')
-    implementation project(path: ':firebase-installations')
+    implementation project(':firebase-components')
+    implementation project(':firebase-installations-interop')
+    implementation project(':firebase-common')
+    runtimeOnly project(':firebase-installations')
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistribution.java

@@ -34,6 +34,7 @@
 import com.google.firebase.app.distribution.internal.LogWrapper;
 import com.google.firebase.app.distribution.internal.SignInResultActivity;
 import com.google.firebase.app.distribution.internal.SignInStorage;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 
 public class FirebaseAppDistribution {
@@ -84,14 +85,16 @@ public class FirebaseAppDistribution {
   /** Constructor for FirebaseAppDistribution */
   FirebaseAppDistribution(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
       @NonNull SignInStorage signInStorage,
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
     this(
         firebaseApp,
-        new TesterSignInManager(firebaseApp, firebaseInstallationsApi, signInStorage),
+        new TesterSignInManager(firebaseApp, firebaseInstallationsApiProvider, signInStorage),
         new NewReleaseFetcher(
-            firebaseApp, new FirebaseAppDistributionTesterApiClient(), firebaseInstallationsApi),
+            firebaseApp,
+            new FirebaseAppDistributionTesterApiClient(),
+            firebaseInstallationsApiProvider),
         new ApkUpdater(firebaseApp, new ApkInstaller()),
         new AabUpdater(),
         signInStorage,
@@ -101,10 +104,10 @@ firebaseApp, new FirebaseAppDistributionTesterApiClient(), firebaseInstallations
   /** Constructor for FirebaseAppDistribution */
   FirebaseAppDistribution(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi) {
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider) {
     this(
         firebaseApp,
-        firebaseInstallationsApi,
+        firebaseInstallationsApiProvider,
         new SignInStorage(firebaseApp.getApplicationContext()),
         FirebaseAppDistributionLifecycleNotifier.getInstance());
   }

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistributionRegistrar.java

@@ -43,17 +43,17 @@ public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
     return Arrays.asList(
         Component.builder(FirebaseAppDistribution.class)
             .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(FirebaseInstallationsApi.class))
+            .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
             .factory(this::buildFirebaseAppDistribution)
             .build(),
         LibraryVersionComponent.create("fire-app-distribution", BuildConfig.VERSION_NAME));
   }
 
   private FirebaseAppDistribution buildFirebaseAppDistribution(ComponentContainer container) {
     FirebaseApp firebaseApp = container.get(FirebaseApp.class);
-    FirebaseInstallationsApi firebaseInstallations = container.get(FirebaseInstallationsApi.class);
     FirebaseAppDistribution appDistribution =
-        new FirebaseAppDistribution(firebaseApp, firebaseInstallations);
+        new FirebaseAppDistribution(
+            firebaseApp, container.getProvider(FirebaseInstallationsApi.class));
     FirebaseAppDistributionLifecycleNotifier lifecycleNotifier =
         FirebaseAppDistributionLifecycleNotifier.getInstance();
 

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/NewReleaseFetcher.java

@@ -26,6 +26,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.app.distribution.internal.LogWrapper;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import java.io.File;
@@ -44,7 +45,7 @@ class NewReleaseFetcher {
 
   private final FirebaseApp firebaseApp;
   private final FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient;
-  private final FirebaseInstallationsApi firebaseInstallationsApi;
+  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
   // Maintain an in-memory mapping from source file to APK hash to avoid re-calculating the hash
   private static final ConcurrentMap<String, String> cachedApkHashes = new ConcurrentHashMap<>();
 
@@ -54,21 +55,21 @@ class NewReleaseFetcher {
   NewReleaseFetcher(
       @NonNull FirebaseApp firebaseApp,
       @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi) {
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider) {
     this.firebaseApp = firebaseApp;
     this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
+    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
     this.taskExecutor = Executors.newSingleThreadExecutor();
   }
 
   NewReleaseFetcher(
       @NonNull FirebaseApp firebaseApp,
       @NonNull FirebaseAppDistributionTesterApiClient firebaseAppDistributionTesterApiClient,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
       @NonNull Executor executor) {
     this.firebaseApp = firebaseApp;
     this.firebaseAppDistributionTesterApiClient = firebaseAppDistributionTesterApiClient;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
+    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
     this.taskExecutor = executor;
   }
 
@@ -79,10 +80,10 @@ public synchronized Task<AppDistributionReleaseInternal> checkForNewRelease() {
       return cachedCheckForNewRelease;
     }
 
-    Task<String> installationIdTask = firebaseInstallationsApi.getId();
+    Task<String> installationIdTask = firebaseInstallationsApiProvider.get().getId();
     // forceRefresh is false to get locally cached token if available
     Task<InstallationTokenResult> installationAuthTokenTask =
-        firebaseInstallationsApi.getToken(false);
+        firebaseInstallationsApiProvider.get().getToken(false);
 
     this.cachedCheckForNewRelease =
         Tasks.whenAllSuccess(installationIdTask, installationAuthTokenTask)

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/TesterSignInManager.java

@@ -39,6 +39,7 @@
 import com.google.firebase.app.distribution.internal.LogWrapper;
 import com.google.firebase.app.distribution.internal.SignInResultActivity;
 import com.google.firebase.app.distribution.internal.SignInStorage;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import java.util.List;
 
@@ -49,7 +50,7 @@ class TesterSignInManager {
       "https://appdistribution.firebase.google.com/pub/testerapps/%s/installations/%s/buildalerts?appName=%s&packageName=%s";
 
   private final FirebaseApp firebaseApp;
-  private final FirebaseInstallationsApi firebaseInstallationsApi;
+  private final Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider;
   private final SignInStorage signInStorage;
   private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
 
@@ -62,23 +63,23 @@ class TesterSignInManager {
 
   TesterSignInManager(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
       @NonNull final SignInStorage signInStorage) {
     this(
         firebaseApp,
-        firebaseInstallationsApi,
+        firebaseInstallationsApiProvider,
         signInStorage,
         FirebaseAppDistributionLifecycleNotifier.getInstance());
   }
 
   @VisibleForTesting
   TesterSignInManager(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
+      @NonNull Provider<FirebaseInstallationsApi> firebaseInstallationsApiProvider,
       @NonNull final SignInStorage signInStorage,
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
     this.firebaseApp = firebaseApp;
-    this.firebaseInstallationsApi = firebaseInstallationsApi;
+    this.firebaseInstallationsApiProvider = firebaseInstallationsApiProvider;
     this.signInStorage = signInStorage;
     this.lifecycleNotifier = lifecycleNotifier;
 
@@ -166,7 +167,8 @@ private AlertDialog getSignInAlertDialog(Activity currentActivity) {
         AlertDialog.BUTTON_POSITIVE,
         context.getString(R.string.singin_yes_button),
         (dialogInterface, i) -> {
-          firebaseInstallationsApi
+          firebaseInstallationsApiProvider
+              .get()
               .getId()
               .addOnSuccessListener(getFidGenerationOnSuccessListener(currentActivity))
               .addOnFailureListener(

firebase-app-distribution/src/test/java/com/google/firebase/app/distribution/NewReleaseFetcherTest.java

@@ -41,6 +41,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import java.util.concurrent.Executor;
@@ -74,6 +75,7 @@ public class NewReleaseFetcherTest {
   private ShadowPackageManager shadowPackageManager;
   private Context applicationContext;
 
+  @Mock private Provider<FirebaseInstallationsApi> mockFirebaseInstallationsProvider;
   @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
   @Mock private FirebaseAppDistributionTesterApiClient mockFirebaseAppDistributionTesterApiClient;
   @Mock private InstallationTokenResult mockInstallationTokenResult;
@@ -95,6 +97,7 @@ public void setup() {
                 .setApiKey(TEST_API_KEY)
                 .build());
 
+    when(mockFirebaseInstallationsProvider.get()).thenReturn(mockFirebaseInstallations);
     when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
     when(mockFirebaseInstallations.getToken(false))
         .thenReturn(Tasks.forResult(mockInstallationTokenResult));
@@ -126,7 +129,7 @@ public void setup() {
             new NewReleaseFetcher(
                 firebaseApp,
                 mockFirebaseAppDistributionTesterApiClient,
-                mockFirebaseInstallations,
+                mockFirebaseInstallationsProvider,
                 testExecutor));
   }
 

firebase-app-distribution/src/test/java/com/google/firebase/app/distribution/TesterSignInManagerTest.java

@@ -43,6 +43,7 @@
 import com.google.firebase.app.distribution.FirebaseAppDistributionTest.TestActivity;
 import com.google.firebase.app.distribution.internal.SignInResultActivity;
 import com.google.firebase.app.distribution.internal.SignInStorage;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.installations.InstallationTokenResult;
 import org.junit.Before;
@@ -79,6 +80,7 @@ public class TesterSignInManagerTest {
   private ShadowActivity shadowActivity;
   private ShadowPackageManager shadowPackageManager;
 
+  @Mock private Provider<FirebaseInstallationsApi> mockFirebaseInstallationsProvider;
   @Mock private FirebaseInstallationsApi mockFirebaseInstallations;
   @Mock private InstallationTokenResult mockInstallationTokenResult;
   @Mock private SignInStorage mockSignInStorage;
@@ -100,6 +102,7 @@ public void setUp() {
                 .setApiKey(TEST_API_KEY)
                 .build());
 
+    when(mockFirebaseInstallationsProvider.get()).thenReturn(mockFirebaseInstallations);
     when(mockFirebaseInstallations.getId()).thenReturn(Tasks.forResult(TEST_FID_1));
     when(mockFirebaseInstallations.getToken(false))
         .thenReturn(Tasks.forResult(mockInstallationTokenResult));
@@ -129,7 +132,10 @@ public void setUp() {
 
     testerSignInManager =
         new TesterSignInManager(
-            firebaseApp, mockFirebaseInstallations, mockSignInStorage, mockLifecycleNotifier);
+            firebaseApp,
+            mockFirebaseInstallationsProvider,
+            mockSignInStorage,
+            mockLifecycleNotifier);
   }
 
   @Test