diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java index ac7f4fdf3..434c91029 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -8,6 +8,7 @@ package com.todoroo.astrid.gtasks; import android.content.Intent; import android.os.Bundle; import android.preference.CheckBoxPreference; +import android.preference.Preference; import android.support.annotation.NonNull; import com.todoroo.andlib.utility.DateUtilities; @@ -75,8 +76,8 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go DateUtilities.getDateStringWithTime(GtasksPreferences.this, gtasksPreferenceService.getLastSyncDate()))); } - findPreference(getString(R.string.gtasks_GPr_interval_key)).setOnPreferenceChangeListener((preference, o) -> { - syncAdapterHelper.setSynchronizationInterval(Integer.parseInt((String) o)); + findPreference(getString(R.string.gtask_background_sync)).setOnPreferenceChangeListener((preference, o) -> { + syncAdapterHelper.enableSynchronization((Boolean) o); return true; }); findPreference(getString(R.string.sync_SPr_forget_key)).setOnPreferenceClickListener(preference -> { @@ -105,6 +106,19 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go startActivityForResult(new Intent(GtasksPreferences.this, GtasksLoginActivity.class), REQUEST_LOGIN); } + @Override + protected void onPostResume() { + super.onPostResume(); + + CheckBoxPreference backgroundSync = (CheckBoxPreference) findPreference(getString(R.string.gtask_background_sync)); + backgroundSync.setChecked(syncAdapterHelper.isSyncEnabled()); + if (syncAdapterHelper.isMasterSyncEnabled()) { + backgroundSync.setSummary(null); + } else { + backgroundSync.setSummary(R.string.master_sync_warning); + } + } + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == REQUEST_LOGIN) { diff --git a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java b/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java index aeb0668bd..7892bb334 100644 --- a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java +++ b/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java @@ -19,7 +19,6 @@ package org.tasks.gtasks; import android.accounts.Account; import android.app.PendingIntent; import android.content.ContentProviderClient; -import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; @@ -131,9 +130,6 @@ public class GoogleTaskSyncAdapter extends InjectingAbstractThreadedSyncAdapter syncResult.stats.numAuthExceptions++; return; } - if (!extras.getBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, false)) { - preferences.setBoolean(R.string.p_sync_warning_shown, false); - } Timber.d("%s: start sync", account); RecordSyncStatusCallback callback = new RecordSyncStatusCallback(gtasksPreferenceService, broadcaster); try { diff --git a/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java b/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java index c177ccd67..0695910cd 100644 --- a/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java +++ b/src/googleplay/java/org/tasks/gtasks/SyncAdapterHelper.java @@ -13,6 +13,8 @@ import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracking; import org.tasks.preferences.Preferences; +import java.util.concurrent.TimeUnit; + import javax.inject.Inject; import timber.log.Timber; @@ -76,7 +78,7 @@ public class SyncAdapterHelper { getAccount() != null; } - private boolean masterSyncEnabled() { + public boolean isMasterSyncEnabled() { return ContentResolver.getMasterSyncAutomatically(); } @@ -84,37 +86,23 @@ public class SyncAdapterHelper { Account account = getAccount(); if (account != null) { Timber.d("enableSynchronization=%s", enabled); - ContentResolver.setIsSyncable(account, AUTHORITY, 1); + ContentResolver.setSyncAutomatically(account, AUTHORITY, enabled); if (enabled) { - setSynchronizationInterval(preferences.getIntegerFromString(R.string.gtasks_GPr_interval_key, 0)); + ContentResolver.addPeriodicSync(account, AUTHORITY, Bundle.EMPTY, TimeUnit.HOURS.toSeconds(1)); } else { - setSynchronizationInterval(0); + ContentResolver.removePeriodicSync(account, AUTHORITY, Bundle.EMPTY); } } } - public void setSynchronizationInterval(int seconds) { - Account account = getAccount(); - if (account != null) { - boolean syncAutomatically = seconds > 0; - ContentResolver.setSyncAutomatically(account, AUTHORITY, syncAutomatically); - Timber.d("syncAutomatically=%s, syncInterval=%s", syncAutomatically, seconds); - if (syncAutomatically) { - ContentResolver.addPeriodicSync(account, AUTHORITY, Bundle.EMPTY, seconds); - } else { - ContentResolver.removePeriodicSync(account, AUTHORITY, Bundle.EMPTY); - } - } + public boolean isSyncEnabled() { + return isEnabled() && ContentResolver.getSyncAutomatically(getAccount(), AUTHORITY); } private Account getAccount() { return accountManager.getAccount(gtasksPreferenceService.getUserName()); } - public boolean shouldShowBackgroundSyncWarning() { - return isEnabled() && !masterSyncEnabled() && !ContentResolver.getPeriodicSyncs(getAccount(), AUTHORITY).isEmpty(); - } - public void checkPlayServices(TaskListFragment taskListFragment) { if (taskListFragment != null && preferences.getBoolean(R.string.sync_gtasks, false) && diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 92843dc8d..a29018a40 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -266,26 +266,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements repeatConfirmationReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_TASK_REPEATED)); - TaskListFragment taskListFragment = getTaskListFragment(); - if (syncAdapterHelper.shouldShowBackgroundSyncWarning() && !preferences.getBoolean(R.string.p_sync_warning_shown, false)) { - if (taskListFragment != null) { - taskListFragment.makeSnackbar(R.string.master_sync_warning) - .setAction(R.string.TLA_menu_settings, view -> { - Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); - }) - .setCallback(new Snackbar.Callback() { - @Override - public void onShown(Snackbar snackbar) { - preferences.setBoolean(R.string.p_sync_warning_shown, true); - } - }) - .show(); - } - } - - syncAdapterHelper.checkPlayServices(taskListFragment); + syncAdapterHelper.checkPlayServices(getTaskListFragment()); } public void restart() { diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index f5b2557dc..e8604acd5 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -361,10 +361,6 @@ public class TaskListFragment extends InjectingFragment implements refresh(); } - public Snackbar makeSnackbar(int resId) { - return makeSnackbar(getString(resId)); - } - public Snackbar makeSnackbar(String text) { Snackbar snackbar = Snackbar.make(coordinatorLayout, text, 8000) .setActionTextColor(getColor(context, R.color.snackbar_text_color)); diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 58547bf52..ff35a9051 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -188,14 +188,6 @@ تاسكس هو مشروع مفتوح المصدر مدموع من طرف مطور واحد. بعض الخيارات متوفرة عن الطريق الدفع من داخل التطبيق من أجل دعم التطوير التعتيم أبيض - تعطيل - كل ساعة - كل ثلاث ساعات - كل ست ساعات - كل 12 ساعة - كل يوم - كل ثلاث أيام - كل أسبوع المزامنة التلقائية معطلة الآن من طرف أندرويد تخصيص اللغة و الجهة إتجاه التنسيق diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 8cce4d5d7..09ad03a40 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -378,14 +378,6 @@ Тапет Ден/Нощ По подразбиране - изключено - на всеки час - на всеки три часа - на всеки шест часа - на всеки дванадесет часа - всеки ден - на всеки три дена - всяка седмица Автоматичната синхронизация в момента е деактивирана от Android Общи Език diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a0371ba41..3c6891391 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -137,14 +137,6 @@ Predeterminat Baix Blanc - desactivat - cada hora - cada tres hores - cada sis hores - cada dotze hores - diàriament - cada tres dies - setmanalment Idioma Localització D\'esquerra a dreta diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 42157b93a..33666d7c5 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -323,14 +323,6 @@ Tapeta Den/Noc Výchozí - zakázat - každou hodinu - každé tři hodiny - každých šest hodin - každých dvanáct hodin - každý den - každé tři dny - každý týden Automatická synchronizace je právě zakázána Androidem Všeobecný Jazyk diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index aa73aae89..55a0b0311 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -103,11 +103,4 @@ Log af Sletter al synkroniserings data Kildekode - hver time - hver 3. time - hver 6. time - hver 12. time - hver dag - hver 3. dag - hver uge \ No newline at end of file diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 537f775d4..2c3300c04 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -366,14 +366,6 @@ Hintergrundbild Tag/Nacht Standard - deaktivieren - stündlich - alle 3 Stunden - alle 6 Stunden - alle 12 Stunden - täglich - jeden dritten Tag - wöchentlich Automatische Syncronisation ist aktuell im System deaktiviert Allgemein Sprache diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index bbd852ab5..db29cb704 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -203,11 +203,4 @@ Συγχρονισμός παρασκηνίου Αποσύνδεση Δωρίστε - κάθε ώρα - κάθε τρεις ώρες - κάθε έξι ώρες - κάθε δώδεκα ώρες - κάθε μέρα - κάθε τρεις ημέρες - κάθε εβδομάδα \ No newline at end of file diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 9da3c9781..beb94afb6 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -373,14 +373,6 @@ Fondo de pantalla Día/Noche Predeterminado - deshabilitar - cada hora - cada tres horas - cada seis horas - cada doce horas - cada día - cada tres días - cada semana La sincronización automática está actualmente deshabilitada por Android Idioma Debe reiniciar Tasks para que los cambios tengan efecto diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index ab0b0a18e..b632ef5ee 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -257,14 +257,6 @@ Tasks پروژه‌ای متن‌باز است که عمدتاً توسط یک‌نفر توسعه داده می‌شود. برای حمایت از این تلاش، برخی ویژگی‌ها به‌صورت خریدهای داخل برنامه ارائه شده‌اند. شفافیت سفید - غیرفعال - هر ساعت - هر سه ساعت - هر شش ساعت - هر دوازده ساعت - هر روز - هر سه روز - هر هفته درحال‌حاضر هماهنگ‌سازی خودکار توسط اندروید غیرفعال است عمومی زبان diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 833eae3c4..6cfc19d49 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -376,14 +376,6 @@ Taustakuva Päivä/Yö Oletus - Poistettu - Joka tunti - Joka kolmas tunti - Joka kuudes tunti - Joka 12. tunti - Joka päivä - Joka kolmas päivä - Joka viikko Android on estänyt automaattisen synkronoinnin Yleinen Kieli diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index c8ec64942..d1101b977 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -364,14 +364,6 @@ Fond d\'écran Jour/Nuit Par défaut - désactiver - toutes les heures - toutes les trois heures - toutes les six heures - toutes les douze heures - tous les jours - tous les trois jours - toutes les semaines La synchronisation automatique est actuellement déactivé par Android Général Langage diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index dc9c9eea7..35b34ab79 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -375,14 +375,6 @@ Fondo de pantalla Día/Noche Predeterminado - deshabilitar - cada hora - cada tres horas - cada seis horas - cada doce horas - cada día - cada tres días - cada semana La sincronización automática está actualmente deshabilitada por Android Xeneral Idioma diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 93633c9c2..804d9cb9e 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -378,14 +378,6 @@ Háttérkép Nappal/Éjszaka Alapértelmezett - Letiltás - Óránként - Háromóránként - Hatóránként - Tizenkét óránként - Naponta - Háromnaponta - Hetente Az Android pillanatnyilag letiltotta az automatikus szinkronizálást. Általános Nyelv diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 220b3fdcd..0bfbaf2d0 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -374,14 +374,6 @@ Sfondo Giorno/Notte Predefinito - disabilita - ogni ora - ogni tre ore - ogni sei ore - ogni dodici ore - ogni giorno - ogni tre giorni - Ogni settimana La sincronizzazione automatica è disabilitata da Android Generale Lingua diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 02a89582b..a08a54179 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -375,14 +375,6 @@ תמונת רקע יום / לילה ברירת מחדל - השבת - כל שעה - כל שלוש שעות - כל שש שעות - כל שתים עשרה שעות - כל יום - כל שלושה ימים - כל שבוע סנכרון אוטומטי כרגע מושבת ע\"י Android כללי שפה diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 15307546c..74546ec2a 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -376,14 +376,6 @@ 壁紙 デイナイト デフォルト - 無効 - 1時間毎 - 3時間毎 - 6時間毎 - 12時間毎 - 毎日 - 3日に一度 - 毎週 自動同期は、現在 Android によって無効にされています 全般 言語 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 45be10b6a..1fc96697e 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -380,14 +380,6 @@ 바탕화면 주간/야간 기본값 - 사용안함 - 매시간 - 3시간마다 - 6시간마다 - 12시간마다 - 매일 - 3일마다 - 일주일마다 현재 자동 동기화는 안드로이드에 의해 사용이 불가합니다. 일반 언어 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 187c9cbda..c03f154f6 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -96,12 +96,4 @@ Logg ut Sletter all synkroniseringsdata Logg ut / slett synkroniseringsdata? - deaktiver - hver time - hver tredje time - hver sjette time - hver tolvte time - daglig - hver tredje dag - hver uke \ No newline at end of file diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index c6cc25cd0..e576641dc 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -366,14 +366,6 @@ Achtergrond Dag/Nacht Standaard - uitschakelen - elk uur - elke 3 uur - elke 6 uur - elke 12 uur - elke dag - elke 3 dagen - elke week Automatische synchronisatie is momenteel uitgezet door Android Globaal Taal diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index ed6bd592e..02c93fa95 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -374,14 +374,6 @@ Tapeta Dzień/noc Domyślny - Wyłączone - co godzinę - co 3 godziny - co 6 godzin - co 12 godzin - raz dziennie - co 3 dni - co tydzień Automatyczna synchronizacja jest obecnie wyłączona przez Androida Podstawowe Język diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index c1e926c27..baaf01f23 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -368,14 +368,6 @@ Plano de fundo Dia/Noite Padrão - desabilitar - a cada hora - a cada três horas - a cada seis horas - a cada doze horas - diariamente - a cada três dias - semanalmente Sincronização automática está atualmente desabilitada pelo Android Geral Idioma diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index b3f1eea50..d455cdf63 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -303,14 +303,6 @@ Preto Escuro Dia/Noite - desativar - cada hora - cada 3 horas - cada 6 horas - cada 12 horas - todos os dias - cada 3 dias - todas as semanas Reiniciar agora Da esquerda para a direita Da direita para a esquerda diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 3102eb5ad..2b71ccbb5 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -375,14 +375,6 @@ Как обои День / ночь По умолчанию - отключить - каждый час - каждые 3 часа - каждые 6 часов - каждые 12 часов - каждый день - каждые 3 дня - каждую неделю Автосинхронизация в Android выключена Общие Язык diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index ac6b16e82..4c8a0eae0 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -265,12 +265,4 @@ Zobraziť skryté Zobraziť dokončené Nízka - zakázať - každú hodinu - každé tri hodiny - každých šesť hodín - každých dvanásť hodín - každý deň - každý tretí deň - každý týždeň \ No newline at end of file diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 5f3d38b49..c7c97e2d5 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -212,12 +212,4 @@ Zbriše vse usklajene podatke Odjava/brisanje usklajenih podatkov? Donirajte - onemogoči - vsako uro - vsake 3 ure - vsakih 6 ur - vsakih 12 ur - vsak dan - vsake 3 dni - vsak teden \ No newline at end of file diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index ad785fe3d..bff98b42f 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -366,14 +366,6 @@ Mörkt Bakgrundsbild Dag/Natt - inaktivera - varje timme - var tredje timme - var sjätte timme - var tolfte timme - varje dag - var tredje dag - varje vecka Allmäna Språk Tasks måste startas om innan ändringarna börjar gälla diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 44408ec6f..e04e25e44 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -210,14 +210,6 @@ Titreşimler arasında duraklama (milisaniye) Tasks, bir geliştirici tarafından tutulan açık kaynaklı bir projedir. Bazı özellikleri, geliştirmeyi desteklemek için uygulama içi satın alma olarak sunulmaktadır. Şeffaflık - devre dışı bırak - her saat - her 3 saat - her 6 saat - her 12 saat - hergün - her 3 gün - her hafta Otomatik eşitleme şu anda Android tarafından devre dışı bırakıldı Yerelleştirme Yerleşim yönü diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 5fa43eb97..91f194f44 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -377,14 +377,6 @@ Шпалери День/Ніч Типово - вимкнути - кожну годину - кожні 3 години - кожні 6 годин - кожні 12 годин - щодня - кожні 3 дня - кожного тижня Автоматична синхронізація наразі недоступна в Android Загальні Мова diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index ba4cdda12..852e0a4a9 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -236,14 +236,6 @@ 蓝灰色 黑色 深灰色 - 停用 - 每小时 - 每3小时 - 每6小时 - 每12小时 - 每天 - 每3天 - 每周 语言 马上重启 稍后 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 5cb30c526..e7fc5aed8 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -234,14 +234,6 @@ 強調色 其他主題 預設 - 停用 - 每小時 - 每3小時 - 每6小時 - 每12小時 - 每天 - 每3天 - 每週 一般 語言 排版方向 diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 0c709de1f..0a3bddb33 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -40,18 +40,6 @@ 600 - - - @string/sync_interval_disable - @string/sync_interval_one_hour - @string/sync_interval_three_hours - @string/sync_interval_six_hours - @string/sync_interval_twelve_hours - @string/sync_interval_one_day - @string/sync_interval_three_days - @string/sync_interval_one_week - - @string/due_date @string/due_time diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml index a84e20b18..615138473 100644 --- a/src/main/res/values/keys.xml +++ b/src/main/res/values/keys.xml @@ -158,24 +158,8 @@ - - - 0 - 3600 - 10800 - 21600 - 43200 - 86400 - 259200 - 604800 - - sync_forget - - - gtasks_sync_freq - @@ -293,7 +277,6 @@ theme_color theme_accent default_gtasks_list - sync_warning_shown language layout_direction led_color @@ -319,5 +302,6 @@ rmd_show_description start_of_week use_native_datetime_pickers + gtask_background_sync diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 764addc29..ef8978a31 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -778,14 +778,6 @@ File %1$s contained %2$s.\n\n Day/Night Default - Disable - Every hour - Every three hours - Every six hours - Every twelve hours - Every day - Every three days - Every week Automatic synchronization is currently disabled by Android General Language diff --git a/src/main/res/xml/preferences_gtasks.xml b/src/main/res/xml/preferences_gtasks.xml index 1f824e0ea..cf795693b 100644 --- a/src/main/res/xml/preferences_gtasks.xml +++ b/src/main/res/xml/preferences_gtasks.xml @@ -18,13 +18,11 @@ android:key="@string/p_gtasks_default_list" android:title="@string/default_list" /> - + android:key="@string/gtask_background_sync" + android:title="@string/sync_SPr_interval_title"/> \ No newline at end of file