Make clear distinction in between old and new cache and index switch

dimagi · Jan 6, 2025 · 3aa36bf · 3aa36bf
1 parent 32d554e
commit 3aa36bf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/src/org/commcare/tasks/EntityLoaderHelper.kt b/app/src/org/commcare/tasks/EntityLoaderHelper.kt
@@ -3,6 +3,7 @@ package org.commcare.tasks
 import android.util.Pair
 import io.reactivex.functions.Cancellable
 import org.commcare.activities.EntitySelectActivity
+import org.commcare.cases.entity.AsyncNodeEntityFactory
 import org.commcare.cases.entity.Entity
 import org.commcare.cases.entity.EntityLoadingProgressListener
 import org.commcare.cases.entity.EntityStorageCache
@@ -30,9 +31,13 @@ class EntityLoaderHelper(
 
     init {
         evalCtx.addFunctionHandler(EntitySelectActivity.getHereFunctionHandler())
-        if (detail.useAsyncStrategy() || detail.shouldCache()) {
+        if (detail.shouldCache()) {
             val entityStorageCache: EntityStorageCache = CommCareEntityStorageCache("case")
             factory = AndroidAsyncNodeEntityFactory(detail, sessionDatum, evalCtx, entityStorageCache)
+        } else if (detail.useAsyncStrategy()) {
+            // legacy cache and index
+            val entityStorageCache: EntityStorageCache = CommCareEntityStorageCache("case")
+            factory = AsyncNodeEntityFactory(detail, evalCtx, entityStorageCache)
         } else {
             factory = NodeEntityFactory(detail, evalCtx)
             if (DeveloperPreferences.collectAndDisplayEntityTraces()) {