diff --git a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
index 23d1bca1c..2629dd11f 100644
--- a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -31,7 +31,7 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastHoneycomb;
public class SortSelectionActivity {
public interface OnSortSelectedListener {
- void onSortSelected(boolean always, int flags, int sort);
+ void onSortSelected(int flags, int sort);
}
/**
@@ -92,10 +92,12 @@ public class SortSelectionActivity {
AlertDialog dialog = builder.
setTitle(R.string.TLA_menu_sort).
setView(body).
- setPositiveButton(R.string.SSD_save_always,
- new DialogOkListener(body, listener, true)).
- setNegativeButton(R.string.SSD_save_temp,
- new DialogOkListener(body, listener, false)).
+ setPositiveButton(R.string.TLA_menu_sort, new DialogOkListener(body, listener)).
+ setNegativeButton(android.R.string.cancel, new OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ }
+ }).
create();
dialog.setOwnerActivity(activity);
return dialog;
@@ -109,13 +111,11 @@ public class SortSelectionActivity {
private static class DialogOkListener implements OnClickListener {
private final OnSortSelectedListener listener;
- private final boolean always;
private final View body;
- public DialogOkListener(View body, OnSortSelectedListener listener, boolean always) {
+ public DialogOkListener(View body, OnSortSelectedListener listener) {
this.body = body;
this.listener = listener;
- this.always = always;
}
@Override
@@ -148,7 +148,7 @@ public class SortSelectionActivity {
sort = SortHelper.SORT_AUTO;
}
- listener.onSortSelected(always, flags, sort);
+ listener.onSortSelected(flags, sort);
}
}
}
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index a7b9b1cf4..841644626 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -909,18 +909,16 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
}
@Override
- public void onSortSelected(boolean always, int flags, int sort) {
+ public void onSortSelected(int flags, int sort) {
boolean manualSettingChanged = SortHelper.isManualSort(sortFlags) !=
SortHelper.isManualSort(flags);
sortFlags = flags;
sortSort = sort;
- if (always) {
- preferences.setSortFlags(flags);
- preferences.setSortMode(sort);
- TasksWidget.updateWidgets(context);
- }
+ preferences.setSortFlags(flags);
+ preferences.setSortMode(sort);
+ TasksWidget.updateWidgets(context);
try {
if(manualSettingChanged) {
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 9650719ba..4f85c6227 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -40,8 +40,6 @@
الترتيب الذكي
بالعنوان
بواسطة التعديل الأخير
- مره واحده فقط
- دائماً
لم يتم اختيار فلتر! ارجو اختيار فلتر او قائمة
اسم المهمة
تعيين تاريخ الاستحقاق
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index fe1ea1575..92da3aca2 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -58,8 +58,6 @@
По приоритет
По последна промяна
В обратен ред
- Само веднъж
- Винаги
Съвпада с \'%s\'
Нов филтър
Няма избран филтър! Моля изберете филтър или списък.
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index c392c6b1b..c80d74450 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -53,8 +53,6 @@
Per importància
Per darrera modificació
Ordenació inversa
- Només una vegada
- Sempre
Coincidència \'%s\'
Filtre nou
No heu seleccionat cap filtre. Seleccioneu un filtre o una llista.
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 3ea57f3a5..cb6560388 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -55,8 +55,6 @@
Podle důležitosti
Podle naposled upraveného
Třídit
- Pouze jednou
- Vždy
Hledanému \'%s\' odpovídá:
Nový Filtr
Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam.
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 732a4a562..859af3dbc 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -49,8 +49,6 @@
Efter vigtighed
Efter senest ændret
Omvendt sortering
- Kun en gang
- Altid
Matcher \'%s\'
Nyt filter
Der er ikke valgt et filter! Vælg venligst et filter eller en liste.
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 2c730c05c..bed712e6b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -54,8 +54,6 @@
Nach Priorität
Nach letzter Änderung
Umgekehrte Sortierung
- Einmalig
- Immer
Übereinstimmung mit %s
Neuer Filter
Kein Filter ausgewählt! Bitte Filter oder Liste auswählen.
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 3c156b574..03e2e63fc 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -53,8 +53,6 @@
Κατά προτεραιότητα
Με βάση τελευταία τροποποίηση
Αντίστροφη ταξινόμηση
- Μόνο μια φορά
- Πάντα
Ταιριάζουν \'%s\'
Νέο φίλτρο
Δεν επιλέχθηκε φίλτρο! Παρακαλώ επιλέξτε ενα φίλτρο η μια λίστα
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index fd5dd85f5..9b0aa10d1 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -55,8 +55,6 @@
Por prioridad
Por última modificación
Invertir orden
- Sólo una vez
- Siempre
Coincidencias con \'%s\'
Nuevo filtro
No hay filtro seleccionado! Por favor seleccione un filtro o lista.
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 2dbfce80c..33e43eea0 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -17,8 +17,6 @@
Prioriteetin mukaan
Viimeisen muutoksen mukaan
Käänteinen järjestys
- Vain kerran
- Aina
Sopivuus \'%s\'
Uusi suodin
Suodatinta ei valittu! Valitse suodatin tai lista.
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8468ffee6..6d8d8db2d 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -55,8 +55,6 @@
Par priorité
Dernier modifié
Tri inversé
- Une fois seulement
- Toujours
Correspondant \'%s\'
Nouveau filtre
Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste.
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index f210f9752..87a253cd5 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -52,8 +52,6 @@
Per scadenza
Per Ultima Modifica
Inverti Ordinamento
- Solo una Volta
- Sempre
Confrontando \'%s\'
Nuovo Filtro
Filtro non selezionato! Perfavore seleziona un filtro o una lista.
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 03826b000..9caa5e9ec 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -55,8 +55,6 @@
ע״פ עדיפות
ע״פ מועד עדכון אחרון
מיון בסדר הפוך
- רק הפעם
- תמיד
התאים ל\'%s\'
מַסְנֵן חדש
לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index b85cba5de..d993c8aa0 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -55,8 +55,6 @@
優先順位順
更新日時順
逆順
- 今回のみ
- 設定の保存
「%s」の検索結果
新しいフィルタ
フィルターが選択されていません! フィルターかリストを選択してください.
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 4a0eb4f50..d16b9dcc2 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -58,8 +58,6 @@
우선순위 순서로
최종 수정일 순서
역순 정렬
- 한번 정렬
- 항상 정렬
\'%s\' 검색 중
새 필터
필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 27911fa77..a33e26593 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -45,8 +45,6 @@
Etter viktighet
Etter siste endring
Omvendt sortering
- Kun en gang
- Alltid
Matcher \'%s\'
Nytt filter
Oppgavesammendrag
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f0dbe0eea..5ff76fec7 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -55,8 +55,6 @@
Op prioriteit
Op datum gewijzigd
Omgekeerd sorteren
- Eenmalig
- Altijd
Bevat \'%s\'
Nieuw Filter
Geen filter geselecteerd! Selecteer een filter of lijst.
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a743b9e1f..3514abcf9 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -55,8 +55,6 @@
Wg priorytetów
Wg. ostatniej modyfikacji
Odwrotna kolejność
- Tylko teraz
- Zawsze
Pasujących do: %s
Nowy filtr
Nie wybraon filtra! Wybierz filtr lub listę.
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index b9fde8d8f..9da151335 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -54,8 +54,6 @@
Por prioridade
Por data de modificação
Ordenação reversa
- Somente uma vez
- Sempre
Encontradas para \'%s\'
Novo Filtro
Sem filtro selecionado! Selecione um filtro ou lista.
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 1bfa62ed4..d89e4c9f4 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -57,8 +57,6 @@
Por Importância
Por Última Modificação
Ordem Inversa
- Só Uma Vez
- Sempre
Coincidente com %s
Novo filtro
Não selecionou o filtro! Selecione um filtro ou uma lista.
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2338e2517..e05825d5d 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -55,8 +55,6 @@
По приоритету
Последние изменённые
Обратный порядок сортировки
- Только один раз
- Всегда
Соответствует \'%s\'
Новый фильтр
Фильтры не выбраны! Пожалуйста, выберите фильтр или список
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 177ad3371..1763f9285 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -55,8 +55,6 @@
Podľa priority
Podľa úpravy
Zmeniť usporiadnanie
- Len raz
- Vždy
Zodpovedá \'%s\'
Nový filter
Nieje vybraný filter! Prosím, zvoľ si filter, alebo zoznam.
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index d6ba5526b..43e92e81e 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -58,8 +58,6 @@
Po prioriteti
Po zadnjih spremembah
Razvrsti po obratnem vrstnem redu
- Samo enkrat
- Vedno
Ujemanje za \'%s\'
Nov filter
Noben filter ni izbran. Izberite filter ali seznam.
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 5c2e91701..bc37d3ff1 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -55,8 +55,6 @@
Efter prioritet
Efter senaste ändringen
Omvänd sortering
- Bara en gång
- Alltid
Matchar \'%s\'
Nytt filter
Inget filter valt! Välj ett filter eller en lista.
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index ae58705f8..9aedbbb57 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -31,8 +31,6 @@
ตามความสำคัญ
ตามวันที่แก้ไขล่าสุด
จัดเรียงย้อนหลัง
- ชั่วคราว
- ตลอดไป
สรุปแผนงาน
ความสำคัญ
บันทึกย่อ
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index fbcc0d6e9..6312a62d0 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -52,8 +52,6 @@
Bitiş Tarihine Göre
Son Değiştirme Tarihine Göre
Sıralamayı Tersine Çevir
- Bir Kereye Mahsus
- Her zaman
\'%s\' ile eşleşenler
Yeni Filtre
Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 2398df142..8034c187f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -58,8 +58,6 @@
За пріоритетом
За останньою модифікованою
Обернений порядок сортування
- Тільки раз
- Завжди
Відповідності до %s
Новий фільтр
Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список.
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 6d793fb8f..e8df7cfdb 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -52,8 +52,6 @@
按到期日
按最后修改
反向排序
- 仅一次
- 总是
比对 \'%s\'
新建过滤器
还没有选定过滤器呢!请选择一个过滤器或列表呗。
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 43f65024f..1c1054b80 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -54,8 +54,6 @@
依照優先權
依最後修改
反向排序
- 僅一次
- 總是
比對 \'%s\'
新建過濾器
還沒有選定過濾器呢!請選擇一個過濾器或列表唄。
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 134bc2cb6..f3236d144 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -110,12 +110,6 @@
Reverse sort
-
- Just once
-
-
- Always
-