[Prototype] Migrate app distro to dagger.

Author: vkryachko

firebase-appdistribution/firebase-appdistribution.gradle

@@ -14,6 +14,7 @@
 
 plugins {
     id 'firebase-library'
+    id 'firebase-vendor'
 }
 
 firebaseLibrary {
@@ -51,6 +52,12 @@ dependencies {
     testImplementation project(path: ':firebase-appdistribution')
     runtimeOnly project(':firebase-installations')
 
+    implementation 'javax.inject:javax.inject:1'
+    vendor ('com.google.dagger:dagger:2.43.2') {
+        exclude group: "javax.inject", module: "javax.inject"
+    }
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.43.2'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AabUpdater.java

@@ -25,11 +25,13 @@
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.UpdateStatus;
 import java.io.IOException;
 import java.util.concurrent.Executor;
+import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 /** Class that handles updateApp functionality for AABs in {@link FirebaseAppDistribution}. */
@@ -51,17 +53,11 @@ class AabUpdater {
   @GuardedBy("updateAabLock")
   private boolean hasBeenSentToPlayForCurrentTask = false;
 
-  AabUpdater(@NonNull Executor blockingExecutor) {
-    this(
-        FirebaseAppDistributionLifecycleNotifier.getInstance(),
-        new HttpsUrlConnectionFactory(),
-        blockingExecutor);
-  }
-
+  @Inject
   AabUpdater(
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier,
       @NonNull HttpsUrlConnectionFactory httpsUrlConnectionFactory,
-      @NonNull Executor blockingExecutor) {
+      @NonNull @Blocking Executor blockingExecutor) {
     this.lifecycleNotifier = lifecycleNotifier;
     this.httpsUrlConnectionFactory = httpsUrlConnectionFactory;
     lifecycleNotifier.addOnActivityStartedListener(this::onActivityStarted);

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ActivityInjector.java

@@ -0,0 +1,30 @@
+package com.google.firebase.appdistribution.impl;
+
+import androidx.annotation.Nullable;
+import com.google.firebase.FirebaseApp;
+import dagger.MembersInjector;
+import javax.inject.Inject;
+
+/** Firebase Component used by activities to request dependency injection into them. */
+class ActivityInjector {
+  private final MembersInjector<InstallActivity> installActivityInjector;
+
+  @Inject
+  ActivityInjector(MembersInjector<InstallActivity> installActivityInjector) {
+    this.installActivityInjector = installActivityInjector;
+  }
+
+  static void injectForApp(@Nullable String firebaseAppName, InstallActivity activity) {
+    getApp(firebaseAppName)
+        .get(ActivityInjector.class)
+        .installActivityInjector
+        .injectMembers(activity);
+  }
+
+  private static FirebaseApp getApp(@Nullable String name) {
+    if (name == null) {
+      return FirebaseApp.getInstance();
+    }
+    return FirebaseApp.getInstance(name);
+  }
+}

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkInstaller.java

@@ -24,27 +24,30 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 /** Class that handles installing APKs in {@link FirebaseAppDistribution}. */
 class ApkInstaller {
   private static final String TAG = "ApkInstaller:";
+  private final String appName;
   private final FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier;
 
   @GuardedBy("installTaskLock")
   private TaskCompletionSource<Void> installTaskCompletionSource;
 
   private final Object installTaskLock = new Object();
 
-  ApkInstaller(FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
+  @Inject
+  ApkInstaller(
+      @Named("appName") String appName,
+      FirebaseAppDistributionLifecycleNotifier lifeCycleNotifier) {
+    this.appName = appName;
     this.lifeCycleNotifier = lifeCycleNotifier;
     lifeCycleNotifier.addOnActivityStartedListener(this::onActivityStarted);
     lifeCycleNotifier.addOnActivityDestroyedListener(this::onActivityDestroyed);
   }
 
-  ApkInstaller() {
-    this(FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
   void onActivityStarted(@Nullable Activity activity) {
     synchronized (installTaskLock) {
       if (installTaskCompletionSource == null
@@ -78,6 +81,7 @@ Task<Void> installApk(String path, Activity currentActivity) {
   private void startInstallActivity(String path, Activity currentActivity) {
     Intent intent = new Intent(currentActivity, InstallActivity.class);
     intent.putExtra("INSTALL_PATH", path);
+    intent.putExtra("FIREBASE_APP_NAME", appName);
     currentActivity.startActivity(intent);
     LogWrapper.getInstance().v(TAG + "Prompting tester with install activity ");
   }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/ApkUpdater.java

@@ -27,7 +27,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
-import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException;
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
@@ -38,6 +38,7 @@
 import java.io.InputStream;
 import java.util.concurrent.Executor;
 import java.util.jar.JarFile;
+import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 
 /** Class that handles updateApp functionality for APKs in {@link FirebaseAppDistribution}. */
@@ -61,22 +62,9 @@ class ApkUpdater {
 
   private final Object updateTaskLock = new Object();
 
+  @Inject
   public ApkUpdater(
-      @NonNull FirebaseApp firebaseApp,
-      @NonNull ApkInstaller apkInstaller,
-      @NonNull Executor blockingExecutor) {
-    this(
-        blockingExecutor,
-        firebaseApp.getApplicationContext(),
-        apkInstaller,
-        new FirebaseAppDistributionNotificationsManager(firebaseApp.getApplicationContext()),
-        new HttpsUrlConnectionFactory(),
-        FirebaseAppDistributionLifecycleNotifier.getInstance());
-  }
-
-  @VisibleForTesting
-  public ApkUpdater(
-      @NonNull Executor blockingExecutor,
+      @NonNull @Blocking Executor blockingExecutor,
       @NonNull Context context,
       @NonNull ApkInstaller apkInstaller,
       @NonNull FirebaseAppDistributionNotificationsManager appDistributionNotificationsManager,

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/AppDistroComponent.java

@@ -0,0 +1,62 @@
+package com.google.firebase.appdistribution.impl;
+
+import android.content.Context;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.appdistribution.FirebaseAppDistribution;
+import com.google.firebase.inject.Provider;
+import com.google.firebase.installations.FirebaseInstallationsApi;
+import dagger.Binds;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import java.util.concurrent.Executor;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+/** @hide */
+@Component(modules = AppDistroComponent.MainModule.class)
+@Singleton
+interface AppDistroComponent {
+
+  FirebaseAppDistribution getAppDistribution();
+
+  FirebaseAppDistributionLifecycleNotifier getLifecycleNotifier();
+
+  ActivityInjector getActivityInjector();
+
+  @Component.Builder
+  interface Builder {
+
+    @BindsInstance
+    Builder setApplicationContext(Context context);
+
+    @BindsInstance
+    Builder setOptions(FirebaseOptions options);
+
+    @BindsInstance
+    Builder setApp(FirebaseApp app);
+
+    @BindsInstance
+    Builder setFis(Provider<FirebaseInstallationsApi> fis);
+
+    @BindsInstance
+    Builder setBlockingExecutor(@Blocking Executor executor);
+
+    AppDistroComponent build();
+  }
+
+  @Module
+  interface MainModule {
+    @Binds
+    FirebaseAppDistribution bindAppDistro(FirebaseAppDistributionImpl impl);
+
+    @Provides
+    @Named("appName")
+    static String providesAppName(FirebaseApp app) {
+      return app.getName();
+    }
+  }
+}

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionImpl.java

@@ -31,7 +31,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.appdistribution.AppDistributionRelease;
 import com.google.firebase.appdistribution.BinaryType;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
@@ -40,6 +39,7 @@
 import com.google.firebase.appdistribution.UpdateProgress;
 import com.google.firebase.appdistribution.UpdateStatus;
 import com.google.firebase.appdistribution.UpdateTask;
+import javax.inject.Inject;
 
 /**
  * This class is the "real" implementation of the Firebase App Distribution API which should only be
@@ -49,7 +49,7 @@ class FirebaseAppDistributionImpl implements FirebaseAppDistribution {
 
   private static final int UNKNOWN_RELEASE_FILE_SIZE = -1;
 
-  private final FirebaseApp firebaseApp;
+  private final Context applicationContext;
   private final TesterSignInManager testerSignInManager;
   private final NewReleaseFetcher newReleaseFetcher;
   private final FirebaseAppDistributionLifecycleNotifier lifecycleNotifier;
@@ -74,16 +74,16 @@ class FirebaseAppDistributionImpl implements FirebaseAppDistribution {
   private TaskCompletionSource<Void> showSignInDialogTask = null;
   private TaskCompletionSource<Void> showUpdateDialogTask = null;
 
-  @VisibleForTesting
+  @Inject
   FirebaseAppDistributionImpl(
-      @NonNull FirebaseApp firebaseApp,
+      @NonNull Context applicationContext,
       @NonNull TesterSignInManager testerSignInManager,
       @NonNull NewReleaseFetcher newReleaseFetcher,
       @NonNull ApkUpdater apkUpdater,
       @NonNull AabUpdater aabUpdater,
       @NonNull SignInStorage signInStorage,
       @NonNull FirebaseAppDistributionLifecycleNotifier lifecycleNotifier) {
-    this.firebaseApp = firebaseApp;
+    this.applicationContext = applicationContext;
     this.testerSignInManager = testerSignInManager;
     this.newReleaseFetcher = newReleaseFetcher;
     this.apkUpdater = apkUpdater;
@@ -170,18 +170,19 @@ private Task<Void> showSignInConfirmationDialog(Activity hostActivity) {
         () -> {
           signInConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
 
-          Context context = firebaseApp.getApplicationContext();
-          signInConfirmationDialog.setTitle(context.getString(R.string.signin_dialog_title));
-          signInConfirmationDialog.setMessage(context.getString(R.string.singin_dialog_message));
+          signInConfirmationDialog.setTitle(
+              applicationContext.getString(R.string.signin_dialog_title));
+          signInConfirmationDialog.setMessage(
+              applicationContext.getString(R.string.singin_dialog_message));
 
           signInConfirmationDialog.setButton(
               AlertDialog.BUTTON_POSITIVE,
-              context.getString(R.string.singin_yes_button),
+              applicationContext.getString(R.string.singin_yes_button),
               (dialogInterface, i) -> showSignInDialogTask.setResult(null));
 
           signInConfirmationDialog.setButton(
               AlertDialog.BUTTON_NEGATIVE,
-              context.getString(R.string.singin_no_button),
+              applicationContext.getString(R.string.singin_no_button),
               (dialogInterface, i) ->
                   showSignInDialogTask.setException(
                       new FirebaseAppDistributionException(
@@ -357,15 +358,15 @@ private Task<Void> showUpdateConfirmationDialog(
       showUpdateDialogTask = new TaskCompletionSource<>();
     }
 
-    Context context = firebaseApp.getApplicationContext();
     dialogHostActivity = hostActivity;
 
     // We should already be on the main (UI) thread here, but be explicit just to be safe. If we are
     // already on the main thread, this will execute immediately.
     hostActivity.runOnUiThread(
         () -> {
           updateConfirmationDialog = new AlertDialog.Builder(hostActivity).create();
-          updateConfirmationDialog.setTitle(context.getString(R.string.update_dialog_title));
+          updateConfirmationDialog.setTitle(
+              applicationContext.getString(R.string.update_dialog_title));
 
           StringBuilder message =
               new StringBuilder(
@@ -380,12 +381,12 @@ private Task<Void> showUpdateConfirmationDialog(
 
           updateConfirmationDialog.setButton(
               AlertDialog.BUTTON_POSITIVE,
-              context.getString(R.string.update_yes_button),
+              applicationContext.getString(R.string.update_yes_button),
               (dialogInterface, i) -> showUpdateDialogTask.setResult(null));
 
           updateConfirmationDialog.setButton(
               AlertDialog.BUTTON_NEGATIVE,
-              context.getString(R.string.update_no_button),
+              applicationContext.getString(R.string.update_no_button),
               (dialogInterface, i) ->
                   showUpdateDialogTask.setException(
                       new FirebaseAppDistributionException(

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionLifecycleNotifier.java

@@ -20,7 +20,6 @@
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.SuccessContinuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -29,7 +28,10 @@
 import java.util.ArrayDeque;
 import java.util.Queue;
 import java.util.concurrent.Executor;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
+@Singleton
 class FirebaseAppDistributionLifecycleNotifier implements Application.ActivityLifecycleCallbacks {
 
   /** An {@link Executor} that runs tasks on the current thread. */
@@ -45,7 +47,6 @@ interface ActivityFunction<T> {
     T apply(Activity activity) throws FirebaseAppDistributionException;
   }
 
-  private static FirebaseAppDistributionLifecycleNotifier instance;
   private final Object lock = new Object();
 
   @GuardedBy("lock")
@@ -71,16 +72,9 @@ interface ActivityFunction<T> {
   @GuardedBy("lock")
   private final Queue<OnActivityDestroyedListener> onDestroyedListeners = new ArrayDeque<>();
 
-  @VisibleForTesting
+  @Inject
   FirebaseAppDistributionLifecycleNotifier() {}
 
-  static synchronized FirebaseAppDistributionLifecycleNotifier getInstance() {
-    if (instance == null) {
-      instance = new FirebaseAppDistributionLifecycleNotifier();
-    }
-    return instance;
-  }
-
   interface OnActivityCreatedListener {
     void onCreated(Activity activity);
   }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

@@ -23,6 +23,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.NotificationCompat;
+import javax.inject.Inject;
 
 class FirebaseAppDistributionNotificationsManager {
   private static final String TAG = "NotificationsManager:";
@@ -35,6 +36,7 @@ class FirebaseAppDistributionNotificationsManager {
   private final Context context;
   private final AppIconSource appIconSource;
 
+  @Inject
   FirebaseAppDistributionNotificationsManager(Context context) {
     this(context, new AppIconSource());
   }