Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip Messlehner committed Jan 19, 2010
2 parents 8f81fcb + fead8c7 commit 0a78c79
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
30 changes: 29 additions & 1 deletion Classes/SyncManager.m
View file
Expand Up @@ -982,6 +982,11 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;



NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
Expand Down Expand Up @@ -1024,6 +1029,10 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
ALog(@"remoteTask.date_due: %@, localTask.dueDate: %@, localTask.dueTime: %@", remoteTask.date_due, localTask.dueDate, localTask.dueTime); ALog(@"remoteTask.date_due: %@, localTask.dueDate: %@, localTask.dueTime: %@", remoteTask.date_due, localTask.dueDate, localTask.dueTime);
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
Expand Down Expand Up @@ -1064,6 +1073,10 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
{ {
Expand Down Expand Up @@ -1236,7 +1249,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;

if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
{ {
Expand Down Expand Up @@ -1278,6 +1294,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
ALog(@"remoteTask.date_due: %@, localTask.dueDate: %@, localTask.dueTime: %@", remoteTask.date_due, localTask.dueDate, localTask.dueTime); ALog(@"remoteTask.date_due: %@, localTask.dueDate: %@, localTask.dueTime: %@", remoteTask.date_due, localTask.dueDate, localTask.dueTime);
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
Expand Down Expand Up @@ -1318,6 +1338,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
{ {
Expand Down Expand Up @@ -1582,6 +1606,10 @@ -(BOOL)syncTasksPreferRemote
remoteTask.date_modified = localTask.lastLocalModification; remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy; remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate; remoteTask.date_due = localTask.dueDate;
if(localTask.dueTime == nil)
remoteTask.hasDueTime = NO;
else
remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array]; NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags) for(Tag *tag in localTask.tags)
{ {
Expand Down
2 changes: 1 addition & 1 deletion toodledo-objc
Submodule toodledo-objc updated 3 files
+2 −0 src/GtdTask.m
+12 −2 src/TDApi.m
+13 −10 src/ToodledoAPI.xcodeproj/gerhard.perspectivev3

0 comments on commit 0a78c79

Please sign in to comment.