Merge pull request #2732 from dimagi/asyncEntityRefactor

Moves Async entity Implementation to Core
dimagi · Apr 10, 2024 · 4637f56 · 4637f56
2 parents a79691b + d54fe91
commit 4637f56
Show file tree

Hide file tree

Showing 16 changed files with 162 additions and 581 deletions.
diff --git a/app/src/org/commcare/CommCareApplication.java b/app/src/org/commcare/CommCareApplication.java
@@ -73,7 +73,7 @@
 import org.commcare.models.database.MigrationException;
 import org.commcare.models.database.SqlStorage;
 import org.commcare.models.database.global.DatabaseGlobalOpenHelper;
-import org.commcare.models.database.user.models.EntityStorageCache;
+import org.commcare.models.database.user.models.CommCareEntityStorageCache;
 import org.commcare.models.legacy.LegacyInstallUtils;
 import org.commcare.modern.database.Table;
 import org.commcare.modern.session.SessionWrapper;
@@ -780,8 +780,8 @@ public void onServiceConnected(ComponentName className, IBinder service) {
                             PurgeStaleArchivedFormsTask.launchPurgeTask();
                         }
 
-                        if (EntityStorageCache.getEntityCacheWipedPref(user.getUniqueId()) < ReportingUtils.getAppVersion()) {
-                            EntityStorageCache.wipeCacheForCurrentApp();
+                        if (CommCareEntityStorageCache.getEntityCacheWipedPref(user.getUniqueId()) < ReportingUtils.getAppVersion()) {
+                            CommCareEntityStorageCache.wipeCacheForCurrentApp();
                         }
 
                         purgeLogs();

diff --git a/app/src/org/commcare/adapters/EntityListAdapter.java b/app/src/org/commcare/adapters/EntityListAdapter.java
@@ -1,5 +1,7 @@
 package org.commcare.adapters;
 
+import static org.commcare.cases.util.StringUtils.normalize;
+
 import android.database.DataSetObserver;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,7 +22,6 @@
 import org.commcare.suite.model.Detail;
 import org.commcare.utils.AndroidUtil;
 import org.commcare.utils.CachingAsyncImageLoader;
-import org.commcare.utils.StringUtils;
 import org.commcare.views.EntityActionViewUtils;
 import org.commcare.views.EntityView;
 import org.commcare.views.EntityViewTile;
@@ -311,7 +312,7 @@ public synchronized void filterByString(String filterRaw) {
         // split by whitespace
         String[] searchTerms = filterRaw.split("\\s+");
         for (int i = 0; i < searchTerms.length; ++i) {
-            searchTerms[i] = StringUtils.normalize(searchTerms[i]);
+            searchTerms[i] = normalize(searchTerms[i]);
         }
         currentSearchTerms = searchTerms;
         searchQuery = filterRaw;

diff --git a/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java b/app/src/org/commcare/interfaces/AndroidSortableEntityAdapter.java
@@ -1,10 +1,10 @@
 package org.commcare.interfaces;
 
 import org.commcare.CommCareApplication;
+import org.commcare.cases.entity.AsyncNodeEntityFactory;
 import org.commcare.cases.entity.Entity;
 import org.commcare.cases.entity.NodeEntityFactory;
 import org.commcare.cases.entity.SortableEntityAdapter;
-import org.commcare.models.AsyncNodeEntityFactory;
 import org.commcare.suite.model.Detail;
 import org.commcare.views.notifications.NotificationMessageFactory;
 import org.javarosa.core.model.instance.TreeReference;

diff --git a/app/src/org/commcare/models/AsyncEntity.java b/app/src/org/commcare/models/AsyncEntity.java