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/callVsBackground'

Browse Source
This commit is contained in:
Matthew Chen 2018-06-07 07:50:48 -06:00
commit abfdca65c2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/Signal-Info.plist
View File

@ -38,7 +38,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.26.0.14</string>
<string>2.26.0.16</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LOGS_EMAIL</key>

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

@ -532,6 +532,12 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, kSocketTimeoutSeconds * NSEC_PER_SEC),
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
^{
DDLogError(@"%@ message timed out: %lld, %@, %@, %zd.",
self.logTag,
socketMessage.requestId,
request.HTTPMethod,
requestPath,
jsonData.length);
[weakSocketMessage didFailBeforeSending];
});
}
@ -639,6 +645,8 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
[self.socketMessageMap removeAllObjects];
}
DDLogInfo(@"%@ failAllPendingSocketMessages: %zd.", self.logTag, socketMessages.count);
for (TSSocketMessage *socketMessage in socketMessages) {
[socketMessage didFailBeforeSending];
}

2
SignalShareExtension/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>2.26.0</string>
<key>CFBundleVersion</key>
<string>2.26.0.14</string>
<string>2.26.0.16</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>NSAppTransportSecurity</key>