Merge branch 'charlesmchen/callVsBackground'

Signal/Signal-Info.plist

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

SignalServiceKit/src/Network/WebSockets/TSSocketManager.m

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

SignalShareExtension/Info.plist

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