Index: packages/openchs-android/src/service/SyncService.js IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/packages/openchs-android/src/service/SyncService.js b/packages/openchs-android/src/service/SyncService.js --- a/packages/openchs-android/src/service/SyncService.js (revision 2b63460bf3809f457df512839332b9daa5beba29) +++ b/packages/openchs-android/src/service/SyncService.js (date 1734947370975) @@ -169,7 +169,9 @@ async getSyncDetails() { const url = this.getService(SettingsService).getSettings().serverURL; const requestParams = `includeUserSubjectType=true&deviceId=${this.deviceId}`; - const entitySyncStatuses = this.entitySyncStatusService.findAll().map(_.identity); + const entitySyncStatuses = this.entitySyncStatusService.findAll() + .map(_.identity) + .filter(eas => !_.includes(['AddressLevel', 'LocationHierarchy', 'LocationMapping'], eas.entityName)); return post(`${url}/v2/syncDetails?${requestParams}`, entitySyncStatuses, true) .then(res => res.json()) .then(({syncDetails, nowMinus10Seconds, now}) => ({ Index: packages/openchs-android/src/service/rest/ConventionalRestClient.js IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/packages/openchs-android/src/service/rest/ConventionalRestClient.js b/packages/openchs-android/src/service/rest/ConventionalRestClient.js --- a/packages/openchs-android/src/service/rest/ConventionalRestClient.js (revision 2b63460bf3809f457df512839332b9daa5beba29) +++ b/packages/openchs-android/src/service/rest/ConventionalRestClient.js (date 1734947370965) @@ -2,6 +2,7 @@ import _ from "lodash"; import moment from "moment"; import ChainedRequests from "../../framework/http/ChainedRequests"; +import {EntitySyncStatus} from 'openchs-models'; class ConventionalRestClient { constructor(settingsService, privilegeService) { @@ -60,7 +61,9 @@ ] .filter(p => !_.isEmpty(p)) .join("/"); - const {loadedSince, entityTypeUuid} = entityMetadata.syncStatus; + let {loadedSince, entityTypeUuid} = entityMetadata.syncStatus; + const isNeverSynced = _.includes(['addressLevel', 'locationHierarchy', 'locationMapping'], entityMetadata.resourceName) && loadedSince > new Date('2024-12-06'); + loadedSince = isNeverSynced ? EntitySyncStatus.REALLY_OLD_DATE : new Date(loadedSince); const {privilegeParam, apiQueryParams, apiQueryParamKey} = entityMetadata; const apiQueryParamsHolder = {} if (privilegeParam) {