Fixed bug where you couldn't uncheck a task you just checked.

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="23"
-      android:versionName="1.8">
+      android:versionCode="24"
+      android:versionName="1.8.1">
       
     <uses-permission android:name="android.permission.VIBRATE"/>
     

src/com/timsu/astrid/activities/TaskListAdapter.java

@@ -245,7 +245,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
         hooks.getTaskController().saveTask(task);
 
         // if our timer is on, ask if we want to stop
-        if(task.getTimerStart() != null) {
+        if(progress == 100 && task.getTimerStart() != null) {
             new AlertDialog.Builder(activity)
             .setTitle(R.string.question_title)
             .setMessage(R.string.stop_timer_title)

src/com/timsu/astrid/data/AbstractModel.java

@@ -85,7 +85,7 @@ public abstract class AbstractModel {
     // --- checking against cached values
 
     protected void putIfChangedFromDatabase(String field, String newValue) {
-        if(values.containsKey(field)) {
+        if(!setValues.containsKey(field) && values.containsKey(field)) {
             String value = values.getAsString(field);
             if(value == null) {
                 if(newValue == null)
@@ -97,7 +97,7 @@ public abstract class AbstractModel {
     }
 
     protected void putIfChangedFromDatabase(String field, Long newValue) {
-        if(values.containsKey(field)) {
+        if(!setValues.containsKey(field) && values.containsKey(field)) {
             Long value = values.getAsLong(field);
             if(value == null) {
                 if(newValue == null)
@@ -109,7 +109,7 @@ public abstract class AbstractModel {
     }
 
     protected void putIfChangedFromDatabase(String field, Integer newValue) {
-        if(values.containsKey(field)) {
+        if(!setValues.containsKey(field) && values.containsKey(field)) {
             Integer value = values.getAsInteger(field);
             if(value == null) {
                 if(newValue == null)
@@ -121,7 +121,7 @@ public abstract class AbstractModel {
     }
 
     protected void putIfChangedFromDatabase(String field, Double newValue) {
-        if(values.containsKey(field)) {
+        if(!setValues.containsKey(field) && values.containsKey(field)) {
             Double value = values.getAsDouble(field);
             if(value == null) {
                 if(newValue == null)