Fix default syncInterval setting issue (40c8d8c4) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt

+19 −4

Original line number	Diff line number	Diff line
		@@ -145,12 +145,20 @@ class AccountSettings(
		}

		if (!baseURL.isNullOrEmpty()) {
		bundle.putString("oc_base_url", baseURL)
		bundle.putString("oc_base_url", getOCBaseUrl(baseURL))
		}

		return bundle
		}

		private fun getOCBaseUrl(baseURL: String): String {
		if (baseURL.contains("remote.php")) {
		return baseURL.split("/remote.php")[0]
		}

		return baseURL
		}

		}


		@@ -255,6 +263,8 @@ class AccountSettings(
		KEY_SYNC_INTERVAL_ADDRESSBOOKS
		authority == CalendarContract.AUTHORITY ->
		KEY_SYNC_INTERVAL_CALENDARS
		authority == context.getString(R.string.task_authority) ->
		KEY_SYNC_INTERVAL_TASKS
		TaskProvider.ProviderName.values().any { it.authority == authority } ->
		KEY_SYNC_INTERVAL_TASKS
		else -> throw IllegalArgumentException("Authority does not exist: $authority")
		@@ -279,9 +289,12 @@ class AccountSettings(
		* @throws IllegalArgumentException when [seconds] is not [SYNC_INTERVAL_MANUALLY] but less than 15 min
		*/
		@WorkerThread
		fun setSyncInterval(authority: String, seconds: Long): Boolean {
		if (seconds != SYNC_INTERVAL_MANUALLY && seconds < 60*15)
		throw IllegalArgumentException("<15 min is not supported by Android")
		fun setSyncInterval(authority: String, argSeconds: Long): Boolean {
		var seconds = argSeconds

		if (seconds != SYNC_INTERVAL_MANUALLY && seconds < 60*15) {
		seconds = 15*60
		}

		// Store (user defined) sync interval in account settings
		val key = when {
		@@ -289,6 +302,8 @@ class AccountSettings(
		KEY_SYNC_INTERVAL_ADDRESSBOOKS
		authority == CalendarContract.AUTHORITY ->
		KEY_SYNC_INTERVAL_CALENDARS
		authority == context.getString(R.string.task_authority) ->
		KEY_SYNC_INTERVAL_TASKS
		TaskProvider.ProviderName.values().any { it.authority == authority } ->
		KEY_SYNC_INTERVAL_TASKS
		else ->

app/src/main/java/at/bitfire/davdroid/settings/AccountSettingsMigrations.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ class AccountSettingsMigrations(
		val authorities = listOf(
		context.getString(R.string.address_books_authority),
		CalendarContract.AUTHORITY,
		context.getString(R.string.task_authority),
		TaskProvider.ProviderName.JtxBoard.authority,
		TaskProvider.ProviderName.OpenTasks.authority,
		TaskProvider.ProviderName.TasksOrg.authority

app/src/main/res/values-da/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,6 @@
		<string name="settings_sync_interval_tasks">Synkroniseringsinterval for opgaver</string>
		<string-array name="settings_sync_interval_names">
		<item>Kun manuelt</item>
		<item>Hvert andet minut</item>
		<item>Hvert 15. minut</item>
		<item>Hver halve time</item>
		<item>Hver time</item>

app/src/main/res/values-de/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,6 @@
		<string name="settings_sync_interval_tasks">Häufigkeit der Aufgaben-Synchronisierung</string>
		<string-array name="settings_sync_interval_names">
		<item>Nur manuell</item>
		<item>alle 2 Minuten</item>
		<item>Alle 15 Minuten</item>
		<item>Alle 30 Minuten</item>
		<item>Jede Stunde</item>

app/src/main/res/values-fr/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@
		<string name="settings_sync_interval_tasks">Intervalle de synchronisation des tâches</string>
		<string-array name="settings_sync_interval_names">
		<item>Manuellement</item>
		<item>Toutes les 2 minutes</item>
		<item>Tous les quarts d\'heure</item>
		<item>Toutes les demi-heures</item>
		<item>Toutes les heures</item>