Simprints · alex-vt · Jan 8, 2026 · Jan 8, 2026 · Jan 9, 2026 · Jan 9, 2026
diff --git a/.editorconfig b/.editorconfig
@@ -6,3 +6,4 @@ ktlint_standard_no-wildcard-imports = enabled
 ktlint_standard_trailing-comma-on-call-site = enabled
 ktlint_standard_trailing-comma-on-declaration-site = enabled
 ktlint_standard_import-ordering = enabled
+ktlint_experimental_no-unused-imports = enabled
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -19,8 +19,12 @@ updates:
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
       - dependency-name: "com.squareup.okhttp3:*"
       - dependency-name: "org.hisp.dhis.mobile:designsystem"
-      - dependency-name: "org.hisp.dhis:android-core"
+      - dependency-name: "org.hisp.dhis.rules:rule-engine-jvm"
+      - dependency-name: "org.hisp.dhis.lib.expression:expression-parser-jvm"
     groups:
+      dhis2-android-core:
+        patterns:
+          - "org.hisp.dhis:android-core"
       gradle-updates:
         patterns:
           - "*"                       # Group all Gradle updates into one PR

diff --git a/.github/workflows/build-release-candidate.yml b/.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
@@ -78,21 +78,21 @@ jobs:
 
     # Upload DhisRelease APK
     - name: Upload DhisRelease APK
-      uses: actions/upload-artifact@v6.0.0
+      uses: actions/upload-artifact@v7.0.0
       with:
         name: ${{ env.repository_name }} - DhisRelease APK
         path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk
 
     # Upload DhisPlayServicesRelease APK
     - name: Upload DhisPlayServicesRelease APK
-      uses: actions/upload-artifact@v6.0.0
+      uses: actions/upload-artifact@v7.0.0
       with:
         name: ${{ env.repository_name }} - DhisPlayServicesRelease APK
         path: ${{ env.main_project_module }}/build/outputs/apk/dhis2PlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk
 
       # Upload Training Release APK
     - name: Upload Training Release APK
-      uses: actions/upload-artifact@v6.0.0
+      uses: actions/upload-artifact@v7.0.0
       with:
         name: ${{ env.repository_name }} - Training Release APK
         path: ${{ env.main_project_module }}/build/outputs/apk/dhis2Training/release/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -42,20 +42,34 @@ jobs:
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
 
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@784a1a4a994315802b7d8e2084e116e783d157be
+        with:
+          fileName: 'debug.keystore'
+          encodedString: ${{ secrets.DEBUG_KEYSTORE_BASE64 }}
+
       # 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 }}
-
-      - name: Read version name from file
-        working-directory: ./gradle
-        id: read-version
-        run: echo "vName=$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')" >> "$GITHUB_OUTPUT"
+          DEBUG_KEYSTORE_ALIAS: ${{ secrets.DEBUG_KEYSTORE_ALIAS }}
+          DEBUG_KEY_PASS: ${{ secrets.DEBUG_KEY_PASS }}
+          DEBUG_KEYSTORE_PASSWORD: ${{ secrets.DEBUG_KEYSTORE_PASSWORD }}
+          DEBUG_KEYSTORE_PATH: ${{ steps.decode_keystore.outputs.filePath }}
+
+      - name: Locate built APK
+        id: apk-path
+        run: |
+          echo "Searching for APKs under ${{ env.main_project_module }}/build/outputs/apk"
+          find "${{ env.main_project_module }}/build/outputs/apk" -type f -name "*.apk"
+          APK_PATH=$(find "${{ env.main_project_module }}/build/outputs/apk" -type f -name "*.apk" -print -quit)
+          echo "apk_path=$APK_PATH" >> "$GITHUB_OUTPUT"
 
       # Upload Artifact Build
       - name: Upload Android artifacts
-        uses: actions/upload-artifact@v6.0.0
+        uses: actions/upload-artifact@v7.0.0
         with:
           name: ${{ env.repository_name }} - Android APK - ${{ steps.date.outputs.date }}
-          path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/debug/dhis2-v${{ steps.read-version.outputs.vName }}.apk
+          path: ${{ steps.apk-path.outputs.apk_path }}
diff --git a/.github/workflows/deploy-release.yml b/.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

diff --git a/.tx/config b/.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
@@ -105,4 +97,3 @@ source_lang  = en
 type         = ANDROID
 minimum_perc = 0
 resource_name = Sync
-
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -66,21 +66,26 @@ pipeline {
             }
         }
         stage('Unit tests') {
+            when {
+                expression {
+                    return !isSkipUnitTest()
+                }
+            }
             environment {
                 ANDROID_HOME = '/opt/android-sdk'
             }
             steps {
                 script {
                     echo 'Running unit tests'
-                    sh './gradlew testDebugUnitTest testDhis2DebugUnitTest --stacktrace --no-daemon'
+                    sh './gradlew --dependency-verification lenient testDebugUnitTest testDhis2DebugUnitTest testAndroidHostTest --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'
                 }
             }
         }
@@ -202,3 +207,9 @@ def isSkipSizeCheck() {
     def prDescription = env.CHANGE_DESCRIPTION ?: ""
     return (prTitle.contains("[skip size]") || prDescription.contains("[skip size]"))
 }
+
+def isSkipUnitTest() {
+    def prTitle = env.CHANGE_TITLE ?: ""
+    def prDescription = env.CHANGE_DESCRIPTION ?: ""
+    return (prTitle.contains("[skip unitTest]") || prDescription.contains("[skip unitTest]"))
+}
diff --git a/README.md b/README.md
@@ -1,10 +1,31 @@
-# README #
+# DHIS2 Android Capture App
 
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-capture-app&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-capture-app)
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=dhis2_dhis2-android-capture-app&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=dhis2_dhis2-android-capture-app)
 
-Check the [Wiki](https://github.com/dhis2/dhis2-android-capture-app/wiki) for information about how to build the project and its architecture **(WIP)**
+## Introduction
 
-### What is this repository for? ###
+DHIS2 Android Capture App is a mobile application that allows offline data collection for DHIS2. It enables health workers and data collectors to access and update DHIS2 data from their mobile devices without requiring constant internet connectivity.
 
-DHIS2 Android application.
+Main features:
+
+- **Offline-first data capture**. Enter data for events, tracked entities, and data sets without an internet connection. Data is stored locally and synchronized when connectivity is available.
+- **Complete DHIS2 workflows**. Support for Tracker programs, Event programs, and Data Sets with validation rules, program rules, and indicators.
+- **Native mobile experience**. Built with modern Android technologies to provide a fast, intuitive, and reliable user experience.
+- **Synchronized with DHIS2**. Seamlessly integrates with DHIS2 server instances, ensuring data consistency and compatibility across DHIS2 versions.
+
+## Documentation
+
+Implementation guidance and user documentation can be found in the [Android Implementation Guide](https://docs.dhis2.org/en/implement/android-implementation/executive-summary.html) in DHIS2 documentation.
+
+Developer-oriented documentation and architecture details can be found in [AGENTS.md](AGENTS.md).
+
+## Getting Started
+
+This app is built using the [DHIS2 Android SDK](https://github.com/dhis2/dhis2-android-sdk) and the [DHIS2 Mobile UI library](https://developers.dhis2.org/docs/mobile/mobile-ui/overview). To get started with development, check the [AGENTS.md](AGENTS.md) file for comprehensive development guidelines, architecture patterns, and best practices.
+
+## Community
+
+Community support can be found in the [DHIS2 Community portal](https://community.dhis2.org/c/implementation/mobile). Any feedback on the app will be highly appreciated.
+
+To report bugs or request new features, visit the [DHIS2 Jira project](https://jira.dhis2.org/projects/ANDROAPP/issues).
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,75 +1,58 @@
-# Release notes - Android App for DHIS2 - 3.3.1
+# Release notes - Android App for DHIS2 - 3.4.0
 
-### Bug
+### NEW FUNCTIONALITY AND WEB PARITY
 
-[ANDROAPP-6870](https://dhis2.atlassian.net/browse/ANDROAPP-6870) Let the rule-engine apply the logic for useCodeForOptionSet in RuleVariable
+#### Tracked Entity Search Performance Configuration:
+This feature enables the configuration of the search operators for the different Tracked Entity Attributes to improve search performance.
 
-[ANDROAPP-6975](https://dhis2.atlassian.net/browse/ANDROAPP-6975) Crash when rotating the device with the save dialog open
+Tracked entity attributes can now define a preferred default search operator. This configuration is set in the Maintenance app and interpreted by the Capture Web and  Android applications, third party clients can also use the recommended operator when performing searches. Specific operators can also be restricted to protect system performance.
 
-[ANDROAPP-7211](https://dhis2.atlassian.net/browse/ANDROAPP-7211) NoSuchElementException: Collection contains no element matching the predicate.
+Sensible defaults are automatically applied to guide efficient queries. The LIKE operator—commonly associated with slow performance—is no longer selected by default; instead, EQUALS or other more efficient operators are pre-selected
 
-[ANDROAPP-7235](https://dhis2.atlassian.net/browse/ANDROAPP-7235) Program rules not triggered when moving between fields manually
+To further optimize tracked entity instance (TEI) searches, this feature adds support for specifying a minimum number of characters required for searching and for enabling trigram indexing.
 
-[ANDROAPP-7260](https://dhis2.atlassian.net/browse/ANDROAPP-7260) Incorrect behavior when creating a new event in timeline view
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-128) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/43-search-performance-operators-combo.png)
 
-[ANDROAPP-7261](https://dhis2.atlassian.net/browse/ANDROAPP-7261) Keyboard blocks the last field when entering data \(screen doesn’t scroll\)
 
-[ANDROAPP-7269](https://dhis2.atlassian.net/browse/ANDROAPP-7269) Crash on search
+#### DHIS2 Custom Theme:
+DHIS2 version 43 now supports changing the theme color of your DHIS2 instance. This is done via the theme color setting under the Appearance tab in the Settings app. The color picker has a curated set of preset colors to choose from, or the user can enter a specific RGB value. The selected color is applied consistently across the headerbar on the entire instance, as well as on the Android app. A contrast algorithm automatically adjusts the text and icon color to maintain legibility against the selected background. Removing the color reverts the instance to the default blue color. The android style setting is restricted to v42 and below.
 
-[ANDROAPP-7293](https://dhis2.atlassian.net/browse/ANDROAPP-7293) Bottom sheet landscape behavior
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-622) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/43-custom-color-combo-new.png)
 
-[ANDROAPP-7345](https://dhis2.atlassian.net/browse/ANDROAPP-7345) Changes to enrollment date not respected by program rules \(version 3.2.1.2\)
+#### Markdown and legend support  in Android Feedback Widget:
+Feedback messages generated through display text and key-value pair actions can now include formatted text using Markdown, enabling the display of structured content such as titles, lists, and emphasized text.
 
-[ANDROAPP-7368](https://dhis2.atlassian.net/browse/ANDROAPP-7368) crash: when trying to update fields in Tracker
+In addition, support for legend-based styling has been introduced, allowing feedback values to be visually highlighted based on predefined legend sets. This enables dynamic color-coding of key values, helping users quickly interpret results and identify important conditions.
 
-[ANDROAPP-7394](https://dhis2.atlassian.net/browse/ANDROAPP-7394) Login blocked after logout “The user is already logged in” error
+[Jira]() | [Feature card]()
 
-[ANDROAPP-7400](https://dhis2.atlassian.net/browse/ANDROAPP-7400) Crash - changing org unit and dates
+#### Program rule priority for Actions:
+Each program rule action can define an optional priority value. During rule evaluation, actions are first grouped based on their parent program rule, and then ordered by the611ir assigned priority. Actions with lower priority values are processed first, while actions without a defined priority are placed at the end.
 
-[ANDROAPP-7402](https://dhis2.atlassian.net/browse/ANDROAPP-7402) Bottom sheet org unit not displaying buttons
+This allows multiple related actions to be managed within a single program rule while still maintaining a clear and predictable execution order.
 
-[ANDROAPP-7403](https://dhis2.atlassian.net/browse/ANDROAPP-7403) Home cards lose proper layout
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-625) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/43-action-priority.png)
 
-[ANDROAPP-7411](https://dhis2.atlassian.net/browse/ANDROAPP-7411) Android sync by working lists: After updating predefined list views settings, changes aren't reflected in android app after syncing
 
-[ANDROAPP-7415](https://dhis2.atlassian.net/browse/ANDROAPP-7415) Android: WORKING LIST incorrect result in app
+### USER EXPERIENCE
 
-[ANDROAPP-7419](https://dhis2.atlassian.net/browse/ANDROAPP-7419) Server selection title is missing
+#### Android Log In process improvements:
+The new PIN design provides a more modern and consistent user experience during setup. This change is part of the broader work to improve authentication related screens and prepare the foundation for future enhancements
 
-[ANDROAPP-7421](https://dhis2.atlassian.net/browse/ANDROAPP-7421) Data set table not opening after clicking next for default category combo
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-618) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/Android-3-4-PIN-redesign-new.png)
 
-[ANDROAPP-7425](https://dhis2.atlassian.net/browse/ANDROAPP-7425) NullPointerException: ProgramFragment
+### PERFORMANCE & MAINTENANCE
 
-[ANDROAPP-7428](https://dhis2.atlassian.net/browse/ANDROAPP-7428) LMIS program is using completed enrollment
+#### Android Metadata Sync Improvements
+Metadata synchronization has been enhanced with more frequency options. In addition to existing intervals, automatic metadata sync can now run every 6 or 12 hours, allowing for more timely updates and better alignment with data sync behavior.
 
-[ANDROAPP-7442](https://dhis2.atlassian.net/browse/ANDROAPP-7442) Program rules not triggering for completed enrollments
+As part of the improvements, the app also performs a daily background check to detect any changes in the configuration when the sync is set to "Manual". If a change is detected from manual to an automatic sync frequency, an immediate metadata sync is triggered and the corresponding schedule is applied.
 
-### Task
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-617) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/Android-3-4-new-sync-periods-new.png)
 
-[ANDROAPP-7286](https://dhis2.atlassian.net/browse/ANDROAPP-7286) Replace deprecated categoryComboUid usages with categoryCombo in Program and DataElement
+#### Improved Event ordering  for consistent sync and calculations:
+With this update, event ordering has been aligned across Web, Android, and API sources, allowing events to be processed in the correct sequence during synchronization and improving overall data consistency and reliability.
 
-[ANDROAPP-7288](https://dhis2.atlassian.net/browse/ANDROAPP-7288) Implement UseCase interface
+[Jira](https://dhis2.atlassian.net/browse/ROADMAP-619) | [Feature card](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/releases/screenshots/43/feature-cards/43-stock-management-lmis.png)
 
-[ANDROAPP-7318](https://dhis2.atlassian.net/browse/ANDROAPP-7318) Create AGENTS.md file
 
-[ANDROAPP-7349](https://dhis2.atlassian.net/browse/ANDROAPP-7349) Sonarcloud - Use full commit SHA hash for this dependency.
-
-[ANDROAPP-7373](https://dhis2.atlassian.net/browse/ANDROAPP-7373) LogoutUser use case improvements
-
-[ANDROAPP-7384](https://dhis2.atlassian.net/browse/ANDROAPP-7384) Update transifex tracker configuration
-
-[ANDROAPP-7386](https://dhis2.atlassian.net/browse/ANDROAPP-7386) QA: Remove duplicated UI modules
-
-[ANDROAPP-7388](https://dhis2.atlassian.net/browse/ANDROAPP-7388) Create sync module
-
-[ANDROAPP-7395](https://dhis2.atlassian.net/browse/ANDROAPP-7395) Review settings repository data loading for log out request
-
-[ANDROAPP-7396](https://dhis2.atlassian.net/browse/ANDROAPP-7396) Remove and update usage to design systems' deprecated methods
-
-[ANDROAPP-7424](https://dhis2.atlassian.net/browse/ANDROAPP-7424) Gradle warnings: Remove RX binding dependency and zxing dependency
-
-[ANDROAPP-7426](https://dhis2.atlassian.net/browse/ANDROAPP-7426) Upload proguard mapping on Sentry
-
-[ANDROAPP-7440](https://dhis2.atlassian.net/browse/ANDROAPP-7440) Update Expression parser to 1.2.2
-
-[ANDROAPP-7441](https://dhis2.atlassian.net/browse/ANDROAPP-7441) Remove username from Sentry reports