Add support for GFE 2.8

This commit is contained in:
Cameron Gutman 2015-11-11 18:24:36 -08:00
parent ea3be613c5
commit 2f31f93bf8
2 changed files with 4 additions and 4 deletions

View File

@ -38,7 +38,7 @@
return; return;
} }
if ([serverInfoResp isStatusOk]) { if ([serverInfoResp isStatusOk]) {
if (![[serverInfoResp getStringTag:@"currentgame"] isEqual:@"0"]) { if (![[serverInfoResp getStringTag:@"state"] hasSuffix:@"_SERVER_AVAILABLE"]) {
[_callback pairFailed:@"You must stop streaming before attempting to pair."]; [_callback pairFailed:@"You must stop streaming before attempting to pair."];
} else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) { } else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) {
[self initiatePair]; [self initiatePair];

View File

@ -48,11 +48,11 @@
ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init]; ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
[hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest] [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]
fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]]; fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]];
NSString* currentGame = [serverInfoResp getStringTag:@"currentgame"];
NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"]; NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"]; NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"];
NSString* appversion = [serverInfoResp getStringTag:@"appversion"]; NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
if (![serverInfoResp isStatusOk] || currentGame == NULL || pairStatus == NULL || appversion == NULL) { NSString* serverState = [serverInfoResp getStringTag:@"state"];
if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) {
[_callbacks launchFailed:@"Failed to connect to PC"]; [_callbacks launchFailed:@"Failed to connect to PC"];
return; return;
} }
@ -64,7 +64,7 @@
} }
// resumeApp and launchApp handle calling launchFailed // resumeApp and launchApp handle calling launchFailed
if (![currentGame isEqualToString:@"0"]) { if ([serverState hasSuffix:@"_SERVER_BUSY"]) {
if (![currentClient isEqualToString:@"1"]) { if (![currentClient isEqualToString:@"1"]) {
// The server is streaming to someone else // The server is streaming to someone else
[_callbacks launchFailed:@"There is another stream in progress"]; [_callbacks launchFailed:@"There is another stream in progress"];