dhis2 · Balcan · Apr 4, 2025 · Mar 25, 2025 · Mar 25, 2025 · Mar 27, 2025
diff --git a/.github/workflows/build-release-candidate.yml b/.github/workflows/build-release-candidate.yml
@@ -44,7 +44,7 @@ jobs:
         fileName: 'dhis_keystore.jks'
         encodedString: ${{ secrets.KEYSTORE }}
     - name: build prod
-      run: ./gradlew app:assembleDhisRelease
+      run: ./gradlew app:assembleDhis2Release
          env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -62,4 +62,4 @@ jobs:
       uses: actions/upload-artifact@v4.6.1
       with:
         name: ${{ env.repository_name }} - Android APK
-        path: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk
+        path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk
diff --git a/.github/workflows/continuous-delivery.yml b/.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 assembleDhisDebug
+        run: ./gradlew assembleDhis2Debug
 
       - name: Read version name from file
         working-directory: ./gradle
@@ -56,4 +56,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.repository_name }} - Android APK - ${{ steps.date.outputs.date }}
-          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
+          path: ${{ env.main_project_module }}/build/outputs/apk/dhis2/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -45,7 +45,7 @@ jobs:
         fileName: 'dhis_keystore.jks'
         encodedString: ${{ secrets.KEYSTORE }}
     - name: Build release apk
-      run: ./gradlew app:assembleRelease app:assembleDhisDebug
+      run: ./gradlew app:assembleRelease app:assembleDhis2Debug
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -59,7 +59,7 @@ jobs:
       with:
         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
+        releaseFiles: ${{ env.main_project_module }}/build/outputs/apk/dhis2PlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk
         track: production
         status: inProgress
         whatsNewDirectory: whatsnew
@@ -74,4 +74,4 @@ jobs:
         bodyFile: "RELEASE.md"
         name: "Android Capture App for DHIS 2 (v${{ inputs.release_tag_name }})"
         tag: ${{ inputs.release_tag_name }}
-        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk,${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk,${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
+        artifacts: ${{ env.main_project_module }}/build/outputs/apk/dhis2/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk,${{ env.main_project_module }}/build/outputs/apk/dhis2PlayServices/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk,${{ env.main_project_module }}/build/outputs/apk/dhis2/debug/dhis2-v${{ steps.read-version.outputs.vName }}-training.apk
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -82,7 +82,7 @@ pipeline {
             steps {
                 script {
                     echo 'Building UI APKs'
-                    sh './gradlew :app:assembleDhisUITestingDebug :app:assembleDhisUITestingDebugAndroidTest :compose-table:assembleAndroidTest :form:assembleAndroidTest'
+                    sh './gradlew :app:assembleDhis2Debug :app:assembleDhis2DebugAndroidTest :form:assembleAndroidTest'
                 }
             }
         }
@@ -108,7 +108,7 @@ pipeline {
                 stage('Deploy and Run UI Tests') {
                     environment {
                         BROWSERSTACK = credentials('android-browserstack')
-                        app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhisUITesting -iname "*.apk"')
+                        app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhis2/debug -iname "*.apk"')
                         test_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/androidTest -iname "*.apk"')
                         app_apk_path = "${env.WORKSPACE}/${app_apk}"
                         test_apk_path = "${env.WORKSPACE}/${test_apk}"
@@ -132,7 +132,7 @@ pipeline {
                     }
                     environment {
                         BROWSERSTACK = credentials('android-browserstack')
-                        app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhisUITesting -iname "*.apk"')
+                        app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhis2/debug -iname "*.apk"')
                         test_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/androidTest -iname "*.apk"')
                         app_apk_path = "${env.WORKSPACE}/${app_apk}"
                         test_apk_path = "${env.WORKSPACE}/${test_apk}"

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,6 @@
+@file:Suppress("UnstableApiUsage")
+
 import com.android.build.api.variant.impl.VariantOutputImpl
-import com.android.build.gradle.internal.scope.ProjectInfo.Companion.getBaseName
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
@@ -157,26 +158,8 @@ android {
     flavorDimensions += listOf("default")
 
     productFlavors {
-        create("dhis") {
-            applicationId = "com.dhis2"
-            dimension = "default"
-            versionCode = libs.versions.vCode.get().toInt()
-            versionName = libs.versions.vName.get()
-        }
-
-        create("dhisPlayServices") {
-            applicationId = "com.dhis2"
-            dimension = "default"
-            versionCode = libs.versions.vCode.get().toInt()
-            versionName = libs.versions.vName.get()
-        }
-
-        create("dhisUITesting") {
-            applicationId = "com.dhis2"
-            dimension = "default"
-            versionCode = libs.versions.vCode.get().toInt()
-            versionName = libs.versions.vName.get()
-        }
+        create("dhis2")
+        create("dhis2PlayServices")
     }
 
     compileOptions {
@@ -286,8 +269,8 @@ dependencies {
 
     coreLibraryDesugaring(libs.desugar)
 
-    "dhisPlayServicesImplementation"(libs.google.auth)
-    "dhisPlayServicesImplementation"(libs.google.auth.apiphone)
+    "dhis2PlayServicesImplementation"(libs.google.auth)
+    "dhis2PlayServicesImplementation"(libs.google.auth.apiphone)
 
     kapt(libs.dagger.compiler)
     kapt(libs.dagger.hilt.android.compiler)

diff --git a/...isUITesting/assets/databases/dhis_test.db → ...androidTest/assets/databases/dhis_test.db b/...isUITesting/assets/databases/dhis_test.db → ...androidTest/assets/databases/dhis_test.db
diff --git a/...ks/dataset/ds_test_dataset_section_a.json → ...ks/dataset/ds_test_dataset_section_a.json b/...ks/dataset/ds_test_dataset_section_a.json → ...ks/dataset/ds_test_dataset_section_a.json
diff --git a/...ks/dataset/ds_test_dataset_section_b.json → ...ks/dataset/ds_test_dataset_section_b.json b/...ks/dataset/ds_test_dataset_section_b.json → ...ks/dataset/ds_test_dataset_section_b.json
diff --git a/...src/dhisUITesting/assets/mocks/other.json → app/src/androidTest/assets/mocks/other.json b/...src/dhisUITesting/assets/mocks/other.json → app/src/androidTest/assets/mocks/other.json
diff --git a/...s/settingswebapp/datasetsettings_404.json → ...s/settingswebapp/datasetsettings_404.json b/...s/settingswebapp/datasetsettings_404.json → ...s/settingswebapp/datasetsettings_404.json
diff --git a/...s/settingswebapp/generalsettings_404.json → ...s/settingswebapp/generalsettings_404.json b/...s/settingswebapp/generalsettings_404.json → ...s/settingswebapp/generalsettings_404.json
diff --git a/...ocks/settingswebapp/infosettings_404.json → ...ocks/settingswebapp/infosettings_404.json b/...ocks/settingswebapp/infosettings_404.json → ...ocks/settingswebapp/infosettings_404.json
diff --git a/...s/settingswebapp/programsettings_404.json → ...s/settingswebapp/programsettings_404.json b/...s/settingswebapp/programsettings_404.json → ...s/settingswebapp/programsettings_404.json
diff --git a/...ng/assets/mocks/syncFlow/datasetSync.json → ...st/assets/mocks/syncFlow/datasetSync.json b/...ng/assets/mocks/syncFlow/datasetSync.json → ...st/assets/mocks/syncFlow/datasetSync.json
diff --git a/...ting/assets/mocks/syncFlow/eventSync.json → ...Test/assets/mocks/syncFlow/eventSync.json b/...ting/assets/mocks/syncFlow/eventSync.json → ...Test/assets/mocks/syncFlow/eventSync.json
diff --git a/...esting/assets/mocks/syncFlow/teiSync.json → ...idTest/assets/mocks/syncFlow/teiSync.json b/...esting/assets/mocks/syncFlow/teiSync.json → ...idTest/assets/mocks/syncFlow/teiSync.json
diff --git a/...g/assets/mocks/syncFlow/teiSyncError.json → ...t/assets/mocks/syncFlow/teiSyncError.json b/...g/assets/mocks/syncFlow/teiSyncError.json → ...t/assets/mocks/syncFlow/teiSyncError.json
diff --git a/...ITesting/assets/mocks/systeminfo/ping.txt → ...roidTest/assets/mocks/systeminfo/ping.txt b/...ITesting/assets/mocks/systeminfo/ping.txt → ...roidTest/assets/mocks/systeminfo/ping.txt
diff --git a/...g/assets/mocks/systeminfo/systeminfo.json → ...t/assets/mocks/systeminfo/systeminfo.json b/...g/assets/mocks/systeminfo/systeminfo.json → ...t/assets/mocks/systeminfo/systeminfo.json
diff --git a/...ked_entity_attribute_reserved_values.json → ...ked_entity_attribute_reserved_values.json b/...ked_entity_attribute_reserved_values.json → ...ked_entity_attribute_reserved_values.json
diff --git a/...ked_entity_attribute_reserved_values.json → ...ked_entity_attribute_reserved_values.json b/...ked_entity_attribute_reserved_values.json → ...ked_entity_attribute_reserved_values.json
diff --git a/.../mocks/teilist/events_empty_response.json → .../mocks/teilist/events_empty_response.json b/.../mocks/teilist/events_empty_response.json → .../mocks/teilist/events_empty_response.json
diff --git a/...sting/assets/mocks/teilist/teilist_1.json → ...dTest/assets/mocks/teilist/teilist_1.json b/...sting/assets/mocks/teilist/teilist_1.json → ...dTest/assets/mocks/teilist/teilist_1.json
diff --git a/...sting/assets/mocks/teilist/teilist_2.json → ...dTest/assets/mocks/teilist/teilist_2.json b/...sting/assets/mocks/teilist/teilist_2.json → ...dTest/assets/mocks/teilist/teilist_2.json
diff --git a/...sting/assets/mocks/teilist/teilist_3.json → ...dTest/assets/mocks/teilist/teilist_3.json b/...sting/assets/mocks/teilist/teilist_3.json → ...dTest/assets/mocks/teilist/teilist_3.json
diff --git a/...eilist/tracked_entity_empty_response.json → ...eilist/tracked_entity_empty_response.json b/...eilist/tracked_entity_empty_response.json → ...eilist/tracked_entity_empty_response.json
diff --git a/...esting/assets/mocks/user/unauthorize.json → ...idTest/assets/mocks/user/unauthorize.json b/...esting/assets/mocks/user/unauthorize.json → ...idTest/assets/mocks/user/unauthorize.json
diff --git a/...dhisUITesting/assets/mocks/user/user.json → ...c/androidTest/assets/mocks/user/user.json b/...dhisUITesting/assets/mocks/user/user.json → ...c/androidTest/assets/mocks/user/user.json
diff --git a/app/src/main/java/org/dhis2/DBTestLoader.kt → ...ndroidTest/java/org/dhis2/DBTestLoader.kt b/app/src/main/java/org/dhis2/DBTestLoader.kt → ...ndroidTest/java/org/dhis2/DBTestLoader.kt
@@ -1,6 +1,7 @@
 package org.dhis2
 
 import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
 import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
@@ -19,9 +20,11 @@ class DBTestLoader(private val context: Context) {
             return
         }
         try {
-            val input = context.assets.open("databases/$DB_NAME_TEST")
+            val input = InstrumentationRegistry.getInstrumentation()
+                .context.assets.open("databases/$DB_NAME_TEST")
             val output = FileOutputStream("$databasePath/$DB_NAME")
             writeExtractedFileToDisk(input, output)
+            Timber.d("Database copy done")
         } catch (e: IOException) {
             Timber.e(Throwable("Could not load testing database"))
         }
@@ -47,4 +50,4 @@ class DBTestLoader(private val context: Context) {
         const val DB_NAME_TEST = "dhis_test.db"
         const val DB_NAME = "127-0-0-1-8080_android_unencrypted.db"
     }
-}
+}
diff --git a/app/src/androidTest/java/org/dhis2/common/di/TestingInjector.kt b/app/src/androidTest/java/org/dhis2/common/di/TestingInjector.kt
@@ -1,6 +1,7 @@
 package org.dhis2.common.di
 
 import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
 import org.dhis2.DBTestLoader
 import org.dhis2.common.FileReader
 import org.dhis2.common.featureConfig.FeatureConfigRobot
@@ -36,8 +37,8 @@ class TestingInjector {
         fun providesFeatureConfigRobot(): FeatureConfigRobot {
             return  FeatureConfigRobot(FeatureConfigRepositoryImpl(D2Manager.getD2()))
         }
-        fun providesMockWebserverRobot(context: Context): MockWebServerRobot {
-            return MockWebServerRobot(Dhis2MockServer(FileReader(context), 8080))
+        fun providesMockWebserverRobot(testContext: Context): MockWebServerRobot {
+            return MockWebServerRobot(Dhis2MockServer(FileReader(testContext), 8080))
         }
         fun provideDBImporter(context: Context): DBTestLoader {
             return DBTestLoader(context)

diff --git a/app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt b/app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt
@@ -43,6 +43,7 @@ open class BaseTest {
 
     @JvmField
     protected var context: Context = InstrumentationRegistry.getInstrumentation().targetContext
+    private var testContext = InstrumentationRegistry.getInstrumentation().context
     private var isIntentsEnable = false
     private lateinit var keyStoreRobot: KeyStoreRobot
     lateinit var preferencesRobot: PreferencesRobot
@@ -59,7 +60,8 @@ open class BaseTest {
     var permissionRule = if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
         GrantPermissionRule.grant(
             android.Manifest.permission.ACCESS_FINE_LOCATION,
-            android.Manifest.permission.CAMERA
+            android.Manifest.permission.CAMERA,
+            android.Manifest.permission.POST_NOTIFICATIONS
         )
     } else {
         GrantPermissionRule.grant(
@@ -81,7 +83,7 @@ open class BaseTest {
         TestingInjector.apply {
             keyStoreRobot = providesKeyStoreRobot(context)
             preferencesRobot = providesPreferencesRobot(context)
-            mockWebServerRobot = providesMockWebserverRobot(context)
+            mockWebServerRobot = providesMockWebserverRobot(testContext)
             featureConfigRobot = providesFeatureConfigRobot()
         }
     }

diff --git a/...roidTest/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/FakeTableModels.kt b/...roidTest/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/FakeTableModels.kt
diff --git a/app/src/androidTest/java/org/dhis2/usescases/main/MainRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/main/MainRobot.kt
@@ -1,9 +1,11 @@
 package org.dhis2.usescases.main
 
 import androidx.compose.ui.semantics.getOrNull
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.espresso.Espresso.onView
@@ -63,7 +65,9 @@ class MainRobot : BaseRobot() {
         Intents.intended(allOf(IntentMatchers.hasComponent(LoginActivity::class.java.name)))
     }
 
+    @OptIn(ExperimentalTestApi::class)
     fun checkHomeIsDisplayed(composeTestRule: ComposeTestRule) {
+        composeTestRule.waitUntilAtLeastOneExists(hasTestTag(HOME_ITEMS))
         composeTestRule.onNodeWithTag(HOME_ITEMS).assertIsDisplayed()
     }
 

diff --git a/app/src/dhis/java/org/dhis2/usescases/main/program/ProgramAnimation.kt b/app/src/dhis/java/org/dhis2/usescases/main/program/ProgramAnimation.kt
diff --git a/app/src/dhis/AndroidManifest.xml → app/src/dhis2/AndroidManifest.xml b/app/src/dhis/AndroidManifest.xml → app/src/dhis2/AndroidManifest.xml
diff --git a/.../utils/granularsync/GranularSyncModule.kt → .../utils/granularsync/GranularSyncModule.kt b/.../utils/granularsync/GranularSyncModule.kt → .../utils/granularsync/GranularSyncModule.kt
@@ -1,28 +1,3 @@
-/*
- * Copyright (c) 2004 - 2019, University of Oslo
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 package org.dhis2.utils.granularsync
 
 import android.content.Context

diff --git a/app/src/dhis2playServices/AndroidManifest.xml b/app/src/dhis2playServices/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
diff --git a/.../utils/granularsync/GranularSyncModule.kt → .../utils/granularsync/GranularSyncModule.kt b/.../utils/granularsync/GranularSyncModule.kt → .../utils/granularsync/GranularSyncModule.kt
diff --git a/...arsync/SMSPlayServicesSyncProviderImpl.kt → ...arsync/SMSPlayServicesSyncProviderImpl.kt b/...arsync/SMSPlayServicesSyncProviderImpl.kt → ...arsync/SMSPlayServicesSyncProviderImpl.kt
diff --git a/...utils/granularsync/SmsResponseReceiver.kt → ...utils/granularsync/SmsResponseReceiver.kt b/...utils/granularsync/SmsResponseReceiver.kt → ...utils/granularsync/SmsResponseReceiver.kt
diff --git a/app/src/dhisPlayServices/AndroidManifest.xml b/app/src/dhisPlayServices/AndroidManifest.xml
diff --git a/app/src/dhisPlayServices/java/org/dhis2/bindings/ContextExtensions.kt b/app/src/dhisPlayServices/java/org/dhis2/bindings/ContextExtensions.kt