Merge tag '2.27.0.7'

pull/1/head
Michael Kirk 7 years ago
commit 266469163e

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

@ -1696,6 +1696,15 @@ private class SignalCallData: NSObject {
return return
} }
guard !call.isTerminated else {
// There's a brief window between when the callViewController is removed
// and when this timer is terminated.
//
// We don't want to fail a call that's already terminated.
Logger.debug("\(logTag) in \(#function) ignoring screen protection check for already terminated call.")
return
}
if !OWSWindowManager.shared().hasCall() { if !OWSWindowManager.shared().hasCall() {
OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file: #file, function: #function, line: #line) OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file: #file, function: #function, line: #line)
owsFail("\(self.logTag) in \(#function) Call terminated due to missing call view.") owsFail("\(self.logTag) in \(#function) Call terminated due to missing call view.")

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
// NOTE: When changing the value of this feature flag, you also need // NOTE: When changing the value of this feature flag, you also need
// to update the filtering in the SAE's info.plist. // to update the filtering in the SAE's info.plist.
BOOL kIsSendingContactSharesEnabled = YES; BOOL kIsSendingContactSharesEnabled = NO;
NSString *NSStringForContactPhoneType(OWSContactPhoneType value) NSString *NSStringForContactPhoneType(OWSContactPhoneType value)
{ {

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.27.0</string> <string>2.27.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.27.0.6</string> <string>2.27.0.7</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
@ -60,8 +60,11 @@
SUBQUERY ( SUBQUERY (
$extensionItem.attachments, $extensionItem.attachments,
$attachment, $attachment,
(
ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data" ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
)
AND NOT (ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.vcard")
).@count &gt;= 1 ).@count &gt;= 1
).@count == 1 ).@count == 1
</string> </string>

Loading…
Cancel
Save