diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2016-01-22 15:23:31 -0500 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2016-01-22 15:23:31 -0500 |
commit | 9bc2023e7171dd0ae94bcd474c9d86b2ea5980ba (patch) | |
tree | 8cc7af0723a0117bee6a9f49f3cb583e5891d6d9 | |
parent | e997325369739dfee485ddc28fcd87fd09b2cb22 (diff) | |
download | sdl_ios-hotfix/issue_333.tar.gz |
Revert "Change runloop modes to common to run during UI"hotfix/issue_333
This reverts commit e997325369739dfee485ddc28fcd87fd09b2cb22.
4 files changed, 6 insertions, 6 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m index a2302c97f..131885965 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLIAPSession.m @@ -76,7 +76,7 @@ - (void)startStream:(NSStream *)stream { stream.delegate = self.streamDelegate; - [stream scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; + [stream scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode]; [stream open]; } @@ -93,7 +93,7 @@ [stream close]; } - [stream removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; + [stream removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode]; [stream setDelegate:nil]; NSUInteger status2 = stream.streamStatus; diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m index 4bec9537c..70f2f415f 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m @@ -590,7 +590,7 @@ const int POLICIES_CORRELATION_ID = 65535; objc_setAssociatedObject(inputStream, @"SDLPutFile", putFileRPCRequest, OBJC_ASSOCIATION_RETAIN); objc_setAssociatedObject(inputStream, @"BaseOffset", [putFileRPCRequest offset], OBJC_ASSOCIATION_RETAIN); - [inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; + [inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; [inputStream open]; } @@ -620,7 +620,7 @@ const int POLICIES_CORRELATION_ID = 65535; case NSStreamEventEndEncountered: { // Cleanup the stream [stream close]; - [stream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; + [stream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; break; } diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m index 868397003..9a2501a1e 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLTCPTransport.m @@ -57,7 +57,7 @@ static void TCPCallback(CFSocketRef socket, CFSocketCallBackType type, CFDataRef socket = CFSocketCreateWithNative(kCFAllocatorDefault, sock_fd, kCFSocketDataCallBack | kCFSocketConnectCallBack, (CFSocketCallBack)&TCPCallback, &socketCtxt); CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, socket, 0); CFRunLoopRef loop = CFRunLoopGetCurrent(); - CFRunLoopAddSource(loop, source, kCFRunLoopCommonModes); + CFRunLoopAddSource(loop, source, kCFRunLoopDefaultMode); CFRelease(source); } diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLURLRequestTask.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLURLRequestTask.m index d526dac64..d1895ac10 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLURLRequestTask.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLURLRequestTask.m @@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN } _connection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO]; - [_connection scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; + [_connection scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode]; [_connection start]; _completionHandler = completionHandler; |