Merge pull request ResearchKit#116 from Erin-Mounts/master

Bridge-iOS-SDK build 8 compatibility
Erin-Mounts · Apr 27, 2016 · 2c18c64 · 2c18c64
2 parents 7751935 + 67b0fcb
commit 2c18c64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser+Bridge.m b/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser+Bridge.m
@@ -159,7 +159,6 @@ - (void) updateProfileOnCompletion:(void (^)(NSError *))completionBlock
     {
         SBBUserProfile *profile = [SBBUserProfile new];
         profile.email = self.email;
-        profile.username = self.email;
 
         profile.firstName = self.name;
 
@@ -189,7 +188,6 @@ - (void) updateCustomProfile:(SBBUserProfile*)profile onCompletion:(void (^)(NSE
     else
     {
         profile.email     = self.email;
-        profile.username  = self.email;
         profile.firstName = self.name;
 
         [SBBComponent(SBBUserManager) updateUserProfileWithProfile: profile

diff --git a/APCAppCore/APCAppCore/Library/Scheduler/APCScheduler.m b/APCAppCore/APCAppCore/Library/Scheduler/APCScheduler.m
@@ -371,7 +371,7 @@ - (void) fetchTasksFromServerAndThenUseThisQueue: (NSOperationQueue *) queue
              back to our thread a while later.
              */
             [SBBComponent (SBBActivityManager) getScheduledActivitiesForDaysAhead:4
-                                          withCompletion:^(SBBResourceList *tasksList,
+                                          withCompletion:^(NSArray *tasksList,
                                                            NSError *errorFetchingTasks)
              {
                  /*
@@ -412,7 +412,7 @@ - (void) handleErrorFetchingTasksAndSchedulesFromServer: (NSError *) errorFetchi
  By the time we get here, we're safely on our private thread
  (a private serial queue).
  */
-- (void) handleSuccessfullyFetchedTasksFromServer: (SBBResourceList *) tasks
+- (void) handleSuccessfullyFetchedTasksFromServer: (NSArray *) tasks
      givenThisPossibleErrorFromTheDownloadProcess: (NSError *) errorFetchingtasks
                               andThenUseThisQueue: (NSOperationQueue *) queue
                                          toDoThis: (APCSchedulerCallbackForFetchAndLoadOperations) callbackBlock
@@ -432,9 +432,8 @@ - (void) handleSuccessfullyFetchedTasksFromServer: (SBBResourceList *) tasks
         if (!errorFetchingtasks)
         {
             jsonCopyOfSageTasks = [NSMutableArray new];
-            NSArray *sageTasks = tasks.items;
 
-            for (SBBScheduledActivity *sageTask in sageTasks)
+            for (SBBScheduledActivity *sageTask in tasks)
             {
                 NSDictionary *sageTaskData = [importEngine extractJsonDataFromIncomingSageTask:sageTask];