signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/canSendRequests'

Browse Source
This commit is contained in:
Matthew Chen 2018-05-30 13:50:20 -04:00
commit 6363d31094
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SignalMessaging/profiles/ProfileFetcherJob.swift
View File

@ -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 {

2
SignalServiceKit/src/Messages/OWSMessageSender.m
View File

@ -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

3
SignalServiceKit/src/Network/WebSockets/TSSocketManager.h
View File

@ -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;

8
SignalServiceKit/src/Network/WebSockets/TSSocketManager.m
View File

@ -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);