Remove sort just once/always

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);
         }
     }
 }

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) {

src/main/res/values-ar/strings.xml

@@ -40,8 +40,6 @@
 	<string name="SSD_sort_auto">الترتيب الذكي</string>
 	<string name="SSD_sort_alpha">بالعنوان</string>
 	<string name="SSD_sort_modified">بواسطة التعديل الأخير</string>
-	<string name="SSD_save_temp">مره واحده فقط</string>
-	<string name="SSD_save_always">دائماً</string>
 	<string name="FLA_no_filter_selected">لم يتم اختيار فلتر! ارجو اختيار فلتر او قائمة</string>
 	<string name="TEA_title_hint">اسم المهمة</string>
 	<string name="TEA_deadline_hint">تعيين تاريخ الاستحقاق</string>

src/main/res/values-bg-rBG/strings.xml

@@ -58,8 +58,6 @@
 	<string name="SSD_sort_importance">По приоритет</string>
 	<string name="SSD_sort_modified">По последна промяна</string>
 	<string name="SSD_sort_reverse">В обратен ред</string>
-	<string name="SSD_save_temp">Само веднъж</string>
-	<string name="SSD_save_always">Винаги</string>
 	<string name="FLA_search_filter">Съвпада с \'%s\'</string>
 	<string name="FLA_new_filter">Нов филтър</string>
 	<string name="FLA_no_filter_selected">Няма избран филтър! Моля изберете филтър или списък.</string>

src/main/res/values-ca/strings.xml

@@ -53,8 +53,6 @@
 	<string name="SSD_sort_importance">Per importància</string>
 	<string name="SSD_sort_modified">Per darrera modificació</string>
 	<string name="SSD_sort_reverse">Ordenació inversa</string>
-	<string name="SSD_save_temp">Només una vegada</string>
-	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Coincidència \'%s\'</string>
 	<string name="FLA_new_filter">Filtre nou</string>
 	<string name="FLA_no_filter_selected">No heu seleccionat cap filtre. Seleccioneu un filtre o una llista.</string>

src/main/res/values-cs/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Podle důležitosti</string>
 	<string name="SSD_sort_modified">Podle naposled upraveného</string>
 	<string name="SSD_sort_reverse">Třídit</string>
-	<string name="SSD_save_temp">Pouze jednou</string>
-	<string name="SSD_save_always">Vždy</string>
 	<string name="FLA_search_filter">Hledanému \'%s\' odpovídá:</string>
 	<string name="FLA_new_filter">Nový Filtr</string>
 	<string name="FLA_no_filter_selected">Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam.</string>

src/main/res/values-da/strings.xml

@@ -49,8 +49,6 @@
 	<string name="SSD_sort_importance">Efter vigtighed</string>
 	<string name="SSD_sort_modified">Efter senest ændret</string>
 	<string name="SSD_sort_reverse">Omvendt sortering</string>
-	<string name="SSD_save_temp">Kun en gang</string>
-	<string name="SSD_save_always">Altid</string>
 	<string name="FLA_search_filter">Matcher \'%s\'</string>
 	<string name="FLA_new_filter">Nyt filter</string>
 	<string name="FLA_no_filter_selected">Der er ikke valgt et filter! Vælg venligst et filter eller en liste.</string>

src/main/res/values-de/strings.xml

@@ -54,8 +54,6 @@
 	<string name="SSD_sort_importance">Nach Priorität</string>
 	<string name="SSD_sort_modified">Nach letzter Änderung</string>
 	<string name="SSD_sort_reverse">Umgekehrte Sortierung</string>
-	<string name="SSD_save_temp">Einmalig</string>
-	<string name="SSD_save_always">Immer</string>
 	<string name="FLA_search_filter">Übereinstimmung mit %s</string>
 	<string name="FLA_new_filter">Neuer Filter</string>
 	<string name="FLA_no_filter_selected">Kein Filter ausgewählt! Bitte Filter oder Liste auswählen.</string>

src/main/res/values-el/strings.xml

@@ -53,8 +53,6 @@
 	<string name="SSD_sort_importance">Κατά προτεραιότητα</string>
 	<string name="SSD_sort_modified">Με βάση τελευταία τροποποίηση</string>
 	<string name="SSD_sort_reverse">Αντίστροφη ταξινόμηση</string>
-	<string name="SSD_save_temp">Μόνο μια φορά</string>
-	<string name="SSD_save_always">Πάντα</string>
 	<string name="FLA_search_filter">Ταιριάζουν \'%s\'</string>
 	<string name="FLA_new_filter">Νέο φίλτρο</string>
 	<string name="FLA_no_filter_selected">Δεν επιλέχθηκε φίλτρο! Παρακαλώ επιλέξτε ενα φίλτρο η μια λίστα</string>

src/main/res/values-es/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Por prioridad</string>
 	<string name="SSD_sort_modified">Por última modificación</string>
 	<string name="SSD_sort_reverse">Invertir orden</string>
-	<string name="SSD_save_temp">Sólo una vez</string>
-	<string name="SSD_save_always">Siempre</string>
 	<string name="FLA_search_filter">Coincidencias con \'%s\'</string>
 	<string name="FLA_new_filter">Nuevo filtro</string>
 	<string name="FLA_no_filter_selected">No hay filtro seleccionado! Por favor seleccione un filtro o lista.</string>

src/main/res/values-fi/strings.xml

@@ -17,8 +17,6 @@
 	<string name="SSD_sort_importance">Prioriteetin mukaan</string>
 	<string name="SSD_sort_modified">Viimeisen muutoksen mukaan</string>
 	<string name="SSD_sort_reverse">Käänteinen järjestys</string>
-	<string name="SSD_save_temp">Vain kerran</string>
-	<string name="SSD_save_always">Aina</string>
 	<string name="FLA_search_filter">Sopivuus \'%s\'</string>
 	<string name="FLA_new_filter">Uusi suodin</string>
 	<string name="FLA_no_filter_selected">Suodatinta ei valittu! Valitse suodatin tai lista.</string>

src/main/res/values-fr/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Par priorité</string>
 	<string name="SSD_sort_modified">Dernier modifié</string>
 	<string name="SSD_sort_reverse">Tri inversé</string>
-	<string name="SSD_save_temp">Une fois seulement</string>
-	<string name="SSD_save_always">Toujours</string>
 	<string name="FLA_search_filter">Correspondant \'%s\'</string>
 	<string name="FLA_new_filter">Nouveau filtre</string>
 	<string name="FLA_no_filter_selected">Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste.</string>

src/main/res/values-it/strings.xml

@@ -52,8 +52,6 @@
 	<string name="SSD_sort_due">Per scadenza</string>
 	<string name="SSD_sort_modified">Per Ultima Modifica</string>
 	<string name="SSD_sort_reverse">Inverti Ordinamento</string>
-	<string name="SSD_save_temp">Solo una Volta</string>
-	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Confrontando \'%s\'</string>
 	<string name="FLA_new_filter">Nuovo Filtro</string>
 	<string name="FLA_no_filter_selected">Filtro non selezionato! Perfavore seleziona un filtro o una lista.</string>

src/main/res/values-iw/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">ע״פ עדיפות</string>
 	<string name="SSD_sort_modified">ע״פ מועד עדכון אחרון</string>
 	<string name="SSD_sort_reverse">מיון בסדר הפוך</string>
-	<string name="SSD_save_temp">רק הפעם</string>
-	<string name="SSD_save_always">תמיד</string>
 	<string name="FLA_search_filter">התאים ל\'%s\'</string>
 	<string name="FLA_new_filter">מַסְנֵן חדש</string>
 	<string name="FLA_no_filter_selected">לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.</string>

src/main/res/values-ja/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">優先順位順</string>
 	<string name="SSD_sort_modified">更新日時順</string>
 	<string name="SSD_sort_reverse">逆順</string>
-	<string name="SSD_save_temp">今回のみ</string>
-	<string name="SSD_save_always">設定の保存</string>
 	<string name="FLA_search_filter">「%s」の検索結果</string>
 	<string name="FLA_new_filter">新しいフィルタ</string>
 	<string name="FLA_no_filter_selected">フィルターが選択されていません! フィルターかリストを選択してください.</string>

src/main/res/values-ko/strings.xml

@@ -58,8 +58,6 @@
 	<string name="SSD_sort_importance">우선순위 순서로</string>
 	<string name="SSD_sort_modified">최종 수정일 순서</string>
 	<string name="SSD_sort_reverse">역순 정렬</string>
-	<string name="SSD_save_temp">한번 정렬</string>
-	<string name="SSD_save_always">항상 정렬</string>
 	<string name="FLA_search_filter">\'%s\' 검색 중</string>
 	<string name="FLA_new_filter">새 필터</string>
 	<string name="FLA_no_filter_selected">필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.</string>

src/main/res/values-nb/strings.xml

@@ -45,8 +45,6 @@
 	<string name="SSD_sort_importance">Etter viktighet</string>
 	<string name="SSD_sort_modified">Etter siste endring</string>
 	<string name="SSD_sort_reverse">Omvendt sortering</string>
-	<string name="SSD_save_temp">Kun en gang</string>
-	<string name="SSD_save_always">Alltid</string>
 	<string name="FLA_search_filter">Matcher \'%s\'</string>
 	<string name="FLA_new_filter">Nytt filter</string>
 	<string name="TEA_title_hint">Oppgavesammendrag</string>

src/main/res/values-nl/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Op prioriteit</string>
 	<string name="SSD_sort_modified">Op datum gewijzigd</string>
 	<string name="SSD_sort_reverse">Omgekeerd sorteren</string>
-	<string name="SSD_save_temp">Eenmalig</string>
-	<string name="SSD_save_always">Altijd</string>
 	<string name="FLA_search_filter">Bevat \'%s\'</string>
 	<string name="FLA_new_filter">Nieuw Filter</string>
 	<string name="FLA_no_filter_selected">Geen filter geselecteerd! Selecteer een filter of lijst.</string>

src/main/res/values-pl/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Wg priorytetów</string>
 	<string name="SSD_sort_modified">Wg. ostatniej modyfikacji</string>
 	<string name="SSD_sort_reverse">Odwrotna kolejność</string>
-	<string name="SSD_save_temp">Tylko teraz</string>
-	<string name="SSD_save_always">Zawsze</string>
 	<string name="FLA_search_filter">Pasujących do: %s</string>
 	<string name="FLA_new_filter">Nowy filtr</string>
 	<string name="FLA_no_filter_selected">Nie wybraon filtra! Wybierz filtr lub listę.</string>

src/main/res/values-pt-rBR/strings.xml

@@ -54,8 +54,6 @@
 	<string name="SSD_sort_importance">Por prioridade</string>
 	<string name="SSD_sort_modified">Por data de modificação</string>
 	<string name="SSD_sort_reverse">Ordenação reversa</string>
-	<string name="SSD_save_temp">Somente uma vez</string>
-	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Encontradas para \'%s\'</string>
 	<string name="FLA_new_filter">Novo Filtro</string>
 	<string name="FLA_no_filter_selected">Sem filtro selecionado! Selecione um filtro ou lista.</string>

src/main/res/values-pt/strings.xml

@@ -57,8 +57,6 @@
 	<string name="SSD_sort_importance">Por Importância</string>
 	<string name="SSD_sort_modified">Por Última Modificação</string>
 	<string name="SSD_sort_reverse">Ordem Inversa</string>
-	<string name="SSD_save_temp">Só Uma Vez</string>
-	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Coincidente com %s</string>
 	<string name="FLA_new_filter">Novo filtro</string>
 	<string name="FLA_no_filter_selected">Não selecionou o filtro! Selecione um filtro ou uma lista.</string>

src/main/res/values-ru/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">По приоритету</string>
 	<string name="SSD_sort_modified">Последние изменённые</string>
 	<string name="SSD_sort_reverse">Обратный порядок сортировки</string>
-	<string name="SSD_save_temp">Только один раз</string>
-	<string name="SSD_save_always">Всегда</string>
 	<string name="FLA_search_filter">Соответствует \'%s\'</string>
 	<string name="FLA_new_filter">Новый фильтр</string>
 	<string name="FLA_no_filter_selected">Фильтры не выбраны! Пожалуйста, выберите фильтр или список</string>

src/main/res/values-sk/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Podľa priority</string>
 	<string name="SSD_sort_modified">Podľa úpravy</string>
 	<string name="SSD_sort_reverse">Zmeniť usporiadnanie</string>
-	<string name="SSD_save_temp">Len raz</string>
-	<string name="SSD_save_always">Vždy</string>
 	<string name="FLA_search_filter">Zodpovedá \'%s\'</string>
 	<string name="FLA_new_filter">Nový filter</string>
 	<string name="FLA_no_filter_selected">Nieje vybraný filter! Prosím, zvoľ si filter, alebo zoznam.</string>

src/main/res/values-sl-rSI/strings.xml

@@ -58,8 +58,6 @@
 	<string name="SSD_sort_importance">Po prioriteti</string>
 	<string name="SSD_sort_modified">Po zadnjih spremembah</string>
 	<string name="SSD_sort_reverse">Razvrsti po obratnem vrstnem redu</string>
-	<string name="SSD_save_temp">Samo enkrat</string>
-	<string name="SSD_save_always">Vedno</string>
 	<string name="FLA_search_filter">Ujemanje za \'%s\'</string>
 	<string name="FLA_new_filter">Nov filter</string>
 	<string name="FLA_no_filter_selected">Noben filter ni izbran. Izberite filter ali seznam.</string>

src/main/res/values-sv/strings.xml

@@ -55,8 +55,6 @@
 	<string name="SSD_sort_importance">Efter prioritet</string>
 	<string name="SSD_sort_modified">Efter senaste ändringen</string>
 	<string name="SSD_sort_reverse">Omvänd sortering</string>
-	<string name="SSD_save_temp">Bara en gång</string>
-	<string name="SSD_save_always">Alltid</string>
 	<string name="FLA_search_filter">Matchar \'%s\'</string>
 	<string name="FLA_new_filter">Nytt filter</string>
 	<string name="FLA_no_filter_selected">Inget filter valt! Välj ett filter eller en lista.</string>

src/main/res/values-th/strings.xml

@@ -31,8 +31,6 @@
 	<string name="SSD_sort_importance">ตามความสำคัญ</string>
 	<string name="SSD_sort_modified">ตามวันที่แก้ไขล่าสุด</string>
 	<string name="SSD_sort_reverse">จัดเรียงย้อนหลัง</string>
-	<string name="SSD_save_temp">ชั่วคราว</string>
-	<string name="SSD_save_always">ตลอดไป</string>
 	<string name="TEA_title_hint">สรุปแผนงาน</string>
 	<string name="TEA_importance_label">ความสำคัญ</string>
 	<string name="TEA_note_label">บันทึกย่อ</string>

src/main/res/values-tr/strings.xml

@@ -52,8 +52,6 @@
 	<string name="SSD_sort_due">Bitiş Tarihine Göre</string>
 	<string name="SSD_sort_modified">Son Değiştirme Tarihine Göre</string>
 	<string name="SSD_sort_reverse">Sıralamayı Tersine Çevir</string>
-	<string name="SSD_save_temp">Bir Kereye Mahsus</string>
-	<string name="SSD_save_always">Her zaman</string>
 	<string name="FLA_search_filter">\'%s\' ile eşleşenler</string>
 	<string name="FLA_new_filter">Yeni Filtre</string>
 	<string name="FLA_no_filter_selected">Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.</string>

src/main/res/values-uk/strings.xml

@@ -58,8 +58,6 @@
 	<string name="SSD_sort_importance">За пріоритетом</string>
 	<string name="SSD_sort_modified">За останньою модифікованою</string>
 	<string name="SSD_sort_reverse">Обернений порядок сортування</string>
-	<string name="SSD_save_temp">Тільки раз</string>
-	<string name="SSD_save_always">Завжди</string>
 	<string name="FLA_search_filter">Відповідності до %s</string>
 	<string name="FLA_new_filter">Новий фільтр</string>
 	<string name="FLA_no_filter_selected">Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список.</string>

src/main/res/values-zh-rCN/strings.xml

@@ -52,8 +52,6 @@
 	<string name="SSD_sort_due">按到期日</string>
 	<string name="SSD_sort_modified">按最后修改</string>
 	<string name="SSD_sort_reverse">反向排序</string>
-	<string name="SSD_save_temp">仅一次</string>
-	<string name="SSD_save_always">总是</string>
 	<string name="FLA_search_filter">比对 \'%s\'</string>
 	<string name="FLA_new_filter">新建过滤器</string>
 	<string name="FLA_no_filter_selected">还没有选定过滤器呢！请选择一个过滤器或列表呗。</string>

src/main/res/values-zh-rTW/strings.xml

@@ -54,8 +54,6 @@
 	<string name="SSD_sort_importance">依照優先權</string>
 	<string name="SSD_sort_modified">依最後修改</string>
 	<string name="SSD_sort_reverse">反向排序</string>
-	<string name="SSD_save_temp">僅一次</string>
-	<string name="SSD_save_always">總是</string>
 	<string name="FLA_search_filter">比對 \'%s\'</string>
 	<string name="FLA_new_filter">新建過濾器</string>
 	<string name="FLA_no_filter_selected">還沒有選定過濾器呢！請選擇一個過濾器或列表唄。</string>

src/main/res/values/strings-core.xml

@@ -110,12 +110,6 @@
   <!-- slide 23g: Sort Selection: reverse -->
   <string name="SSD_sort_reverse">Reverse sort</string>
   
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Just once</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Always</string>
-  
   <!-- =============================================== FilterListActivity == -->
 
   <!-- Search Filter name (%s => query) -->