archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'stingerAJ/2011-05-09-patches'

Browse Source 
Conflicts:
	astrid/src/com/todoroo/astrid/service/TaskService.java
pull/14/head
Tim Su 13 years ago
parent 052c92d3a4 247edede75
commit fc3d02bc8d
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File

6
astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java
Unescape Escape View File

@ -47,8 +47,8 @@ public class ProducteevFilterExposer extends BroadcastReceiver {
values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY);
values.put(ProducteevTask.DASHBOARD_ID.name, dashboard.getId());
values.put(ProducteevTask.ID.name, 0);
values.put(ProducteevTask.CREATOR_ID.name, 0);
values.put(ProducteevTask.RESPONSIBLE_ID.name, 0);
values.put(ProducteevTask.CREATOR_ID.name, currentUserId);
values.put(ProducteevTask.RESPONSIBLE_ID.name, currentUserId);
Filter filter;
if (currentUserId != -1)
filter = new Filter(dashboardTitle, title, new QueryTemplate().join(
@ -97,7 +97,7 @@ public class ProducteevFilterExposer extends BroadcastReceiver {
values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY);
values.put(ProducteevTask.ID.name, 0);
values.put(ProducteevTask.CREATOR_ID.name, 0);
values.put(ProducteevTask.RESPONSIBLE_ID.name, user.getId());
values.put(ProducteevTask.RESPONSIBLE_ID.name, currentUserId);
Filter filter = new Filter(user.toString(), title, new QueryTemplate().join(
ProducteevDataService.METADATA_JOIN).where(Criterion.and(
MetadataCriteria.withKey(ProducteevTask.METADATA_KEY),

19
astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.utility.Flags;
public class RepeatTaskCompleteListener extends BroadcastReceiver {
@ -73,6 +74,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, task.getValue(Task.DUE_DATE));
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, newDueDate);
context.sendOrderedBroadcast(broadcastIntent, null);
Flags.set(Flags.REFRESH);
}
}
@ -82,15 +84,24 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
DateValue today = new DateValueImpl(repeatFromDate.getYear() + 1900,
repeatFromDate.getMonth() + 1, repeatFromDate.getDate());
if(task.hasDueDate() && !task.getFlag(Task.FLAGS, Task.FLAG_REPEAT_AFTER_COMPLETION)) {
boolean repeatAfterCompletion = task.getFlag(Task.FLAGS, Task.FLAG_REPEAT_AFTER_COMPLETION);
if(task.hasDueDate() && !repeatAfterCompletion) {
repeatFromDate = new Date(task.getValue(Task.DUE_DATE));
if(task.hasDueTime()) {
repeatFrom = new DateTimeValueImpl(repeatFromDate.getYear() + 1900,
repeatFromDate.getMonth() + 1, repeatFromDate.getDate(),
repeatFromDate.getHours(), repeatFromDate.getMinutes(), repeatFromDate.getSeconds());
} else {
repeatFrom = new DateValueImpl(repeatFromDate.getYear() + 1900,
repeatFromDate.getMonth() + 1, repeatFromDate.getDate());
repeatFrom = today;
}
} else if (task.hasDueDate() && repeatAfterCompletion) {
repeatFromDate = new Date(task.getValue(Task.DUE_DATE));
if(task.hasDueTime()) {
repeatFrom = new DateTimeValueImpl(today.year(),
today.month(), today.day(),
repeatFromDate.getHours(), repeatFromDate.getMinutes(), repeatFromDate.getSeconds());
} else {
repeatFrom = today;
}
} else {
repeatFrom = today;
@ -141,7 +152,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
nextDate.day()).getTime());
}
if(newDueDate > DateUtilities.now() && newDueDate != repeatFromDate.getTime())
if(newDueDate > DateUtilities.now() && (repeatAfterCompletion || (newDueDate != repeatFromDate.getTime())))
break;
}

6
astrid/src/com/todoroo/astrid/dao/TaskDao.java
Unescape Escape View File

@ -175,12 +175,6 @@ public class TaskDao extends DatabaseDao<Task> {
@Override
public boolean createNew(Task item) {
ContentValues values = item.getSetValues();
if(values == null || values.size() == 0) {
if(item.getDatabaseValues() != null)
return false;
}
if(!item.containsValue(Task.CREATION_DATE))
item.setValue(Task.CREATION_DATE, DateUtilities.now());
item.setValue(Task.MODIFICATION_DATE, DateUtilities.now());

14
astrid/src/com/todoroo/astrid/service/TaskService.java
Unescape Escape View File

@ -115,15 +115,17 @@ public class TaskService {
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
metadata.readFromCursor(cursor);
// don't clone sync metadata
if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
continue;
{
metadata.setValue(GtasksMetadata.ID, "0");
}
if(ProducteevTask.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
continue;
{
metadata.setValue(ProducteevTask.ID, 0L);
}
// don't clone sync metadata
if(MilkTaskFields.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
continue;
if(OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
continue;
continue; // FIXME do the same as for the others
metadata.setValue(Metadata.TASK, newId);
metadata.clearValue(Metadata.ID);

Write Preview
Loading…
Cancel
Save