diff --git a/scripts/catxml b/scripts/catxml
index bf6dbd8a2..fbf7aee2b 100755
--- a/scripts/catxml
+++ b/scripts/catxml
@@ -1,10 +1,10 @@
#!/bin/bash
# combine multiple android resource xml's to one
-cat $1 | /usr/bin/sed 's/<\/resources.*//'
+cat $1 | sed 's/<\/resources.*//'
shift
if [ "$*" != "" ]; then
- cat $* | /usr/bin/sed 's/<\/resources.*//;s/'
diff --git a/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/src/main/java/com/todoroo/astrid/reminders/Notifications.java
index 811e0087e..77ec1d868 100644
--- a/src/main/java/com/todoroo/astrid/reminders/Notifications.java
+++ b/src/main/java/com/todoroo/astrid/reminders/Notifications.java
@@ -8,7 +8,6 @@ package com.todoroo.astrid.reminders;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.os.Bundle;
import android.text.TextUtils;
@@ -20,7 +19,6 @@ import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.utility.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,34 +70,16 @@ public class Notifications extends InjectingBroadcastReceiver {
void handle(Intent intent) {
long id = intent.getLongExtra(ID_KEY, 0);
int type = intent.getIntExtra(EXTRAS_TYPE, (byte) 0);
-
- Resources r = context.getResources();
- String reminder;
-
- if (type == ReminderService.TYPE_ALARM) {
- reminder = getRandomReminder(r.getStringArray(R.array.reminders_alarm));
- } else {
- reminder = ""; //$NON-NLS-1$
- }
-
- if (!showTaskNotification(id, type, reminder)) {
+ if (!showTaskNotification(id, type)) {
notificationManager.cancel((int) id);
}
}
- /**
- * @return a random reminder string
- */
- private String getRandomReminder(String[] reminders) {
- int next = ReminderService.random.nextInt(reminders.length);
- return reminders[next];
- }
-
/**
* Show a new notification about the given task. Returns false if there was
* some sort of error or the alarm should be disabled.
*/
- private boolean showTaskNotification(long id, int type, String reminder) {
+ private boolean showTaskNotification(long id, int type) {
Task task;
try {
task = taskDao.fetch(id, Task.ID, Task.TITLE, Task.HIDE_UNTIL, Task.COMPLETION_DATE,
@@ -150,7 +130,6 @@ public class Notifications extends InjectingBroadcastReceiver {
taskDao.saveExisting(task);
String title = context.getString(R.string.app_name);
- String text = reminder + " " + taskTitle; //$NON-NLS-1$
Intent notifyIntent = new Intent(context, TaskListActivity.class);
FilterWithCustomIntent itemFilter = new FilterWithCustomIntent(context.getString(R.string.rmd_NoA_filter),
@@ -159,17 +138,17 @@ public class Notifications extends InjectingBroadcastReceiver {
null);
Bundle customExtras = new Bundle();
customExtras.putLong(NotificationFragment.TOKEN_ID, id);
- customExtras.putString(EXTRAS_TEXT, text);
+ customExtras.putString(EXTRAS_TEXT, taskTitle);
itemFilter.customExtras = customExtras;
itemFilter.customTaskList = new ComponentName(context, NotificationFragment.class);
notifyIntent.setAction("NOTIFY" + id); //$NON-NLS-1$
notifyIntent.putExtra(TaskListFragment.TOKEN_FILTER, itemFilter);
notifyIntent.putExtra(NotificationFragment.TOKEN_ID, id);
- notifyIntent.putExtra(EXTRAS_TEXT, text);
+ notifyIntent.putExtra(EXTRAS_TEXT, taskTitle);
notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
- broadcaster.requestNotification((int) id, notifyIntent, type, title, text, ringTimes);
+ broadcaster.requestNotification((int) id, notifyIntent, type, title, taskTitle, ringTimes);
return true;
}
}
diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
index 2a5ac9287..a694606ec 100644
--- a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
+++ b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
@@ -75,7 +75,7 @@ public final class ReminderService {
/** flag for an alarm reminder */
public static final int TYPE_ALARM = 4;
- static final Random random = new Random();
+ private static final Random random = new Random();
// --- instance variables
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 4910bb4a8..a501c5751 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -14,9 +14,6 @@
Изберете Google акаунт, който искате да използвате:
Аларми
Добави Аларма
-
- - Аларма!
-
Резервни копия
Състояние
Последно резервно копие:\n%s
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 90991134d..2b0489f59 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -14,9 +14,6 @@
Trieu el compte de Google que vulgueu utilitzar:
Alarmes
Afegeix una alarma
-
- - Alarma
-
Còpies de seguretat
Estat
Còpia de seguretat més recent:\n%s
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index f3e71469f..76f199d3b 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -14,9 +14,6 @@
Vyberte, který účet Google chcete použít:
Alarmy
Přidat alarm
-
- - Budík!
-
Zálohy
Stav
Předchozí:\n%s
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index c7c252cc6..9b297239b 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -13,9 +13,6 @@
Επιλέξτε τον λογαριασμό Google που θέλετε να χρησιμοποιήσετε:
Ξυπνητήρια
Προσθήκη ξυπνητηριού
-
- - Ξυπνητήρι!
-
Αντίγραφα ασφαλείας
Κατάσταση
Τελευταίο αντίγραφο ασφαλείας:\n%s
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d257bad78..b5e54926f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -14,9 +14,6 @@
Seleccione la cuenta de Google que desea usar:
Alarmas
Añadir una alarma
-
- - ¡Alarma!
-
Copias de seguridad
Estado
Última copia:\n%s
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 193709ddf..368eed8e7 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -14,9 +14,6 @@
Sélectionnez le compte Google que vous voulez utiliser :
Alarmes
Ajouter une alarme
-
- - Alarme !
-
Sauvegardes
Statut
Dernière sauvegarde : \n%s
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 5ff64fdbb..a2883a23b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -14,9 +14,6 @@
Seleziona l\'account Google che vuoi utilizzare:
Promemoria
Aggiungi un promemoria
-
- - Avviso!
-
Salvataggi
Stato
Backup più recente:\n%s
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 317425cd2..45316a22e 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -14,9 +14,6 @@
בחר חשבון גוגל
התראות
הוסף התראה
-
- - התראה!
-
גיבויים
מצב
גיבוי אחרון: %s
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 444194ba1..98f2e973c 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -14,9 +14,6 @@
使用したいGoogleアカウントを選択してください:
アラーム
アラームを追加する
-
- - アラーム
-
バックアップ
状況
最新: %s
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index dc87b4ded..0fa1abe15 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -14,9 +14,6 @@
사용하려는 구글 계정을 선택해 주십시오:
알람
알람 추가
-
- - 알람!
-
백업
상태
최근 백업:\n%s
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index e75bbc301..5ae07e7eb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -14,9 +14,6 @@
Selecteer de Google account die je wil gebruiken:
Herinneringen
Voeg Herinnering toe
-
- - Voeg Alarm toe
-
Back-ups
Laatste: back-up\n%s
Laatste back-up mislukt
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 0bab43ded..337d209aa 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -14,9 +14,6 @@
Selecione a conta do Google que deseja usar:
Alarmes
Inserir alarme
-
- - Alarme!
-
Estado
Backup recente:\n%s
O último backup falhou
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 4bb573353..d87758ef5 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -14,9 +14,6 @@
Escolha a conta Google a utilizar:
Alarmes
Adicionar alarme
-
- - Alarme!
-
Estado
Último backup:\n%s
Último backup falhou
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c5edab09d..8c665d53b 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -14,9 +14,6 @@
Выберите аккаунт Google, который вы хотите использовать:
Напоминания
Добавить напоминание
-
- - Напоминание!
-
Резервные копии
Состояние
Последняя: %s
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index ef25ff69a..2a4f7b12c 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -14,9 +14,6 @@
Izberite želeni Google račun:
Glasna opozorila
Dodaj glasno opozorilo
-
- - Glasno opozorilo!
-
Varnostne kopije
Najnovejša varnostna kopija:\n%s
Najnovejša varnostna kopija neuspešna
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 83e6c06e2..2d79f2b02 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -8,9 +8,6 @@
ถ่ายภาพ
เลือกจากคลังภาพ
ล้างภาพ
-
- - แจ้งเตือน!
-
สำรองข้อมูล
สถานะ
(แตะเพื่อแสดงข้อผิดพลาด)
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 279cbc04f..ae161eba6 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -14,9 +14,6 @@
Виберіть обліковий запис Google для використання:
Сигнали
Додати сигнал
-
- - Нагадування!
-
Резервні копії
Статус
Остання резервна копія:\n%s
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 7889789db..9542090bd 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -14,9 +14,6 @@
选择你要使用的Google账户
闹钟
添加闹钟
-
- - 闹钟!
-
备份
状态
最近一次:%s
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index b3c855426..5d84b5fcf 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -14,9 +14,6 @@
選擇您要使用的Google帳戶:
警示
加入警示
-
- - 警示!
-
備份
狀態
上次備份:\n%s
diff --git a/src/main/res/values/strings-alarms.xml b/src/main/res/values/strings-alarms.xml
index 6f8e3ce92..92c2104e5 100644
--- a/src/main/res/values/strings-alarms.xml
+++ b/src/main/res/values/strings-alarms.xml
@@ -1,17 +1,10 @@
-
-
Alarms
Add an Alarm
-
-
-
- - Alarm!
-
-
+