generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update GAE API paths for join/leave.

Browse Source 
BUG=4221
R=jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/33069004

Cr-Commit-Position: refs/heads/master@{#8174}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8174 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tkchin@webrtc.org
2015-01-27 21:34:39 +00:00
parent 8bb32d600b
commit 36401aba62
9 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
talk/examples/objc/AppRTCDemo/ARDAppEngineClient.m
View File

@@ -27,20 +27,20 @@
#import "ARDAppEngineClient.h"
#import "ARDJoinResponse.h"
#import "ARDMessageResponse.h"
#import "ARDRegisterResponse.h"
#import "ARDSignalingMessage.h"
#import "ARDUtilities.h"
// TODO(tkchin): move these to a configuration object.
static NSString *kARDRoomServerHostUrl =
@"https://apprtc.appspot.com";
static NSString *kARDRoomServerRegisterFormat =
@"https://apprtc.appspot.com/register/%@";
static NSString *kARDRoomServerJoinFormat =
@"https://apprtc.appspot.com/join/%@";
static NSString *kARDRoomServerMessageFormat =
@"https://apprtc.appspot.com/message/%@/%@";
static NSString *kARDRoomServerByeFormat =
@"https://apprtc.appspot.com/bye/%@/%@";
static NSString *kARDRoomServerLeaveFormat =
@"https://apprtc.appspot.com/leave/%@/%@";
static NSString *kARDAppEngineClientErrorDomain = @"ARDAppEngineClient";
static NSInteger kARDAppEngineClientErrorBadResponse = -1;
@@ -49,15 +49,15 @@ static NSInteger kARDAppEngineClientErrorBadResponse = -1;
#pragma mark - ARDRoomServerClient
- (void)registerForRoomId:(NSString *)roomId
completionHandler:(void (^)(ARDRegisterResponse *response,
NSError *error))completionHandler {
- (void)joinRoomWithRoomId:(NSString *)roomId
completionHandler:(void (^)(ARDJoinResponse *response,
NSError *error))completionHandler {
NSParameterAssert(roomId.length);
NSString *urlString =
[NSString stringWithFormat:kARDRoomServerRegisterFormat, roomId];
[NSString stringWithFormat:kARDRoomServerJoinFormat, roomId];
NSURL *roomURL = [NSURL URLWithString:urlString];
NSLog(@"Registering with room server.");
NSLog(@"Joining room:%@ on room server.", roomId);
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:roomURL];
request.HTTPMethod = @"POST";
__weak ARDAppEngineClient *weakSelf = self;
@@ -72,9 +72,9 @@ static NSInteger kARDAppEngineClientErrorBadResponse = -1;
}
return;
}
ARDRegisterResponse *registerResponse =
[ARDRegisterResponse responseFromJSONData:data];
if (!registerResponse) {
ARDJoinResponse *joinResponse =
[ARDJoinResponse responseFromJSONData:data];
if (!joinResponse) {
if (completionHandler) {
NSError *error = [[self class] badResponseError];
completionHandler(nil, error);
@@ -82,7 +82,7 @@ static NSInteger kARDAppEngineClientErrorBadResponse = -1;
return;
}
if (completionHandler) {
completionHandler(registerResponse, nil);
completionHandler(joinResponse, nil);
}
}];
}
@@ -132,32 +132,33 @@ static NSInteger kARDAppEngineClientErrorBadResponse = -1;
}];
}
- (void)deregisterForRoomId:(NSString *)roomId
- (void)leaveRoomWithRoomId:(NSString *)roomId
clientId:(NSString *)clientId
completionHandler:(void (^)(NSError *error))completionHandler {
NSParameterAssert(roomId.length);
NSParameterAssert(clientId.length);
NSString *urlString =
[NSString stringWithFormat:kARDRoomServerByeFormat, roomId, clientId];
[NSString stringWithFormat:kARDRoomServerLeaveFormat, roomId, clientId];
NSURL *url = [NSURL URLWithString:urlString];
NSURLRequest *request = [NSURLRequest requestWithURL:url];
NSURLResponse *response = nil;
NSError *error = nil;
// We want a synchronous request so that we know that we're unregistered from
// room server before we do any further unregistration.
// We want a synchronous request so that we know that we've left the room on
// room server before we do any further work.
NSLog(@"C->RS: BYE");
[NSURLConnection sendSynchronousRequest:request
returningResponse:&response
error:&error];
if (error) {
NSLog(@"Error unregistering from room server: %@", error);
NSLog(@"Error leaving room %@ on room server: %@",
roomId, error.localizedDescription);
if (completionHandler) {
completionHandler(error);
}
return;
}
NSLog(@"Unregistered from room server.");
NSLog(@"Left room:%@ on room server.", roomId);
if (completionHandler) {
completionHandler(nil);
}