diff --git a/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java
index 3c0d552fc..4ddd811aa 100644
--- a/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java
@@ -12,13 +12,9 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterWithCustomIntent;
-import com.todoroo.astrid.data.Task;
-
-import org.tasks.R;
import java.util.Map.Entry;
import java.util.Set;
@@ -34,19 +30,12 @@ public class ShortcutActivity extends Activity {
// --- constants
- /** token for passing a task id through extras for viewing a single task */
- public static final String TOKEN_SINGLE_TASK = "id"; //$NON-NLS-1$
-
/** token for passing a {@link Filter}'s title through extras */
public static final String TOKEN_FILTER_TITLE = "title"; //$NON-NLS-1$
/** token for passing a {@link Filter}'s sql through extras */
public static final String TOKEN_FILTER_SQL = "sql"; //$NON-NLS-1$
- /** token for passing a {@link Filter}'s values for new tasks through extras as string */
- @Deprecated
- public static final String TOKEN_FILTER_VALUES = "v4nt"; //$NON-NLS-1$
-
/** token for passing a {@link Filter}'s values for new tasks through extras as exploded ContentValues */
public static final String TOKEN_FILTER_VALUES_ITEM = "v4ntp_"; //$NON-NLS-1$
@@ -55,10 +44,8 @@ public class ShortcutActivity extends Activity {
/** List of the above constants for searching */
private static final String[] CUSTOM_EXTRAS = {
- TOKEN_SINGLE_TASK,
TOKEN_FILTER_TITLE,
TOKEN_FILTER_SQL,
- TOKEN_FILTER_VALUES,
TOKEN_FILTER_VALUES_ITEM,
TOKEN_CUSTOM_CLASS
};
@@ -93,31 +80,26 @@ public class ShortcutActivity extends Activity {
String title = extras.getString(TOKEN_FILTER_TITLE);
String sql = extras.getString(TOKEN_FILTER_SQL);
sql = sql.replace("tasks.userId=0", "1"); // TODO: replace dirty hack for missing column
- ContentValues values;
- if(extras.containsKey(TOKEN_FILTER_VALUES)) {
- values = AndroidUtilities.contentValuesFromString(extras.getString(TOKEN_FILTER_VALUES));
- } else {
- values = new ContentValues();
- for(String key : extras.keySet()) {
- if(!key.startsWith(TOKEN_FILTER_VALUES_ITEM)) {
- continue;
- }
+ ContentValues values = new ContentValues();
+ for(String key : extras.keySet()) {
+ if(!key.startsWith(TOKEN_FILTER_VALUES_ITEM)) {
+ continue;
+ }
- Object value = extras.get(key);
- key = key.substring(TOKEN_FILTER_VALUES_ITEM.length());
-
- // assume one of the big 4...
- if(value instanceof String) {
- values.put(key, (String) value);
- } else if(value instanceof Integer) {
- values.put(key, (Integer) value);
- } else if(value instanceof Double) {
- values.put(key, (Double) value);
- } else if(value instanceof Long) {
- values.put(key, (Long) value);
- } else {
- throw new IllegalStateException("Unsupported bundle type " + value.getClass()); //$NON-NLS-1$
- }
+ Object value = extras.get(key);
+ key = key.substring(TOKEN_FILTER_VALUES_ITEM.length());
+
+ // assume one of the big 4...
+ if(value instanceof String) {
+ values.put(key, (String) value);
+ } else if(value instanceof Integer) {
+ values.put(key, (Integer) value);
+ } else if(value instanceof Double) {
+ values.put(key, (Double) value);
+ } else if(value instanceof Long) {
+ values.put(key, (Long) value);
+ } else {
+ throw new IllegalStateException("Unsupported bundle type " + value.getClass()); //$NON-NLS-1$
}
}
@@ -138,13 +120,6 @@ public class ShortcutActivity extends Activity {
filter = new Filter(title, sql, values);
}
taskListIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
- } else if(extras != null && extras.containsKey(TOKEN_SINGLE_TASK)) {
- Filter filter = new Filter(getString(R.string.TLA_custom),
- new QueryTemplate().where(Task.ID.eq(extras.getLong(TOKEN_SINGLE_TASK, -1))), null);
-
- taskListIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- taskListIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
- startActivity(taskListIntent);
}
startActivity(taskListIntent);
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index cbff97a4f..fe1ea1575 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -39,7 +39,6 @@
Сортирай
Търсене
Настройки
- Други
%s [скрито]
%s [изтрити]
Приключена\n%s
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index c8aaa1cdb..c392c6b1b 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -34,7 +34,6 @@
Ordenació i subtasques
Cerca
Paràmetres
- Personalitzat
%s [ocult]
%s [eliminat]
Acabat fa\n%s
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index be98b5d4d..3ea57f3a5 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -36,7 +36,6 @@
Třídit
Hledat
Nastavení
- Vlastní
%s [skrytý]
%s [smazán]
Dokončeno\n%s
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 7b6f20db0..732a4a562 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -33,7 +33,6 @@
Tryk for at indstille
Sorter & skjulte
Opsætning
- Tilpasset
%s [skjult]
%s [slettet]
Rediger
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 4e1fbaf0c..2c730c05c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -35,7 +35,6 @@
Sortieren
Suchen
Einstellungen
- Benutzerdefiniert
%s [versteckt]
%s [gelöscht]
Abgeschlossen\n%s
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index b512c8ecb..3c156b574 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -38,7 +38,6 @@
Ταξινόμηση
Αναζήτηση
Ρυθμίσεις
- Προσαρμοσμένο
%s [κρυφό]
%s [διαγράφηκε]
Επεξεργασία
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d17267d49..fd5dd85f5 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -36,7 +36,6 @@
Ordenar
Buscar
Configuración
- Personalizar
%s [oculto]
%s [borrado]
Terminado\n%s
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 39014dc15..8468ffee6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -36,7 +36,6 @@
Trier
Rechercher
Paramètres
- Personnalisé
%s [masqué(e)]
%s [supprimé(e)]
Accomplie\n%s
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 728b2f61b..f210f9752 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -35,7 +35,6 @@
Nessuna Attività!
Cerca
Impostazioni
- Personalizzato
%s [Nascosto]
%s [eliminato]
Terminata\n%s
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 6b8a461d8..03826b000 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -36,7 +36,6 @@
מיון
חיפוש
הגדרות
- מותאם אישית
%s [מוסתרת]
%s [נמחקה]
הסתיימה\n%s
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index e16e80d71..b85cba5de 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -36,7 +36,6 @@
ソート
検索
設定
- カスタムフィルタ
%s [非表示]
%s [削除済]
%s\nに完了
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 499968959..4a0eb4f50 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -39,7 +39,6 @@
정렬
검색
설정
- 사용자 설정
%s [숨김]
%s [지움]
일정 완료\n%s
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 793b78766..27911fa77 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -28,7 +28,6 @@
Klikk for å sette
Sorter & Skjult
Innstillinger
- Egendefinert
%s [skjult]
%s [slettet]
Rediger
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f47cbb4af..f0dbe0eea 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -36,7 +36,6 @@
Sorteren
Zoek
Instellingen
- Aangepast
%s [verborgen]
%s [verwijderd]
Afgerond\n%s
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 82b053d1a..a743b9e1f 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -36,7 +36,6 @@
Sortowanie
Szukaj
Ustawienia
- Własny filtr
%s [ukryte]
%s [usunięte]
Ukończono\n%s
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index f24ddc88e..b9fde8d8f 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -35,7 +35,6 @@
Ordenar
Buscar
Configurações
- Personalizar
%s [oculta]
%s [excluída]
Concluída\n%s
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 383ae3067..1bfa62ed4 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -38,7 +38,6 @@
Ordenação
Procura
Definições
- Personalizado
%s [oculta]
%s [eliminada]
Terminada\n%s
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 733c69220..2338e2517 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -36,7 +36,6 @@
Сортировка
Поиск
Настройки
- Другой
%s [скрыта]
%s [удалена]
Завершена\n%s
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 065b83fc0..177ad3371 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -36,7 +36,6 @@
Triediť
Hľadať
Nastavenia
- Vlastné
%s [skryté]
%s [vymazané]
Dokončené\n%s
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 393132965..d6ba5526b 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -39,7 +39,6 @@
Razvrsti
Iskanje
Nastavitve
- Po meri
%s [skrit]
%s [zbrisan]
Opravljen\n%s
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index ebd8e9b42..5c2e91701 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -36,7 +36,6 @@
Sortera
Sök
Inställningar
- Egendefinierad
%s [dold]
%s [raderad]
Avslutad\n%s
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 166bc9975..ae58705f8 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -21,7 +21,6 @@
คลิก เพื่อตั้งค่า
ไม่มีแผนงานใดๆ !
Sort & Hidden
- ปรับแต่ง
แก้ไข
แผนงานที่ลบไม่ได้
แสดงแผนงานที่เสร็จแล้ว
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 8832d0634..fbcc0d6e9 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -35,7 +35,6 @@
Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur?
Ara
Ayarlar
- Özel
%s [gizli]
%s [silinmiş]
Bitti\n%s
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index da20a59e6..2398df142 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -39,7 +39,6 @@
Сортувати
Пошук
Налаштування
- Користувальницький
%s [приховано]
%s [видалено]
Завершено\n%s
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 1812fe0ca..6d793fb8f 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -35,7 +35,6 @@
你没有任务
搜索
设置
- 自定义
%s [已隐藏]
%s [已删除]
完成\n%s 项
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 71ecae184..43f65024f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -36,7 +36,6 @@
排序
搜索
設定
- 自訂
%s [隱藏]
%s [刪除]
%s\n完成
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index e2b5a61f9..134bc2cb6 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -49,9 +49,6 @@
Settings
-
- Custom
-