[1.14.1] Version 1.14.1 (#2655)

Author: taridepaco

core/api/core.api

@@ -11791,18 +11791,21 @@ public final class org/hisp/dhis/android/core/user/openid/IntentWithRequestCode
 }
 
 public final class org/hisp/dhis/android/core/user/openid/OpenIDConnectConfig {
-	public fun <init> (Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Landroid/net/Uri;
 	public final fun component3 ()Landroid/net/Uri;
 	public final fun component4 ()Ljava/lang/String;
 	public final fun component5 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;
-	public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;
+	public final fun component6 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;
+	public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;Ljava/lang/String;Landroid/net/Uri;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/user/openid/OpenIDConnectConfig;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAuthorizationUri ()Ljava/lang/String;
 	public final fun getClientId ()Ljava/lang/String;
 	public final fun getDiscoveryUri ()Landroid/net/Uri;
+	public final fun getPrompt ()Ljava/lang/String;
 	public final fun getRedirectUri ()Landroid/net/Uri;
 	public final fun getTokenUrl ()Ljava/lang/String;
 	public fun hashCode ()I

core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetCollectionRepositoryMockIntegrationShould.kt

@@ -261,12 +261,12 @@ class DataSetCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTest
         val dataSetCapture = d2.dataSetModule().dataSets()
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
             .blockingGet()
-        assertThat(dataSetCapture.size).isEqualTo(3)
+        assertThat(dataSetCapture.size).isEqualTo(2)
 
         val dataSetSearch = d2.dataSetModule().dataSets()
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
             .blockingGet()
-        assertThat(dataSetSearch.size).isEqualTo(0)
+        assertThat(dataSetSearch.size).isEqualTo(3)
     }
 
     @Test

core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.kt

@@ -110,20 +110,20 @@ class OrganisationUnitCollectionRepositoryMockIntegrationShould : BaseMockIntegr
         val captureOrganisationUnits = d2.organisationUnitModule().organisationUnits()
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
             .blockingGet()
-        assertThat(captureOrganisationUnits.size).isEqualTo(3)
+        assertThat(captureOrganisationUnits.size).isEqualTo(1)
 
         val searchOrganisationUnits = d2.organisationUnitModule().organisationUnits()
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
             .blockingGet()
-        assertThat(searchOrganisationUnits.size).isEqualTo(0)
+        assertThat(searchOrganisationUnits.size).isEqualTo(3)
     }
 
     @Test
     fun filter_by_root_organisation_unit() {
         val rootOrganisationUnits = d2.organisationUnitModule().organisationUnits()
             .byRootOrganisationUnit(true)
             .blockingGet()
-        assertThat(rootOrganisationUnits.size).isEqualTo(1)
+        assertThat(rootOrganisationUnits.size).isEqualTo(2)
 
         val notRootOrganisationUnits = d2.organisationUnitModule().organisationUnits()
             .byRootOrganisationUnit(false)

core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramCollectionRepositoryMockIntegrationShould.kt

@@ -383,7 +383,7 @@ class ProgramCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTest
         val programSearch = d2.programModule().programs()
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
             .blockingGet()
-        assertThat(programSearch.size).isEqualTo(0)
+        assertThat(programSearch.size).isEqualTo(3)
     }
 
     @Test

core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParser.kt

@@ -36,19 +36,24 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
 internal object ServerUrlParser {
     @JvmStatic
-    @Suppress("ThrowsCount")
     @Throws(D2Error::class)
-    fun parse(url: String?): Url {
+    fun validate(url: String?) {
         when {
             url.isNullOrBlank() -> throw nullOrBlankUrlD2Error()
             !url.startsWith("http") -> throw malformedUrlD2Error()
-            else -> try {
-                val urlBuilder = URLBuilder(removeTrailingApi(url))
-                urlBuilder.encodedPathSegments += "api/"
-                return urlBuilder.build()
-            } catch (_: URLParserException) {
-                throw malformedUrlD2Error()
-            }
+        }
+    }
+
+    @JvmStatic
+    @Throws(D2Error::class)
+    fun parse(url: String?): Url {
+        validate(url)
+        return try {
+            val urlBuilder = URLBuilder(removeTrailingApi(url!!))
+            urlBuilder.encodedPathSegments += "api/"
+            urlBuilder.build()
+        } catch (_: URLParserException) {
+            throw malformedUrlD2Error()
         }
     }
 

core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.kt

@@ -541,7 +541,7 @@ class Dhis2MockServer(private val fileReader: IFileReader, port: Int) {
         private const val DATA_SET_COMPLETE_REGISTRATIONS_JSON =
             "dataset/data_set_complete_registrations.json"
         private const val DATA_APPROVALS_MULTIPLE_JSON = "dataapproval/data_approvals_multiple.json"
-        private const val ORGANISATION_UNITS_JSON = "organisationunit/organisation_units.json"
+        private const val ORGANISATION_UNITS_JSON = "organisationunit/search_organisation_units.json"
         private const val RESERVE_VALUES_JSON =
             "trackedentity/tracked_entity_attribute_reserved_values.json"
         private const val SMS_METADATA = "sms/metadata_ids.json"

core/src/main/java/org/hisp/dhis/android/core/server/internal/LoginConfigCall.kt

@@ -46,6 +46,12 @@ internal class LoginConfigCall(
     private val networkHandler: LoginConfigNetworkHandler,
 ) {
     suspend fun checkServerUrl(serverUrl: String): Result<LoginConfig, D2Error> {
+        try {
+            ServerUrlParser.validate(serverUrl)
+        } catch (d2Error: D2Error) {
+            return Result.Failure(d2Error)
+        }
+
         val sanitizedUrl = ServerUrlParser.trimAndRemoveTrailingSlash(serverUrl)!!
         val loginConfig = tryLoginConfig(sanitizedUrl)
 

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

@@ -31,56 +31,41 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
 import org.hisp.dhis.android.persistence.common.querybuilders.WhereClauseBuilder
 import org.hisp.dhis.android.persistence.enrollment.EnrollmentTableInfo
 import org.koin.core.annotation.Singleton
 
 @Singleton
 internal class TrackedEntityEnrollmentOrphanCleaner(
     private val enrollmentStore: EnrollmentStore,
-    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper,
 ) {
 
     suspend fun deleteOrphan(
         parent: TrackedEntityInstance?,
         children: Collection<Enrollment>?,
         program: String?,
     ): Boolean {
-        return if (parent != null && children != null) {
+        return if (parent != null && children != null && program != null) {
             val orphanEnrollmentsClause = WhereClauseBuilder().run {
                 appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, parent.uid())
                 appendNotInKeyStringValues(EnrollmentTableInfo.Columns.UID, children.map { it.uid() })
                 appendInKeyEnumValues(
                     EnrollmentTableInfo.Columns.SYNC_STATE,
                     listOf(State.SYNCED, State.SYNCED_VIA_SMS),
                 )
-                if (program != null) {
-                    appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, program)
-                }
+                appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, program)
                 build()
             }
 
             val orphanEnrollments = enrollmentStore.selectWhere(orphanEnrollmentsClause)
 
-            val deletedEnrollments = orphanEnrollments.filter { e -> isAccessibleByGlass(e, program) }
-
-            if (deletedEnrollments.isNotEmpty()) {
-                enrollmentStore.deleteByUid(deletedEnrollments)
+            if (orphanEnrollments.isNotEmpty()) {
+                enrollmentStore.deleteByUid(orphanEnrollments)
             }
 
-            deletedEnrollments.isNotEmpty()
+            orphanEnrollments.isNotEmpty()
         } else {
             false
         }
     }
-
-    private suspend fun isAccessibleByGlass(enrollment: Enrollment, program: String?): Boolean {
-        val isProtected = breakTheGlassHelper.isProtectedInSearchScope(
-            program = enrollment.program(),
-            organisationUnit = enrollment.organisationUnit(),
-        )
-
-        return !isProtected || enrollment.program() == program
-    }
 }

core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStore.kt

@@ -30,4 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 
-internal interface ProgramOwnerStore : ObjectWithoutUidStore<ProgramOwner>
+internal interface ProgramOwnerStore : ObjectWithoutUidStore<ProgramOwner> {
+    suspend fun selectForTeiProgram(tei: String, program: String): ProgramOwner?
+}

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

@@ -81,7 +81,7 @@ internal class TrackedEntityInstanceQueryDataFetcher(
             }
             if (result.size < requestedLoadSize && scope.mode() == RepositoryMode.OFFLINE_FIRST) {
                 val onlineInstances = queryOnline(requestedLoadSize)
-                result.addAll(onlineInstances)
+                result.addAll(onlineInstances.filter { it.succeeded })
             }
         } else {
             val instances = queryOnline(requestedLoadSize)