Merge pull request #1515 from dhis2/master-dev

fix: [MASTER-DEV] Version 1.3.2

core/build.gradle

@@ -41,8 +41,8 @@ ext {
             buildToolsVersion: "29.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 29,
-            versionCode      : 231,
-            versionName      : "1.3.1"
+            versionCode      : 232,
+            versionName      : "1.3.2"
     ]
 
     libraries = [

core/gradle.properties

@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=1.3.1
-VERSION_CODE=231
+VERSION_NAME=1.3.2
+VERSION_CODE=232
 
 GROUP=org.hisp.dhis
 

core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryBuilderFactory.java

@@ -136,6 +136,9 @@ private List<TeiQuery.Builder> queryPerProgram(ProgramDataDownloadParams params,
         if (params.orgUnits().size() > 0) {
             ouMode = OrganisationUnitMode.SELECTED;
             orgUnits = params.orgUnits();
+        } else if (params.uids().size() > 0) {
+            ouMode = OrganisationUnitMode.ACCESSIBLE;
+            orgUnits = Collections.emptyList();
         } else if (hasLimitByOrgUnit) {
             ouMode = OrganisationUnitMode.SELECTED;
             orgUnits = getLinkedCaptureOrgUnitUids(programUid);
@@ -146,7 +149,7 @@ private List<TeiQuery.Builder> queryPerProgram(ProgramDataDownloadParams params,
 
         List<TeiQuery.Builder> builders = new ArrayList<>();
 
-        if (hasLimitByOrgUnit) {
+        if (hasLimitByOrgUnit && !orgUnits.isEmpty()) {
             for (String orgUnitUid : orgUnits) {
                 builders.add(getBuilderFor(lastUpdated, Collections.singletonList(orgUnitUid), ouMode, params, limit)
                         .program(programUid).programStatus(programStatus).programStartDate(programStartDate));
@@ -177,6 +180,9 @@ private List<TeiQuery.Builder> queryGlobal(ProgramDataDownloadParams params,
         if (params.orgUnits().size() > 0) {
             ouMode = OrganisationUnitMode.SELECTED;
             orgUnits = params.orgUnits();
+        } else if (params.uids().size() > 0) {
+            ouMode = OrganisationUnitMode.ACCESSIBLE;
+            orgUnits = Collections.emptyList();
         } else if (hasLimitByOrgUnit) {
             ouMode = OrganisationUnitMode.SELECTED;
             orgUnits = getCaptureOrgUnitUids();
@@ -187,7 +193,7 @@ private List<TeiQuery.Builder> queryGlobal(ProgramDataDownloadParams params,
 
         List<TeiQuery.Builder> builders = new ArrayList<>();
 
-        if (hasLimitByOrgUnit) {
+        if (hasLimitByOrgUnit && !orgUnits.isEmpty()) {
             for (String orgUnitUid : orgUnits) {
                 builders.add(getBuilderFor(lastUpdated, Collections.singletonList(orgUnitUid), ouMode, params, limit));
             }

core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.java

@@ -79,8 +79,9 @@ private List<TrackedEntityInstance> queryTrackedEntityInstances(TrackedEntityIns
         String assignedUserModeStr = query.assignedUserMode() == null ? null : query.assignedUserMode().toString();
         String enrollmentStatus = query.enrollmentStatus() == null ? null : query.enrollmentStatus().toString();
         String eventStatus = query.eventStatus() == null ? null : query.eventStatus().toString();
+        String orgUnits = query.orgUnits().isEmpty() ? null :
+                CollectionsHelper.joinCollectionWithSeparator(query.orgUnits(), ";");
 
-        String orgUnits = CollectionsHelper.joinCollectionWithSeparator(query.orgUnits(), ";");
         Call<SearchGrid> searchGridCall = service.query(orgUnits, orgUnitModeStr, query.program(),
                 query.formattedProgramStartDate(), query.formattedProgramEndDate(), enrollmentStatus,
                 query.formattedEventStartDate(), query.formattedEventEndDate(), eventStatus,

docs/content/developer/compatibility.md

@@ -17,3 +17,4 @@ Compatibility table between DHIS2 Android SDK library, DHIS2 core and Android SD
 | 1.2.1    | 2.29 -> 2.34     | 19 - 28     |
 | 1.3.0    | 2.29 -> 2.35     | 19 - 29     |
 | 1.3.1    | 2.29 -> 2.35     | 19 - 29     |
+| 1.3.2    | 2.29 -> 2.35     | 19 - 29     |

docs/content/developer/getting-started.md

@@ -10,7 +10,7 @@ Include dependency in build.gradle.
 
 ```gradle
 dependencies {
-    implementation "org.hisp.dhis:android-core:1.3.1"
+    implementation "org.hisp.dhis:android-core:1.3.2"
     ...
 }
 ```

docs/content/developer/known-issues.md

@@ -4,4 +4,8 @@
 
 ## Data set completion
 
-- In DHIS2 version 2.33.0 and 2.33.1, if a dataset is mark as uncompleted in the server, this value is not updated in the SDK. In those versions the API did not expose enough information to know if the status was complete or uncomplete.
+- In DHIS2 version 2.33.0 and 2.33.1, if a dataset is mark as uncompleted in the server, this value is not updated in the SDK. In those versions the API did not expose enough information to know if the status was complete or uncomplete.
+
+## Tracker relationships
+
+- In DHIS2 version 2.35.1, TEI relationships might fail to be downloaded at data sync. 

docs/dhis2_android_sdk_developer_guide_INDEX.md

@@ -3,11 +3,11 @@ title: 'DHIS 2 Android SDK Developer Guide'
 author: 'DHIS 2'
 date:
 year: 2021
-month: January
+month: March
 keywords: [DHIS2, Android]
 commit:
 version: master
-applicable_txt: 'Applicable to version 1.3.1'
+applicable_txt: 'Applicable to version 1.3.2'
 ---
 <!--DHIS2-SECTION-ID:index-->