Eliminate obsolete background data sync option

It only applied to pre-ICS devices.

ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED is no longer
broadcast.

ConnectivityManager.getBackgroundDataSetting() always returns true.

res/values-ca/strings.xml

@@ -650,8 +650,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="background_ops_label">Sincronització 2n pla</string>
   <string name="background_ops_never">Mai</string>
   <string name="background_ops_always">Sempre</string>
-  <string name="background_ops_enabled">Quan s\'està comprovant \'Dades en segon pla\'</string>
-  <string name="background_ops_auto_sync">Quan s\'està comprovant \'Dades en segon pla\' i \'Sincronització Automàtica\'</string>
   <string name="background_ops_auto_sync_only">Quan la Sincronització Automàtica està activada</string>
   <string name="batch_select_all">Selecciona-ho tot</string>
   <string name="account_setup_push_limit_label">Carpetes màximes a comprovar</string>

res/values-cs/strings.xml

@@ -650,8 +650,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="background_ops_label">Synchronizace na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
-  <string name="background_ops_enabled">Je-li \'Data na pozadí\' zaškrtnuto</string>
-  <string name="background_ops_auto_sync">Jsou-li \'Data na pozadí\' a \'Aut. synchronizace\' zaškrtnuty</string>
   <string name="background_ops_auto_sync_only">Jsou-li \'Aut. synchronizace\' zaškrtnuty</string>
   <string name="batch_select_all">Vybrat vše</string>
   <string name="account_setup_push_limit_label">Max. počet složek řízených PUSH</string>

res/values-da/strings.xml

@@ -644,8 +644,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="background_ops_label">Baggrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <string name="background_ops_always">Altid</string>
-  <string name="background_ops_enabled">Når \"Baggrundsdata\" er aktiveret</string>
-  <string name="background_ops_auto_sync">Når \"Baggrundsdata\" &amp; \"Auto-sync\" er aktiveret</string>
   <string name="background_ops_auto_sync_only">Når \"Auto-sync\" er valgt</string>
   <string name="batch_select_all">Vælg alle</string>
   <string name="account_setup_push_limit_label">Max antal mapper som skal kontrolleres ved push</string>

res/values-de/strings.xml

@@ -657,8 +657,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="background_ops_label">Hintergrund-Synchronisierung</string>
   <string name="background_ops_never">Nie</string>
   <string name="background_ops_always">Immer</string>
-  <string name="background_ops_enabled">Wenn \'Hintergrunddaten\' aktiviert ist</string>
-  <string name="background_ops_auto_sync">Wenn \'Hintergrunddaten\' &amp; \'Automatische Synchronisation\' aktiviert sind</string>
   <string name="background_ops_auto_sync_only">Wenn \'Automatische Synchronisation\' aktiviert ist</string>
   <string name="batch_select_all">Alle auswählen</string>
   <string name="account_setup_push_limit_label">Maximale Push-Ordner-Anzahl</string>

res/values-el/strings.xml

@@ -649,8 +649,6 @@
   <string name="background_ops_label">Συγχρονισμός στο παρασκήνιο</string>
   <string name="background_ops_never">Ποτέ</string>
   <string name="background_ops_always">Πάντοτε</string>
-  <string name="background_ops_enabled">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\'</string>
-  <string name="background_ops_auto_sync">Όταν ελέγχονται \'Δεδομένα παρασκηνίου\' &amp; \'Αυτόματο συγχρονισμός\'</string>
   <string name="background_ops_auto_sync_only">Όταν έχει επιλεγεί \'Auto-sync\'</string>
   <string name="batch_select_all">Επιλογή όλων</string>
   <string name="account_setup_push_limit_label">Μέγιστο φακέλων για σπρώξιμο</string>

res/values-es/strings.xml

@@ -659,8 +659,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Siempre</string>
-  <string name="background_ops_enabled">Cuando \'Sincronización en segundo plano\' esté activo</string>
-  <string name="background_ops_auto_sync">Cuando \'Sincronización en segundo plano\' y \'Sincronización automática\' estén activos</string>
   <string name="background_ops_auto_sync_only">Cuando \'sincronización automática\' esté activo</string>
   <string name="batch_select_all">Seleccionar todos</string>
   <string name="account_setup_push_limit_label">Max. carpetas Push</string>

res/values-eu/strings.xml

@@ -650,8 +650,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="background_ops_label">Atzeko planoko sinkronizazioa</string>
   <string name="background_ops_never">Inoiz ez</string>
   <string name="background_ops_always">Beti</string>
-  <string name="background_ops_enabled">\'Background data\' gaituta dagoenean</string>
-  <string name="background_ops_auto_sync">\'Background data\' eta \'Auto-sinkronizazioa\' gaituta daudenean</string>
   <string name="background_ops_auto_sync_only">\'Auto-sinkronizazioa\' gaituta dagoenean</string>
   <string name="batch_select_all">Guztia hautatu</string>
   <string name="account_setup_push_limit_label">Push erabiliz egiaztatuko diren karpeta kopuru maximoa</string>

res/values-fi/strings.xml

@@ -659,8 +659,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="background_ops_label">Synkronointi taustalla</string>
   <string name="background_ops_never">Ei koskaan</string>
   <string name="background_ops_always">Aina</string>
-  <string name="background_ops_enabled">Kun Taustadata on valittu</string>
-  <string name="background_ops_auto_sync">Kun \'Taustadata\' ja \'Automaattinen synkronointi\' on valittu</string>
   <string name="background_ops_auto_sync_only">Kun Automaattinen synkronointi on valittu</string>
   <string name="batch_select_all">Valitse kaikki</string>
   <string name="account_setup_push_limit_label">Push-tilassa tarkistettavien kansioiden enimmäismäärä</string>

res/values-fr/strings.xml

@@ -658,8 +658,6 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="background_ops_label">Synchronisation en arrière-plan</string>
   <string name="background_ops_never">Jamais</string>
   <string name="background_ops_always">Toujours</string>
-  <string name="background_ops_enabled">Lorsque «\u00A0Données en arrière-plan\u00A0» est activé</string>
-  <string name="background_ops_auto_sync">Lorsque «\u00A0Données en arrière-plan\u00A0» et «\u00A0Synchronisation auto\u00A0» sont activés</string>
   <string name="background_ops_auto_sync_only">Lorsque «\u00A0Synchronisation auto\u00A0» est activée</string>
   <string name="batch_select_all">Sélectionner tout</string>
   <string name="account_setup_push_limit_label">Maximum de dossiers avec le pousser à vérifier</string>

res/values-gl/strings.xml

@@ -582,8 +582,6 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
   <string name="background_ops_label">Sincronizar en segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
-  <string name="background_ops_enabled">Cando \'Sincronización en segundo plano\' esté activo</string>
-  <string name="background_ops_auto_sync">Cando \'Sincronización en segundo plano\' e \'Sincronización automática\' estén activos</string>
   <string name="batch_select_all">Seleccionar todos</string>
   <string name="account_setup_push_limit_label">Max. subscripcións</string>
   <string name="account_setup_push_limit_10">10 carpetas</string>

res/values-hu/strings.xml

@@ -638,8 +638,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="background_ops_label">Háttérszinkronizálás</string>
   <string name="background_ops_never">Soha</string>
   <string name="background_ops_always">Mindig</string>
-  <string name="background_ops_enabled">Ha a \'Háttéradatok\' bekapcsolva</string>
-  <string name="background_ops_auto_sync">Ha a \'Háttéradatok\' és \'Auto-szink\' bekapcsolva</string>
   <string name="background_ops_auto_sync_only">Amikor az \'Automatikus szinkronizáció\' be van kapcsolva</string>
   <string name="batch_select_all">Mindent kijelöl</string>
   <string name="account_setup_push_limit_label">Ellenőrizhető mappák száma</string>

res/values-it/strings.xml

@@ -659,8 +659,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="background_ops_label">Sincronizzazione in background</string>
   <string name="background_ops_never">Mai</string>
   <string name="background_ops_always">Sempre</string>
-  <string name="background_ops_enabled">Quando \'Dati in background\' è selezionato</string>
-  <string name="background_ops_auto_sync">Quando \'Dati in background\' e \'Sincronizzazione automatica\' sono selezionati</string>
   <string name="background_ops_auto_sync_only">Quando \'Sincronizzazione automatica\' è selezionato</string>
   <string name="batch_select_all">Seleziona tutto</string>
   <string name="account_setup_push_limit_label">Max cartelle Push</string>

res/values-iw/strings.xml

@@ -549,8 +549,6 @@
   <string name="background_ops_label">סנכרון ברקע</string>
   <string name="background_ops_never">אף פעם</string>
   <string name="background_ops_always">תמיד</string>
-  <string name="background_ops_enabled">"מתי ש\'נתונים ברקע\' מסומן "</string>
-  <string name="background_ops_auto_sync">"מתי ש\'נתונים ברקע\' ו\'סינכרון אוטומטי\' מסומנים "</string>
   <string name="batch_select_all">בחר הכל</string>
   <string name="account_setup_push_limit_label">מקסימום תיקיות כדי לבדוק עם דחיפה</string>
   <string name="account_setup_push_limit_10">10 תיקיות</string>

res/values-ja/strings.xml

@@ -659,8 +659,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="background_ops_label">バックグラウンド同期</string>
   <string name="background_ops_never">使用しない</string>
   <string name="background_ops_always">常時利用</string>
-  <string name="background_ops_enabled">バックグランドデータがチェックされた時</string>
-  <string name="background_ops_auto_sync">バックグランドデータと自動同期がチェックされた時</string>
   <string name="background_ops_auto_sync_only">自動同期がチェックされた時</string>
   <string name="batch_select_all">全選択</string>
   <string name="account_setup_push_limit_label">プッシュ受信の最大フォルダ数</string>

res/values-ko/strings.xml

@@ -648,8 +648,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="background_ops_label">백그라운드 동기화</string>
   <string name="background_ops_never">하지 않음</string>
   <string name="background_ops_always">항상</string>
-  <string name="background_ops_enabled">\'백그라운드 데이터\'가 선택된 경우</string>
-  <string name="background_ops_auto_sync">\'백그라운드 데이터\'와 \'자동 동기화\'가 선택된 경우</string>
   <string name="background_ops_auto_sync_only">\'자동 동기화\' 가 선택된 경우</string>
   <string name="batch_select_all">모두 선택</string>
   <string name="account_setup_push_limit_label">푸시할 때 점검할 최대 폴더 수</string>

res/values-lt/strings.xml

@@ -651,8 +651,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="background_ops_label">Sinchronizuoti fone</string>
   <string name="background_ops_never">Niekada</string>
   <string name="background_ops_always">Visada</string>
-  <string name="background_ops_enabled">Kai pažymėta „Fono duomenys“</string>
-  <string name="background_ops_auto_sync">Kai pažymėta „Fono duomenys“ ir „Automatinis sinchronizavimas“</string>
   <string name="background_ops_auto_sync_only">Kai pažymėtas „automatinis sinchronizavimas“</string>
   <string name="batch_select_all">Pasirinkti viską</string>
   <string name="account_setup_push_limit_label">Kiek daugiausia aplankų tikrinti siunčiant</string>

res/values-nl/strings.xml

@@ -649,8 +649,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="background_ops_label">Achtergrond sync</string>
   <string name="background_ops_never">Nooit</string>
   <string name="background_ops_always">Altijd</string>
-  <string name="background_ops_enabled">Wanneer \'Achtergrond data\' is aangevinkt</string>
-  <string name="background_ops_auto_sync">Wanneer \'Achtergrond data\' &amp; \'Auto-sync\' zijn aangevinkt</string>
   <string name="background_ops_auto_sync_only">Als \'Auto-sync\' geselecteerd is</string>
   <string name="batch_select_all">Selecteer alle</string>
   <string name="account_setup_push_limit_label">Max mappen om te controleren met push</string>

res/values-pl/strings.xml

@@ -649,8 +649,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="background_ops_label">Synchronizacja w tle</string>
   <string name="background_ops_never">Nigdy</string>
   <string name="background_ops_always">Zawsze</string>
-  <string name="background_ops_enabled">Gdy systemowa opcja \'Dane w tle\' jest włączone</string>
-  <string name="background_ops_auto_sync">Gdy systemowe opcje \'Dane w tle\' oraz \'Autosynchronizacja\' są włączone</string>
   <string name="background_ops_auto_sync_only">Gdy \'Autosynchronizacja\' jest włączona</string>
   <string name="batch_select_all">Zaznacz wszystko</string>
   <string name="account_setup_push_limit_label">Sprawdzanie przez Push</string>

res/values-pt-rBR/strings.xml

@@ -645,8 +645,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="background_ops_label">Sincronização em segundo plano</string>
   <string name="background_ops_never">Nunca</string>
   <string name="background_ops_always">Sempre</string>
-  <string name="background_ops_enabled">Quando \'Dados em segundo plano\' estiverem ativados</string>
-  <string name="background_ops_auto_sync">Quando \'Dados de segundo plano\' e \'Auto-sinc\' estiverem ativados</string>
   <string name="background_ops_auto_sync_only">Quando \'Auto-sinc\' estiver ativada</string>
   <string name="batch_select_all">Selecionar todos</string>
   <string name="account_setup_push_limit_label">Máximo de pastas para verificar com push</string>

res/values-ru/strings.xml

@@ -658,8 +658,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="background_ops_label">Фоновая синхронизация</string>
   <string name="background_ops_never">Никогда</string>
   <string name="background_ops_always">Всегда</string>
-  <string name="background_ops_enabled">Фоновые данные вкл.</string>
-  <string name="background_ops_auto_sync">Фоновые данные и Автосинхронизация вкл.</string>
   <string name="background_ops_auto_sync_only">Автосинхронизация вкл.</string>
   <string name="batch_select_all">Выбрать все</string>
   <string name="account_setup_push_limit_label">Лимит push-проверки</string>

res/values-sk/strings.xml

@@ -658,8 +658,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="background_ops_label">Synchronizácia na pozadí</string>
   <string name="background_ops_never">Nikdy</string>
   <string name="background_ops_always">Vždy</string>
-  <string name="background_ops_enabled">Keď je možnosť \'Dáta na pozadí\" zaškrtnutá</string>
-  <string name="background_ops_auto_sync">Keď sú možnosti \'Dáta na pozadí\' &amp; \'Automatická synchronizácia\' zaškrtnuté</string>
   <string name="background_ops_auto_sync_only">Keď je možnosť \'Automatická synchronizácia\'  zaškrtnutá</string>
   <string name="batch_select_all">Vybrať všetko</string>
   <string name="account_setup_push_limit_label">Maximálny počet priečinkov na kontrolu pomocou push</string>

res/values-sv/strings.xml

@@ -650,8 +650,6 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="background_ops_label">Bakgrundssynkronisering</string>
   <string name="background_ops_never">Aldrig</string>
   <string name="background_ops_always">Alltid</string>
-  <string name="background_ops_enabled">När \'Bakgrundsdata\' är aktiverad</string>
-  <string name="background_ops_auto_sync">När \'Bakgrundsdata\' &amp; \'Auto-sync\' är aktiverade</string>
   <string name="background_ops_auto_sync_only">Endast när \'Auto-sync\' är aktiverad</string>
   <string name="batch_select_all">Markera alla</string>
   <string name="account_setup_push_limit_label">Max antal mappar att kontrollera med push</string>

res/values-tr/strings.xml

@@ -601,8 +601,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="background_ops_label">Arkaplan senkronizasyonu</string>
   <string name="background_ops_never">Asla</string>
   <string name="background_ops_always">Daima</string>
-  <string name="background_ops_enabled">\'Arkaplan verisi\' işaretli olduğu zaman</string>
-  <string name="background_ops_auto_sync">\'Arkaplan verisi\' &amp; \'Oto. Senk.\' işaretli olduğu zaman</string>
   <string name="batch_select_all">Hepsini Seç</string>
   <string name="account_setup_push_limit_label">Push ile en fazla kontrol edilecek klasör sayısı</string>
   <string name="account_setup_push_limit_10">10 klasör</string>

res/values-uk/strings.xml

@@ -647,8 +647,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="background_ops_label">Фонова синхронізація</string>
   <string name="background_ops_never">Ніколи</string>
   <string name="background_ops_always">Завжди</string>
-  <string name="background_ops_enabled">Коли \'Фонові дані\' включено</string>
-  <string name="background_ops_auto_sync">Коли \'Фонові дані\' та \'Автосинхронізація\' включено</string>
   <string name="background_ops_auto_sync_only">Коли \"Автосинхронізація\" увімкнена</string>
   <string name="batch_select_all">Вибрати усе</string>
   <string name="account_setup_push_limit_label">Найбільша кількість папок для перевірки з push</string>

res/values-zh-rCN/strings.xml

@@ -648,8 +648,6 @@ K-9改进的功能包括：
   <string name="background_ops_label">后台同步</string>
   <string name="background_ops_never">从不</string>
   <string name="background_ops_always">总是</string>
-  <string name="background_ops_enabled">当“后台数据”被选中</string>
-  <string name="background_ops_auto_sync">当“后台数据”&amp;“自动同步”被选中</string>
   <string name="background_ops_auto_sync_only">当“自动同步”已选定</string>
   <string name="batch_select_all">选择全部</string>
   <string name="account_setup_push_limit_label">推送时最多检查文件夹数量</string>

res/values-zh-rTW/strings.xml

@@ -620,8 +620,6 @@
   <string name="background_ops_label">背景同步</string>
   <string name="background_ops_never">不要</string>
   <string name="background_ops_always">預設</string>
-  <string name="background_ops_enabled">當「背景資料」被勾選</string>
-  <string name="background_ops_auto_sync">當「背景資料」&amp;「自動同步」被勾選</string>
   <string name="background_ops_auto_sync_only">當「自動同步」被勾選</string>
   <string name="batch_select_all">選擇全部</string>
   <string name="account_setup_push_limit_label">推送時檢查信件匣上限數量</string>

res/values/arrays.xml

@@ -522,16 +522,13 @@
         <item>global</item>
     </string-array>
 
-    <!-- Note: If you change this make sure the code in Prefs.java is still working -->
     <string-array name="background_ops_entries">
-        <item>@string/background_ops_enabled</item>
-        <item>@string/background_ops_auto_sync</item>
+        <item>@string/background_ops_auto_sync_only</item>
         <item>@string/background_ops_always</item>
         <item>@string/background_ops_never</item>
     </string-array>
 
     <string-array name="background_ops_values" translatable="false">
-        <item>WHEN_CHECKED</item>
         <item>WHEN_CHECKED_AUTO_SYNC</item>
         <item>ALWAYS</item>
         <item>NEVER</item>

res/values/strings.xml

@@ -800,8 +800,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="background_ops_label">Background sync</string>
     <string name="background_ops_never">Never</string>
     <string name="background_ops_always">Always</string>
-    <string name="background_ops_enabled">When \'Background data\' is checked</string>
-    <string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>
     <string name="background_ops_auto_sync_only">When \'Auto-sync\' is checked</string>
 
     <string name="batch_select_all">Select all</string>

src/com/fsck/k9/K9.java

@@ -102,7 +102,7 @@ public class K9 extends Application {
     private static boolean sInitialized = false;
 
     public enum BACKGROUND_OPS {
-        WHEN_CHECKED, ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
+        ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
     }
 
     private static String language = "";
@@ -113,7 +113,7 @@ public class K9 extends Application {
 
     private static final FontSizes fontSizes = new FontSizes();
 
-    private static BACKGROUND_OPS backgroundOps = BACKGROUND_OPS.WHEN_CHECKED;
+    private static BACKGROUND_OPS backgroundOps = BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC;
     /**
      * Some log messages can be sent to a file, so that the logs
      * can be read using unprivileged access (eg. Terminal Emulator)
@@ -509,7 +509,7 @@ public class K9 extends Application {
     public static void save(SharedPreferences.Editor editor) {
         editor.putBoolean("enableDebugLogging", K9.DEBUG);
         editor.putBoolean("enableSensitiveLogging", K9.DEBUG_SENSITIVE);
-        editor.putString("backgroundOperations", K9.backgroundOps.toString());
+        editor.putString("backgroundOperations", K9.backgroundOps.name());
         editor.putBoolean("animations", mAnimations);
         editor.putBoolean("gesturesEnabled", mGesturesEnabled);
         editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation);
@@ -795,9 +795,11 @@ public class K9 extends Application {
         fontSizes.load(sprefs);
 
         try {
-            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString("backgroundOperations", "WHEN_CHECKED")));
+            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString(
+                    "backgroundOperations",
+                    BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC.name())));
         } catch (Exception e) {
-            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED);
+            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC);
         }
 
         sColorizeMissingContactPictures = sprefs.getBoolean("colorizeMissingContactPictures", true);

src/com/fsck/k9/activity/setup/Prefs.java

@@ -12,7 +12,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -352,34 +351,7 @@ public class Prefs extends K9PreferenceActivity {
             mNotificationQuickDelete = null;
         }
 
-        mBackgroundOps = setupListPreference(PREFERENCE_BACKGROUND_OPS, K9.getBackgroundOps().toString());
-        // In ICS+ there is no 'background data' setting that apps can chose to ignore anymore. So
-        // we hide that option for "Background Sync".
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            CharSequence[] oldEntries = mBackgroundOps.getEntries();
-            CharSequence[] newEntries = new CharSequence[3];
-            // Use "When 'Auto-sync' is checked" instead of "When 'Background data' & 'Auto-sync'
-            // are checked" as description.
-            newEntries[0] = getString(R.string.background_ops_auto_sync_only);
-            newEntries[1] = oldEntries[2];
-            newEntries[2] = oldEntries[3];
-
-            CharSequence[] oldValues = mBackgroundOps.getEntryValues();
-            CharSequence[] newValues = new CharSequence[3];
-            newValues[0] = oldValues[1];
-            newValues[1] = oldValues[2];
-            newValues[2] = oldValues[3];
-
-            mBackgroundOps.setEntries(newEntries);
-            mBackgroundOps.setEntryValues(newValues);
-
-            // Since ConnectivityManager.getBackgroundDataSetting() always returns 'true' on ICS+
-            // we map WHEN_CHECKED to ALWAYS.
-            if (K9.getBackgroundOps() == K9.BACKGROUND_OPS.WHEN_CHECKED) {
-                mBackgroundOps.setValue(K9.BACKGROUND_OPS.ALWAYS.toString());
-                mBackgroundOps.setSummary(mBackgroundOps.getEntry());
-            }
-        }
+        mBackgroundOps = setupListPreference(PREFERENCE_BACKGROUND_OPS, K9.getBackgroundOps().name());
 
         mUseGalleryBugWorkaround = (CheckBoxPreference)findPreference(PREFERENCE_GALLERY_BUG_WORKAROUND);
         mUseGalleryBugWorkaround.setChecked(K9.useGalleryBugWorkaround());

src/com/fsck/k9/preferences/GlobalSettings.java

@@ -44,7 +44,7 @@ public class GlobalSettings {
             ));
         s.put("backgroundOperations", Settings.versions(
                 new V(1, new EnumSetting<K9.BACKGROUND_OPS>(
-                        K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED))
+                        K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC))
             ));
         s.put("changeRegisteredNameColor", Settings.versions(
                 new V(1, new BooleanSetting(false))

src/com/fsck/k9/remotecontrol/K9RemoteControl.java

@@ -100,10 +100,9 @@ public class K9RemoteControl {
     /**
      * Key for the {@link Intent} Extra to set for controlling K-9's global "Background sync" setting.
      * Acceptable values are K9_BACKGROUND_OPERATIONS_ALWAYS, K9_BACKGROUND_OPERATIONS_NEVER
-     * K9_BACKGROUND_OPERATIONS_WHEN_CHECKED
+     * K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC
      */
     public final static String K9_BACKGROUND_OPERATIONS = "com.fsck.k9.K9RemoteControl.backgroundOperations";
-    public final static String K9_BACKGROUND_OPERATIONS_WHEN_CHECKED = "WHEN_CHECKED";
     public final static String K9_BACKGROUND_OPERATIONS_ALWAYS = "ALWAYS";
     public final static String K9_BACKGROUND_OPERATIONS_NEVER = "NEVER";
     public final static String K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC = "WHEN_CHECKED_AUTO_SYNC";

src/com/fsck/k9/service/BootReceiver.java

@@ -46,12 +46,6 @@ public class BootReceiver extends CoreReceiver {
                 MailService.actionReset(context, tmpWakeLockId);
                 tmpWakeLockId = null;
             }
-        } else if (ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED.equals(action)) {
-            K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
-            if (bOps == K9.BACKGROUND_OPS.WHEN_CHECKED || bOps == K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC) {
-                MailService.actionReset(context, tmpWakeLockId);
-                tmpWakeLockId = null;
-            }
         } else if (FIRE_INTENT.equals(action)) {
             Intent alarmedIntent = intent.getParcelableExtra(ALARMED_INTENT);
             String alarmedAction = alarmedIntent.getAction();

src/com/fsck/k9/service/MailService.java

@@ -8,7 +8,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
 import android.os.IBinder;
 import android.util.Log;
 
@@ -86,14 +85,9 @@ public class MailService extends CoreService {
     public int startService(Intent intent, int startId) {
         long startTime = System.currentTimeMillis();
         boolean oldIsSyncDisabled = isSyncDisabled();
-        ConnectivityManager connectivityManager = (ConnectivityManager)getApplication().getSystemService(Context.CONNECTIVITY_SERVICE);
         boolean doBackground = true;
-        boolean backgroundData = false;
 
         final boolean hasConnectivity = Utility.hasConnectivity(getApplication());
-        if (connectivityManager != null) {
-            backgroundData = connectivityManager.getBackgroundDataSetting();
-        }
         boolean autoSync = ContentResolver.getMasterSyncAutomatically();
 
         K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
@@ -105,11 +99,8 @@ public class MailService extends CoreService {
             case ALWAYS:
                 doBackground = true;
                 break;
-            case WHEN_CHECKED:
-                doBackground = backgroundData;
-                break;
             case WHEN_CHECKED_AUTO_SYNC:
-                doBackground = backgroundData & autoSync;
+                doBackground = autoSync;
                 break;
         }
 

src/com/fsck/k9/service/RemoteControlService.java

@@ -113,8 +113,7 @@ public class RemoteControlService extends CoreService {
                         String backgroundOps = intent.getStringExtra(K9_BACKGROUND_OPERATIONS);
                         if (K9RemoteControl.K9_BACKGROUND_OPERATIONS_ALWAYS.equals(backgroundOps)
                                 || K9RemoteControl.K9_BACKGROUND_OPERATIONS_NEVER.equals(backgroundOps)
-                                || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED.equals(backgroundOps)
-                        || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC.equals(backgroundOps)) {
+                                || K9RemoteControl.K9_BACKGROUND_OPERATIONS_WHEN_CHECKED_AUTO_SYNC.equals(backgroundOps)) {
                             BACKGROUND_OPS newBackgroundOps = BACKGROUND_OPS.valueOf(backgroundOps);
                             boolean needsReset = K9.setBackgroundOps(newBackgroundOps);
                             needsPushRestart |= needsReset;