Merge branch 'develop' into release/3.3.1

Author: xavimolloy

.github/workflows/build-release-candidate.yml

@@ -45,7 +45,7 @@ jobs:
         encodedString: ${{ secrets.KEYSTORE }}
 
     - name: Build Release APKs
-      run: ./gradlew app:assembleDhis2Release app:assembleDhis2PlayServicesRelease
+      run: ./gradlew --dependency-verification lenient app:assembleDhis2Release app:assembleDhis2PlayServicesRelease
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -69,7 +69,7 @@ jobs:
         TRAINING_KEY_PASSWORD: ${{ secrets.TRAINING_KEY_PASSWORD }}
         TRAINING_STORE_PASSWORD: ${{ secrets.TRAINING_STORE_PASSWORD }}
         TRAINING_STORE_FILE: ${{ steps.decode_training_keystore.outputs.filePath }}
-      run: ./gradlew app:assembleDhis2TrainingRelease
+      run: ./gradlew --dependency-verification lenient app:assembleDhis2TrainingRelease
 
     - name: Read version name from file
       working-directory: ./gradle

.github/workflows/continuous-delivery.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Create APK Debug
       - name: Build apk debug project (APK) - ${{ env.main_project_module }} module
-        run: ./gradlew assembleDhis2Debug
+        run: ./gradlew --dependency-verification lenient assembleDhis2Debug
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 

.github/workflows/deploy-release.yml

@@ -49,7 +49,7 @@ jobs:
         encodedString: ${{ secrets.KEYSTORE }}
 
     - name: Build Release APKs
-      run: ./gradlew app:assembleDhis2Release app:assembleDhis2PlayServicesRelease
+      run: ./gradlew --dependency-verification lenient app:assembleDhis2Release app:assembleDhis2PlayServicesRelease
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -73,7 +73,7 @@ jobs:
         TRAINING_KEY_PASSWORD: ${{ secrets.TRAINING_KEY_PASSWORD }}
         TRAINING_STORE_PASSWORD: ${{ secrets.TRAINING_STORE_PASSWORD }}
         TRAINING_STORE_FILE: ${{ steps.decode_training_keystore.outputs.filePath }}
-      run: ./gradlew app:assembleDhis2TrainingRelease
+      run: ./gradlew --dependency-verification lenient app:assembleDhis2TrainingRelease
 
     - name: Read version name from file
       working-directory: ./gradle

.tx/config

@@ -50,14 +50,6 @@ type         = ANDROID
 minimum_perc = 0
 resource_name = Main App
 
-[o:hisp-uio:p:dhis2-android-capture-app:r:ui-strings-xml]
-file_filter  = ui-components/src/main/res/values-<lang>/strings.xml
-source_file  = ui-components/src/main/res/values/strings.xml
-source_lang  = en
-type         = ANDROID
-minimum_perc = 0
-resource_name = UI Components
-
 [o:hisp-uio:p:dhis2-android-capture-app:r:table-strings-xml]
 file_filter  = compose-table/src/main/res/values-<lang>/strings.xml
 source_file  = compose-table/src/main/res/values/strings.xml

Jenkinsfile

@@ -72,15 +72,15 @@ pipeline {
             steps {
                 script {
                     echo 'Running unit tests'
-                    sh './gradlew testDebugUnitTest testDhis2DebugUnitTest --stacktrace --no-daemon'
+                    sh './gradlew --dependency-verification lenient testDebugUnitTest testDhis2DebugUnitTest --stacktrace --no-daemon'
                 }
             }
         }
         stage('Build Test APKs') {
             steps {
                 script {
                     echo 'Building UI APKs'
-                    sh './gradlew :app:assembleDhis2Debug :app:assembleDhis2DebugAndroidTest :form:assembleAndroidTest'
+                    sh './gradlew --dependency-verification lenient :app:assembleDhis2Debug :app:assembleDhis2DebugAndroidTest :form:assembleAndroidTest'
                 }
             }
         }

app/src/androidTest/java/org/dhis2/usescases/datasets/DataSetTest.kt

@@ -307,6 +307,7 @@ class DataSetTest : BaseTest() {
         val cellId = "PGRlPlhOcmpYcVpySEQ4Ojxjb2M+SGxsdlg1MGNYQzA="
         val threeDaysFromNowStr = threeDaysFromNow.format(formatter)
         val fiveDaysAgoStr = fiveDaysAgo.format(formatter)
+
         enterDataSetStep(
             uid = dataSetUid,
             name = dataSetName,
@@ -318,10 +319,7 @@ class DataSetTest : BaseTest() {
         )
 
         checkTableIsNotEditable()
-        dataSetTableRobot(composeTestRule) {
-            tapOnSaveButton()
-        }
-        composeTestRule.waitForIdle()
+
         createDailyPeriodDataSetInstanceStep(
             date = threeDaysFromNowStr,
             orgUnit = orgUnit,
@@ -387,8 +385,9 @@ class DataSetTest : BaseTest() {
         composeTestRule.onNodeWithTag("TABLE_SCROLLABLE_COLUMN").printToLog("TABLE_LOG")
         dataSetTableRobot(composeTestRule) {
             checkItemWithTextIsDisplayed("This data is not editable")
+            tapOnSaveButton()
+            composeTestRule.waitForIdle()
         }
-        composeTestRule.waitForIdle()
     }
 
     private suspend fun checkContentBoxesAreDisplayed() {

app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardTest.kt

@@ -339,23 +339,21 @@ class TeiDashboardTest : BaseTest() {
             clickOnTimelineEvents()
             clickOnMenuMoreOptions()
             clickOnMenuProgramEnrollments()
-        }
 
-        enrollmentRobot(composeTestRule) {
-            clickOnAProgramForEnrollment(composeTestRule, womanProgram)
-            clickOnAcceptInDatePicker()
+            enrollmentRobot(composeTestRule) {
+                clickOnAProgramForEnrollment(composeTestRule, womanProgram)
+                clickOnAcceptInDatePicker()
 
-            orgUnitSelectorRobot(composeTestRule) {
-                selectTreeOrgUnit(orgUnit)
-            }
+                orgUnitSelectorRobot(composeTestRule) {
+                    selectTreeOrgUnit(orgUnit)
+                }
 
-            waitUntilActivityVisible<EnrollmentActivity>()
-            openFormSection(personAttribute)
-            typeOnInputDateField("01012000", "Date of birth")
-            clickOnSaveEnrollment()
-        }
+                waitUntilActivityVisible<EnrollmentActivity>()
+                openFormSection(personAttribute)
+                typeOnInputDateField("01012000", "Date of birth")
+                clickOnSaveEnrollment()
+            }
 
-        teiDashboardRobot(composeTestRule) {
             waitToDebounce(1000)
             clickOnMenuMoreOptions()
             clickOnTimelineEvents()

app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/EnrollmentRobot.kt

@@ -40,9 +40,15 @@ fun enrollmentRobot(
 
 class EnrollmentRobot(val composeTestRule: ComposeTestRule) : BaseRobot() {
 
+    @OptIn(ExperimentalTestApi::class)
     fun clickOnAProgramForEnrollment(composeTestRule: ComposeTestRule, program: String) {
+        val testTag = PROGRAM_TO_ENROLL.format(program)
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithTag(PROGRAM_TO_ENROLL.format(program), useUnmergedTree = true)
+        composeTestRule.waitUntilAtLeastOneExists(
+            hasTestTag(testTag),
+            TIMEOUT
+        )
+        composeTestRule.onNodeWithTag(testTag, useUnmergedTree = true)
             .performClick()
         composeTestRule.waitForIdle()
     }

app/src/dhis2PlayServices/java/org/dhis2/usecases/main/domain/DownloadNewVersion.kt

@@ -0,0 +1,19 @@
+package org.dhis2.usescases.main.domain
+
+import org.dhis2.data.service.VersionRepository
+import org.dhis2.mobile.commons.domain.UseCase
+import org.dhis2.usescases.main.domain.model.DownloadMethod
+
+class DownloadNewVersion(
+    private val versionRepository: VersionRepository,
+) : UseCase<Unit, DownloadMethod> {
+    override suspend fun invoke(input: Unit): Result<DownloadMethod> =
+        try {
+            val url = versionRepository.getUrl()
+            url?.let {
+                Result.success(DownloadMethod.Url(it))
+            } ?: Result.failure(DomainError.UnexpectedError("No url provided"))
+        } catch (domainError: DomainError) {
+            Result.failure(domainError)
+        }
+}

app/src/main/java/org/dhis2/bindings/Bindings.java

@@ -5,11 +5,9 @@
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
-import android.os.Build;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.content.res.AppCompatResources;
@@ -168,13 +166,6 @@ public static void setImageBackground(ImageView imageView, Drawable drawable) {
 
     }
 
-    @BindingAdapter("versionVisibility")
-    public static void setVisibility(LinearLayout linearLayout, boolean check) {
-        if (check && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            linearLayout.setVisibility(View.GONE);
-        }
-    }
-
     @BindingAdapter("settingIcon")
     public static void setSettingIcon(ImageView view, int drawableReference) {
         Drawable drawable = AppCompatResources.getDrawable(view.getContext(), drawableReference);