Merge branch 'master' of github.com:loki-project/loki-messenger-ios into messaging-refactor

6 years ago · 1c4c47ab33
parent 294d8b5c11 cb53acf138
commit 1c4c47ab33
1 changed files with 3 additions and 0 deletions
--- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m
+++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m
@ -909,6 +909,9 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
 - (BOOL)shouldSocketBeOpen
 {
    OWSAssertIsOnMainThread();
+    
+    // Loki: Since we don't use websockets, disable them.
+    return NO;

    // Don't open socket in app extensions.
    if (!CurrentAppContext().isMainApp) {