Merge pull request #3731 from dhis2/release/3.0.1

Release/3.0.1 -> Main

.github/workflows/continuous-delivery.yml

@@ -11,6 +11,11 @@ on:
       - main
       - develop
       - release/*
+  pull_request:
+    branches:
+      - main
+      - develop
+      - release/*
 
 jobs:
   deployment_job:

.github/workflows/deploy-release.yml

@@ -65,8 +65,9 @@ jobs:
         serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
         packageName: com.dhis2
         releaseFiles: ${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk
-        track: alpha
+        track: production
         whatsNewDirectory: whatsnew
+        userFraction: 0.99
 
 
     - name: Github Patch Release

RELEASE.md

@@ -1,19 +1,89 @@
-# Release notes - Android App for DHIS2 - 3.0.0.2
+# Release notes - Android App for DHIS2 - 3.0.1
 
 ### Bug
 
-[ANDROAPP-5869](https://dhis2.atlassian.net/browse/ANDROAPP-5869) IllegalArgumentException: Key "" was already used. If you are using LazyColumn/Row please make sure you provide a unique ke...
+[ANDROAPP-5753](https://dhis2.atlassian.net/browse/ANDROAPP-5753) Formatting Issues with Attribute Values on TEI Card Dashboard
 
-[ANDROAPP-6093](https://dhis2.atlassian.net/browse/ANDROAPP-6093) App crash when a catCombo is override
+[ANDROAPP-5808](https://dhis2.atlassian.net/browse/ANDROAPP-5808) GS1 QR code input does not display popup if Scanned QR code is not GS1 type
 
-[ANDROAPP-6104](https://dhis2.atlassian.net/browse/ANDROAPP-6104) Future date can be entered in Date of birth search field
+[ANDROAPP-5873](https://dhis2.atlassian.net/browse/ANDROAPP-5873) Thread lock when app is unable to download reserved values
 
-[ANDROAPP-6124](https://dhis2.atlassian.net/browse/ANDROAPP-6124) Phone number input value type lacks of support for international symbols like \+, \(, \)
+[ANDROAPP-5953](https://dhis2.atlassian.net/browse/ANDROAPP-5953) Option set not working well in data set if the code of option constains character "\_"
+
+[ANDROAPP-6051](https://dhis2.atlassian.net/browse/ANDROAPP-6051) No feedback is received after the database import is complete
+
+[ANDROAPP-6057](https://dhis2.atlassian.net/browse/ANDROAPP-6057) Form scrolling improvement to prevent overlap with save button
+
+[ANDROAPP-6088](https://dhis2.atlassian.net/browse/ANDROAPP-6088) Turning off a working list does not scroll user back to top of screen
+
+[ANDROAPP-6094](https://dhis2.atlassian.net/browse/ANDROAPP-6094) Data set duplicates records in unavailable capture OUs
+
+[ANDROAPP-6101](https://dhis2.atlassian.net/browse/ANDROAPP-6101) User is allowed to save errors when the event is with status "complete"
+
+[ANDROAPP-6116](https://dhis2.atlassian.net/browse/ANDROAPP-6116) App doesn't respect program specification constraints when displaying the list of available relationship types
+
+[ANDROAPP-6131](https://dhis2.atlassian.net/browse/ANDROAPP-6131) Event program displays no events created message on intial load
+
+[ANDROAPP-6132](https://dhis2.atlassian.net/browse/ANDROAPP-6132) Double tap on event/enrollment creation could generate duplicates
+
+[ANDROAPP-6137](https://dhis2.atlassian.net/browse/ANDROAPP-6137) Category Combo section shows incorrect number of fields
+
+[ANDROAPP-6146](https://dhis2.atlassian.net/browse/ANDROAPP-6146) Incomplete "Download" label when exporting a DB
+
+[ANDROAPP-6158](https://dhis2.atlassian.net/browse/ANDROAPP-6158) Data set - Sections without DE's never stops displaying the loading icon
+
+[ANDROAPP-6174](https://dhis2.atlassian.net/browse/ANDROAPP-6174) When same day \(eg. 20 June\) is chosen for a future month, the scheduled date always shows "Today"
+
+[ANDROAPP-6181](https://dhis2.atlassian.net/browse/ANDROAPP-6181) ConcurrentModificationException
+
+[ANDROAPP-6182](https://dhis2.atlassian.net/browse/ANDROAPP-6182) \(RuntimeException\) Crash when rotating device in schedule screen
+
+[ANDROAPP-6183](https://dhis2.atlassian.net/browse/ANDROAPP-6183) \(UnsupportedOperationException\) crash when opening a map
+
+[ANDROAPP-6184](https://dhis2.atlassian.net/browse/ANDROAPP-6184) \(RuntimeException\) crash when rotating device in settings activity
+
+[ANDROAPP-6185](https://dhis2.atlassian.net/browse/ANDROAPP-6185) Event report date is not updated when changing the due date \(keeping the overdue status\)
+
+[ANDROAPP-6187](https://dhis2.atlassian.net/browse/ANDROAPP-6187) Form is not refreshed when changing from closed org unit to open one
+
+[ANDROAPP-6193](https://dhis2.atlassian.net/browse/ANDROAPP-6193) App asks device location permission after granting location permission
+
+[ANDROAPP-6197](https://dhis2.atlassian.net/browse/ANDROAPP-6197) Incorrect header in TEI Dashboard card
+
+[ANDROAPP-6198](https://dhis2.atlassian.net/browse/ANDROAPP-6198) Android adding '.0' to Data Element causing sync error
+
+[ANDROAPP-6209](https://dhis2.atlassian.net/browse/ANDROAPP-6209) NaN displayed in program indicators
+
+[ANDROAPP-6212](https://dhis2.atlassian.net/browse/ANDROAPP-6212) Cannot share database due to device permissions
 
 [ANDROAPP-6225](https://dhis2.atlassian.net/browse/ANDROAPP-6225) RuntimeException: Unable to start activity ComponentInfo\{com.dhis2/org.dhis2.usescases.searchTrackEntity.SearchTEAc...
 
-[ANDROAPP-6271](https://dhis2.atlassian.net/browse/ANDROAPP-6271) IllegalArgumentException: The provided start date year \(2026\) is out of the years range of 2024..2024.
+[ANDROAPP-6272](https://dhis2.atlassian.net/browse/ANDROAPP-6272) ApplicationNotResponding: ANR for at least 5000 ms.
+
+[ANDROAPP-6273](https://dhis2.atlassian.net/browse/ANDROAPP-6273) ApplicationNotResponding: ANR for at least 5000 ms.
+
+[ANDROAPP-6277](https://dhis2.atlassian.net/browse/ANDROAPP-6277) Working lists aren't applied even when active
+
+[ANDROAPP-6315](https://dhis2.atlassian.net/browse/ANDROAPP-6315) Fix Mobile ui breaking changes in capture app
+
+[ANDROAPP-6318](https://dhis2.atlassian.net/browse/ANDROAPP-6318) Order of TEIs change when moving between landscape and portrait
+
+[ANDROAPP-6332](https://dhis2.atlassian.net/browse/ANDROAPP-6332) \[DEFECT\] Incorrect workflow of Org unit when creating event
+
+[ANDROAPP-6345](https://dhis2.atlassian.net/browse/ANDROAPP-6345) Keyboard malfunction after stock distribution
+
+[ANDROAPP-6346](https://dhis2.atlassian.net/browse/ANDROAPP-6346) \[ANR\]  jdk.internal.misc.Unsafe in park
+
+[ANDROAPP-6379](https://dhis2.atlassian.net/browse/ANDROAPP-6379) Time recorded when creating notes
+
+[ANDROAPP-6380](https://dhis2.atlassian.net/browse/ANDROAPP-6380) Keyboard navigation
+
+[ANDROAPP-6407](https://dhis2.atlassian.net/browse/ANDROAPP-6407) \[Defect\] Data entry not saving more than one value
+
+[ANDROAPP-6414](https://dhis2.atlassian.net/browse/ANDROAPP-6414) Clicking save, not now or sync several times
+
+[ANDROAPP-6415](https://dhis2.atlassian.net/browse/ANDROAPP-6415) Login error in landscape
 
-[ANDROAPP-6285](https://dhis2.atlassian.net/browse/ANDROAPP-6285) Maps - App crashes when navigating from home to maps but not from analytics to maps
+[ANDROAPP-6416](https://dhis2.atlassian.net/browse/ANDROAPP-6416) Percentage input is showing %  twice
 
-[ANDROAPP-6305](https://dhis2.atlassian.net/browse/ANDROAPP-6305) Value of a TEA of valuetype AGE/DATE is not fully validated \(it is possible to add wrong dates\), and it breaks the analytics.
+[ANDROAPP-6417](https://dhis2.atlassian.net/browse/ANDROAPP-6417) Cannot navigate to event details or sync event after navigating back from details 

app/src/androidTest/java/org/dhis2/common/mockwebserver/MockWebServerRobot.kt

@@ -20,6 +20,8 @@ class MockWebServerRobot(private val dhis2MockServer: Dhis2MockServer) {
         const val API_OLD_TRACKED_ENTITY_PATH = "/api/trackedEntityInstances/query?.*"
         const val API_OLD_TRACKED_ENTITY_RESPONSE =
             "mocks/teilist/old_tracked_entity_empty_response.json"
+        const val API_OLD_EVENTS_PATH = "/api/events?.*"
+        const val API_OLD_EVENTS_RESPONSE = "mocks/teilist/old_events_empty_response.json"
 
     }
 }

app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt

@@ -24,7 +24,6 @@ import org.dhis2.commons.idlingresource.SearchIdlingResourceSingleton
 import org.dhis2.commons.prefs.Preference
 import org.dhis2.form.ui.idling.FormCountingIdlingResource
 import org.dhis2.usescases.eventsWithoutRegistration.EventIdlingResourceSingleton
-import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.ui.EventDetailIdlingResourceSingleton
 import org.dhis2.usescases.programEventDetail.eventList.EventListIdlingResourceSingleton
 import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.TeiDataIdlingResourceSingleton
 import org.junit.After
@@ -87,7 +86,6 @@ open class BaseTest {
             SearchIdlingResourceSingleton.countingIdlingResource,
             TeiDataIdlingResourceSingleton.countingIdlingResource,
             EventIdlingResourceSingleton.countingIdlingResource,
-            EventDetailIdlingResourceSingleton.countingIdlingResource,
         )
     }
 
@@ -100,7 +98,6 @@ open class BaseTest {
                 SearchIdlingResourceSingleton.countingIdlingResource,
                 TeiDataIdlingResourceSingleton.countingIdlingResource,
                 EventIdlingResourceSingleton.countingIdlingResource,
-                EventDetailIdlingResourceSingleton.countingIdlingResource,
             )
     }
 

app/src/androidTest/java/org/dhis2/usescases/event/EventRegistrationRobot.kt

@@ -40,7 +40,7 @@ class EventRegistrationRobot : BaseRobot() {
     }
 
     private fun clickOnNextQR() {
-        onView(withId(R.id.next)).perform(click())
+        waitForView(withId(R.id.next)).perform(click())
     }
 
     fun clickOnAllQR(listQR: Int) {

app/src/androidTest/java/org/dhis2/usescases/event/EventTest.kt

@@ -122,7 +122,6 @@ class EventTest : BaseTest() {
         val atenatalCare = "lxAQ7Zs9VYR"
 
         prepareProgramAndLaunchActivity(atenatalCare)
-        disableRecyclerViewAnimations()
 
         programEventsRobot(composeTestRule) {
             clickOnAddEvent()
@@ -175,14 +174,4 @@ class EventTest : BaseTest() {
             putExtra(ProgramEventDetailActivity.EXTRA_PROGRAM_UID, programUid)
         }.also { eventListRule.launch(it) }
     }
-
-    private fun disableRecyclerViewAnimations() {
-        eventListRule.getScenario().onActivity {
-            it.runOnUiThread {
-                it.supportFragmentManager.findFragmentByTag("EVENT_LIST").apply {
-                    (this as EventListFragment).binding.recycler.itemAnimator = null
-                }
-            }
-        }
-    }
 }

app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt

@@ -53,6 +53,7 @@ class SearchFlowTest : BaseTest() {
             )
         val filterCounter = "1"
         val filterTotalCount = "2"
+        enableComposeForms()
         prepareWomanProgrammeIntentAndLaunchActivity(rule)
 
         teiFlowRobot(composeTestRule) {

app/src/androidTest/java/org/dhis2/usescases/flow/syncFlow/SyncFlowTest.kt

@@ -70,7 +70,7 @@ class SyncFlowTest : BaseTest() {
             openNextSearchParameter("Last name")
             typeOnNextSearchTextParameter(teiLastName)
             clickOnSearch()
-            clickOnTEI(teiName, teiLastName)
+            clickOnTEI(teiLastName, composeTestRule)
         }
 
         teiDashboardRobot(composeTestRule) {