Skip to content
Browse files

Merge

  • Loading branch information...
2 parents 8f81fcb + fead8c7 commit 0a78c795a9028540a71dde0eae45a0b2be022c97 Philip Messlehner committed Jan 19, 2010
Showing with 30 additions and 2 deletions.
  1. +29 −1 Classes/SyncManager.m
  2. +1 −1 toodledo-objc
View
30 Classes/SyncManager.m
@@ -982,6 +982,11 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate;
+ if(localTask.dueTime == nil)
+ remoteTask.hasDueTime = NO;
+ else
+ remoteTask.hasDueTime = YES;
+
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
@@ -1024,6 +1029,10 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
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);
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
@@ -1064,6 +1073,10 @@ -(BOOL)syncTasksMatchDates
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate;
+ if(localTask.dueTime == nil)
+ remoteTask.hasDueTime = NO;
+ else
+ remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
{
@@ -1236,7 +1249,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate;
-
+ if(localTask.dueTime == nil)
+ remoteTask.hasDueTime = NO;
+ else
+ remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
{
@@ -1278,6 +1294,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
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);
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
@@ -1318,6 +1338,10 @@ -(BOOL)syncTasksPreferLocal
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate;
+ if(localTask.dueTime == nil)
+ remoteTask.hasDueTime = NO;
+ else
+ remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
{
@@ -1582,6 +1606,10 @@ -(BOOL)syncTasksPreferRemote
remoteTask.date_modified = localTask.lastLocalModification;
remoteTask.date_start = localTask.startDateAnnoy;
remoteTask.date_due = localTask.dueDate;
+ if(localTask.dueTime == nil)
+ remoteTask.hasDueTime = NO;
+ else
+ remoteTask.hasDueTime = YES;
NSMutableArray *mutableTags = [NSMutableArray array];
for(Tag *tag in localTask.tags)
{
2 toodledo-objc
@@ -1 +1 @@
-Subproject commit 88d5ed904431e637ee6c0992e755672b2656e6c8
+Subproject commit fb88e9540f5c4d4f44bb3cbce64695f8768a68f5

0 comments on commit 0a78c79

Please sign in to comment.
Something went wrong with that request. Please try again.