issue_3321_seperate_firebaseapp

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java

@@ -55,7 +55,7 @@ public class FirebaseModelDownloader {
       FirebaseApp firebaseApp, FirebaseInstallationsApi firebaseInstallationsApi) {
     this.firebaseOptions = firebaseApp.getOptions();
     this.sharedPreferencesUtil = new SharedPreferencesUtil(firebaseApp);
-    this.eventLogger = FirebaseMlLogger.getInstance();
+    this.eventLogger = FirebaseMlLogger.getInstance(firebaseApp);
     this.fileDownloadService = new ModelFileDownloadService(firebaseApp);
     this.modelDownloadService =
         new CustomModelDownloadService(firebaseApp, firebaseInstallationsApi);

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/FirebaseMlLogger.java

@@ -93,6 +93,11 @@ public static FirebaseMlLogger getInstance() {
     return FirebaseApp.getInstance().get(FirebaseMlLogger.class);
   }
 
+  @NonNull
+  public static FirebaseMlLogger getInstance(@NonNull FirebaseApp app) {
+    return app.get(FirebaseMlLogger.class);
+  }
+
   void logModelInfoRetrieverFailure(CustomModel model, ErrorCode errorCode) {
     logModelInfoRetrieverFailure(model, errorCode, NO_FAILURE_VALUE);
   }

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java

@@ -85,7 +85,7 @@ public class ModelFileDownloadService {
   public ModelFileDownloadService(@NonNull FirebaseApp firebaseApp) {
     this.context = firebaseApp.getApplicationContext();
     downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-    this.fileManager = ModelFileManager.getInstance();
+    this.fileManager = ModelFileManager.getInstance(firebaseApp);
     this.sharedPreferencesUtil = new SharedPreferencesUtil(firebaseApp);
     this.isInitialLoad = true;
     this.eventLogger = FirebaseMlLogger.getInstance();

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManager.java

@@ -62,6 +62,11 @@ public static ModelFileManager getInstance() {
     return FirebaseApp.getInstance().get(ModelFileManager.class);
   }
 
+  @NonNull
+  public static ModelFileManager getInstance(@NonNull FirebaseApp app) {
+    return app.get(ModelFileManager.class);
+  }
+
   void deleteNonLatestCustomModels() throws FirebaseMlException {
     File root = getDirImpl("");