Skip to content

AccountSettings: make enable flag for sync intervals explicit #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2024
Merged

AccountSettings: make enable flag for sync intervals explicit #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import android.provider.CalendarContract
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import at.bitfire.davdroid.R
import at.bitfire.davdroid.db.AppDatabase
import at.bitfire.davdroid.db.Credentials
import at.bitfire.davdroid.db.Service
import at.bitfire.davdroid.settings.AccountSettings
import at.bitfire.davdroid.settings.SettingsManager
import at.bitfire.davdroid.sync.TasksAppManager
Expand All @@ -26,17 +28,16 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.logging.Logger

@HiltViewModel(assistedFactory = AccountSettingsModel.Factory::class)
class AccountSettingsModel @AssistedInject constructor(
@Assisted val account: Account,
private val accountSettingsFactory: AccountSettings.Factory,
@ApplicationContext val context: Context,
private val logger: Logger,
db: AppDatabase,
private val settings: SettingsManager,
private val syncWorkerManager: SyncWorkerManager,
tasksAppManager: TasksAppManager
private val tasksAppManager: TasksAppManager
): ViewModel(), SettingsManager.OnChangeListener {

@AssistedFactory
Expand All @@ -46,8 +47,11 @@ class AccountSettingsModel @AssistedInject constructor(

// settings
data class UiState(
val hasContactsSync: Boolean = false,
val syncIntervalContacts: Long? = null,
val hasCalendarsSync: Boolean = false,
val syncIntervalCalendars: Long? = null,
val hasTasksSync: Boolean = false,
val syncIntervalTasks: Long? = null,

val syncWifiOnly: Boolean = false,
Expand All @@ -67,7 +71,9 @@ class AccountSettingsModel @AssistedInject constructor(
private val _uiState = MutableStateFlow(UiState())
val uiState: StateFlow<UiState> = _uiState.asStateFlow()

private val tasksProvider = tasksAppManager.currentProvider()
private val serviceDao = db.serviceDao()
private val tasksProvider
get() = tasksAppManager.currentProvider()

/**
* Only acquire account settings on a worker thread!
Expand All @@ -94,10 +100,16 @@ class AccountSettingsModel @AssistedInject constructor(
}

private suspend fun reload() = withContext(Dispatchers.Default) {
logger.info("Reloading settings")
val hasContactsSync = serviceDao.getByAccountAndType(account.name, Service.TYPE_CARDDAV) != null
val hasCalendarSync = serviceDao.getByAccountAndType(account.name, Service.TYPE_CALDAV) != null
val hasTasksSync = hasCalendarSync && tasksProvider != null

_uiState.value = UiState(
hasContactsSync = hasContactsSync,
syncIntervalContacts = accountSettings.getSyncInterval(context.getString(R.string.address_books_authority)),
hasCalendarsSync = hasCalendarSync,
syncIntervalCalendars = accountSettings.getSyncInterval(CalendarContract.AUTHORITY),
hasTasksSync = hasTasksSync,
syncIntervalTasks = tasksProvider?.let { accountSettings.getSyncInterval(it.authority) },

syncWifiOnly = accountSettings.getSyncWifiOnly(),
Expand Down Expand Up @@ -220,8 +232,8 @@ class AccountSettingsModel @AssistedInject constructor(
*
* @param authority authority to re-sync
* @param fullResync whether sync shall download all events again
* (_true_: sets [Syncer.SYNC_EXTRAS_FULL_RESYNC],
* _false_: sets [Syncer.SYNC_EXTRAS_RESYNC])
* (_true_: sets [at.bitfire.davdroid.sync.worker.BaseSyncWorker.FULL_RESYNC],
* _false_: sets [BaseSyncWorker.RESYNC])
*/
private fun resync(authority: String, fullResync: Boolean) {
val resync =
Expand Down
33 changes: 27 additions & 6 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,13 @@ fun AccountSettingsScreen(
// Sync settings
canAccessWifiSsid = canAccessWifiSsid,
onSyncWifiOnlyPermissionsAction = onNavWifiPermissionsScreen,
hasContactsSync = uiState.hasContactsSync,
contactsSyncInterval = uiState.syncIntervalContacts,
onUpdateContactsSyncInterval = model::updateContactsSyncInterval,
hasCalendarsSync = uiState.hasCalendarsSync,
calendarSyncInterval = uiState.syncIntervalCalendars,
onUpdateCalendarSyncInterval = model::updateCalendarSyncInterval,
hasTasksSync = uiState.hasTasksSync,
tasksSyncInterval = uiState.syncIntervalTasks,
onUpdateTasksSyncInterval = model::updateTasksSyncInterval,
syncOnlyOnWifi = uiState.syncWifiOnly,
Expand Down Expand Up @@ -127,10 +130,13 @@ fun AccountSettingsScreen(
// Sync settings
canAccessWifiSsid: Boolean,
onSyncWifiOnlyPermissionsAction: () -> Unit,
hasContactsSync: Boolean,
contactsSyncInterval: Long?,
onUpdateContactsSyncInterval: ((Long) -> Unit) = {},
hasCalendarsSync: Boolean,
calendarSyncInterval: Long?,
onUpdateCalendarSyncInterval: ((Long) -> Unit) = {},
hasTasksSync: Boolean,
tasksSyncInterval: Long?,
onUpdateTasksSyncInterval: ((Long) -> Unit) = {},
syncOnlyOnWifi: Boolean,
Expand Down Expand Up @@ -199,10 +205,13 @@ fun AccountSettingsScreen(
// Sync settings
canAccessWifiSsid = canAccessWifiSsid,
onSyncWifiOnlyPermissionsAction = onSyncWifiOnlyPermissionsAction,
hasContactsSync = hasContactsSync,
contactsSyncInterval = contactsSyncInterval,
onUpdateContactsSyncInterval = onUpdateContactsSyncInterval,
hasCalendarsSync = hasCalendarsSync,
calendarSyncInterval = calendarSyncInterval,
onUpdateCalendarSyncInterval = onUpdateCalendarSyncInterval,
hasTasksSync = hasTasksSync,
taskSyncInterval = tasksSyncInterval,
onUpdateTaskSyncInterval = onUpdateTasksSyncInterval,
syncOnlyOnWifi = syncOnlyOnWifi,
Expand All @@ -228,7 +237,7 @@ fun AccountSettingsScreen(

// CardDav Settings
contactGroupMethod = contactGroupMethod,
onUpdateContactGroupMethod = onUpdateContactGroupMethod,
onUpdateContactGroupMethod = onUpdateContactGroupMethod
)
}
}
Expand All @@ -241,10 +250,13 @@ fun AccountSettings_FromModel(
// Sync settings
canAccessWifiSsid: Boolean,
onSyncWifiOnlyPermissionsAction: () -> Unit,
hasContactsSync: Boolean,
contactsSyncInterval: Long?,
onUpdateContactsSyncInterval: ((Long) -> Unit) = {},
hasCalendarsSync: Boolean,
calendarSyncInterval: Long?,
onUpdateCalendarSyncInterval: ((Long) -> Unit) = {},
hasTasksSync: Boolean,
taskSyncInterval: Long?,
onUpdateTaskSyncInterval: ((Long) -> Unit) = {},
syncOnlyOnWifi: Boolean,
Expand Down Expand Up @@ -276,10 +288,13 @@ fun AccountSettings_FromModel(
SyncSettings(
canAccessWifiSsid = canAccessWifiSsid,
onSyncWifiOnlyPermissionsAction = onSyncWifiOnlyPermissionsAction,
hasContactsSync = hasContactsSync,
contactsSyncInterval = contactsSyncInterval,
onUpdateContactsSyncInterval = onUpdateContactsSyncInterval,
hasCalendarsSync = hasCalendarsSync,
calendarSyncInterval = calendarSyncInterval,
onUpdateCalendarSyncInterval = onUpdateCalendarSyncInterval,
hasTasksSync = hasTasksSync,
taskSyncInterval = taskSyncInterval,
onUpdateTaskSyncInterval = onUpdateTaskSyncInterval,
syncOnlyOnWifi = syncOnlyOnWifi,
Expand Down Expand Up @@ -320,10 +335,13 @@ fun AccountSettings_FromModel(
fun SyncSettings(
canAccessWifiSsid: Boolean,
onSyncWifiOnlyPermissionsAction: () -> Unit,
hasContactsSync: Boolean,
contactsSyncInterval: Long?,
onUpdateContactsSyncInterval: ((Long) -> Unit) = {},
hasCalendarsSync: Boolean,
calendarSyncInterval: Long?,
onUpdateCalendarSyncInterval: ((Long) -> Unit) = {},
hasTasksSync: Boolean,
taskSyncInterval: Long?,
onUpdateTaskSyncInterval: ((Long) -> Unit) = {},
syncOnlyOnWifi: Boolean,
Expand All @@ -338,21 +356,21 @@ fun SyncSettings(
Text(stringResource(R.string.settings_sync))
}

if (contactsSyncInterval != null)
if (hasContactsSync)
SyncIntervalSetting(
icon = Icons.Default.Contacts,
name = R.string.settings_sync_interval_contacts,
syncInterval = contactsSyncInterval,
onUpdateSyncInterval = onUpdateContactsSyncInterval
)
if (calendarSyncInterval != null)
if (hasCalendarsSync)
SyncIntervalSetting(
icon = Icons.Default.Event,
name = R.string.settings_sync_interval_calendars,
syncInterval = calendarSyncInterval,
onUpdateSyncInterval = onUpdateCalendarSyncInterval
)
if (taskSyncInterval != null)
if (hasTasksSync)
SyncIntervalSetting(
icon = Icons.Outlined.Task,
name = R.string.settings_sync_interval_tasks,
Expand Down Expand Up @@ -431,15 +449,15 @@ fun SyncSettings(
fun SyncIntervalSetting(
icon: ImageVector,
@StringRes name: Int,
syncInterval: Long,
syncInterval: Long?,
onUpdateSyncInterval: (Long) -> Unit
) {
var showSyncIntervalDialog by remember { mutableStateOf(false) }
Setting(
icon = icon,
name = stringResource(name),
summary =
if (syncInterval == AccountSettings.SYNC_INTERVAL_MANUALLY)
if (syncInterval == null || syncInterval == AccountSettings.SYNC_INTERVAL_MANUALLY)
stringResource(R.string.settings_sync_summary_manually)
else
stringResource(R.string.settings_sync_summary_periodically, syncInterval / 60),
Expand Down Expand Up @@ -693,10 +711,13 @@ fun AccountSettingsScreen_Preview() {
// Sync settings
canAccessWifiSsid = true,
onSyncWifiOnlyPermissionsAction = {},
hasContactsSync = true,
contactsSyncInterval = 80000L,
onUpdateContactsSyncInterval = {},
hasCalendarsSync = true,
calendarSyncInterval = 50000L,
onUpdateCalendarSyncInterval = {},
hasTasksSync = true,
tasksSyncInterval = 900000L,
onUpdateTasksSyncInterval = {},
syncOnlyOnWifi = true,
Expand Down
Loading