Merge branch 'master' into fix_dynamic_module_support_bug

Author: VinayGuthal

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt

@@ -33,11 +33,13 @@ abstract class ChangedModulesTask : DefaultTask() {
             AffectedProjectFinder(project, changedGitPaths.toSet(), listOf()).find().map { it.path }
                 .toSet()
 
-        val result = mutableMapOf<String, MutableSet<String>>()
+        val result = project.rootProject.subprojects.associate {
+            it.path to mutableSetOf<String>()
+        }
         project.rootProject.subprojects.forEach { p ->
             p.configurations.forEach { c ->
                 c.dependencies.filterIsInstance<ProjectDependency>().forEach {
-                    result.getOrPut(it.dependencyProject.path) { mutableSetOf() }.add(p.path)
+                    result[it.dependencyProject.path]?.add(p.path)
                 }
             }
         }

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

@@ -70,7 +70,6 @@ public static ModelFileManager getInstance(@NonNull FirebaseApp app) {
   void deleteNonLatestCustomModels() throws FirebaseMlException {
     File root = getDirImpl("");
 
-    boolean ret = true;
     if (root.isDirectory()) {
       for (File f : root.listFiles()) {
         // for each custom model sub directory - extract customModelName and clean up old models.
@@ -212,7 +211,7 @@ public synchronized File moveModelToDestinationFolder(
   public synchronized void deleteOldModels(
       @NonNull String modelName, @NonNull String latestModelFilePath) {
     File modelFolder = getModelDirUnsafe(modelName);
-    if (!modelFolder.exists()) {
+    if (!modelFolder.exists() || latestModelFilePath.isEmpty()) {
       return;
     }
 

firebase-ml-modeldownloader/src/test/java/com/google/firebase/ml/modeldownloader/internal/ModelFileManagerTest.java

@@ -188,6 +188,29 @@ public void deleteNonLatestCustomModels_fileToDelete()
     assertTrue(new File(modelDestinationFolder + "/1").exists());
   }
 
+  @Test
+  public void deleteNonLatestCustomModels_whenModelOnDiskButNotInPreferences()
+      throws FirebaseMlException, IOException {
+    String modelDestinationFolder2 = setUpTestingFiles(app, MODEL_NAME_2);
+
+    // Was just downloaded
+    MoveFileToDestination(modelDestinationFolder, testModelFile, CUSTOM_MODEL_NO_FILE, 0);
+    // Was downloaded previously via FirebaseModelManager
+    MoveFileToDestination(modelDestinationFolder2, testModelFile2, CUSTOM_MODEL_NO_FILE_2, 0);
+
+    sharedPreferencesUtil.setLoadedCustomModelDetails(
+        new CustomModel(MODEL_NAME, MODEL_HASH, 100, 0, modelDestinationFolder + "/0"));
+
+    // Download in progress, hence file path is not present
+    sharedPreferencesUtil.setLoadedCustomModelDetails(
+        new CustomModel(MODEL_NAME_2, MODEL_HASH_2, 100, 0));
+
+    fileManager.deleteNonLatestCustomModels();
+
+    assertTrue(new File(modelDestinationFolder + "/0").exists());
+    assertTrue(new File(modelDestinationFolder2 + "/0").exists());
+  }
+
   @Test
   public void deleteNonLatestCustomModels_noFileToDelete()
       throws FirebaseMlException, FileNotFoundException {