From 31647f11fdbef9ec6dfda371e551fc3872754f37 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 11 Mar 2015 13:35:39 -0500
Subject: [PATCH] Remove completed toast

---
 .../java/com/todoroo/astrid/reminders/ReminderDialog.java  | 7 -------
 .../todoroo/astrid/reminders/ShowNotificationReceiver.java | 3 ++-
 src/main/res/values-ar/strings.xml                         | 1 -
 src/main/res/values-bg-rBG/strings.xml                     | 1 -
 src/main/res/values-cs/strings.xml                         | 1 -
 src/main/res/values-de/strings.xml                         | 1 -
 src/main/res/values-el/strings.xml                         | 1 -
 src/main/res/values-es/strings.xml                         | 1 -
 src/main/res/values-fr/strings.xml                         | 1 -
 src/main/res/values-it/strings.xml                         | 1 -
 src/main/res/values-iw/strings.xml                         | 1 -
 src/main/res/values-ja/strings.xml                         | 1 -
 src/main/res/values-ko/strings.xml                         | 1 -
 src/main/res/values-nl/strings.xml                         | 1 -
 src/main/res/values-pl/strings.xml                         | 1 -
 src/main/res/values-pt-rBR/strings.xml                     | 1 -
 src/main/res/values-pt/strings.xml                         | 1 -
 src/main/res/values-ru/strings.xml                         | 1 -
 src/main/res/values-sl-rSI/strings.xml                     | 1 -
 src/main/res/values-sv/strings.xml                         | 1 -
 src/main/res/values-tr/strings.xml                         | 1 -
 src/main/res/values-uk/strings.xml                         | 1 -
 src/main/res/values-zh-rCN/strings.xml                     | 1 -
 src/main/res/values-zh-rTW/strings.xml                     | 1 -
 src/main/res/values/strings-reminders.xml                  | 5 +----
 25 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java b/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java
index 47957a2a2..4536ecb08 100644
--- a/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -10,16 +10,13 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.TimePickerDialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
-import android.content.Intent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TimePicker;
-import android.widget.Toast;
 
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.AstridActivity;
-import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TaskService;
 
@@ -94,10 +91,6 @@ public class ReminderDialog extends Dialog {
                 if (task != null) {
                     taskService.setComplete(task, true);
                 }
-                activity.sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
-                Toast.makeText(activity,
-                        R.string.rmd_NoA_completed_toast,
-                        Toast.LENGTH_LONG).show();
                 dismiss();
             }
         });
diff --git a/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java b/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java
index 93a8d02f1..803e8e537 100644
--- a/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java
+++ b/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
 import android.telephony.TelephonyManager;
 
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -112,7 +113,7 @@ public class ShowNotificationReceiver extends InjectingBroadcastReceiver {
 
         PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
-        Notification notification = new Notification.Builder(context)
+        Notification notification = new NotificationCompat.Builder(context)
                 .setSmallIcon(R.drawable.notif_astrid)
                 .setTicker(text)
                 .setWhen(System.currentTimeMillis())
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 28565d3b8..1dcded44e 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -63,7 +63,6 @@
 	<string name="rmd_NoA_filter">تذكير!</string>
 	<string name="rmd_NoA_done">اكمل</string>
 	<string name="rmd_NoA_snooze">غفوة</string>
-	<string name="rmd_NoA_completed_toast">مبارك على الانتهاء!</string>
 	<string name="rmd_EPr_alerts_header">إعدادات التذكير</string>
 	<string name="rmd_EPr_alerts_summary">الساعات الهادئة، وخيارات الغفوة، ومستوى الثبات</string>
 	<string name="rmd_EPr_enabled_title">التذكير مفعل؟</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index a501c5751..dd65139dc 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -380,7 +380,6 @@
 	<string name="rmd_NoA_filter">Напомняне!</string>
 	<string name="rmd_NoA_done">Завършен</string>
 	<string name="rmd_NoA_snooze">Отложи</string>
-	<string name="rmd_NoA_completed_toast">Поздравления за завършване!</string>
 	<string name="rmd_NoA_dlg_title">Напомняне:</string>
 	<string name="rmd_EPr_alerts_header">Настройки на напомняне</string>
 	<string name="rmd_EPr_alerts_summary">Тихи часове, опции за отлагане, ниво на настойчивост</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 76f199d3b..12033a26e 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -366,7 +366,6 @@
 	<string name="rmd_NoA_filter">Připomínka!</string>
 	<string name="rmd_NoA_done">Dokončeno!</string>
 	<string name="rmd_NoA_snooze">Později...</string>
-	<string name="rmd_NoA_completed_toast">Hotovo! Gratuluji!</string>
 	<string name="rmd_NoA_dlg_title">Připomenutí:</string>
 	<string name="rmd_EPr_alerts_header">Nastavení upomínek</string>
 	<string name="rmd_EPr_alerts_summary">Čas klidu, nastavení odložení, úroveň vytrvalosti</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 4bc460cfe..b95e2e5bb 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -372,7 +372,6 @@
 	<string name="rmd_NoA_filter">Erinnerung!</string>
 	<string name="rmd_NoA_done">Abgeschlossen</string>
 	<string name="rmd_NoA_snooze">Schlummern</string>
-	<string name="rmd_NoA_completed_toast">Herzlichen Glückwunsch zum Abschluss!</string>
 	<string name="rmd_NoA_dlg_title">Erinnerung:</string>
 	<string name="rmd_EPr_alerts_header">Erinnerungs-Einstellungen</string>
 	<string name="rmd_EPr_alerts_summary">Ruhezeiten, Schlummer-Einstellungen, Hartnäckigkeit</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 9b297239b..eb5444f79 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -374,7 +374,6 @@
 	<string name="rmd_NoA_filter">Υπενθύμιση!</string>
 	<string name="rmd_NoA_done">Ολοκληρωμένο</string>
 	<string name="rmd_NoA_snooze">Αναβολή</string>
-	<string name="rmd_NoA_completed_toast">Συγχαρητήρια στο τελείωμα!</string>
 	<string name="rmd_NoA_dlg_title">Υπενθύμιση:</string>
 	<string name="rmd_EPr_alerts_header">Ρυθμίσεις υπενθυμίσεων</string>
 	<string name="rmd_EPr_alerts_summary">Ώρες ησυχίας, ρυθμίσεις αναβολής, επίπεδο επιμονής</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index b5e54926f..fc5b6e64c 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -374,7 +374,6 @@
 	<string name="rmd_NoA_filter">¡Aviso!</string>
 	<string name="rmd_NoA_done">¡Terminada!</string>
 	<string name="rmd_NoA_snooze">Dilación</string>
-	<string name="rmd_NoA_completed_toast">¡Felicitaciones por terminar!</string>
 	<string name="rmd_NoA_dlg_title">Recordatorio:</string>
 	<string name="rmd_EPr_alerts_header">Configurar recordatorios</string>
 	<string name="rmd_EPr_alerts_summary">Horario en silencio, opciones al posponer, nivel de persistencia</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 368eed8e7..99c3aa051 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -373,7 +373,6 @@
 	<string name="rmd_NoA_filter">Rappel !</string>
 	<string name="rmd_NoA_done">Déjà fait !</string>
 	<string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
-	<string name="rmd_NoA_completed_toast">Félicitations pour avoir fini cette tâche</string>
 	<string name="rmd_NoA_dlg_title">Rappel :</string>
 	<string name="rmd_EPr_alerts_header">Paramètres de rappel</string>
 	<string name="rmd_EPr_alerts_summary">Heures de repos, options de report, niveau de persistance</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index a2883a23b..d7d7be2f2 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -333,7 +333,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="rmd_NoA_filter">Promemoria!</string>
 	<string name="rmd_NoA_done">Completata</string>
 	<string name="rmd_NoA_snooze">Rimanda...</string>
-	<string name="rmd_NoA_completed_toast">Congratulazioni per il completamento!</string>
 	<string name="rmd_NoA_dlg_title">Promemoria:</string>
 	<string name="rmd_EPr_alerts_header">Impostazioni promemoria</string>
 	<string name="rmd_EPr_alerts_summary">Ore tranquille, funzione di ripetizione, livello di persistenza</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 45316a22e..76f60e316 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -372,7 +372,6 @@
 	<string name="rmd_NoA_filter">תזכורת!</string>
 	<string name="rmd_NoA_done">בוצעה</string>
 	<string name="rmd_NoA_snooze">השתק</string>
-	<string name="rmd_NoA_completed_toast">איחולי על השלמת המשימה!</string>
 	<string name="rmd_NoA_dlg_title">תזכורת:</string>
 	<string name="rmd_EPr_alerts_header">הגדרות תזכורת</string>
 	<string name="rmd_EPr_alerts_summary">שעות שקטות, אשפרויות נימנום, רמת המשכות</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 98f2e973c..32664ce44 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -378,7 +378,6 @@
 	<string name="rmd_NoA_filter">お知らせ</string>
 	<string name="rmd_NoA_done">既に完了しています!</string>
 	<string name="rmd_NoA_snooze">スヌーズ</string>
-	<string name="rmd_NoA_completed_toast">設定が完了しました!</string>
 	<string name="rmd_NoA_dlg_title">お知らせ.</string>
 	<string name="rmd_EPr_alerts_header">通知の設定</string>
 	<string name="rmd_EPr_alerts_summary">消音時間帯, スヌーズオプション, 持続レベル</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 0fa1abe15..0426fd253 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -380,7 +380,6 @@
 	<string name="rmd_NoA_filter">알림!</string>
 	<string name="rmd_NoA_done">완료</string>
 	<string name="rmd_NoA_snooze">알림 잠시 미루기</string>
-	<string name="rmd_NoA_completed_toast">완료를 축하합니다!</string>
 	<string name="rmd_NoA_dlg_title">알림:</string>
 	<string name="rmd_EPr_alerts_header">알림 설정</string>
 	<string name="rmd_EPr_alerts_summary">알람 꺼짐 시간, 스누즈 설정, 알람 지속 레벨</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 5ae07e7eb..c8b8e6b86 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -375,7 +375,6 @@
 	<string name="rmd_NoA_filter">Herinnering!</string>
 	<string name="rmd_NoA_done">Reeds voltooid!</string>
 	<string name="rmd_NoA_snooze">Sluimeren...</string>
-	<string name="rmd_NoA_completed_toast">Gefeliciteerd met het afronden!</string>
 	<string name="rmd_NoA_dlg_title">Herinnering:</string>
 	<string name="rmd_EPr_alerts_header">Instellingen herinneringen</string>
 	<string name="rmd_EPr_alerts_summary">Rustige uren, snooze opties, niveau volhouden</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 0c9371c83..6658be137 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -378,7 +378,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="rmd_NoA_filter">Przypomnienie!</string>
 	<string name="rmd_NoA_done">Już wykonano!</string>
 	<string name="rmd_NoA_snooze">Wstrzymaj...</string>
-	<string name="rmd_NoA_completed_toast">Gratuluję ukończenia!</string>
 	<string name="rmd_NoA_dlg_title">Przypomnienie:</string>
 	<string name="rmd_EPr_alerts_header">Ustawienia przypomnień</string>
 	<string name="rmd_EPr_alerts_summary">Ciche godziny, opcje drzemki, poziom trwania</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 337d209aa..1fb5b0fd4 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -372,7 +372,6 @@
 	<string name="rmd_NoA_filter">Lembrete!</string>
 	<string name="rmd_NoA_done">Concluída</string>
 	<string name="rmd_NoA_snooze">Adiar</string>
-	<string name="rmd_NoA_completed_toast">Parabéns!</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
 	<string name="rmd_EPr_alerts_header">Configurações de lembretes</string>
 	<string name="rmd_EPr_alerts_summary">Horas quieto, opções de soneca, nível de persistência</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index d87758ef5..b0738273f 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -378,7 +378,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	</string-array>
 	<string name="rmd_NoA_filter">Lembrete!</string>
 	<string name="rmd_NoA_done">Terminada</string>
-	<string name="rmd_NoA_completed_toast">Parabéns ao terminar!</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
 	<string name="rmd_EPr_alerts_header">Definições do lembrete</string>
 	<string name="rmd_EPr_alerts_summary">Horas de silêncio, opções de snooze, nível de persistência</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 8c665d53b..584ed2d05 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -379,7 +379,6 @@
 	<string name="rmd_NoA_filter">Напоминание!</string>
 	<string name="rmd_NoA_done">Уже готово!</string>
 	<string name="rmd_NoA_snooze">Повтор</string>
-	<string name="rmd_NoA_completed_toast">Поздравляем с окончанием!</string>
 	<string name="rmd_NoA_dlg_title">Напоминания:</string>
 	<string name="rmd_EPr_alerts_header">Настройки напоминаний</string>
 	<string name="rmd_EPr_alerts_summary">Тихие часы, повторные напоминания и уровень настойчивости</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 2a4f7b12c..ba1e3b383 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -377,7 +377,6 @@
 	<string name="rmd_NoA_filter">Opomnik!</string>
 	<string name="rmd_NoA_done">Končano</string>
 	<string name="rmd_NoA_snooze">Dremež</string>
-	<string name="rmd_NoA_completed_toast">Čestitke za dokončanje!</string>
 	<string name="rmd_NoA_dlg_title">Opomnik:</string>
 	<string name="rmd_EPr_alerts_header">Nastavitve opomnika</string>
 	<string name="rmd_EPr_alerts_summary">Tihi čas, možnosti dremeža, stopnja vztrajnosti</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4b10e7144..5cee38cba 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -367,7 +367,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="rmd_NoA_filter">Påminnelse!</string>
 	<string name="rmd_NoA_done">Redan klar!</string>
 	<string name="rmd_NoA_snooze">Vänta...</string>
-	<string name="rmd_NoA_completed_toast">Grattis till den slutförda uppgiften!</string>
 	<string name="rmd_NoA_dlg_title">Påminnelse:</string>
 	<string name="rmd_EPr_alerts_header">Påminnelseinställningar</string>
 	<string name="rmd_EPr_alerts_summary">Tysta timmar, snooze alternativ, envishets-nivå</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index daefb594c..15a785a7b 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -335,7 +335,6 @@
 	<string name="rmd_NoA_filter">Hatırlatıcı!</string>
 	<string name="rmd_NoA_done">Tamamlandı</string>
 	<string name="rmd_NoA_snooze">Ertele</string>
-	<string name="rmd_NoA_completed_toast">Bitirdiğin için tebrikler!</string>
 	<string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
 	<string name="rmd_EPr_alerts_header">Hatırlatıcı Ayarları</string>
 	<string name="rmd_EPr_alerts_summary">Sessiz saatler, erteleme seçenekleri, süreklilik düzeyi</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index ae161eba6..1b0de108e 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -380,7 +380,6 @@
 	<string name="rmd_NoA_filter">Нагадування!</string>
 	<string name="rmd_NoA_done">Виконано!</string>
 	<string name="rmd_NoA_snooze">Відкласти</string>
-	<string name="rmd_NoA_completed_toast">Вітаю з завершенням!</string>
 	<string name="rmd_NoA_dlg_title">Нагадування:</string>
 	<string name="rmd_EPr_alerts_header">Налаштування нагадувань</string>
 	<string name="rmd_EPr_alerts_summary">Тихі години, опції короткого сну, рівень наполегливості</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9542090bd..f2e698758 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -313,7 +313,6 @@
 	<string name="rmd_NoA_filter">提醒！</string>
 	<string name="rmd_NoA_done">已完成!</string>
 	<string name="rmd_NoA_snooze">晚点提醒...</string>
-	<string name="rmd_NoA_completed_toast">恭喜，已经完成了！</string>
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_alerts_header">提醒设置</string>
 	<string name="rmd_EPr_alerts_summary">勿扰模式，稍候提醒，持续提醒</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 5d84b5fcf..58639b2d6 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -353,7 +353,6 @@
 	<string name="rmd_NoA_filter">提醒！</string>
 	<string name="rmd_NoA_done">已完成!</string>
 	<string name="rmd_NoA_snooze">晚點提醒...</string>
-	<string name="rmd_NoA_completed_toast">恭喜，已經完成了！</string>
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_alerts_header">提醒設置</string>
 	<string name="rmd_EPr_alerts_summary">勿擾模式，稍候提醒，持續提醒</string>
diff --git a/src/main/res/values/strings-reminders.xml b/src/main/res/values/strings-reminders.xml
index 83168837d..b31edab73 100644
--- a/src/main/res/values/strings-reminders.xml
+++ b/src/main/res/values/strings-reminders.xml
@@ -64,10 +64,7 @@
   
   <!-- Reminder: Snooze button (remind again later) -->
   <string name="rmd_NoA_snooze">Snooze</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
-  
+
   <!-- Prefix for reminder dialog title -->
   <string name="rmd_NoA_dlg_title">Reminder:</string>