Remove context menu item for purging deleted tasks

src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -129,7 +129,6 @@ public class TaskListFragment extends InjectingListFragment implements
     protected static final int CONTEXT_MENU_COPY_TASK_ID = R.string.TAd_contextCopyTask;
     protected static final int CONTEXT_MENU_DELETE_TASK_ID = R.string.TAd_contextDeleteTask;
     protected static final int CONTEXT_MENU_UNDELETE_TASK_ID = R.string.TAd_contextUndeleteTask;
-    protected static final int CONTEXT_MENU_PURGE_TASK_ID = R.string.TAd_contextPurgeTask;
 
     // --- instance variables
 
@@ -659,7 +658,6 @@ public class TaskListFragment extends InjectingListFragment implements
 
         if (task.isDeleted()) {
             menu.add(id, CONTEXT_MENU_UNDELETE_TASK_ID, Menu.NONE, R.string.TAd_contextUndeleteTask);
-            menu.add(id, CONTEXT_MENU_PURGE_TASK_ID, Menu.NONE, R.string.TAd_contextPurgeTask);
         } else {
             menu.add(id, CONTEXT_MENU_COPY_TASK_ID, Menu.NONE, R.string.TAd_contextCopyTask);
             menu.add(id, CONTEXT_MENU_DELETE_TASK_ID, Menu.NONE, R.string.TAd_contextDeleteTask);
@@ -769,15 +767,6 @@ public class TaskListFragment extends InjectingListFragment implements
             taskService.save(task);
             loadTaskListContent();
             return true;
-        }
-        case CONTEXT_MENU_PURGE_TASK_ID: {
-            itemId = item.getGroupId();
-            Task task = new Task();
-            task.setId(itemId);
-            TimerPlugin.stopTimer(notificationManager, taskService, getActivity(), task);
-            taskDeleter.purge(itemId);
-            loadTaskListContent();
-            return true;
         }
             default:
                 return super.onOptionsItemSelected(item);

src/main/java/com/todoroo/astrid/service/TaskDeleter.java

@@ -48,13 +48,6 @@ public class TaskDeleter {
         return taskDao.deleteWhere(Task.DELETION_DATE.gt(0));
     }
 
-    /**
-     * Permanently delete the given task.
-     */
-    public void purge(long taskId) {
-        taskDao.delete(taskId);
-    }
-
     public void delete(Task item) {
         if(!item.isSaved()) {
             return;

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

@@ -44,7 +44,6 @@
 	<string name="TAd_contextCopyTask">Копирай задача</string>
 	<string name="TAd_contextDeleteTask">Изтрий задача</string>
 	<string name="TAd_contextUndeleteTask">Възстанови Задача</string>
-	<string name="TAd_contextPurgeTask">Изчистване на задачите</string>
 	<string name="SSD_sort_drag">Ръчно подреждане с подзадачи</string>
 	<string name="SSD_sort_auto">Умно сортиране</string>
 	<string name="SSD_sort_alpha">По име</string>

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

@@ -32,7 +32,6 @@
 	<string name="TAd_contextCopyTask">Copia la tasca</string>
 	<string name="TAd_contextDeleteTask">Suprimeix la tasca</string>
 	<string name="TAd_contextUndeleteTask">Recupera la tasca</string>
-	<string name="TAd_contextPurgeTask">Purgar tasques</string>
 	<string name="SSD_sort_drag">Ordre manual amb subtasques</string>
 	<string name="SSD_sort_auto">Classificació intel·ligent Tasks</string>
 	<string name="SSD_sort_alpha">Per títol</string>

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

@@ -34,7 +34,6 @@
 	<string name="TAd_contextCopyTask">Kopírovat úkol</string>
 	<string name="TAd_contextDeleteTask">Smazat úkol</string>
 	<string name="TAd_contextUndeleteTask">Obnovit úkol</string>
-	<string name="TAd_contextPurgeTask">Smazat úkol</string>
 	<string name="SSD_sort_drag">Ručně nebo s podúkoly</string>
 	<string name="SSD_sort_auto">Chytré třídění</string>
 	<string name="SSD_sort_alpha">Podle názvu</string>

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

@@ -29,7 +29,6 @@
 	<string name="TAd_deletedFormat">%s [slettet]</string>
 	<string name="TAd_actionEditTask">Rediger</string>
 	<string name="TAd_contextUndeleteTask">Gendan opgave</string>
-	<string name="TAd_contextPurgeTask">Ryd opgave</string>
 	<string name="SSD_sort_drag">Manuel ordre med delopgaver</string>
 	<string name="SSD_sort_auto">Tasks Intelligent sortering</string>
 	<string name="SSD_sort_alpha">Efter titel</string>

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

@@ -39,7 +39,6 @@
 	<string name="TAd_contextCopyTask">Aufgabe kopieren</string>
 	<string name="TAd_contextDeleteTask">Aufgabe löschen</string>
 	<string name="TAd_contextUndeleteTask">Aufgabe wiederherstellen</string>
-	<string name="TAd_contextPurgeTask">Aufgabe endgültig löschen</string>
 	<string name="SSD_sort_drag">Manuelle Sortierung mit Unteraufgaben</string>
 	<string name="SSD_sort_auto">Smarte Sortierung</string>
 	<string name="SSD_sort_alpha">Nach Titel</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Copiar tarea</string>
 	<string name="TAd_contextDeleteTask">Eliminar tarea</string>
 	<string name="TAd_contextUndeleteTask">Restaurar Tarea</string>
-	<string name="TAd_contextPurgeTask">Purgar Tareas</string>
 	<string name="SSD_sort_drag">Orden manual con subtareas</string>
 	<string name="SSD_sort_auto">Ordenación inteligente</string>
 	<string name="SSD_sort_alpha">Por título</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Copier la tâche</string>
 	<string name="TAd_contextDeleteTask">Supprimer la tâche</string>
 	<string name="TAd_contextUndeleteTask">Récupérer la tâche</string>
-	<string name="TAd_contextPurgeTask">Purger la tâche</string>
 	<string name="SSD_sort_drag">Ordonner manuellement avec les sous-tâches</string>
 	<string name="SSD_sort_auto">Tri intelligent Tasks</string>
 	<string name="SSD_sort_alpha">Par Titre</string>

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

@@ -14,7 +14,6 @@
 	<string name="TAd_contextCopyTask">Feladat másolása</string>
 	<string name="TAd_contextDeleteTask">Feladat törlése</string>
 	<string name="TAd_contextUndeleteTask">Feladat törlésének visszavonása</string>
-	<string name="TAd_contextPurgeTask">Feladat eltávolítása</string>
 	<string name="SSD_sort_drag">Manuális sorrend részfeladatokkal</string>
 	<string name="SSD_sort_auto">Intelligens rendezés</string>
 	<string name="SSD_sort_alpha">Név alapján</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Copia Attività</string>
 	<string name="TAd_contextDeleteTask">Elimina attività</string>
 	<string name="TAd_contextUndeleteTask">Ripristina Attività</string>
-	<string name="TAd_contextPurgeTask">Elimina Attività</string>
 	<string name="SSD_sort_drag">Ordinamento manuale con attività correlate</string>
 	<string name="SSD_sort_auto">Ordinamento Intelligente</string>
 	<string name="SSD_sort_alpha">Per Titotlo</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">העתק משימה</string>
 	<string name="TAd_contextDeleteTask">מַחֲקֵי משימה</string>
 	<string name="TAd_contextUndeleteTask">בטלי מחיקת משימה</string>
-	<string name="TAd_contextPurgeTask">אַיֵּן משימה</string>
 	<string name="SSD_sort_drag">סידור ידני עם תתי-משימות</string>
 	<string name="SSD_sort_auto">Tasks מיון חכם</string>
 	<string name="SSD_sort_alpha">ע״פ כותרת</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">タスクをコピー</string>
 	<string name="TAd_contextDeleteTask">タスクを削除</string>
 	<string name="TAd_contextUndeleteTask">元に戻す</string>
-	<string name="TAd_contextPurgeTask">タスクを削除</string>
 	<string name="SSD_sort_drag">サブタスクの手動設定順</string>
 	<string name="SSD_sort_auto">自動</string>
 	<string name="SSD_sort_alpha">タイトル順</string>

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

@@ -44,7 +44,6 @@
 	<string name="TAd_contextCopyTask">일정 복사하기</string>
 	<string name="TAd_contextDeleteTask">일정 지우기</string>
 	<string name="TAd_contextUndeleteTask">일정 복구하기</string>
-	<string name="TAd_contextPurgeTask">일정 비우기</string>
 	<string name="SSD_sort_drag">수동 정렬 (하위일정 포함)</string>
 	<string name="SSD_sort_auto">Tasks 스마트 정렬</string>
 	<string name="SSD_sort_alpha">제목 순서</string>

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

@@ -29,7 +29,6 @@
 	<string name="TAd_contextCopyTask">Kopier oppgave</string>
 	<string name="TAd_contextDeleteTask">Slett oppgave</string>
 	<string name="TAd_contextUndeleteTask">Gjenopprett slettet oppgave</string>
-	<string name="TAd_contextPurgeTask">Rens ut oppgave</string>
 	<string name="SSD_sort_auto">Tasks intelligent sortering</string>
 	<string name="SSD_sort_alpha">Etter tittel</string>
 	<string name="SSD_sort_due">Etter forfallsdato</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Taak kopiëren</string>
 	<string name="TAd_contextDeleteTask">Taak wissen</string>
 	<string name="TAd_contextUndeleteTask">Taak herstellen</string>
-	<string name="TAd_contextPurgeTask">Taak opruimen</string>
 	<string name="SSD_sort_drag">Handmatige volgorde met subtaken</string>
 	<string name="SSD_sort_auto">Slim Sorteren</string>
 	<string name="SSD_sort_alpha">Op titel</string>

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

@@ -34,7 +34,6 @@
 	<string name="TAd_contextCopyTask">Kopiuj zadanie</string>
 	<string name="TAd_contextDeleteTask">Usuń zadanie</string>
 	<string name="TAd_contextUndeleteTask">Przywrócone zadanie</string>
-	<string name="TAd_contextPurgeTask">Trwale usuń zadanie</string>
 	<string name="SSD_sort_drag">Ręczne z podzadaniami</string>
 	<string name="SSD_sort_auto">Automatyczne</string>
 	<string name="SSD_sort_alpha">Wg. tytułu</string>

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

@@ -36,7 +36,6 @@
 	<string name="TAd_contextCopyTask">Copiar tarefa</string>
 	<string name="TAd_contextDeleteTask">Excluir tarefa</string>
 	<string name="TAd_contextUndeleteTask">Restaurar tarefa</string>
-	<string name="TAd_contextPurgeTask">Destruir tarefa</string>
 	<string name="SSD_sort_drag">Ordem manual com subtarefas</string>
 	<string name="SSD_sort_auto">Ordenação inteligente Tasks</string>
 	<string name="SSD_sort_alpha">Por título</string>

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

@@ -39,7 +39,6 @@
 	<string name="TAd_contextCopyTask">Copiar tarefa</string>
 	<string name="TAd_contextDeleteTask">Eliminar tarefa</string>
 	<string name="TAd_contextUndeleteTask">Recuperar tarefa</string>
-	<string name="TAd_contextPurgeTask">Remover tarefa</string>
 	<string name="SSD_sort_drag">Ordem manual com subtarefas</string>
 	<string name="SSD_sort_auto">Ordenação Inteligente Tasks</string>
 	<string name="SSD_sort_alpha">Por Título</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Копировать задачу</string>
 	<string name="TAd_contextDeleteTask">Удалить задачу</string>
 	<string name="TAd_contextUndeleteTask">Отменить удаление задачи</string>
-	<string name="TAd_contextPurgeTask">Очистить задачу</string>
 	<string name="SSD_sort_drag">Ручная сортировка с подзадачами</string>
 	<string name="SSD_sort_auto">Умная сортировка</string>
 	<string name="SSD_sort_alpha">По названию</string>

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

@@ -36,7 +36,6 @@
 	<string name="TAd_contextCopyTask">Kopírovať úlohu</string>
 	<string name="TAd_contextDeleteTask">Vymazať úlohu</string>
 	<string name="TAd_contextUndeleteTask">Nevymazať úlohu</string>
-	<string name="TAd_contextPurgeTask">Vyčistiť úlohu</string>
 	<string name="SSD_sort_drag">Ručne alebo s pdúlohami</string>
 	<string name="SSD_sort_auto">Chytré triedenie</string>
 	<string name="SSD_sort_alpha">Podľa názvu</string>

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

@@ -37,7 +37,6 @@
 	<string name="TAd_contextCopyTask">Naredi kopijo opravka</string>
 	<string name="TAd_contextDeleteTask">Zbriši opravek</string>
 	<string name="TAd_contextUndeleteTask">Razveljavi izbris opravka</string>
-	<string name="TAd_contextPurgeTask">Očisti opravek</string>
 	<string name="SSD_sort_drag">Ročna nastavitev s podopravki</string>
 	<string name="SSD_sort_auto">Pametno razvrščanje</string>
 	<string name="SSD_sort_alpha">Po naslovu</string>

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

@@ -41,7 +41,6 @@
 	<string name="TAd_contextCopyTask">Kopiera uppgift</string>
 	<string name="TAd_contextDeleteTask">Radera uppgift</string>
 	<string name="TAd_contextUndeleteTask">Återställ raderad uppgift</string>
-	<string name="TAd_contextPurgeTask">Rensa uppgift</string>
 	<string name="SSD_sort_drag">Manuell sortering med underuppgifter</string>
 	<string name="SSD_sort_auto">Tasks intelligent sortering</string>
 	<string name="SSD_sort_alpha">Efter titel</string>

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

@@ -33,7 +33,6 @@
 	<string name="TAd_contextCopyTask">Görevi Kopyala</string>
 	<string name="TAd_contextDeleteTask">Görevi Sil</string>
 	<string name="TAd_contextUndeleteTask">Görevi Kurtar</string>
-	<string name="TAd_contextPurgeTask">Görevi Temizle</string>
 	<string name="SSD_sort_auto">Tasks Akıllı Sıralama</string>
 	<string name="SSD_sort_alpha">Başlığa göre</string>
 	<string name="SSD_sort_due">Bitiş Tarihine Göre</string>

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

@@ -37,7 +37,6 @@
 	<string name="TAd_contextCopyTask">Копіювати завдання</string>
 	<string name="TAd_contextDeleteTask">Видалити завдання</string>
 	<string name="TAd_contextUndeleteTask">Відмінити видалення завдання</string>
-	<string name="TAd_contextPurgeTask">Очитстити завдання</string>
 	<string name="SSD_sort_drag">Ручний порядок з підзадачами</string>
 	<string name="SSD_sort_auto">Розумне сортування</string>
 	<string name="SSD_sort_alpha">За заголовком</string>

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

@@ -33,7 +33,6 @@
 	<string name="TAd_contextCopyTask">复制任务</string>
 	<string name="TAd_contextDeleteTask">删除任务</string>
 	<string name="TAd_contextUndeleteTask">未删除任务</string>
-	<string name="TAd_contextPurgeTask">清除任务</string>
 	<string name="SSD_sort_auto">清单小助理智能排序</string>
 	<string name="SSD_sort_alpha">按标题</string>
 	<string name="SSD_sort_due">按到期日</string>

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

@@ -34,7 +34,6 @@
 	<string name="TAd_contextCopyTask">複製任務工作</string>
 	<string name="TAd_contextDeleteTask">刪除任務工作</string>
 	<string name="TAd_contextUndeleteTask">還原工作刪除</string>
-	<string name="TAd_contextPurgeTask">清除工作</string>
 	<string name="SSD_sort_auto">Tasks智慧排序</string>
 	<string name="SSD_sort_alpha">依主旨</string>
 	<string name="SSD_sort_due">依到期日</string>

src/main/res/values/strings.xml

@@ -131,9 +131,6 @@ File %1$s contained %2$s.\n\n
     <!-- Context Item: undelete task -->
     <string name="TAd_contextUndeleteTask">Undelete Task</string>
 
-    <!-- Context Item: purge task -->
-    <string name="TAd_contextPurgeTask">Purge Task</string>
-
     <!-- ============================================== SortSelectionDialog == -->
 
     <!-- Sort Selection: drag with subtasks -->