diff --git a/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt b/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt index b62b6024f..486771d31 100644 --- a/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt +++ b/app/src/main/java/org/tasks/jobs/SyncOpenTasksWork.kt @@ -36,7 +36,7 @@ class SyncOpenTasksWork @WorkerInject constructor( override suspend fun doSync() { openTasksSynchronizer.sync() - if (inputData.getBoolean(EXTRA_IMMEDIATE, false)) { + if (isImmediate) { AccountManager .get(context) .accounts diff --git a/app/src/main/java/org/tasks/jobs/SyncWork.kt b/app/src/main/java/org/tasks/jobs/SyncWork.kt index 983244d63..ad60f8cea 100644 --- a/app/src/main/java/org/tasks/jobs/SyncWork.kt +++ b/app/src/main/java/org/tasks/jobs/SyncWork.kt @@ -1,7 +1,11 @@ package org.tasks.jobs import android.content.Context +import android.net.ConnectivityManager +import androidx.core.content.ContextCompat.getSystemService +import androidx.core.net.ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_ENABLED import androidx.work.WorkerParameters +import com.todoroo.andlib.utility.AndroidUtilities.atLeastNougat import org.tasks.LocalBroadcastManager import org.tasks.analytics.Firebase import org.tasks.injection.BaseWorker @@ -19,6 +23,13 @@ abstract class SyncWork constructor( if (!enabled()) { return Result.failure() } + if (atLeastNougat() && isBackground) { + getSystemService(context, ConnectivityManager::class.java)?.apply { + if (restrictBackgroundStatus == RESTRICT_BACKGROUND_STATUS_ENABLED) { + return Result.failure() + } + } + } synchronized(LOCK) { if (preferences.getBoolean(syncStatus, false)) { @@ -38,6 +49,12 @@ abstract class SyncWork constructor( return Result.success() } + val isImmediate: Boolean + get() = inputData.getBoolean(EXTRA_IMMEDIATE, false) + + private val isBackground: Boolean + get() = inputData.getBoolean(EXTRA_BACKGROUND, false) + protected abstract val syncStatus: Int protected abstract suspend fun enabled(): Boolean @@ -48,5 +65,6 @@ abstract class SyncWork constructor( private val LOCK = Any() const val EXTRA_IMMEDIATE = "extra_immediate" + const val EXTRA_BACKGROUND = "extra_background" } } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.kt b/app/src/main/java/org/tasks/jobs/WorkManager.kt index 766163e67..752297d0a 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManager.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManager.kt @@ -31,9 +31,6 @@ interface WorkManager { fun updateBackgroundSync() - fun updateBackgroundSync( - forceBackgroundEnabled: Boolean?, forceOnlyOnUnmetered: Boolean?) - fun scheduleRefresh(time: Long) fun scheduleMidnightRefresh() diff --git a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt index 82e14bfcb..3cdfa70a0 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt @@ -25,6 +25,7 @@ import org.tasks.data.CaldavAccount.Companion.TYPE_TASKS import org.tasks.date.DateTimeUtils.midnight import org.tasks.date.DateTimeUtils.newDateTime import org.tasks.jobs.MigrateLocalWork.Companion.EXTRA_ACCOUNT +import org.tasks.jobs.SyncWork.Companion.EXTRA_BACKGROUND import org.tasks.jobs.SyncWork.Companion.EXTRA_IMMEDIATE import org.tasks.jobs.WorkManager.Companion.MAX_CLEANUP_LENGTH import org.tasks.jobs.WorkManager.Companion.REMOTE_CONFIG_INTERVAL_HOURS @@ -82,9 +83,7 @@ class WorkManagerImpl constructor( override fun migrateLocalTasks(caldavAccount: CaldavAccount) { val builder = OneTimeWorkRequest.Builder(MigrateLocalWork::class.java) .setInputData(Data.Builder().putString(EXTRA_ACCOUNT, caldavAccount.uuid).build()) - .setConstraints(Constraints.Builder() - .setRequiredNetworkType(NetworkType.CONNECTED) - .build()) + .setConstraints(networkConstraints) enqueue(workManager.beginUniqueWork(TAG_MIGRATE_LOCAL, APPEND_OR_REPLACE, builder.build())) } @@ -120,14 +119,7 @@ class WorkManagerImpl constructor( val builder = OneTimeWorkRequest.Builder(c) .setInputData(Data.Builder().putBoolean(EXTRA_IMMEDIATE, immediate).build()) if (requireNetwork) { - builder.setConstraints(Constraints.Builder() - .setRequiredNetworkType( - if (!immediate && preferences.getBoolean(R.string.p_background_sync_unmetered_only, false)) { - NetworkType.UNMETERED - } else { - NetworkType.CONNECTED - }) - .build()) + builder.setConstraints(networkConstraints) } if (!immediate) { builder.setInitialDelay(1, TimeUnit.MINUTES) @@ -151,48 +143,33 @@ class WorkManagerImpl constructor( enqueue( OneTimeWorkRequest.Builder(ReverseGeocodeWork::class.java) .setInputData(Data.Builder().putLong(ReverseGeocodeWork.PLACE_ID, place.id).build()) - .setConstraints( - Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())) + .setConstraints(networkConstraints)) } override fun updateBackgroundSync() { - updateBackgroundSync(null, null) - } - - @SuppressLint("CheckResult") - override fun updateBackgroundSync( - forceBackgroundEnabled: Boolean?, forceOnlyOnUnmetered: Boolean?) { - val enabled = forceBackgroundEnabled - ?: preferences.getBoolean(R.string.p_background_sync, true) - val unmetered = forceOnlyOnUnmetered - ?: preferences.getBoolean(R.string.p_background_sync_unmetered_only, false) throttle.run { scheduleBackgroundSync( TAG_BACKGROUND_SYNC_GOOGLE_TASKS, SyncGoogleTasksWork::class.java, - enabled && googleTaskListDao.accountCount() > 0, - unmetered) + googleTaskListDao.accountCount() > 0) } throttle.run { scheduleBackgroundSync( TAG_BACKGROUND_SYNC_CALDAV, SyncCaldavWork::class.java, - enabled && caldavDao.getAccounts(TYPE_CALDAV, TYPE_TASKS).isNotEmpty(), - unmetered) + caldavDao.getAccounts(TYPE_CALDAV, TYPE_TASKS).isNotEmpty()) } throttle.run { scheduleBackgroundSync( TAG_BACKGROUND_SYNC_ETESYNC, SyncEteSyncWork::class.java, - enabled && caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty(), - unmetered) + caldavDao.getAccounts(TYPE_ETESYNC).isNotEmpty()) } throttle.run { scheduleBackgroundSync( TAG_BACKGROUND_SYNC_ETEBASE, SyncEtebaseWork::class.java, - enabled && caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty(), - unmetered) + caldavDao.getAccounts(TYPE_ETEBASE).isNotEmpty()) } throttle.run { scheduleBackgroundSync( @@ -203,12 +180,12 @@ class WorkManagerImpl constructor( } } - private fun scheduleBackgroundSync( - tag: String, c: Class, enabled: Boolean, unmetered: Boolean? = null) { - Timber.d("scheduleBackgroundSync($tag, $c, enabled = $enabled, unmetered = $unmetered)") + private fun scheduleBackgroundSync(tag: String, c: Class, enabled: Boolean) { + Timber.d("scheduleBackgroundSync($tag, $c, enabled = $enabled)") if (enabled) { val builder = PeriodicWorkRequest.Builder(c, 1, TimeUnit.HOURS) - unmetered?.let { builder.setConstraints(getNetworkConstraints(it)) } + .setInputData(Data.Builder().putBoolean(EXTRA_BACKGROUND, true).build()) + .setConstraints(networkConstraints) workManager.enqueueUniquePeriodicWork( tag, ExistingPeriodicWorkPolicy.KEEP, builder.build()) } else { @@ -252,8 +229,7 @@ class WorkManagerImpl constructor( ExistingPeriodicWorkPolicy.KEEP, PeriodicWorkRequest.Builder( RemoteConfigWork::class.java, REMOTE_CONFIG_INTERVAL_HOURS, TimeUnit.HOURS) - .setConstraints( - Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()) + .setConstraints(networkConstraints) .build()) } } @@ -272,13 +248,7 @@ class WorkManagerImpl constructor( } private val networkConstraints: Constraints - get() = getNetworkConstraints( - preferences.getBoolean(R.string.p_background_sync_unmetered_only, false)) - - private fun getNetworkConstraints(unmeteredOnly: Boolean) = - Constraints.Builder() - .setRequiredNetworkType(if (unmeteredOnly) NetworkType.UNMETERED else NetworkType.CONNECTED) - .build() + get() = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build() override fun cancelNotifications() { alarmManager.cancel(notificationPendingIntent) diff --git a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt index ffe50ca4d..29e8222eb 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt @@ -27,7 +27,6 @@ import org.tasks.data.OpenTaskDao.Companion.isEteSync import org.tasks.etebase.EtebaseAccountSettingsActivity import org.tasks.etesync.EteSyncAccountSettingsActivity import org.tasks.injection.InjectingPreferenceFragment -import org.tasks.jobs.WorkManager import org.tasks.opentasks.OpenTaskAccountSettingsActivity import org.tasks.preferences.Preferences import org.tasks.preferences.PreferencesViewModel @@ -38,7 +37,6 @@ import javax.inject.Inject @AndroidEntryPoint class Synchronization : InjectingPreferenceFragment() { - @Inject lateinit var workManager: WorkManager @Inject lateinit var preferences: Preferences @Inject lateinit var caldavDao: CaldavDao @Inject lateinit var googleTaskListDao: GoogleTaskListDao @@ -50,21 +48,6 @@ class Synchronization : InjectingPreferenceFragment() { override fun getPreferenceXml() = R.xml.preferences_synchronization override suspend fun setupPreferences(savedInstanceState: Bundle?) { - findPreference(R.string.p_background_sync_unmetered_only) - .setOnPreferenceChangeListener { _: Preference?, o: Any? -> - lifecycleScope.launch { - workManager.updateBackgroundSync(null, o as Boolean?) - } - true - } - findPreference(R.string.p_background_sync) - .setOnPreferenceChangeListener { _: Preference?, o: Any? -> - lifecycleScope.launch { - workManager.updateBackgroundSync(o as Boolean?, null) - } - true - } - findPreference(R.string.add_account) .setOnPreferenceClickListener { lifecycleScope.launch { @@ -193,9 +176,7 @@ class Synchronization : InjectingPreferenceFragment() { synchronizationPreferences.removeAll() val hasGoogleAccounts: Boolean = addGoogleTasksAccounts(synchronizationPreferences) val hasCaldavAccounts = addCaldavAccounts(synchronizationPreferences) - val syncEnabled = hasGoogleAccounts || hasCaldavAccounts - findPreference(R.string.accounts).isVisible = syncEnabled - findPreference(R.string.sync_SPr_interval_title).isVisible = syncEnabled + findPreference(R.string.accounts).isVisible = hasGoogleAccounts || hasCaldavAccounts } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 88fb7d6d8..0d7e78713 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -112,7 +112,6 @@ أمس غدا أمس - تحيين في الخلفية إظهار مربعات التعليم إظهار الهايدر إظهار الإعدادات diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index f03718f77..379aae8f6 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -268,7 +268,6 @@ Вчера Утре Вчера - Синхронзиране във фонов режим Покажи отметки Покажи хедър Покажи настройки @@ -415,7 +414,6 @@ Помощ Home set не е намерен Свързването е неуспешно - Само при неограничени връзки Обнови към pro Управление на абонамент Обнови покупки diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b499b6e66..a4b177497 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -85,7 +85,6 @@ Avui Demà Ahir - Sincronitzar en segon pla Codi font Contribuir traduccions Contacta amb el desenvolupador diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b83833eab..21f6b5ae5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -167,7 +167,6 @@ Včera Zítra Včera - Synchronizace na pozadí Zobrazovat zaškrtávací políčka Zobrazit záhlaví Zobrazit nastavení @@ -429,7 +428,6 @@ Zobrazit upozornění Nápověda Nepodařilo se připojit - Pouze pokud připojení není účtované podle objemu dat Získat PRO verzi Spravovat předplatné Obnovit nákupy diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c8b127424..b02f8a270 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -73,7 +73,6 @@ I dag I morgen I går - Baggrundssynkronisering Kildekode Gentages %1$s hver %2$s indtil %3$s Gentages %1$s hver %2$s @@ -225,7 +224,6 @@ Opret ny opgave Geninitialisér Kunne ikke tilgå kontoen - Kun på ubegrænsede forbindelser Log ud af %s\? Al data for denne konto vil blive slettet fra enheden Log ud Denne funktion kræver et abonnement diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f65af7432..64994b48e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -268,7 +268,6 @@ Gestern Morgen Gestern - Hintergrund-Synchronisierung Checkboxen anzeigen Kopfleiste anzeigen Einstellungen anzeigen @@ -411,7 +410,6 @@ Hilfe CalDAV-Home-Set nicht gefunden Verbindung fehlgeschlagen - Nur bei unbeschränkter Verbindung Pro-Funktionen freischalten Abonnement ändern Einkäufe aktualisieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 46eb1e43e..112358109 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -146,6 +146,5 @@ Χθές Αύριο Χθές - Συγχρονισμός παρασκηνίου Δωρίστε \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 63ff457a9..1c420adef 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -269,7 +269,6 @@ Ayer Mñna Ayer - Sincronización en segundo plano Mostrar casillas de verificación Mostrar encabezado Mostrar configuración @@ -414,7 +413,6 @@ Ayuda Origen no encontrado No se pudo conectar - Sólo en conexiones sin cargos Actualizar a profesional Modificar suscripción Actualizar los acquisiciones diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index c9dbda32d..8cdcf0d80 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -147,7 +147,6 @@ Eile Homme Eile - Taustal sünkroonimine Näita märkekaste Näita päist Näita seadeid diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index bcfc02eb7..66c8a7a13 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -271,7 +271,6 @@ Atzo Bihar Atzo - Bigarren planoko sinkronizazioa Erakutsi markaketa-koadroak Erakutsi goiburua Erakutsi ezarpenak @@ -420,7 +419,6 @@ Laguntza Ez da jatorria aurkitu Ezin izan da konektatu - Mugagabeko konexioetan besterik ez Aldatu pro bertsiora Aldatu harpidetza Freskatu erosketak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d3796467b..274df9954 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -164,7 +164,6 @@ فردا بعد از ظهر فردا دیروز - سینک پیش زمینه نمایش محل تیک نمایش سربرگ نمایش تنظیمات diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c7148978a..2a4ca5a52 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -260,7 +260,6 @@ Eilen Huominen Eilinen - Tausta synkronointi Näytä valintaruudut Näytä otsikot Näytä asetukset @@ -573,7 +572,6 @@ Saavuit paikkaan %s Kirjaudu ulos %s\? Kaikki tälle tilille tallennetut tiedot poistetaan laitteeltasi Päivitä ostoksesi - Vain rajoittamattomalla yhteydellä Piilotettu Otsikon alle Otsikon jälkeen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 70128e92d..9f1d7224c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -254,7 +254,6 @@ Hier Demain Hier - Synchro. en arrière-plan Montrer les cases à cocher Montrer l\'en-tête Voir les paramètres @@ -396,7 +395,6 @@ Aide Ensemble d\'accueil non trouvé Impossible de se connecter - Uniquement sur les connexions illimitées Passer en pro Modifier les abonnements Rafraîchir les achats diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5f7311683..16d915b73 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -182,7 +182,6 @@ Ayer Mñna Ayer - Sincronización en segundo plano Mostrar casillas de verificación Mostrar encabezado Mostrar configuración diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fd5bc1d73..8fc85512d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -268,7 +268,6 @@ Tegnap Holn Tegn - Szinkronizáció a háttérben Jelölőnégyzetek megjelenítése Fejléc megjelenítése Beállítások megjelenítése @@ -415,7 +414,6 @@ Súgó Home set nem található Sikertelen kapcsolódás - Csak forgalmidíj mentes kapcsolatoknál Upgrade pro verzióra Előfizetés módosítása Vásárlások frissítése diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 54387a5ba..4fcd32725 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -194,7 +194,6 @@ Kemarin Bsk Kmrn - Sinkronisasi latar belakang Tampilkan kotak centang Tampilkan tajuk Tampilkan pengaturan @@ -347,7 +346,6 @@ Buat tugas Bantuan Koneksi gagal - Hanya pada koneksi tak terbatas Tingkatkan ke pro Kelola langganan Segarkan pembelian diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bd1fc2250..4f6599273 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -270,7 +270,6 @@ Ieri Domani Ieri - Sincronizza in background Mostra le caselle di selezione Mostra intestazione Mostra impostazioni @@ -415,7 +414,6 @@ Aiuto Home set non trovato Connessione fallita - Solo su connessioni non a consumo Aggiorna a pro Modifica abbonamento Aggiorna acquisti diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 1282d7d3d..c9540e023 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -301,7 +301,6 @@ אתמול מחר אתמול - סנכרון ברקע הצג תיבות סימון הצג כותרת הצג הגדרות @@ -449,7 +448,6 @@ עזרה קבוצת הבית לא נמצאה לא ניתן להתחבר - רק בחיבורים ללא חיוב לפי נפח גלישה שידרוג לגירסת pro ניהול מינוי עדכן רכישות diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cc7b1313b..f12046b94 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -266,7 +266,6 @@ 昨日 明日 昨日 - バックグラウンド同期 チェックボックスを表示 ヘッダーを表示 設定を表示 @@ -412,7 +411,6 @@ ヘルプ ホームの設定が見つかりません 接続に失敗しました - 定額の接続時のみ プロ版にアップグレード サブスクリプションの管理 購入を更新 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8d1704b57..b8dba90c4 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -268,7 +268,6 @@ 어제 내일 어제 - 백그라운드 동기화 체크박스 표시 헤더 표시 설정버튼 표시 @@ -413,7 +412,6 @@ 도움말 CalDAV 홈 설정 없음 연결 실패 - 요금이 부과되지 않는 접속인 경우에만 프로 서비스로 업그레이드 구매 새로고침 신청 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 71fec1b0f..6c2e60907 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -265,7 +265,6 @@ Vakar Ryt Vakar - Foninis sinchronizavimas Rodyti žymimus kvadratėlius Rodyti antraštę Rodyti nustatymus @@ -411,7 +410,6 @@ Pagalba Kalendorių rinkinio direktorija nerasta Sujungimas nepavyko - Naudoti tik \"unmetered\" ryšius Atnaujinti į pro versiją Redaguoti prenumeratą Atnaujinti pirkimus diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index df24e4f56..6ab01af0d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -113,7 +113,6 @@ I dag I morgen I går - Bakgrunnssynkronisering Vis avkryssingsbokser Vis innstillinger Varsler @@ -420,7 +419,6 @@ Hjelp Fant ikke CalDAV-\"home set\" Kunne ikke koble til - Kun for ubegrensede tilkoblinger Oppgrader til pro Endre abonnement Gjenoppfrisk kjøp diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 741387d69..90bf5026a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -264,7 +264,6 @@ Gisteren mrgn gisteren - Achtergrond synchronisatie Toon vinkboxjes Toon titel Toon instellingen @@ -404,7 +403,6 @@ Notificatie lijst Home set niet gevonden Kon geen verbinding maken - Alleen bij onbeperkte verbindingen Opwaarderen naar pro Verander abonnement Vernieuw aankopen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fa4a20556..8d204a1b1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -280,7 +280,6 @@ Wczoraj jtr wcz - Synchronizacja w tle Pokaż przyciski wyboru Pokaż nagłówek Pokaż ustawienia @@ -425,7 +424,6 @@ Lista powiadomień Pomoc Błąd połączenia - Tylko niezliczane połączenia Upgrade do pro Zmodyfikuj subskrypcję Odśwież zakupy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 31069aee2..0676f5213 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -266,7 +266,6 @@ Ontem Amanhã Ontem - Sincronização em segundo plano Mostrar tarefas ocultas Mostrar ocultas Configurações @@ -412,7 +411,6 @@ Ajuda Conjunto inicial não encontrado Não foi possível conectar - Apenas em conexões ilimitadas Atualizar para Pro Gerenciar subscrição Atualizar compras diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index cea2f945d..e0a21774b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -257,7 +257,6 @@ Ontem Amanhã Ontem - Sincronização em segundo plano Mostrar caixas de seleção Mostrar cabeçalho Definições: @@ -428,7 +427,6 @@ Atualizar compras Gerir assinatura Atualizar para pro - Apenas em conexões ilimitadas Conjunto inicial não encontrado Ajuda Listar notificações diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 703aa43bb..132b8d922 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -285,7 +285,6 @@ Вчера Завтра Вчера - Фоновая синхронизация Показать кнопки для галочек Показать заголовок Показать настройки @@ -432,7 +431,6 @@ Помощь Домашний набор не найден Не удалось подключиться - Только на соединениях без тарификации Обновить до версии Про Изменить подписку Обновить покупки diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 6b4eca928..f76ae98b9 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -266,7 +266,6 @@ Včera Zajtra Včera - Synchronizácia na pozadí Ukázať zaškrtávacie políčka Ukázať záhlavia Ukázať nastavenia @@ -411,7 +410,6 @@ Pomoc Nastavenie Domov nenájdené Spojenie zlyhalo - Iba na bezplatných pripojeniach Rozšíriť na verziu pro Platená verzia Obnoviť nákupy diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml index 37256fa81..b554a191a 100644 --- a/app/src/main/res/values-sl-rSI/strings.xml +++ b/app/src/main/res/values-sl-rSI/strings.xml @@ -151,6 +151,5 @@ Včeraj Jutr Včer - Usklajevanje v ozadju Donirajte \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 127171c04..817ce82d1 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -182,7 +182,6 @@ Igår Imorgon Igår - Bakgrundssynkronisering Visa kryssrutor Visa rubrik Visa ikon för inställningar @@ -415,7 +414,6 @@ Hjälp Hemuppsättning hittades inte Kunde inte ansluta - Endast på obegränsade anslutningar Uppgradera till Pro Hantera prenumerations Uppdatera inköp diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 844a64456..999716f5b 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -304,7 +304,6 @@ வாங்குதல்களைப் புதுப்பிக்கவும் சந்தாவை நிர்வகிக்கவும் சார்புக்கு மேம்படுத்தவும் - அளவிடப்படாத இணைப்புகளில் மட்டுமே இணைக்க முடியவில்லை முகப்பு தொகுப்பு கிடைக்கவில்லை உதவி & கருத்து @@ -468,7 +467,6 @@ தலைப்பைக் காட்டு பின்னணியை மறைக்க தேர்வுப்பெட்டிகளைக் காட்டு - பின்னணி ஒத்திசைவு நேற்று நாளை நேற்று diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index d752b4e0d..e957be3cd 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -58,7 +58,6 @@ Magdagdag ng account Gumagamit Mga baterya optimization ay maaaring antalahin ang mga notification - Sa metered connections laang Ipaalala sa pagdating Dumating sa %s Umalis %s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ee90b21a3..7e9a83637 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -271,7 +271,6 @@ Dün Yarın Dün - Arka planda eşzamanla Onay kutularını göster Başlığı göster Ayarları göster @@ -417,7 +416,6 @@ Yardım Ev takımı (home set) bulunamadı Bağlanamadı - Yalnızca ölçülmeyen bağlantılarda Pro\'ya yükselt Aboneliği değiştir Satın alımları yenile diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2929a5269..76fe6c4ad 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -286,7 +286,6 @@ Вчора Звтр Вчр - Фонова синхронізація Показати кнопки для галочок Показати заголовок Показати налаштування @@ -433,7 +432,6 @@ Допомога Домашній список не знайдено Не вдалося з’єднатися - Лише при з\'єднанні без обліку трафіка Покращити до Преміум Змінити підписку Оновити покупки diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e1c66ee85..68813344f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -254,7 +254,6 @@ 昨天 明天 昨天 - 后台同步 显示复选框 显示标题 显示设置 @@ -398,7 +397,6 @@ 帮助 未设置CalDAVHome 无法连接 - 仅于不计费的连接 升级至专业版 刷新购买 订购 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 363444156..83e1965f3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -159,7 +159,6 @@ 昨天 明天 昨天 - 後台同步 顯示核取方塊 顯示標頭 顯示設定 diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 4f1841716..93a5f8df0 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -376,7 +376,6 @@ Debug start_of_week - gtask_background_sync bundle_notifications strict_mode_vm strict_mode_thread @@ -385,7 +384,6 @@ debug_pro debug_crash_main_queries warned_play_services - background_sync_unmetered_only sync_ongoing_google_tasks sync_ongoing_caldav sync_ongoing_etesync diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f2691f13a..e4922996f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -308,7 +308,6 @@ File %1$s contained %2$s.\n\n tmrw Yest yest - Background sync Show checkboxes Hide background Show header @@ -492,7 +491,6 @@ File %1$s contained %2$s.\n\n Help & feedback Home set not found Could not connect - Only on unmetered connections Upgrade to pro Modify subscription Refresh purchases diff --git a/app/src/main/res/xml/preferences_synchronization.xml b/app/src/main/res/xml/preferences_synchronization.xml index 28525ae84..0ca46a81d 100644 --- a/app/src/main/res/xml/preferences_synchronization.xml +++ b/app/src/main/res/xml/preferences_synchronization.xml @@ -13,20 +13,4 @@ android:title="@string/add_account" app:icon="@drawable/ic_outline_add_24px" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/preferences_tasks.xml b/app/src/main/res/xml/preferences_tasks.xml index 27f8e7a31..a149ea097 100644 --- a/app/src/main/res/xml/preferences_tasks.xml +++ b/app/src/main/res/xml/preferences_tasks.xml @@ -39,21 +39,6 @@ - - - - - -