@@ -25,9 +25,8 @@ class EntityLoaderHelper(
2525 var sessionDatum : EntityDatum ? ,
2626 evalCtx : EvaluationContext ,
2727 inBackground : Boolean ,
28- var factory : NodeEntityFactory ? = null
28+ var factory : NodeEntityFactory ? = null ,
2929) : Cancellable {
30-
3130 var focusTargetIndex: Int = - 1
3231 private var stopLoading: Boolean = false
3332
@@ -57,11 +56,15 @@ class EntityLoaderHelper(
5756 */
5857 fun loadEntities (
5958 nodeset : TreeReference ,
60- progressListener : EntityLoadingProgressListener
59+ progressListener : EntityLoadingProgressListener ,
6160 ): Pair <List <Entity <TreeReference >>, List<TreeReference>>? {
6261 if (! isAsyncNodeEntityFactory()) {
6362 // if we are into synchronous mode, cancel background cache work for now to not lock the user db
64- CommCareApplication .instance().currentApp.primeEntityCacheHelper.cancelWork()
63+ CommCareApplication
64+ .instance()
65+ .currentApp
66+ .primeEntityCacheHelper
67+ .cancelWork()
6568 }
6669 try {
6770 val references = factory!! .expandReferenceList(nodeset)
@@ -80,9 +83,7 @@ class EntityLoaderHelper(
8083 return null
8184 }
8285
83- fun isAsyncNodeEntityFactory (): Boolean {
84- return factory is AsyncNodeEntityFactory
85- }
86+ fun isAsyncNodeEntityFactory (): Boolean = factory is AsyncNodeEntityFactory
8687
8788 /* *
8889 * Primes the entity cache
@@ -103,7 +104,7 @@ class EntityLoaderHelper(
103104 */
104105 private fun loadEntitiesWithReferences (
105106 references : List <TreeReference >,
106- progressListener : EntityLoadingProgressListener ?
107+ progressListener : EntityLoadingProgressListener ? ,
107108 ): MutableList <Entity <TreeReference >>? {
108109 val entities: MutableList <Entity <TreeReference >> = ArrayList ()
109110 focusTargetIndex = - 1
@@ -115,7 +116,7 @@ class EntityLoaderHelper(
115116 progressListener?.publishEntityLoadingProgress(
116117 EntityLoadingProgressListener .EntityLoadingProgressPhase .PHASE_PROCESSING ,
117118 index,
118- references.size
119+ references.size,
119120 )
120121 val e = factory!! .getEntity(ref)
121122 if (e != null ) {
0 commit comments