From 9a8703a000e535415c2db27ba7b0ed3b3a6ff2fa Mon Sep 17 00:00:00 2001 From: Tim Su Date: Tue, 14 Sep 2010 17:05:42 +0800 Subject: [PATCH] Hide linkify behind a simple string contains, also removed unnecessary details cache clearing --- astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java | 8 ++++++-- astrid/src/com/todoroo/astrid/dao/TaskDao.java | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index e0c789b6d..b10ecd7e2 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -272,7 +272,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { nameView.setText(nameValue); nameView.setMovementMethod(null); - Linkify.addLinks(nameView, Linkify.ALL); + if(nameValue.contains(".") || nameValue.contains("-")) //$NON-NLS-1$ //$NON-NLS-2$ + Linkify.addLinks(nameView, Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | + Linkify.WEB_URLS); } // due date / completion date @@ -568,7 +570,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { detailImageGetter, null)); else view.setText(string.trim()); - Linkify.addLinks(view, Linkify.ALL); + if(string.contains(".") || string.contains("-")) + Linkify.addLinks(view, Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | + Linkify.WEB_URLS); } @Override diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index b4b7b4bf5..974401ff4 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -159,10 +159,6 @@ public class TaskDao extends DatabaseDao { return false; } - // clear task detail cache - if(values != null && !values.containsKey(Task.DETAILS.name)) - values.put(Task.DETAILS.name, ""); //$NON-NLS-1$ - if (task.getId() == Task.NO_ID) { saveSuccessful = createNew(task); } else {