Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added unset dueDate and dueTime

  • Loading branch information...
commit fead8c7285144a94da08753c6d07fbd35faf487e 1 parent 73fa323
Gerhard Schraml authored
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)
{
View
6 Less2Do.xcodeproj/project.pbxproj
@@ -768,7 +768,7 @@
39B659F910B7080D00825C1D /* Products */ = {
isa = PBXGroup;
children = (
- 39B65A0110B7080D00825C1D /* liblibToodledoAPI.a */,
+ 39B65A0110B7080D00825C1D /* libToodledoAPI.a */,
39F5AFCA10ED19AF00E54EB1 /* libToodledoAPIMac.a */,
39B65A0310B7080D00825C1D /* UnitTests.octest */,
39F5AFCC10ED19AF00E54EB1 /* liblibToodledoAPIiPhone.a */,
@@ -1019,10 +1019,10 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 39B65A0110B7080D00825C1D /* liblibToodledoAPI.a */ = {
+ 39B65A0110B7080D00825C1D /* libToodledoAPI.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = liblibToodledoAPI.a;
+ path = libToodledoAPI.a;
remoteRef = 39B65A0010B7080D00825C1D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
2  toodledo-objc
@@ -1 +1 @@
-Subproject commit 398640d923b18bf2982afcf1f9bd5be4de3e3c42
+Subproject commit fb88e9540f5c4d4f44bb3cbce64695f8768a68f5
Please sign in to comment.
Something went wrong with that request. Please try again.