Merge pull request ResearchKit#130 from Erin-Mounts/BRIDGE-1382

update for BridgeSDK refactor
Erin-Mounts · Jun 8, 2016 · 17535a5 · 17535a5
2 parents a8f7670 + 14dc24e
commit 17535a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser+Bridge.m b/APCAppCore/APCAppCore/DataSubstrate/Model/APCUser+Bridge.m
@@ -79,7 +79,7 @@ - (void)signUpWithDataGroups:(NSArray<NSString *> *)dataGroups onCompletion:(voi
                                              username: self.email
                                              password: self.password
                                            dataGroups:dataGroups
-                                           completion: ^(NSURLSessionDataTask * __unused task,
+                                           completion: ^(NSURLSessionTask * __unused task,
                                                          id __unused responseObject,
                                                          NSError *error)
          {
@@ -356,7 +356,7 @@ - (void)signInOnCompletion:(void (^)(NSError *))completionBlock
         NSParameterAssert(self.password);
         [SBBComponent(SBBAuthManager) signInWithEmail: self.email
                                              password: self.password
-                                           completion: ^(NSURLSessionDataTask * __unused task,
+                                           completion: ^(NSURLSessionTask * __unused task,
                                                          id responseObject,
                                                          NSError *signInError)
          {
@@ -443,7 +443,7 @@ - (void)signOutOnCompletion:(void (^)(NSError *))completionBlock
     else
     {
         NSParameterAssert(self.password);
-        [SBBComponent(SBBAuthManager) signOutWithCompletion: ^(NSURLSessionDataTask * __unused task,
+        [SBBComponent(SBBAuthManager) signOutWithCompletion: ^(NSURLSessionTask * __unused task,
                                                                id __unused responseObject,
                                                                NSError *error)
          {
@@ -545,7 +545,7 @@ - (void) resendEmailVerificationOnCompletion:(void (^)(NSError *))completionBloc
     else
     {
         if (self.email.length > 0) {
-            [SBBComponent(SBBAuthManager) resendEmailVerification:self.email completion: ^(NSURLSessionDataTask * __unused task,
+            [SBBComponent(SBBAuthManager) resendEmailVerification:self.email completion: ^(NSURLSessionTask * __unused task,
                                                                                            id __unused responseObject,
                                                                                            NSError *error)
 			 {

diff --git a/APCAppCore/APCAppCore/Library/DataArchiverAndUploader/APCDataVerificationDaemon.m b/APCAppCore/APCAppCore/Library/DataArchiverAndUploader/APCDataVerificationDaemon.m
@@ -114,7 +114,7 @@ - (void)callURL: (NSURL *)url
     NSMutableDictionary *headers = [NSMutableDictionary new];
     [[SBBAuthManager defaultComponent] addAuthHeaderToHeaders:headers];
 
-    [sharedManager get:url.absoluteString headers:headers parameters:@{@"study":gSBBAppStudy} completion:^(NSURLSessionDataTask *__unused task, id responseObject, NSError *error) {
+    [sharedManager get:url.absoluteString headers:headers parameters:@{@"study":gSBBAppStudy} completion:^(NSURLSessionTask *__unused task, id responseObject, NSError *error) {
         if (responseObject) {
             NSDictionary *responseDictionary = (NSDictionary *)responseObject;
             NSString *responseString = [NSString stringWithFormat:@"\nAPCDataVerificationDaemon verified upload of uploadID: %@. Status : %@\n", [responseDictionary objectForKey:@"id"], [responseDictionary objectForKey:@"status"]];

diff --git a/APCAppCore/APCAppCore/Startup/APCAppDelegate.m b/APCAppCore/APCAppCore/Startup/APCAppDelegate.m
@@ -213,7 +213,7 @@ - (void)applicationDidBecomeActive:(UIApplication *) __unused application
 #ifndef DEVELOPMENT
     if (self.dataSubstrate.currentUser.signedIn) {
         if (self.dataSubstrate.currentUser.isConsented) {
-            [SBBComponent(SBBAuthManager) ensureSignedInWithCompletion: ^(NSURLSessionDataTask * __unused task,
+            [SBBComponent(SBBAuthManager) ensureSignedInWithCompletion: ^(NSURLSessionTask * __unused task,
                                                                           id  __unused responseObject,
                                                                           NSError *error) {
                 APCLogError2 (error);

diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m
@@ -128,7 +128,7 @@ - (void) sendPassword
                 __weak typeof(self) weakSelf = self;
 
                 [SBBComponent(SBBAuthManager) requestPasswordResetForEmail: emailAddress
-                                                                completion: ^(NSURLSessionDataTask * __unused task,
+                                                                completion: ^(NSURLSessionTask * __unused task,
                                                                               id __unused responseObject,
                                                                               NSError *error) {