diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/AccountDetailsFragment.kt index b5ffc66b60cabc6812bd9b08ad2184a5594eec90..03493b00723d8986206203bf6a2139adef421cb5 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/AccountDetailsFragment.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/AccountDetailsFragment.kt @@ -199,6 +199,11 @@ class AccountDetailsFragment : Fragment() { val name = MutableLiveData() val nameError = MutableLiveData() + companion object { + const val GOOGLE_ACCOUNT_TYPE = "e.foundation.webdav.google" + const val GOOGLE_ACCOUNT_DEFAULT_SYNC_PERIOD_IN_S = 5 * 60L + } + fun createAccount( activity: Activity, name: String, @@ -333,9 +338,10 @@ class AccountDetailsFragment : Fragment() { context.startService(refreshIntent) // contact sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_address_books.xml + val syncInterval = provideSyncInterval(accountType, Constants.DEFAULT_CALENDAR_SYNC_INTERVAL) accountSettings.setSyncInterval( context.getString(R.string.address_books_authority), - Constants.DEFAULT_CALENDAR_SYNC_INTERVAL + syncInterval ) } else ContentResolver.setIsSyncable( @@ -361,9 +367,10 @@ class AccountDetailsFragment : Fragment() { context.startService(refreshIntent) // calendar sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_calendars.xml + val syncInterval = provideSyncInterval(accountType, Constants.DEFAULT_CALENDAR_SYNC_INTERVAL) accountSettings.setSyncInterval( CalendarContract.AUTHORITY, - Constants.DEFAULT_CALENDAR_SYNC_INTERVAL + syncInterval ) // enable task sync if OpenTasks is installed @@ -374,9 +381,10 @@ class AccountDetailsFragment : Fragment() { TaskProvider.ProviderName.OpenTasks.authority, 1 ) + val syncInterval = provideSyncInterval(accountType, Constants.DEFAULT_CALENDAR_SYNC_INTERVAL) accountSettings.setSyncInterval( TaskProvider.ProviderName.OpenTasks.authority, - Constants.DEFAULT_CALENDAR_SYNC_INTERVAL + syncInterval ) } } else { @@ -398,6 +406,13 @@ class AccountDetailsFragment : Fragment() { return result } + private fun provideSyncInterval(type: String, fallback: Long): Long { + if (type == GOOGLE_ACCOUNT_TYPE) { + return GOOGLE_ACCOUNT_DEFAULT_SYNC_PERIOD_IN_S + } + return fallback + } + private fun insertService( db: AppDatabase, accountName: String, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 91138d861ee883c7c6ffd5eba37833c2b37c7ef6..5c51b44b2a3dc21c208b65713074668665430ebd 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -152,6 +152,8 @@ مدة مزامنة المهام يدوياً فقط + كل 2 دقيقة + كل 5 دقيقة كل 15 دقيقة كل 30 دقيقة كل ساعة @@ -253,4 +255,4 @@ جوجل دليل عناوين جوجل دليل العناوين - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ef2e6a0fbe64463fb82aa2ef266d94bf75af41bc..d3b755f56da998cc60014141f9d590f459726a47 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -138,6 +138,8 @@ Период за синхронизиране на задачи Само изрично + Всеки 2 минути + Всеки 5 минути Всеки 15 минути На половин час Всеки час @@ -256,4 +258,4 @@ Google WebDAV ВНИМАНИЕ - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d0bf10362a8243fb4eaa10a2c82d11a611a9f661..77d080382b712404597b684701958d9efd80ac09 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -85,6 +85,8 @@ Només a mà Només a mà + Cada 2 minuts + Cada 5 minuts Cada 15 minuts Cada 30 minuts Cada hora diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index fbe63e1be55d67a0ff11434812d77b54dd6d09e0..c3df12f72078df6df69c1ffd07dc487329de5971 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -158,6 +158,7 @@ Kun manuelt Hvert andet minut + Hvert 5. minut Hvert 15. minut Hver halve time Hver time diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2392a5de2c33f83c5eb13b8e9ea445c22b2b45d9..7185047fce5f5450ef76d60d3172edff4d53dd95 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -163,6 +163,7 @@ Nur manuell alle 2 Minuten + alle 5 Minuten Alle 15 Minuten Alle 30 Minuten Jede Stunde @@ -325,4 +326,4 @@ \n \nBemerkung: Du kannst diesen Schritt auch überspringen, und ein Konto später unter den Einstellungen hinzufügen. Falls du auf Schwierigkeiten triffst, kontaktiere bitte den Kundendienst. Anmelden - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 84722b47d78a3f92da1e0bdd324bfded1176ada1..1e837cbb0f2e994f394cc7ea6233743102179188 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -157,6 +157,8 @@ Μεσοδιάστημα συγχρονισμού εργασιών Μόνο χειροκίνητα + Κάθε 2 λεπτά + Κάθε 5 λεπτά Κάθε 15 λεπτά Κάθε 30 λεπτά Κάθε ώρα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8448f9c975fd7984692226228c560e7482cd8301..d64024a9b42375c12fbb5f6f3abf3ade0afd7035 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -158,6 +158,8 @@ Intervalo de sincronizacion de Tasks Solo manualmente + Cada 2 minutos + Cada 5 minutos Cada 15 minutos Cada 30 minutos Cada hora @@ -289,4 +291,4 @@ /e/ reportará un dispositivo falso a Google para proteger su privacidad. \nPuedes revisar cuáles en \"Tus dispositivos\" de Google después de iniciar sesión. ADVERTENCIA - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d9cce79aa84bb4fffdd1b90859ba1dccc28ba4a9..eb40ea7c22c744d76666b1f07c093c73c795bb59 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -156,6 +156,8 @@ تسک همگام سازی شد. فقط به صورت دستی + هر 2 دقیقه + هر 5 دقیقه هر 15 دقیقه هر 30 دقیقه هر ساعت diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ece2bbb79afc36a89ffdf1b0ad350bde88acf019..c969d84614a25dab2068a1dff6c259e833db40d1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -160,6 +160,7 @@ Manuellement Toutes les 2 minutes + Toutes les 5 minutes Tous les quarts d\'heure Toutes les demi-heures Toutes les heures @@ -290,4 +291,4 @@ e.foundation.webdav.google Google WebDAV - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index c258068f26f8258df04d1d2c6693958fc3e90d94..118dbd517693aadb02df2d1a2b7278dfdb5c897e 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -159,6 +159,8 @@ Intervalo sincr. de tarefas Só manual + Cada 2 minutos + Cada 5 minutos Cada 15 minutos Cada 30 minutos Cada hora @@ -289,4 +291,4 @@ /e/ e.foundation.webdav.google Google - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 133d97f915c0a1623ecb7bb24e55852172373e85..7a4f793c178f03bc74b27300be5d3f253f0500b7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -159,6 +159,7 @@ Solo manualmente Ogni 2 minuti + Ogni 5 minuti Ogni 15 minuti Ogni 30 minuti Ogni ora @@ -290,4 +291,4 @@ e.foundation.webdav.google Google WebDAV - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3d24a91e6b6c5ab6ca30ac22e4878376a72be698..a1037cb56ae12f52b51883dac7ca581f233d6ff4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -158,6 +158,7 @@ 手動のみ 2 分ごと + 5 分ごと 15 分ごと 30 分ごと 1 時間ごと diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 7cee491e5189573660c044299fee8bc7e78376d1..c26b2b8b86cf766e59bea1f43e8bcc58a1143c9b 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -151,6 +151,7 @@ Bare manuelt Hvert 2 minutter + Hvert 5 minutter Hvert kvarter Hver halvtime Hver time diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ba236df0a6b22d1d451add8640bbd2428beb9da4..05c660f77405692e8e95627a995cc9ac4ea5b3fe 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -158,6 +158,8 @@ Taak synchronisatie interval Enkel handmatig + Iedere 2 minuten + Iedere 5 minuten Iedere 15 minuten Iedere 30 minuten Ieder uur @@ -320,4 +322,4 @@ \nProbeer het a.u.b. later opnieuw. \n \nOpmerking: je kan deze stap ook overslaan en later een account toevoegen in de Instellingen. Contacteer support in geval van problemen. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2522a71a4fd79530693e6a73ab90c8a10cee63b8..99ada2f52a39d8fd755ce87782f7c39be03ced82 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -161,6 +161,7 @@ Tylko ręcznie Co 2 minuty + Co 5 minuty Co 15 minut Co 30 minut Co godzinę diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1dc2ab1f63404a1ca3a539b0d18e2195b0eb80a2..42adbb8eb8954536b5b710d1f4c64176c7d294c1 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -161,6 +161,7 @@ Apenas manualmente A cada 2 minutos + A cada 5 minutos A cada 15 minutos A cada 30 minutos A cada hora diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8454b4c154b49a06fbb469f82ba30512e53d35ad..80987971f44b74334c7895bb6ceb321ca4ae3535 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -163,6 +163,7 @@ Только вручную Каждые 2 минуты + Каждые 5 минуты Каждые 15 минут Каждые 30 минут Каждый час @@ -297,4 +298,4 @@ Использовать конкретный сервер Требуется действительный URL адрес сервера URL сервера (https://server_url) - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2a0bbf8eefe58b90482494743ec3e38b4802ef2d..4c4951d9b364005742c378c1cb338a468f6bdfee 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -156,6 +156,8 @@ Synchr. interval pre úlohy Iba manuálne + Každých 2 minút + Každých 5 minút Každých 15 minút Každých 30 minút Každú hodinu diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml index 9d48b6f1beb594bbdf339c85cf345c90f80b1c1f..8993feb1b77836c002e9a64d14bcd5aeafbf5cbd 100644 --- a/app/src/main/res/values-sl-rSI/strings.xml +++ b/app/src/main/res/values-sl-rSI/strings.xml @@ -156,6 +156,8 @@ Naloge interval sinhronizacij Samo ročno + Vsakih 2 minut + Vsakih 5 minut Vsakih 15 minut Vsakih 30 minut Vsako uro diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 5df3fe256993364c5bba59f32270287cccc40889..0af738281def55e2cfc034896cbc0e918fd716cf 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -136,6 +136,8 @@ Интервал синх. задатака Само ручно + Сваких 2 минута + Сваких 5 минута Сваких 15 минута Сваких 30 минута Сваког сата diff --git a/app/src/main/res/values-szl/strings.xml b/app/src/main/res/values-szl/strings.xml index 38ecb315e4999c1c72b1448b81dc58ae35e47110..1706985057ab559a83ff8e35126c5e22f648f1be 100644 --- a/app/src/main/res/values-szl/strings.xml +++ b/app/src/main/res/values-szl/strings.xml @@ -156,6 +156,8 @@ Frekwyncyjo synchrōnizacyje list zadań Ino ryncznie + Co 2 minut + Co 5 minut Co 15 minut Co 30 minut Co godzina diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e8258109842b11fa3e06bda1be4dc01e9999f628..0d74bf8b693ec2eb53fd8c6150cc502eb5281b1a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -158,6 +158,7 @@ Вручну Кожні 2 хвилини + Кожні 5 хвилини Кожні 15 хвилин Кожні 30 хвилин Щогодинно diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0d17582bd5e5e9404dd08f7e4346ec88e06aa898..6a686560c326d21e90058c05a597073158d6bf3b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -157,6 +157,7 @@ 手动同步 每 2 分钟 + 每 5 分钟 每 15 分钟 每 30 分钟 每小时 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae49ab8adff028a875fd30d3f512b48dc93ae6d1..c9940ebc36c719d05e9b4d0f182f3bda9b441e7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -212,6 +212,7 @@ -1 120 + 300 900 1800 3600 @@ -222,6 +223,7 @@ Only manually Every 2 minutes + Every 5 minutes Every 15 minutes Every 30 minutes Every hour