Merge branch 'charlesmchen/canSendRequests'

SignalMessaging/profiles/ProfileFetcherJob.swift

@@ -115,7 +115,7 @@ public class ProfileFetcherJob: NSObject {
 
         let (promise, fulfill, reject) = Promise<SignalServiceProfile>.pending()
 
-        if self.socketManager.canMakeRequests {
+        if TSSocketManager.canMakeRequests() {
             self.socketManager.make(request,
                 success: { (responseObject: Any?) -> Void in
                     do {

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -976,7 +976,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                                                                      messages:deviceMessages
                                                                         relay:recipient.relay
                                                                     timeStamp:message.timestamp];
-    if (CurrentAppContext().isMainApp && TSSocketManager.sharedManager.canMakeRequests) {
+    if (TSSocketManager.canMakeRequests) {
         [TSSocketManager.sharedManager makeRequest:request
             success:^(id _Nullable responseObject) {
                 [self messageSendDidSucceed:message

SignalServiceKit/src/Network/WebSockets/TSSocketManager.h

@@ -25,7 +25,6 @@ typedef void (^TSSocketMessageFailure)(NSInteger statusCode, NSError *error);
 @interface TSSocketManager : NSObject <SRWebSocketDelegate>
 
 @property (nonatomic, readonly) SocketManagerState state;
-@property (atomic, readonly) BOOL canMakeRequests;
 
 + (instancetype)sharedManager;
 
@@ -44,6 +43,8 @@ typedef void (^TSSocketMessageFailure)(NSInteger statusCode, NSError *error);
 
 #pragma mark - Message Sending
 
++ (BOOL)canMakeRequests;
+
 - (void)makeRequest:(TSRequest *)request
             success:(TSSocketMessageSuccess)success
             failure:(TSSocketMessageFailure)failure;

SignalServiceKit/src/Network/WebSockets/TSSocketManager.m

@@ -441,6 +441,14 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
 
 #pragma mark - Message Sending
 
++ (BOOL)canMakeRequests
+{
+    if (!CurrentAppContext().isMainApp) {
+        return NO;
+    }
+    return TSSocketManager.sharedManager.canMakeRequests;
+}
+
 - (void)makeRequest:(TSRequest *)request success:(TSSocketMessageSuccess)success failure:(TSSocketMessageFailure)failure
 {
     OWSAssert(request);