feat: [ANDROAPP-7370] Support 6 and 12 hours metadata sync

Author: Balcan

app/src/main/java/org/dhis2/usescases/settings/SettingsRepository.kt

@@ -49,12 +49,7 @@ class SettingsRepository(
                 null
             }
     private val programSettings: ProgramSettings?
-        get() =
-            if (d2.settingModule().programSetting().blockingExists()) {
-                d2.settingModule().programSetting().blockingGet()
-            } else {
-                null
-            }
+        get() = syncSettings?.programSettings()
     private val smsConfig: ConfigCase.SmsConfig
         get() =
             d2
@@ -179,13 +174,13 @@ class SettingsRepository(
                 .isNotEmpty()
 
     private fun metadataPeriod(): Int =
-        generalSettings?.metadataSync()?.toSeconds() ?: prefs.getInt(
+        syncSettings?.metadataSync()?.toSeconds() ?: prefs.getInt(
             Preference.TIME_META,
             TIME_WEEKLY,
         )
 
     private fun dataPeriod(): Int =
-        generalSettings?.dataSync()?.toSeconds() ?: prefs.getInt(
+        syncSettings?.dataSync()?.toSeconds() ?: prefs.getInt(
             Preference.TIME_DATA,
             TIME_DAILY,
         )
@@ -231,14 +226,11 @@ class SettingsRepository(
     private fun getLimitedScopeFromPreferences(): LimitScope {
         val byOrgUnit = prefs.getBoolean(Constants.LIMIT_BY_ORG_UNIT, false)
         val byProgram = prefs.getBoolean(Constants.LIMIT_BY_PROGRAM, false)
-        return if (byOrgUnit && !byProgram) {
-            LimitScope.PER_ORG_UNIT
-        } else if (!byOrgUnit && byProgram) {
-            LimitScope.PER_PROGRAM
-        } else if (byOrgUnit && byProgram) {
-            LimitScope.PER_OU_AND_PROGRAM
-        } else {
-            LimitScope.GLOBAL
+        return when {
+            byOrgUnit && byProgram -> LimitScope.PER_OU_AND_PROGRAM
+            byOrgUnit && !byProgram -> LimitScope.PER_ORG_UNIT
+            !byOrgUnit && byProgram -> LimitScope.PER_PROGRAM
+            else -> LimitScope.GLOBAL
         }
     }
 
@@ -253,6 +245,7 @@ class SettingsRepository(
     suspend fun saveLimitScope(limitScope: LimitScope) {
         when (limitScope) {
             LimitScope.ALL_ORG_UNITS -> {
+                // Do nothing
             }
 
             LimitScope.GLOBAL -> {
@@ -289,7 +282,7 @@ class SettingsRepository(
                 .setGatewayNumber(gatewayNumber)
                 .blockingAwait()
         } catch (e: Exception) {
-            Timber.d(e.message)
+            Timber.d(e)
         }
     }
 

app/src/main/java/org/dhis2/usescases/settings/ui/SyncMetadataSettingItem.kt

@@ -1,6 +1,7 @@
 package org.dhis2.usescases.settings.ui
 
 import android.content.Context
+import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -21,9 +22,11 @@ import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.dp
 import org.dhis2.R
+import org.dhis2.bindings.EVERY_12_HOUR
 import org.dhis2.bindings.EVERY_24_HOUR
+import org.dhis2.bindings.EVERY_6_HOUR
 import org.dhis2.bindings.EVERY_7_DAYS
-import org.dhis2.commons.Constants
+import org.dhis2.commons.Constants.TIME_MANUAL
 import org.dhis2.usescases.settings.SettingItem
 import org.dhis2.usescases.settings.models.MetadataSettingsViewModel
 import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem
@@ -77,11 +80,18 @@ internal fun SyncMetadataSettingItem(
                 if (metadataSettings.canEdit) {
                     val metaSyncPeriods =
                         listOf(
-                            stringResource(R.string.a_day),
-                            stringResource(R.string.a_week),
-                            stringResource(R.string.Manual),
+                            SyncMetadataPeriods.Every6Hours,
+                            SyncMetadataPeriods.Every12Hours,
+                            SyncMetadataPeriods.Every24Hours,
+                            SyncMetadataPeriods.EveryWeek,
+                            SyncMetadataPeriods.Manual,
                         )
 
+                    val dropdownItemLabel =
+                        metaSyncPeriods.map {
+                            stringResource(it.label)
+                        }
+
                     var selectedItem by
                         remember {
                             mutableStateOf(
@@ -101,21 +111,14 @@ internal fun SyncMetadataSettingItem(
                         itemCount = metaSyncPeriods.size,
                         onSearchOption = {},
                         fetchItem = { index ->
-                            DropdownItem(metaSyncPeriods[index])
+                            DropdownItem(dropdownItemLabel[index])
                         },
                         selectedItem = selectedItem,
                         onResetButtonClicked = { },
                         onItemSelected = { index, newItem ->
                             selectedItem = newItem
                             inputSyncConfigurationState = InputShellState.UNFOCUSED
-                            when (index) {
-                                0 -> onSyncMetaPeriodChanged(EVERY_24_HOUR)
-                                1 -> onSyncMetaPeriodChanged(EVERY_7_DAYS)
-                                2 -> onSyncMetaPeriodChanged(Constants.TIME_MANUAL)
-                                else -> {
-                                    // do nothing
-                                }
-                            }
+                            onSyncMetaPeriodChanged(metaSyncPeriods[index].syncPeriod)
                         },
                         showSearchBar = false,
                         loadOptions = {},
@@ -193,3 +196,18 @@ private fun provideSyncInProgressInfoItems(
         isConstantItem = true,
     ),
 )
+
+internal sealed class SyncMetadataPeriods(
+    @StringRes val label: Int,
+    val syncPeriod: Int,
+) {
+    data object Every24Hours : SyncMetadataPeriods(R.string.a_day, EVERY_24_HOUR)
+
+    data object Every12Hours : SyncMetadataPeriods(R.string.every_12_hours, EVERY_12_HOUR)
+
+    data object Every6Hours : SyncMetadataPeriods(R.string.every_6_hours, EVERY_6_HOUR)
+
+    data object EveryWeek : SyncMetadataPeriods(R.string.a_week, EVERY_7_DAYS)
+
+    data object Manual : SyncMetadataPeriods(R.string.Manual, TIME_MANUAL)
+}

gradle/verification-metadata.xml

@@ -11530,8 +11530,16 @@
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.21">
+          <artifact name="kotlin-stdlib-1.9.21-all.jar">
+              <sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4"
+                  origin="Generated by Gradle" />
+          </artifact>
          <artifact name="kotlin-stdlib-1.9.21.jar">
             <sha256 value="3b479313ab6caea4e5e25d3dee8ca80c302c89ba73e1af4dafaa100f6ef9296a" origin="Generated by Gradle"/>
+         </artifact>
+          <artifact name="kotlin-stdlib-1.9.21.module">
+              <sha256 value="d3019f7f0d71924ce47298c9cc46af0245f75219719b35c5915fbcc7e7a69395"
+                  origin="Generated by Gradle" />
          </artifact>
          <artifact name="kotlin-stdlib-1.9.21.pom">
             <sha256 value="c807d92f7c6aa1b65c06cf87232363504e690fca3f3c1e27206630a1322fd7e0" origin="Generated by Gradle"/>