Fix deprecated methods in AppRTCMobile.

webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.m

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 39 matching lines @@
     urlString =
         [NSString stringWithFormat:kARDRoomServerJoinFormat, roomId];
   }
 
   NSURL *roomURL = [NSURL URLWithString:urlString];
   RTCLog(@"Joining room:%@ on room server.", roomId);
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:roomURL];
   request.HTTPMethod = @"POST";
   __weak ARDAppEngineClient *weakSelf = self;
   [NSURLConnection sendAsyncRequest:request
-                  completionHandler:^(NSURLResponse *response,
-                                      NSData *data,
-                                      NSError *error) {
-    ARDAppEngineClient *strongSelf = weakSelf;
-    if (error) {
-      if (completionHandler) {
-        completionHandler(nil, error);
-      }
-      return;
-    }
-    ARDJoinResponse *joinResponse =
-        [ARDJoinResponse responseFromJSONData:data];
-    if (!joinResponse) {
-      if (completionHandler) {
-        NSError *error = [[self class] badResponseError];
-        completionHandler(nil, error);
-      }
-      return;
-    }
-    if (completionHandler) {
-      completionHandler(joinResponse, nil);
-    }
-  }];
+                  completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
+                    ARDAppEngineClient *strongSelf = weakSelf;
+                    if (error) {
+                      if (completionHandler) {
+                        completionHandler(nil, error);
+                      }
+                      return;
+                    }
+                    ARDJoinResponse *joinResponse = [ARDJoinResponse responseFromJSONData:data];
+                    if (!joinResponse) {
+                      if (completionHandler) {
+                        NSError *error = [[self class] badResponseError];
+                        completionHandler(nil, error);
+                      }
+                      return;
+                    }
+                    if (completionHandler) {
+                      completionHandler(joinResponse, nil);
+                    }
+                  }];
 }
 
 - (void)sendMessage:(ARDSignalingMessage *)message
             forRoomId:(NSString *)roomId
              clientId:(NSString *)clientId
     completionHandler:(void (^)(ARDMessageResponse *response,
                                 NSError *error))completionHandler {
   NSParameterAssert(message);
   NSParameterAssert(roomId.length);
   NSParameterAssert(clientId.length);
@@ skipping 38 matching lines @@
                    clientId:(NSString *)clientId
           completionHandler:(void (^)(NSError *error))completionHandler {
   NSParameterAssert(roomId.length);
   NSParameterAssert(clientId.length);
 
   NSString *urlString =
       [NSString stringWithFormat:kARDRoomServerLeaveFormat, roomId, clientId];
   NSURL *url = [NSURL URLWithString:urlString];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
   request.HTTPMethod = @"POST";
-  NSURLResponse *response = nil;
-  NSError *error = nil;
+
+  RTCLog(@"C->RS: BYE");
+  __block NSError *error = nil;
+
   // We want a synchronous request so that we know that we've left the room on
   // room server before we do any further work.
-  RTCLog(@"C->RS: BYE");
-  [NSURLConnection sendSynchronousRequest:request
-                        returningResponse:&response
-                                    error:&error];
+  dispatch_semaphore_t sem = dispatch_semaphore_create(0);

[magjed_webrtc, 2017/03/29 20:03:46]

Maybe use rtc::Event instead?

[kthelgason, 2017/03/30 08:58:53]

This is a pure ObjC file, and I'd prefer to keep it that way. Lets not add
unnecessary dependencies on base.

[magjed_webrtc, 2017/03/30 11:19:46]

Acknowledged.

+  [NSURLConnection sendAsyncRequest:request
+                  completionHandler:^(NSURLResponse *response, NSData *data, NSError *e) {
+                    if (e) {
+                      error = e;
+                    }
+                    dispatch_semaphore_signal(sem);
+                  }];
+
+  dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
   if (error) {
-    RTCLogError(@"Error leaving room %@ on room server: %@",
-          roomId, error.localizedDescription);
+    RTCLogError(@"Error leaving room %@ on room server: %@", roomId, error.localizedDescription);
     if (completionHandler) {
       completionHandler(error);
     }
     return;
   }
   RTCLog(@"Left room:%@ on room server.", roomId);
   if (completionHandler) {
     completionHandler(nil);
   }
 }
 
 #pragma mark - Private
 
 + (NSError *)badResponseError {
   NSError *error =
       [[NSError alloc] initWithDomain:kARDAppEngineClientErrorDomain
                                  code:kARDAppEngineClientErrorBadResponse
                              userInfo:@{
     NSLocalizedDescriptionKey: @"Error parsing response.",
   }];
   return error;
 }
 
 @end