From bc2e94a5a34d236a5ef2c068b7ef4d0864a131b1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 19 Dec 2013 22:52:49 -0600 Subject: [PATCH] Update lint config --- api/src/main/java/com/todoroo/astrid/core/SortHelper.java | 4 +--- api/src/main/java/com/todoroo/astrid/data/RemoteModel.java | 3 +++ lint.sh | 3 --- astrid/lint.xml => lint.xml | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100755 lint.sh rename astrid/lint.xml => lint.xml (61%) diff --git a/api/src/main/java/com/todoroo/astrid/core/SortHelper.java b/api/src/main/java/com/todoroo/astrid/core/SortHelper.java index 96b678af7..b7c8b17d4 100644 --- a/api/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/api/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -12,8 +12,6 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskApiDao.TaskCriteria; -import java.util.concurrent.TimeUnit; - /** * Helpers for sorting a list of tasks * @@ -66,7 +64,7 @@ public class SortHelper { } if ((flags & FLAG_SHOW_RECENTLY_COMPLETED) > 0) { originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(), - Criterion.or(Task.COMPLETION_DATE.lte(0), Task.COMPLETION_DATE.gt(DateUtilities.now() - TimeUnit.MINUTES.toMillis(1))).toString()); + Criterion.or(Task.COMPLETION_DATE.lte(0), Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000)).toString()); } if((flags & FLAG_SHOW_HIDDEN) > 0) { originalSql = originalSql.replace(TaskCriteria.isVisible().toString(), diff --git a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java index 70820a8c6..4809dfa8e 100644 --- a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java +++ b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java @@ -5,10 +5,12 @@ */ package com.todoroo.astrid.data; +import android.annotation.TargetApi; import android.content.ContentValues; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.os.Build; import android.text.TextUtils; import com.todoroo.andlib.data.AbstractModel; @@ -112,6 +114,7 @@ abstract public class RemoteModel extends AbstractModel { return String.format("cached::%s%s", tagData.getValue(TagData.NAME), tag_date); } + @TargetApi(Build.VERSION_CODES.FROYO) public static JSONObject savePictureJson(Context context, Bitmap bitmap) { try { String name = DateUtilities.now() + ".jpg"; diff --git a/lint.sh b/lint.sh deleted file mode 100755 index 527566f1a..000000000 --- a/lint.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -lint --exitcode --classpath astrid/build/classes --resources astrid/build/res/ --sources astrid/build/source/ --config astrid/lint.xml astrid diff --git a/astrid/lint.xml b/lint.xml similarity index 61% rename from astrid/lint.xml rename to lint.xml index 5356ac787..9f18e0fa0 100644 --- a/astrid/lint.xml +++ b/lint.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + +