Fix debug mode detection and update eCHIS app configuration

android/.gitignore

@@ -23,3 +23,6 @@ keystore.properties
 gradle.properties
 
 /sentry.properties
+.kotlin/
+quest/echis/
+quest/echisSupervisor/

android/build.gradle.kts

@@ -46,8 +46,8 @@ allprojects {
     mavenLocal()
     google()
     mavenCentral()
-    maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
-    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
+    // Old OSSRH repos removed - service was sunset June 30, 2025
+    // See: https://central.sonatype.org/pages/ossrh-eol/
     maven(url = "https://repository.liferay.com/nexus/content/repositories/public")
     maven(url = "https://central.sonatype.com/repository/maven-snapshots")
     apply(plugin = "org.owasp.dependencycheck")

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt

@@ -439,6 +439,13 @@ constructor(
    */
   @Throws(UnknownHostException::class, HttpException::class)
   suspend fun fetchNonWorkflowConfigResources() {
+    // Skip remote fetch when using /debug mode - resources are loaded from assets
+    // Check directly for /debug suffix in app ID, regardless of build variant
+    val appId = sharedPreferencesHelper.retrieveApplicationId()?.trim()
+    if (appId?.endsWith(DEBUG_SUFFIX, ignoreCase = true) == true) {
+      Timber.d("Skipping remote config fetch - app ID '$appId' has /debug suffix, using local assets")
+      return
+    }
     Timber.d("Triggered fetching application configurations remotely")
     configCacheMap.clear()
     sharedPreferencesHelper.read(SharedPreferenceKey.APP_ID.name, null)?.let { appId ->

android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt

@@ -1305,4 +1305,106 @@ class ConfigurationRegistryTest : RobolectricTest() {
     val savedTimestamp = configRegistry.sharedPreferencesHelper.read(expectedKey, "")
     assertFalse(savedTimestamp.isNullOrEmpty())
   }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should skip remote fetch when appId has debug suffix`() =
+    runTest {
+      // Given: App ID with /debug suffix
+      val appId = "echis/debug"
+      sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, appId)
+
+      // When: fetchNonWorkflowConfigResources is called
+      configRegistry.fetchNonWorkflowConfigResources()
+
+      // Then: Should NOT fetch from remote (no calls to fetchRemoteCompositionByAppId)
+      coVerify(exactly = 0) { configRegistry.fetchRemoteCompositionByAppId(any()) }
+      // And configCacheMap should remain empty (no remote configs loaded)
+      assertTrue(configRegistry.configCacheMap.isEmpty())
+    }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should skip remote fetch when appId has DEBUG suffix uppercase`() =
+    runTest {
+      // Given: App ID with /DEBUG suffix (uppercase)
+      val appId = "echis/DEBUG"
+      sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, appId)
+
+      // When: fetchNonWorkflowConfigResources is called
+      configRegistry.fetchNonWorkflowConfigResources()
+
+      // Then: Should NOT fetch from remote (case-insensitive check)
+      coVerify(exactly = 0) { configRegistry.fetchRemoteCompositionByAppId(any()) }
+    }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should fetch from remote when appId has no debug suffix`() =
+    runTest {
+      // Given: App ID without /debug suffix
+      val appId = "echis"
+      sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, appId)
+
+      val composition =
+        Composition().apply {
+          identifier = Identifier().setValue(appId)
+          addSection().apply {
+            focus =
+              Reference().apply {
+                reference = "Binary/test-config"
+                identifier = Identifier().setValue("application")
+              }
+          }
+        }
+
+      coEvery { configRegistry.fetchRemoteCompositionByAppId(appId) } returns composition
+      coEvery { fhirResourceDataSource.getResource(any()) } returns Bundle()
+      coEvery { fhirEngine.get<Binary>(any()) } returns
+        Binary().apply {
+          id = "test-config"
+          content = """{"appId":"echis"}""".toByteArray()
+        }
+
+      // When: fetchNonWorkflowConfigResources is called
+      configRegistry.fetchNonWorkflowConfigResources()
+
+      // Then: Should fetch from remote
+      coVerify { configRegistry.fetchRemoteCompositionByAppId(appId) }
+    }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should skip when appId is null`() = runTest {
+    // Given: No App ID set
+    sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, null)
+
+    // When: fetchNonWorkflowConfigResources is called
+    configRegistry.fetchNonWorkflowConfigResources()
+
+    // Then: Should NOT fetch from remote
+    coVerify(exactly = 0) { configRegistry.fetchRemoteCompositionByAppId(any()) }
+  }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should skip when appId is empty`() = runTest {
+    // Given: Empty App ID
+    sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, "")
+
+    // When: fetchNonWorkflowConfigResources is called
+    configRegistry.fetchNonWorkflowConfigResources()
+
+    // Then: Should NOT fetch from remote
+    coVerify(exactly = 0) { configRegistry.fetchRemoteCompositionByAppId(any()) }
+  }
+
+  @Test
+  fun `fetchNonWorkflowConfigResources() should handle appId with whitespace and debug suffix`() =
+    runTest {
+      // Given: App ID with whitespace and /debug suffix
+      val appId = "  echis/debug  "
+      sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, appId)
+
+      // When: fetchNonWorkflowConfigResources is called
+      configRegistry.fetchNonWorkflowConfigResources()
+
+      // Then: Should trim and detect debug suffix, skipping remote fetch
+      coVerify(exactly = 0) { configRegistry.fetchRemoteCompositionByAppId(any()) }
+    }
 }

android/gradle/libs.versions.toml

@@ -56,7 +56,7 @@ kotlinx-coroutines = "1.9.0"
 kotlinx-serialization-json = "1.6.3"
 kt3k-coveralls-ver="2.12.0"
 ktlint = "0.50.0"
-kujaku-library = "0.10.8-SNAPSHOT"
+kujaku-library = "0.9.0"
 kujaku-mapbox-sdk-turf = "7.2.0"
 leakcanary-android = "2.10"
 lifecycle= "2.8.7"

android/quest/build.gradle.kts

@@ -57,6 +57,7 @@ sonar {
 
 android {
   compileSdk = BuildConfigs.compileSdk
+  ndkVersion = "27.2.12479018"
 
   val buildDate = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(Date())
 
@@ -269,14 +270,7 @@ android {
       dimension = "apps"
       applicationId = "ug.go.health.echis"
       versionNameSuffix = "-echis"
-      manifestPlaceholders["appLabel"] = "MOH UG eCHIS"
-    }
-
-    create("echisSupervisor") {
-      dimension = "apps"
-      applicationId = "ug.go.health.echisSupervisor"
-      versionNameSuffix = "-echis-supervisor"
-      manifestPlaceholders["appLabel"] = "MOH UG eCHIS Supervisor"
+      manifestPlaceholders["appLabel"] = "eCHIS"
     }
 
     create("sidBunda") {

android/quest/src/echis/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="fhir_core_app" translatable="false">MoH eCHIS</string>
+</resources>

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModel.kt

@@ -98,7 +98,9 @@ constructor(
     val appId = appId.value?.trim()
     if (!appId.isNullOrEmpty()) {
       when {
-        sharedPreferencesHelper.hasDebugSuffix() -> loadConfigurations(context)
+        // Check directly for /debug suffix, regardless of build variant
+        appId.endsWith(ConfigurationRegistry.DEBUG_SUFFIX, ignoreCase = true) ->
+          loadConfigurations(context)
         else -> fetchRemoteConfigurations(appId, context)
       }
     }

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModelTest.kt

@@ -426,4 +426,114 @@ class AppSettingViewModelTest : RobolectricTest() {
       coVerify { appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any()) }
     }
   }
+
+  @Test
+  fun `fetchConfigurations() with debug suffix should call loadConfigurations() not fetchRemoteConfigurations()`() {
+    runTest {
+      // Given: App ID with /debug suffix
+      val appId = "echis/debug"
+      appSettingViewModel.onApplicationIdChanged(appId)
+
+      coEvery { appSettingViewModel.loadConfigurations(any()) } just runs
+
+      // When: fetchConfigurations is called
+      appSettingViewModel.fetchConfigurations(context)
+
+      // Then: Should call loadConfigurations (local assets)
+      coVerify { appSettingViewModel.loadConfigurations(context) }
+      // And should NOT fetch from remote
+      coVerify(exactly = 0) {
+        appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any())
+      }
+      coVerify(exactly = 0) {
+        appSettingViewModel.configurationRegistry.fetchRemoteImplementationGuideByAppId(any(), any())
+      }
+    }
+  }
+
+  @Test
+  fun `fetchConfigurations() with DEBUG suffix in uppercase should call loadConfigurations()`() {
+    runTest {
+      // Given: App ID with /DEBUG suffix (uppercase)
+      val appId = "echis/DEBUG"
+      appSettingViewModel.onApplicationIdChanged(appId)
+
+      coEvery { appSettingViewModel.loadConfigurations(any()) } just runs
+
+      // When: fetchConfigurations is called
+      appSettingViewModel.fetchConfigurations(context)
+
+      // Then: Should call loadConfigurations (case-insensitive check)
+      coVerify { appSettingViewModel.loadConfigurations(context) }
+      coVerify(exactly = 0) {
+        appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any())
+      }
+    }
+  }
+
+  @Test
+  fun `fetchConfigurations() without debug suffix should call fetchRemoteConfigurations()`() {
+    runTest {
+      // Given: App ID without /debug suffix
+      val appId = "echis"
+      appSettingViewModel.onApplicationIdChanged(appId)
+
+      val composition =
+        Composition().apply {
+          addSection().apply { this.focus = Reference().apply { reference = "Binary/123" } }
+        }
+
+      coEvery {
+        appSettingViewModel.configurationRegistry.fetchRemoteImplementationGuideByAppId(any(), any())
+      } returns null
+      coEvery {
+        appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any())
+      } returns composition
+      coEvery { appSettingViewModel.defaultRepository.createRemote(any(), any()) } just runs
+      coEvery { appSettingViewModel.fhirResourceDataSource.post(requestBody = any()) } returns
+        Bundle()
+
+      // When: fetchConfigurations is called
+      appSettingViewModel.fetchConfigurations(context)
+
+      // Then: Should fetch from remote
+      coVerify { appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any()) }
+      // And should NOT call loadConfigurations
+      coVerify(exactly = 0) { appSettingViewModel.loadConfigurations(any()) }
+    }
+  }
+
+  @Test
+  fun `fetchConfigurations() with empty appId should not proceed`() {
+    runTest {
+      // Given: Empty App ID
+      appSettingViewModel.onApplicationIdChanged("")
+
+      // When: fetchConfigurations is called
+      appSettingViewModel.fetchConfigurations(context)
+
+      // Then: Should not fetch anything
+      coVerify(exactly = 0) {
+        appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any())
+      }
+      coVerify(exactly = 0) { appSettingViewModel.loadConfigurations(any()) }
+    }
+  }
+
+  @Test
+  fun `fetchConfigurations() with null appId should not proceed`() {
+    runTest {
+      // Given: Null App ID (not set)
+      appSettingViewModel.appId.value = null
+
+      // When: fetchConfigurations is called
+      appSettingViewModel.fetchConfigurations(context)
+
+      // Then: Should not fetch anything
+      coVerify(exactly = 0) {
+        appSettingViewModel.configurationRegistry.fetchRemoteCompositionByAppId(any())
+      }
+      coVerify(exactly = 0) { appSettingViewModel.loadConfigurations(any()) }
+    }
+  }
 }