From 1de0ede52d17bf00c7f04cd89b3c86f91d67b654 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 6 Feb 2019 19:18:20 -0700 Subject: [PATCH 001/493] Specific CDS feedback --- .../src/Contacts/ContactDiscoveryService.h | 5 +- .../src/Contacts/ContactDiscoveryService.m | 137 +++++++++++++----- .../OWSContactDiscoveryOperation.swift | 60 +++++++- .../Network/API/Requests/OWSRequestFactory.h | 5 +- .../Network/API/Requests/OWSRequestFactory.m | 16 +- 5 files changed, 168 insertions(+), 55 deletions(-) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.h b/SignalServiceKit/src/Contacts/ContactDiscoveryService.h index 60031ea0c..2b19fc8bd 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.h +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.h @@ -1,12 +1,13 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN +extern NSErrorUserInfoKey const ContactDiscoveryServiceErrorKey_Reason; extern NSErrorDomain const ContactDiscoveryServiceErrorDomain; typedef NS_ERROR_ENUM(ContactDiscoveryServiceErrorDomain, ContactDiscoveryServiceError){ - ContactDiscoveryServiceErrorAttestationFailed = 100, + ContactDiscoveryServiceErrorAttestationFailed = 100, ContactDiscoveryServiceErrorAssertionError = 101 }; @class ECKeyPair; diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 2153936bd..e34114488 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -18,8 +18,16 @@ NS_ASSUME_NONNULL_BEGIN +NSErrorUserInfoKey const ContactDiscoveryServiceErrorKey_Reason = @"ContactDiscoveryServiceErrorKey_Reason"; NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.ContactDiscoveryService"; +NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *reason) +{ + return [NSError errorWithDomain:ContactDiscoveryServiceErrorDomain + code:code + userInfo:@{ ContactDiscoveryServiceErrorKey_Reason : reason }]; +} + @interface RemoteAttestationAuth () @property (nonatomic) NSString *username; @@ -53,17 +61,21 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont + (nullable RemoteAttestationKeys *)keysForKeyPair:(ECKeyPair *)keyPair serverEphemeralPublic:(NSData *)serverEphemeralPublic serverStaticPublic:(NSData *)serverStaticPublic + error:(NSError **)error { if (!keyPair) { - OWSFailDebug(@"Missing keyPair"); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"Missing keyPair"); return nil; } if (serverEphemeralPublic.length < 1) { - OWSFailDebug(@"Invalid serverEphemeralPublic"); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"Invalid serverEphemeralPublic"); return nil; } if (serverStaticPublic.length < 1) { - OWSFailDebug(@"Invalid serverStaticPublic"); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"Invalid serverStaticPublic"); return nil; } RemoteAttestationKeys *keys = [RemoteAttestationKeys new]; @@ -71,6 +83,8 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont keys.serverEphemeralPublic = serverEphemeralPublic; keys.serverStaticPublic = serverStaticPublic; if (![keys deriveKeys]) { + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"failed to derive keys"); return nil; } return keys; @@ -350,16 +364,22 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont [[TSNetworkManager sharedManager] makeRequest:request success:^(NSURLSessionDataTask *task, id responseJson) { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSError *_Nullable error; RemoteAttestation *_Nullable attestation = [self parseAttestationResponseJson:responseJson response:task.response keyPair:keyPair enclaveId:enclaveId - auth:auth]; + auth:auth + error:&error]; if (!attestation) { - NSError *error = [NSError errorWithDomain:ContactDiscoveryServiceErrorDomain - code:ContactDiscoveryServiceErrorAttestationFailed - userInfo:nil]; + if (!error) { + OWSFailDebug(@"error was unexpectedly nil"); + error = ContactDiscoveryServiceErrorMakeWithReason(ContactDiscoveryServiceErrorAssertionError, + @"failure when parsing attestation - no reason given"); + } else { + OWSFailDebug(@"error with attestation: %@", error); + } error.isRetryable = NO; failureHandler(error); return; @@ -378,6 +398,7 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont keyPair:(ECKeyPair *)keyPair enclaveId:(NSString *)enclaveId auth:(RemoteAttestationAuth *)auth + error:(NSError **)error { OWSAssertDebug(responseJson); OWSAssertDebug(response); @@ -392,71 +413,89 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:httpResponse.allHeaderFields forURL:httpResponse.URL]; if (cookies.count < 1) { - OWSFailDebug(@"couldn't parse cookie."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse cookie."); return nil; } if (![responseJson isKindOfClass:[NSDictionary class]]) { + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"invalid json response"); return nil; } NSDictionary *responseDict = responseJson; NSData *_Nullable serverEphemeralPublic = [responseDict base64DataForKey:@"serverEphemeralPublic" expectedLength:32]; if (!serverEphemeralPublic) { - OWSFailDebug(@"couldn't parse serverEphemeralPublic."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse serverEphemeralPublic."); return nil; } NSData *_Nullable serverStaticPublic = [responseDict base64DataForKey:@"serverStaticPublic" expectedLength:32]; if (!serverStaticPublic) { - OWSFailDebug(@"couldn't parse serverStaticPublic."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse serverStaticPublic."); return nil; } NSData *_Nullable encryptedRequestId = [responseDict base64DataForKey:@"ciphertext"]; if (!encryptedRequestId) { - OWSFailDebug(@"couldn't parse encryptedRequestId."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse encryptedRequestId."); return nil; } NSData *_Nullable encryptedRequestIv = [responseDict base64DataForKey:@"iv" expectedLength:12]; if (!encryptedRequestIv) { - OWSFailDebug(@"couldn't parse encryptedRequestIv."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse encryptedRequestIv."); return nil; } NSData *_Nullable encryptedRequestTag = [responseDict base64DataForKey:@"tag" expectedLength:16]; if (!encryptedRequestTag) { - OWSFailDebug(@"couldn't parse encryptedRequestTag."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse encryptedRequestTag."); return nil; } NSData *_Nullable quoteData = [responseDict base64DataForKey:@"quote"]; if (!quoteData) { - OWSFailDebug(@"couldn't parse quote data."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse quote data."); return nil; } NSString *_Nullable signatureBody = [responseDict stringForKey:@"signatureBody"]; if (![signatureBody isKindOfClass:[NSString class]]) { - OWSFailDebug(@"couldn't parse signatureBody."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse signatureBody."); return nil; } NSData *_Nullable signature = [responseDict base64DataForKey:@"signature"]; if (!signature) { - OWSFailDebug(@"couldn't parse signature."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse signature."); return nil; } NSString *_Nullable encodedCertificates = [responseDict stringForKey:@"certificates"]; if (![encodedCertificates isKindOfClass:[NSString class]]) { - OWSFailDebug(@"couldn't parse encodedCertificates."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse encodedCertificates."); return nil; } NSString *_Nullable certificates = [encodedCertificates stringByRemovingPercentEncoding]; if (!certificates) { - OWSFailDebug(@"couldn't parse certificates."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't parse certificates."); return nil; } RemoteAttestationKeys *_Nullable keys = [RemoteAttestationKeys keysForKeyPair:keyPair serverEphemeralPublic:serverEphemeralPublic - serverStaticPublic:serverStaticPublic]; - if (!keys) { - OWSFailDebug(@"couldn't derive keys."); + serverStaticPublic:serverStaticPublic + error:error]; + if (!keys || *error != nil) { + if (*error == nil) { + OWSFailDebug(@"missing error specifics"); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"Couldn't derive keys. No reason given"); + } return nil; } @@ -470,20 +509,28 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont encryptedRequestTag:encryptedRequestTag keys:keys]; if (!requestId) { - OWSFailDebug(@"couldn't decrypt request id."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"couldn't decrypt request id."); return nil; } if (![self verifyServerQuote:quote keys:keys enclaveId:enclaveId]) { - OWSFailDebug(@"couldn't verify quote."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAttestationFailed, @"couldn't verify quote."); return nil; } if (![self verifyIasSignatureWithCertificates:certificates signatureBody:signatureBody signature:signature - quoteData:quoteData]) { - OWSFailDebug(@"couldn't verify ias signature."); + quoteData:quoteData + error:error]) { + + if (*error == nil) { + OWSFailDebug(@"missing error specifics"); + *error = ContactDiscoveryServiceErrorMakeWithReason(ContactDiscoveryServiceErrorAssertionError, + @"verifyIasSignatureWithCertificates failed. No reason given"); + } return nil; } @@ -503,61 +550,71 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont signatureBody:(NSString *)signatureBody signature:(NSData *)signature quoteData:(NSData *)quoteData + error:(NSError **)error { OWSAssertDebug(certificates.length > 0); OWSAssertDebug(signatureBody.length > 0); OWSAssertDebug(signature.length > 0); OWSAssertDebug(quoteData); - NSError *error; + NSError *signingError; CDSSigningCertificate *_Nullable certificate = - [CDSSigningCertificate parseCertificateFromPem:certificates error:&error]; - if (error) { - OWSFailDebug(@"error when parsing signing certificate. %@", error.localizedDescription); + [CDSSigningCertificate parseCertificateFromPem:certificates error:&signingError]; + if (signingError) { + *error = signingError; return NO; } if (!certificate) { - OWSFailDebug(@"could not parse signing certificate."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"could not parse signing certificate."); return NO; } if (![certificate verifySignatureOfBody:signatureBody signature:signature]) { - OWSFailDebug(@"could not verify signature."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAttestationFailed, @"could not verify signature."); return NO; } SignatureBodyEntity *_Nullable signatureBodyEntity = [self parseSignatureBodyEntity:signatureBody]; if (!signatureBodyEntity) { - OWSFailDebug(@"could not parse signature body."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"could not parse signature body."); return NO; } // Compare the first N bytes of the quote data with the signed quote body. const NSUInteger kQuoteBodyComparisonLength = 432; if (signatureBodyEntity.isvEnclaveQuoteBody.length < kQuoteBodyComparisonLength) { - OWSFailDebug(@"isvEnclaveQuoteBody has unexpected length."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"isvEnclaveQuoteBody has unexpected length."); return NO; } // NOTE: This version is separate from and does _NOT_ match the CDS quote version. const NSUInteger kSignatureBodyVersion = 3; if (![signatureBodyEntity.version isEqual:@(kSignatureBodyVersion)]) { - OWSFailDebug(@"signatureBodyEntity has unexpected version."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"signatureBodyEntity has unexpected version."); return NO; } if (quoteData.length < kQuoteBodyComparisonLength) { - OWSFailDebug(@"quoteData has unexpected length."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"quoteData has unexpected length."); return NO; } NSData *isvEnclaveQuoteBodyForComparison = [signatureBodyEntity.isvEnclaveQuoteBody subdataWithRange:NSMakeRange(0, kQuoteBodyComparisonLength)]; NSData *quoteDataForComparison = [quoteData subdataWithRange:NSMakeRange(0, kQuoteBodyComparisonLength)]; if (![isvEnclaveQuoteBodyForComparison ows_constantTimeIsEqualToData:quoteDataForComparison]) { - OWSFailDebug(@"isvEnclaveQuoteBody and quoteData do not match."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAttestationFailed, @"isvEnclaveQuoteBody and quoteData do not match."); return NO; } if (![@"OK" isEqualToString:signatureBodyEntity.isvEnclaveQuoteStatus]) { - OWSFailDebug(@"invalid isvEnclaveQuoteStatus: %@.", signatureBodyEntity.isvEnclaveQuoteStatus); + NSString *reason = + [NSString stringWithFormat:@"invalid isvEnclaveQuoteStatus: %@", signatureBodyEntity.isvEnclaveQuoteStatus]; + *error = ContactDiscoveryServiceErrorMakeWithReason(ContactDiscoveryServiceErrorAttestationFailed, reason); return NO; } @@ -567,7 +624,8 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont [dateFormatter setDateFormat:@"yyy-MM-dd'T'HH:mm:ss.SSSSSS"]; NSDate *timestampDate = [dateFormatter dateFromString:signatureBodyEntity.timestamp]; if (!timestampDate) { - OWSFailDebug(@"could not parse signature body timestamp."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAssertionError, @"could not parse signature body timestamp."); return NO; } @@ -581,7 +639,8 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont BOOL isExpired = [now isAfterDate:timestampDatePlus1Day]; if (isExpired) { - OWSFailDebug(@"Signature is expired."); + *error = ContactDiscoveryServiceErrorMakeWithReason( + ContactDiscoveryServiceErrorAttestationFailed, @"Signature is expired."); return NO; } diff --git a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift index b55b7eaab..e3dd4c81e 100644 --- a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift +++ b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -400,11 +400,11 @@ class CDSBatchOperation: OWSOperation { class CDSFeedbackOperation: OWSOperation { - enum FeedbackResult: String { + enum FeedbackResult { case ok case mismatch - case attestationError = "attestation-error" - case unexpectedError = "unexpected-error" + case attestationError(reason: String) + case unexpectedError(reason: String) } private let legacyRegisteredRecipientIds: Set @@ -455,10 +455,22 @@ class CDSFeedbackOperation: OWSOperation { case ContactDiscoveryError.serverError, ContactDiscoveryError.clientError: // Server already has this information, no need submit feedback self.reportSuccess() - case ContactDiscoveryServiceError.attestationFailed: - self.makeRequest(result: .attestationError) + case let cdsError as ContactDiscoveryServiceError: + let reason = cdsError.reason + switch cdsError.code { + case .assertionError: + self.makeRequest(result: .unexpectedError(reason: "CDS assertionError: \(reason ?? "unknown")")) + case .attestationFailed: + self.makeRequest(result: .attestationError(reason: "CDS attestationFailed: \(reason ?? "unknown")")) + } + case ContactDiscoveryError.assertionError(let assertionDescription): + self.makeRequest(result: .unexpectedError(reason: "assertionError: \(assertionDescription)")) + case ContactDiscoveryError.parseError(description: let parseErrorDescription): + self.makeRequest(result: .unexpectedError(reason: "parseError: \(parseErrorDescription)")) default: - self.makeRequest(result: .unexpectedError) + let nsError = error as NSError + let reason = "unexpectedError code:\(nsError.code)" + self.makeRequest(result: .unexpectedError(reason: reason)) } return @@ -474,7 +486,18 @@ class CDSFeedbackOperation: OWSOperation { } func makeRequest(result: FeedbackResult) { - let request = OWSRequestFactory.cdsFeedbackRequest(result: result.rawValue) + let reason: String? + switch result { + case .ok: + reason = nil + case .mismatch: + reason = nil + case .attestationError(let attestationErrorReason): + reason = attestationErrorReason + case .unexpectedError(let unexpectedErrorReason): + reason = unexpectedErrorReason + } + let request = OWSRequestFactory.cdsFeedbackRequest(status: result.statusPath, reason: reason) self.networkManager.makeRequest(request, success: { _, _ in self.reportSuccess() }, failure: { _, error in self.reportError(error) }) @@ -488,3 +511,24 @@ extension Array { } } } + +extension CDSFeedbackOperation.FeedbackResult { + var statusPath: String { + switch self { + case .ok: + return "ok" + case .mismatch: + return "mismatch" + case .attestationError: + return "attestation-error" + case .unexpectedError: + return "unexpected-error" + } + } +} + +extension ContactDiscoveryServiceError { + var reason: String? { + return userInfo[ContactDiscoveryServiceErrorKey_Reason] as? String + } +} diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index b7ef07a7c..197009257 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -102,7 +102,8 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { TSVerificationTransportVo cookies:(NSArray *)cookies; + (TSRequest *)remoteAttestationAuthRequest; -+ (TSRequest *)cdsFeedbackRequestWithResult:(NSString *)result NS_SWIFT_NAME(cdsFeedbackRequest(result:)); ++ (TSRequest *)cdsFeedbackRequestWithStatus:(NSString *)status + reason:(nullable NSString *)reason NS_SWIFT_NAME(cdsFeedbackRequest(status:reason:)); #pragma mark - UD diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index bc2e4b6ae..c9e394a96 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSRequestFactory.h" @@ -490,10 +490,18 @@ NS_ASSUME_NONNULL_BEGIN return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; } -+ (TSRequest *)cdsFeedbackRequestWithResult:(NSString *)result ++ (TSRequest *)cdsFeedbackRequestWithStatus:(NSString *)status + reason:(nullable NSString *)reason { - NSString *path = [NSString stringWithFormat:@"/v1/directory/feedback/%@", result]; - return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"PUT" parameters:@{}]; + + NSDictionary *parameters; + if (reason == nil) { + parameters = @{}; + } else { + parameters = @{ @"reason": reason }; + } + NSString *path = [NSString stringWithFormat:@"/v1/directory/feedback-v2/%@", status]; + return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"PUT" parameters:parameters]; } #pragma mark - UD From 62784a477afb1a5de8a2c6c4c56b0c583c9a8248 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Feb 2019 16:28:05 -0700 Subject: [PATCH 002/493] fix staging url --- Signal/Signal-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 319894846..4ac614c6b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -69,7 +69,7 @@ NSThirdPartyExceptionRequiresForwardSecrecy - api-staging.directory.signal.org + api-staging.directory.signal.org NSExceptionAllowsInsecureHTTPLoads From 3f8ea271b47ef95ecdea149616047a3127e58e61 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 13:50:18 -0500 Subject: [PATCH 003/493] First draft of image editor's text tool. --- Signal.xcodeproj/project.pbxproj | 8 + .../AttachmentApprovalViewController.swift | 2 + .../ImageEditorGestureRecognizer.swift | 34 +- .../Views/ImageEditor/ImageEditorModel.swift | 207 ++++++- .../ImageEditorPinchGestureRecognizer.swift | 202 +++++++ .../ImageEditorTextViewController.swift | 213 +++++++ .../Views/ImageEditor/ImageEditorView.swift | 519 ++++++++++++++++-- SignalMessaging/categories/UIView+OWS.h | 2 + SignalMessaging/categories/UIView+OWS.m | 13 + 9 files changed, 1118 insertions(+), 82 deletions(-) create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index fafb368b4..c26f2904f 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -228,6 +228,8 @@ 34B6A90B218BA1D1007C4606 /* typing-animation.gif in Resources */ = {isa = PBXBuildFile; fileRef = 34B6A90A218BA1D0007C4606 /* typing-animation.gif */; }; 34B6D27420F664C900765BE2 /* OWSUnreadIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B6D27220F664C800765BE2 /* OWSUnreadIndicator.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34B6D27520F664C900765BE2 /* OWSUnreadIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B6D27320F664C800765BE2 /* OWSUnreadIndicator.m */; }; + 34BBC84B220B2CB200857249 /* ImageEditorTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */; }; + 34BBC84D220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */; }; 34BECE2B1F74C12700D7438D /* DebugUIStress.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2A1F74C12700D7438D /* DebugUIStress.m */; }; 34BECE2E1F7ABCE000D7438D /* GifPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */; }; 34BECE301F7ABCF800D7438D /* GifPickerLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2F1F7ABCF800D7438D /* GifPickerLayout.swift */; }; @@ -902,6 +904,8 @@ 34B6A90A218BA1D0007C4606 /* typing-animation.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "typing-animation.gif"; sourceTree = ""; }; 34B6D27220F664C800765BE2 /* OWSUnreadIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSUnreadIndicator.h; sourceTree = ""; }; 34B6D27320F664C800765BE2 /* OWSUnreadIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSUnreadIndicator.m; sourceTree = ""; }; + 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTextViewController.swift; sourceTree = ""; }; + 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPinchGestureRecognizer.swift; sourceTree = ""; }; 34BECE291F74C12700D7438D /* DebugUIStress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUIStress.h; sourceTree = ""; }; 34BECE2A1F74C12700D7438D /* DebugUIStress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUIStress.m; sourceTree = ""; }; 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GifPickerViewController.swift; sourceTree = ""; }; @@ -1866,6 +1870,8 @@ children = ( 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */, 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */, + 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */, + 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */, 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */, ); path = ImageEditor; @@ -3340,6 +3346,7 @@ 347850691FD9B78A007B8332 /* AppSetup.m in Sources */, 346941A3215D2EE400B5BFAD /* Theme.m in Sources */, 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */, + 34BBC84D220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift in Sources */, 34AC0A14211B39EA00997B47 /* ContactCellView.m in Sources */, 34AC0A15211B39EA00997B47 /* ContactsViewHelper.m in Sources */, 346129FF1FD5F31400532771 /* OWS103EnableVideoCalling.m in Sources */, @@ -3361,6 +3368,7 @@ 4598198F204E2F28009414F2 /* OWS108CallLoggingPreference.m in Sources */, 34AC09F3211B39B100997B47 /* NewNonContactConversationViewController.m in Sources */, 4C3E245C21F29FCE000AE092 /* Toast.swift in Sources */, + 34BBC84B220B2CB200857249 /* ImageEditorTextViewController.swift in Sources */, 34AC09FA211B39B100997B47 /* SharingThreadPickerViewController.m in Sources */, 45F59A082028E4FB00E8D2B0 /* OWSAudioSession.swift in Sources */, 34612A071FD7238600532771 /* OWSSyncManager.m in Sources */, diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 731ee9862..565a7e94a 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1317,6 +1317,8 @@ extension AttachmentPrepViewController: UIScrollViewDelegate { } } +// MARK: - + class BottomToolView: UIView { let mediaMessageTextToolbar: MediaMessageTextToolbar let galleryRailView: GalleryRailView diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift index 2fab76936..bacddf5bb 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift @@ -1,10 +1,10 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit -class ImageEditorGestureRecognizer: UIGestureRecognizer { +public class ImageEditorGestureRecognizer: UIGestureRecognizer { @objc public var shouldAllowOutsideView = true @@ -13,42 +13,56 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer { public weak var canvasView: UIView? @objc - override func canPrevent(_ preventedGestureRecognizer: UIGestureRecognizer) -> Bool { + public var startLocationInView: CGPoint = .zero + + @objc + public override func canPrevent(_ preventedGestureRecognizer: UIGestureRecognizer) -> Bool { return false } @objc - override func canBePrevented(by: UIGestureRecognizer) -> Bool { + public override func canBePrevented(by: UIGestureRecognizer) -> Bool { return false } @objc - override func shouldRequireFailure(of: UIGestureRecognizer) -> Bool { + public override func shouldRequireFailure(of: UIGestureRecognizer) -> Bool { return false } @objc - override func shouldBeRequiredToFail(by: UIGestureRecognizer) -> Bool { + public override func shouldBeRequiredToFail(by: UIGestureRecognizer) -> Bool { return true } // MARK: - Touch Handling @objc - override func touchesBegan(_ touches: Set, with event: UIEvent) { + public override func touchesBegan(_ touches: Set, with event: UIEvent) { super.touchesBegan(touches, with: event) if state == .possible, touchType(for: touches, with: event) == .valid { // If a gesture starts with a valid touch, begin stroke. state = .began + startLocationInView = .zero + + guard let view = view else { + owsFailDebug("Missing view.") + return + } + guard let touch = touches.randomElement() else { + owsFailDebug("Missing touch.") + return + } + startLocationInView = touch.location(in: view) } else { state = .failed } } @objc - override func touchesMoved(_ touches: Set, with event: UIEvent) { + public override func touchesMoved(_ touches: Set, with event: UIEvent) { super.touchesMoved(touches, with: event) switch state { @@ -70,7 +84,7 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer { } @objc - override func touchesEnded(_ touches: Set, with event: UIEvent) { + public override func touchesEnded(_ touches: Set, with event: UIEvent) { super.touchesEnded(touches, with: event) switch state { @@ -88,7 +102,7 @@ class ImageEditorGestureRecognizer: UIGestureRecognizer { } @objc - override func touchesCancelled(_ touches: Set, with event: UIEvent) { + public override func touchesCancelled(_ touches: Set, with event: UIEvent) { super.touchesCancelled(touches, with: event) state = .cancelled diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 246930422..eb601470c 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -13,10 +13,30 @@ import UIKit public enum ImageEditorItemType: Int { case test case stroke + case text } // MARK: - +// Represented in a "ULO unit" coordinate system +// for source image. +// +// "ULO" coordinate system is "upper-left-origin". +// +// "Unit" coordinate system means values are expressed +// in terms of some other values, in this case the +// width and height of the source image. +// +// * 0.0 = left edge +// * 1.0 = right edge +// * 0.0 = top edge +// * 1.0 = bottom edge +public typealias ImageEditorSample = CGPoint + +public typealias ImageEditorConversion = (ImageEditorSample) -> ImageEditorSample + +// MARK: - + // Instances of ImageEditorItem should be treated // as immutable, once configured. @objc @@ -44,11 +64,13 @@ public class ImageEditorItem: NSObject { super.init() } - public typealias PointConversionFunction = (CGPoint) -> CGPoint - - public func clone(withPointConversionFunction conversion: PointConversionFunction) -> ImageEditorItem { + public func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { return ImageEditorItem(itemId: itemId, itemType: itemType) } + + public func outputScale() -> CGFloat { + return 1.0 + } } // MARK: - @@ -60,20 +82,7 @@ public class ImageEditorStrokeItem: ImageEditorItem { @objc public let color: UIColor - // Represented in a "ULO unit" coordinate system - // for source image. - // - // "ULO" coordinate system is "upper-left-origin". - // - // "Unit" coordinate system means values are expressed - // in terms of some other values, in this case the - // width and height of the source image. - // - // * 0.0 = left edge - // * 1.0 = right edge - // * 0.0 = top edge - // * 1.0 = bottom edge - public typealias StrokeSample = CGPoint + public typealias StrokeSample = ImageEditorSample @objc public let unitSamples: [StrokeSample] @@ -117,7 +126,7 @@ public class ImageEditorStrokeItem: ImageEditorItem { return CGFloatClamp01(unitStrokeWidth) * min(dstSize.width, dstSize.height) } - public override func clone(withPointConversionFunction conversion: PointConversionFunction) -> ImageEditorItem { + public override func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { // TODO: We might want to convert the unitStrokeWidth too. let convertedUnitSamples = unitSamples.map { (sample) in conversion(sample) @@ -131,6 +140,159 @@ public class ImageEditorStrokeItem: ImageEditorItem { // MARK: - +@objc +public class ImageEditorTextItem: ImageEditorItem { + // Until we need to serialize these items, + // just use UIColor. + @objc + public let color: UIColor + + @objc + public let font: UIFont + + @objc + public let text: String + + @objc + public let unitCenter: ImageEditorSample + + // Leave some margins against the edge of the image. + @objc + public static let kDefaultUnitWidth: CGFloat = 0.9 + + // The max width of the text as a fraction of the image width. + @objc + public let unitWidth: CGFloat + + // 0 = no rotation. + // CGFloat.pi * 0.5 = rotation 90 degrees clockwise. + @objc + public let rotationRadians: CGFloat + + @objc + public static let kMaxScaling: CGFloat = 4.0 + @objc + public static let kMinScaling: CGFloat = 0.5 + @objc + public let scaling: CGFloat + + // This might be nil while the item is a "draft" item. + // Once the item has been "committed" to the model, it + // should always be non-nil, + @objc + public let imagePath: String? + + @objc + public init(color: UIColor, + font: UIFont, + text: String, + unitCenter: ImageEditorSample = CGPoint(x: 0.5, y: 0.5), + unitWidth: CGFloat = ImageEditorTextItem.kDefaultUnitWidth, + rotationRadians: CGFloat = 0.0, + scaling: CGFloat = 1.0, + imagePath: String? = nil) { + self.color = color + self.font = font + self.text = text + self.unitCenter = unitCenter + self.unitWidth = unitWidth + self.rotationRadians = rotationRadians + self.scaling = scaling + self.imagePath = imagePath + + super.init(itemType: .text) + } + + private init(itemId: String, + color: UIColor, + font: UIFont, + text: String, + unitCenter: ImageEditorSample, + unitWidth: CGFloat, + rotationRadians: CGFloat, + scaling: CGFloat, + imagePath: String?) { + self.color = color + self.font = font + self.text = text + self.unitCenter = unitCenter + self.unitWidth = unitWidth + self.rotationRadians = rotationRadians + self.scaling = scaling + self.imagePath = imagePath + + super.init(itemId: itemId, itemType: .text) + } + + @objc + public class func empty(withColor color: UIColor) -> ImageEditorTextItem { + let font = UIFont.boldSystemFont(ofSize: 30.0) + return ImageEditorTextItem(color: color, font: font, text: "") + } + + @objc + public func copy(withText newText: String) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + color: color, + font: font, + text: newText, + unitCenter: unitCenter, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling, + imagePath: imagePath) + } + + @objc + public func copy(withUnitCenter newUnitCenter: CGPoint) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + color: color, + font: font, + text: text, + unitCenter: newUnitCenter, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling, + imagePath: imagePath) + } + + @objc + public func copy(withUnitCenter newUnitCenter: CGPoint, + scaling newScaling: CGFloat, + rotationRadians newRotationRadians: CGFloat) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + color: color, + font: font, + text: text, + unitCenter: newUnitCenter, + unitWidth: unitWidth, + rotationRadians: newRotationRadians, + scaling: newScaling, + imagePath: imagePath) + } + + public override func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { + let convertedUnitCenter = conversion(unitCenter) + let convertedUnitWidth = conversion(CGPoint(x: unitWidth, y: 0)).x + + return ImageEditorTextItem(itemId: itemId, + color: color, + font: font, + text: text, + unitCenter: convertedUnitCenter, + unitWidth: convertedUnitWidth, + rotationRadians: rotationRadians, + scaling: scaling, + imagePath: imagePath) + } + + public override func outputScale() -> CGFloat { + return scaling + } +} + +// MARK: - + public class OrderedDictionary: NSObject { public typealias KeyType = String @@ -422,6 +584,11 @@ public class ImageEditorModel: NSObject { return contents.items() } + @objc + public func has(itemForId itemId: String) -> Bool { + return item(forId: itemId) != nil + } + @objc public func item(forId itemId: String) -> ImageEditorItem? { return contents.item(forId: itemId) @@ -559,7 +726,7 @@ public class ImageEditorModel: NSObject { let right = unitCropRect.origin.x + unitCropRect.size.width let top = unitCropRect.origin.y let bottom = unitCropRect.origin.y + unitCropRect.size.height - let conversion: ImageEditorItem.PointConversionFunction = { (point) in + let conversion: ImageEditorConversion = { (point) in // Convert from the pre-crop unit coordinate system // to post-crop unit coordinate system using inverse // lerp. @@ -580,7 +747,7 @@ public class ImageEditorModel: NSObject { let newContents = ImageEditorContents(imagePath: croppedImagePath, imageSizePixels: croppedImageSizePixels) for oldItem in oldContents.items() { - let newItem = oldItem.clone(withPointConversionFunction: conversion) + let newItem = oldItem.clone(withImageEditorConversion: conversion) newContents.append(item: newItem) } return newContents diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift new file mode 100644 index 000000000..ae7042247 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift @@ -0,0 +1,202 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +public struct ImageEditorPinchState { + public let centroid: CGPoint + public let distance: CGFloat + public let angleRadians: CGFloat + + init(centroid: CGPoint, + distance: CGFloat, + angleRadians: CGFloat) { + self.centroid = centroid + self.distance = distance + self.angleRadians = angleRadians + } + + static func empty() -> ImageEditorPinchState { + return ImageEditorPinchState(centroid: .zero, distance: 1.0, angleRadians: 0) + } +} + +public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { + + public var pinchStateStart = ImageEditorPinchState.empty() + + public var pinchStateLast = ImageEditorPinchState.empty() + + // MARK: - Touch Handling + + private var gestureBeganLocation: CGPoint? + + private func failAndReset() { + state = .failed + gestureBeganLocation = nil + } + + @objc + public override func touchesBegan(_ touches: Set, with event: UIEvent) { + super.touchesBegan(touches, with: event) + + if state == .possible { + if gestureBeganLocation == nil { + gestureBeganLocation = centroid(forTouches: event.allTouches) + } + + switch touchState(for: event) { + case .possible: + // Do nothing + break + case .invalid: + failAndReset() + case .valid(let pinchState): + state = .began + pinchStateStart = pinchState + pinchStateLast = pinchState + } + } else { + failAndReset() + } + } + + @objc + public override func touchesMoved(_ touches: Set, with event: UIEvent) { + super.touchesMoved(touches, with: event) + + switch state { + case .began, .changed: + switch touchState(for: event) { + case .possible: + if let gestureBeganLocation = gestureBeganLocation { + let location = centroid(forTouches: event.allTouches) + + // If the initial touch moves too much without a second touch, + // this GR needs to fail - the gesture looks like a pan/swipe/etc., + // not a pinch. + let distance = CGPointDistance(location, gestureBeganLocation) + let maxDistance: CGFloat = 10.0 + guard distance <= maxDistance else { + failAndReset() + return + } + } + + // Do nothing + break + case .invalid: + failAndReset() + case .valid(let pinchState): + state = .changed + pinchStateLast = pinchState + } + default: + failAndReset() + } + } + + @objc + public override func touchesEnded(_ touches: Set, with event: UIEvent) { + super.touchesEnded(touches, with: event) + + switch state { + case .began, .changed: + switch touchState(for: event) { + case .possible: + failAndReset() + case .invalid: + failAndReset() + case .valid(let pinchState): + state = .ended + pinchStateLast = pinchState + } + default: + failAndReset() + } + } + + @objc + public override func touchesCancelled(_ touches: Set, with event: UIEvent) { + super.touchesCancelled(touches, with: event) + + state = .cancelled + } + + public enum TouchState { + case possible + case valid(pinchState : ImageEditorPinchState) + case invalid + } + + private func touchState(for event: UIEvent) -> TouchState { + guard let allTouches = event.allTouches else { + owsFailDebug("Missing allTouches") + return .invalid + } + // Note that we use _all_ touches. + if allTouches.count < 2 { + return .possible + } + guard let pinchState = pinchState(for: allTouches) else { + return .invalid + } + return .valid(pinchState:pinchState) + } + + private func pinchState(for touches: Set) -> ImageEditorPinchState? { + guard let view = self.view else { + owsFailDebug("Missing view") + return nil + } + guard touches.count == 2 else { + return nil + } + let touchList = Array(touches).sorted { (left, right) -> Bool in + // TODO: Will timestamp yield stable sort? + left.timestamp < right.timestamp + } + guard let touch0 = touchList.first else { + return nil + } + guard let touch1 = touchList.last else { + return nil + } + let location0 = touch0.location(in: view) + let location1 = touch1.location(in: view) + + let centroid = CGPointScale(CGPointAdd(location0, location1), 0.5) + let distance = CGPointDistance(location0, location1) + + // The valence of the angle doesn't matter; we're only going to be using + // changes to the angle. + let delta = CGPointSubtract(location1, location0) + let angleRadians = atan2(delta.y, delta.x) + + return ImageEditorPinchState(centroid: centroid, + distance: distance, + angleRadians: angleRadians) + } + + private func centroid(forTouches touches: Set?) -> CGPoint { + guard let view = self.view else { + owsFailDebug("Missing view") + return .zero + } + guard let touches = touches else { + return .zero + } + guard touches.count > 0 else { + return .zero + } + var sum = CGPoint.zero + for touch in touches { + let location = touch.location(in: view) + sum = CGPointAdd(sum, location) + } + + let centroid = CGPointScale(sum, 1 / CGFloat(touches.count)) + return centroid + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift new file mode 100644 index 000000000..75a580646 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -0,0 +1,213 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public protocol VAlignTextViewDelegate: class { + func textViewDidComplete() +} + +// MARK: - + +private class VAlignTextView: UITextView { + fileprivate weak var textViewDelegate: VAlignTextViewDelegate? + + enum Alignment: String { + case top + case center + case bottom + } + private let alignment: Alignment + + @objc public override var bounds: CGRect { + didSet { + if oldValue != bounds { + updateInsets() + } + } + } + + @objc public override var frame: CGRect { + didSet { + if oldValue != frame { + updateInsets() + } + } + } + + public init(alignment: Alignment) { + self.alignment = alignment + + super.init(frame: .zero, textContainer: nil) + + self.addObserver(self, forKeyPath: "contentSize", options: .new, context: nil) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + deinit { + self.removeObserver(self, forKeyPath: "contentSize") + } + + private func updateInsets() { + let topOffset: CGFloat + switch alignment { + case .top: + topOffset = 0 + case .center: + topOffset = max(0, (self.height() - contentSize.height) * 0.5) + case .bottom: + topOffset = max(0, self.height() - contentSize.height) + } + contentInset = UIEdgeInsets(top: topOffset, leading: 0, bottom: 0, trailing: 0) + } + + open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) { + updateInsets() + } + + // MARK: - Key Commands + + override var keyCommands: [UIKeyCommand]? { + return [ + UIKeyCommand(input: "\r", modifierFlags: .command, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Send Message"), + UIKeyCommand(input: "\r", modifierFlags: .alternate, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Send Message") + ] + } + + @objc + public func modifiedReturnPressed(sender: UIKeyCommand) { + Logger.verbose("") + + self.textViewDelegate?.textViewDidComplete() + } +} + +// MARK: - + +@objc +public protocol ImageEditorTextViewControllerDelegate: class { + func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) + func textEditDidCancel() +} + +// MARK: - + +// A view for editing text item in image editor. +class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { + private weak var delegate: ImageEditorTextViewControllerDelegate? + + private let textItem: ImageEditorTextItem + + private let maxTextWidthPoints: CGFloat + + private let textView = VAlignTextView(alignment: .bottom) + + init(delegate: ImageEditorTextViewControllerDelegate, + textItem: ImageEditorTextItem, + maxTextWidthPoints: CGFloat) { + self.delegate = delegate + self.textItem = textItem + self.maxTextWidthPoints = maxTextWidthPoints + + super.init(nibName: nil, bundle: nil) + + self.textView.textViewDelegate = self + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - View Lifecycle + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + textView.becomeFirstResponder() + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + textView.becomeFirstResponder() + } + + override func loadView() { + self.view = UIView() + self.view.backgroundColor = UIColor(white: 0.5, alpha: 0.5) + + configureTextView() + + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + target: self, + action: #selector(didTapBackButton)) + + self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + self.view.addSubview(textView) + textView.autoPinTopToSuperviewMargin() + textView.autoHCenterInSuperview() + // In order to having text wrapping be as WYSIWYG as possible, we limit the text view + // to the max text width on the image. + let maxTextWidthPoints = max(self.maxTextWidthPoints, 200) + textView.autoSetDimension(.width, toSize: maxTextWidthPoints, relation: .lessThanOrEqual) + self.autoPinView(toBottomOfViewControllerOrKeyboard: textView, avoidNotch: true) + } + + private func configureTextView() { + textView.text = textItem.text + textView.font = textItem.font + textView.textColor = textItem.color + + textView.isEditable = true + textView.backgroundColor = .clear + textView.isOpaque = false + // We use a white cursor since we use a dark background. + textView.tintColor = .white + textView.returnKeyType = .done + // TODO: + // textView.delegate = self + textView.isScrollEnabled = true + textView.scrollsToTop = false + textView.isUserInteractionEnabled = true + textView.textAlignment = .center + textView.textContainerInset = .zero + textView.textContainer.lineFragmentPadding = 0 + textView.contentInset = .zero + } + + // MARK: - Events + + @objc public func didTapBackButton() { + completeAndDismiss() + } + + private func completeAndDismiss() { + + // Before we take a screenshot, make sure selection state + // auto-complete suggestions, cursor don't affect screenshot. + textView.resignFirstResponder() + if textView.isFirstResponder { + owsFailDebug("Text view is still first responder.") + } + textView.selectedTextRange = nil + + self.delegate?.textEditDidComplete(textItem: textItem, text: textView.text) + + self.dismiss(animated: true) { + // Do nothing. + } + } + + // MARK: - VAlignTextViewDelegate + + func textViewDidComplete() { + completeAndDismiss() + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index d4b81425f..94da61b12 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -4,13 +4,61 @@ import UIKit +extension UIView { + public func renderAsImage() -> UIImage? { + return renderAsImage(opaque: false, scale: UIScreen.main.scale) + } + + public func renderAsImage(opaque: Bool, scale: CGFloat) -> UIImage? { + if #available(iOS 10, *) { + let format = UIGraphicsImageRendererFormat() + format.scale = scale + format.opaque = opaque + let renderer = UIGraphicsImageRenderer(bounds: self.bounds, + format: format) + return renderer.image { (context) in + self.layer.render(in: context.cgContext) + } + } else { + UIGraphicsBeginImageContextWithOptions(bounds.size, opaque, scale) + if let _ = UIGraphicsGetCurrentContext() { + drawHierarchy(in: bounds, afterScreenUpdates: true) + let image = UIGraphicsGetImageFromCurrentImageContext() + UIGraphicsEndImageContext() + return image + } + owsFailDebug("Could not create graphics context.") + return nil + } + } +} + +private class EditorTextLayer: CATextLayer { + let itemId: String + + public init(itemId: String) { + self.itemId = itemId + + super.init() + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } +} + +// MARK: - + // A view for editing outgoing image attachments. // It can also be used to render the final output. @objc -public class ImageEditorView: UIView, ImageEditorModelDelegate { +public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextViewControllerDelegate, UIGestureRecognizerDelegate { + private let model: ImageEditorModel enum EditorMode: String { + // This is the default mode. It is used for interacting with text items. case none case brush case crop @@ -20,23 +68,11 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { didSet { AssertIsOnMainThread() - switch editorMode { - case .none: - editorGestureRecognizer?.isEnabled = false - case .brush: - // Brush strokes can start and end (and return from) outside the view. - editorGestureRecognizer?.shouldAllowOutsideView = true - editorGestureRecognizer?.isEnabled = true - case .crop: - // Crop gestures can start and end (and return from) outside the view. - editorGestureRecognizer?.shouldAllowOutsideView = true - editorGestureRecognizer?.isEnabled = true - } + updateGestureState() } } - // TODO: - private static let defaultColor = UIColor.ows_signalBlue + private static let defaultColor = UIColor.white private var currentColor = ImageEditorView.defaultColor @objc @@ -59,6 +95,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { private var imageViewConstraints = [NSLayoutConstraint]() private let layersView = OWSLayerView() private var editorGestureRecognizer: ImageEditorGestureRecognizer? + private var tapGestureRecognizer: UITapGestureRecognizer? + private var pinchGestureRecognizer: ImageEditorPinchGestureRecognizer? @objc public func configureSubviews() -> Bool { @@ -77,18 +115,50 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { self.isUserInteractionEnabled = true layersView.isUserInteractionEnabled = true - let editorGestureRecognizer = ImageEditorGestureRecognizer(target: self, action: #selector(handleTouchGesture(_:))) + + let editorGestureRecognizer = ImageEditorGestureRecognizer(target: self, action: #selector(handleEditorGesture(_:))) editorGestureRecognizer.canvasView = layersView + editorGestureRecognizer.delegate = self self.addGestureRecognizer(editorGestureRecognizer) self.editorGestureRecognizer = editorGestureRecognizer - editorGestureRecognizer.isEnabled = false + + let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))) + self.addGestureRecognizer(tapGestureRecognizer) + self.tapGestureRecognizer = tapGestureRecognizer + + let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) + self.addGestureRecognizer(pinchGestureRecognizer) + self.pinchGestureRecognizer = pinchGestureRecognizer + + // De-conflict the GRs. + editorGestureRecognizer.require(toFail: tapGestureRecognizer) + editorGestureRecognizer.require(toFail: pinchGestureRecognizer) + + updateGestureState() return true } + private func commitTextEditingChanges(textItem: ImageEditorTextItem, textView: UITextView) { + AssertIsOnMainThread() + + guard let text = textView.text?.ows_stripped(), + text.count > 0 else { + model.remove(item: textItem) + return + } + + // Model items are immutable; we _replace_ the item rather than modify it. + let newItem = textItem.copy(withText: text) + if model.has(itemForId: textItem.itemId) { + model.replace(item: newItem, suppressUndo: false) + } else { + model.append(item: newItem) + } + } + @objc public func updateImageView() -> Bool { - Logger.verbose("") guard let image = UIImage(contentsOfFile: model.currentImagePath) else { owsFailDebug("Could not load image") @@ -129,6 +199,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { private let redoButton = UIButton(type: .custom) private let brushButton = UIButton(type: .custom) private let cropButton = UIButton(type: .custom) + private let newTextButton = UIButton(type: .custom) + private var allButtons = [UIButton]() @objc public func addControls(to containerView: UIView) { @@ -148,11 +220,17 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { label: NSLocalizedString("IMAGE_EDITOR_CROP_BUTTON", comment: "Label for crop button in image editor."), selector: #selector(didTapCrop(sender:))) + configure(button: newTextButton, + label: "Text", + selector: #selector(didTapNewText(sender:))) + let redButton = colorButton(color: UIColor.red) let whiteButton = colorButton(color: UIColor.white) let blackButton = colorButton(color: UIColor.black) - let stackView = UIStackView(arrangedSubviews: [brushButton, cropButton, undoButton, redoButton, redButton, whiteButton, blackButton]) + allButtons = [brushButton, cropButton, undoButton, redoButton, newTextButton, redButton, whiteButton, blackButton] + + let stackView = UIStackView(arrangedSubviews: allButtons) stackView.axis = .vertical stackView.alignment = .center stackView.spacing = 10 @@ -191,6 +269,11 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { redoButton.isEnabled = model.canRedo() brushButton.isSelected = editorMode == .brush cropButton.isSelected = editorMode == .crop + newTextButton.isSelected = false + + for button in allButtons { + button.isHidden = isEditingTextItem + } } // MARK: - Actions @@ -225,6 +308,14 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { toggle(editorMode: .crop) } + @objc func didTapNewText(sender: UIButton) { + Logger.verbose("") + + let textItem = ImageEditorTextItem.empty(withColor: currentColor) + + edit(textItem: textItem) + } + func toggle(editorMode: EditorMode) { if self.editorMode == editorMode { self.editorMode = .none @@ -240,12 +331,160 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { currentColor = color } - @objc - public func handleTouchGesture(_ gestureRecognizer: UIGestureRecognizer) { + // MARK: - Gestures + + private func updateGestureState() { AssertIsOnMainThread() switch editorMode { case .none: + editorGestureRecognizer?.shouldAllowOutsideView = true + editorGestureRecognizer?.isEnabled = true + tapGestureRecognizer?.isEnabled = true + pinchGestureRecognizer?.isEnabled = true + case .brush: + // Brush strokes can start and end (and return from) outside the view. + editorGestureRecognizer?.shouldAllowOutsideView = true + editorGestureRecognizer?.isEnabled = true + tapGestureRecognizer?.isEnabled = false + pinchGestureRecognizer?.isEnabled = false + case .crop: + // Crop gestures can start and end (and return from) outside the view. + editorGestureRecognizer?.shouldAllowOutsideView = true + editorGestureRecognizer?.isEnabled = true + tapGestureRecognizer?.isEnabled = false + pinchGestureRecognizer?.isEnabled = false + } + } + + // MARK: - Tap Gesture + + @objc + public func handleTapGesture(_ gestureRecognizer: UIGestureRecognizer) { + AssertIsOnMainThread() + + guard gestureRecognizer.state == .recognized else { + owsFailDebug("Unexpected state.") + return + } + + guard let textLayer = textLayer(forGestureRecognizer: gestureRecognizer) else { + return + } + + guard let textItem = model.item(forId: textLayer.itemId) as? ImageEditorTextItem else { + owsFailDebug("Missing or invalid text item.") + return + } + + edit(textItem: textItem) + } + + private var isEditingTextItem = false { + didSet { + AssertIsOnMainThread() + + updateButtons() + } + } + + private func edit(textItem: ImageEditorTextItem) { + Logger.verbose("") + + toggle(editorMode: .none) + + guard let viewController = self.containingViewController() else { + owsFailDebug("Can't find view controller.") + return + } + + isEditingTextItem = true + + let maxTextWidthPoints = imageView.width() * ImageEditorTextItem.kDefaultUnitWidth + + let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) + let navigationController = OWSNavigationController(rootViewController: textEditor) + navigationController.modalPresentationStyle = .overFullScreen + viewController.present(navigationController, animated: true) { + // Do nothing. + } + } + + // MARK: - Pinch Gesture + + // These properties are valid while moving a text item. + private var pinchingTextItem: ImageEditorTextItem? + private var pinchHasChanged = false + + @objc + public func handlePinchGesture(_ gestureRecognizer: ImageEditorPinchGestureRecognizer) { + AssertIsOnMainThread() + + // We could undo an in-progress pinch if the gesture is cancelled, but it seems gratuitous. + + switch gestureRecognizer.state { + case .began: + let pinchState = gestureRecognizer.pinchStateStart + guard let gestureRecognizerView = gestureRecognizer.view else { + owsFailDebug("Missing gestureRecognizer.view.") + return + } + let location = gestureRecognizerView.convert(pinchState.centroid, to: unitReferenceView) + guard let textLayer = textLayer(forLocation: location) else { + // The pinch needs to start centered on a text item. + return + } + guard let textItem = model.item(forId: textLayer.itemId) as? ImageEditorTextItem else { + owsFailDebug("Missing or invalid text item.") + return + } + pinchingTextItem = textItem + pinchHasChanged = false + case .changed, .ended: + guard let textItem = pinchingTextItem else { + return + } + + let locationDelta = CGPointSubtract(gestureRecognizer.pinchStateLast.centroid, + gestureRecognizer.pinchStateStart.centroid) + let unitLocationDelta = convertToUnit(location: locationDelta, shouldClamp: false) + let unitCenter = CGPointClamp01(CGPointAdd(textItem.unitCenter, unitLocationDelta)) + + // NOTE: We use max(1, ...) to avoid divide-by-zero. + let newScaling = CGFloatClamp(textItem.scaling * gestureRecognizer.pinchStateLast.distance / max(1.0, gestureRecognizer.pinchStateStart.distance), + ImageEditorTextItem.kMinScaling, + ImageEditorTextItem.kMaxScaling) + + let newRotationRadians = textItem.rotationRadians + gestureRecognizer.pinchStateLast.angleRadians - gestureRecognizer.pinchStateStart.angleRadians + + let newItem = textItem.copy(withUnitCenter: unitCenter, + scaling: newScaling, + rotationRadians: newRotationRadians) + + if pinchHasChanged { + model.replace(item: newItem, suppressUndo: true) + } else { + model.replace(item: newItem, suppressUndo: false) + pinchHasChanged = true + } + + if gestureRecognizer.state == .ended { + pinchingTextItem = nil + } + default: + pinchingTextItem = nil + } + } + + // MARK: - Editor Gesture + + @objc + public func handleEditorGesture(_ gestureRecognizer: ImageEditorGestureRecognizer) { + AssertIsOnMainThread() + + switch editorMode { + case .none: + handleDefaultGesture(gestureRecognizer) break case .brush: handleBrushGesture(gestureRecognizer) @@ -254,6 +493,65 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { } } + // These properties are valid while moving a text item. + private var movingTextItem: ImageEditorTextItem? + private var movingTextStartUnitLocation = CGPoint.zero + private var movingTextStartUnitCenter = CGPoint.zero + private var movingTextHasMoved = false + + @objc + public func handleDefaultGesture(_ gestureRecognizer: ImageEditorGestureRecognizer) { + AssertIsOnMainThread() + + // We could undo an in-progress move if the gesture is cancelled, but it seems gratuitous. + + switch gestureRecognizer.state { + case .began: + guard let gestureRecognizerView = gestureRecognizer.view else { + owsFailDebug("Missing gestureRecognizer.view.") + return + } + let location = gestureRecognizerView.convert(gestureRecognizer.startLocationInView, to: unitReferenceView) + guard let textLayer = textLayer(forLocation: location) else { + owsFailDebug("No text layer") + return + } + guard let textItem = model.item(forId: textLayer.itemId) as? ImageEditorTextItem else { + owsFailDebug("Missing or invalid text item.") + return + } + movingTextStartUnitLocation = convertToUnit(location: location, + shouldClamp: false) + + movingTextItem = textItem + movingTextStartUnitCenter = textItem.unitCenter + movingTextHasMoved = false + + case .changed, .ended: + guard let textItem = movingTextItem else { + return + } + + let unitLocation = unitSampleForGestureLocation(gestureRecognizer, shouldClamp: false) + let unitLocationDelta = CGPointSubtract(unitLocation, movingTextStartUnitLocation) + let unitCenter = CGPointClamp01(CGPointAdd(movingTextStartUnitCenter, unitLocationDelta)) + let newItem = textItem.copy(withUnitCenter: unitCenter) + + if movingTextHasMoved { + model.replace(item: newItem, suppressUndo: true) + } else { + model.replace(item: newItem, suppressUndo: false) + movingTextHasMoved = true + } + + if gestureRecognizer.state == .ended { + movingTextItem = nil + } + default: + movingTextItem = nil + } + } + // MARK: - Brush // These properties are non-empty while drawing a stroke. @@ -274,7 +572,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { let tryToAppendStrokeSample = { let newSample = self.unitSampleForGestureLocation(gestureRecognizer, shouldClamp: false) if let prevSample = self.currentStrokeSamples.last, - prevSample == newSample { + prevSample == newSample { // Ignore duplicate samples. return } @@ -320,13 +618,22 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { } } + private var unitReferenceView: UIView { + return layersView + } + private func unitSampleForGestureLocation(_ gestureRecognizer: UIGestureRecognizer, shouldClamp: Bool) -> CGPoint { - let referenceView = layersView // TODO: Smooth touch samples before converting into stroke samples. - let location = gestureRecognizer.location(in: referenceView) - var x = CGFloatInverseLerp(location.x, 0, referenceView.bounds.width) - var y = CGFloatInverseLerp(location.y, 0, referenceView.bounds.height) + let location = gestureRecognizer.location(in: unitReferenceView) + return convertToUnit(location: location, + shouldClamp: shouldClamp) + } + + private func convertToUnit(location: CGPoint, + shouldClamp: Bool) -> CGPoint { + var x = CGFloatInverseLerp(location.x, 0, unitReferenceView.bounds.width) + var y = CGFloatInverseLerp(location.y, 0, unitReferenceView.bounds.height) if shouldClamp { x = CGFloatClamp01(x) y = CGFloatClamp01(y) @@ -565,6 +872,12 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { return nil } return strokeLayerForItem(item: strokeItem, viewSize: viewSize) + case .text: + guard let textItem = item as? ImageEditorTextItem else { + owsFailDebug("Item has unexpected type: \(type(of: item)).") + return nil + } + return textLayerForItem(item: textItem, viewSize: viewSize) } } @@ -658,6 +971,50 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { return shapeLayer } + private class func textLayerForItem(item: ImageEditorTextItem, + viewSize: CGSize) -> CALayer? { + AssertIsOnMainThread() + + let layer = EditorTextLayer(itemId: item.itemId) + layer.string = item.text + layer.foregroundColor = item.color.cgColor + layer.font = CGFont(item.font.fontName as CFString) + layer.fontSize = item.font.pointSize + layer.isWrapped = true + layer.alignmentMode = kCAAlignmentCenter + // I don't think we need to enable allowsFontSubpixelQuantization + // or set truncationMode. + + // This text needs to be rendered at a scale that reflects the scaling. + layer.contentsScale = UIScreen.main.scale * item.scaling + + // TODO: Min with measured width. + let maxWidth = viewSize.width * item.unitWidth + let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude) + // TODO: Is there a more accurate way to measure text in a CATextLayer? + // CoreText? + let textBounds = (item.text as NSString).boundingRect(with: maxSize, + options: [ + .usesLineFragmentOrigin, + .usesFontLeading + ], + attributes: [ + .font: item.font + ], + context: nil) + let center = CGPoint(x: viewSize.width * item.unitCenter.x, + y: viewSize.height * item.unitCenter.y) + let layerSize = CGSizeCeil(textBounds.size) + layer.frame = CGRect(origin: CGPoint(x: center.x - layerSize.width * 0.5, + y: center.y - layerSize.height * 0.5), + size: layerSize) + + let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) + layer.setAffineTransform(transform) + + return layer + } + // We apply more than one kind of smoothing. // // This (simple) smoothing reduces jitter from the touch sensor. @@ -700,6 +1057,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { // Render output at same size as source image. let dstSizePixels = model.srcImageSizePixels + let dstScale: CGFloat = 1.0 // The size is specified in pixels, not in points. let hasAlpha = NSData.hasAlpha(forValidImageFilePath: model.currentImagePath) @@ -708,37 +1066,94 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate { return nil } - let dstScale: CGFloat = 1.0 // The size is specified in pixels, not in points. - UIGraphicsBeginImageContextWithOptions(dstSizePixels, !hasAlpha, dstScale) - defer { UIGraphicsEndImageContext() } - - guard let context = UIGraphicsGetCurrentContext() else { - owsFailDebug("Could not create output context.") - return nil - } - context.interpolationQuality = .high - - // Draw source image. - let dstFrame = CGRect(origin: .zero, size: model.srcImageSizePixels) - srcImage.draw(in: dstFrame) - + // We use an UIImageView + UIView.renderAsImage() instead of a CGGraphicsContext + // Because CALayer.renderInContext() doesn't honor CALayer properties like frame, + // transform, etc. + let imageView = UIImageView(image: srcImage) + imageView.frame = CGRect(origin: .zero, size: dstSizePixels) for item in model.items() { guard let layer = layerForItem(item: item, viewSize: dstSizePixels) else { - Logger.error("Couldn't create layer for item.") + Logger.error("Couldn't create layer for item.") + continue + } + layer.contentsScale = dstScale * item.outputScale() + imageView.layer.addSublayer(layer) + } + let image = imageView.renderAsImage(opaque: !hasAlpha, scale: dstScale) + return image + } + + // MARK: - ImageEditorTextViewControllerDelegate + + public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) { + AssertIsOnMainThread() + + isEditingTextItem = false + + guard let text = text?.ows_stripped(), + text.count > 0 else { + if model.has(itemForId: textItem.itemId) { + model.remove(item: textItem) + } + return + } + + // Model items are immutable; we _replace_ the item rather than modify it. + let newItem = textItem.copy(withText: text) + if model.has(itemForId: textItem.itemId) { + model.replace(item: newItem, suppressUndo: false) + } else { + model.append(item: newItem) + } + } + + public func textEditDidCancel() { + isEditingTextItem = false + } + + // MARK: - UIGestureRecognizerDelegate + + @objc public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + guard let editorGestureRecognizer = editorGestureRecognizer else { + owsFailDebug("Missing editorGestureRecognizer.") + return false + } + guard editorGestureRecognizer == gestureRecognizer else { + owsFailDebug("Unexpected gesture.") + return false + } + guard editorMode == .none else { + // We only filter touches when in default mode. + return true + } + + let isInTextArea = textLayer(forTouch: touch) != nil + return isInTextArea + } + + private func textLayer(forTouch touch: UITouch) -> EditorTextLayer? { + let point = touch.location(in: layersView) + return textLayer(forLocation: point) + } + + private func textLayer(forGestureRecognizer gestureRecognizer: UIGestureRecognizer) -> EditorTextLayer? { + let point = gestureRecognizer.location(in: layersView) + return textLayer(forLocation: point) + } + + private func textLayer(forLocation point: CGPoint) -> EditorTextLayer? { + guard let sublayers = layersView.layer.sublayers else { + return nil + } + for layer in sublayers { + guard let textLayer = layer as? EditorTextLayer else { continue } - // This might be superfluous, but ensure that the layer renders - // at "point=pixel" scale. - layer.contentsScale = 1.0 - - layer.render(in: context) + if textLayer.hitTest(point) != nil { + return textLayer + } } - - let scaledImage = UIGraphicsGetImageFromCurrentImageContext() - if scaledImage == nil { - owsFailDebug("could not generate dst image.") - } - return scaledImage + return nil } } diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 2a7f63224..1f94bab21 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -117,6 +117,8 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); + (UIView *)verticalStackWithSubviews:(NSArray *)subviews spacing:(int)spacing; +- (nullable UIViewController *)containingViewController; + #pragma mark - Debugging - (void)addBorderWithColor:(UIColor *)color; diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index babbd3f9f..cff1b3330 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -448,6 +448,19 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) return container; } +- (nullable UIViewController *)containingViewController +{ + UIResponder *responder = self; + while (responder) { + if ([responder isKindOfClass:[UIViewController class]]) { + UIViewController *viewController = (UIViewController *)responder; + return viewController; + } + responder = responder.nextResponder; + } + return nil; +} + #pragma mark - Debugging - (void)addBorderWithColor:(UIColor *)color From 6ac2dd7ea1260a30916a3dc3c7600dbef8cb9cb8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 14:21:32 -0500 Subject: [PATCH 004/493] First draft of image editor's text tool. --- .../xcshareddata/xcschemes/Signal.xcscheme | 17 +++++----- Signal/Signal-Info.plist | 2 +- .../ConversationViewController.m | 26 ++++++++++++++ .../HomeView/HomeViewController.m | 18 ++++++++++ .../Views/ImageEditor/ImageEditorModel.swift | 34 ++++++++----------- .../ImageEditorPinchGestureRecognizer.swift | 5 +++ .../ImageEditorTextViewController.swift | 4 +-- .../src/Network/WebSockets/OWSWebSocket.m | 2 ++ 8 files changed, 76 insertions(+), 32 deletions(-) diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index f5fde70a8..16d93f758 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> @@ -136,8 +136,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - enableThreadSanitizer = "YES" - enableUBSanitizer = "YES" + disableMainThreadChecker = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 319894846..bbc073f5d 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,7 +7,7 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.2 + 10.14.3 WebRTCCommit 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a40183cd2..51c1bf479 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1234,6 +1234,32 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; + + [self showDebugImageEditorAsync]; +} + +- (void)showDebugImageEditorAsync +{ + dispatch_async(dispatch_get_main_queue(), ^{ + NSString *_Nullable filePath = [[NSBundle mainBundle] pathForResource:@"qr@2x" ofType:@"png" inDirectory:nil]; + if (!filePath) { + OWSFailDebug(@"Missing asset."); + } + + DataSource *_Nullable dataSource = + [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO]; + if (!dataSource) { + OWSFailDebug(@"Invalid asset."); + return; + } + + // "Document picker" attachments _SHOULD NOT_ be resized, if possible. + SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource + dataUTI:(NSString *)kUTTypePNG + imageQuality:TSImageQualityOriginal]; + + [self showApprovalDialogForAttachment:attachment]; + }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..02850c1d2 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,8 +482,26 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + [self presentFirstThreadAsync]; } +#ifdef DEBUG + +- (void)presentFirstThreadAsync +{ + dispatch_async(dispatch_get_main_queue(), ^{ + if ([self.tableView numberOfRowsInSection:HomeViewControllerSectionConversations] < 1) { + return; + } + TSThread *thread = + [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; + [self presentThread:thread action:ConversationViewActionNone animated:YES]; + }); +} + +#endif + - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index eb601470c..f7199b6dd 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -68,6 +68,8 @@ public class ImageEditorItem: NSObject { return ImageEditorItem(itemId: itemId, itemType: itemType) } + // The scale with which to render this item's content + // when rendering the "output" image for sending. public func outputScale() -> CGFloat { return 1.0 } @@ -161,6 +163,12 @@ public class ImageEditorTextItem: ImageEditorItem { public static let kDefaultUnitWidth: CGFloat = 0.9 // The max width of the text as a fraction of the image width. + // + // This provides continuity of text layout before/after cropping. + // + // NOTE: When you scale the text with with a pinch gesture, that + // affects _scaling_, not the _unit width_, since we don't want + // to change how the text wraps when scaling. @objc public let unitWidth: CGFloat @@ -176,12 +184,6 @@ public class ImageEditorTextItem: ImageEditorItem { @objc public let scaling: CGFloat - // This might be nil while the item is a "draft" item. - // Once the item has been "committed" to the model, it - // should always be non-nil, - @objc - public let imagePath: String? - @objc public init(color: UIColor, font: UIFont, @@ -189,8 +191,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: ImageEditorSample = CGPoint(x: 0.5, y: 0.5), unitWidth: CGFloat = ImageEditorTextItem.kDefaultUnitWidth, rotationRadians: CGFloat = 0.0, - scaling: CGFloat = 1.0, - imagePath: String? = nil) { + scaling: CGFloat = 1.0) { self.color = color self.font = font self.text = text @@ -198,7 +199,6 @@ public class ImageEditorTextItem: ImageEditorItem { self.unitWidth = unitWidth self.rotationRadians = rotationRadians self.scaling = scaling - self.imagePath = imagePath super.init(itemType: .text) } @@ -210,8 +210,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: ImageEditorSample, unitWidth: CGFloat, rotationRadians: CGFloat, - scaling: CGFloat, - imagePath: String?) { + scaling: CGFloat) { self.color = color self.font = font self.text = text @@ -219,7 +218,6 @@ public class ImageEditorTextItem: ImageEditorItem { self.unitWidth = unitWidth self.rotationRadians = rotationRadians self.scaling = scaling - self.imagePath = imagePath super.init(itemId: itemId, itemType: .text) } @@ -239,8 +237,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: unitCenter, unitWidth: unitWidth, rotationRadians: rotationRadians, - scaling: scaling, - imagePath: imagePath) + scaling: scaling) } @objc @@ -252,8 +249,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: newUnitCenter, unitWidth: unitWidth, rotationRadians: rotationRadians, - scaling: scaling, - imagePath: imagePath) + scaling: scaling) } @objc @@ -267,8 +263,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: newUnitCenter, unitWidth: unitWidth, rotationRadians: newRotationRadians, - scaling: newScaling, - imagePath: imagePath) + scaling: newScaling) } public override func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { @@ -282,8 +277,7 @@ public class ImageEditorTextItem: ImageEditorItem { unitCenter: convertedUnitCenter, unitWidth: convertedUnitWidth, rotationRadians: rotationRadians, - scaling: scaling, - imagePath: imagePath) + scaling: scaling) } public override func outputScale() -> CGFloat { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift index ae7042247..595d7b758 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift @@ -22,6 +22,11 @@ public struct ImageEditorPinchState { } } +// This GR: +// +// * Tries to fail quickly to avoid conflicts with other GRs, especially pans/swipes. +// * Captures a bunch of useful "pinch state" that makes using this GR much easier +// than UIPinchGestureRecognizer. public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { public var pinchStateStart = ImageEditorPinchState.empty() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 75a580646..aaac87099 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -171,8 +171,8 @@ class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { // We use a white cursor since we use a dark background. textView.tintColor = .white textView.returnKeyType = .done - // TODO: - // textView.delegate = self + // TODO: Limit the size of the text. + // textView.delegate = self textView.isScrollEnabled = true textView.scrollsToTop = false textView.isUserInteractionEnabled = true diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index 17d6b7c5a..c93a07d23 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -910,6 +910,8 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O { OWSAssertIsOnMainThread(); + return NO; + // Don't open socket in app extensions. if (!CurrentAppContext().isMainApp) { return NO; From 2f00cbdfeb77c6afa9e5895a5e605180aba12322 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 16:00:22 -0500 Subject: [PATCH 005/493] First draft of image editor's text tool. --- .../xcshareddata/xcschemes/Signal.xcscheme | 17 ++++++------ Signal/Signal-Info.plist | 4 +-- .../ConversationViewController.m | 26 ------------------- .../HomeView/HomeViewController.m | 18 ------------- .../src/Network/WebSockets/OWSWebSocket.m | 2 -- 5 files changed, 11 insertions(+), 56 deletions(-) diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 16d93f758..f5fde70a8 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> @@ -136,7 +136,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - disableMainThreadChecker = "YES" + enableThreadSanitizer = "YES" + enableUBSanitizer = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index bbc073f5d..5cc9da65c 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,9 +7,9 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.3 + 10.14.2 WebRTCCommit - 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 + aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195 M71 CFBundleDevelopmentRegion en diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 51c1bf479..a40183cd2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1234,32 +1234,6 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; - - [self showDebugImageEditorAsync]; -} - -- (void)showDebugImageEditorAsync -{ - dispatch_async(dispatch_get_main_queue(), ^{ - NSString *_Nullable filePath = [[NSBundle mainBundle] pathForResource:@"qr@2x" ofType:@"png" inDirectory:nil]; - if (!filePath) { - OWSFailDebug(@"Missing asset."); - } - - DataSource *_Nullable dataSource = - [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO]; - if (!dataSource) { - OWSFailDebug(@"Invalid asset."); - return; - } - - // "Document picker" attachments _SHOULD NOT_ be resized, if possible. - SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource - dataUTI:(NSString *)kUTTypePNG - imageQuality:TSImageQualityOriginal]; - - [self showApprovalDialogForAttachment:attachment]; - }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 02850c1d2..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,26 +482,8 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - [self presentFirstThreadAsync]; } -#ifdef DEBUG - -- (void)presentFirstThreadAsync -{ - dispatch_async(dispatch_get_main_queue(), ^{ - if ([self.tableView numberOfRowsInSection:HomeViewControllerSectionConversations] < 1) { - return; - } - TSThread *thread = - [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; - [self presentThread:thread action:ConversationViewActionNone animated:YES]; - }); -} - -#endif - - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index c93a07d23..17d6b7c5a 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -910,8 +910,6 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O { OWSAssertIsOnMainThread(); - return NO; - // Don't open socket in app extensions. if (!CurrentAppContext().isMainApp) { return NO; From 73b36c54006c45c31c95fb15c5f5cedd55aefba8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 10:03:32 -0500 Subject: [PATCH 006/493] Respond to CR. --- .../AttachmentApprovalViewController.swift | 17 +++++- .../Views/ImageEditor/ImageEditorModel.swift | 4 +- .../ImageEditorPinchGestureRecognizer.swift | 6 +- .../ImageEditorTextViewController.swift | 2 +- .../Views/ImageEditor/ImageEditorView.swift | 55 +++++-------------- SignalMessaging/categories/UIView+OWS.h | 2 - SignalMessaging/categories/UIView+OWS.m | 13 ----- SignalMessaging/categories/UIView+OWS.swift | 29 ++++++++++ SignalMessaging/utils/UIImage+OWS.swift | 17 +----- 9 files changed, 64 insertions(+), 81 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 565a7e94a..fc0442660 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -941,7 +941,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD if let imageEditorModel = attachmentItem.imageEditorModel, let imageMediaView = mediaMessageView.contentView { - let imageEditorView = ImageEditorView(model: imageEditorModel) + let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) if imageEditorView.configureSubviews() { mediaMessageView.isHidden = true @@ -1319,6 +1319,19 @@ extension AttachmentPrepViewController: UIScrollViewDelegate { // MARK: - +extension AttachmentPrepViewController: ImageEditorViewDelegate { + public func imageEditor(presentFullScreenOverlay viewController: UIViewController) { + + let navigationController = OWSNavigationController(rootViewController: viewController) + navigationController.modalPresentationStyle = .overFullScreen + self.present(navigationController, animated: true) { + // Do nothing. + } + } +} + +// MARK: - + class BottomToolView: UIView { let mediaMessageTextToolbar: MediaMessageTextToolbar let galleryRailView: GalleryRailView @@ -1338,7 +1351,7 @@ class BottomToolView: UIView { super.init(frame: .zero) - // Specifying autorsizing mask and an intrinsic content size allows proper + // Specifying auto-resizing mask and an intrinsic content size allows proper // sizing when used as an input accessory view. self.autoresizingMask = .flexibleHeight self.translatesAutoresizingMaskIntoConstraints = false diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f7199b6dd..900875e87 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -144,8 +144,6 @@ public class ImageEditorStrokeItem: ImageEditorItem { @objc public class ImageEditorTextItem: ImageEditorItem { - // Until we need to serialize these items, - // just use UIColor. @objc public let color: UIColor @@ -188,7 +186,7 @@ public class ImageEditorTextItem: ImageEditorItem { public init(color: UIColor, font: UIFont, text: String, - unitCenter: ImageEditorSample = CGPoint(x: 0.5, y: 0.5), + unitCenter: ImageEditorSample = ImageEditorSample(x: 0.5, y: 0.5), unitWidth: CGFloat = ImageEditorTextItem.kDefaultUnitWidth, rotationRadians: CGFloat = 0.0, scaling: CGFloat = 1.0) { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift index 595d7b758..b6ee17690 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift @@ -17,7 +17,7 @@ public struct ImageEditorPinchState { self.angleRadians = angleRadians } - static func empty() -> ImageEditorPinchState { + static var empty: ImageEditorPinchState { return ImageEditorPinchState(centroid: .zero, distance: 1.0, angleRadians: 0) } } @@ -29,9 +29,9 @@ public struct ImageEditorPinchState { // than UIPinchGestureRecognizer. public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { - public var pinchStateStart = ImageEditorPinchState.empty() + public var pinchStateStart = ImageEditorPinchState.empty - public var pinchStateLast = ImageEditorPinchState.empty() + public var pinchStateLast = ImageEditorPinchState.empty // MARK: - Touch Handling diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index aaac87099..4fa208637 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -153,7 +153,7 @@ class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { self.view.addSubview(textView) textView.autoPinTopToSuperviewMargin() textView.autoHCenterInSuperview() - // In order to having text wrapping be as WYSIWYG as possible, we limit the text view + // In order to have text wrapping be as WYSIWYG as possible, we limit the text view // to the max text width on the image. let maxTextWidthPoints = max(self.maxTextWidthPoints, 200) textView.autoSetDimension(.width, toSize: maxTextWidthPoints, relation: .lessThanOrEqual) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 94da61b12..a0f27a3e7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -4,35 +4,6 @@ import UIKit -extension UIView { - public func renderAsImage() -> UIImage? { - return renderAsImage(opaque: false, scale: UIScreen.main.scale) - } - - public func renderAsImage(opaque: Bool, scale: CGFloat) -> UIImage? { - if #available(iOS 10, *) { - let format = UIGraphicsImageRendererFormat() - format.scale = scale - format.opaque = opaque - let renderer = UIGraphicsImageRenderer(bounds: self.bounds, - format: format) - return renderer.image { (context) in - self.layer.render(in: context.cgContext) - } - } else { - UIGraphicsBeginImageContextWithOptions(bounds.size, opaque, scale) - if let _ = UIGraphicsGetCurrentContext() { - drawHierarchy(in: bounds, afterScreenUpdates: true) - let image = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - return image - } - owsFailDebug("Could not create graphics context.") - return nil - } - } -} - private class EditorTextLayer: CATextLayer { let itemId: String @@ -50,11 +21,20 @@ private class EditorTextLayer: CATextLayer { // MARK: - +@objc +public protocol ImageEditorViewDelegate: class { + func imageEditor(presentFullScreenOverlay viewController: UIViewController) +} + +// MARK: - + // A view for editing outgoing image attachments. // It can also be used to render the final output. @objc public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextViewControllerDelegate, UIGestureRecognizerDelegate { + weak var delegate: ImageEditorViewDelegate? + private let model: ImageEditorModel enum EditorMode: String { @@ -76,8 +56,9 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV private var currentColor = ImageEditorView.defaultColor @objc - public required init(model: ImageEditorModel) { + public required init(model: ImageEditorModel, delegate: ImageEditorViewDelegate) { self.model = model + self.delegate = delegate super.init(frame: .zero) @@ -393,21 +374,12 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV toggle(editorMode: .none) - guard let viewController = self.containingViewController() else { - owsFailDebug("Can't find view controller.") - return - } - isEditingTextItem = true let maxTextWidthPoints = imageView.width() * ImageEditorTextItem.kDefaultUnitWidth let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) - let navigationController = OWSNavigationController(rootViewController: textEditor) - navigationController.modalPresentationStyle = .overFullScreen - viewController.present(navigationController, animated: true) { - // Do nothing. - } + self.delegate?.imageEditor(presentFullScreenOverlay: textEditor) } // MARK: - Pinch Gesture @@ -985,7 +957,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV // I don't think we need to enable allowsFontSubpixelQuantization // or set truncationMode. - // This text needs to be rendered at a scale that reflects the scaling. + // This text needs to be rendered at a scale that reflects the sceen scaling + // AND the item's scaling. layer.contentsScale = UIScreen.main.scale * item.scaling // TODO: Min with measured width. diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 1f94bab21..2a7f63224 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -117,8 +117,6 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); + (UIView *)verticalStackWithSubviews:(NSArray *)subviews spacing:(int)spacing; -- (nullable UIViewController *)containingViewController; - #pragma mark - Debugging - (void)addBorderWithColor:(UIColor *)color; diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index cff1b3330..babbd3f9f 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -448,19 +448,6 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) return container; } -- (nullable UIViewController *)containingViewController -{ - UIResponder *responder = self; - while (responder) { - if ([responder isKindOfClass:[UIViewController class]]) { - UIViewController *viewController = (UIViewController *)responder; - return viewController; - } - responder = responder.nextResponder; - } - return nil; -} - #pragma mark - Debugging - (void)addBorderWithColor:(UIColor *)color diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 1ea3c908c..1e826eb0a 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -44,3 +44,32 @@ public extension UINavigationController { CATransaction.commit() } } + +extension UIView { + public func renderAsImage() -> UIImage? { + return renderAsImage(opaque: false, scale: UIScreen.main.scale) + } + + public func renderAsImage(opaque: Bool, scale: CGFloat) -> UIImage? { + if #available(iOS 10, *) { + let format = UIGraphicsImageRendererFormat() + format.scale = scale + format.opaque = opaque + let renderer = UIGraphicsImageRenderer(bounds: self.bounds, + format: format) + return renderer.image { (context) in + self.layer.render(in: context.cgContext) + } + } else { + UIGraphicsBeginImageContextWithOptions(bounds.size, opaque, scale) + if let _ = UIGraphicsGetCurrentContext() { + drawHierarchy(in: bounds, afterScreenUpdates: true) + let image = UIGraphicsGetImageFromCurrentImageContext() + UIGraphicsEndImageContext() + return image + } + owsFailDebug("Could not create graphics context.") + return nil + } + } +} diff --git a/SignalMessaging/utils/UIImage+OWS.swift b/SignalMessaging/utils/UIImage+OWS.swift index 6ad19b9d3..e675d22f1 100644 --- a/SignalMessaging/utils/UIImage+OWS.swift +++ b/SignalMessaging/utils/UIImage+OWS.swift @@ -5,27 +5,12 @@ import Foundation extension UIImage { - - private func image(with view: UIView) -> UIImage? { - UIGraphicsBeginImageContextWithOptions(view.bounds.size, view.isOpaque, 0.0) - defer { UIGraphicsEndImageContext() } - - guard let context = UIGraphicsGetCurrentContext() else { - owsFailDebug("context was unexpectedly nil") - return nil - } - - view.layer.render(in: context) - let image = UIGraphicsGetImageFromCurrentImageContext() - return image - } - @objc public func asTintedImage(color: UIColor) -> UIImage? { let template = self.withRenderingMode(.alwaysTemplate) let imageView = UIImageView(image: template) imageView.tintColor = color - return image(with: imageView) + return imageView.renderAsImage(opaque: imageView.isOpaque, scale: UIScreen.main.scale) } } From 0d5d5c6932b3e04a7f5f57087d5215c3a2a3bbc5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 10:04:56 -0700 Subject: [PATCH 007/493] limit reason length --- .../src/Contacts/ContactDiscoveryService.m | 2 +- .../src/Network/API/Requests/OWSRequestFactory.m | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index e34114488..cb373c9ed 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -406,7 +406,7 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re OWSAssertDebug(enclaveId.length > 0); if (![response isKindOfClass:[NSHTTPURLResponse class]]) { - OWSFailDebug(@"unexpected response type."); + *error = ContactDiscoveryServiceErrorMakeWithReason(ContactDiscoveryServiceErrorAssertionError, @"unexpected response type."); return nil; } NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response; diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index c9e394a96..1b0c08600 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -498,7 +498,15 @@ NS_ASSUME_NONNULL_BEGIN if (reason == nil) { parameters = @{}; } else { - parameters = @{ @"reason": reason }; + const NSUInteger kServerReasonLimit = 1000; + NSString *limitedReason; + if (reason.length < kServerReasonLimit) { + limitedReason = reason; + } else { + OWSFailDebug(@"failure: reason should be under 1000"); + limitedReason = [reason substringToIndex:kServerReasonLimit - 1]; + } + parameters = @{ @"reason": limitedReason }; } NSString *path = [NSString stringWithFormat:@"/v1/directory/feedback-v2/%@", status]; return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"PUT" parameters:parameters]; From 273974880d9a20c3ac12f85f74a168e657c19bc4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:41:06 -0500 Subject: [PATCH 008/493] Update Signal info plist. --- Signal/Signal-Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5cc9da65c..bbc073f5d 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,9 +7,9 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.2 + 10.14.3 WebRTCCommit - aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195 M71 + 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 CFBundleDevelopmentRegion en From a1b412c704380d9bef1c455c297198bd1c3b0bc0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 8 Feb 2019 16:20:48 -0700 Subject: [PATCH 009/493] Fix "missed calls" not sorting threads Ensure we touch thread after saving *any* interaction --- SignalServiceKit/src/Contacts/TSThread.m | 2 ++ .../src/Messages/Interactions/TSErrorMessage.m | 1 - .../Messages/Interactions/TSIncomingMessage.m | 1 - .../src/Messages/Interactions/TSInfoMessage.m | 1 - .../src/Messages/Interactions/TSInteraction.m | 14 +++++++++++--- .../src/Messages/Interactions/TSMessage.m | 17 ----------------- SignalServiceKit/src/Messages/TSCall.m | 6 +----- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m index e7d0952f2..441557ff9 100644 --- a/SignalServiceKit/src/Contacts/TSThread.m +++ b/SignalServiceKit/src/Contacts/TSThread.m @@ -429,6 +429,8 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa if (!self.shouldThreadBeVisible) { self.shouldThreadBeVisible = YES; [self saveWithTransaction:transaction]; + } else { + [self touchWithTransaction:transaction]; } } diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m index e8b9e2e05..63e37e645 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m @@ -218,7 +218,6 @@ NSUInteger TSErrorMessageSchemaVersion = 1; OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp); _read = YES; [self saveWithTransaction:transaction]; - [self touchThreadWithTransaction:transaction]; // Ignore sendReadReceipt - it doesn't apply to error messages. } diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m index f2646edad..7e01e11e7 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m @@ -158,7 +158,6 @@ NS_ASSUME_NONNULL_BEGIN secondsAgoRead); _read = YES; [self saveWithTransaction:transaction]; - [self touchThreadWithTransaction:transaction]; [transaction addCompletionQueue:nil completionBlock:^{ diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m index cf3ab1f7d..2220fbc3c 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m @@ -181,7 +181,6 @@ NSUInteger TSInfoMessageSchemaVersion = 1; OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp); _read = YES; [self saveWithTransaction:transaction]; - [self touchThreadWithTransaction:transaction]; // Ignore sendReadReceipt, it doesn't apply to info messages. } diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m index ace9b4a8a..b40632d37 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m +++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSInteraction.h" @@ -160,8 +160,16 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value) - (void)touchThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { - TSThread *thread = [TSThread fetchObjectWithUniqueID:self.uniqueThreadId transaction:transaction]; - [thread touchWithTransaction:transaction]; + [transaction touchObjectForKey:self.uniqueThreadId inCollection:[TSThread collection]]; +} + +- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction + changeBlock:(void (^)(id))changeBlock +{ + OWSAssertDebug(transaction); + + [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock]; + [self touchThreadWithTransaction:transaction]; } #pragma mark Date operations diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index 296348678..c51a4919e 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -370,14 +370,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4; } [attachment removeWithTransaction:transaction]; }; - - // Updates inbox thread preview - [self touchThreadWithTransaction:transaction]; -} - -- (void)touchThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction -{ - [transaction touchObjectForKey:self.uniqueThreadId inCollection:[TSThread collection]]; } - (BOOL)isExpiringMessage @@ -416,15 +408,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4; #pragma mark - Update With... Methods -- (void)applyChangeToSelfAndLatestCopy:(YapDatabaseReadWriteTransaction *)transaction - changeBlock:(void (^)(id))changeBlock -{ - OWSAssertDebug(transaction); - - [super applyChangeToSelfAndLatestCopy:transaction changeBlock:changeBlock]; - [self touchThreadWithTransaction:transaction]; -} - - (void)updateWithExpireStartedAt:(uint64_t)expireStartedAt transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssertDebug(expireStartedAt > 0); diff --git a/SignalServiceKit/src/Messages/TSCall.m b/SignalServiceKit/src/Messages/TSCall.m index 67c6fcc98..f6c2cba18 100644 --- a/SignalServiceKit/src/Messages/TSCall.m +++ b/SignalServiceKit/src/Messages/TSCall.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSCall.h" @@ -144,7 +144,6 @@ NSUInteger TSCallCurrentSchemaVersion = 1; OWSLogDebug(@"marking as read uniqueId: %@ which has timestamp: %llu", self.uniqueId, self.timestamp); _read = YES; [self saveWithTransaction:transaction]; - [self touchThreadWithTransaction:transaction]; // Ignore sendReadReceipt - it doesn't apply to calls. } @@ -171,9 +170,6 @@ NSUInteger TSCallCurrentSchemaVersion = 1; _callType = callType; [self saveWithTransaction:transaction]; - - // redraw any thread-related unread count UI. - [self touchThreadWithTransaction:transaction]; } @end From af475aa1e49a5f1688cb42353784c13c270e512c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 8 Feb 2019 14:45:00 -0700 Subject: [PATCH 010/493] update registration state on main thread --- .../src/Network/API/TSNetworkManager.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index bf7dd8503..677b95473 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -513,12 +513,14 @@ dispatch_queue_t NetworkManagerQueue() // * etc. if ([task.originalRequest.URL.absoluteString hasPrefix:textSecureServerURL] && request.shouldHaveAuthorizationHeaders) { - if (self.tsAccountManager.isRegisteredAndReady) { - [self.tsAccountManager setIsDeregistered:YES]; - } else { - OWSFailDebug( - @"Ignoring auth failure; not registered and ready: %@.", task.originalRequest.URL.absoluteString); - } + dispatch_async(dispatch_get_main_queue(), ^{ + if (self.tsAccountManager.isRegisteredAndReady) { + [self.tsAccountManager setIsDeregistered:YES]; + } else { + OWSFailDebug( + @"Ignoring auth failure; not registered and ready: %@.", task.originalRequest.URL.absoluteString); + } + }); } else { OWSLogWarn(@"Ignoring %d for URL: %@", (int)statusCode, task.originalRequest.URL.absoluteString); } From cb3a36ba3d2b50af416a4dd8c3ec83d25df6275e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 16:57:37 -0700 Subject: [PATCH 011/493] Platform specific notification clearing --- Signal/src/AppDelegate.m | 5 +++-- .../LegacyNotificationsAdaptee.swift | 7 +++++++ Signal/src/environment/SignalApp.h | 1 - Signal/src/environment/SignalApp.m | 18 ++---------------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index ca35cfd8b..a12247045 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -732,7 +732,7 @@ static NSTimeInterval launchStartedAt; OWSLogInfo(@"running post launch block for unregistered user."); // Unregistered user should have no unread messages. e.g. if you delete your account. - [SignalApp clearAllNotifications]; + [AppEnvironment.shared.notificationPresenter clearAllNotifications]; [self.socketManager requestSocketOpen]; @@ -791,6 +791,7 @@ static NSTimeInterval launchStartedAt; OWSLogWarn(@"applicationWillResignActive."); [self updateShouldEnableLandscape]; + [self clearAllNotificationsAndRestoreBadgeCount]; [DDLog flushLog]; } @@ -799,8 +800,8 @@ static NSTimeInterval launchStartedAt; { OWSAssertIsOnMainThread(); - [SignalApp clearAllNotifications]; [AppReadiness runNowOrWhenAppDidBecomeReady:^{ + [AppEnvironment.shared.notificationPresenter clearAllNotifications]; [OWSMessageUtils.sharedManager updateApplicationBadgeCount]; }]; } diff --git a/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift index 5ec257521..cc326e3b3 100644 --- a/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift @@ -222,6 +222,13 @@ extension LegacyNotificationPresenterAdaptee: NotificationPresenterAdaptee { for (_, notification) in notifications { cancelNotification(notification) } + // This will cancel all "scheduled" local notifications that haven't + // been presented yet. + UIApplication.shared.cancelAllLocalNotifications() + // To clear all already presented local notifications, we need to + // set the app badge number to zero after setting it to a non-zero value. + UIApplication.shared.applicationIconBadgeNumber = 1 + UIApplication.shared.applicationIconBadgeNumber = 0 } } diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h index ebf2ae8a4..b3b5fb9dc 100644 --- a/Signal/src/environment/SignalApp.h +++ b/Signal/src/environment/SignalApp.h @@ -50,7 +50,6 @@ NS_ASSUME_NONNULL_BEGIN + (void)resetAppData; -+ (void)clearAllNotifications; - (void)showHomeView; diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 1b7f2a2df..1eb5f764b 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "SignalApp.h" @@ -138,26 +138,12 @@ NS_ASSUME_NONNULL_BEGIN [OWSStorage resetAllStorage]; [OWSUserProfile resetProfileStorage]; [Environment.shared.preferences clear]; - - [self clearAllNotifications]; + [AppEnvironment.shared.notificationPresenter clearAllNotifications]; [DebugLogger.sharedLogger wipeLogs]; exit(0); } -+ (void)clearAllNotifications -{ - OWSLogInfo(@"clearAllNotifications."); - - // This will cancel all "scheduled" local notifications that haven't - // been presented yet. - [UIApplication.sharedApplication cancelAllLocalNotifications]; - // To clear all already presented local notifications, we need to - // set the app badge number to zero after setting it to a non-zero value. - [UIApplication sharedApplication].applicationIconBadgeNumber = 1; - [UIApplication sharedApplication].applicationIconBadgeNumber = 0; -} - - (void)showHomeView { HomeViewController *homeView = [HomeViewController new]; From 5e0c10a1a9cce1abf8eb891192e18955918da328 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 17:11:27 -0700 Subject: [PATCH 012/493] remove any lingering legacy notifications in modern notification adapter --- .../Notifications/LegacyNotificationsAdaptee.swift | 4 ++++ .../Notifications/UserNotificationsAdaptee.swift | 1 + 2 files changed, 5 insertions(+) diff --git a/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift index cc326e3b3..f44aac478 100644 --- a/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/LegacyNotificationsAdaptee.swift @@ -222,6 +222,10 @@ extension LegacyNotificationPresenterAdaptee: NotificationPresenterAdaptee { for (_, notification) in notifications { cancelNotification(notification) } + type(of: self).clearExistingNotifications() + } + + public class func clearExistingNotifications() { // This will cancel all "scheduled" local notifications that haven't // been presented yet. UIApplication.shared.cancelAllLocalNotifications() diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index 6b037c8aa..412ed633c 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -181,6 +181,7 @@ extension UserNotificationPresenterAdaptee: NotificationPresenterAdaptee { AssertIsOnMainThread() notificationCenter.removeAllPendingNotificationRequests() notificationCenter.removeAllDeliveredNotifications() + LegacyNotificationPresenterAdaptee.clearExistingNotifications() } func shouldPresentNotification(category: AppNotificationCategory, userInfo: [AnyHashable: Any]) -> Bool { From eae341a72382c309fd69a384d55ce4169c730ce0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 17:20:39 -0700 Subject: [PATCH 013/493] sync translations --- .../translations/ca.lproj/Localizable.strings | 10 +- .../translations/cs.lproj/Localizable.strings | 176 +++++++++--------- .../translations/da.lproj/Localizable.strings | 26 +-- .../translations/el.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 4 +- .../translations/et.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 10 +- .../translations/he.lproj/Localizable.strings | 10 +- .../translations/it.lproj/Localizable.strings | 10 +- .../translations/nb.lproj/Localizable.strings | 10 +- .../translations/nl.lproj/Localizable.strings | 20 +- .../translations/pl.lproj/Localizable.strings | 10 +- .../pt_BR.lproj/Localizable.strings | 26 +-- .../translations/sv.lproj/Localizable.strings | 12 +- .../translations/tr.lproj/Localizable.strings | 20 +- .../zh_CN.lproj/Localizable.strings | 10 +- 16 files changed, 179 insertions(+), 179 deletions(-) diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 2feb281f8..5aed148c1 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Es necessita accés al micròfon"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Trucada entrant"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Telefona"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Trucada perduda perquè el número de seguretat de l'emissor ha canviat."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Trucada perduda"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Sense resposta"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Membre"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ a %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nom d'aquest grup"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Envia"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "El teu missatge no s'ha enviat."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Ha fallat l'enviament de la invitació, torneu a provar-ho més tard."; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 6d683556f..fe3f85752 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -8,7 +8,7 @@ "ACTION_AUDIO_CALL" = "Hovor Signal"; /* Label for 'invite' button in contact view. */ -"ACTION_INVITE" = "Pozvat do aplikace Signal"; +"ACTION_INVITE" = "Pozvat do Signalu"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ @@ -60,7 +60,7 @@ "APN_Message" = "Nová zpráva!"; /* Message for the 'app launch failed' alert. */ -"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Aplikaci Signal nelze spustit. Odešlete prosím debug log na support@signal.org, pokusíme se problém opravit."; +"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal nelze spustit. Odešlete prosím debug log na support@signal.org, pokusíme se problém opravit."; /* Title for the 'app launch failed' alert. */ "APP_LAUNCH_FAILURE_ALERT_TITLE" = "Chyba"; @@ -75,7 +75,7 @@ "APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "V App Storu je nyní dostupná verze %@."; /* Title for the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_TITLE" = "Je dostupná nová verze aplikace Signal"; +"APP_UPDATE_NAG_ALERT_TITLE" = "Je dostupná nová verze Signalu"; /* Label for the 'update' button in the 'new app version available' alert. */ "APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "Aktualizovat"; @@ -294,7 +294,7 @@ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "Zablokovat %@?"; /* An explanation of the consequences of blocking another user. */ -"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Zablokovaní uživatelé vám nebudou moci zavolat nebo vám posílat zprávy."; +"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Zablokovaní uživatelé vám nebudou moci zavolat nebo posílat zprávy."; /* Label for 'continue' button. */ "BUTTON_CONTINUE" = "Pokračovat"; @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Vyžadován přístup k mikrofonu"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Příchozí hovor"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Zavolat"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Zmeškaný hovor. Změnilo se bezpečnostní číslo volajícího."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Zmeškaný hovor"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Žádná odpověď"; @@ -363,10 +363,10 @@ "CALL_VIEW_MUTE_LABEL" = "Ztlumit"; /* Reminder to the user of the benefits of enabling CallKit and disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Můžete povolit integraci s iOS hovory v nastavení soukromí aplikace Signal, abyste mohli přijímat příchozí hovory ze zamčené obrazovky."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Můžete povolit integraci s iOS hovory v nastavení soukromí Signalu, abyste mohli přijímat příchozí hovory ze zamčené obrazovky."; /* Reminder to the user of the benefits of disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Můžete povolit integraci s iOS hovory v nastavení soukromí aplikace Signal, abyste mohli vidět jméno a telefonní číslo pro příchozí hovory."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Můžete povolit integraci s iOS hovory v nastavení soukromí Signalu, abyste uviděli jméno a telefonní číslo příchozích hovorů."; /* Label for button that dismiss the call view's settings nag. */ "CALL_VIEW_SETTINGS_NAG_NOT_NOW_BUTTON" = "Nyní ne"; @@ -375,13 +375,13 @@ "CALL_VIEW_SETTINGS_NAG_SHOW_CALL_SETTINGS" = "Zobrazit nastavení soukromí"; /* Accessibility label to toggle front- vs. rear-facing camera */ -"CALL_VIEW_SWITCH_CAMERA_DIRECTION" = "Přepnout kameru"; +"CALL_VIEW_SWITCH_CAMERA_DIRECTION" = "Převrátit kameru"; /* Accessibility label to switch to audio only */ "CALL_VIEW_SWITCH_TO_AUDIO_LABEL" = "Přepnout na audio hovor"; /* Accessibility label to switch to video call */ -"CALL_VIEW_SWITCH_TO_VIDEO_LABEL" = "Přepnout na video hovor"; +"CALL_VIEW_SWITCH_TO_VIDEO_LABEL" = "Přepnout na videohovor"; /* Label for the 'return to call' banner. */ "CALL_WINDOW_RETURN_TO_CALL" = "Klepněte pro návrat k hovoru"; @@ -390,7 +390,7 @@ "CALLBACK_BUTTON_TITLE" = "Zavolat zpět"; /* The generic name used for calls if CallKit privacy is enabled */ -"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Uživatel aplikace Signal"; +"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Uživatel Signalu"; /* Message for alert explaining that a user cannot be verified. */ "CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Tento uživatel nemůže být ověřen, dokud neodešlete zprávu."; @@ -414,13 +414,13 @@ "CHECK_FOR_BACKUP_RESTORE" = "Obnovení"; /* Error indicating that the app could not determine that user's iCloud account status */ -"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "Nebylo možné zjistit stav účtu iCloud. Přihlašte se do svého účtu iCloud v nastavení iOS pro zálohování dat v Signalu."; +"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "Nebylo možné zjistit stav účtu iCloud. Přihlašte se do svého účtu iCloud v nastavení iOS pro zálohování dat Signalu."; /* Error indicating that user does not have an iCloud account. */ -"CLOUDKIT_STATUS_NO_ACCOUNT" = "Žádný účet iCloud. Přihlašte se do svého účtu iCloud v nastavení iOS pro zálohování dat v Signalu."; +"CLOUDKIT_STATUS_NO_ACCOUNT" = "Žádný účet iCloud. Přihlašte se do svého účtu iCloud v nastavení iOS pro zálohování dat Signalu."; /* Error indicating that the app was prevented from accessing the user's iCloud account. */ -"CLOUDKIT_STATUS_RESTRICTED" = "Signalu byl odepřen přístup k účtu iCloud pro vytvoření zálohy. Povolte Signalu přístup k vašemu účtu iCloud v nastavení iOS pro zálohování dat."; +"CLOUDKIT_STATUS_RESTRICTED" = "Signalu byl odepřen přístup k účtu iCloud pro vytvoření zálohy. Pro zálohování dat povolte Signalu přístup k vašemu účtu iCloud v nastavení iOS."; /* The first of two messages demonstrating the chosen conversation color, by rendering this message in an outgoing message bubble. */ "COLOR_PICKER_DEMO_MESSAGE_1" = "Vyberte barvu odchozích zpráv v této konverzaci."; @@ -486,7 +486,7 @@ "CONTACT_EDIT_NAME_BUTTON" = "Upravit"; /* Label for a contact's email address. */ -"CONTACT_EMAIL" = "Email"; +"CONTACT_EMAIL" = "E-mail"; /* Label for the 'city' field of a contact's address. */ "CONTACT_FIELD_ADDRESS_CITY" = "Město"; @@ -516,13 +516,13 @@ "CONTACT_FIELD_GIVEN_NAME" = "Křestní jméno"; /* Label for the 'middle name' field of a contact. */ -"CONTACT_FIELD_MIDDLE_NAME" = "Prostřední jméno"; +"CONTACT_FIELD_MIDDLE_NAME" = "Druhé jméno"; /* Label for the 'name prefix' field of a contact. */ -"CONTACT_FIELD_NAME_PREFIX" = "Titul před jménem"; +"CONTACT_FIELD_NAME_PREFIX" = "Před jménem"; /* Label for the 'name suffix' field of a contact. */ -"CONTACT_FIELD_NAME_SUFFIX" = "Titul za jménem"; +"CONTACT_FIELD_NAME_SUFFIX" = "Za jménem"; /* Label for the 'organization' field of a contact. */ "CONTACT_FIELD_ORGANIZATION" = "Organizace"; @@ -552,7 +552,7 @@ "CONTACT_SHARE_NO_FIELDS_SELECTED" = "Nebylo vybráno žádné pole kontaktu."; /* Label for 'open address in maps app' button in contact view. */ -"CONTACT_VIEW_OPEN_ADDRESS_IN_MAPS_APP" = "Otevřít v mapách"; +"CONTACT_VIEW_OPEN_ADDRESS_IN_MAPS_APP" = "Otevřít v Mapách"; /* Label for 'open email in email app' button in contact view. */ "CONTACT_VIEW_OPEN_EMAIL_IN_EMAIL_APP" = "Poslat email"; @@ -570,7 +570,7 @@ "CONVERSATION_SETTINGS" = "Nastavení konverzace"; /* Label for 'new contact' button in conversation settings view. */ -"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Přidat k existujícímu kontaktu"; +"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Přidat ke kontaktu"; /* table cell label in conversation settings */ "CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Zablokovat tuto skupinu"; @@ -594,7 +594,7 @@ "CONVERSATION_SETTINGS_MUTE_LABEL" = "Ztlumit"; /* Indicates that the current thread is not muted. */ -"CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Neztlumen"; +"CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Není ztlumeno"; /* Label for button to mute a thread for a day. */ "CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION" = "Ztlumit na den"; @@ -672,7 +672,7 @@ "DATABASE_VIEW_OVERLAY_SUBTITLE" = "Toto může pár minut trvat."; /* Title shown while the app is updating its database. */ -"DATABASE_VIEW_OVERLAY_TITLE" = "Optimalizuji databázi"; +"DATABASE_VIEW_OVERLAY_TITLE" = "Optimalizace databáze"; /* Format string for a relative time, expressed as a certain number of hours in the past. Embeds {{The number of hours}}. */ "DATE_HOURS_AGO_FORMAT" = "před %@h"; @@ -739,7 +739,7 @@ "DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Znovu zaregistrovat toto telefonní číslo"; /* Label warning the user that they have been de-registered. */ -"DEREGISTRATION_WARNING" = "Zařízení již není registrováno. Vaše telefonní číslo může být registrováno v aplikaci Signal na jiném zařízení. Klepněte pro opětovnou registraci."; +"DEREGISTRATION_WARNING" = "Zařízení již není registrováno. Je možné, že je vaše telefonní číslo registrováno v aplikaci Signal na jiném zařízení. Klepněte pro opětovnou registraci."; /* {{Short Date}} when device last communicated with Signal Server. */ "DEVICE_LAST_ACTIVE_AT_LABEL" = "Naposledy aktivní: %@"; @@ -757,7 +757,7 @@ "DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Zprávy v konverzaci zmizí za %@."; /* subheading in conversation settings */ -"DISAPPEARING_MESSAGES_DESCRIPTION" = "Pokud je povoleno, odeslané a přiaté zprávy v této konverzaci zmizí, jakmile budou viděny."; +"DISAPPEARING_MESSAGES_DESCRIPTION" = "Pokud je povoleno, odeslané a přijaté zprávy v této konverzaci zmizí, jakmile budou zobrazeny."; /* Accessibility hint that contains current timeout information */ "DISAPPEARING_MESSAGES_HINT" = "Nyní zprávy zmizí po %@"; @@ -775,7 +775,7 @@ "EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Můžete povolit přístup v nastavení iOS."; /* Alert title for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Aplikace Signal pro úpravu informací kontaktu vyžaduje přístup ke kontaktům."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Signal pro úpravu informací o kontaktu vyžaduje přístup ke kontaktům."; /* table cell label in conversation settings */ "EDIT_GROUP_ACTION" = "Upravit skupinu"; @@ -799,7 +799,7 @@ "EDIT_GROUP_UPDATE_BUTTON" = "Aktualizovat"; /* The alert message if user tries to exit update group view without saving changes. */ -"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Chcete uložit změny vykonané na této skupině?"; +"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Změnil(a) jste tuto skupinu. Chcete tyto změny uložit?"; /* The alert title if user tries to exit update group view without saving changes. */ "EDIT_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "Neuložené změny"; @@ -823,7 +823,7 @@ "EMPTY_ARCHIVE_TITLE" = "Vyčistit váš seznam konverzací."; /* Full width label displayed when attempting to compose message */ -"EMPTY_CONTACTS_LABEL_LINE1" = "Žádný z vašich kontaktů nemá aplikaci Signal."; +"EMPTY_CONTACTS_LABEL_LINE1" = "Žádný z vašich kontaktů nemá Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Proč někoho nepozvete?"; @@ -832,13 +832,13 @@ "EMPTY_INBOX_NEW_USER_TEXT" = "Klepněte na tlačítko vytvořit."; /* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Zahajte vaši první konverzaci Signal!"; +"EMPTY_INBOX_NEW_USER_TITLE" = "Začněte vaši první konverzaci na Signalu!"; /* Body text an existing user sees when viewing an empty inbox */ "EMPTY_INBOX_TEXT" = "Nula nula nic."; /* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Schránka prázdná, nikde nic."; +"EMPTY_INBOX_TITLE" = "Schránka prázdná, velký kulový."; /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Potvrďte Váš PIN."; @@ -862,13 +862,13 @@ "ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "Zadaný PIN nesouhlasí."; /* Indicates that user should select a 'two factor auth pin'. */ -"ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Zadejte PIN registrace. Při změně přístroje s tímto telefonním číslem budete na tento PIN dotázán."; +"ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Zadejte PIN zámku registrace. Při příští registraci pod tímto telefonním číslem budete na PIN dotázán(a)."; /* Indicates that user has 'two factor auth pin' disabled. */ -"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Pro zvýšení bezpečnosti zapněte registrační PIN, který bude vyžadován při změně přístroje s tímto telefonním číslem v aplikaci Signal."; +"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Pro zvýšení bezpečnosti povolte PIN zámku registrace, který bude v aplikaci Signal vyžadován při příští registraci pod tímto telefonním číslem."; /* Indicates that user has 'two factor auth pin' enabled. */ -"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "Registrační zámek je povolen. Budete požádán(a) o zadání PINu při změně přístroje s tímto telefonním číslem v aplikaci Signal."; +"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "Zámek registrace je povolen. Budete požádán(a) o zadání PINu při příští registraci pod tímto telefonním číslem."; /* Title for the 'enable two factor auth PIN' views. */ "ENABLE_2FA_VIEW_TITLE" = "Zámek registrace"; @@ -880,7 +880,7 @@ "END_CALL_UNCATEGORIZED_FAILURE" = "Hovor selhal."; /* Error indicating that the phone's contacts could not be retrieved. */ -"ERROR_COULD_NOT_FETCH_CONTACTS" = "Nelze přistoupit ke kontaktům"; +"ERROR_COULD_NOT_FETCH_CONTACTS" = "Nelze přistoupit ke kontaktům."; /* Generic notice when message failed to send. */ "ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "Nepodařilo se odeslat zprávu."; @@ -898,7 +898,7 @@ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal se nemohl připojit k internetu. Prosím zkuste to znovu."; /* Error indicating that an outgoing message had no valid recipients. */ -"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Poslání zprávy selhalo z důvodu platných příjemců."; +"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Odesílání zprávy selhalo z důvodu neplatných příjemců."; /* Error indicating that a socket request failed. */ "ERROR_DESCRIPTION_REQUEST_FAILED" = "Síťová žádost selhala."; @@ -919,10 +919,10 @@ "ERROR_DESCRIPTION_UNKNOWN_ERROR" = "Došlo k neznámé chybě."; /* Error message when attempting to send message */ -"ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Kontakt není uživatelem aplikace Signal."; +"ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Kontakt není uživatelem Signalu."; /* Error message when unable to receive an attachment because the sending client is too old. */ -"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Chyba přílohy: Odesílatel musí aktualizovat aplikaci Signal a odeslat zprávu znovu."; +"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Chyba přílohy: Požádejte odesílatele, aby aktualizoval(a) Signal a odeslal(a) zprávu znovu."; /* No comment provided by engineer. */ "ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Přijata duplikovaná zpráva."; @@ -1084,13 +1084,13 @@ "IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; /* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +"IMAGE_EDITOR_CROP_BUTTON" = "Oříznout"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ -"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; +"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nemůžete sdílet více než %@ položek."; /* alert title */ -"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Failed to select attachment."; +"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Nepodařilo se odeslat přílohu."; /* Call setup status label */ "IN_CALL_CONNECTING" = "Připojování…"; @@ -1135,7 +1135,7 @@ "INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "Povolit přístup ke kontaktům"; /* Label for the cell that presents the 'invite contacts' workflow. */ -"INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Pozvat přátele do aplikace Signal"; +"INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Pozvat přátele do Signalu"; /* Search */ "INVITE_FRIENDS_PICKER_SEARCHBAR_PLACEHOLDER" = "Hledat"; @@ -1162,7 +1162,7 @@ "LINK_DEVICE_INVALID_CODE_BODY" = "Tento QR kód je neplatný. Ujistěte se prosím, že snímáte QR kód ze zařízení, které chcete připojit."; /* report an invalid linking code */ -"LINK_DEVICE_INVALID_CODE_TITLE" = "Propojení zařízení selhalo"; +"LINK_DEVICE_INVALID_CODE_TITLE" = "Připojení zařízení selhalo"; /* confirm the users intent to link a new device */ "LINK_DEVICE_PERMISSION_ALERT_BODY" = "Toto zařízení uvidí vaše skupiny a kontakty, bude mít přístup k vaším konverzacím a bude moct posílat zprávy ve vašem jménu."; @@ -1174,7 +1174,7 @@ "LINK_DEVICE_RESTART" = "Zkusit znovu"; /* QR Scanning screen instructions, placed alongside a camera view for scanning QR Codes */ -"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "Pro připojení naskenujte QR kód zobrazený na zařízení, které chcete připojit."; +"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "Naskenujte QR kód zobrazený na zařízení, které chcete připojit."; /* Subheading for 'Link New Device' navigation */ "LINK_NEW_DEVICE_SUBTITLE" = "Naskenovat QR kód"; @@ -1183,13 +1183,13 @@ "LINK_NEW_DEVICE_TITLE" = "Připojit nové zařízení"; /* Label for link previews with an unknown host. */ -"LINK_PREVIEW_UNKNOWN_DOMAIN" = "Link Preview"; +"LINK_PREVIEW_UNKNOWN_DOMAIN" = "Náhled odkazu"; /* Menu item and navbar title for the device manager */ "LINKED_DEVICES_TITLE" = "Připojená zařízení"; /* Alert Title */ -"LINKING_DEVICE_FAILED_TITLE" = "Propojení zařízení selhalo"; +"LINKING_DEVICE_FAILED_TITLE" = "Připojení zařízení selhalo"; /* table cell label in conversation settings */ "LIST_GROUP_MEMBERS_ACTION" = "Členové skupiny"; @@ -1240,7 +1240,7 @@ "MESSAGE_ACTION_DELETE_MESSAGE" = "Smazat tuto zprávu"; /* Action sheet button subtitle */ -"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Bude pouze smazána na tomto zařízení."; +"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Bude smazána pouze na tomto zařízení."; /* Action sheet button title */ "MESSAGE_ACTION_DETAILS" = "Více informací"; @@ -1380,7 +1380,7 @@ /* Alert title Alert title when camera is not authorized */ -"MISSING_CAMERA_PERMISSION_TITLE" = "Aplikace Signal vyžaduje přístup k vašemu fotoaparátu."; +"MISSING_CAMERA_PERMISSION_TITLE" = "Signal vyžaduje přístup k vašemu fotoaparátu."; /* Alert body when user has previously denied media library access */ "MISSING_MEDIA_LIBRARY_PERMISSION_MESSAGE" = "Tento souhlas můžete udělit v nastavení iOS."; @@ -1389,10 +1389,10 @@ "MISSING_MEDIA_LIBRARY_PERMISSION_TITLE" = "Tato funkce Signalu vyžaduje přístup k fotografiím."; /* alert title: cannot link - reached max linked devices */ -"MULTIDEVICE_PAIRING_MAX_DESC" = "Nemůžete propojit další zařízení."; +"MULTIDEVICE_PAIRING_MAX_DESC" = "Nemůžete připojit žádné další zařízení."; /* alert body: cannot link - reached max linked devices */ -"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "Dosáhl(a) jste limitu počtu zařízení, které můžete připojit k vašemu účtu. Prosím odstraňte některé ze zařízení a zkuste to znovu."; +"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "Dosáhl(a) jste maximálního počtu zařízení, které můžete připojit k vašemu účtu. Prosím odstraňte některé ze zařízení a zkuste to znovu."; /* An explanation of the consequences of muting a thread. */ "MUTE_BEHAVIOR_EXPLANATION" = "Pro ztlumené konverzace nebudete dostávat oznámení."; @@ -1440,10 +1440,10 @@ "NEW_GROUP_MEMBER_LABEL" = "Člen"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ v %@"; /* Placeholder text for group name field */ -"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Pojmenujte tento skupinový chat"; +"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Pojmenujte tuto skupinu"; /* a title for the non-contacts section of the 'new group' view. */ "NEW_GROUP_NON_CONTACTS_SECTION_TITLE" = "Ostatní uživatelé"; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Najít kontakty pomocí telefonního čísla"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Poznámka sobě"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Je možné, že byly přijaty nové zprávy zatímco váš %@ byl restartován."; @@ -1500,13 +1500,13 @@ "OPEN_SETTINGS_BUTTON" = "Nastavení"; /* Info Message when {{other user}} disables or doesn't support disappearing messages */ -"OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ zakázal mizející zprávy."; +"OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ zakázal(a) mizející zprávy."; /* Info Message when {{other user}} updates message expiration to {{time amount}}, see the *_TIME_AMOUNT strings for context. */ -"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ nastavil čas mizejících zpráv na %@."; +"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ nastavil(a) čas mizejících zpráv na %@."; /* Label warning the user that the Signal service may be down. */ -"OUTAGE_WARNING" = "Aplikace Signal se potýká s technickými problémy. Úsilovně pracujeme na co nejrychlejším obnovení služby."; +"OUTAGE_WARNING" = "Signal se potýká s technickými problémy. Usilovně pracujeme na co nejrychlejším obnovení služby."; /* info message text in conversation view */ "OUTGOING_CALL" = "Odchozí hovor"; @@ -1590,22 +1590,22 @@ "PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD" = "Číslo ve vaší schránce nevypadá jako správné bezpečnostní číslo této konverzace."; /* Alert body for user error */ -"PRIVACY_VERIFICATION_FAILED_NO_SAFETY_NUMBERS_IN_CLIPBOARD" = "Aplikace Signal nemohla ve vaší schránce nalézt žádné bezpečnostní číslo. Zkopírovali jste ho správně?"; +"PRIVACY_VERIFICATION_FAILED_NO_SAFETY_NUMBERS_IN_CLIPBOARD" = "Signal nemohl ve vaší schránce nalézt žádné bezpečnostní číslo. Zkopíroval(a) jste ho správně?"; /* Alert body when verifying with {{contact name}} */ "PRIVACY_VERIFICATION_FAILED_THEY_HAVE_WRONG_KEY_FOR_ME" = "Každá dvojice uživatelů Signalu sdílí odlišné bezpečnostní číslo. Ověřte, že %@ zobrazuje *vaše* bezpečnostní číslo."; /* alert body */ -"PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "Používáte starou verzi aplikace Signal, před ověřením ji musíte aktualizovat."; +"PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "Používáte starou verzi Signalu, před ověřením ji musíte aktualizovat."; /* alert body */ "PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "Váš kontakt používá starou verzi Signalu a musí ji aktualizovat, než bude možné ověření."; /* alert body */ -"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "Naskenovaný kód nevypadá jako bezpečnostní číslo. Používate oba aktuální verzi aplikace Signal?"; +"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "Naskenovaný kód nevypadá jako bezpečnostní číslo. Používate oba aktuální verzi Signalu?"; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Pokud chcete ověřit bezpečnost koncového šifrování s %@, porovnete čísla výše s čísli na druhém zařízení..\n\nNebo můžete naskenovat kód z druhého telefonu, nebo on může naskenovat ten váš."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Pokud chcete ověřit bezpečnost koncového šifrování s %@, porovnete čísla výše s čísli na druhém zařízení.\n\nTaké můžete naskenovat kód z jejich telefonu, nebo je požádat o naskenování vašeho kódu."; /* Navbar title */ "PRIVACY_VERIFICATION_TITLE" = "Ověření bezpečnostního čísla"; @@ -1671,7 +1671,7 @@ "QUESTIONMARK_PUNCTUATION" = "?"; /* Indicates the author of a quoted message. Embeds {{the author's name or phone number}}. */ -"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "Odpověď na %@"; +"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "Odpověď uživateli %@"; /* message header label when someone else is quoting you */ "QUOTED_REPLY_AUTHOR_INDICATOR_YOU" = "Odpověď vám"; @@ -1707,10 +1707,10 @@ "REGISTER_2FA_FORGOT_PIN" = "Zapoměl jsem PIN."; /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ -"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrace tohoto telefonního čísla bude možná bez zámku registrace po uplynutí 7 dní po poslední aktivitě čísla v aplikaci Signal."; +"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrace tohoto telefonního čísla bude možná bez PINu zámku registrace po uplynutí 7 dní od poslední aktivity telefonního čísla na Signalu."; /* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Toto telefonní číslo má povolený zámek registrace. Prosím zadejte registrační PIN.\n\nVáš registrační PIN se liší od automatického kódu, který byl zadán na Váš přístroj při posledním kroku."; +"REGISTER_2FA_INSTRUCTIONS" = "Toto telefonní číslo má povolený zámek registrace. Prosím zadejte PIN zámku registrace.\n\nPIN zámku registrace se liší od ověřovacího kódu, který vám byl odeslán při předchozím kroku."; /* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ "REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrace neúspěšná"; @@ -1785,7 +1785,7 @@ "REGISTRATION_VERIFICATION_FAILED_WRONG_CODE_DESCRIPTION" = "Čísla, která jste zadal(a) neodpovídají tomu, co jsme poslali. Nechcete to zkontrolovat?"; /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ -"REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Neplatný registrační PIN."; +"REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Neplatný PIN zámku registrace."; /* No comment provided by engineer. */ "REGISTRATION_VERIFY_DEVICE" = "Zaregistrovat se"; @@ -1809,16 +1809,16 @@ "RELAY_REGISTERED_ERROR_RECOVERY" = "Telefonní číslo, které se snažíte zaregistrovat, je již zaregistrováno na jiném serveru. Zrušte jeho registraci z tohoto serveru a zkuste to znovu."; /* Body text for when user is periodically prompted to enter their registration lock PIN */ -"REMINDER_2FA_BODY" = "Registrační zámek je na Vašem telefonním čísle povolen. Aby Vám pomohla zapamatovat si kód, Vás bude aplikace Signal pravidelně žádat o jeho zadávání."; +"REMINDER_2FA_BODY" = "Registrační zámek je povolen pro vaše telefonní číslo. Signal vás bude pravidelně žádat o zadání kódu, aby vám pomohl si ho zapamatovat."; /* Body header for when user is periodically prompted to enter their registration lock PIN */ "REMINDER_2FA_BODY_HEADER" = "Připomenutí:"; /* Alert message explaining what happens if you forget your 'two-factor auth pin' */ -"REMINDER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registračná zámek pomáhá zabezpečit Vaše telefonní číslo před neautorizovanými pokusy o registraci. Tato funkce může být kdykoliv vypnuta v nastavení soukromí v aplikaci Signal."; +"REMINDER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Zámek registrace pomáhá zabezpečit vaše telefonní číslo před neoprávněnými pokusy o registraci. Tato funkce může být kdykoliv zakázána v nastavení soukromí Signalu."; /* Navbar title for when user is periodically prompted to enter their registration lock PIN */ -"REMINDER_2FA_NAV_TITLE" = "Zadejte Váš registrační PIN."; +"REMINDER_2FA_NAV_TITLE" = "Zadejte váš PIN zámku registrace"; /* Alert body after wrong guess for 'two-factor auth pin' reminder activity */ "REMINDER_2FA_WRONG_PIN_ALERT_BODY" = "Nový PIN můžete nastavit v nastavení soukromí."; @@ -1842,7 +1842,7 @@ "SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Přesto odeslat"; /* Snippet to share {{safety number}} with a friend. sent e.g. via SMS */ -"SAFETY_NUMBER_SHARE_FORMAT" = "Naše bezpečnostní číslo v aplikaci Signal:\n%@"; +"SAFETY_NUMBER_SHARE_FORMAT" = "Naše bezpečnostní číslo v Signalu:\n%@"; /* Action sheet heading */ "SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Vaše bezpečnostní číslo s %@ se změnilo. Možná ho chcete ověřit."; @@ -1866,13 +1866,13 @@ "SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_LOCKOUT" = "Příliš mnoho pokusů o autentifikaci. Prosím zkuste později."; /* Indicates that Touch ID/Face ID/Phone Passcode are not available on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Musíte nejdříve povolit zámek v iOS aplikaci Nastavení, před povolením aplikace zámek displeje."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Pokud chcete používat zámek displeje, nejprve zapněte kódový zámek v nastavení iOS."; /* Indicates that Touch ID/Face ID/Phone Passcode is not configured on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Musíte nejdříve povolit zámek v iOS aplikaci Nastavení, před povolením aplikace zámek displeje."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Pokud chcete používat zámek displeje, nejprve zapněte kódový zámek v nastavení iOS."; /* Indicates that Touch ID/Face ID/Phone Passcode passcode is not set. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Musíte nejdříve povolit zámek v iOS aplikaci Nastavení, před povolením aplikace zámek displeje."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Pokud chcete používat zámek displeje, nejprve zapněte kódový zámek v nastavení iOS."; /* Description of how and why Signal iOS uses Touch ID/Face ID/Phone Passcode to unlock 'screen lock'. */ "SCREEN_LOCK_REASON_UNLOCK_SCREEN_LOCK" = "Autentifikovat pro otevření Signalu."; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Zaslat"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Vaše zpráva nemohla být odeslána."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Odeslání pozvánky selhalo, zkuste to později."; @@ -1929,7 +1929,7 @@ "SEND_SMS_CONFIRM_TITLE" = "Pozvat kamaráda přes zabezpečenou SMS?"; /* No comment provided by engineer. */ -"SEND_SMS_INVITE_TITLE" = "Chcete pozvat toto číslo do aplikace Signal:"; +"SEND_SMS_INVITE_TITLE" = "Chcete pozvat následující číslo do Signalu:"; /* Navbar title */ "SETTINGS_ABOUT" = "O aplikaci"; @@ -2028,7 +2028,7 @@ "SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Přidat zablokovaného uživatele"; /* A label that indicates the user has no Signal contacts. */ -"SETTINGS_BLOCK_LIST_NO_CONTACTS" = "V aplikaci Signal nemáte žádné kontakty."; +"SETTINGS_BLOCK_LIST_NO_CONTACTS" = "Nemáte žádné kontakty v Signalu."; /* A label that indicates the user's search has no matching results. */ "SETTINGS_BLOCK_LIST_NO_SEARCH_RESULTS" = "Žádné výsledky vyhledávání"; @@ -2037,7 +2037,7 @@ "SETTINGS_BLOCK_LIST_TITLE" = "Blokovaní"; /* Table cell label */ -"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE" = "Vždy přeposílat hovory"; +"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE" = "Vždy přenášet hovory"; /* User settings section footer, a detailed explanation */ "SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE_DETAIL" = "Přenášet všechna volání přes server Signal, aby nedošlo k odhalení vaší IP adresy volanému. Povolením dojde ke zhoršení kvality hovoru."; @@ -2055,7 +2055,7 @@ "SETTINGS_DELETE_DATA_BUTTON" = "Smazat veškerá data"; /* Alert message before user confirms clearing history */ -"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Opravdu chcete smazat celou historii (zprávy, přílohy, volání atd.)? Tuto akci nelze vzít zpět."; +"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Opravdu chcete smazat veškerou historii (zprávy, přílohy, volání atd.)? Tuto akci nelze vzít zpět."; /* Confirmation text for button which deletes all message, calling, attachments, etc. */ "SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Smazat vše"; @@ -2082,13 +2082,13 @@ "SETTINGS_LEGAL_TERMS_CELL" = "Podmínky & Zásady ochrany osobních údajů"; /* Setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS" = "Odeslat náhledy odkazu"; +"SETTINGS_LINK_PREVIEWS" = "Odeslat náhledy odkazů"; /* Footer for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_FOOTER" = "Náhledy jsou podporovány pro odkazy na Imgur, Instagram, Reddit, a YouTube."; /* Header for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; +"SETTINGS_LINK_PREVIEWS_HEADER" = "Náhledy odkazů"; /* Title for settings activity */ "SETTINGS_NAV_BAR_TITLE" = "Nastavení"; @@ -2106,7 +2106,7 @@ "SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE" = "Zobrazit jméno & číslo volajícího"; /* Settings table section footer. */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Zobrazit hovory v \"Poslední volané\" v aplikaci Telefon"; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Zobrazit hovory v historii v aplikaci Telefon."; /* Short table cell label */ "SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "Zobrazit hovory v \"Poslední volané\""; @@ -2217,13 +2217,13 @@ "SHARE_EXTENSION_LOADING" = "Načítání..."; /* Message indicating that the share extension cannot be used until the user has registered in the main app. */ -"SHARE_EXTENSION_NOT_REGISTERED_MESSAGE" = "Spustit aplikaci Signal pro registraci."; +"SHARE_EXTENSION_NOT_REGISTERED_MESSAGE" = "Otevřete Signal pro registraci."; /* Title indicating that the share extension cannot be used until the user has registered in the main app. */ "SHARE_EXTENSION_NOT_REGISTERED_TITLE" = "Není registrováno"; /* Message indicating that the share extension cannot be used until the main app has been launched at least once. */ -"SHARE_EXTENSION_NOT_YET_MIGRATED_MESSAGE" = "Spustit aplikaci Signal pro registraci nebo aktualizaci."; +"SHARE_EXTENSION_NOT_YET_MIGRATED_MESSAGE" = "Otevřete Signal pro registraci nebo aktualizaci."; /* Title indicating that the share extension cannot be used until the main app has been launched at least once. */ "SHARE_EXTENSION_NOT_YET_MIGRATED_TITLE" = "Nepřipraveno"; @@ -2247,7 +2247,7 @@ "SHOW_THREAD_BUTTON_TITLE" = "Zobrazit konverzaci"; /* body sent to contacts when inviting to Install Signal */ -"SMS_INVITE_BODY" = "Pozval jsem tě do aplikace Signal! Zde je odkaz:"; +"SMS_INVITE_BODY" = "Zvu tě do aplikace Signal! Tady je odkaz:"; /* Label for the 'no sound' option that allows users to disable sounds for notifications, etc. */ "SOUNDS_NONE" = "Žádné"; @@ -2328,13 +2328,13 @@ "UNLINK_ACTION" = "Odpojit"; /* Alert message to confirm unlinking a device */ -"UNLINK_CONFIRMATION_ALERT_BODY" = "Pokud bude toto zařízení odpojeno, nebude možné dále odesílat a přijímat zprávy."; +"UNLINK_CONFIRMATION_ALERT_BODY" = "Pokud bude zařízení odpojeno, nebude možné dále odesílat nebo přijímat zprávy."; /* Alert title for confirming device deletion */ "UNLINK_CONFIRMATION_ALERT_TITLE" = "Odpojit \"%@\"?"; /* Alert title when unlinking device fails */ -"UNLINKING_FAILED_ALERT_TITLE" = "Aplikaci Signal se nepodařilo odpojit vaše zařízení."; +"UNLINKING_FAILED_ALERT_TITLE" = "Signalu se nepodařilo odpojit vaše zařízení."; /* Label text in device manager for a device with no name */ "UNNAMED_DEVICE" = "Nepojmenované zařízení"; @@ -2367,13 +2367,13 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Zapnout indikátory psaní"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Volitelné náhledy odkazu jsou nyní podporovány na některých populárních internetových stránkách."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Volitelné náhledy odkazů jsou nyní podporovány na některých populárních internetových stránkách."; /* Subtitle for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Tuto funkci můžete kdykoliv zakázat nebo povolit v nastavení soukromí Signalu (Soukromí > Odeslat náhledy odkazů)."; /* Header for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Link Previews"; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Náhledy odkazů"; /* Description for notification audio customization */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Nyní můžete zvolit výchozí zvuky chatů, či zvuky pro každou konverzaci zvlášť. Zvuky u hovorů budou stejné, jako byly zvoleny u každého systémového kontaktu zvlášť."; @@ -2388,7 +2388,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Nastavit váš profil"; /* Description of new profile feature for upgrading (existing) users */ -"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Nyní můžete s vašimi přáteli v aplikaci Signal sdílet profilovou fotku a jméno."; +"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Nyní můžete s vašimi přáteli na Signalu sdílet profilovou fotku a jméno."; /* Header for upgrade experience */ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Připraveni?"; @@ -2409,7 +2409,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "Představujeme indikátory psaní"; /* Description of video calling to upgrading (existing) users */ -"UPGRADE_EXPERIENCE_VIDEO_DESCRIPTION" = "Aplikace Signal nyní podporuje bezpečné video hovory. Začněte hovor jako obvykle, klepněte na tlačítko kamery a zamávejte na pozdrav."; +"UPGRADE_EXPERIENCE_VIDEO_DESCRIPTION" = "Signal nyní podporuje bezpečné video hovory. Začněte hovor jako obvykle, klepněte na tlačítko kamery a zamávejte na pozdrav."; /* Header for upgrade experience */ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Ahoj, bezpečné videohovory!"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 10ea65cb6..0a031a30e 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Adgang til mikrofonen er påkrævet"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Indkommende opkald"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Ring op"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Ubesvaret opkald, fordi opkalderens sikkerhedsnummer er ændret."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Ubesvaret opkald"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Intet svar"; @@ -1395,7 +1395,7 @@ "MULTIDEVICE_PAIRING_MAX_RECOVERY" = "Du har nået det maksimale antal enheder, du i øjeblikket kan tilkoble til din konto. Fjern en enhed, og prøv igen."; /* An explanation of the consequences of muting a thread. */ -"MUTE_BEHAVIOR_EXPLANATION" = "Du modtager ikke underretninger for dæmpede samtaler."; +"MUTE_BEHAVIOR_EXPLANATION" = "Du modtager ikke meddelelser for dæmpede samtaler."; /* A button to skip a view. */ "NAVIGATION_ITEM_SKIP_BUTTON" = "Spring over"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Medlem"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ til %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Navngiv gruppesamtalen"; @@ -1662,7 +1662,7 @@ "PUSH_MANAGER_REPLY" = "Svar"; /* Title of alert shown when push tokens sync job succeeds. */ -"PUSH_REGISTER_SUCCESS" = "Genregistreret til push-notifikationer."; +"PUSH_REGISTER_SUCCESS" = "Genregistreret til push-meddelelser."; /* Used in table section header and alert view title contexts */ "PUSH_REGISTER_TITLE" = "Push meddelelser"; @@ -1731,7 +1731,7 @@ "REGISTER_RATE_LIMITING_ERROR" = "Du har forsøgt for ofte. Vent venligst et minut."; /* Title of alert shown when push tokens sync job fails. */ -"REGISTRATION_BODY" = "Kunne ikke genregistrere til push-notifikationer."; +"REGISTRATION_BODY" = "Kunne ikke genregistrere til push-meddelelser."; /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landekode"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Send"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Din besked kunne ikke sendes."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Kunne ikke sende invitation. Prøv igen senere."; @@ -2094,10 +2094,10 @@ "SETTINGS_NAV_BAR_TITLE" = "Indstillinger"; /* table section footer */ -"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Opkalds- og meddelelsesnotifikationer kan vises, mens telefonen er låst. Du vil muligvis begrænse, hvad der vises i disse notifikationer."; +"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Opkalds- og besked-meddelelser kan vises, mens telefonen er låst. Du vil muligvis begrænse, hvad der vises i disse meddelelser."; /* table section header */ -"SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Notifikations Indhold "; +"SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Meddelelses indhold"; /* No comment provided by engineer. */ "SETTINGS_NOTIFICATIONS" = "Meddelelser"; @@ -2130,7 +2130,7 @@ "SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT" = "Skærmlås timeout"; /* Footer for the 'screen lock' section of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Lås op Signals skærmen ved hjælp af Touch ID, Face ID eller din iOS-enhedens adgangskode. Du kan stadig svare på indgående opkald og modtage meddelelsesnotifikationer, mens Skærmlås er aktiveret. Signal's underretningsindstillinger giver dig mulighed for at tilpasse de oplysninger, der vises."; +"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Lås op Signals skærm ved hjælp af Touch ID, Face ID eller din iOS-enhedens adgangskode. Du kan stadig svare på indgående opkald og modtage besked-meddelelser, mens Skærmlås er aktiveret. Signals meddelelsesindstillinger giver dig mulighed for at tilpasse de oplysninger, der vises."; /* Title for the 'screen lock' section of the privacy settings. */ "SETTINGS_SCREEN_LOCK_SECTION_TITLE" = "Skærmlås"; @@ -2148,7 +2148,7 @@ "SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "iOS opkaldsintegration viser Signal-opkald på din låseskærm og i systemets opkaldshistorik. Du kan eventuelt vise din kontaktpersons navn og nummer. Hvis iCloud er aktiveret, deles denne opkaldshistorik med Apple."; /* Label for the notifications section of conversation settings view. */ -"SETTINGS_SECTION_NOTIFICATIONS" = "Notifikationer"; +"SETTINGS_SECTION_NOTIFICATIONS" = "Meddelelser"; /* Header Label for the sounds section of settings views. */ "SETTINGS_SECTION_SOUNDS" = "Lyde"; @@ -2379,7 +2379,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Du kan nu vælge standard og samtale-specifikke meddelelseslyde, og opkald vil respektere den ringetone, du har valgt for hver systemkontakt."; /* button label shown one time, after upgrade */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Gennemse notifikationsindstillinger"; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Gennemse meddelelsesindstillinger"; /* Header for upgrade experience */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE" = "Opdater opkalds- og beskedlyde"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index e9aef7334..79932fe5b 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -2367,7 +2367,7 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Ενεργοποίηση δεικτών πληκτρολόγησης"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optional link previews are now supported for some of the most popular sites on the Internet."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Οι προεπισκοπήσεις συνδέσμων υποστηρίζονται πλέον προαιρετικά για μερικές από τις γνωστότερες ιστοσελίδες του διαδικτύου. "; /* Subtitle for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 1e2680838..aa484c7a6 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Encontrar por núm. de teléfono"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Tú mismo"; +"NOTE_TO_SELF" = "Mensajes a ti mism@"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Has recibido mensajes mientras tu %@ estaba reiniciándose."; @@ -2466,7 +2466,7 @@ "VOICE_MESSAGE_FILE_NAME" = "Nota de voz"; /* Message for the alert indicating the 'voice message' needs to be held to be held down to record. */ -"VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE" = "Toca y mantén pulsado el icono del micrófono para grabar una nota de voz."; +"VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE" = "Toca y mantén pulsado el icono del micrófono para grabar una nota de voz corta. Toca, arrastra hacia arriba y suelta para grabar notas de voz más largas."; /* Title for the alert indicating the 'voice message' needs to be held to be held down to record. */ "VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE" = "Nota de voz"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index 20c0c2426..cd41a9164 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -2367,7 +2367,7 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Lülita kirjutamisindikaatorid sisse"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optional link previews are now supported for some of the most popular sites on the Internet."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Valikulised linkide eelvaated on nüüd toetatud populaarseimate saitide puhul."; /* Subtitle for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 04342dd8f..6746a2de9 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Mikrofonin käyttöoikeutta tarvitaan"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Saapuva puhelu"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Soita"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Vastaamatta jäänyt puhelu, koska soittajan turvanumero on vaihtunut."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Vastaamatta jäänyt puhelu "; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Ei vastausta"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Jäsen"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ ryhmälle %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nimeä tämä ryhmä"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Lähetä"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Viestin lähettäminen epäonnistui."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Kutsun lähettäminen epäonnistui. Yritä myöhemmin uudelleen."; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index d484448f4..abe573716 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "נדרשת גישה למיקרופון"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ שיחה נכנסת"; /* Accessibility label for placing call button */ "CALL_LABEL" = "חייג"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ שיחה לא נענתה מאחר שמספר הביטחון של המתקשר השתנה."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ שיחה שלא נענתה"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "אין מענה"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "חבר קבוצה"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ אל %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "תן שם לשיחת קבוצה זו"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "שלח"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "ההודעה שלך נכשלה להישלח."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "שליחת ההזמנה נכשלה, אנא נסה שוב מאוחר יותר."; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 1834f171f..8105500e1 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Accesso microfono richiesto"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Chiamata in arrivo"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Chiama"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Chiamata persa perché il codice di sicurezza del chiamante è cambiato."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Chiamata persa"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Nessuna risposta"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Membro"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ su %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nome chat di gruppo"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Invia"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Invio del messaggio fallito."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Invio dell'invito fallito, riprova più tardi"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index a9295a2ce..c279c0a8d 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Krever tilgang til mikrofon"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Innkommende anrop"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Ring"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Tapt anrop grunnet endring av din kontakts sikkerhetsnummer"; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Ubesvart anrop"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Ingen svar"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Medlem"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ til %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Navngi gruppesamtalen"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Send"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Sending mislyktes"; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Sending av invitasjon mislyktes, vennligst prøv igjen senere."; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index d944d31b6..e0e9b3f16 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -462,7 +462,7 @@ "CONFIRM_LINK_NEW_DEVICE_ACTION" = "Nieuw apparaat koppelen"; /* Action sheet body presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ -"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ is mogelijk van apparaat veranderd. Verifieer jullie veiligheidsnummers om zeker te zijn van je privacy."; +"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ heet mogelijk de app opnieuw geïnstalleerd of heeft een ander apparaat in gebruik genomen. Verifieer jullie veiligheidsnummers om zeker te zijn dat je met de juiste persoon communiceert."; /* Action sheet title presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ "CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Veiligheidsnummer met %@ is veranderd"; @@ -1036,7 +1036,7 @@ "GROUP_MEMBERS_CALL" = "Bellen"; /* Label for the button that clears all verification errors in the 'group members' view. */ -"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Alle verificatiefouten wissen"; +"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Alle groepsleden als niet geverifieerd markeren"; /* Label for the 'reset all no-longer-verified group members' confirmation alert. */ "GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE" = "Dit zal de verificatie wissen voor alle groepsleden wier veiligheidsnummers veranderd zijn sinds ze als geverifieerd zijn gemarkeerd."; @@ -1045,7 +1045,7 @@ "GROUP_MEMBERS_SECTION_TITLE_MEMBERS" = "Leden"; /* Title for the 'no longer verified' section of the 'group members' view. */ -"GROUP_MEMBERS_SECTION_TITLE_NO_LONGER_VERIFIED" = "Niet meer gemarkeerd als geverifieerd"; +"GROUP_MEMBERS_SECTION_TITLE_NO_LONGER_VERIFIED" = "Niet langer gemarkeerd als geverifieerd"; /* Button label for the 'send message to group member' button */ "GROUP_MEMBERS_SEND_MESSAGE" = "Bericht verzenden"; @@ -1336,13 +1336,13 @@ "MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Nieuw bericht"; /* Indicates that one member of this group conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet meer gemarkeerd als geverifieerd. Tik voor opties."; +"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet langer gemarkeerd als geverifieerd. Tik voor opties."; /* Indicates that this 1:1 conversation has been blocked. */ "MESSAGES_VIEW_CONTACT_BLOCKED" = "Je hebt deze gebruiker geblokkeerd"; /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet meer gemarkeerd als geverifieerd. Tik voor opties."; +"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet langer gemarkeerd als geverifieerd. Tik voor opties."; /* Indicates that a single member of this group has been blocked. */ "MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "Je hebt één lid van deze groep geblokkeerd"; @@ -1357,7 +1357,7 @@ "MESSAGES_VIEW_GROUP_PROFILE_WHITELIST_BANNER" = "Je profiel met deze groep delen?"; /* Indicates that more than one member of this group conversation is no longer verified. */ -"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "Meer dan een lid van deze groep is niet meer gemarkeerd als geverifieerd. Tik voor opties."; +"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "Meer dan een lid van deze groep is niet langer gemarkeerd als geverifieerd. Tik voor opties."; /* The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation. */ "MESSAGES_VIEW_TITLE_SUBTITLE" = "Tik hier voor instellingen"; @@ -1584,7 +1584,7 @@ "PRIVACY_UNVERIFY_BUTTON" = "Verificatie wissen"; /* Alert body when verifying with {{contact name}} */ -"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Dit lijkt niet op je veiligheidsnummer met %@. Verifieer je wel het juiste contact?"; +"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Dit lijkt niet op je veiligheidsnummer met %@. Verifieer je wel de juiste contactpersoon?"; /* Alert body */ "PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD" = "Het nummer in je klembord lijkt niet op het juiste veiligheidsnummer voor dit gesprek."; @@ -1599,7 +1599,7 @@ "PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "Je gebruikt een oude versie van Signal. Om te kunnen verifiëren moet je Signal eerst bijwerken."; /* alert body */ -"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "Je partner gebruikt een oude versie van Signal. Om te kunnen bevestigen moet hij/zij Signal eerst bijwerken."; +"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "Je gesprekspartner gebruikt een oude versie van Signal. Om te kunnen verifiëren moet hij/zij Signal eerst bijwerken."; /* alert body */ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "De gescande code lijkt niet op een veiligheidsnummer. Gebruiken jullie allebei de laatste versie van Signal?"; @@ -1845,7 +1845,7 @@ "SAFETY_NUMBER_SHARE_FORMAT" = "Ons Signal-veiligheidsnummer:\n%@"; /* Action sheet heading */ -"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Je veiligheidsnummer met %@ is veranderd. Je verifieert het best."; +"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Je veiligheidsnummer met %@ is veranderd. Het wordt aanbevolen het nieuwe nummer te verifiëren."; /* label presented once scanning (camera) view is visible. */ "SCAN_CODE_INSTRUCTIONS" = "Scan de QR-code op het apparaat van je contact."; @@ -2211,7 +2211,7 @@ "SHARE_ACTION_TWEET" = "Twitter"; /* alert body when sharing file failed because of untrusted/changed identity keys */ -"SHARE_EXTENSION_FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_FORMAT" = "Je veiligheidsnummer met %@ is recent veranderd. Je verifieert het best in de hoofdapp vooraleer je je bericht opnieuw stuurt."; +"SHARE_EXTENSION_FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_FORMAT" = "Je veiligheidsnummer met %@ is recentelijk veranderd. Het wordt aanbevolen om dit nieuwe nummer te verifiëren is de Signal app."; /* Indicates that the share extension is still loading. */ "SHARE_EXTENSION_LOADING" = "Aan het laden…"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index b0d31ef50..a8bb1485c 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Wymagany dostęp do mikrofonu"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Połączenie przychodzące"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Połączenie"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Nieodebrane połączenie z powodu zmiany numeru bezpieczeństwa dzwoniącego."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Nieodebrane połączenie"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Brak odpowiedzi"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Członek"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ do %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nazwij tę rozmowę grupową"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Wyślij"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Twoja wiadomość nie została wysłana."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Wysyłanie zaproszenia nie powiodło się, spróbuj później."; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 714a31e2a..c1e36f4d8 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -72,7 +72,7 @@ "APP_UPDATE_NAG_ALERT_DISMISS_BUTTON" = "Agora Não"; /* Message format for the 'new app version available' alert. Embeds: {{The latest app version number}} */ -"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "A versão %@ está disponível na App Store."; +"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "A versão %@ está disponível agora na App Store."; /* Title for the 'new app version available' alert. */ "APP_UPDATE_NAG_ALERT_TITLE" = "Uma Nova Versão do Signal Está Disponível"; @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Necessário acesso ao microfone"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Recebendo ligação"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Chamar"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Chamada perdida porque o número de segurança do chamador mudou."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Ligação perdida"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Sem Resposta."; @@ -339,7 +339,7 @@ "CALL_STATUS_FORMAT" = "Signal %@"; /* Label for call button for alert offering to call a user. */ -"CALL_USER_ALERT_CALL_BUTTON" = "Chamar"; +"CALL_USER_ALERT_CALL_BUTTON" = "Ligar"; /* Message format for alert offering to call a user. Embeds {{the user's display name or phone number}}. */ "CALL_USER_ALERT_MESSAGE_FORMAT" = "Gostaria de chamar %@?"; @@ -1081,7 +1081,7 @@ "HOME_VIEW_TITLE_INBOX" = "Signal"; /* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; +"IMAGE_EDITOR_BRUSH_BUTTON" = "Escova "; /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Cortar"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Membro"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ para %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nomear esse grupo de bate-papo"; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Encontrar Contatos pelo Número do Telefone"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Recado para mim"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Pode ser que você tenha recebido mensagens enquanto seu %@ reiniciava."; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Enviar"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Sua mensagem não pôde ser enviada."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Falha no envie de convite. Tente novamente mais tarde."; @@ -2085,7 +2085,7 @@ "SETTINGS_LINK_PREVIEWS" = "Enviar pré-visualizações de links"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Visualizações são suportadas para Imgur, Instagram, Reddit e links do YouTube."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Pré-visualizações de links"; @@ -2367,10 +2367,10 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Ativar indicadores de digitação"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optional link previews are now supported for some of the most popular sites on the Internet."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Agora é possível mostrar pré-visualizações de links de alguns dos sites mais populares da internet."; /* Subtitle for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Você pode desativar ou habilitar essa característica a qualquer momento em suas configurações do Signal (Privacidade > Mandar link de visualizações)."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Pré-visualizações de links"; @@ -2472,7 +2472,7 @@ "VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE" = "Mensagem de voz"; /* Activity indicator title, shown upon returning to the device manager, until you complete the provisioning process on desktop */ -"WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Termine a configuração no Signal Desktop"; +"WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Termine a configuração no Signal Desktop."; /* Info Message when you disable disappearing messages */ "YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Você desabilitou mensagens efêmeras."; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index a90dba036..88e89571c 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Åtkomst till mikrofon krävs"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Inkommande samtal"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Ring"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missade samtalet, för den andra personens säkerhetsnummer har ändrats."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missat samtal"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Inget svar"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Medlem"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ till %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Namnge gruppchatten"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Skicka"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Ditt meddelande kunde inte skickas."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Kunde inte skicka inbjudan, vänligen försök senare."; @@ -2436,7 +2436,7 @@ "VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Skicka"; /* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Skriv verifieringskoden vi skickade till %@."; +"VERIFICATION_PHONE_NUMBER_FORMAT" = "Ange verifieringskoden vi skickade till %@."; /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du markerade %@ som ej verifierad."; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index d636f3246..8e5dd53ce 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Mikrofon Erişimi Gerekiyor"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Gelen Arama"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Ara"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Arayanın güvenlik numarası değiştiğinden arama karşılanmadı."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Cevapsız Arama"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Yanıt Yok"; @@ -423,7 +423,7 @@ "CLOUDKIT_STATUS_RESTRICTED" = "Signal'in iCloud erişimi engellenmiş. Signal verilerinizi yedeklemek için iOS ayarlar uygulamasından Signal'in iCloud hesabınıza erişimine izni verin."; /* The first of two messages demonstrating the chosen conversation color, by rendering this message in an outgoing message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_1" = "Bu sohbete gönderilen mesajarın rengini seçin."; +"COLOR_PICKER_DEMO_MESSAGE_1" = "Bu sohbete gönderilen mesajların rengini seçin."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ "COLOR_PICKER_DEMO_MESSAGE_2" = "Seçtiğiniz rengi sadece siz göreceksiniz."; @@ -733,7 +733,7 @@ "DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "Gist bağlantısı panonuza kopyalandı. GitHub sorunlar listesine yönlendirilmek üzeresiniz."; /* Title of the alert before redirecting to GitHub Issues. */ -"DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "GıtHub'a Yönlendirme"; +"DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "GitHub'a Yönlendirme"; /* Label for button that lets users re-register using the same phone number. */ "DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Bu telefon numarasını tekrar kaydet"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Üye"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@, %@ grubuna"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Grup sohbetini adlandır"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Gönder"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Mesajınız gönderilemedi."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Davetiye gönderilemedi, lütfen daha sonra tekrar deneyin."; @@ -2145,7 +2145,7 @@ "SETTINGS_SCREEN_SECURITY_DETAIL" = "Uygulama geçişleri esnasında Signal önizlemelerinin görülmez."; /* Settings table section footer. */ -"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "IOS Çağrı Entegrasyonu, Signal çağrılarını kilit ekranınızda ve sistemin arama geçmişinde gösterir. İsteğe bağlı olarak kişinin adını ve numarasını da gösterebilirsiniz. ICloud etkinleştirilmiş ise, bu arama geçmişi Apple ile paylaşılacaktır."; +"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "iOS Çağrı Entegrasyonu, Signal çağrılarını kilit ekranınızda ve sistemin arama geçmişinde gösterir. İsteğe bağlı olarak kişinin adını ve numarasını da gösterebilirsiniz. ICloud etkinleştirilmiş ise, bu arama geçmişi Apple ile paylaşılacaktır."; /* Label for the notifications section of conversation settings view. */ "SETTINGS_SECTION_NOTIFICATIONS" = "Bildirimler"; @@ -2355,7 +2355,7 @@ "UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE" = "Desteklenmiyor"; /* Description of CallKit to upgrading (existing) users */ -"UPGRADE_EXPERIENCE_CALLKIT_DESCRIPTION" = "IOS çağrı entegrasyonu ile kilit ekranınızdan gelen aramaları cevaplamak kolaydır. Varsayılan olarak arayan bilgilerini saklarız."; +"UPGRADE_EXPERIENCE_CALLKIT_DESCRIPTION" = "iOS çağrı entegrasyonu ile kilit ekranınızdan gelen aramaları cevaplamak kolaydır. Varsayılan olarak arayan bilgilerini saklarız."; /* button label shown once when when user upgrades app, in context of call kit */ "UPGRADE_EXPERIENCE_CALLKIT_PRIVACY_SETTINGS_BUTTON" = "Daha fazlasını gizlilik ayarlarınızdan öğrenin."; @@ -2415,7 +2415,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Merhaba Güvenli Görüntülü Aramalar!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal iOS 9 veya daha sonrasını gerektirir. Lütfen iOS Ayarlar uygulamasından Yazılım Güncelleştirme özeliğini kullanın."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal iOS 9 veya daha sonrasını gerektirir. Lütfen iOS Ayarlar uygulamasından Yazılım Güncelleme özeliğini kullanın."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS'u Güncelle"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 7c52b3d22..ac4d9da46 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "请求访问麦克风"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "来电"; /* Accessibility label for placing call button */ "CALL_LABEL" = "打电话"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "未接来电，因为对方的安全码发生了变化。"; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "未接来电"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "无应答"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "成员"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@至%@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "为此群组命名"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "发送"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "您的信息发送失败。"; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "发送邀请失败, 请稍候再试."; From db2294888797c6391cbd52a35f1dcc01e3727cb0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 15:06:15 -0700 Subject: [PATCH 014/493] Fix crash after deleting message w/ link preview --- Signal/src/views/LinkPreviewView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift index 9360513af..d61ed8135 100644 --- a/Signal/src/views/LinkPreviewView.swift +++ b/Signal/src/views/LinkPreviewView.swift @@ -211,7 +211,8 @@ public class LinkPreviewSent: NSObject, LinkPreviewState { return nil } guard let image = UIImage(contentsOfFile: imageFilepath) else { - owsFail("Could not load image: \(imageFilepath)") + owsFailDebug("Could not load image: \(imageFilepath)") + return nil } return image } From 38da911d4f32555910da0bee9c86dc5fca212acc Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 12 Feb 2019 15:28:55 -0700 Subject: [PATCH 015/493] Don't crash when user has 0 saved photos --- .../PhotoLibrary/PhotoLibrary.swift | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift b/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift index 0a2d13729..077934954 100644 --- a/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift +++ b/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift @@ -291,7 +291,9 @@ class PhotoLibrary: NSObject, PHPhotoLibraryChangeObserver { var collections = [PhotoCollection]() var collectionIds = Set() - let processPHCollection: (PHCollection) -> Void = { (collection) in + let processPHCollection: ((collection: PHCollection, hideIfEmpty: Bool)) -> Void = { arg in + let (collection, hideIfEmpty) = arg + // De-duplicate by id. let collectionId = collection.localIdentifier guard !collectionIds.contains(collectionId) else { @@ -304,15 +306,14 @@ class PhotoLibrary: NSObject, PHPhotoLibraryChangeObserver { return } let photoCollection = PhotoCollection(collection: assetCollection) - // Hide empty collections. - guard photoCollection.contents().assetCount > 0 else { + guard !hideIfEmpty || photoCollection.contents().assetCount > 0 else { return } collections.append(photoCollection) } - let processPHAssetCollections: (PHFetchResult) -> Void = { (fetchResult) in - // undocumented constant + let processPHAssetCollections: ((fetchResult: PHFetchResult, hideIfEmpty: Bool)) -> Void = { arg in + let (fetchResult, hideIfEmpty) = arg fetchResult.enumerateObjects { (assetCollection, _, _) in // We're already sorting albums by last-updated. "Recently Added" is mostly redundant @@ -320,33 +321,40 @@ class PhotoLibrary: NSObject, PHPhotoLibraryChangeObserver { return } + // undocumented constant let kRecentlyDeletedAlbumSubtype = PHAssetCollectionSubtype(rawValue: 1000000201) guard assetCollection.assetCollectionSubtype != kRecentlyDeletedAlbumSubtype else { return } - processPHCollection(assetCollection) + processPHCollection((collection: assetCollection, hideIfEmpty: hideIfEmpty)) } } - let processPHCollections: (PHFetchResult) -> Void = { (fetchResult) in + let processPHCollections: ((fetchResult: PHFetchResult, hideIfEmpty: Bool)) -> Void = { arg in + let (fetchResult, hideIfEmpty) = arg + for index in 0.. Date: Tue, 12 Feb 2019 17:22:21 -0700 Subject: [PATCH 016/493] "Bump build to 2.36.0.6." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4ac614c6b..148d4a7e4 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.36.0.5 + 2.36.0.6 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 97ad7716a..244a828ca 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.36.0 CFBundleVersion - 2.36.0.5 + 2.36.0.6 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 2c0aa7a222dec1df826313fea16cf695feec3992 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:40:40 -0500 Subject: [PATCH 017/493] Sketch out the onboarding permissions view. --- Signal.xcodeproj/project.pbxproj | 8 + .../BackupRestoreViewController.swift | 2 +- .../Registration/OnboardingDelegate.swift | 11 ++ .../OnboardingPermissionsViewController.swift | 180 ++++++++++++++++++ .../environment/PushRegistrationManager.swift | 2 +- SignalMessaging/categories/UIView+OWS.h | 1 + SignalMessaging/categories/UIView+OWS.m | 9 + 7 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/OnboardingDelegate.swift create mode 100644 Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c26f2904f..9b7ca1504 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -72,6 +72,8 @@ 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B651FD0AA9400BC14EF /* UIFont+OWS.m */; }; 34480B681FD0AA9400BC14EF /* UIFont+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */; }; + 3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */; }; + 3448E15E221333F5004B052E /* OnboardingDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15D221333F5004B052E /* OnboardingDelegate.swift */; }; 344F248D2007CCD600CFB4F4 /* DisplayableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; @@ -723,6 +725,8 @@ 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+OWS.h"; sourceTree = ""; }; 344825C4211390C700DB4BD8 /* OWSOrphanDataCleaner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSOrphanDataCleaner.h; sourceTree = ""; }; 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanDataCleaner.m; sourceTree = ""; }; + 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPermissionsViewController.swift; sourceTree = ""; }; + 3448E15D221333F5004B052E /* OnboardingDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingDelegate.swift; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableText.swift; sourceTree = ""; }; 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; @@ -1439,6 +1443,8 @@ 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, + 3448E15D221333F5004B052E /* OnboardingDelegate.swift */, + 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */, @@ -3496,6 +3502,7 @@ 4542DF54208D40AC007B4E76 /* LoadingViewController.swift in Sources */, 34D5CCA91EAE3D30005515DB /* AvatarViewHelper.m in Sources */, 34D1F0B71F87F8850066283D /* OWSGenericAttachmentView.m in Sources */, + 3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */, 34D920E720E179C200D51158 /* OWSMessageFooterView.m in Sources */, 341341EF2187467A00192D59 /* ConversationViewModel.m in Sources */, 348BB25D20A0C5530047AEC2 /* ContactShareViewHelper.swift in Sources */, @@ -3586,6 +3593,7 @@ 34D1F0861F8678AA0066283D /* ConversationViewController.m in Sources */, 3427C64320F500E000EEC730 /* OWSMessageTimerView.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, + 3448E15E221333F5004B052E /* OnboardingDelegate.swift in Sources */, 340FC8BD204DAC8D007AEB0F /* ShowGroupMembersViewController.m in Sources */, 3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, diff --git a/Signal/src/ViewControllers/Registration/BackupRestoreViewController.swift b/Signal/src/ViewControllers/Registration/BackupRestoreViewController.swift index 7da4aea50..1887575c0 100644 --- a/Signal/src/ViewControllers/Registration/BackupRestoreViewController.swift +++ b/Signal/src/ViewControllers/Registration/BackupRestoreViewController.swift @@ -170,6 +170,6 @@ public class BackupRestoreViewController: OWSTableViewController { // MARK: Orientation public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { - return DefaultUIInterfaceOrientationMask() + return .portrait } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingDelegate.swift b/Signal/src/ViewControllers/Registration/OnboardingDelegate.swift new file mode 100644 index 000000000..5e2bd4dda --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingDelegate.swift @@ -0,0 +1,11 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public protocol OnboardingController: class { + func onboardingPermissionsWasSkipped(viewController: UIViewController) + func onboardingPermissionsDidComplete(viewController: UIViewController) +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift new file mode 100644 index 000000000..4a349bb2b --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -0,0 +1,180 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +@objc +public class MockOnboardingController: NSObject, OnboardingController { + public func onboardingPermissionsWasSkipped(viewController: UIViewController) {} + + public func onboardingPermissionsDidComplete(viewController: UIViewController) {} +} + +// MARK: - + +@objc +public class OnboardingPermissionsViewController: OWSViewController { + // Unlike a delegate, the OnboardingController we should retain a strong + // reference to the onboardingController. + private var onboardingController: OnboardingController + + @objc + public init(onboardingController: OnboardingController) { + self.delegate = onboardingController + + super.init(nibName: nil, bundle: nil) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - + + override public func loadView() { + super.loadView() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + + // TODO: +// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + + navigationItem.rightBarButtonItem = UIBarButtonItem(title: NSLocalizedString("NAVIGATION_ITEM_SKIP_BUTTON", comment: "A button to skip a view."), + style: .plain, + target: self, + action: #selector(skipWasPressed)) + + let titleLabel = UILabel() + titleLabel.text = NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.") + titleLabel.textColor = Theme.primaryColor + titleLabel.font = UIFont.ows_dynamicTypeTitle2.ows_mediumWeight() + titleLabel.numberOfLines = 0 + titleLabel.lineBreakMode = .byWordWrapping + titleLabel.textAlignment = .center + view.addSubview(titleLabel) + titleLabel.autoPinWidthToSuperviewMargins() + titleLabel.autoPinEdge(toSuperviewMargin: .top) + + let explainerLabel = UILabel() + // TODO: Finalize copy. + explainerLabel.text = NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.") + explainerLabel.textColor = Theme.secondaryColor + explainerLabel.font = UIFont.ows_dynamicTypeCaption1 + explainerLabel.numberOfLines = 0 + explainerLabel.textAlignment = .center + explainerLabel.lineBreakMode = .byWordWrapping + explainerLabel.isUserInteractionEnabled = true + explainerLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explainerLabelTapped))) + + // TODO: Make sure this all fits if dynamic font sizes are maxed out. + let buttonHeight: CGFloat = 48 + let giveAccessButton = OWSFlatButton.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", + comment: "Label for the 'give access' button in the 'onboarding permissions' view."), + font: OWSFlatButton.fontForHeight(buttonHeight), + titleColor: .white, + backgroundColor: .ows_materialBlue, + target: self, + selector: #selector(giveAccessPressed)) + giveAccessButton.autoSetDimension(.height, toSize: buttonHeight) + + let notNowButton = OWSFlatButton.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", + comment: "Label for the 'give access' button in the 'onboarding permissions' view."), + font: OWSFlatButton.fontForHeight(buttonHeight), + titleColor: .white, + backgroundColor: .ows_materialBlue, + target: self, + selector: #selector(notNowPressed)) + notNowButton.autoSetDimension(.height, toSize: buttonHeight) + + let buttonStack = UIStackView(arrangedSubviews: [ + giveAccessButton, + notNowButton + ]) + buttonStack.axis = .vertical + buttonStack.alignment = .fill + buttonStack.spacing = 12 + + let stackView = UIStackView(arrangedSubviews: [ + explainerLabel, + buttonStack + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.spacing = 40 + view.addSubview(stackView) + stackView.autoPinWidthToSuperviewMargins() + stackView.autoVCenterInSuperview() + NSLayoutConstraint.autoSetPriority(.defaultHigh) { + stackView.autoPinEdge(.top, to: .bottom, of: titleLabel, withOffset: 20, relation: .greaterThanOrEqual) + } + } + + // MARK: Request Access + + private func requestAccess() { + Logger.info("") + + // TODO: We need to defer app's request notification permissions until onboarding is complete. + requestContactsAccess().then { _ in + return PushRegistrationManager.shared.registerUserNotificationSettings() + }.done { [weak self] in + guard let self = self else { + return + } + self.onboardingController.onboardingPermissionsDidComplete(viewController: self) + }.retainUntilComplete() + } + + private func requestContactsAccess() -> Promise { + Logger.info("") + + let (promise, resolver) = Promise.pending() + CNContactStore().requestAccess(for: CNEntityType.contacts) { (granted, error) -> Void in + if granted { + Logger.info("Granted.") + } else { + Logger.error("Error: \(String(describing: error)).") + } + // Always fulfill. + resolver.fulfill(()) + } + return promise + } + + // MARK: Orientation + + public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { + return .portrait + } + + // MARK: - Events + + @objc func skipWasPressed() { + Logger.info("") + + onboardingController.onboardingPermissionsWasSkipped(viewController: self) + } + + @objc func explainerLabelTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + // TODO: + } + + @objc func giveAccessPressed() { + Logger.info("") + + requestAccess() + } + + @objc func notNowPressed() { + Logger.info("") + + delegate?.onboardingPermissionsWasSkipped(viewController: self) + } +} diff --git a/Signal/src/environment/PushRegistrationManager.swift b/Signal/src/environment/PushRegistrationManager.swift index 44ab9cb21..acadafecd 100644 --- a/Signal/src/environment/PushRegistrationManager.swift +++ b/Signal/src/environment/PushRegistrationManager.swift @@ -127,7 +127,7 @@ public enum PushRegistrationError: Error { // User notification settings must be registered *before* AppDelegate will // return any requested push tokens. - private func registerUserNotificationSettings() -> Promise { + public func registerUserNotificationSettings() -> Promise { AssertIsOnMainThread() Logger.info("registering user notification settings") return notificationPresenter.registerNotificationSettings() diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 2a7f63224..0c47facd0 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -26,6 +26,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); // Pins the width of this view to the width of its superview, with uniform margins. - (NSArray *)autoPinWidthToSuperviewWithMargin:(CGFloat)margin; - (NSArray *)autoPinWidthToSuperview; +- (NSArray *)autoPinWidthToSuperviewMargins; // Pins the height of this view to the height of its superview, with uniform margins. - (NSArray *)autoPinHeightToSuperviewWithMargin:(CGFloat)margin; - (NSArray *)autoPinHeightToSuperview; diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index babbd3f9f..6eb7e98cf 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -44,6 +44,15 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) return result; } +- (NSArray *)autoPinWidthToSuperviewMargins +{ + NSArray *result = @[ + [self autoPinEdgeToSuperviewMargin:ALEdgeLeading], + [self autoPinEdgeToSuperviewMargin:ALEdgeTrailing], + ]; + return result; +} + - (NSArray *)autoPinWidthToSuperview { NSArray *result = @[ From 193c3dd96c8c38a996044543fd699e77604e21c2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:44:26 -0500 Subject: [PATCH 018/493] Sketch out the onboarding permissions view. --- Signal.xcodeproj/project.pbxproj | 8 ++++---- ...nboardingDelegate.swift => OnboardingController.swift} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename Signal/src/ViewControllers/Registration/{OnboardingDelegate.swift => OnboardingController.swift} (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 9b7ca1504..a194106e3 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -73,7 +73,7 @@ 34480B681FD0AA9400BC14EF /* UIFont+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */; }; 3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */; }; - 3448E15E221333F5004B052E /* OnboardingDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15D221333F5004B052E /* OnboardingDelegate.swift */; }; + 3448E15E221333F5004B052E /* OnboardingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15D221333F5004B052E /* OnboardingController.swift */; }; 344F248D2007CCD600CFB4F4 /* DisplayableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; @@ -726,7 +726,7 @@ 344825C4211390C700DB4BD8 /* OWSOrphanDataCleaner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSOrphanDataCleaner.h; sourceTree = ""; }; 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanDataCleaner.m; sourceTree = ""; }; 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPermissionsViewController.swift; sourceTree = ""; }; - 3448E15D221333F5004B052E /* OnboardingDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingDelegate.swift; sourceTree = ""; }; + 3448E15D221333F5004B052E /* OnboardingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingController.swift; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableText.swift; sourceTree = ""; }; 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; @@ -1443,7 +1443,7 @@ 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, - 3448E15D221333F5004B052E /* OnboardingDelegate.swift */, + 3448E15D221333F5004B052E /* OnboardingController.swift */, 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, @@ -3593,7 +3593,7 @@ 34D1F0861F8678AA0066283D /* ConversationViewController.m in Sources */, 3427C64320F500E000EEC730 /* OWSMessageTimerView.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, - 3448E15E221333F5004B052E /* OnboardingDelegate.swift in Sources */, + 3448E15E221333F5004B052E /* OnboardingController.swift in Sources */, 340FC8BD204DAC8D007AEB0F /* ShowGroupMembersViewController.m in Sources */, 3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, diff --git a/Signal/src/ViewControllers/Registration/OnboardingDelegate.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift similarity index 100% rename from Signal/src/ViewControllers/Registration/OnboardingDelegate.swift rename to Signal/src/ViewControllers/Registration/OnboardingController.swift From 18c4ed4a250e7f1be2eb86d727c54bf212eafa82 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:46:17 -0500 Subject: [PATCH 019/493] Sketch out the onboarding permissions view. --- .../Registration/OnboardingController.swift | 9 +++++++++ .../OnboardingPermissionsViewController.swift | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 5e2bd4dda..8869bdda4 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -9,3 +9,12 @@ public protocol OnboardingController: class { func onboardingPermissionsWasSkipped(viewController: UIViewController) func onboardingPermissionsDidComplete(viewController: UIViewController) } + +// MARK: - + +@objc +public class MockOnboardingController: NSObject, OnboardingController { + public func onboardingPermissionsWasSkipped(viewController: UIViewController) {} + + public func onboardingPermissionsDidComplete(viewController: UIViewController) {} +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 4a349bb2b..11cf0a735 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -5,15 +5,6 @@ import UIKit import PromiseKit -@objc -public class MockOnboardingController: NSObject, OnboardingController { - public func onboardingPermissionsWasSkipped(viewController: UIViewController) {} - - public func onboardingPermissionsDidComplete(viewController: UIViewController) {} -} - -// MARK: - - @objc public class OnboardingPermissionsViewController: OWSViewController { // Unlike a delegate, the OnboardingController we should retain a strong From 29e65a93aeccde0bf2b821120a608073da4c0bda Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:48:25 -0500 Subject: [PATCH 020/493] Sketch out the onboarding permissions view. --- .../Registration/OnboardingPermissionsViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 11cf0a735..b86006a4f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -13,7 +13,7 @@ public class OnboardingPermissionsViewController: OWSViewController { @objc public init(onboardingController: OnboardingController) { - self.delegate = onboardingController + self.onboardingController = onboardingController super.init(nibName: nil, bundle: nil) } From 407571c9d6a79c1e33469ad3b99606c8bf418927 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 13:54:25 -0500 Subject: [PATCH 021/493] Sketch out the onboarding permissions view. --- .../OnboardingPermissionsViewController.swift | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index b86006a4f..0770e797f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -104,6 +104,18 @@ public class OnboardingPermissionsViewController: OWSViewController { } } + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + } + // MARK: Request Access private func requestAccess() { @@ -166,6 +178,6 @@ public class OnboardingPermissionsViewController: OWSViewController { @objc func notNowPressed() { Logger.info("") - delegate?.onboardingPermissionsWasSkipped(viewController: self) + onboardingController.onboardingPermissionsWasSkipped(viewController: self) } } From d6826b94e072fe56241cbb078c6493575350f392 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 16:35:12 -0500 Subject: [PATCH 022/493] Respond to CR. --- .../OnboardingPermissionsViewController.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 0770e797f..495d4b6c3 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -7,8 +7,7 @@ import PromiseKit @objc public class OnboardingPermissionsViewController: OWSViewController { - // Unlike a delegate, the OnboardingController we should retain a strong - // reference to the onboardingController. + // Unlike a delegate, we can and should retain a strong reference to the OnboardingController. private var onboardingController: OnboardingController @objc @@ -47,8 +46,7 @@ public class OnboardingPermissionsViewController: OWSViewController { titleLabel.lineBreakMode = .byWordWrapping titleLabel.textAlignment = .center view.addSubview(titleLabel) - titleLabel.autoPinWidthToSuperviewMargins() - titleLabel.autoPinEdge(toSuperviewMargin: .top) + titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) let explainerLabel = UILabel() // TODO: Finalize copy. @@ -98,9 +96,9 @@ public class OnboardingPermissionsViewController: OWSViewController { stackView.spacing = 40 view.addSubview(stackView) stackView.autoPinWidthToSuperviewMargins() - stackView.autoVCenterInSuperview() + stackView.autoPinEdge(.top, to: .bottom, of: titleLabel, withOffset: 20, relation: .greaterThanOrEqual) NSLayoutConstraint.autoSetPriority(.defaultHigh) { - stackView.autoPinEdge(.top, to: .bottom, of: titleLabel, withOffset: 20, relation: .greaterThanOrEqual) + stackView.autoVCenterInSuperview() } } From 54c8c1f352dc984dd02a6075c3bee0dfe62c3599 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 14:56:58 -0500 Subject: [PATCH 023/493] Sketch out the onboarding splash view. --- Signal.xcodeproj/project.pbxproj | 8 ++ .../Contents.json | 21 ++++ .../Screen Shot 2019-02-12 at 2.22.35 PM.png | Bin 0 -> 36109 bytes .../OnboardingBaseViewController.swift | 75 +++++++++++++++ .../Registration/OnboardingController.swift | 18 +++- .../OnboardingPermissionsViewController.swift | 73 +++----------- .../OnboardingSplashViewController.swift | 91 ++++++++++++++++++ .../translations/en.lproj/Localizable.strings | 24 +++++ SignalMessaging/categories/UIView+OWS.swift | 14 +++ 9 files changed, 264 insertions(+), 60 deletions(-) create mode 100644 Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json create mode 100644 Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png create mode 100644 Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift create mode 100644 Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index a194106e3..1e6fe7f26 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -74,6 +74,8 @@ 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */; }; 3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */; }; 3448E15E221333F5004B052E /* OnboardingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15D221333F5004B052E /* OnboardingController.swift */; }; + 3448E16022134C89004B052E /* OnboardingSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */; }; + 3448E1622213585C004B052E /* OnboardingBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */; }; 344F248D2007CCD600CFB4F4 /* DisplayableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; @@ -727,6 +729,8 @@ 344825C5211390C800DB4BD8 /* OWSOrphanDataCleaner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanDataCleaner.m; sourceTree = ""; }; 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPermissionsViewController.swift; sourceTree = ""; }; 3448E15D221333F5004B052E /* OnboardingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingController.swift; sourceTree = ""; }; + 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingSplashViewController.swift; sourceTree = ""; }; + 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingBaseViewController.swift; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableText.swift; sourceTree = ""; }; 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; @@ -1443,8 +1447,10 @@ 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, + 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */, 3448E15D221333F5004B052E /* OnboardingController.swift */, 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, + 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */, @@ -3478,6 +3484,7 @@ D221A09A169C9E5E00537ABF /* main.m in Sources */, 3496957221A301A100DCFE74 /* OWSBackup.m in Sources */, 34B3F87B1E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift in Sources */, + 3448E1622213585C004B052E /* OnboardingBaseViewController.swift in Sources */, 34E5DC8220D8050D00C08145 /* RegistrationUtils.m in Sources */, 452EA09E1EA7ABE00078744B /* AttachmentPointerView.swift in Sources */, 45638BDC1F3DD0D400128435 /* DebugUICalling.swift in Sources */, @@ -3510,6 +3517,7 @@ 457C87B82032645C008D52D6 /* DebugUINotifications.swift in Sources */, 4C13C9F620E57BA30089A98B /* ColorPickerViewController.swift in Sources */, 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */, + 3448E16022134C89004B052E /* OnboardingSplashViewController.swift in Sources */, 34B6A903218B3F63007C4606 /* TypingIndicatorView.swift in Sources */, 458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */, 34B6A905218B4C91007C4606 /* TypingIndicatorInteraction.swift in Sources */, diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json new file mode 100644 index 000000000..2eb68d3be --- /dev/null +++ b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Screen Shot 2019-02-12 at 2.22.35 PM.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef277fb850fbe5c4fb308593fc2729d335bf4cf GIT binary patch literal 36109 zcmZU(18`+gw=Npnw%NfBI<{>)JGQlBI~^MxcWm3}*hvQ+TOB($|2gN~d#c{5T2*Ue zaAJLPj2We@D20qbfB*&thAbm3t_lVQ4)}Uq;9$OLil_DeeHDDI#l)0l#Kg#yT^uc} z?aaZz=n_qhjlan-(v1Ou#>Qh)4D<*to~n_Nv8u+sgMCwdgJeU-!(@3G`uf{=XxoE< zn7*AOeQu=L8zdwpY(j31YEBNK*%8

MvsweSNHnOzd0g?+W+60Ri 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 literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift new file mode 100644 index 000000000..9f6546b09 --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -0,0 +1,75 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +@objc +public class OnboardingBaseViewController: OWSViewController { + // Unlike a delegate, we can and should retain a strong reference to the OnboardingController. + let onboardingController: OnboardingController + + @objc + public init(onboardingController: OnboardingController) { + self.onboardingController = onboardingController + + super.init(nibName: nil, bundle: nil) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - + + func titleLabel(text: String) -> UILabel { + let titleLabel = UILabel() + titleLabel.text = text + titleLabel.textColor = Theme.primaryColor + titleLabel.font = UIFont.ows_dynamicTypeTitle2.ows_mediumWeight() + titleLabel.numberOfLines = 0 + titleLabel.lineBreakMode = .byWordWrapping + titleLabel.textAlignment = .center + return titleLabel + } + + func explanationLabel(explanationText: String, linkText: String, selector: Selector) -> UILabel { + let explanationText = NSAttributedString(string: explanationText) + .rtlSafeAppend(NSAttributedString(string: " ")) + .rtlSafeAppend(linkText, + attributes: [ + NSAttributedStringKey.foregroundColor: UIColor.ows_materialBlue + ]) + let explanationLabel = UILabel() + explanationLabel.textColor = Theme.secondaryColor + explanationLabel.font = UIFont.ows_dynamicTypeCaption1 + explanationLabel.attributedText = explanationText + explanationLabel.numberOfLines = 0 + explanationLabel.textAlignment = .center + explanationLabel.lineBreakMode = .byWordWrapping + explanationLabel.isUserInteractionEnabled = true + explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: selector)) + return explanationLabel + } + + func button(title: String, selector: Selector) -> UIView { + // TODO: Make sure this all fits if dynamic font sizes are maxed out. + let buttonHeight: CGFloat = 48 + let button = OWSFlatButton.button(title: title, + font: OWSFlatButton.fontForHeight(buttonHeight), + titleColor: .white, + backgroundColor: .ows_materialBlue, + target: self, + selector: selector) + button.autoSetDimension(.height, toSize: buttonHeight) + return button + } + + // MARK: Orientation + + public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { + return .portrait + } +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 8869bdda4..7514dc8b3 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -6,6 +6,10 @@ import UIKit @objc public protocol OnboardingController: class { + func initialViewController() -> UIViewController + + func onboardingSplashDidComplete(viewController: UIViewController) + func onboardingPermissionsWasSkipped(viewController: UIViewController) func onboardingPermissionsDidComplete(viewController: UIViewController) } @@ -13,8 +17,18 @@ public protocol OnboardingController: class { // MARK: - @objc -public class MockOnboardingController: NSObject, OnboardingController { +public class OnboardingControllerImpl: NSObject, OnboardingController { + public func initialViewController() -> UIViewController { + let view = OnboardingSplashViewController(onboardingController: self) + return view + } + + public func onboardingSplashDidComplete(viewController: UIViewController) { + let view = OnboardingPermissionsViewController(onboardingController: self) + viewController.navigationController?.pushViewController(view, animated: true) + } + public func onboardingPermissionsWasSkipped(viewController: UIViewController) {} - + public func onboardingPermissionsDidComplete(viewController: UIViewController) {} } diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 495d4b6c3..c19dd160d 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -6,23 +6,7 @@ import UIKit import PromiseKit @objc -public class OnboardingPermissionsViewController: OWSViewController { - // Unlike a delegate, we can and should retain a strong reference to the OnboardingController. - private var onboardingController: OnboardingController - - @objc - public init(onboardingController: OnboardingController) { - self.onboardingController = onboardingController - - super.init(nibName: nil, bundle: nil) - } - - @available(*, unavailable, message: "use other init() instead.") - required public init?(coder aDecoder: NSCoder) { - notImplemented() - } - - // MARK: - +public class OnboardingPermissionsViewController: OnboardingBaseViewController { override public func loadView() { super.loadView() @@ -38,46 +22,25 @@ public class OnboardingPermissionsViewController: OWSViewController { target: self, action: #selector(skipWasPressed)) - let titleLabel = UILabel() - titleLabel.text = NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.") - titleLabel.textColor = Theme.primaryColor - titleLabel.font = UIFont.ows_dynamicTypeTitle2.ows_mediumWeight() - titleLabel.numberOfLines = 0 - titleLabel.lineBreakMode = .byWordWrapping - titleLabel.textAlignment = .center + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.")) view.addSubview(titleLabel) titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) - let explainerLabel = UILabel() // TODO: Finalize copy. - explainerLabel.text = NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.") - explainerLabel.textColor = Theme.secondaryColor - explainerLabel.font = UIFont.ows_dynamicTypeCaption1 - explainerLabel.numberOfLines = 0 - explainerLabel.textAlignment = .center - explainerLabel.lineBreakMode = .byWordWrapping - explainerLabel.isUserInteractionEnabled = true - explainerLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explainerLabelTapped))) + let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", + comment: "Explanation in the 'onboarding permissions' view."), + linkText: NSLocalizedString("ONBOARDING_PERMISSIONS_LEARN_MORE_LINK", + comment: "Link to the 'learn more' in the 'onboarding permissions' view."), + selector: #selector(explanationLabelTapped)) // TODO: Make sure this all fits if dynamic font sizes are maxed out. - let buttonHeight: CGFloat = 48 - let giveAccessButton = OWSFlatButton.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", - comment: "Label for the 'give access' button in the 'onboarding permissions' view."), - font: OWSFlatButton.fontForHeight(buttonHeight), - titleColor: .white, - backgroundColor: .ows_materialBlue, - target: self, - selector: #selector(giveAccessPressed)) - giveAccessButton.autoSetDimension(.height, toSize: buttonHeight) + let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", + comment: "Label for the 'give access' button in the 'onboarding permissions' view."), + selector: #selector(giveAccessPressed)) - let notNowButton = OWSFlatButton.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", - comment: "Label for the 'give access' button in the 'onboarding permissions' view."), - font: OWSFlatButton.fontForHeight(buttonHeight), - titleColor: .white, - backgroundColor: .ows_materialBlue, - target: self, - selector: #selector(notNowPressed)) - notNowButton.autoSetDimension(.height, toSize: buttonHeight) + let notNowButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON", + comment: "Label for the 'not now' button in the 'onboarding permissions' view."), + selector: #selector(notNowPressed)) let buttonStack = UIStackView(arrangedSubviews: [ giveAccessButton, @@ -88,7 +51,7 @@ public class OnboardingPermissionsViewController: OWSViewController { buttonStack.spacing = 12 let stackView = UIStackView(arrangedSubviews: [ - explainerLabel, + explanationLabel, buttonStack ]) stackView.axis = .vertical @@ -146,12 +109,6 @@ public class OnboardingPermissionsViewController: OWSViewController { return promise } - // MARK: Orientation - - public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { - return .portrait - } - // MARK: - Events @objc func skipWasPressed() { @@ -160,7 +117,7 @@ public class OnboardingPermissionsViewController: OWSViewController { onboardingController.onboardingPermissionsWasSkipped(viewController: self) } - @objc func explainerLabelTapped(sender: UIGestureRecognizer) { + @objc func explanationLabelTapped(sender: UIGestureRecognizer) { guard sender.state == .recognized else { return } diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift new file mode 100644 index 000000000..aa4b0ce71 --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -0,0 +1,91 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +@objc +public class OnboardingSplashViewController: OnboardingBaseViewController { + + override public func loadView() { + super.loadView() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + // TODO: + // navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + + let heroImage = UIImage(named: "onboarding_splash_hero") + let heroImageView = UIImageView(image: heroImage) + heroImageView.contentMode = .scaleAspectFit + heroImageView.layer.minificationFilter = kCAFilterTrilinear + heroImageView.layer.magnificationFilter = kCAFilterTrilinear + heroImageView.setCompressionResistanceLow() + heroImageView.setContentHuggingVerticalLow() + + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_SPLASH_TITLE", comment: "Title of the 'onboarding splash' view.")) + view.addSubview(titleLabel) + titleLabel.autoPinWidthToSuperviewMargins() + titleLabel.autoPinEdge(toSuperviewMargin: .top) + + // TODO: Finalize copy. + let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_SPLASH_EXPLANATION", + comment: "Explanation in the 'onboarding splash' view."), + linkText: NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", + comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view."), + selector: #selector(explanationLabelTapped)) + + // TODO: Make sure this all fits if dynamic font sizes are maxed out. + let continueButton = self.button(title: NSLocalizedString("BUTTON_CONTINUE", + comment: "Label for 'continue' button."), + selector: #selector(continuePressed)) + view.addSubview(continueButton) + + let stackView = UIStackView(arrangedSubviews: [ + heroImageView, + UIView.spacer(withHeight: 22), + titleLabel, + UIView.spacer(withHeight: 56), + explanationLabel, + UIView.spacer(withHeight: 40), + continueButton + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperviewMargins() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0) + } + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + self.navigationController?.isNavigationBarHidden = true + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.navigationController?.isNavigationBarHidden = true + } + + // MARK: - Events + + @objc func explanationLabelTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + // TODO: + } + + @objc func continuePressed() { + Logger.info("") + + onboardingController.onboardingSplashDidComplete(viewController: self) + } +} diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index ef6fbda3c..8d153c632 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1496,6 +1496,30 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "ONBOARDING_PERMISSIONS_EXPLANATION"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON" = "Give Access"; + +/* Link to the 'learn more' in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_LEARN_MORE_LINK" = "Learn More"; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "We need access to your contacts and notifications"; + +/* Explanation in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_EXPLANATION" = "By continuing, you agree to Signal's terms."; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms and Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Settings"; diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 1e826eb0a..d6ce22e95 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -72,4 +72,18 @@ extension UIView { return nil } } + + @objc + public class func spacer(withWidth width: CGFloat) -> UIView { + let view = UIView() + view.autoSetDimension(.width, toSize: width) + return view + } + + @objc + public class func spacer(withHeight height: CGFloat) -> UIView { + let view = UIView() + view.autoSetDimension(.height, toSize: height) + return view + } } From ed30b15fdadfcc2fdc70a33f8c7e83e5d5753272 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 14:55:34 -0500 Subject: [PATCH 024/493] Add call setup time logging. --- Signal/src/call/CallService.swift | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index b79b3d4a5..8de9dc8f8 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -106,6 +106,9 @@ protocol SignalCallDataDelegate: class { // Gather all per-call state in one place. private class SignalCallData: NSObject { + + let startTime: UInt64 + fileprivate weak var delegate: SignalCallDataDelegate? public let call: SignalCall @@ -154,8 +157,9 @@ private class SignalCallData: NSObject { } } - required init(call: SignalCall, delegate: SignalCallDataDelegate) { + required init(call: SignalCall, startTime: UInt64, delegate: SignalCallDataDelegate) { self.call = call + self.startTime = startTime self.delegate = delegate let (callConnectedPromise, callConnectedResolver) = Promise.pending() @@ -438,6 +442,8 @@ private class SignalCallData: NSObject { func handleOutgoingCall(_ call: SignalCall) -> Promise { AssertIsOnMainThread() + let startTime = NSDate.ows_millisecondTimeStamp() + guard self.call == nil else { let errorDescription = "call was unexpectedly already set." Logger.error(errorDescription) @@ -446,7 +452,7 @@ private class SignalCallData: NSObject { return Promise(error: CallError.assertionError(description: errorDescription)) } - let callData = SignalCallData(call: call, delegate: self) + let callData = SignalCallData(call: call, startTime: startTime, delegate: self) self.callData = callData // MJK TODO remove this timestamp param @@ -677,6 +683,8 @@ private class SignalCallData: NSObject { public func handleReceivedOffer(thread: TSContactThread, callId: UInt64, sessionDescription callerSessionDescription: String) { AssertIsOnMainThread() + let startTime = NSDate.ows_millisecondTimeStamp() + let newCall = SignalCall.incomingCall(localId: UUID(), remotePhoneNumber: thread.contactIdentifier(), signalingId: callId) Logger.info("receivedCallOffer: \(newCall.identifiersForLogs)") @@ -747,7 +755,7 @@ private class SignalCallData: NSObject { Logger.info("starting new call: \(newCall.identifiersForLogs)") - let callData = SignalCallData(call: newCall, delegate: self) + let callData = SignalCallData(call: newCall, startTime: startTime, delegate: self) self.callData = callData var backgroundTask: OWSBackgroundTask? = OWSBackgroundTask(label: "\(#function)", completionBlock: { [weak self] status in @@ -972,20 +980,29 @@ private class SignalCallData: NSObject { private func handleIceConnected() { AssertIsOnMainThread() - guard let call = self.call else { + guard let callData = self.callData else { // This will only be called for the current peerConnectionClient, so // fail the current call. OWSProdError(OWSAnalyticsEvents.callServiceCallMissing(), file: #file, function: #function, line: #line) handleFailedCurrentCall(error: CallError.assertionError(description: "ignoring \(#function) since there is no current call.")) return } + let call = callData.call - Logger.info("\(call.identifiersForLogs).") + Logger.info("\(call.identifiersForLogs)") switch call.state { case .dialing: + if call.state != .remoteRinging { + let connectedTime = NSDate.ows_millisecondTimeStamp() + Logger.info("Connected in: \(connectedTime - callData.startTime)") + } call.state = .remoteRinging case .answering: + if call.state != .localRinging { + let connectedTime = NSDate.ows_millisecondTimeStamp() + Logger.info("Connected in: \(connectedTime - callData.startTime)") + } call.state = .localRinging self.callUIAdapter.reportIncomingCall(call, thread: call.thread) case .remoteRinging: From d62fa19cb521f40a46ba54ef45f6176d81010161 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 09:34:24 -0500 Subject: [PATCH 025/493] Respond to CR. --- Signal/src/call/CallService.swift | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index 8de9dc8f8..197561c7c 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -107,8 +107,6 @@ protocol SignalCallDataDelegate: class { // Gather all per-call state in one place. private class SignalCallData: NSObject { - let startTime: UInt64 - fileprivate weak var delegate: SignalCallDataDelegate? public let call: SignalCall @@ -157,9 +155,8 @@ private class SignalCallData: NSObject { } } - required init(call: SignalCall, startTime: UInt64, delegate: SignalCallDataDelegate) { + required init(call: SignalCall, delegate: SignalCallDataDelegate) { self.call = call - self.startTime = startTime self.delegate = delegate let (callConnectedPromise, callConnectedResolver) = Promise.pending() @@ -442,7 +439,8 @@ private class SignalCallData: NSObject { func handleOutgoingCall(_ call: SignalCall) -> Promise { AssertIsOnMainThread() - let startTime = NSDate.ows_millisecondTimeStamp() + let callId = call.signalingId + BenchEventStart(title: "Outgoing Call Connection", eventId: "call-\(callId)") guard self.call == nil else { let errorDescription = "call was unexpectedly already set." @@ -452,7 +450,7 @@ private class SignalCallData: NSObject { return Promise(error: CallError.assertionError(description: errorDescription)) } - let callData = SignalCallData(call: call, startTime: startTime, delegate: self) + let callData = SignalCallData(call: call, delegate: self) self.callData = callData // MJK TODO remove this timestamp param @@ -683,7 +681,7 @@ private class SignalCallData: NSObject { public func handleReceivedOffer(thread: TSContactThread, callId: UInt64, sessionDescription callerSessionDescription: String) { AssertIsOnMainThread() - let startTime = NSDate.ows_millisecondTimeStamp() + BenchEventStart(title: "Incoming Call Connection", eventId: "call-\(callId)") let newCall = SignalCall.incomingCall(localId: UUID(), remotePhoneNumber: thread.contactIdentifier(), signalingId: callId) @@ -755,7 +753,7 @@ private class SignalCallData: NSObject { Logger.info("starting new call: \(newCall.identifiersForLogs)") - let callData = SignalCallData(call: newCall, startTime: startTime, delegate: self) + let callData = SignalCallData(call: newCall, delegate: self) self.callData = callData var backgroundTask: OWSBackgroundTask? = OWSBackgroundTask(label: "\(#function)", completionBlock: { [weak self] status in @@ -988,20 +986,19 @@ private class SignalCallData: NSObject { return } let call = callData.call + let callId = call.signalingId Logger.info("\(call.identifiersForLogs)") switch call.state { case .dialing: if call.state != .remoteRinging { - let connectedTime = NSDate.ows_millisecondTimeStamp() - Logger.info("Connected in: \(connectedTime - callData.startTime)") + BenchEventComplete(eventId: "call-\(callId)") } call.state = .remoteRinging case .answering: if call.state != .localRinging { - let connectedTime = NSDate.ows_millisecondTimeStamp() - Logger.info("Connected in: \(connectedTime - callData.startTime)") + BenchEventComplete(eventId: "call-\(callId)") } call.state = .localRinging self.callUIAdapter.reportIncomingCall(call, thread: call.thread) From 0807325190d1743ace9dc162a660ccb1f1af0aec Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 14:21:32 -0500 Subject: [PATCH 026/493] First draft of image editor's text tool. --- .../xcshareddata/xcschemes/Signal.xcscheme | 17 ++++++------ .../ConversationViewController.m | 26 +++++++++++++++++++ .../HomeView/HomeViewController.m | 18 +++++++++++++ .../src/Network/WebSockets/OWSWebSocket.m | 2 ++ 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index f5fde70a8..16d93f758 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> @@ -136,8 +136,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - enableThreadSanitizer = "YES" - enableUBSanitizer = "YES" + disableMainThreadChecker = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a40183cd2..51c1bf479 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1234,6 +1234,32 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; + + [self showDebugImageEditorAsync]; +} + +- (void)showDebugImageEditorAsync +{ + dispatch_async(dispatch_get_main_queue(), ^{ + NSString *_Nullable filePath = [[NSBundle mainBundle] pathForResource:@"qr@2x" ofType:@"png" inDirectory:nil]; + if (!filePath) { + OWSFailDebug(@"Missing asset."); + } + + DataSource *_Nullable dataSource = + [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO]; + if (!dataSource) { + OWSFailDebug(@"Invalid asset."); + return; + } + + // "Document picker" attachments _SHOULD NOT_ be resized, if possible. + SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource + dataUTI:(NSString *)kUTTypePNG + imageQuality:TSImageQualityOriginal]; + + [self showApprovalDialogForAttachment:attachment]; + }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..02850c1d2 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,8 +482,26 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + [self presentFirstThreadAsync]; } +#ifdef DEBUG + +- (void)presentFirstThreadAsync +{ + dispatch_async(dispatch_get_main_queue(), ^{ + if ([self.tableView numberOfRowsInSection:HomeViewControllerSectionConversations] < 1) { + return; + } + TSThread *thread = + [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; + [self presentThread:thread action:ConversationViewActionNone animated:YES]; + }); +} + +#endif + - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index 17d6b7c5a..c93a07d23 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -910,6 +910,8 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O { OWSAssertIsOnMainThread(); + return NO; + // Don't open socket in app extensions. if (!CurrentAppContext().isMainApp) { return NO; From 618a3b1d4705b9c1f977684382d76daf69c7dbc1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 6 Feb 2019 16:00:22 -0500 Subject: [PATCH 027/493] Sketch out crop tool. --- Signal.xcodeproj/project.pbxproj | 52 +- .../xcshareddata/xcschemes/Signal.xcscheme | 17 +- .../ConversationViewController.m | 24 +- Signal/src/views/OWSProgressView.m | 2 +- Signal/src/views/TypingIndicatorView.swift | 6 +- .../ImageEditor/ImageEditorModelTest.swift | 81 ++ .../{ => ImageEditor}/ImageEditorTest.swift | 7 +- .../translations/en.lproj/Localizable.strings | 9 + .../AttachmentApprovalViewController.swift | 12 +- .../ImageEditor/ImageEditorCanvasView.swift | 657 ++++++++++++++ .../ImageEditor/ImageEditorContents.swift | 77 ++ .../ImageEditorCropViewController.swift | 649 ++++++++++++++ .../ImageEditorGestureRecognizer.swift | 204 ----- .../Views/ImageEditor/ImageEditorItem.swift | 70 ++ .../Views/ImageEditor/ImageEditorModel.swift | 636 +++----------- .../ImageEditorPanGestureRecognizer.swift | 36 + .../ImageEditorPinchGestureRecognizer.swift | 27 +- .../ImageEditor/ImageEditorStrokeItem.swift | 57 ++ .../ImageEditor/ImageEditorTextItem.swift | 154 ++++ .../ImageEditorTextViewController.swift | 18 +- .../Views/ImageEditor/ImageEditorView.swift | 802 ++++-------------- .../Views/ImageEditor/OrderedDictionary.swift | 104 +++ SignalMessaging/categories/UIColor+OWS.m | 3 +- SignalMessaging/categories/UIView+OWS.m | 2 +- SignalMessaging/categories/UIView+OWS.swift | 112 +++ .../src/Network/WebSockets/OWSWebSocket.m | 2 - SignalServiceKit/src/Util/OWSMath.h | 2 - 27 files changed, 2401 insertions(+), 1421 deletions(-) create mode 100644 Signal/test/views/ImageEditor/ImageEditorModelTest.swift rename Signal/test/views/{ => ImageEditor}/ImageEditorTest.swift (93%) create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorContents.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorItem.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorStrokeItem.swift create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift create mode 100644 SignalMessaging/Views/ImageEditor/OrderedDictionary.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 1e6fe7f26..76ec0e98b 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -234,12 +234,21 @@ 34B6D27520F664C900765BE2 /* OWSUnreadIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B6D27320F664C800765BE2 /* OWSUnreadIndicator.m */; }; 34BBC84B220B2CB200857249 /* ImageEditorTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */; }; 34BBC84D220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */; }; + 34BBC84F220B8A0100857249 /* ImageEditorCropViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */; }; + 34BBC851220B8EEF00857249 /* ImageEditorCanvasView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */; }; + 34BBC857220C7ADA00857249 /* ImageEditorItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC852220C7AD900857249 /* ImageEditorItem.swift */; }; + 34BBC858220C7ADA00857249 /* ImageEditorContents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC853220C7ADA00857249 /* ImageEditorContents.swift */; }; + 34BBC859220C7ADA00857249 /* ImageEditorStrokeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC854220C7ADA00857249 /* ImageEditorStrokeItem.swift */; }; + 34BBC85A220C7ADA00857249 /* ImageEditorTextItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC855220C7ADA00857249 /* ImageEditorTextItem.swift */; }; + 34BBC85B220C7ADA00857249 /* OrderedDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC856220C7ADA00857249 /* OrderedDictionary.swift */; }; + 34BBC85D220D19D600857249 /* ImageEditorPanGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */; }; + 34BBC861220E883300857249 /* ImageEditorModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC85F220E883200857249 /* ImageEditorModelTest.swift */; }; + 34BBC862220E883300857249 /* ImageEditorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBC860220E883200857249 /* ImageEditorTest.swift */; }; 34BECE2B1F74C12700D7438D /* DebugUIStress.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2A1F74C12700D7438D /* DebugUIStress.m */; }; 34BECE2E1F7ABCE000D7438D /* GifPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */; }; 34BECE301F7ABCF800D7438D /* GifPickerLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BECE2F1F7ABCF800D7438D /* GifPickerLayout.swift */; }; 34BEDB0B21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB0A21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift */; }; 34BEDB0E21C405B0007B0EAE /* ImageEditorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */; }; - 34BEDB1121C41E71007B0EAE /* ImageEditorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1021C41E71007B0EAE /* ImageEditorTest.swift */; }; 34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */; }; 34BEDB1621C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */; }; @@ -914,13 +923,22 @@ 34B6D27320F664C800765BE2 /* OWSUnreadIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSUnreadIndicator.m; sourceTree = ""; }; 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTextViewController.swift; sourceTree = ""; }; 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPinchGestureRecognizer.swift; sourceTree = ""; }; + 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorCropViewController.swift; sourceTree = ""; }; + 34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorCanvasView.swift; sourceTree = ""; }; + 34BBC852220C7AD900857249 /* ImageEditorItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorItem.swift; sourceTree = ""; }; + 34BBC853220C7ADA00857249 /* ImageEditorContents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorContents.swift; sourceTree = ""; }; + 34BBC854220C7ADA00857249 /* ImageEditorStrokeItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorStrokeItem.swift; sourceTree = ""; }; + 34BBC855220C7ADA00857249 /* ImageEditorTextItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTextItem.swift; sourceTree = ""; }; + 34BBC856220C7ADA00857249 /* OrderedDictionary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedDictionary.swift; sourceTree = ""; }; + 34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPanGestureRecognizer.swift; sourceTree = ""; }; + 34BBC85F220E883200857249 /* ImageEditorModelTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorModelTest.swift; sourceTree = ""; }; + 34BBC860220E883200857249 /* ImageEditorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTest.swift; sourceTree = ""; }; 34BECE291F74C12700D7438D /* DebugUIStress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUIStress.h; sourceTree = ""; }; 34BECE2A1F74C12700D7438D /* DebugUIStress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUIStress.m; sourceTree = ""; }; 34BECE2D1F7ABCE000D7438D /* GifPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GifPickerViewController.swift; sourceTree = ""; }; 34BECE2F1F7ABCF800D7438D /* GifPickerLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GifPickerLayout.swift; sourceTree = ""; }; 34BEDB0A21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS114RemoveDynamicInteractions.swift; sourceTree = ""; }; 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorModel.swift; sourceTree = ""; }; - 34BEDB1021C41E71007B0EAE /* ImageEditorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTest.swift; sourceTree = ""; }; 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorView.swift; sourceTree = ""; }; 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAnyTouchGestureRecognizer.h; sourceTree = ""; }; 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAnyTouchGestureRecognizer.m; sourceTree = ""; }; @@ -1867,6 +1885,15 @@ path = ViewControllers; sourceTree = ""; }; + 34BBC85E220E883200857249 /* ImageEditor */ = { + isa = PBXGroup; + children = ( + 34BBC85F220E883200857249 /* ImageEditorModelTest.swift */, + 34BBC860220E883200857249 /* ImageEditorTest.swift */, + ); + path = ImageEditor; + sourceTree = ""; + }; 34BECE2C1F7ABCE000D7438D /* GifPicker */ = { isa = PBXGroup; children = ( @@ -1880,11 +1907,19 @@ 34BEDB0C21C405B0007B0EAE /* ImageEditor */ = { isa = PBXGroup; children = ( + 34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */, + 34BBC853220C7ADA00857249 /* ImageEditorContents.swift */, + 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */, 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */, + 34BBC852220C7AD900857249 /* ImageEditorItem.swift */, 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */, + 34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */, 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */, + 34BBC854220C7ADA00857249 /* ImageEditorStrokeItem.swift */, + 34BBC855220C7ADA00857249 /* ImageEditorTextItem.swift */, 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */, 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */, + 34BBC856220C7ADA00857249 /* OrderedDictionary.swift */, ); path = ImageEditor; sourceTree = ""; @@ -1892,7 +1927,7 @@ 34BEDB0F21C41E71007B0EAE /* views */ = { isa = PBXGroup; children = ( - 34BEDB1021C41E71007B0EAE /* ImageEditorTest.swift */, + 34BBC85E220E883200857249 /* ImageEditor */, ); path = views; sourceTree = ""; @@ -3305,17 +3340,20 @@ 4CBBCA6321714B4500EEB37D /* OWS110SortIdMigration.swift in Sources */, 342950832124C9750000B063 /* OWSTextView.m in Sources */, 452EC6E1205FF5DC000E787C /* Bench.swift in Sources */, + 34BBC85D220D19D600857249 /* ImageEditorPanGestureRecognizer.swift in Sources */, 342950882124CB0A0000B063 /* OWSSearchBar.m in Sources */, 342950822124C9750000B063 /* OWSTextField.m in Sources */, 34AC0A13211B39EA00997B47 /* DisappearingTimerConfigurationView.swift in Sources */, 4CA46F4D219CFDAA0038ABDE /* GalleryRailView.swift in Sources */, 34480B621FD0A98800BC14EF /* UIColor+OWS.m in Sources */, 4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */, + 34BBC857220C7ADA00857249 /* ImageEditorItem.swift in Sources */, 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */, 34AC0A1C211B39EA00997B47 /* OWSFlatButton.swift in Sources */, 34C3C7932040B0DD0000134C /* OWSAudioPlayer.m in Sources */, 34AC09E5211B39B100997B47 /* ScreenLockViewController.m in Sources */, 34AC09F7211B39B100997B47 /* MediaMessageView.swift in Sources */, + 34BBC858220C7ADA00857249 /* ImageEditorContents.swift in Sources */, 3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */, 34AC09E6211B39B100997B47 /* SelectRecipientViewController.m in Sources */, 4C858A52212DC5E1001B45D3 /* UIImage+OWS.swift in Sources */, @@ -3327,6 +3365,7 @@ 346129AB1FD1F0EE00532771 /* OWSFormat.m in Sources */, 34AC0A12211B39EA00997B47 /* ContactTableViewCell.m in Sources */, 451F8A461FD715BA005CB9DA /* OWSGroupAvatarBuilder.m in Sources */, + 34BBC85B220C7ADA00857249 /* OrderedDictionary.swift in Sources */, 346129961FD1E30000532771 /* OWSDatabaseMigration.m in Sources */, 346129FB1FD5F31400532771 /* OWS101ExistingUsersBlockOnIdentityChange.m in Sources */, 34AC09EA211B39B100997B47 /* ModalActivityIndicatorViewController.swift in Sources */, @@ -3355,6 +3394,7 @@ 45BC829D1FD9C4B400011CF3 /* ShareViewDelegate.swift in Sources */, 3461295B1FD1D74C00532771 /* Environment.m in Sources */, 346129D51FD20ADC00532771 /* UIViewController+OWS.m in Sources */, + 34BBC851220B8EEF00857249 /* ImageEditorCanvasView.swift in Sources */, 347850691FD9B78A007B8332 /* AppSetup.m in Sources */, 346941A3215D2EE400B5BFAD /* Theme.m in Sources */, 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */, @@ -3369,6 +3409,7 @@ 34AC0A1A211B39EA00997B47 /* CommonStrings.swift in Sources */, 34AC0A19211B39EA00997B47 /* OWSAlerts.swift in Sources */, 34FDB29221FF986600A01202 /* UIView+OWS.swift in Sources */, + 34BBC859220C7ADA00857249 /* ImageEditorStrokeItem.swift in Sources */, 451F8A351FD710DE005CB9DA /* Searcher.swift in Sources */, 451F8A481FD715BA005CB9DA /* OWSContactAvatarBuilder.m in Sources */, 4503F1C3204711D300CEE724 /* OWS107LegacySounds.m in Sources */, @@ -3391,6 +3432,7 @@ 34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */, 451F8A441FD7156B005CB9DA /* BlockListUIUtils.m in Sources */, 34AC0A1E211B39EA00997B47 /* ThreadViewHelper.m in Sources */, + 34BBC85A220C7ADA00857249 /* ImageEditorTextItem.swift in Sources */, 34641E182088D7E900E2EDE5 /* OWSScreenLock.swift in Sources */, 346129721FD1D74C00532771 /* SignalKeyingStorage.m in Sources */, 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */, @@ -3399,6 +3441,7 @@ 34ABB2C42090C59700C727A6 /* OWSResaveCollectionDBMigration.m in Sources */, 4C948FF72146EB4800349F0D /* BlockListCache.swift in Sources */, 4551DB5A205C562300C8AE75 /* Collection+OWS.swift in Sources */, + 34BBC84F220B8A0100857249 /* ImageEditorCropViewController.swift in Sources */, 34AC09ED211B39B100997B47 /* ContactFieldView.swift in Sources */, 346129AF1FD1F5D900532771 /* SystemContactsFetcher.swift in Sources */, 34AC09E3211B39B100997B47 /* OWSViewController.m in Sources */, @@ -3614,14 +3657,15 @@ files = ( 456F6E2F1E261D1000FD2210 /* PeerConnectionClientTest.swift in Sources */, 458967111DC117CC00E9DD21 /* AccountManagerTest.swift in Sources */, - 34BEDB1121C41E71007B0EAE /* ImageEditorTest.swift in Sources */, 3491D9A121022DB7001EF5A1 /* CDSSigningCertificateTest.m in Sources */, + 34BBC861220E883300857249 /* ImageEditorModelTest.swift in Sources */, 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */, 458E383A1D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m in Sources */, 3421981C21061D2E00C57195 /* ByteParserTest.swift in Sources */, 34843B26214327C9004DED45 /* OWSOrphanDataCleanerTest.m in Sources */, 4C04F58421C860C50090D0BB /* MantlePerfTest.swift in Sources */, 45360B901F9527DA00FA666C /* SearcherTest.swift in Sources */, + 34BBC862220E883300857249 /* ImageEditorTest.swift in Sources */, 34DB0BED2011548B007B313F /* OWSDatabaseConverterTest.m in Sources */, 34843B2C214FE296004DED45 /* MockEnvironment.m in Sources */, 45360B911F952AA900FA666C /* MarqueeLabel.swift in Sources */, diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 16d93f758..f5fde70a8 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> @@ -136,7 +136,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - disableMainThreadChecker = "YES" + enableThreadSanitizer = "YES" + enableUBSanitizer = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 51c1bf479..17c8ec918 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1246,6 +1246,22 @@ typedef enum : NSUInteger { OWSFailDebug(@"Missing asset."); } + for (ConversationInteractionViewItem *viewItem in self.conversationViewModel.viewItems + .reverseObjectEnumerator) { + if (viewItem.mediaAlbumItems.count < 1) { + continue; + } + ConversationMediaAlbumItem *mediaItem = viewItem.mediaAlbumItems.firstObject; + if (mediaItem.attachmentStream == nil) { + continue; + } + if (!mediaItem.attachmentStream.isValidImage) { + continue; + } + filePath = mediaItem.attachmentStream.originalFilePath; + break; + } + DataSource *_Nullable dataSource = [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO]; if (!dataSource) { @@ -1253,10 +1269,12 @@ typedef enum : NSUInteger { return; } + NSString *fileExtension = filePath.pathExtension; + NSString *dataUTI = [MIMETypeUtil utiTypeForFileExtension:fileExtension]; + // "Document picker" attachments _SHOULD NOT_ be resized, if possible. - SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource - dataUTI:(NSString *)kUTTypePNG - imageQuality:TSImageQualityOriginal]; + SignalAttachment *attachment = + [SignalAttachment attachmentWithDataSource:dataSource dataUTI:dataUTI imageQuality:TSImageQualityOriginal]; [self showApprovalDialogForAttachment:attachment]; }); diff --git a/Signal/src/views/OWSProgressView.m b/Signal/src/views/OWSProgressView.m index 7e8f1985a..bfb2454fa 100644 --- a/Signal/src/views/OWSProgressView.m +++ b/Signal/src/views/OWSProgressView.m @@ -104,7 +104,7 @@ NS_ASSUME_NONNULL_BEGIN CGFloat baseProgress = borderThickness * 2; CGFloat minProgress = baseProgress; CGFloat maxProgress = MAX(0, self.bounds.size.width - baseProgress); - progressRect.size.width = CGFloatLerp(minProgress, maxProgress, self.progress); + progressRect.size.width = CGFloatLerp(minProgress, maxProgress, CGFloatClamp01(self.progress)); UIBezierPath *progressPath = [UIBezierPath bezierPathWithRoundedRect:progressRect cornerRadius:cornerRadius]; self.progressLayer.path = progressPath.CGPath; self.progressLayer.fillColor = self.color.CGColor; diff --git a/Signal/src/views/TypingIndicatorView.swift b/Signal/src/views/TypingIndicatorView.swift index 58e68683b..4e3014519 100644 --- a/Signal/src/views/TypingIndicatorView.swift +++ b/Signal/src/views/TypingIndicatorView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // @objc class TypingIndicatorView: UIStackView { @@ -108,9 +108,9 @@ var animationDuration: CFTimeInterval = 0 let addDotKeyFrame = { (keyFrameTime: CFTimeInterval, progress: CGFloat) in - let dotColor = baseColor.withAlphaComponent(CGFloatLerp(0.4, 1.0, progress)) + let dotColor = baseColor.withAlphaComponent(CGFloatLerp(0.4, 1.0, CGFloatClamp01(progress))) colorValues.append(dotColor.cgColor) - let radius = CGFloatLerp(TypingIndicatorView.kMinRadiusPt, TypingIndicatorView.kMaxRadiusPt, progress) + let radius = CGFloatLerp(TypingIndicatorView.kMinRadiusPt, TypingIndicatorView.kMaxRadiusPt, CGFloatClamp01(progress)) let margin = (TypingIndicatorView.kMaxRadiusPt - radius) * 0.5 let bezierPath = UIBezierPath(ovalIn: CGRect(x: margin, y: margin, width: radius, height: radius)) pathValues.append(bezierPath.cgPath) diff --git a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift new file mode 100644 index 000000000..fedb5b69e --- /dev/null +++ b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift @@ -0,0 +1,81 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import XCTest +@testable import Signal +@testable import SignalMessaging + +class ImageEditorModelTest: SignalBaseTest { + +// override func setUp() { +// super.setUp() +// } +// +// override func tearDown() { +// // Put teardown code here. This method is called after the invocation of each test method in the class. +// super.tearDown() +// } + + func testImageEditorTransform0() { + let imageSizePixels = CGSize(width: 200, height: 300) + let outputSizePixels = CGSize(width: 200, height: 300) + let unitTranslation = CGPoint.zero + let rotationRadians: CGFloat = 0 + let scaling: CGFloat = 1 + let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling) + + let viewSize = outputSizePixels + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSizePixels, transform: transform) + let affineTransform = transform.affineTransform(viewSize: viewSize) + + XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(100.0, imageFrame.center.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(150.0, imageFrame.center.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(200.0, imageFrame.bottomRight.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(300.0, imageFrame.bottomRight.applying(affineTransform).y, accuracy: 0.1) + } + + func testImageEditorTransform1() { + let imageSizePixels = CGSize(width: 864, height: 1536) + let outputSizePixels = CGSize(width: 432, height: 768) + let unitTranslation = CGPoint(x: +0.5, y: -0.5) + let rotationRadians: CGFloat = 0 + let scaling: CGFloat = 2 + let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling) + + let viewSize = CGSize(width: 335, height: 595) + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSizePixels, transform: transform) + let affineTransform = transform.affineTransform(viewSize: viewSize) + + XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(100.0, imageFrame.center.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(150.0, imageFrame.center.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(200.0, imageFrame.bottomRight.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(300.0, imageFrame.bottomRight.applying(affineTransform).y, accuracy: 0.1) + } + + func testAffineTransformComposition() { + XCTAssertEqual(+20.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).x, accuracy: 0.1) + XCTAssertEqual(+30.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).y, accuracy: 0.1) + XCTAssertEqual(+100.0, CGPoint.zero.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) + XCTAssertEqual(+150.0, CGPoint.zero.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + + XCTAssertEqual(+20.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).x, accuracy: 0.1) + XCTAssertEqual(+30.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).y, accuracy: 0.1) + XCTAssertEqual(-150.0, CGPoint.zero.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) + XCTAssertEqual(+100.0, CGPoint.zero.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + + XCTAssertEqual(+25.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).x, accuracy: 0.1) + XCTAssertEqual(+35.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).y, accuracy: 0.1) + XCTAssertEqual(+105.0, CGPoint.unit.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) + XCTAssertEqual(+155.0, CGPoint.unit.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + + XCTAssertEqual(+15.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).x, accuracy: 0.1) + XCTAssertEqual(+35.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).y, accuracy: 0.1) + XCTAssertEqual(-155.0, CGPoint.unit.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) + XCTAssertEqual(+105.0, CGPoint.unit.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + } +} diff --git a/Signal/test/views/ImageEditorTest.swift b/Signal/test/views/ImageEditor/ImageEditorTest.swift similarity index 93% rename from Signal/test/views/ImageEditorTest.swift rename to Signal/test/views/ImageEditor/ImageEditorTest.swift index 343e168a6..f6325b4df 100644 --- a/Signal/test/views/ImageEditorTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorTest.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import XCTest @@ -26,10 +26,7 @@ class ImageEditorTest: SignalBaseTest { } func testImageEditorContents() { - let imagePath = writeDummyImage() - - let contents = ImageEditorContents(imagePath: imagePath, - imageSizePixels: CGSize(width: 1, height: 1)) + let contents = ImageEditorContents() XCTAssertEqual(0, contents.itemMap.count) let item = ImageEditorItem(itemType: .test) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 8d153c632..1d161d876 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1086,6 +1086,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index fc0442660..a0416c31b 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -589,11 +589,11 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // Image was not edited. return attachmentItem.attachment } - guard imageEditorModel.itemCount() > 0 else { + guard imageEditorModel.isDirty() else { // Image editor has no changes. return attachmentItem.attachment } - guard let dstImage = ImageEditorView.renderForOutput(model: imageEditorModel) else { + guard let dstImage = ImageEditorCanvasView.renderForOutput(model: imageEditorModel, transform: imageEditorModel.currentTransform()) else { owsFailDebug("Could not render for output.") return attachmentItem.attachment } @@ -945,9 +945,13 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD if imageEditorView.configureSubviews() { mediaMessageView.isHidden = true + // TODO: Is this necessary? imageMediaView.isUserInteractionEnabled = true - mediaMessageView.superview?.addSubview(imageEditorView) - imageEditorView.autoPin(toEdgesOf: mediaMessageView) + + contentContainer.addSubview(imageEditorView) + imageEditorView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: imageEditorView, avoidNotch: true) + imageEditorView.autoPinWidthToSuperview() imageEditorView.addControls(to: imageEditorView) } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift new file mode 100644 index 000000000..2069ef7f6 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -0,0 +1,657 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +public class EditorTextLayer: CATextLayer { + let itemId: String + + public init(itemId: String) { + self.itemId = itemId + + super.init() + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } +} + +// MARK: - + +// A view for previewing an image editor model. +@objc +public class ImageEditorCanvasView: UIView { + + private let model: ImageEditorModel + + @objc + public required init(model: ImageEditorModel) { + self.model = model + + super.init(frame: .zero) + + model.add(observer: self) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - Views + + // TODO: Audit all usage of this view. + public let contentView = OWSLayerView() + + private let clipView = OWSLayerView() + + private var contentViewConstraints = [NSLayoutConstraint]() + + private var srcImage: UIImage? + + private var imageLayer = CALayer() + + @objc + public func configureSubviews() -> Bool { + self.backgroundColor = .clear + self.isOpaque = false + + self.srcImage = loadSrcImage() + + clipView.clipsToBounds = true + clipView.backgroundColor = .clear + clipView.isOpaque = false + clipView.layoutCallback = { [weak self] (_) in + guard let strongSelf = self else { + return + } + strongSelf.updateLayout() + } + addSubview(clipView) + + if let srcImage = srcImage { + imageLayer.contents = srcImage.cgImage + imageLayer.contentsScale = srcImage.scale + } + + contentView.backgroundColor = .clear + contentView.isOpaque = false + contentView.layer.addSublayer(imageLayer) + contentView.layoutCallback = { [weak self] (_) in + guard let strongSelf = self else { + return + } + strongSelf.updateAllContent() + } + clipView.addSubview(contentView) + contentView.ows_autoPinToSuperviewEdges() + + updateLayout() + + return true + } + + public var gestureReferenceView: UIView { + return clipView + } + + private func updateLayout() { + NSLayoutConstraint.deactivate(contentViewConstraints) + contentViewConstraints = ImageEditorCanvasView.updateContentLayout(transform: model.currentTransform(), + contentView: clipView) + } + + public class func updateContentLayout(transform: ImageEditorTransform, + contentView: UIView) -> [NSLayoutConstraint] { + guard let superview = contentView.superview else { + owsFailDebug("Content view has no superview.") + return [] + } + let outputSizePixels = transform.outputSizePixels + + let aspectRatio = outputSizePixels + var constraints = superview.applyScaleAspectFitLayout(subview: contentView, aspectRatio: aspectRatio.width / aspectRatio.height) + + let screenSize = UIScreen.main.bounds.size + let maxScreenSize = max(screenSize.width, screenSize.height) + let outputSizePoints = CGSize(width: maxScreenSize, height: maxScreenSize) + // TODO: Add a "shouldFill" parameter. + // let outputSizePoints = CGSizeScale(outputSizePixels, 1.0 / UIScreen.main.scale) + NSLayoutConstraint.autoSetPriority(UILayoutPriority.defaultLow) { + constraints.append(contentsOf: contentView.autoSetDimensions(to: outputSizePoints)) + } + return constraints + } + + @objc + public func loadSrcImage() -> UIImage? { + return ImageEditorCanvasView.loadSrcImage(model: model) + } + + @objc + public class func loadSrcImage(model: ImageEditorModel) -> UIImage? { + let srcImageData: Data + do { + let srcImagePath = model.srcImagePath + let srcImageUrl = URL(fileURLWithPath: srcImagePath) + srcImageData = try Data(contentsOf: srcImageUrl) + } catch { + Logger.error("Couldn't parse srcImageUrl") + return nil + } + // We use this constructor so that we can specify the scale. + guard let srcImage = UIImage(data: srcImageData, scale: 1.0) else { + owsFailDebug("Couldn't load background image.") + return nil + } + return srcImage + } + + // MARK: - Content + + var contentLayerMap = [String: CALayer]() + + internal func updateAllContent() { + AssertIsOnMainThread() + + Logger.verbose("") + + // Don't animate changes. + CATransaction.begin() + CATransaction.setDisableActions(true) + + for layer in contentLayerMap.values { + layer.removeFromSuperlayer() + } + contentLayerMap.removeAll() + + let viewSize = clipView.bounds.size + if viewSize.width > 0, + viewSize.height > 0 { + + applyTransform() + + updateImageLayer() + + for item in model.items() { + guard let layer = ImageEditorCanvasView.layerForItem(item: item, + model: model, + viewSize: viewSize) else { + continue + } + + contentView.layer.addSublayer(layer) + contentLayerMap[item.itemId] = layer + } + } + + updateLayout() + + // Force layout now. + setNeedsLayout() + layoutIfNeeded() + + CATransaction.commit() + } + + internal func updateContent(changedItemIds: [String]) { + AssertIsOnMainThread() + + Logger.verbose("") + + // Don't animate changes. + CATransaction.begin() + CATransaction.setDisableActions(true) + + // Remove all changed items. + for itemId in changedItemIds { + if let layer = contentLayerMap[itemId] { + layer.removeFromSuperlayer() + } + contentLayerMap.removeValue(forKey: itemId) + } + + let viewSize = clipView.bounds.size + if viewSize.width > 0, + viewSize.height > 0 { + + applyTransform() + + updateImageLayer() + + // Create layers for inserted and updated items. + for itemId in changedItemIds { + guard let item = model.item(forId: itemId) else { + // Item was deleted. + continue + } + + // Item was inserted or updated. + guard let layer = ImageEditorCanvasView.layerForItem(item: item, + model: model, + viewSize: viewSize) else { + continue + } + + contentView.layer.addSublayer(layer) + contentLayerMap[item.itemId] = layer + } + } + + CATransaction.commit() + } + + private func applyTransform() { + Logger.verbose("") + + let viewSize = clipView.bounds.size + contentView.layer.setAffineTransform(model.currentTransform().affineTransform(viewSize: viewSize)) + } + + private func updateImageLayer() { + let viewSize = clipView.bounds.size + ImageEditorCanvasView.updateImageLayer(imageLayer: imageLayer, + viewSize: viewSize, + imageSize: model.srcImageSizePixels, + transform: model.currentTransform()) + } + + public class func updateImageLayer(imageLayer: CALayer, viewSize: CGSize, imageSize: CGSize, transform: ImageEditorTransform) { + imageLayer.frame = imageFrame(forViewSize: viewSize, imageSize: imageSize, transform: transform) + } + + public class func imageFrame(forViewSize viewSize: CGSize, imageSize: CGSize, transform: ImageEditorTransform) -> CGRect { + guard viewSize.width > 0, viewSize.height > 0 else { + owsFailDebug("Invalid viewSize") + return .zero + } + guard imageSize.width > 0, imageSize.height > 0 else { + owsFailDebug("Invalid imageSize") + return .zero + } + + // We want to "fill" the output rect. + // + // Find the smallest possible image size that will completely fill the output size. + // + // NOTE: The "bounding box" of the output size that we need to fill needs to + // reflect the rotation. + let sinValue = abs(sin(transform.rotationRadians)) + let cosValue = abs(cos(transform.rotationRadians)) + let outputSize = CGSize(width: viewSize.width * cosValue + viewSize.height * sinValue, + height: viewSize.width * sinValue + viewSize.height * cosValue) + + var width = outputSize.width + var height = outputSize.width * imageSize.height / imageSize.width + if height < outputSize.height { + width = outputSize.height * imageSize.width / imageSize.height + height = outputSize.height + } + let imageFrame = CGRect(x: (width - viewSize.width) * -0.5, + y: (height - viewSize.height) * -0.5, + width: width, + height: height) + + Logger.verbose("viewSize: \(viewSize), imageFrame: \(imageFrame), ") + return imageFrame + } + + private class func imageLayerForItem(model: ImageEditorModel, + transform: ImageEditorTransform, + viewSize: CGSize) -> CALayer? { + guard let srcImage = loadSrcImage(model: model) else { + owsFailDebug("Could not load src image.") + return nil + } + let imageLayer = CALayer() + imageLayer.contents = srcImage.cgImage + imageLayer.contentsScale = srcImage.scale + updateImageLayer(imageLayer: imageLayer, + viewSize: viewSize, + imageSize: model.srcImageSizePixels, + transform: transform) + return imageLayer + } + + private class func layerForItem(item: ImageEditorItem, + model: ImageEditorModel, + viewSize: CGSize) -> CALayer? { + AssertIsOnMainThread() + + switch item.itemType { + case .test: + owsFailDebug("Unexpected test item.") + return nil + case .stroke: + guard let strokeItem = item as? ImageEditorStrokeItem else { + owsFailDebug("Item has unexpected type: \(type(of: item)).") + return nil + } + return strokeLayerForItem(item: strokeItem, viewSize: viewSize) + case .text: + guard let textItem = item as? ImageEditorTextItem else { + owsFailDebug("Item has unexpected type: \(type(of: item)).") + return nil + } + return textLayerForItem(item: textItem, + model: model, + viewSize: viewSize) + } + } + + private class func strokeLayerForItem(item: ImageEditorStrokeItem, + viewSize: CGSize) -> CALayer? { + AssertIsOnMainThread() + + let strokeWidth = ImageEditorStrokeItem.strokeWidth(forUnitStrokeWidth: item.unitStrokeWidth, + dstSize: viewSize) + let unitSamples = item.unitSamples + guard unitSamples.count > 0 else { + // Not an error; the stroke doesn't have enough samples to render yet. + return nil + } + + let shapeLayer = CAShapeLayer() + shapeLayer.lineWidth = strokeWidth + shapeLayer.strokeColor = item.color.cgColor + shapeLayer.frame = CGRect(origin: .zero, size: viewSize) + + let transformSampleToPoint = { (unitSample: CGPoint) -> CGPoint in + return CGPoint(x: viewSize.width * unitSample.x, + y: viewSize.height * unitSample.y) + } + + // TODO: Use bezier curves to smooth stroke. + let bezierPath = UIBezierPath() + + let points = applySmoothing(to: unitSamples.map { (unitSample) in + transformSampleToPoint(unitSample) + }) + var previousForwardVector = CGPoint.zero + for index in 0.. CALayer? { + AssertIsOnMainThread() + + let imageFrame = self.imageFrame(forViewSize: viewSize, imageSize: model.srcImageSizePixels, + transform: model.currentTransform()) + + // We need to adjust the font size to reflect the current output scale, + // using the image width as reference. + let fontSize = item.font.pointSize * imageFrame.size.width / item.fontReferenceImageWidth + + let layer = EditorTextLayer(itemId: item.itemId) + layer.string = item.text + layer.foregroundColor = item.color.cgColor + layer.font = CGFont(item.font.fontName as CFString) + layer.fontSize = fontSize + layer.isWrapped = true + layer.alignmentMode = kCAAlignmentCenter + // I don't think we need to enable allowsFontSubpixelQuantization + // or set truncationMode. + + // This text needs to be rendered at a scale that reflects the sceen scaling + // AND the item's scaling. + layer.contentsScale = UIScreen.main.scale * item.scaling + + // TODO: Min with measured width. + let maxWidth = imageFrame.size.width * item.unitWidth +// let maxWidth = viewSize.width * item.unitWidth + + let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude) + // TODO: Is there a more accurate way to measure text in a CATextLayer? + // CoreText? + let textBounds = (item.text as NSString).boundingRect(with: maxSize, + options: [ + .usesLineFragmentOrigin, + .usesFontLeading + ], + attributes: [ + .font: item.font.withSize(fontSize) + ], + context: nil) + Logger.verbose("---- maxWidth: \(maxWidth), viewSize: \(viewSize), item.unitWidth: \(item.unitWidth), textBounds: \(textBounds)") + let center = CGPoint(x: viewSize.width * item.unitCenter.x, + y: viewSize.height * item.unitCenter.y) + let layerSize = CGSizeCeil(textBounds.size) + layer.frame = CGRect(origin: CGPoint(x: center.x - layerSize.width * 0.5, + y: center.y - layerSize.height * 0.5), + size: layerSize) + + let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) + layer.setAffineTransform(transform) + + return layer + } + + // We apply more than one kind of smoothing. + // + // This (simple) smoothing reduces jitter from the touch sensor. + private class func applySmoothing(to points: [CGPoint]) -> [CGPoint] { + AssertIsOnMainThread() + + var result = [CGPoint]() + + for index in 0.. CGPoint { + return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer, + view: self.clipView, + transform: transform) + } + + public class func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, + view: UIView, + transform: ImageEditorTransform) -> CGPoint { + let locationInView = gestureRecognizer.location(in: view) + return locationUnit(forLocationInView: locationInView, + viewSize: view.bounds.size, + transform: transform) + } + + public func locationUnit(forLocationInView locationInView: CGPoint, + transform: ImageEditorTransform) -> CGPoint { + let viewSize = self.clipView.bounds.size + return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, + viewSize: viewSize, + transform: transform) + } + + public class func locationUnit(forLocationInView locationInView: CGPoint, + viewSize: CGSize, + transform: ImageEditorTransform) -> CGPoint { + let affineTransformStart = transform.affineTransform(viewSize: viewSize) + let locationInContent = locationInView.applyingInverse(affineTransformStart) + let locationUnit = locationInContent.toUnitCoordinates(viewSize: viewSize, shouldClamp: false) + return locationUnit + } + + // MARK: - Actions + + // Returns nil on error. + // + // We render using the transform parameter, not the transform from the model. + // This allows this same method to be used for rendering "previews" for the + // crop tool and the final output. + @objc + public class func renderForOutput(model: ImageEditorModel, transform: ImageEditorTransform) -> UIImage? { + // TODO: Do we want to render off the main thread? + AssertIsOnMainThread() + + // Render output at same size as source image. + let dstSizePixels = transform.outputSizePixels + let dstScale: CGFloat = 1.0 // The size is specified in pixels, not in points. + // TODO: Reflect crop rectangle. + let viewSize = dstSizePixels + + let hasAlpha = NSData.hasAlpha(forValidImageFilePath: model.srcImagePath) + + // We use an UIImageView + UIView.renderAsImage() instead of a CGGraphicsContext + // Because CALayer.renderInContext() doesn't honor CALayer properties like frame, + // transform, etc. + let view = UIView() + view.backgroundColor = UIColor.clear + view.isOpaque = false + view.frame = CGRect(origin: .zero, size: viewSize) + + // Rendering a UIView to an image will not honor the root image's layer transform. + // We therefore use a subview. + let contentView = UIView() + contentView.backgroundColor = UIColor.clear + contentView.isOpaque = false + contentView.frame = CGRect(origin: .zero, size: viewSize) + view.addSubview(contentView) + + CATransaction.begin() + CATransaction.setDisableActions(true) + + contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) + + guard let imageLayer = imageLayerForItem(model: model, + transform: transform, + viewSize: viewSize) else { + owsFailDebug("Could not load src image.") + return nil + } + // TODO: + imageLayer.contentsScale = dstScale * transform.scaling + contentView.layer.addSublayer(imageLayer) + + for item in model.items() { + guard let layer = layerForItem(item: item, + model: model, + viewSize: viewSize) else { + Logger.error("Couldn't create layer for item.") + continue + } + // TODO: Should we do this for all layers? + layer.contentsScale = dstScale * transform.scaling * item.outputScale() + contentView.layer.addSublayer(layer) + } + + CATransaction.commit() + + let image = view.renderAsImage(opaque: !hasAlpha, scale: dstScale) + return image + } + + // MARK: - + + public func textLayer(forLocation point: CGPoint) -> EditorTextLayer? { + guard let sublayers = contentView.layer.sublayers else { + return nil + } + for layer in sublayers { + guard let textLayer = layer as? EditorTextLayer else { + continue + } + if textLayer.hitTest(point) != nil { + return textLayer + } + } + return nil + } +} + +// MARK: - + +extension ImageEditorCanvasView: ImageEditorModelObserver { + + public func imageEditorModelDidChange(before: ImageEditorContents, + after: ImageEditorContents) { + updateAllContent() + } + + public func imageEditorModelDidChange(changedItemIds: [String]) { + updateContent(changedItemIds: changedItemIds) + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift new file mode 100644 index 000000000..e62d1b3d1 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift @@ -0,0 +1,77 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +// ImageEditorContents represents a snapshot of canvas +// state. +// +// Instances of ImageEditorContents should be treated +// as immutable, once configured. +public class ImageEditorContents: NSObject { + + public typealias ItemMapType = OrderedDictionary + + // This represents the current state of each item, + // a mapping of [itemId : item]. + var itemMap = ItemMapType() + + // Used to create an initial, empty instances of this class. + public override init() { + } + + // Used to clone copies of instances of this class. + public init(itemMap: ItemMapType) { + self.itemMap = itemMap + } + + // Since the contents are immutable, we only modify copies + // made with this method. + public func clone() -> ImageEditorContents { + return ImageEditorContents(itemMap: itemMap.clone()) + } + + @objc + public func item(forId itemId: String) -> ImageEditorItem? { + return itemMap.value(forKey: itemId) + } + + @objc + public func append(item: ImageEditorItem) { + Logger.verbose("\(item.itemId)") + + itemMap.append(key: item.itemId, value: item) + } + + @objc + public func replace(item: ImageEditorItem) { + Logger.verbose("\(item.itemId)") + + itemMap.replace(key: item.itemId, value: item) + } + + @objc + public func remove(item: ImageEditorItem) { + Logger.verbose("\(item.itemId)") + + itemMap.remove(key: item.itemId) + } + + @objc + public func remove(itemId: String) { + Logger.verbose("\(itemId)") + + itemMap.remove(key: itemId) + } + + @objc + public func itemCount() -> Int { + return itemMap.count + } + + @objc + public func items() -> [ImageEditorItem] { + return itemMap.orderedValues() + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift new file mode 100644 index 000000000..78efd5888 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -0,0 +1,649 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +public protocol ImageEditorCropViewControllerDelegate: class { + func cropDidComplete(transform: ImageEditorTransform) + func cropDidCancel() +} + +// MARK: - + +// A view for editing text item in image editor. +class ImageEditorCropViewController: OWSViewController { + private weak var delegate: ImageEditorCropViewControllerDelegate? + + private let model: ImageEditorModel + + private let srcImage: UIImage + + private let previewImage: UIImage + + private var transform: ImageEditorTransform + + public let contentView = OWSLayerView() + + public let clipView = OWSLayerView() + + private var imageLayer = CALayer() + + private enum CropRegion { + // The sides of the crop region. + case left, right, top, bottom + // The corners of the crop region. + case topLeft, topRight, bottomLeft, bottomRight + } + + private class CropCornerView: UIView { + let cropRegion: CropRegion + + init(cropRegion: CropRegion) { + self.cropRegion = cropRegion + super.init(frame: .zero) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + } + + private let cropView = UIView() + private let cropCornerViews: [CropCornerView] = [ + CropCornerView(cropRegion: .topLeft), + CropCornerView(cropRegion: .topRight), + CropCornerView(cropRegion: .bottomLeft), + CropCornerView(cropRegion: .bottomRight) + ] + + init(delegate: ImageEditorCropViewControllerDelegate, + model: ImageEditorModel, + srcImage: UIImage, + previewImage: UIImage) { + self.delegate = delegate + self.model = model + self.srcImage = srcImage + self.previewImage = previewImage + transform = model.currentTransform() + + super.init(nibName: nil, bundle: nil) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - View Lifecycle + + override func loadView() { + self.view = UIView() + + if (UIAccessibilityIsReduceTransparencyEnabled()) { + self.view.backgroundColor = UIColor(white: 0.5, alpha: 0.5) + } else { + let alpha = OWSNavigationBar.backgroundBlurMutingFactor + self.view.backgroundColor = UIColor(white: 0.5, alpha: alpha) + + let blurEffectView = UIVisualEffectView(effect: Theme.barBlurEffect) + blurEffectView.layer.zPosition = -1 + self.view.addSubview(blurEffectView) + blurEffectView.autoPinEdgesToSuperviewEdges() + } + + let stackView = UIStackView() + stackView.axis = .vertical + stackView.alignment = .fill + stackView.spacing = 16 + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + stackView.isLayoutMarginsRelativeArrangement = true + self.view.addSubview(stackView) + stackView.ows_autoPinToSuperviewEdges() + + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + target: self, + action: #selector(didTapBackButton)) + + let wrapperView = UIView.container() + wrapperView.backgroundColor = .clear + wrapperView.isOpaque = false + stackView.addArrangedSubview(wrapperView) + + // TODO: We could mask the clipped region with a semi-transparent overlay like WA. + clipView.clipsToBounds = true + clipView.backgroundColor = .clear + clipView.isOpaque = false + clipView.layoutCallback = { [weak self] (_) in + guard let strongSelf = self else { + return + } + strongSelf.updateCropViewLayout() + } + wrapperView.addSubview(clipView) + + imageLayer.contents = previewImage.cgImage + imageLayer.contentsScale = previewImage.scale + contentView.backgroundColor = .clear + contentView.isOpaque = false + contentView.layer.addSublayer(imageLayer) + contentView.layoutCallback = { [weak self] (_) in + guard let strongSelf = self else { + return + } + strongSelf.updateContent() + } + clipView.addSubview(contentView) + contentView.ows_autoPinToSuperviewEdges() + + let rotate90Button = OWSButton() + rotate90Button.setTitle(NSLocalizedString("IMAGE_EDITOR_ROTATE_90_BUTTON", comment: "Label for button that rotates image 90 degrees."), + for: .normal) + rotate90Button.block = { [weak self] in + self?.rotate90ButtonPressed() + } + + let rotate45Button = OWSButton() + rotate45Button.setTitle(NSLocalizedString("IMAGE_EDITOR_ROTATE_45_BUTTON", comment: "Label for button that rotates image 45 degrees."), + for: .normal) + rotate45Button.block = { [weak self] in + self?.rotate45ButtonPressed() + } + + let resetButton = OWSButton() + resetButton.setTitle(NSLocalizedString("IMAGE_EDITOR_RESET_BUTTON", comment: "Label for button that resets crop & rotation state."), + for: .normal) + resetButton.block = { [weak self] in + self?.resetButtonPressed() + } + + let zoom2xButton = OWSButton() + zoom2xButton.setTitle("Zoom 2x", + for: .normal) + zoom2xButton.block = { [weak self] in + self?.zoom2xButtonPressed() + } + + cropView.setContentHuggingLow() + cropView.setCompressionResistanceLow() + view.addSubview(cropView) + for cropCornerView in cropCornerViews { + cropView.addSubview(cropCornerView) + + switch cropCornerView.cropRegion { + case .topLeft, .bottomLeft: + cropCornerView.autoPinEdge(toSuperviewEdge: .left) + case .topRight, .bottomRight: + cropCornerView.autoPinEdge(toSuperviewEdge: .right) + default: + owsFailDebug("Invalid crop region: \(cropRegion)") + } + switch cropCornerView.cropRegion { + case .topLeft, .topRight: + cropCornerView.autoPinEdge(toSuperviewEdge: .top) + case .bottomLeft, .bottomRight: + cropCornerView.autoPinEdge(toSuperviewEdge: .bottom) + default: + owsFailDebug("Invalid crop region: \(cropRegion)") + } + } + + let footer = UIStackView(arrangedSubviews: [rotate90Button, rotate45Button, resetButton, zoom2xButton]) + footer.axis = .horizontal + footer.spacing = 16 + footer.backgroundColor = .clear + footer.isOpaque = false + stackView.addArrangedSubview(footer) + + updateClipViewLayout() + + configureGestures() + } + + private static let desiredCornerSize: CGFloat = 30 + private static let minCropSize: CGFloat = desiredCornerSize * 2 + private var cornerSize = CGSize.zero + + private var clipViewConstraints = [NSLayoutConstraint]() + + private func updateClipViewLayout() { + NSLayoutConstraint.deactivate(clipViewConstraints) + clipViewConstraints = ImageEditorCanvasView.updateContentLayout(transform: transform, + contentView: clipView) + + clipView.superview?.setNeedsLayout() + clipView.superview?.layoutIfNeeded() + updateCropViewLayout() + } + + private var cropViewConstraints = [NSLayoutConstraint]() + + private func updateCropViewLayout() { + NSLayoutConstraint.deactivate(cropViewConstraints) + cropViewConstraints.removeAll() + + // TODO: Tune the size. + let cornerSize = CGSize(width: min(clipView.width() * 0.5, ImageEditorCropViewController.desiredCornerSize), + height: min(clipView.height() * 0.5, ImageEditorCropViewController.desiredCornerSize)) + self.cornerSize = cornerSize + for cropCornerView in cropCornerViews { + cropViewConstraints.append(contentsOf: cropCornerView.autoSetDimensions(to: cornerSize)) + + cropCornerView.addRedBorder() + cropView.addRedBorder() + } + + if !isCropGestureActive { + cropView.frame = view.convert(clipView.bounds, from: clipView) + } + } + + internal func updateContent() { + AssertIsOnMainThread() + + Logger.verbose("") + + let viewSize = contentView.bounds.size + guard viewSize.width > 0, + viewSize.height > 0 else { + return + } + + updateTransform(transform) + } + + private func updateTransform(_ transform: ImageEditorTransform) { + self.transform = transform + + // Don't animate changes. + CATransaction.begin() + CATransaction.setDisableActions(true) + + applyTransform() + updateClipViewLayout() + updateImageLayer() + + CATransaction.commit() + } + + private func applyTransform() { + Logger.verbose("") + + let viewSize = contentView.bounds.size +// contentView.layer.anchorPoint = .zero + contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) + } + + private func updateImageLayer() { + let viewSize = contentView.bounds.size + ImageEditorCanvasView.updateImageLayer(imageLayer: imageLayer, viewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) + } + + private func configureGestures() { + self.view.isUserInteractionEnabled = true + + let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) + pinchGestureRecognizer.referenceView = self.clipView + view.addGestureRecognizer(pinchGestureRecognizer) + + let panGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:))) + panGestureRecognizer.maximumNumberOfTouches = 1 + panGestureRecognizer.referenceView = self.clipView + view.addGestureRecognizer(panGestureRecognizer) + } + + override public var canBecomeFirstResponder: Bool { + return true + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + _ = self.becomeFirstResponder() + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + _ = self.becomeFirstResponder() + } + + // MARK: - Pinch Gesture + + @objc + public func handlePinchGesture(_ gestureRecognizer: ImageEditorPinchGestureRecognizer) { + AssertIsOnMainThread() + + Logger.verbose("") + + // We could undo an in-progress pinch if the gesture is cancelled, but it seems gratuitous. + + switch gestureRecognizer.state { + case .began: + gestureStartTransform = transform + case .changed, .ended: + guard let gestureStartTransform = gestureStartTransform else { + owsFailDebug("Missing pinchTransform.") + return + } + + let locationUnitStart = self.locationUnit(forLocationInView: gestureRecognizer.pinchStateStart.centroid, + transform: gestureStartTransform) + let locationUnitLast = self.locationUnit(forLocationInView: gestureRecognizer.pinchStateLast.centroid, + transform: gestureStartTransform) + let locationUnitDelta = CGPointSubtract(locationUnitLast, locationUnitStart) + let newUnitTranslation = CGPointAdd(gestureStartTransform.unitTranslation, locationUnitDelta) + + let newRotationRadians = gestureStartTransform.rotationRadians + gestureRecognizer.pinchStateLast.angleRadians - gestureRecognizer.pinchStateStart.angleRadians + + // NOTE: We use max(1, ...) to avoid divide-by-zero. + // + // TODO: The clamp limits are wrong. + let newScaling = CGFloatClamp(gestureStartTransform.scaling * gestureRecognizer.pinchStateLast.distance / max(1.0, gestureRecognizer.pinchStateStart.distance), + ImageEditorTextItem.kMinScaling, + ImageEditorTextItem.kMaxScaling) + + updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, + unitTranslation: newUnitTranslation, + rotationRadians: newRotationRadians, + scaling: newScaling).normalize()) + default: + break + } + } + + // MARK: - Pan Gesture + + private var gestureStartTransform: ImageEditorTransform? + private var panCropRegion: CropRegion? + private var isCropGestureActive: Bool { + return panCropRegion != nil + } + + @objc + public func handlePanGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { + AssertIsOnMainThread() + + Logger.verbose("") + + // We could undo an in-progress pinch if the gesture is cancelled, but it seems gratuitous. + + switch gestureRecognizer.state { + case .began: + Logger.verbose("began: \(transform.unitTranslation)") + gestureStartTransform = transform + // Pans that start near the crop rectangle should be treated as crop gestures. + panCropRegion = cropRegion(forGestureRecognizer: gestureRecognizer) + case .changed, .ended: + if let panCropRegion = panCropRegion { + // Crop pan gesture + handleCropPanGesture(gestureRecognizer, panCropRegion: panCropRegion) + } else { + handleNormalPanGesture(gestureRecognizer) + } + default: + break + } + + switch gestureRecognizer.state { + case .ended, .failed, .cancelled, .possible: + if panCropRegion != nil { + panCropRegion = nil + + // Don't animate changes. + CATransaction.begin() + CATransaction.setDisableActions(true) + + updateCropViewLayout() + + CATransaction.commit() + } + default: + break + } + } + + private func handleCropPanGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer, + panCropRegion: CropRegion) { + AssertIsOnMainThread() + + Logger.verbose("") + + guard let locationStart = gestureRecognizer.locationStart else { + owsFailDebug("Missing locationStart.") + return + } + let locationNow = gestureRecognizer.location(in: self.clipView) + + // Crop pan gesture + let locationDelta = CGPointSubtract(locationNow, locationStart) + + let cropRectangleStart = clipView.bounds + var cropRectangleNow = cropRectangleStart + + let maxDeltaX = cropRectangleNow.size.width - cornerSize.width * 2 + let maxDeltaY = cropRectangleNow.size.height - cornerSize.height * 2 + + switch panCropRegion { + case .left, .topLeft, .bottomLeft: + let delta = min(maxDeltaX, max(0, locationDelta.x)) + cropRectangleNow.origin.x += delta + cropRectangleNow.size.width -= delta + case .right, .topRight, .bottomRight: + let delta = min(maxDeltaX, max(0, -locationDelta.x)) + cropRectangleNow.size.width -= delta + default: + break + } + + switch panCropRegion { + case .top, .topLeft, .topRight: + let delta = min(maxDeltaY, max(0, locationDelta.y)) + cropRectangleNow.origin.y += delta + cropRectangleNow.size.height -= delta + case .bottom, .bottomLeft, .bottomRight: + let delta = min(maxDeltaY, max(0, -locationDelta.y)) + cropRectangleNow.size.height -= delta + default: + break + } + + cropView.frame = view.convert(cropRectangleNow, from: clipView) + + switch gestureRecognizer.state { + case .ended: + crop(toRect: cropRectangleNow) + default: + break + } + } + + private func crop(toRect cropRect: CGRect) { + let viewBounds = clipView.bounds + + // TODO: The output size should be rounded, although this can + // cause crop to be slightly not WYSIWYG. + let croppedOutputSizePixels = CGSizeRound(CGSize(width: transform.outputSizePixels.width * cropRect.width / clipView.width(), + height: transform.outputSizePixels.height * cropRect.height / clipView.height())) + + // We need to update the transform's unitTranslation and scaling properties + // to reflect the crop. + // + // Cropping involves changing the output size AND aspect ratio. The output aspect ratio + // has complicated effects on the rendering behavior of the image background, since the + // default rendering size of the image is an "aspect fill" of the output bounds. + // Therefore, the simplest and more reliable way to update the scaling is to measure + // the difference between the "before crop"/"after crop" image frames and adjust the + // scaling accordingly. + let naiveTransform = ImageEditorTransform(outputSizePixels: croppedOutputSizePixels, + unitTranslation: transform.unitTranslation, + rotationRadians: transform.rotationRadians, + scaling: transform.scaling) + let naiveImageFrameOld = ImageEditorCanvasView.imageFrame(forViewSize: transform.outputSizePixels, imageSize: model.srcImageSizePixels, transform: naiveTransform) + let naiveImageFrameNew = ImageEditorCanvasView.imageFrame(forViewSize: croppedOutputSizePixels, imageSize: model.srcImageSizePixels, transform: naiveTransform) + let scalingDeltaX = naiveImageFrameNew.width / naiveImageFrameOld.width + let scalingDeltaY = naiveImageFrameNew.height / naiveImageFrameOld.height + // scalingDeltaX and scalingDeltaY should only differ by rounding error. + let scalingDelta = (scalingDeltaX + scalingDeltaY) * 0.5 + let scaling = transform.scaling / scalingDelta + + // We also need to update the transform's translation, to ensure that the correct + // content (background image and items) ends up in the crop region. + // + // To do this, we use the center of the image content. Due to + // scaling and rotation of the image content, it's far simpler to + // use the center. + let oldAffineTransform = transform.affineTransform(viewSize: viewBounds.size) + // We determine the pre-crop render frame for the image. + let oldImageFrameCanvas = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: model.srcImageSizePixels, transform: transform) + // We project it into pre-crop view coordinates (the coordinate + // system of the crop rectangle). Note that a CALayer's tranform + // is applied using its "anchor point", the center of the layer. + // so we translate before and after the projection to be consistent. + let oldImageCenterView = oldImageFrameCanvas.center.minus(viewBounds.center).applying(oldAffineTransform).plus(viewBounds.center) + // We transform the "image content center" into the unit coordinates + // of the crop rectangle. + let newImageCenterUnit = oldImageCenterView.toUnitCoordinates(viewBounds: cropRect, shouldClamp: false) + // The transform's "unit translation" represents a deviation from + // the center of the output canvas, so we need to subtract the + // unit midpoint. + let unitTranslation = newImageCenterUnit.minus(CGPoint.unitMidpoint) + + // Clear the panCropRegion now so that the crop bounds are updated + // immediately. + panCropRegion = nil + + updateTransform(ImageEditorTransform(outputSizePixels: croppedOutputSizePixels, + unitTranslation: unitTranslation, + rotationRadians: transform.rotationRadians, + scaling: scaling).normalize()) + } + + private func handleNormalPanGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { + AssertIsOnMainThread() + + guard let gestureStartTransform = gestureStartTransform else { + owsFailDebug("Missing pinchTransform.") + return + } + guard let locationStart = gestureRecognizer.locationStart else { + owsFailDebug("Missing locationStart.") + return + } + let locationNow = gestureRecognizer.location(in: self.clipView) + + let locationUnitStart = self.locationUnit(forLocationInView: locationStart, transform: gestureStartTransform) + let locationUnitNow = self.locationUnit(forLocationInView: locationNow, transform: gestureStartTransform) + let locationUnitDelta = CGPointSubtract(locationUnitNow, locationUnitStart) + let newUnitTranslation = CGPointAdd(gestureStartTransform.unitTranslation, locationUnitDelta) + + updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, + unitTranslation: newUnitTranslation, + rotationRadians: gestureStartTransform.rotationRadians, + scaling: gestureStartTransform.scaling).normalize()) + } + + private func cropRegion(forGestureRecognizer gestureRecognizer: ImageEditorPanGestureRecognizer) -> CropRegion? { + guard let location = gestureRecognizer.locationStart else { + owsFailDebug("Missing locationStart.") + return nil + } + + let tolerance: CGFloat = ImageEditorCropViewController.desiredCornerSize * 2.0 + let left = tolerance + let top = tolerance + let right = clipView.width() - tolerance + let bottom = clipView.height() - tolerance + + // We could ignore touches far outside the crop rectangle. + if location.x < left { + if location.y < top { + return .topLeft + } else if location.y > bottom { + return .bottomLeft + } else { + return .left + } + } else if location.x > right { + if location.y < top { + return .topRight + } else if location.y > bottom { + return .bottomRight + } else { + return .right + } + } else { + if location.y < top { + return .top + } else if location.y > bottom { + return .bottom + } else { + return nil + } + } + } + + // MARK: - Coordinates + + private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, + transform: ImageEditorTransform) -> CGPoint { + return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer, view: clipView, transform: transform) + } + + private func locationUnit(forLocationInView locationInView: CGPoint, + transform: ImageEditorTransform) -> CGPoint { + return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, viewSize: clipView.bounds.size, transform: transform) + } + + // MARK: - Events + + @objc public func didTapBackButton() { + completeAndDismiss() + } + + private func completeAndDismiss() { + // TODO: + self.delegate?.cropDidComplete(transform: transform) + + self.dismiss(animated: true) { + // Do nothing. + } + } + + @objc public func rotate90ButtonPressed() { + rotateButtonPressed(angleRadians: CGFloat.pi * 0.5) + } + + @objc public func rotate45ButtonPressed() { + rotateButtonPressed(angleRadians: CGFloat.pi * 0.25) + } + + private func rotateButtonPressed(angleRadians: CGFloat) { + // Invert width and height. + let outputSizePixels = CGSize(width: transform.outputSizePixels.height, + height: transform.outputSizePixels.width) + let unitTranslation = transform.unitTranslation + let rotationRadians = transform.rotationRadians + angleRadians + let scaling = transform.scaling + updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: unitTranslation, + rotationRadians: rotationRadians, + scaling: scaling).normalize()) + } + + @objc public func zoom2xButtonPressed() { + let outputSizePixels = transform.outputSizePixels + let unitTranslation = transform.unitTranslation + let rotationRadians = transform.rotationRadians + let scaling = transform.scaling * 2.0 + updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: unitTranslation, + rotationRadians: rotationRadians, + scaling: scaling).normalize()) + } + + @objc public func resetButtonPressed() { + updateTransform(ImageEditorTransform.defaultTransform(srcImageSizePixels: model.srcImageSizePixels)) + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift index bacddf5bb..71065b4cf 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift @@ -2,208 +2,4 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -import UIKit -public class ImageEditorGestureRecognizer: UIGestureRecognizer { - - @objc - public var shouldAllowOutsideView = true - - @objc - public weak var canvasView: UIView? - - @objc - public var startLocationInView: CGPoint = .zero - - @objc - public override func canPrevent(_ preventedGestureRecognizer: UIGestureRecognizer) -> Bool { - return false - } - - @objc - public override func canBePrevented(by: UIGestureRecognizer) -> Bool { - return false - } - - @objc - public override func shouldRequireFailure(of: UIGestureRecognizer) -> Bool { - return false - } - - @objc - public override func shouldBeRequiredToFail(by: UIGestureRecognizer) -> Bool { - return true - } - - // MARK: - Touch Handling - - @objc - public override func touchesBegan(_ touches: Set, with event: UIEvent) { - super.touchesBegan(touches, with: event) - - if state == .possible, - touchType(for: touches, with: event) == .valid { - // If a gesture starts with a valid touch, begin stroke. - state = .began - startLocationInView = .zero - - guard let view = view else { - owsFailDebug("Missing view.") - return - } - guard let touch = touches.randomElement() else { - owsFailDebug("Missing touch.") - return - } - startLocationInView = touch.location(in: view) - } else { - state = .failed - } - } - - @objc - public override func touchesMoved(_ touches: Set, with event: UIEvent) { - super.touchesMoved(touches, with: event) - - switch state { - case .began, .changed: - switch touchType(for: touches, with: event) { - case .valid: - // If a gesture continues with a valid touch, continue stroke. - state = .changed - case .invalid: - state = .failed - case .outside: - // If a gesture continues with a valid touch _outside the canvas_, - // end stroke. - state = .ended - } - default: - state = .failed - } - } - - @objc - public override func touchesEnded(_ touches: Set, with event: UIEvent) { - super.touchesEnded(touches, with: event) - - switch state { - case .began, .changed: - switch touchType(for: touches, with: event) { - case .valid, .outside: - // If a gesture ends with a valid touch, end stroke. - state = .ended - case .invalid: - state = .failed - } - default: - state = .failed - } - } - - @objc - public override func touchesCancelled(_ touches: Set, with event: UIEvent) { - super.touchesCancelled(touches, with: event) - - state = .cancelled - } - - public enum TouchType { - case invalid - case valid - case outside - } - - private func touchType(for touches: Set, with event: UIEvent) -> TouchType { - guard let gestureView = self.view else { - owsFailDebug("Missing gestureView") - return .invalid - } - guard let canvasView = canvasView else { - owsFailDebug("Missing canvasView") - return .invalid - } - guard let allTouches = event.allTouches else { - owsFailDebug("Missing allTouches") - return .invalid - } - guard allTouches.count <= 1 else { - return .invalid - } - guard touches.count == 1 else { - return .invalid - } - guard let firstTouch: UITouch = touches.first else { - return .invalid - } - - let isNewTouch = firstTouch.phase == .began - if isNewTouch { - // Reject new touches that are inside a control subview. - if subviewControl(ofView: gestureView, contains: firstTouch) { - return .invalid - } - } - - // Reject new touches outside this GR's view's bounds. - let location = firstTouch.location(in: canvasView) - if !canvasView.bounds.contains(location) { - if shouldAllowOutsideView { - // Do nothing - } else if isNewTouch { - return .invalid - } else { - return .outside - } - } - - if isNewTouch { - // Ignore touches that start near the top or bottom edge of the screen; - // they may be a system edge swipe gesture. - let rootView = self.rootView(of: gestureView) - let rootLocation = firstTouch.location(in: rootView) - let distanceToTopEdge = max(0, rootLocation.y) - let distanceToBottomEdge = max(0, rootView.bounds.size.height - rootLocation.y) - let distanceToNearestEdge = min(distanceToTopEdge, distanceToBottomEdge) - let kSystemEdgeSwipeTolerance: CGFloat = 50 - if (distanceToNearestEdge < kSystemEdgeSwipeTolerance) { - return .invalid - } - } - - return .valid - } - - private func subviewControl(ofView superview: UIView, contains touch: UITouch) -> Bool { - for subview in superview.subviews { - guard !subview.isHidden, subview.isUserInteractionEnabled else { - continue - } - let location = touch.location(in: subview) - guard subview.bounds.contains(location) else { - continue - } - if subview as? UIControl != nil { - return true - } - if subviewControl(ofView: subview, contains: touch) { - return true - } - } - return false - } - - private func rootView(of view: UIView) -> UIView { - var responder: UIResponder? = view - var lastView: UIView = view - while true { - guard let currentResponder = responder else { - return lastView - } - if let currentView = currentResponder as? UIView { - lastView = currentView - } - responder = currentResponder.next - } - } -} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorItem.swift new file mode 100644 index 000000000..e3dacaaed --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorItem.swift @@ -0,0 +1,70 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc public enum ImageEditorError: Int, Error { + case assertionError + case invalidInput +} + +@objc +public enum ImageEditorItemType: Int { + case test + case stroke + case text +} + +// MARK: - + +// Represented in a "ULO unit" coordinate system +// for source image. +// +// "ULO" coordinate system is "upper-left-origin". +// +// "Unit" coordinate system means values are expressed +// in terms of some other values, in this case the +// width and height of the source image. +// +// * 0.0 = left edge +// * 1.0 = right edge +// * 0.0 = top edge +// * 1.0 = bottom edge +public typealias ImageEditorSample = CGPoint + +// MARK: - + +// Instances of ImageEditorItem should be treated +// as immutable, once configured. +@objc +public class ImageEditorItem: NSObject { + @objc + public let itemId: String + + @objc + public let itemType: ImageEditorItemType + + @objc + public init(itemType: ImageEditorItemType) { + self.itemId = UUID().uuidString + self.itemType = itemType + + super.init() + } + + @objc + public init(itemId: String, + itemType: ImageEditorItemType) { + self.itemId = itemId + self.itemType = itemType + + super.init() + } + + // The scale with which to render this item's content + // when rendering the "output" image for sending. + public func outputScale() -> CGFloat { + return 1.0 + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 900875e87..f137b6b49 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -4,472 +4,80 @@ import UIKit -@objc public enum ImageEditorError: Int, Error { - case assertionError - case invalidInput -} - @objc -public enum ImageEditorItemType: Int { - case test - case stroke - case text -} - -// MARK: - - -// Represented in a "ULO unit" coordinate system -// for source image. -// -// "ULO" coordinate system is "upper-left-origin". -// -// "Unit" coordinate system means values are expressed -// in terms of some other values, in this case the -// width and height of the source image. -// -// * 0.0 = left edge -// * 1.0 = right edge -// * 0.0 = top edge -// * 1.0 = bottom edge -public typealias ImageEditorSample = CGPoint - -public typealias ImageEditorConversion = (ImageEditorSample) -> ImageEditorSample - -// MARK: - - -// Instances of ImageEditorItem should be treated -// as immutable, once configured. -@objc -public class ImageEditorItem: NSObject { - @objc - public let itemId: String - - @objc - public let itemType: ImageEditorItemType - - @objc - public init(itemType: ImageEditorItemType) { - self.itemId = UUID().uuidString - self.itemType = itemType - - super.init() - } - - @objc - public init(itemId: String, - itemType: ImageEditorItemType) { - self.itemId = itemId - self.itemType = itemType - - super.init() - } - - public func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { - return ImageEditorItem(itemId: itemId, itemType: itemType) - } - - // The scale with which to render this item's content - // when rendering the "output" image for sending. - public func outputScale() -> CGFloat { - return 1.0 - } -} - -// MARK: - - -@objc -public class ImageEditorStrokeItem: ImageEditorItem { - // Until we need to serialize these items, - // just use UIColor. - @objc - public let color: UIColor - - public typealias StrokeSample = ImageEditorSample - - @objc - public let unitSamples: [StrokeSample] - - // Expressed as a "Unit" value as a fraction of - // min(width, height) of the destination viewport. - @objc - public let unitStrokeWidth: CGFloat - - @objc - public init(color: UIColor, - unitSamples: [StrokeSample], - unitStrokeWidth: CGFloat) { - self.color = color - self.unitSamples = unitSamples - self.unitStrokeWidth = unitStrokeWidth - - super.init(itemType: .stroke) - } - - @objc - public init(itemId: String, - color: UIColor, - unitSamples: [StrokeSample], - unitStrokeWidth: CGFloat) { - self.color = color - self.unitSamples = unitSamples - self.unitStrokeWidth = unitStrokeWidth - - super.init(itemId: itemId, itemType: .stroke) - } - - @objc - public class func defaultUnitStrokeWidth() -> CGFloat { - return 0.02 - } - - @objc - public class func strokeWidth(forUnitStrokeWidth unitStrokeWidth: CGFloat, - dstSize: CGSize) -> CGFloat { - return CGFloatClamp01(unitStrokeWidth) * min(dstSize.width, dstSize.height) - } - - public override func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { - // TODO: We might want to convert the unitStrokeWidth too. - let convertedUnitSamples = unitSamples.map { (sample) in - conversion(sample) - } - return ImageEditorStrokeItem(itemId: itemId, - color: color, - unitSamples: convertedUnitSamples, - unitStrokeWidth: unitStrokeWidth) - } -} - -// MARK: - - -@objc -public class ImageEditorTextItem: ImageEditorItem { - @objc - public let color: UIColor - - @objc - public let font: UIFont - - @objc - public let text: String - - @objc - public let unitCenter: ImageEditorSample - - // Leave some margins against the edge of the image. - @objc - public static let kDefaultUnitWidth: CGFloat = 0.9 - - // The max width of the text as a fraction of the image width. - // - // This provides continuity of text layout before/after cropping. - // - // NOTE: When you scale the text with with a pinch gesture, that - // affects _scaling_, not the _unit width_, since we don't want - // to change how the text wraps when scaling. - @objc - public let unitWidth: CGFloat - - // 0 = no rotation. - // CGFloat.pi * 0.5 = rotation 90 degrees clockwise. - @objc +public class ImageEditorTransform: NSObject { + public let outputSizePixels: CGSize + public let unitTranslation: CGPoint public let rotationRadians: CGFloat - - @objc - public static let kMaxScaling: CGFloat = 4.0 - @objc - public static let kMinScaling: CGFloat = 0.5 - @objc public let scaling: CGFloat - @objc - public init(color: UIColor, - font: UIFont, - text: String, - unitCenter: ImageEditorSample = ImageEditorSample(x: 0.5, y: 0.5), - unitWidth: CGFloat = ImageEditorTextItem.kDefaultUnitWidth, - rotationRadians: CGFloat = 0.0, - scaling: CGFloat = 1.0) { - self.color = color - self.font = font - self.text = text - self.unitCenter = unitCenter - self.unitWidth = unitWidth - self.rotationRadians = rotationRadians - self.scaling = scaling - - super.init(itemType: .text) - } - - private init(itemId: String, - color: UIColor, - font: UIFont, - text: String, - unitCenter: ImageEditorSample, - unitWidth: CGFloat, + public init(outputSizePixels: CGSize, + unitTranslation: CGPoint, rotationRadians: CGFloat, scaling: CGFloat) { - self.color = color - self.font = font - self.text = text - self.unitCenter = unitCenter - self.unitWidth = unitWidth + self.outputSizePixels = outputSizePixels + self.unitTranslation = unitTranslation self.rotationRadians = rotationRadians self.scaling = scaling - - super.init(itemId: itemId, itemType: .text) } - @objc - public class func empty(withColor color: UIColor) -> ImageEditorTextItem { - let font = UIFont.boldSystemFont(ofSize: 30.0) - return ImageEditorTextItem(color: color, font: font, text: "") + public class func defaultTransform(srcImageSizePixels: CGSize) -> ImageEditorTransform { + // It shouldn't be necessary normalize the default transform, but we do so to be safe. + return ImageEditorTransform(outputSizePixels: srcImageSizePixels, + unitTranslation: .zero, + rotationRadians: 0.0, + scaling: 1.0).normalize() } - @objc - public func copy(withText newText: String) -> ImageEditorTextItem { - return ImageEditorTextItem(itemId: itemId, - color: color, - font: font, - text: newText, - unitCenter: unitCenter, - unitWidth: unitWidth, - rotationRadians: rotationRadians, - scaling: scaling) + public func affineTransform(viewSize: CGSize) -> CGAffineTransform { + let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize) + Logger.verbose("viewSize: \(viewSize), translation: \(translation), unitTranslation: \(unitTranslation), scaling: \(scaling), rotationRadians: \(rotationRadians), ") + // Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation + // is not affected affected by the scaling or rotation, which shoud both be about the "origin" + // (in this case the center of the content). + // + // NOTE: CGAffineTransform transforms are composed in reverse order. + let transform = CGAffineTransform.identity.translate(translation).rotated(by: rotationRadians).scaledBy(x: scaling, y: scaling) + return transform } - @objc - public func copy(withUnitCenter newUnitCenter: CGPoint) -> ImageEditorTextItem { - return ImageEditorTextItem(itemId: itemId, - color: color, - font: font, - text: text, - unitCenter: newUnitCenter, - unitWidth: unitWidth, - rotationRadians: rotationRadians, - scaling: scaling) + public func normalize() -> ImageEditorTransform { + // TODO: Normalize translation. +// public let unitTranslation: CGPoint + + // We need to ensure that + let minScaling: CGFloat = 1.0 + let scaling = max(minScaling, self.scaling) + + // We don't need to normalize rotation. + + return ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: unitTranslation, + rotationRadians: rotationRadians, + scaling: scaling) } - @objc - public func copy(withUnitCenter newUnitCenter: CGPoint, - scaling newScaling: CGFloat, - rotationRadians newRotationRadians: CGFloat) -> ImageEditorTextItem { - return ImageEditorTextItem(itemId: itemId, - color: color, - font: font, - text: text, - unitCenter: newUnitCenter, - unitWidth: unitWidth, - rotationRadians: newRotationRadians, - scaling: newScaling) - } - - public override func clone(withImageEditorConversion conversion: ImageEditorConversion) -> ImageEditorItem { - let convertedUnitCenter = conversion(unitCenter) - let convertedUnitWidth = conversion(CGPoint(x: unitWidth, y: 0)).x - - return ImageEditorTextItem(itemId: itemId, - color: color, - font: font, - text: text, - unitCenter: convertedUnitCenter, - unitWidth: convertedUnitWidth, - rotationRadians: rotationRadians, - scaling: scaling) - } - - public override func outputScale() -> CGFloat { - return scaling - } -} - -// MARK: - - -public class OrderedDictionary: NSObject { - - public typealias KeyType = String - - var keyValueMap = [KeyType: ValueType]() - - var orderedKeys = [KeyType]() - - public override init() { - } - - // Used to clone copies of instances of this class. - public init(keyValueMap: [KeyType: ValueType], - orderedKeys: [KeyType]) { - - self.keyValueMap = keyValueMap - self.orderedKeys = orderedKeys - } - - // Since the contents are immutable, we only modify copies - // made with this method. - public func clone() -> OrderedDictionary { - return OrderedDictionary(keyValueMap: keyValueMap, orderedKeys: orderedKeys) - } - - public func value(forKey key: KeyType) -> ValueType? { - return keyValueMap[key] - } - - public func append(key: KeyType, value: ValueType) { - if keyValueMap[key] != nil { - owsFailDebug("Unexpected duplicate key in key map: \(key)") - } - keyValueMap[key] = value - - if orderedKeys.contains(key) { - owsFailDebug("Unexpected duplicate key in key list: \(key)") - } else { - orderedKeys.append(key) - } - - if orderedKeys.count != keyValueMap.count { - owsFailDebug("Invalid contents.") + public override func isEqual(_ object: Any?) -> Bool { + guard let other = object as? ImageEditorTransform else { + return false } + return (outputSizePixels == other.outputSizePixels && + unitTranslation == other.unitTranslation && + rotationRadians == other.rotationRadians && + scaling == other.scaling) } - public func replace(key: KeyType, value: ValueType) { - if keyValueMap[key] == nil { - owsFailDebug("Missing key in key map: \(key)") - } - keyValueMap[key] = value - - if !orderedKeys.contains(key) { - owsFailDebug("Missing key in key list: \(key)") - } - - if orderedKeys.count != keyValueMap.count { - owsFailDebug("Invalid contents.") - } + public override var hash: Int { + return (outputSizePixels.width.hashValue ^ + outputSizePixels.height.hashValue ^ + unitTranslation.x.hashValue ^ + unitTranslation.y.hashValue ^ + rotationRadians.hashValue ^ + scaling.hashValue) } - public func remove(key: KeyType) { - if keyValueMap[key] == nil { - owsFailDebug("Missing key in key map: \(key)") - } else { - keyValueMap.removeValue(forKey: key) - } - - if !orderedKeys.contains(key) { - owsFailDebug("Missing key in key list: \(key)") - } else { - orderedKeys = orderedKeys.filter { $0 != key } - } - - if orderedKeys.count != keyValueMap.count { - owsFailDebug("Invalid contents.") - } - } - - public var count: Int { - if orderedKeys.count != keyValueMap.count { - owsFailDebug("Invalid contents.") - } - return orderedKeys.count - } - - public func orderedValues() -> [ValueType] { - var values = [ValueType]() - for key in orderedKeys { - guard let value = self.keyValueMap[key] else { - owsFailDebug("Missing value") - continue - } - values.append(value) - } - return values - } -} - -// MARK: - - -// ImageEditorContents represents a snapshot of canvas -// state. -// -// Instances of ImageEditorContents should be treated -// as immutable, once configured. -public class ImageEditorContents: NSObject { - - @objc - public let imagePath: String - - @objc - public let imageSizePixels: CGSize - - public typealias ItemMapType = OrderedDictionary - - // This represents the current state of each item, - // a mapping of [itemId : item]. - var itemMap = ItemMapType() - - // Used to create an initial, empty instances of this class. - public init(imagePath: String, - imageSizePixels: CGSize) { - self.imagePath = imagePath - self.imageSizePixels = imageSizePixels - } - - // Used to clone copies of instances of this class. - public init(imagePath: String, - imageSizePixels: CGSize, - itemMap: ItemMapType) { - self.imagePath = imagePath - self.imageSizePixels = imageSizePixels - self.itemMap = itemMap - } - - // Since the contents are immutable, we only modify copies - // made with this method. - public func clone() -> ImageEditorContents { - return ImageEditorContents(imagePath: imagePath, - imageSizePixels: imageSizePixels, - itemMap: itemMap.clone()) - } - - @objc - public func item(forId itemId: String) -> ImageEditorItem? { - return itemMap.value(forKey: itemId) - } - - @objc - public func append(item: ImageEditorItem) { - Logger.verbose("\(item.itemId)") - - itemMap.append(key: item.itemId, value: item) - } - - @objc - public func replace(item: ImageEditorItem) { - Logger.verbose("\(item.itemId)") - - itemMap.replace(key: item.itemId, value: item) - } - - @objc - public func remove(item: ImageEditorItem) { - Logger.verbose("\(item.itemId)") - - itemMap.remove(key: item.itemId) - } - - @objc - public func remove(itemId: String) { - Logger.verbose("\(itemId)") - - itemMap.remove(key: itemId) - } - - @objc - public func itemCount() -> Int { - return itemMap.count - } - - @objc - public func items() -> [ImageEditorItem] { - return itemMap.orderedValues() + open override var description: String { + return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling)]" } } @@ -493,7 +101,7 @@ private class ImageEditorOperation: NSObject { // MARK: - @objc -public protocol ImageEditorModelDelegate: class { +public protocol ImageEditorModelObserver: class { // Used for large changes to the model, when the entire // model should be reloaded. func imageEditorModelDidChange(before: ImageEditorContents, @@ -514,9 +122,6 @@ public class ImageEditorModel: NSObject { return _isDebugAssertConfiguration() } - @objc - public weak var delegate: ImageEditorModelDelegate? - @objc public let srcImagePath: String @@ -525,6 +130,8 @@ public class ImageEditorModel: NSObject { private var contents: ImageEditorContents + private var transform: ImageEditorTransform + private var undoStack = [ImageEditorOperation]() private var redoStack = [ImageEditorOperation]() @@ -544,8 +151,8 @@ public class ImageEditorModel: NSObject { } guard MIMETypeUtil.isImage(mimeType), !MIMETypeUtil.isAnimated(mimeType) else { - Logger.error("Invalid MIME type: \(mimeType).") - throw ImageEditorError.invalidInput + Logger.error("Invalid MIME type: \(mimeType).") + throw ImageEditorError.invalidInput } let srcImageSizePixels = NSData.imageSize(forFilePath: srcImagePath, mimeType: mimeType) @@ -555,15 +162,22 @@ public class ImageEditorModel: NSObject { } self.srcImageSizePixels = srcImageSizePixels - self.contents = ImageEditorContents(imagePath: srcImagePath, - imageSizePixels: srcImageSizePixels) + self.contents = ImageEditorContents() + self.transform = ImageEditorTransform.defaultTransform(srcImageSizePixels: srcImageSizePixels) super.init() } + public func currentTransform() -> ImageEditorTransform { + return transform + } + @objc - public var currentImagePath: String { - return contents.imagePath + public func isDirty() -> Bool { + if itemCount() > 0 { + return true + } + return transform != ImageEditorTransform.defaultTransform(srcImageSizePixels: srcImageSizePixels) } @objc @@ -596,6 +210,39 @@ public class ImageEditorModel: NSObject { return !redoStack.isEmpty } + // MARK: - Observers + + private var observers = [Weak]() + + @objc + public func add(observer: ImageEditorModelObserver) { + observers.append(Weak(value: observer)) + } + + private func fireModelDidChange(before: ImageEditorContents, + after: ImageEditorContents) { + // We could diff here and yield a more narrow change event. + for weakObserver in observers { + guard let observer = weakObserver.value else { + continue + } + observer.imageEditorModelDidChange(before: before, + after: after) + } + } + + private func fireModelDidChange(changedItemIds: [String]) { + // We could diff here and yield a more narrow change event. + for weakObserver in observers { + guard let observer = weakObserver.value else { + continue + } + observer.imageEditorModelDidChange(changedItemIds: changedItemIds) + } + } + + // MARK: - + @objc public func undo() { guard let undoOperation = undoStack.popLast() else { @@ -610,8 +257,7 @@ public class ImageEditorModel: NSObject { self.contents = undoOperation.contents // We could diff here and yield a more narrow change event. - delegate?.imageEditorModelDidChange(before: oldContents, - after: self.contents) + fireModelDidChange(before: oldContents, after: self.contents) } @objc @@ -628,8 +274,7 @@ public class ImageEditorModel: NSObject { self.contents = redoOperation.contents // We could diff here and yield a more narrow change event. - delegate?.imageEditorModelDidChange(before: oldContents, - after: self.contents) + fireModelDidChange(before: oldContents, after: self.contents) } @objc @@ -661,6 +306,16 @@ public class ImageEditorModel: NSObject { }, changedItemIds: [item.itemId]) } + @objc + public func replace(transform: ImageEditorTransform) { + self.transform = transform + + // The contents haven't changed, but this event prods the + // observers to reload everything, which is necessary if + // the transform changes. + fireModelDidChange(before: self.contents, after: self.contents) + } + // MARK: - Temp Files private var temporaryFilePaths = [String]() @@ -689,63 +344,6 @@ public class ImageEditorModel: NSObject { } } - // MARK: - Crop - - @objc - public func crop(unitCropRect: CGRect) { - guard let croppedImage = ImageEditorModel.crop(imagePath: contents.imagePath, - unitCropRect: unitCropRect) else { - // Not an error; user might have tapped or - // otherwise drawn an invalid crop region. - Logger.warn("Could not crop image.") - return - } - // Use PNG for temp files; PNG is lossless. - guard let croppedImageData = UIImagePNGRepresentation(croppedImage) else { - owsFailDebug("Could not convert cropped image to PNG.") - return - } - let croppedImagePath = temporaryFilePath(withFileExtension: "png") - do { - try croppedImageData.write(to: NSURL.fileURL(withPath: croppedImagePath), options: .atomicWrite) - } catch let error as NSError { - owsFailDebug("File write failed: \(error)") - return - } - let croppedImageSizePixels = CGSizeScale(croppedImage.size, croppedImage.scale) - - let left = unitCropRect.origin.x - let right = unitCropRect.origin.x + unitCropRect.size.width - let top = unitCropRect.origin.y - let bottom = unitCropRect.origin.y + unitCropRect.size.height - let conversion: ImageEditorConversion = { (point) in - // Convert from the pre-crop unit coordinate system - // to post-crop unit coordinate system using inverse - // lerp. - // - // NOTE: Some post-conversion unit values will _NOT_ - // be clamped. e.g. strokes outside the crop - // are that < 0 or > 1. This is fine. - // We could hypothethically discard any items - // whose bounding box is entirely outside the - // new unit rectangle (e.g. have been completely - // cropped) but it doesn't seem worthwhile. - let converted = CGPoint(x: CGFloatInverseLerp(point.x, left, right), - y: CGFloatInverseLerp(point.y, top, bottom)) - return converted - } - - performAction({ (oldContents) in - let newContents = ImageEditorContents(imagePath: croppedImagePath, - imageSizePixels: croppedImageSizePixels) - for oldItem in oldContents.items() { - let newItem = oldItem.clone(withImageEditorConversion: conversion) - newContents.append(item: newItem) - } - return newContents - }, changedItemIds: nil) - } - private func performAction(_ action: (ImageEditorContents) -> ImageEditorContents, changedItemIds: [String]?, suppressUndo: Bool = false) { @@ -760,10 +358,10 @@ public class ImageEditorModel: NSObject { contents = newContents if let changedItemIds = changedItemIds { - delegate?.imageEditorModelDidChange(changedItemIds: changedItemIds) + fireModelDidChange(changedItemIds: changedItemIds) } else { - delegate?.imageEditorModelDidChange(before: oldContents, - after: self.contents) + fireModelDidChange(before: oldContents, + after: self.contents) } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift new file mode 100644 index 000000000..3f5cc39ee --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift @@ -0,0 +1,36 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +// This GR: +// +// * Tries to fail quickly to avoid conflicts with other GRs, especially pans/swipes. +// * Captures a bunch of useful "pan state" that makes using this GR much easier +// than UIPanGestureRecognizer. +public class ImageEditorPanGestureRecognizer: UIPanGestureRecognizer { + + public weak var referenceView: UIView? + + public var locationStart: CGPoint? + + // MARK: - Touch Handling + + @objc + public override func touchesBegan(_ touches: Set, with event: UIEvent) { + super.touchesBegan(touches, with: event) + + guard let referenceView = referenceView else { + owsFailDebug("Missing view") + return + } + locationStart = self.location(in: referenceView) + } + + public override func reset() { + super.reset() + + locationStart = nil + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift index b6ee17690..c76f49475 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPinchGestureRecognizer.swift @@ -29,6 +29,8 @@ public struct ImageEditorPinchState { // than UIPinchGestureRecognizer. public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { + public weak var referenceView: UIView? + public var pinchStateStart = ImageEditorPinchState.empty public var pinchStateLast = ImageEditorPinchState.empty @@ -144,32 +146,24 @@ public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { if allTouches.count < 2 { return .possible } - guard let pinchState = pinchState(for: allTouches) else { + guard let pinchState = pinchState() else { return .invalid } return .valid(pinchState:pinchState) } - private func pinchState(for touches: Set) -> ImageEditorPinchState? { - guard let view = self.view else { + private func pinchState() -> ImageEditorPinchState? { + guard let referenceView = referenceView else { owsFailDebug("Missing view") return nil } - guard touches.count == 2 else { + guard numberOfTouches == 2 else { return nil } - let touchList = Array(touches).sorted { (left, right) -> Bool in - // TODO: Will timestamp yield stable sort? - left.timestamp < right.timestamp - } - guard let touch0 = touchList.first else { - return nil - } - guard let touch1 = touchList.last else { - return nil - } - let location0 = touch0.location(in: view) - let location1 = touch1.location(in: view) + // We need the touch locations _with a stable ordering_. + // The only way to ensure the ordering is to use location(ofTouch:in:). + let location0 = location(ofTouch: 0, in: referenceView) + let location1 = location(ofTouch: 1, in: referenceView) let centroid = CGPointScale(CGPointAdd(location0, location1), 0.5) let distance = CGPointDistance(location0, location1) @@ -178,7 +172,6 @@ public class ImageEditorPinchGestureRecognizer: UIGestureRecognizer { // changes to the angle. let delta = CGPointSubtract(location1, location0) let angleRadians = atan2(delta.y, delta.x) - return ImageEditorPinchState(centroid: centroid, distance: distance, angleRadians: angleRadians) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorStrokeItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorStrokeItem.swift new file mode 100644 index 000000000..f86940d22 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorStrokeItem.swift @@ -0,0 +1,57 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public class ImageEditorStrokeItem: ImageEditorItem { + // Until we need to serialize these items, + // just use UIColor. + @objc + public let color: UIColor + + public typealias StrokeSample = ImageEditorSample + + @objc + public let unitSamples: [StrokeSample] + + // Expressed as a "Unit" value as a fraction of + // min(width, height) of the destination viewport. + @objc + public let unitStrokeWidth: CGFloat + + @objc + public init(color: UIColor, + unitSamples: [StrokeSample], + unitStrokeWidth: CGFloat) { + self.color = color + self.unitSamples = unitSamples + self.unitStrokeWidth = unitStrokeWidth + + super.init(itemType: .stroke) + } + + @objc + public init(itemId: String, + color: UIColor, + unitSamples: [StrokeSample], + unitStrokeWidth: CGFloat) { + self.color = color + self.unitSamples = unitSamples + self.unitStrokeWidth = unitStrokeWidth + + super.init(itemId: itemId, itemType: .stroke) + } + + @objc + public class func defaultUnitStrokeWidth() -> CGFloat { + return 0.02 + } + + @objc + public class func strokeWidth(forUnitStrokeWidth unitStrokeWidth: CGFloat, + dstSize: CGSize) -> CGFloat { + return CGFloatClamp01(unitStrokeWidth) * min(dstSize.width, dstSize.height) + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift new file mode 100644 index 000000000..5c0b84828 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift @@ -0,0 +1,154 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public class ImageEditorTextItem: ImageEditorItem { + + @objc + public let text: String + + @objc + public let color: UIColor + + @objc + public let font: UIFont + + // In order to render the text at a consistent size + // in very differently sized contexts (canvas in + // portrait, landscape, in the crop tool, before and + // after cropping, while rendering output), + // we need to scale the font size to reflect the + // view width. + // + // We use the image's rendering width as the reference value, + // since we want to be consistent with regard to the image's + // content. + @objc + public let fontReferenceImageWidth: CGFloat + + @objc + public let unitCenter: ImageEditorSample + + // Leave some margins against the edge of the image. + @objc + public static let kDefaultUnitWidth: CGFloat = 0.9 + + // The max width of the text as a fraction of the image width. + // + // This provides continuity of text layout before/after cropping. + // + // NOTE: When you scale the text with with a pinch gesture, that + // affects _scaling_, not the _unit width_, since we don't want + // to change how the text wraps when scaling. + @objc + public let unitWidth: CGFloat + + // 0 = no rotation. + // CGFloat.pi * 0.5 = rotation 90 degrees clockwise. + @objc + public let rotationRadians: CGFloat + + @objc + public static let kMaxScaling: CGFloat = 4.0 + @objc + public static let kMinScaling: CGFloat = 0.5 + @objc + public let scaling: CGFloat + + @objc + public init(text: String, + color: UIColor, + font: UIFont, + fontReferenceImageWidth: CGFloat, + unitCenter: ImageEditorSample = ImageEditorSample(x: 0.5, y: 0.5), + unitWidth: CGFloat = ImageEditorTextItem.kDefaultUnitWidth, + rotationRadians: CGFloat = 0.0, + scaling: CGFloat = 1.0) { + self.text = text + self.color = color + self.font = font + self.fontReferenceImageWidth = fontReferenceImageWidth + self.unitCenter = unitCenter + self.unitWidth = unitWidth + self.rotationRadians = rotationRadians + self.scaling = scaling + + super.init(itemType: .text) + } + + private init(itemId: String, + text: String, + color: UIColor, + font: UIFont, + fontReferenceImageWidth: CGFloat, + unitCenter: ImageEditorSample, + unitWidth: CGFloat, + rotationRadians: CGFloat, + scaling: CGFloat) { + self.text = text + self.color = color + self.font = font + self.fontReferenceImageWidth = fontReferenceImageWidth + self.unitCenter = unitCenter + self.unitWidth = unitWidth + self.rotationRadians = rotationRadians + self.scaling = scaling + + super.init(itemId: itemId, itemType: .text) + } + + @objc + public class func empty(withColor color: UIColor, unitWidth: CGFloat, fontReferenceImageWidth: CGFloat) -> ImageEditorTextItem { + // TODO: Tune the default font size. + let font = UIFont.boldSystemFont(ofSize: 30.0) + return ImageEditorTextItem(text: "", color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, unitWidth: unitWidth) + } + + @objc + public func copy(withText newText: String) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + text: newText, + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitCenter: unitCenter, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling) + } + + @objc + public func copy(withUnitCenter newUnitCenter: CGPoint) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + text: text, + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitCenter: newUnitCenter, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling) + } + + @objc + public func copy(withUnitCenter newUnitCenter: CGPoint, + scaling newScaling: CGFloat, + rotationRadians newRotationRadians: CGFloat) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + text: text, + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitCenter: newUnitCenter, + unitWidth: unitWidth, + rotationRadians: newRotationRadians, + scaling: newScaling) + } + + public override func outputScale() -> CGFloat { + return scaling + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 4fa208637..4fd987b19 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -99,7 +99,7 @@ public protocol ImageEditorTextViewControllerDelegate: class { // MARK: - // A view for editing text item in image editor. -class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { +public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { private weak var delegate: ImageEditorTextViewControllerDelegate? private let textItem: ImageEditorTextItem @@ -127,19 +127,19 @@ class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { // MARK: - View Lifecycle - override func viewWillAppear(_ animated: Bool) { + public override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) textView.becomeFirstResponder() } - override func viewDidAppear(_ animated: Bool) { + public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) textView.becomeFirstResponder() } - override func loadView() { + public override func loadView() { self.view = UIView() self.view.backgroundColor = UIColor(white: 0.5, alpha: 0.5) @@ -155,8 +155,12 @@ class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { textView.autoHCenterInSuperview() // In order to have text wrapping be as WYSIWYG as possible, we limit the text view // to the max text width on the image. - let maxTextWidthPoints = max(self.maxTextWidthPoints, 200) - textView.autoSetDimension(.width, toSize: maxTextWidthPoints, relation: .lessThanOrEqual) +// let maxTextWidthPoints = max(textItem.widthPoints, 200) +// textView.autoSetDimension(.width, toSize: maxTextWidthPoints, relation: .lessThanOrEqual) +// textView.autoPinEdge(toSuperviewMargin: .leading, relation: .greaterThanOrEqual) +// textView.autoPinEdge(toSuperviewMargin: .trailing, relation: .greaterThanOrEqual) + textView.autoPinEdge(toSuperviewMargin: .leading) + textView.autoPinEdge(toSuperviewMargin: .trailing) self.autoPinView(toBottomOfViewControllerOrKeyboard: textView, avoidNotch: true) } @@ -207,7 +211,7 @@ class ImageEditorTextViewController: OWSViewController, VAlignTextViewDelegate { // MARK: - VAlignTextViewDelegate - func textViewDidComplete() { + public func textViewDidComplete() { completeAndDismiss() } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index a0f27a3e7..989ab212e 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -4,23 +4,6 @@ import UIKit -private class EditorTextLayer: CATextLayer { - let itemId: String - - public init(itemId: String) { - self.itemId = itemId - - super.init() - } - - @available(*, unavailable, message: "use other init() instead.") - required public init?(coder aDecoder: NSCoder) { - notImplemented() - } -} - -// MARK: - - @objc public protocol ImageEditorViewDelegate: class { func imageEditor(presentFullScreenOverlay viewController: UIViewController) @@ -31,17 +14,18 @@ public protocol ImageEditorViewDelegate: class { // A view for editing outgoing image attachments. // It can also be used to render the final output. @objc -public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextViewControllerDelegate, UIGestureRecognizerDelegate { +public class ImageEditorView: UIView { weak var delegate: ImageEditorViewDelegate? private let model: ImageEditorModel + private let canvasView: ImageEditorCanvasView + enum EditorMode: String { // This is the default mode. It is used for interacting with text items. case none case brush - case crop } private var editorMode = EditorMode.none { @@ -59,10 +43,11 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV public required init(model: ImageEditorModel, delegate: ImageEditorViewDelegate) { self.model = model self.delegate = delegate + self.canvasView = ImageEditorCanvasView(model: model) super.init(frame: .zero) - model.delegate = self + model.add(observer: self) } @available(*, unavailable, message: "use other init() instead.") @@ -72,51 +57,53 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV // MARK: - Views - private let imageView = UIImageView() - private var imageViewConstraints = [NSLayoutConstraint]() - private let layersView = OWSLayerView() - private var editorGestureRecognizer: ImageEditorGestureRecognizer? + private var moveTextGestureRecognizer: ImageEditorPanGestureRecognizer? + private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? private var tapGestureRecognizer: UITapGestureRecognizer? private var pinchGestureRecognizer: ImageEditorPinchGestureRecognizer? @objc public func configureSubviews() -> Bool { - self.addSubview(imageView) - - guard updateImageView() else { + guard canvasView.configureSubviews() else { return false } - - layersView.clipsToBounds = true - layersView.layoutCallback = { [weak self] (_) in - self?.updateAllContent() - } - self.addSubview(layersView) - layersView.autoPin(toEdgesOf: imageView) + self.addSubview(canvasView) + canvasView.ows_autoPinToSuperviewEdges() self.isUserInteractionEnabled = true - layersView.isUserInteractionEnabled = true - let editorGestureRecognizer = ImageEditorGestureRecognizer(target: self, action: #selector(handleEditorGesture(_:))) - editorGestureRecognizer.canvasView = layersView - editorGestureRecognizer.delegate = self - self.addGestureRecognizer(editorGestureRecognizer) - self.editorGestureRecognizer = editorGestureRecognizer + let moveTextGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleMoveTextGesture(_:))) + moveTextGestureRecognizer.maximumNumberOfTouches = 1 + moveTextGestureRecognizer.referenceView = canvasView.gestureReferenceView + moveTextGestureRecognizer.delegate = self + self.addGestureRecognizer(moveTextGestureRecognizer) + self.moveTextGestureRecognizer = moveTextGestureRecognizer + + let brushGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleBrushGesture(_:))) + brushGestureRecognizer.maximumNumberOfTouches = 1 + brushGestureRecognizer.referenceView = canvasView.gestureReferenceView + self.addGestureRecognizer(brushGestureRecognizer) + self.brushGestureRecognizer = brushGestureRecognizer let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))) self.addGestureRecognizer(tapGestureRecognizer) self.tapGestureRecognizer = tapGestureRecognizer let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) + pinchGestureRecognizer.referenceView = canvasView.gestureReferenceView self.addGestureRecognizer(pinchGestureRecognizer) self.pinchGestureRecognizer = pinchGestureRecognizer // De-conflict the GRs. - editorGestureRecognizer.require(toFail: tapGestureRecognizer) - editorGestureRecognizer.require(toFail: pinchGestureRecognizer) + // editorGestureRecognizer.require(toFail: tapGestureRecognizer) + // editorGestureRecognizer.require(toFail: pinchGestureRecognizer) updateGestureState() + DispatchQueue.main.async { + self.presentCropTool() + } + return true } @@ -138,44 +125,6 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV } } - @objc - public func updateImageView() -> Bool { - - guard let image = UIImage(contentsOfFile: model.currentImagePath) else { - owsFailDebug("Could not load image") - return false - } - guard image.size.width > 0 && image.size.height > 0 else { - owsFailDebug("Could not load image") - return false - } - - imageView.image = image - imageView.layer.minificationFilter = kCAFilterTrilinear - imageView.layer.magnificationFilter = kCAFilterTrilinear - let aspectRatio = image.size.width / image.size.height - for constraint in imageViewConstraints { - constraint.autoRemove() - } - imageViewConstraints = applyScaleAspectFitLayout(view: imageView, aspectRatio: aspectRatio) - - return true - } - - private func applyScaleAspectFitLayout(view: UIView, aspectRatio: CGFloat) -> [NSLayoutConstraint] { - // This emulates the behavior of contentMode = .scaleAspectFit using - // iOS auto layout constraints. - // - // This allows ConversationInputToolbar to place the "cancel" button - // in the upper-right hand corner of the preview content. - var constraints = [NSLayoutConstraint]() - constraints.append(contentsOf: view.autoCenterInSuperview()) - constraints.append(view.autoPin(toAspectRatio: aspectRatio)) - constraints.append(view.autoMatch(.width, to: .width, of: self, withMultiplier: 1.0, relation: .lessThanOrEqual)) - constraints.append(view.autoMatch(.height, to: .height, of: self, withMultiplier: 1.0, relation: .lessThanOrEqual)) - return constraints - } - private let undoButton = UIButton(type: .custom) private let redoButton = UIButton(type: .custom) private let brushButton = UIButton(type: .custom) @@ -249,7 +198,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV undoButton.isEnabled = model.canUndo() redoButton.isEnabled = model.canRedo() brushButton.isSelected = editorMode == .brush - cropButton.isSelected = editorMode == .crop + cropButton.isSelected = false newTextButton.isSelected = false for button in allButtons { @@ -286,13 +235,23 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV @objc func didTapCrop(sender: UIButton) { Logger.verbose("") - toggle(editorMode: .crop) + presentCropTool() } @objc func didTapNewText(sender: UIButton) { Logger.verbose("") - let textItem = ImageEditorTextItem.empty(withColor: currentColor) + let viewSize = canvasView.gestureReferenceView.bounds.size + let imageSize = model.srcImageSizePixels + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSize, + transform: model.currentTransform()) + + let textWidthPoints = viewSize.width * ImageEditorTextItem.kDefaultUnitWidth + let textWidthUnit = textWidthPoints / imageFrame.size.width + + let textItem = ImageEditorTextItem.empty(withColor: currentColor, + unitWidth: textWidthUnit, + fontReferenceImageWidth: imageFrame.size.width) edit(textItem: textItem) } @@ -319,20 +278,14 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV switch editorMode { case .none: - editorGestureRecognizer?.shouldAllowOutsideView = true - editorGestureRecognizer?.isEnabled = true + moveTextGestureRecognizer?.isEnabled = true + brushGestureRecognizer?.isEnabled = false tapGestureRecognizer?.isEnabled = true pinchGestureRecognizer?.isEnabled = true case .brush: // Brush strokes can start and end (and return from) outside the view. - editorGestureRecognizer?.shouldAllowOutsideView = true - editorGestureRecognizer?.isEnabled = true - tapGestureRecognizer?.isEnabled = false - pinchGestureRecognizer?.isEnabled = false - case .crop: - // Crop gestures can start and end (and return from) outside the view. - editorGestureRecognizer?.shouldAllowOutsideView = true - editorGestureRecognizer?.isEnabled = true + moveTextGestureRecognizer?.isEnabled = false + brushGestureRecognizer?.isEnabled = true tapGestureRecognizer?.isEnabled = false pinchGestureRecognizer?.isEnabled = false } @@ -349,7 +302,8 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV return } - guard let textLayer = textLayer(forGestureRecognizer: gestureRecognizer) else { + let location = gestureRecognizer.location(in: canvasView.gestureReferenceView) + guard let textLayer = canvasView.textLayer(forLocation: location) else { return } @@ -361,27 +315,6 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV edit(textItem: textItem) } - private var isEditingTextItem = false { - didSet { - AssertIsOnMainThread() - - updateButtons() - } - } - - private func edit(textItem: ImageEditorTextItem) { - Logger.verbose("") - - toggle(editorMode: .none) - - isEditingTextItem = true - - let maxTextWidthPoints = imageView.width() * ImageEditorTextItem.kDefaultUnitWidth - - let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) - self.delegate?.imageEditor(presentFullScreenOverlay: textEditor) - } - // MARK: - Pinch Gesture // These properties are valid while moving a text item. @@ -397,12 +330,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV switch gestureRecognizer.state { case .began: let pinchState = gestureRecognizer.pinchStateStart - guard let gestureRecognizerView = gestureRecognizer.view else { - owsFailDebug("Missing gestureRecognizer.view.") - return - } - let location = gestureRecognizerView.convert(pinchState.centroid, to: unitReferenceView) - guard let textLayer = textLayer(forLocation: location) else { + guard let textLayer = canvasView.textLayer(forLocation: pinchState.centroid) else { // The pinch needs to start centered on a text item. return } @@ -417,9 +345,13 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV return } - let locationDelta = CGPointSubtract(gestureRecognizer.pinchStateLast.centroid, - gestureRecognizer.pinchStateStart.centroid) - let unitLocationDelta = convertToUnit(location: locationDelta, shouldClamp: false) + let locationStart = gestureRecognizer.pinchStateStart.centroid + let locationUnitStart = locationUnit(forLocationInView: locationStart, transform: model.currentTransform()) + let locationNow = gestureRecognizer.pinchStateLast.centroid + let locationUnitNow = locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) + + let unitLocationDelta = CGPointSubtract(locationUnitNow, + locationUnitStart) let unitCenter = CGPointClamp01(CGPointAdd(textItem.unitCenter, unitLocationDelta)) // NOTE: We use max(1, ...) to avoid divide-by-zero. @@ -450,41 +382,24 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV // MARK: - Editor Gesture - @objc - public func handleEditorGesture(_ gestureRecognizer: ImageEditorGestureRecognizer) { - AssertIsOnMainThread() - - switch editorMode { - case .none: - handleDefaultGesture(gestureRecognizer) - break - case .brush: - handleBrushGesture(gestureRecognizer) - case .crop: - handleCropGesture(gestureRecognizer) - } - } - // These properties are valid while moving a text item. private var movingTextItem: ImageEditorTextItem? - private var movingTextStartUnitLocation = CGPoint.zero - private var movingTextStartUnitCenter = CGPoint.zero + private var movingTextStartUnitCenter: CGPoint? private var movingTextHasMoved = false @objc - public func handleDefaultGesture(_ gestureRecognizer: ImageEditorGestureRecognizer) { + public func handleMoveTextGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { AssertIsOnMainThread() // We could undo an in-progress move if the gesture is cancelled, but it seems gratuitous. switch gestureRecognizer.state { case .began: - guard let gestureRecognizerView = gestureRecognizer.view else { - owsFailDebug("Missing gestureRecognizer.view.") + guard let locationStart = gestureRecognizer.locationStart else { + owsFailDebug("Missing locationStart.") return } - let location = gestureRecognizerView.convert(gestureRecognizer.startLocationInView, to: unitReferenceView) - guard let textLayer = textLayer(forLocation: location) else { + guard let textLayer = canvasView.textLayer(forLocation: locationStart) else { owsFailDebug("No text layer") return } @@ -492,9 +407,6 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV owsFailDebug("Missing or invalid text item.") return } - movingTextStartUnitLocation = convertToUnit(location: location, - shouldClamp: false) - movingTextItem = textItem movingTextStartUnitCenter = textItem.unitCenter movingTextHasMoved = false @@ -503,9 +415,20 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV guard let textItem = movingTextItem else { return } + guard let locationStart = gestureRecognizer.locationStart else { + owsFailDebug("Missing locationStart.") + return + } + guard let movingTextStartUnitCenter = movingTextStartUnitCenter else { + owsFailDebug("Missing movingTextStartUnitCenter.") + return + } - let unitLocation = unitSampleForGestureLocation(gestureRecognizer, shouldClamp: false) - let unitLocationDelta = CGPointSubtract(unitLocation, movingTextStartUnitLocation) + let locationUnitStart = canvasView.locationUnit(forLocationInView: locationStart, transform: model.currentTransform()) + let locationNow = gestureRecognizer.location(in: canvasView.gestureReferenceView) + let locationUnitNow = canvasView.locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) + + let unitLocationDelta = CGPointSubtract(locationUnitNow, locationUnitStart) let unitCenter = CGPointClamp01(CGPointAdd(movingTextStartUnitCenter, unitLocationDelta)) let newItem = textItem.copy(withUnitCenter: unitCenter) @@ -542,7 +465,7 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV self.currentStrokeSamples.removeAll() } let tryToAppendStrokeSample = { - let newSample = self.unitSampleForGestureLocation(gestureRecognizer, shouldClamp: false) + let newSample = self.locationUnit(forGestureRecognizer: gestureRecognizer, transform: self.model.currentTransform()) if let prevSample = self.currentStrokeSamples.last, prevSample == newSample { // Ignore duplicate samples. @@ -590,474 +513,105 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV } } - private var unitReferenceView: UIView { - return layersView + // MARK: - Coordinates + + private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, + transform: ImageEditorTransform) -> CGPoint { + return canvasView.locationUnit(forGestureRecognizer: gestureRecognizer, transform: transform) } - private func unitSampleForGestureLocation(_ gestureRecognizer: UIGestureRecognizer, - shouldClamp: Bool) -> CGPoint { - // TODO: Smooth touch samples before converting into stroke samples. - let location = gestureRecognizer.location(in: unitReferenceView) - return convertToUnit(location: location, - shouldClamp: shouldClamp) + private func locationUnit(forLocationInView locationInView: CGPoint, + transform: ImageEditorTransform) -> CGPoint { + return canvasView.locationUnit(forLocationInView: locationInView, transform: transform) } - private func convertToUnit(location: CGPoint, - shouldClamp: Bool) -> CGPoint { - var x = CGFloatInverseLerp(location.x, 0, unitReferenceView.bounds.width) - var y = CGFloatInverseLerp(location.y, 0, unitReferenceView.bounds.height) - if shouldClamp { - x = CGFloatClamp01(x) - y = CGFloatClamp01(y) - } - return CGPoint(x: x, y: y) - } + // MARK: - Edit Text Tool - // MARK: - Crop + private var isEditingTextItem = false { + didSet { + AssertIsOnMainThread() - private var cropStartUnit = CGPoint.zero - private var cropEndUnit = CGPoint.zero - private var cropLayer1 = CAShapeLayer() - private var cropLayer2 = CAShapeLayer() - private var cropLayers: [CAShapeLayer] { - return [cropLayer1, cropLayer2] - } - - @objc - public func handleCropGesture(_ gestureRecognizer: UIGestureRecognizer) { - AssertIsOnMainThread() - - let kCropDashLength: CGFloat = 3 - let cancelCrop = { - for cropLayer in self.cropLayers { - cropLayer.removeFromSuperlayer() - cropLayer.removeAllAnimations() - } - } - let updateCropLayer = { (cropLayer: CAShapeLayer) in - cropLayer.fillColor = nil - cropLayer.lineWidth = 1.0 - cropLayer.lineDashPattern = [NSNumber(value: Double(kCropDashLength)), NSNumber(value: Double(kCropDashLength))] - - let viewSize = self.layersView.bounds.size - cropLayer.frame = CGRect(origin: .zero, size: viewSize) - - // Find the upper-left and bottom-right corners of the - // crop rectangle, in unit coordinates. - let unitMin = CGPointMin(self.cropStartUnit, self.cropEndUnit) - let unitMax = CGPointMax(self.cropStartUnit, self.cropEndUnit) - - let transformSampleToPoint = { (unitSample: CGPoint) -> CGPoint in - return CGPoint(x: viewSize.width * unitSample.x, - y: viewSize.height * unitSample.y) - } - - // Convert from unit coordinates to view coordinates. - let pointMin = transformSampleToPoint(unitMin) - let pointMax = transformSampleToPoint(unitMax) - let cropRect = CGRect(x: pointMin.x, - y: pointMin.y, - width: pointMax.x - pointMin.x, - height: pointMax.y - pointMin.y) - let bezierPath = UIBezierPath(rect: cropRect) - cropLayer.path = bezierPath.cgPath - } - let updateCrop = { - updateCropLayer(self.cropLayer1) - updateCropLayer(self.cropLayer2) - self.cropLayer1.strokeColor = UIColor.white.cgColor - self.cropLayer2.strokeColor = UIColor.black.cgColor - self.cropLayer1.lineDashPhase = 0 - self.cropLayer2.lineDashPhase = self.cropLayer1.lineDashPhase + kCropDashLength - } - let startCrop = { - for cropLayer in self.cropLayers { - self.layersView.layer.addSublayer(cropLayer) - } - - updateCrop() - } - let endCrop = { - updateCrop() - - for cropLayer in self.cropLayers { - cropLayer.removeFromSuperlayer() - cropLayer.removeAllAnimations() - } - - // Find the upper-left and bottom-right corners of the - // crop rectangle, in unit coordinates. - let unitMin = CGPointClamp01(CGPointMin(self.cropStartUnit, self.cropEndUnit)) - let unitMax = CGPointClamp01(CGPointMax(self.cropStartUnit, self.cropEndUnit)) - let unitCropRect = CGRect(x: unitMin.x, - y: unitMin.y, - width: unitMax.x - unitMin.x, - height: unitMax.y - unitMin.y) - self.model.crop(unitCropRect: unitCropRect) - } - - let currentUnitSample = { - self.unitSampleForGestureLocation(gestureRecognizer, shouldClamp: true) - } - - switch gestureRecognizer.state { - case .began: - let unitSample = currentUnitSample() - cropStartUnit = unitSample - cropEndUnit = unitSample - startCrop() - - case .changed: - cropEndUnit = currentUnitSample() - updateCrop() - case .ended: - cropEndUnit = currentUnitSample() - endCrop() - default: - cancelCrop() + updateButtons() } } - // MARK: - ImageEditorModelDelegate + private func edit(textItem: ImageEditorTextItem) { + Logger.verbose("") + + toggle(editorMode: .none) + + isEditingTextItem = true + + // TODO: + let maxTextWidthPoints = model.srcImageSizePixels.width * ImageEditorTextItem.kDefaultUnitWidth + // let maxTextWidthPoints = canvasView.imageView.width() * ImageEditorTextItem.kDefaultUnitWidth + + let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) + self.delegate?.imageEditor(presentFullScreenOverlay: textEditor) + } + + // MARK: - Crop Tool + + private func presentCropTool() { + Logger.verbose("") + + toggle(editorMode: .none) + + guard let srcImage = canvasView.loadSrcImage() else { + owsFailDebug("Couldn't load src image.") + return + } + + // We want to render a preview image that "flattens" all of the brush strokes, text items, + // into the background image without applying the transform (e.g. rotating, etc.), so we + // use a default transform. + let previewTransform = ImageEditorTransform.defaultTransform(srcImageSizePixels: model.srcImageSizePixels) + guard let previewImage = ImageEditorCanvasView.renderForOutput(model: model, transform: previewTransform) else { + owsFailDebug("Couldn't generate preview image.") + return + } + + let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage) + self.delegate?.imageEditor(presentFullScreenOverlay: cropTool) + }} + +// MARK: - + +extension ImageEditorView: UIGestureRecognizerDelegate { + + @objc public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + guard moveTextGestureRecognizer == gestureRecognizer else { + owsFailDebug("Unexpected gesture.") + return false + } + guard editorMode == .none else { + // We only filter touches when in default mode. + return true + } + + let location = touch.location(in: canvasView.gestureReferenceView) + let isInTextArea = canvasView.textLayer(forLocation: location) != nil + return isInTextArea + } +} + +// MARK: - + +extension ImageEditorView: ImageEditorModelObserver { public func imageEditorModelDidChange(before: ImageEditorContents, after: ImageEditorContents) { - - if before.imagePath != after.imagePath { - _ = updateImageView() - } - - updateAllContent() - updateButtons() } public func imageEditorModelDidChange(changedItemIds: [String]) { - updateContent(changedItemIds: changedItemIds) - updateButtons() } +} - // MARK: - Accessor Overrides +// MARK: - - @objc public override var bounds: CGRect { - didSet { - if oldValue != bounds { - updateAllContent() - } - } - } - - @objc public override var frame: CGRect { - didSet { - if oldValue != frame { - updateAllContent() - } - } - } - - // MARK: - Content - - var contentLayerMap = [String: CALayer]() - - internal func updateAllContent() { - AssertIsOnMainThread() - - // Don't animate changes. - CATransaction.begin() - CATransaction.setDisableActions(true) - - for layer in contentLayerMap.values { - layer.removeFromSuperlayer() - } - contentLayerMap.removeAll() - - if bounds.width > 0, - bounds.height > 0 { - - for item in model.items() { - let viewSize = layersView.bounds.size - guard let layer = ImageEditorView.layerForItem(item: item, - viewSize: viewSize) else { - continue - } - - layersView.layer.addSublayer(layer) - contentLayerMap[item.itemId] = layer - } - } - - CATransaction.commit() - } - - internal func updateContent(changedItemIds: [String]) { - AssertIsOnMainThread() - - // Don't animate changes. - CATransaction.begin() - CATransaction.setDisableActions(true) - - // Remove all changed items. - for itemId in changedItemIds { - if let layer = contentLayerMap[itemId] { - layer.removeFromSuperlayer() - } - contentLayerMap.removeValue(forKey: itemId) - } - - if bounds.width > 0, - bounds.height > 0 { - - // Create layers for inserted and updated items. - for itemId in changedItemIds { - guard let item = model.item(forId: itemId) else { - // Item was deleted. - continue - } - - // Item was inserted or updated. - let viewSize = layersView.bounds.size - guard let layer = ImageEditorView.layerForItem(item: item, - viewSize: viewSize) else { - continue - } - - layersView.layer.addSublayer(layer) - contentLayerMap[item.itemId] = layer - } - } - - CATransaction.commit() - } - - private class func layerForItem(item: ImageEditorItem, - viewSize: CGSize) -> CALayer? { - AssertIsOnMainThread() - - switch item.itemType { - case .test: - owsFailDebug("Unexpected test item.") - return nil - case .stroke: - guard let strokeItem = item as? ImageEditorStrokeItem else { - owsFailDebug("Item has unexpected type: \(type(of: item)).") - return nil - } - return strokeLayerForItem(item: strokeItem, viewSize: viewSize) - case .text: - guard let textItem = item as? ImageEditorTextItem else { - owsFailDebug("Item has unexpected type: \(type(of: item)).") - return nil - } - return textLayerForItem(item: textItem, viewSize: viewSize) - } - } - - private class func strokeLayerForItem(item: ImageEditorStrokeItem, - viewSize: CGSize) -> CALayer? { - AssertIsOnMainThread() - - let strokeWidth = ImageEditorStrokeItem.strokeWidth(forUnitStrokeWidth: item.unitStrokeWidth, - dstSize: viewSize) - let unitSamples = item.unitSamples - guard unitSamples.count > 0 else { - // Not an error; the stroke doesn't have enough samples to render yet. - return nil - } - - let shapeLayer = CAShapeLayer() - shapeLayer.lineWidth = strokeWidth - shapeLayer.strokeColor = item.color.cgColor - shapeLayer.frame = CGRect(origin: .zero, size: viewSize) - - let transformSampleToPoint = { (unitSample: CGPoint) -> CGPoint in - return CGPoint(x: viewSize.width * unitSample.x, - y: viewSize.height * unitSample.y) - } - - // TODO: Use bezier curves to smooth stroke. - let bezierPath = UIBezierPath() - - let points = applySmoothing(to: unitSamples.map { (unitSample) in - transformSampleToPoint(unitSample) - }) - var previousForwardVector = CGPoint.zero - for index in 0.. CALayer? { - AssertIsOnMainThread() - - let layer = EditorTextLayer(itemId: item.itemId) - layer.string = item.text - layer.foregroundColor = item.color.cgColor - layer.font = CGFont(item.font.fontName as CFString) - layer.fontSize = item.font.pointSize - layer.isWrapped = true - layer.alignmentMode = kCAAlignmentCenter - // I don't think we need to enable allowsFontSubpixelQuantization - // or set truncationMode. - - // This text needs to be rendered at a scale that reflects the sceen scaling - // AND the item's scaling. - layer.contentsScale = UIScreen.main.scale * item.scaling - - // TODO: Min with measured width. - let maxWidth = viewSize.width * item.unitWidth - let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude) - // TODO: Is there a more accurate way to measure text in a CATextLayer? - // CoreText? - let textBounds = (item.text as NSString).boundingRect(with: maxSize, - options: [ - .usesLineFragmentOrigin, - .usesFontLeading - ], - attributes: [ - .font: item.font - ], - context: nil) - let center = CGPoint(x: viewSize.width * item.unitCenter.x, - y: viewSize.height * item.unitCenter.y) - let layerSize = CGSizeCeil(textBounds.size) - layer.frame = CGRect(origin: CGPoint(x: center.x - layerSize.width * 0.5, - y: center.y - layerSize.height * 0.5), - size: layerSize) - - let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) - layer.setAffineTransform(transform) - - return layer - } - - // We apply more than one kind of smoothing. - // - // This (simple) smoothing reduces jitter from the touch sensor. - private class func applySmoothing(to points: [CGPoint]) -> [CGPoint] { - AssertIsOnMainThread() - - var result = [CGPoint]() - - for index in 0.. UIImage? { - // TODO: Do we want to render off the main thread? - AssertIsOnMainThread() - - // Render output at same size as source image. - let dstSizePixels = model.srcImageSizePixels - let dstScale: CGFloat = 1.0 // The size is specified in pixels, not in points. - - let hasAlpha = NSData.hasAlpha(forValidImageFilePath: model.currentImagePath) - - guard let srcImage = UIImage(contentsOfFile: model.currentImagePath) else { - owsFailDebug("Could not load src image.") - return nil - } - - // We use an UIImageView + UIView.renderAsImage() instead of a CGGraphicsContext - // Because CALayer.renderInContext() doesn't honor CALayer properties like frame, - // transform, etc. - let imageView = UIImageView(image: srcImage) - imageView.frame = CGRect(origin: .zero, size: dstSizePixels) - for item in model.items() { - guard let layer = layerForItem(item: item, - viewSize: dstSizePixels) else { - Logger.error("Couldn't create layer for item.") - continue - } - layer.contentsScale = dstScale * item.outputScale() - imageView.layer.addSublayer(layer) - } - let image = imageView.renderAsImage(opaque: !hasAlpha, scale: dstScale) - return image - } - - // MARK: - ImageEditorTextViewControllerDelegate +extension ImageEditorView: ImageEditorTextViewControllerDelegate { public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) { AssertIsOnMainThread() @@ -1084,49 +638,17 @@ public class ImageEditorView: UIView, ImageEditorModelDelegate, ImageEditorTextV public func textEditDidCancel() { isEditingTextItem = false } +} - // MARK: - UIGestureRecognizerDelegate +// MARK: - - @objc public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { - guard let editorGestureRecognizer = editorGestureRecognizer else { - owsFailDebug("Missing editorGestureRecognizer.") - return false - } - guard editorGestureRecognizer == gestureRecognizer else { - owsFailDebug("Unexpected gesture.") - return false - } - guard editorMode == .none else { - // We only filter touches when in default mode. - return true - } - - let isInTextArea = textLayer(forTouch: touch) != nil - return isInTextArea +extension ImageEditorView: ImageEditorCropViewControllerDelegate { + public func cropDidComplete(transform: ImageEditorTransform) { + // TODO: Ignore no-change updates. + model.replace(transform: transform) } - private func textLayer(forTouch touch: UITouch) -> EditorTextLayer? { - let point = touch.location(in: layersView) - return textLayer(forLocation: point) - } - - private func textLayer(forGestureRecognizer gestureRecognizer: UIGestureRecognizer) -> EditorTextLayer? { - let point = gestureRecognizer.location(in: layersView) - return textLayer(forLocation: point) - } - - private func textLayer(forLocation point: CGPoint) -> EditorTextLayer? { - guard let sublayers = layersView.layer.sublayers else { - return nil - } - for layer in sublayers { - guard let textLayer = layer as? EditorTextLayer else { - continue - } - if textLayer.hitTest(point) != nil { - return textLayer - } - } - return nil + public func cropDidCancel() { + // TODO: } } diff --git a/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift new file mode 100644 index 000000000..adec0c9fd --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift @@ -0,0 +1,104 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +public class OrderedDictionary: NSObject { + + public typealias KeyType = String + + var keyValueMap = [KeyType: ValueType]() + + var orderedKeys = [KeyType]() + + public override init() { + } + + // Used to clone copies of instances of this class. + public init(keyValueMap: [KeyType: ValueType], + orderedKeys: [KeyType]) { + + self.keyValueMap = keyValueMap + self.orderedKeys = orderedKeys + } + + // Since the contents are immutable, we only modify copies + // made with this method. + public func clone() -> OrderedDictionary { + return OrderedDictionary(keyValueMap: keyValueMap, orderedKeys: orderedKeys) + } + + public func value(forKey key: KeyType) -> ValueType? { + return keyValueMap[key] + } + + public func append(key: KeyType, value: ValueType) { + if keyValueMap[key] != nil { + owsFailDebug("Unexpected duplicate key in key map: \(key)") + } + keyValueMap[key] = value + + if orderedKeys.contains(key) { + owsFailDebug("Unexpected duplicate key in key list: \(key)") + } else { + orderedKeys.append(key) + } + + if orderedKeys.count != keyValueMap.count { + owsFailDebug("Invalid contents.") + } + } + + public func replace(key: KeyType, value: ValueType) { + if keyValueMap[key] == nil { + owsFailDebug("Missing key in key map: \(key)") + } + keyValueMap[key] = value + + if !orderedKeys.contains(key) { + owsFailDebug("Missing key in key list: \(key)") + } + + if orderedKeys.count != keyValueMap.count { + owsFailDebug("Invalid contents.") + } + } + + public func remove(key: KeyType) { + if keyValueMap[key] == nil { + owsFailDebug("Missing key in key map: \(key)") + } else { + keyValueMap.removeValue(forKey: key) + } + + if !orderedKeys.contains(key) { + owsFailDebug("Missing key in key list: \(key)") + } else { + orderedKeys = orderedKeys.filter { $0 != key } + } + + if orderedKeys.count != keyValueMap.count { + owsFailDebug("Invalid contents.") + } + } + + public var count: Int { + if orderedKeys.count != keyValueMap.count { + owsFailDebug("Invalid contents.") + } + return orderedKeys.count + } + + public func orderedValues() -> [ValueType] { + var values = [ValueType]() + for key in orderedKeys { + guard let value = self.keyValueMap[key] else { + owsFailDebug("Missing value") + continue + } + values.append(value) + } + return values + } +} diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m index ae0bc3e18..8dadbc795 100644 --- a/SignalMessaging/categories/UIColor+OWS.m +++ b/SignalMessaging/categories/UIColor+OWS.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "UIColor+OWS.h" @@ -119,6 +119,7 @@ NS_ASSUME_NONNULL_BEGIN [otherColor getRed:&r1 green:&g1 blue:&b1 alpha:&a1]; OWSAssertDebug(result); + alpha = CGFloatClamp01(alpha); return [UIColor colorWithRed:CGFloatLerp(r0, r1, alpha) green:CGFloatLerp(g0, g1, alpha) blue:CGFloatLerp(b0, b1, alpha) diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index 6eb7e98cf..a4999a0a3 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -22,7 +22,7 @@ CGFloat ScaleFromIPhone5To7Plus(CGFloat iPhone5Value, CGFloat iPhone7PlusValue) CGFloat screenShortDimension = ScreenShortDimension(); return (CGFloat)round(CGFloatLerp(iPhone5Value, iPhone7PlusValue, - CGFloatInverseLerp(screenShortDimension, kIPhone5ScreenWidth, kIPhone7PlusScreenWidth))); + CGFloatClamp01(CGFloatInverseLerp(screenShortDimension, kIPhone5ScreenWidth, kIPhone7PlusScreenWidth)))); } CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index d6ce22e95..2ff5cde1f 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -86,4 +86,116 @@ extension UIView { view.autoSetDimension(.height, toSize: height) return view } + + @objc + public func applyScaleAspectFitLayout(subview: UIView, aspectRatio: CGFloat) -> [NSLayoutConstraint] { + guard subviews.contains(subview) else { + owsFailDebug("Not a subview.") + return [] + } + + // This emulates the behavior of contentMode = .scaleAspectFit using + // iOS auto layout constraints. + // + // This allows ConversationInputToolbar to place the "cancel" button + // in the upper-right hand corner of the preview content. + var constraints = [NSLayoutConstraint]() + constraints.append(contentsOf: subview.autoCenterInSuperview()) + constraints.append(subview.autoPin(toAspectRatio: aspectRatio)) + constraints.append(subview.autoMatch(.width, to: .width, of: self, withMultiplier: 1.0, relation: .lessThanOrEqual)) + constraints.append(subview.autoMatch(.height, to: .height, of: self, withMultiplier: 1.0, relation: .lessThanOrEqual)) + return constraints + } +} + +public extension CGFloat { + // Linear interpolation + public func lerp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + return CGFloatLerp(minValue, maxValue, self) + } + + // Inverse linear interpolation + public func inverseLerp(_ minValue: CGFloat, _ maxValue: CGFloat, shouldClamp: Bool = false) -> CGFloat { + let value = CGFloatInverseLerp(self, minValue, maxValue) + return (shouldClamp ? CGFloatClamp01(value) : value) + } + + public static let halfPi: CGFloat = CGFloat.pi * 0.5 +} + +public extension CGPoint { + public func toUnitCoordinates(viewBounds: CGRect, shouldClamp: Bool) -> CGPoint { + return CGPoint(x: (x - viewBounds.origin.x).inverseLerp(0, viewBounds.width, shouldClamp: shouldClamp), + y: (y - viewBounds.origin.y).inverseLerp(0, viewBounds.height, shouldClamp: shouldClamp)) + } + + public func toUnitCoordinates(viewSize: CGSize, shouldClamp: Bool) -> CGPoint { + return toUnitCoordinates(viewBounds: CGRect(origin: .zero, size: viewSize), shouldClamp: shouldClamp) + } + + public func fromUnitCoordinates(viewSize: CGSize) -> CGPoint { + return CGPoint(x: x.lerp(0, viewSize.width), + y: y.lerp(0, viewSize.height)) + } + + public func inverse() -> CGPoint { + return CGPoint(x: -x, y: -y) + } + + public func plus(_ value: CGPoint) -> CGPoint { + return CGPointAdd(self, value) + } + + public func minus(_ value: CGPoint) -> CGPoint { + return CGPointSubtract(self, value) + } + + public static let unit: CGPoint = CGPoint(x: 1.0, y: 1.0) + + public static let unitMidpoint: CGPoint = CGPoint(x: 0.5, y: 0.5) + + public func applyingInverse(_ transform: CGAffineTransform) -> CGPoint { + return applying(transform.inverted()) + } +} + +public extension CGRect { + public var center: CGPoint { + return CGPoint(x: midX, y: midY) + } + + public var topLeft: CGPoint { + return origin + } + + public var bottomRight: CGPoint { + return CGPoint(x: maxX, y: maxY) + } +} + +public extension CGAffineTransform { + public static func translate(_ point: CGPoint) -> CGAffineTransform { + return CGAffineTransform(translationX: point.x, y: point.y) + } + + public static func scale(_ scaling: CGFloat) -> CGAffineTransform { + return CGAffineTransform(scaleX: scaling, y: scaling) + } + + public func translate(_ point: CGPoint) -> CGAffineTransform { + return translatedBy(x: point.x, y: point.y) + } + + public func scale(_ scaling: CGFloat) -> CGAffineTransform { + return scaledBy(x: scaling, y: scaling) + } + + public func rotate(_ angleRadians: CGFloat) -> CGAffineTransform { + return rotated(by: angleRadians) + } + +// public func forAnchorPoint(viewSize: CGSize) -> CGAffineTransform { +// let viewCenter = CGRect(origin: .zero, size: viewSize).center +// return CGAffineTransform.translate(viewCenter.inverse()).concatenating(self).translate(viewCenter) +// } } diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index c93a07d23..17d6b7c5a 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -910,8 +910,6 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O { OWSAssertIsOnMainThread(); - return NO; - // Don't open socket in app extensions. if (!CurrentAppContext().isMainApp) { return NO; diff --git a/SignalServiceKit/src/Util/OWSMath.h b/SignalServiceKit/src/Util/OWSMath.h index 1a9ec40cb..d09f00763 100644 --- a/SignalServiceKit/src/Util/OWSMath.h +++ b/SignalServiceKit/src/Util/OWSMath.h @@ -16,8 +16,6 @@ CG_INLINE CGFloat CGFloatClamp01(CGFloat value) CG_INLINE CGFloat CGFloatLerp(CGFloat left, CGFloat right, CGFloat alpha) { - alpha = CGFloatClamp01(alpha); - return (left * (1.f - alpha)) + (right * alpha); } From 922f787ff62b4ff4f7aebb53e1293a04a5db8e70 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 10:36:00 -0500 Subject: [PATCH 028/493] Clean up ahead of PR. --- Signal/Signal-Info.plist | 4 +- .../ConversationViewController.m | 44 ------------------- .../HomeView/HomeViewController.m | 18 -------- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index bbc073f5d..5cc9da65c 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,9 +7,9 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.3 + 10.14.2 WebRTCCommit - 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 + aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195 M71 CFBundleDevelopmentRegion en diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 17c8ec918..a40183cd2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1234,50 +1234,6 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; - - [self showDebugImageEditorAsync]; -} - -- (void)showDebugImageEditorAsync -{ - dispatch_async(dispatch_get_main_queue(), ^{ - NSString *_Nullable filePath = [[NSBundle mainBundle] pathForResource:@"qr@2x" ofType:@"png" inDirectory:nil]; - if (!filePath) { - OWSFailDebug(@"Missing asset."); - } - - for (ConversationInteractionViewItem *viewItem in self.conversationViewModel.viewItems - .reverseObjectEnumerator) { - if (viewItem.mediaAlbumItems.count < 1) { - continue; - } - ConversationMediaAlbumItem *mediaItem = viewItem.mediaAlbumItems.firstObject; - if (mediaItem.attachmentStream == nil) { - continue; - } - if (!mediaItem.attachmentStream.isValidImage) { - continue; - } - filePath = mediaItem.attachmentStream.originalFilePath; - break; - } - - DataSource *_Nullable dataSource = - [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:NO]; - if (!dataSource) { - OWSFailDebug(@"Invalid asset."); - return; - } - - NSString *fileExtension = filePath.pathExtension; - NSString *dataUTI = [MIMETypeUtil utiTypeForFileExtension:fileExtension]; - - // "Document picker" attachments _SHOULD NOT_ be resized, if possible. - SignalAttachment *attachment = - [SignalAttachment attachmentWithDataSource:dataSource dataUTI:dataUTI imageQuality:TSImageQualityOriginal]; - - [self showApprovalDialogForAttachment:attachment]; - }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 02850c1d2..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,26 +482,8 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - [self presentFirstThreadAsync]; } -#ifdef DEBUG - -- (void)presentFirstThreadAsync -{ - dispatch_async(dispatch_get_main_queue(), ^{ - if ([self.tableView numberOfRowsInSection:HomeViewControllerSectionConversations] < 1) { - return; - } - TSThread *thread = - [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; - [self presentThread:thread action:ConversationViewActionNone animated:YES]; - }); -} - -#endif - - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; From 331a013f8d2e981e088f9d270897ebe021dbcd28 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 10:53:07 -0500 Subject: [PATCH 029/493] Clean up ahead of PR. --- .../ImageEditor/ImageEditorModelTest.swift | 9 --------- .../ImageEditor/ImageEditorCanvasView.swift | 19 ++++++------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift index fedb5b69e..29cb2ab39 100644 --- a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift @@ -8,15 +8,6 @@ import XCTest class ImageEditorModelTest: SignalBaseTest { -// override func setUp() { -// super.setUp() -// } -// -// override func tearDown() { -// // Put teardown code here. This method is called after the invocation of each test method in the class. -// super.tearDown() -// } - func testImageEditorTransform0() { let imageSizePixels = CGSize(width: 200, height: 300) let outputSizePixels = CGSize(width: 200, height: 300) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 2069ef7f6..ad538e621 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -43,9 +43,13 @@ public class ImageEditorCanvasView: UIView { // MARK: - Views - // TODO: Audit all usage of this view. + // contentView is used to host the layers used to render the content. + // + // The transform for the content is applied to it. public let contentView = OWSLayerView() + // clipView is used to clip the content. It reflects the actual + // visible bounds of the content. private let clipView = OWSLayerView() private var contentViewConstraints = [NSLayoutConstraint]() @@ -157,8 +161,6 @@ public class ImageEditorCanvasView: UIView { internal func updateAllContent() { AssertIsOnMainThread() - Logger.verbose("") - // Don't animate changes. CATransaction.begin() CATransaction.setDisableActions(true) @@ -200,8 +202,6 @@ public class ImageEditorCanvasView: UIView { internal func updateContent(changedItemIds: [String]) { AssertIsOnMainThread() - Logger.verbose("") - // Don't animate changes. CATransaction.begin() CATransaction.setDisableActions(true) @@ -245,8 +245,6 @@ public class ImageEditorCanvasView: UIView { } private func applyTransform() { - Logger.verbose("") - let viewSize = clipView.bounds.size contentView.layer.setAffineTransform(model.currentTransform().affineTransform(viewSize: viewSize)) } @@ -295,7 +293,6 @@ public class ImageEditorCanvasView: UIView { width: width, height: height) - Logger.verbose("viewSize: \(viewSize), imageFrame: \(imageFrame), ") return imageFrame } @@ -364,7 +361,7 @@ public class ImageEditorCanvasView: UIView { y: viewSize.height * unitSample.y) } - // TODO: Use bezier curves to smooth stroke. + // Use bezier curves to smooth stroke. let bezierPath = UIBezierPath() let points = applySmoothing(to: unitSamples.map { (unitSample) in @@ -474,7 +471,6 @@ public class ImageEditorCanvasView: UIView { .font: item.font.withSize(fontSize) ], context: nil) - Logger.verbose("---- maxWidth: \(maxWidth), viewSize: \(viewSize), item.unitWidth: \(item.unitWidth), textBounds: \(textBounds)") let center = CGPoint(x: viewSize.width * item.unitCenter.x, y: viewSize.height * item.unitCenter.y) let layerSize = CGSizeCeil(textBounds.size) @@ -570,7 +566,6 @@ public class ImageEditorCanvasView: UIView { // Render output at same size as source image. let dstSizePixels = transform.outputSizePixels let dstScale: CGFloat = 1.0 // The size is specified in pixels, not in points. - // TODO: Reflect crop rectangle. let viewSize = dstSizePixels let hasAlpha = NSData.hasAlpha(forValidImageFilePath: model.srcImagePath) @@ -602,7 +597,6 @@ public class ImageEditorCanvasView: UIView { owsFailDebug("Could not load src image.") return nil } - // TODO: imageLayer.contentsScale = dstScale * transform.scaling contentView.layer.addSublayer(imageLayer) @@ -613,7 +607,6 @@ public class ImageEditorCanvasView: UIView { Logger.error("Couldn't create layer for item.") continue } - // TODO: Should we do this for all layers? layer.contentsScale = dstScale * transform.scaling * item.outputScale() contentView.layer.addSublayer(layer) } From 69c5492fcef02a4c0a831801eb27011da39f5024 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Feb 2019 11:08:19 -0500 Subject: [PATCH 030/493] Clean up ahead of PR. --- Signal.xcodeproj/project.pbxproj | 4 ---- Signal/Signal-Info.plist | 4 ++-- .../Views/ImageEditor/ImageEditorCanvasView.swift | 5 ++++- .../Views/ImageEditor/ImageEditorCropViewController.swift | 2 -- .../Views/ImageEditor/ImageEditorGestureRecognizer.swift | 5 ----- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 1 - SignalMessaging/categories/UIView+OWS.swift | 5 ----- 7 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 76ec0e98b..83685fcda 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -252,7 +252,6 @@ 34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */; }; 34BEDB1621C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */; }; - 34BEDB1921C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */; }; 34C3C78D20409F320000134C /* Opening.m4r in Resources */ = {isa = PBXBuildFile; fileRef = 34C3C78C20409F320000134C /* Opening.m4r */; }; 34C3C78F2040A4F70000134C /* sonarping.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 34C3C78E2040A4F70000134C /* sonarping.mp3 */; }; 34C3C7922040B0DD0000134C /* OWSAudioPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C3C7902040B0DC0000134C /* OWSAudioPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -942,7 +941,6 @@ 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorView.swift; sourceTree = ""; }; 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAnyTouchGestureRecognizer.h; sourceTree = ""; }; 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAnyTouchGestureRecognizer.m; sourceTree = ""; }; - 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorGestureRecognizer.swift; sourceTree = ""; }; 34C3C78C20409F320000134C /* Opening.m4r */ = {isa = PBXFileReference; lastKnownFileType = file; path = Opening.m4r; sourceTree = ""; }; 34C3C78E2040A4F70000134C /* sonarping.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = sonarping.mp3; path = Signal/AudioFiles/sonarping.mp3; sourceTree = SOURCE_ROOT; }; 34C3C7902040B0DC0000134C /* OWSAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAudioPlayer.h; sourceTree = ""; }; @@ -1910,7 +1908,6 @@ 34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */, 34BBC853220C7ADA00857249 /* ImageEditorContents.swift */, 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */, - 34BEDB1821C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift */, 34BBC852220C7AD900857249 /* ImageEditorItem.swift */, 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */, 34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */, @@ -3329,7 +3326,6 @@ 45194F931FD7215C00333B2C /* OWSContactOffersInteraction.m in Sources */, 450998681FD8C0FF00D89EB3 /* AttachmentSharing.m in Sources */, 347850711FDAEB17007B8332 /* OWSUserProfile.m in Sources */, - 34BEDB1921C82AC5007B0EAE /* ImageEditorGestureRecognizer.swift in Sources */, 346129F81FD5F31400532771 /* OWS100RemoveTSRecipientsMigration.m in Sources */, 34AC09DF211B39B100997B47 /* OWSNavigationController.m in Sources */, 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */, diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5cc9da65c..bbc073f5d 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,9 +7,9 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.2 + 10.14.3 WebRTCCommit - aa8bee9bd6f69e388a9ca7506b8702ef8ab7f195 M71 + 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 CFBundleDevelopmentRegion en diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index ad538e621..c3529bb55 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -271,7 +271,10 @@ public class ImageEditorCanvasView: UIView { return .zero } - // We want to "fill" the output rect. + // The image content's default size (at scaling = 1) is to fill the output/canvas bounds. + // This makes it easier to clamp the scaling to safe values. + // The downside is that rotation has the side effect of changing the render size of the + // image, which complicates the crop view logic. // // Find the smallest possible image size that will completely fill the output size. // diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 78efd5888..264505c1f 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -271,7 +271,6 @@ class ImageEditorCropViewController: OWSViewController { Logger.verbose("") let viewSize = contentView.bounds.size -// contentView.layer.anchorPoint = .zero contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) } @@ -603,7 +602,6 @@ class ImageEditorCropViewController: OWSViewController { } private func completeAndDismiss() { - // TODO: self.delegate?.cropDidComplete(transform: transform) self.dismiss(animated: true) { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift deleted file mode 100644 index 71065b4cf..000000000 --- a/SignalMessaging/Views/ImageEditor/ImageEditorGestureRecognizer.swift +++ /dev/null @@ -1,5 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f137b6b49..e73c9f033 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -31,7 +31,6 @@ public class ImageEditorTransform: NSObject { public func affineTransform(viewSize: CGSize) -> CGAffineTransform { let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize) - Logger.verbose("viewSize: \(viewSize), translation: \(translation), unitTranslation: \(unitTranslation), scaling: \(scaling), rotationRadians: \(rotationRadians), ") // Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation // is not affected affected by the scaling or rotation, which shoud both be about the "origin" // (in this case the center of the content). diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 2ff5cde1f..8ca4cc6a9 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -193,9 +193,4 @@ public extension CGAffineTransform { public func rotate(_ angleRadians: CGFloat) -> CGAffineTransform { return rotated(by: angleRadians) } - -// public func forAnchorPoint(viewSize: CGSize) -> CGAffineTransform { -// let viewCenter = CGRect(origin: .zero, size: viewSize).center -// return CGAffineTransform.translate(viewCenter.inverse()).concatenating(self).translate(viewCenter) -// } } From c0f907c4419c040509fbd62c017c8e7b2e7d7448 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 17:13:57 -0500 Subject: [PATCH 031/493] Respond to CR. --- Signal/Signal-Info.plist | 4 ++++ .../views/ImageEditor/ImageEditorModelTest.swift | 11 +++++++++++ .../Views/ImageEditor/ImageEditorCanvasView.swift | 8 +++++--- .../ImageEditorCropViewController.swift | 14 ++------------ .../Views/ImageEditor/ImageEditorView.swift | 4 ---- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index bbc073f5d..4fe947497 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -6,10 +6,14 @@ CarthageVersion 0.31.2 + DateTime + Wed Feb 13 22:13:11 UTC 2019 OSXVersion 10.14.3 WebRTCCommit 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 + XCodeVersion + 1000.1010 CFBundleDevelopmentRegion en diff --git a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift index 29cb2ab39..1d7f62f72 100644 --- a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift @@ -49,23 +49,34 @@ class ImageEditorModelTest: SignalBaseTest { } func testAffineTransformComposition() { + // Documents how classic SRT (scale-rotate-translate) ordering is specified + // in _reverse_ order using CGAffineTransform. + + // The transformed origin should reflect ONLY the translation, not scaling or rotation. XCTAssertEqual(+20.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).x, accuracy: 0.1) XCTAssertEqual(+30.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).y, accuracy: 0.1) + // WRONG: the translation is being scaled. XCTAssertEqual(+100.0, CGPoint.zero.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) XCTAssertEqual(+150.0, CGPoint.zero.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + // The transformed origin should reflect ONLY the translation, not scaling or rotation. XCTAssertEqual(+20.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).x, accuracy: 0.1) XCTAssertEqual(+30.0, CGPoint.zero.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).y, accuracy: 0.1) + // WRONG: the translation is being scaled. XCTAssertEqual(-150.0, CGPoint.zero.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) XCTAssertEqual(+100.0, CGPoint.zero.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + // An arbitrary point one "unit" away from the origin should be end up scaled (unit x scaling) + translation. XCTAssertEqual(+25.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).x, accuracy: 0.1) XCTAssertEqual(+35.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).scale(5)).y, accuracy: 0.1) + // WRONG: the translation is being scaled. XCTAssertEqual(+105.0, CGPoint.unit.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) XCTAssertEqual(+155.0, CGPoint.unit.applying(CGAffineTransform.scale(5).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) + // An arbitrary point one "unit" away from the origin should be end up scaled (unit x scaling ... rotated about the origin) + translation. XCTAssertEqual(+15.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).x, accuracy: 0.1) XCTAssertEqual(+35.0, CGPoint.unit.applying(CGAffineTransform.translate(CGPoint(x: 20, y: 30)).rotate(CGFloat.halfPi).scale(5)).y, accuracy: 0.1) + // WRONG: the translation is being scaled. XCTAssertEqual(-155.0, CGPoint.unit.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).x, accuracy: 0.1) XCTAssertEqual(+105.0, CGPoint.unit.applying(CGAffineTransform.scale(5).rotate(CGFloat.halfPi).translate(CGPoint(x: 20, y: 30))).y, accuracy: 0.1) } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index c3529bb55..ce696a272 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -143,10 +143,12 @@ public class ImageEditorCanvasView: UIView { let srcImageUrl = URL(fileURLWithPath: srcImagePath) srcImageData = try Data(contentsOf: srcImageUrl) } catch { - Logger.error("Couldn't parse srcImageUrl") + owsFailDebug("Couldn't parse srcImageUrl") return nil } // We use this constructor so that we can specify the scale. + // + // UIImage(contentsOfFile:) will sometimes use device scale. guard let srcImage = UIImage(data: srcImageData, scale: 1.0) else { owsFailDebug("Couldn't load background image.") return nil @@ -605,9 +607,9 @@ public class ImageEditorCanvasView: UIView { for item in model.items() { guard let layer = layerForItem(item: item, - model: model, + model: model, viewSize: viewSize) else { - Logger.error("Couldn't create layer for item.") + owsFailDebug("Couldn't create layer for item.") continue } layer.contentsScale = dstScale * transform.scaling * item.outputScale() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 264505c1f..26653ddca 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -296,18 +296,6 @@ class ImageEditorCropViewController: OWSViewController { return true } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - _ = self.becomeFirstResponder() - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - _ = self.becomeFirstResponder() - } - // MARK: - Pinch Gesture @objc @@ -368,6 +356,7 @@ class ImageEditorCropViewController: OWSViewController { // We could undo an in-progress pinch if the gesture is cancelled, but it seems gratuitous. + // Handle the GR if necessary. switch gestureRecognizer.state { case .began: Logger.verbose("began: \(transform.unitTranslation)") @@ -385,6 +374,7 @@ class ImageEditorCropViewController: OWSViewController { break } + // Reset the GR if necessary. switch gestureRecognizer.state { case .ended, .failed, .cancelled, .possible: if panCropRegion != nil { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 989ab212e..2bf841fd0 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -100,10 +100,6 @@ public class ImageEditorView: UIView { updateGestureState() - DispatchQueue.main.async { - self.presentCropTool() - } - return true } From 2a4b9426c30556a5fd1b2a2d957f8b9724de618c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 16:18:00 -0500 Subject: [PATCH 032/493] Sketch out the 'onboarding phone number' view. --- Signal.xcodeproj/project.pbxproj | 4 + Signal/src/Models/AccountManager.swift | 20 +- .../HomeView/HomeViewController.m | 11 + .../OnboardingBaseViewController.swift | 8 +- .../Registration/OnboardingController.swift | 20 +- .../OnboardingPhoneNumberViewController.swift | 514 ++++++++++++++++++ Signal/src/util/MainAppContext.m | 9 + .../translations/en.lproj/Localizable.strings | 9 + .../CountryCodeViewController.h | 4 + .../CountryCodeViewController.m | 4 + .../ViewControllers/ViewControllerUtils.h | 9 +- .../ViewControllers/ViewControllerUtils.m | 38 +- SignalMessaging/categories/UIView+OWS.swift | 16 + .../src/Account/TSAccountManager.h | 2 +- .../src/Account/TSAccountManager.m | 2 +- .../src/Contacts/PhoneNumberUtil.h | 4 +- .../src/Contacts/PhoneNumberUtil.m | 3 +- .../src/TestUtils/TestAppContext.m | 11 +- SignalServiceKit/src/Util/AppContext.h | 4 +- SignalServiceKit/src/Util/String+SSK.swift | 6 +- .../utils/ShareAppExtensionContext.m | 11 +- 21 files changed, 684 insertions(+), 25 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 83685fcda..8d157d008 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -76,6 +76,7 @@ 3448E15E221333F5004B052E /* OnboardingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15D221333F5004B052E /* OnboardingController.swift */; }; 3448E16022134C89004B052E /* OnboardingSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */; }; 3448E1622213585C004B052E /* OnboardingBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */; }; + 3448E16422135FFA004B052E /* OnboardingPhoneNumberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */; }; 344F248D2007CCD600CFB4F4 /* DisplayableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; @@ -739,6 +740,7 @@ 3448E15D221333F5004B052E /* OnboardingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingController.swift; sourceTree = ""; }; 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingSplashViewController.swift; sourceTree = ""; }; 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingBaseViewController.swift; sourceTree = ""; }; + 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPhoneNumberViewController.swift; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableText.swift; sourceTree = ""; }; 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; @@ -1466,6 +1468,7 @@ 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */, 3448E15D221333F5004B052E /* OnboardingController.swift */, 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, + 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */, 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, @@ -3542,6 +3545,7 @@ 4556FA681F54AA9500AF40DD /* DebugUIProfile.swift in Sources */, 45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */, 34D1F0881F8678AA0066283D /* ConversationViewLayout.m in Sources */, + 3448E16422135FFA004B052E /* OnboardingPhoneNumberViewController.swift in Sources */, 34330AA31E79686200DF2FB9 /* OWSProgressView.m in Sources */, 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */, 45D2AC02204885170033C692 /* OWS2FAReminderViewController.swift in Sources */, diff --git a/Signal/src/Models/AccountManager.swift b/Signal/src/Models/AccountManager.swift index eb7d36cad..1b2d6ee5e 100644 --- a/Signal/src/Models/AccountManager.swift +++ b/Signal/src/Models/AccountManager.swift @@ -19,17 +19,6 @@ public class AccountManager: NSObject { return OWSProfileManager.shared() } - // MARK: - - - @objc - public override init() { - super.init() - - SwiftSingletons.register(self) - } - - // MARK: - Dependencies - private var networkManager: TSNetworkManager { return SSKEnvironment.shared.networkManager } @@ -42,6 +31,15 @@ public class AccountManager: NSObject { return TSAccountManager.sharedInstance() } + // MARK: - + + @objc + public override init() { + super.init() + + SwiftSingletons.register(self) + } + // MARK: registration @objc func registerObjc(verificationCode: String, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..ff5d49af5 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,6 +482,17 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + id onboardingController = [OnboardingControllerImpl new]; + OnboardingPhoneNumberViewController *view = + [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; + // OnboardingPermissionsViewController *view = + // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:view]; + [self presentViewController:navigationController animated:YES completion:nil]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 9f6546b09..52cc3ff28 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -15,6 +15,8 @@ public class OnboardingBaseViewController: OWSViewController { self.onboardingController = onboardingController super.init(nibName: nil, bundle: nil) + + self.shouldUseTheme = false } @available(*, unavailable, message: "use other init() instead.") @@ -54,7 +56,7 @@ public class OnboardingBaseViewController: OWSViewController { return explanationLabel } - func button(title: String, selector: Selector) -> UIView { + func button(title: String, selector: Selector) -> OWSFlatButton { // TODO: Make sure this all fits if dynamic font sizes are maxed out. let buttonHeight: CGFloat = 48 let button = OWSFlatButton.button(title: title, @@ -72,4 +74,8 @@ public class OnboardingBaseViewController: OWSViewController { public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { return .portrait } + + public override var preferredStatusBarStyle: UIStatusBarStyle { + return .lightContent + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 7514dc8b3..fca6a964d 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -12,6 +12,8 @@ public protocol OnboardingController: class { func onboardingPermissionsWasSkipped(viewController: UIViewController) func onboardingPermissionsDidComplete(viewController: UIViewController) + + func onboardingPhoneNumberDidComplete(viewController: UIViewController) } // MARK: - @@ -28,7 +30,21 @@ public class OnboardingControllerImpl: NSObject, OnboardingController { viewController.navigationController?.pushViewController(view, animated: true) } - public func onboardingPermissionsWasSkipped(viewController: UIViewController) {} + public func onboardingPermissionsWasSkipped(viewController: UIViewController) { + pushPhoneNumberView(viewController: viewController) + } - public func onboardingPermissionsDidComplete(viewController: UIViewController) {} + public func onboardingPermissionsDidComplete(viewController: UIViewController) { + pushPhoneNumberView(viewController: viewController) + } + + private func pushPhoneNumberView(viewController: UIViewController) { + let view = OnboardingPhoneNumberViewController(onboardingController: self) + viewController.navigationController?.pushViewController(view, animated: true) + } + + public func onboardingPhoneNumberDidComplete(viewController: UIViewController) { + // CodeVerificationViewController *vc = [CodeVerificationViewController new]; + // [weakSelf.navigationController pushViewController:vc animated:YES]; + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift new file mode 100644 index 000000000..e12e1c8ec --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -0,0 +1,514 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +@objc +public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { + + // MARK: - Dependencies + + private var tsAccountManager: TSAccountManager { + return TSAccountManager.sharedInstance() + } + + // MARK: - + + private let countryNameLabel = UILabel() + private let callingCodeLabel = UILabel() + private let phoneNumberTextField = UITextField() + private var nextButton: OWSFlatButton? + + // - (void)didTapLegalTerms:(UIButton *)sender +//{ +// [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; +// } +//#pragma mark - Keyboard notifications +// +//- (void)initializeKeyboardHandlers +//{ +// UITapGestureRecognizer *outsideTabRecognizer = +// [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboardFromAppropriateSubView)]; +// [self.view addGestureRecognizer:outsideTabRecognizer]; +// } +// +// - (void)dismissKeyboardFromAppropriateSubView +// { +// [self.view endEditing:NO]; +//} +// + + override public func loadView() { + super.loadView() + + // TODO: Is this still necessary? + if let navigationController = self.navigationController as? OWSNavigationController { + SignalApp.shared().signUpFlowNavigationController = navigationController + } else { + owsFailDebug("Missing or invalid navigationController") + } + + populateDefaults() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + // TODO: +// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) + + // Country + + // TODO: dynamic + let fontSizePoints: CGFloat = ScaleFromIPhone5To7Plus(16, 20) + let rowHeight: CGFloat = 40 + + countryNameLabel.textColor = Theme.primaryColor + countryNameLabel.font = UIFont.ows_dynamicTypeBody + countryNameLabel.setContentHuggingHorizontalLow() + countryNameLabel.setCompressionResistanceHorizontalLow() + + let countryIcon = UIImage(named: (CurrentAppContext().isRTL + ? "small_chevron_left" + : "small_chevron_right")) +// NavBarBackRTL +// small_chevron_right +// system_disclosure_indicator_rtl + let countryImageView = UIImageView(image: countryIcon?.withRenderingMode(.alwaysTemplate)) + countryImageView.tintColor = Theme.placeholderColor + countryImageView.setContentHuggingHigh() + countryImageView.setCompressionResistanceHigh() + + let countryRow = UIStackView(arrangedSubviews: [ + countryNameLabel, + countryImageView + ]) + countryRow.axis = .horizontal + countryRow.alignment = .center + countryRow.spacing = 10 + countryRow.isUserInteractionEnabled = true + countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) + countryRow.autoSetDimension(.height, toSize: rowHeight) + addBottomStroke(countryRow) + + callingCodeLabel.textColor = Theme.primaryColor + callingCodeLabel.font = UIFont.ows_dynamicTypeBody + callingCodeLabel.setContentHuggingHorizontalHigh() + callingCodeLabel.setCompressionResistanceHorizontalHigh() + callingCodeLabel.isUserInteractionEnabled = true + callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) + addBottomStroke(callingCodeLabel) + callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) + + phoneNumberTextField.textAlignment = .left + phoneNumberTextField.delegate = self + phoneNumberTextField.keyboardType = .numberPad + phoneNumberTextField.textColor = Theme.primaryColor + phoneNumberTextField.font = UIFont.ows_dynamicTypeBody + phoneNumberTextField.setContentHuggingHorizontalLow() + phoneNumberTextField.setCompressionResistanceHorizontalLow() + + addBottomStroke(phoneNumberTextField) + + let phoneNumberRow = UIStackView(arrangedSubviews: [ + callingCodeLabel, + phoneNumberTextField + ]) + phoneNumberRow.axis = .horizontal + phoneNumberRow.alignment = .fill + phoneNumberRow.spacing = 10 + phoneNumberRow.autoSetDimension(.height, toSize: rowHeight) + callingCodeLabel.autoMatch(.height, to: .height, of: phoneNumberTextField) + + // TODO: Finalize copy. + + let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", + comment: "Label for the 'next' button."), + selector: #selector(nextPressed)) + self.nextButton = nextButton + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() + + let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + topSpacer, + countryRow, + UIView.spacer(withHeight: 8), + phoneNumberRow, + bottomSpacer, + nextButton + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperviewMargins() + stackView.autoPinWidthToSuperviewMargins() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + } + + private func addBottomStroke(_ view: UIView) { + let strokeView = UIView() + strokeView.backgroundColor = Theme.middleGrayColor + view.addSubview(strokeView) + strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) + strokeView.autoPinWidthToSuperview() + strokeView.autoPinEdge(toSuperviewEdge: .bottom) + } + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + + phoneNumberTextField.becomeFirstResponder() + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + + phoneNumberTextField.becomeFirstResponder() + + if tsAccountManager.isReregistering() { + // If re-registering, pre-populate the country (country code, calling code, country name) + // and phone number state. + guard let phoneNumberE164 = tsAccountManager.reregisterationPhoneNumber() else { + owsFailDebug("Could not resume re-registration; missing phone number.") + return + } + tryToReregister(phoneNumberE164: phoneNumberE164) + } + } + + private func tryToReregister(phoneNumberE164: String) { + guard phoneNumberE164.count > 0 else { + owsFailDebug("Could not resume re-registration; invalid phoneNumberE164.") + return + } + guard let parsedPhoneNumber = PhoneNumber(fromE164: phoneNumberE164) else { + owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") + return + } + guard let callingCode = parsedPhoneNumber.getCountryCode() else { + owsFailDebug("Could not resume re-registration; missing callingCode.") + return + } + let callingCodeText = "\(COUNTRY_CODE_PREFIX)\(callingCode)" + let countryCodes: [String] = + PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCodeText) + guard let countryCode = countryCodes.first else { + owsFailDebug("Could not resume re-registration; unknown countryCode.") + return + } + guard let countryName = PhoneNumberUtil.countryName(fromCountryCode: countryCode) else { + owsFailDebug("Could not resume re-registration; unknown countryName.") + return + } + if !phoneNumberE164.hasPrefix(callingCodeText) { + owsFailDebug("Could not resume re-registration; non-matching calling code.") + return + } + let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) + + update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + + phoneNumberTextField.text = phoneNumberWithoutCallingCode + // Don't let user edit their phone number while re-registering. + phoneNumberTextField.isEnabled = false + } + + // MARK: - + + private var countryName = "" + private var callingCode = "" + private var countryCode = "" + + private func populateDefaults() { + + var countryCode: String = PhoneNumber.defaultCountryCode() + if let lastRegisteredCountryCode = self.lastRegisteredCountryCode(), + lastRegisteredCountryCode.count > 0 { + countryCode = lastRegisteredCountryCode + } + + let callingCodeNumber: NSNumber = PhoneNumberUtil.sharedThreadLocal().nbPhoneNumberUtil.getCountryCode(forRegion: countryCode) + let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumber)" + + if let lastRegisteredPhoneNumber = self.lastRegisteredPhoneNumber(), + lastRegisteredPhoneNumber.count > 0, + lastRegisteredPhoneNumber.hasPrefix(callingCode) { + phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) + } + + var countryName = NSLocalizedString("UNKNOWN_COUNTRY_NAME", comment: "Label for unknown countries.") + if let countryNameDerived = PhoneNumberUtil.countryName(fromCountryCode: countryCode) { + countryName = countryNameDerived + } + + update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + } + + private func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + AssertIsOnMainThread() + + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + self.countryName = countryName + self.callingCode = callingCode + self.countryCode = countryCode + + countryNameLabel.text = countryName + callingCodeLabel.text = callingCode + + self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) + } + + // MARK: - Debug + + private let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" + private let kKeychainKey_LastRegisteredCountryCode = "kKeychainKey_LastRegisteredCountryCode" + private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" + + private func debugValue(forKey key: String) -> String? { + guard CurrentAppContext().isDebugBuild() else { + return nil + } + + do { + let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) + return value + } catch { + owsFailDebug("Error: \(error)") + return nil + } + } + + private func setDebugValue(_ value: String, forKey key: String) { + guard CurrentAppContext().isDebugBuild() else { + return + } + + do { + try CurrentAppContext().keychainStorage().set(string: value, service: kKeychainService_LastRegistered, key: key) + } catch { + owsFailDebug("Error: \(error)") + } + } + + private func lastRegisteredCountryCode() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) + } + + private func setLastRegisteredCountryCode(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) + } + + private func lastRegisteredPhoneNumber() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) + } + + private func setLastRegisteredPhoneNumber(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) + } + + // MARK: - Events + + @objc func explanationLabelTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + // TODO: + } + + @objc func countryRowTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + showCountryPicker() + } + + @objc func countryCodeTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + showCountryPicker() + } + + @objc func nextPressed() { + Logger.info("") + + onboardingController.onboardingPhoneNumberDidComplete(viewController: self) + } + + // MARK: - Country Picker + + private func showCountryPicker() { + guard !tsAccountManager.isReregistering() else { + return + } + + let countryCodeController = CountryCodeViewController() + countryCodeController.countryCodeDelegate = self + countryCodeController.interfaceOrientationMask = .portrait + let navigationController = OWSNavigationController(rootViewController: countryCodeController) + self.present(navigationController, animated: true, completion: nil) + } + + // MARK: - Register + + private func didTapRegisterButton() { + guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), + phoneNumberText.count > 0 else { + OWSAlerts.showAlert(title: + NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", + comment: "Title of alert indicating that users needs to enter a phone number to register."), + message: + NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE", + comment: "Message of alert indicating that users needs to enter a phone number to register.")) + return + } + + let phoneNumber = "\(callingCode)\(phoneNumberText)" + guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), + localNumber.toE164().count > 0, + PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { + OWSAlerts.showAlert(title: + NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", + comment: "Title of alert indicating that users needs to enter a valid phone number to register."), + message: + NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE", + comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) + return + } + let parsedPhoneNumber = localNumber.toE164() + + if UIDevice.current.isIPad { + let countryCode = self.countryCode + OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", + comment: "alert title when registering an iPad"), + message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", + comment: "alert body when registering an iPad"), + proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", + comment: "button text to proceed with registration when on an iPad"), + proceedAction: { (_) in + self.sendCode(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) + }) + } else { + sendCode(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) + } + } + + private func sendCode(parsedPhoneNumber: String, + phoneNumberText: String, + countryCode: String) { + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: true) { (modal) in + self.setLastRegisteredCountryCode(value: countryCode) + self.setLastRegisteredPhoneNumber(value: phoneNumberText) + + self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, + success: { + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationSucceeded() + }) + } + }, failure: { (error) in + Logger.error("Error: \(error)") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationFailed(error: error as NSError) + }) + } + }, smsVerification: true) + } + } + + private func registrationSucceeded() { + self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) + } + + private func registrationFailed(error: NSError) { + if error.code == 400 { + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), + message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) + + } else { + OWSAlerts.showAlert(title: error.localizedDescription, + message: error.localizedRecoverySuggestion) + } + + phoneNumberTextField.becomeFirstResponder() + } +} + +// MARK: - + +extension OnboardingPhoneNumberViewController: UITextFieldDelegate { + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + var prefix = self.callingCode + if prefix.hasPrefix(COUNTRY_CODE_PREFIX) { + prefix = prefix.substring(from: COUNTRY_CODE_PREFIX.count) + } + ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode, prefix: prefix) + + // Inform our caller that we took care of performing the change. + return false + } + + public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + didTapRegisterButton() + textField.resignFirstResponder() + return false + } +} + +// MARK: - + +extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate { + public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + + // Trigger the formatting logic with a no-op edit. + _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") + } +} diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index 8631e9291..f3cf57c97 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -314,6 +314,15 @@ NSString *const ReportedApplicationStateDidChangeNotification = @"ReportedApplic return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } +- (BOOL)isDebugBuild +{ +#ifdef DEBUG + return YES; +#else + return NO; +#endif +} + @end NS_ASSUME_NONNULL_END diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 1d161d876..dfcb3443b 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Done"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -1520,6 +1523,9 @@ /* Title of the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_TITLE" = "We need access to your contacts and notifications"; +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + /* Explanation in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_EXPLANATION" = "By continuing, you agree to Signal's terms."; @@ -2354,6 +2360,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Unknown Contact"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unknown"; diff --git a/SignalMessaging/ViewControllers/CountryCodeViewController.h b/SignalMessaging/ViewControllers/CountryCodeViewController.h index deb98c044..7f9a70352 100644 --- a/SignalMessaging/ViewControllers/CountryCodeViewController.h +++ b/SignalMessaging/ViewControllers/CountryCodeViewController.h @@ -4,6 +4,8 @@ #import "OWSTableViewController.h" +NS_ASSUME_NONNULL_BEGIN + @class CountryCodeViewController; @protocol CountryCodeViewControllerDelegate @@ -26,3 +28,5 @@ @property (nonatomic) UIInterfaceOrientationMask interfaceOrientationMask; @end + +NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/ViewControllers/CountryCodeViewController.m b/SignalMessaging/ViewControllers/CountryCodeViewController.m index 16ea98bc4..264c2d316 100644 --- a/SignalMessaging/ViewControllers/CountryCodeViewController.m +++ b/SignalMessaging/ViewControllers/CountryCodeViewController.m @@ -11,6 +11,8 @@ #import "UIView+OWS.h" #import +NS_ASSUME_NONNULL_BEGIN + @interface CountryCodeViewController () @property (nonatomic, readonly) UISearchBar *searchBar; @@ -170,3 +172,5 @@ } @end + +NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.h b/SignalMessaging/ViewControllers/ViewControllerUtils.h index bedba7671..c115c3769 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.h +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -22,6 +22,13 @@ extern NSString *const TappedStatusBarNotification; replacementString:(NSString *)insertionText countryCode:(NSString *)countryCode; +// The same method, but it temporarily adds a prefix during the formatting process. ++ (void)phoneNumberTextField:(UITextField *)textField + shouldChangeCharactersInRange:(NSRange)range + replacementString:(NSString *)insertionText + countryCode:(NSString *)countryCode + prefix:(nullable NSString *)prefix; + + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText; diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.m b/SignalMessaging/ViewControllers/ViewControllerUtils.m index c5e5aa457..68ad7fc19 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.m +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "ViewControllerUtils.h" @@ -23,7 +23,19 @@ const NSUInteger kMax2FAPinLength = 16; replacementString:(NSString *)insertionText countryCode:(NSString *)countryCode { + return [self phoneNumberTextField:textField + shouldChangeCharactersInRange:range + replacementString:insertionText + countryCode:countryCode + prefix:nil]; +} ++ (void)phoneNumberTextField:(UITextField *)textField + shouldChangeCharactersInRange:(NSRange)range + replacementString:(NSString *)insertionText + countryCode:(NSString *)countryCode + prefix:(nullable NSString *)prefix +{ // Phone numbers takes many forms. // // * We only want to let the user enter decimal digits. @@ -40,6 +52,7 @@ const NSUInteger kMax2FAPinLength = 16; // * Take partial input if possible. NSString *oldText = textField.text; + // Construct the new contents of the text field by: // 1. Determining the "left" substring: the contents of the old text _before_ the deletion range. // Filtering will remove non-decimal digit characters like hyphen "-". @@ -76,6 +89,12 @@ const NSUInteger kMax2FAPinLength = 16; // 5. Construct the "formatted" new text by inserting a hyphen if necessary. // reformat the phone number, trying to keep the cursor beside the inserted or deleted digit NSUInteger cursorPositionAfterChange = MIN(left.length + center.length, textAfterChange.length); + + // if (prefix.length > 0) { + // textAfterChange = [prefix stringByAppendingString:textAfterChange]; + // cursorPositionAfterChange += prefix.length; + // } + NSString *textAfterReformat = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textAfterChange withSpecifiedCountryCodeString:countryCode]; @@ -83,6 +102,23 @@ const NSUInteger kMax2FAPinLength = 16; from:textAfterChange to:textAfterReformat stickingRightward:isJustDeletion]; + + // if (prefix.length > 0) { + // OWSAssertDebug([textAfterReformat hasPrefix:prefix]); + // if ([textAfterReformat hasPrefix:prefix]) { + // textAfterReformat = [textAfterReformat substringFromIndex:prefix.length]; + // cursorPositionAfterReformat -= prefix.length; + // + // NSRange trimRange = [textAfterReformat + // rangeOfCharacterFromSet:NSCharacterSet.whitespaceCharacterSet.invertedSet]; if (trimRange.location > + // 0) { + // textAfterReformat = [textAfterReformat + // stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet]; + // cursorPositionAfterReformat -= trimRange.location; + // } + // } + // } + textField.text = textAfterReformat; UITextPosition *pos = [textField positionFromPosition:textField.beginningOfDocument offset:(NSInteger)cursorPositionAfterReformat]; diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 8ca4cc6a9..5082dea68 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -87,6 +87,22 @@ extension UIView { return view } + @objc + public class func hStretchingSpacer() -> UIView { + let view = UIView() + view.setContentHuggingHorizontalLow() + view.setCompressionResistanceHorizontalLow() + return view + } + + @objc + public class func vStretchingSpacer() -> UIView { + let view = UIView() + view.setContentHuggingVerticalLow() + view.setCompressionResistanceVerticalLow() + return view + } + @objc public func applyScaleAspectFitLayout(subview: UIView, aspectRatio: CGFloat) -> [NSLayoutConstraint] { guard subviews.contains(subview) else { diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h index dece93ae6..92c873603 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.h +++ b/SignalServiceKit/src/Account/TSAccountManager.h @@ -146,7 +146,7 @@ typedef NS_ENUM(NSUInteger, OWSRegistrationState) { // Returns YES on success. - (BOOL)resetForReregistration; -- (NSString *)reregisterationPhoneNumber; +- (nullable NSString *)reregisterationPhoneNumber; - (BOOL)isReregistering; #pragma mark - Manual Message Fetch diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 75261d303..d95b63c53 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -625,7 +625,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa } } -- (NSString *)reregisterationPhoneNumber +- (nullable NSString *)reregisterationPhoneNumber { OWSAssertDebug([self isReregistering]); diff --git a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h index 416d893b1..377fa7498 100644 --- a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h +++ b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h @@ -18,12 +18,12 @@ NS_ASSUME_NONNULL_BEGIN + (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString; + (NSString *)callingCodeFromCountryCode:(NSString *)countryCode; -+ (NSString *)countryNameFromCountryCode:(NSString *)countryCode; ++ (nullable NSString *)countryNameFromCountryCode:(NSString *)countryCode; + (NSArray *)countryCodesForSearchTerm:(nullable NSString *)searchTerm; // Returns a list of country codes for a calling code in descending // order of population. -- (NSArray *)countryCodesFromCallingCode:(NSString *)callingCode; +- (NSArray *)countryCodesFromCallingCode:(NSString *)callingCode; // Returns the most likely country code for a calling code based on population. - (NSString *)probableCountryCodeForCallingCode:(NSString *)callingCode; diff --git a/SignalServiceKit/src/Contacts/PhoneNumberUtil.m b/SignalServiceKit/src/Contacts/PhoneNumberUtil.m index 359f0a9ab..cbf6bfa31 100644 --- a/SignalServiceKit/src/Contacts/PhoneNumberUtil.m +++ b/SignalServiceKit/src/Contacts/PhoneNumberUtil.m @@ -82,7 +82,8 @@ NS_ASSUME_NONNULL_BEGIN } // country code -> country name -+ (NSString *)countryNameFromCountryCode:(NSString *)countryCode { ++ (nullable NSString *)countryNameFromCountryCode:(NSString *)countryCode +{ OWSAssertDebug(countryCode); NSDictionary *countryCodeComponent = @{NSLocaleCountryCode : countryCode}; diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m index 0fc67f5fe..4ff166493 100644 --- a/SignalServiceKit/src/TestUtils/TestAppContext.m +++ b/SignalServiceKit/src/TestUtils/TestAppContext.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TestAppContext.h" @@ -148,6 +148,15 @@ NS_ASSUME_NONNULL_BEGIN return self.mockAppSharedDataDirectoryPath; } +- (BOOL)isDebugBuild +{ +#ifdef DEBUG + return YES; +#else + return NO; +#endif +} + @end #endif diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h index a00aeeadf..5ebd5eb0d 100755 --- a/SignalServiceKit/src/Util/AppContext.h +++ b/SignalServiceKit/src/Util/AppContext.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -102,6 +102,8 @@ NSString *NSStringForUIApplicationState(UIApplicationState value); - (NSUserDefaults *)appUserDefaults; +- (BOOL)isDebugBuild; + @end id CurrentAppContext(void); diff --git a/SignalServiceKit/src/Util/String+SSK.swift b/SignalServiceKit/src/Util/String+SSK.swift index 3656b3ff9..b3bdca923 100644 --- a/SignalServiceKit/src/Util/String+SSK.swift +++ b/SignalServiceKit/src/Util/String+SSK.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -8,4 +8,8 @@ public extension String { func rtlSafeAppend(_ string: String) -> String { return (self as NSString).rtlSafeAppend(string) } + + public func substring(from index: Int) -> String { + return String(self[self.index(self.startIndex, offsetBy: index)...]) + } } diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index 0fd08c97a..7e9cc3e21 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "ShareAppExtensionContext.h" @@ -234,6 +234,15 @@ NS_ASSUME_NONNULL_BEGIN return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } +- (BOOL)isDebugBuild +{ +#ifdef DEBUG + return YES; +#else + return NO; +#endif +} + @end NS_ASSUME_NONNULL_END From b658866319be70f876de2d5cc0d4463c683e23dd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 16:21:07 -0500 Subject: [PATCH 033/493] Sketch out the 'onboarding phone number' view. --- .../OnboardingPhoneNumberViewController.swift | 31 ++----------------- .../OnboardingSplashViewController.swift | 6 +++- .../ViewControllers/ViewControllerUtils.h | 7 ----- .../ViewControllers/ViewControllerUtils.m | 21 ------------- 4 files changed, 7 insertions(+), 58 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index e12e1c8ec..cddbc39b5 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -21,25 +21,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private let phoneNumberTextField = UITextField() private var nextButton: OWSFlatButton? - // - (void)didTapLegalTerms:(UIButton *)sender -//{ -// [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; -// } -//#pragma mark - Keyboard notifications -// -//- (void)initializeKeyboardHandlers -//{ -// UITapGestureRecognizer *outsideTabRecognizer = -// [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboardFromAppropriateSubView)]; -// [self.view addGestureRecognizer:outsideTabRecognizer]; -// } -// -// - (void)dismissKeyboardFromAppropriateSubView -// { -// [self.view endEditing:NO]; -//} -// - override public func loadView() { super.loadView() @@ -62,8 +43,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // Country - // TODO: dynamic - let fontSizePoints: CGFloat = ScaleFromIPhone5To7Plus(16, 20) let rowHeight: CGFloat = 40 countryNameLabel.textColor = Theme.primaryColor @@ -74,9 +53,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let countryIcon = UIImage(named: (CurrentAppContext().isRTL ? "small_chevron_left" : "small_chevron_right")) -// NavBarBackRTL -// small_chevron_right -// system_disclosure_indicator_rtl let countryImageView = UIImageView(image: countryIcon?.withRenderingMode(.alwaysTemplate)) countryImageView.tintColor = Theme.placeholderColor countryImageView.setContentHuggingHigh() @@ -472,11 +448,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { extension OnboardingPhoneNumberViewController: UITextFieldDelegate { public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - var prefix = self.callingCode - if prefix.hasPrefix(COUNTRY_CODE_PREFIX) { - prefix = prefix.substring(from: COUNTRY_CODE_PREFIX.count) - } - ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode, prefix: prefix) + // TODO: Fix auto-format of phone numbers. + ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) // Inform our caller that we took care of performing the change. return false diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index aa4b0ce71..6d474ddbf 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -80,7 +80,11 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { guard sender.state == .recognized else { return } - // TODO: + guard let url = URL(string: kLegalTermsUrlString) else { + owsFailDebug("Invalid URL.") + return + } + UIApplication.shared.openURL(url) } @objc func continuePressed() { diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.h b/SignalMessaging/ViewControllers/ViewControllerUtils.h index c115c3769..38b26561d 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.h +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.h @@ -22,13 +22,6 @@ extern NSString *const TappedStatusBarNotification; replacementString:(NSString *)insertionText countryCode:(NSString *)countryCode; -// The same method, but it temporarily adds a prefix during the formatting process. -+ (void)phoneNumberTextField:(UITextField *)textField - shouldChangeCharactersInRange:(NSRange)range - replacementString:(NSString *)insertionText - countryCode:(NSString *)countryCode - prefix:(nullable NSString *)prefix; - + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText; diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.m b/SignalMessaging/ViewControllers/ViewControllerUtils.m index 68ad7fc19..441e3e797 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.m +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.m @@ -90,11 +90,6 @@ const NSUInteger kMax2FAPinLength = 16; // reformat the phone number, trying to keep the cursor beside the inserted or deleted digit NSUInteger cursorPositionAfterChange = MIN(left.length + center.length, textAfterChange.length); - // if (prefix.length > 0) { - // textAfterChange = [prefix stringByAppendingString:textAfterChange]; - // cursorPositionAfterChange += prefix.length; - // } - NSString *textAfterReformat = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textAfterChange withSpecifiedCountryCodeString:countryCode]; @@ -103,22 +98,6 @@ const NSUInteger kMax2FAPinLength = 16; to:textAfterReformat stickingRightward:isJustDeletion]; - // if (prefix.length > 0) { - // OWSAssertDebug([textAfterReformat hasPrefix:prefix]); - // if ([textAfterReformat hasPrefix:prefix]) { - // textAfterReformat = [textAfterReformat substringFromIndex:prefix.length]; - // cursorPositionAfterReformat -= prefix.length; - // - // NSRange trimRange = [textAfterReformat - // rangeOfCharacterFromSet:NSCharacterSet.whitespaceCharacterSet.invertedSet]; if (trimRange.location > - // 0) { - // textAfterReformat = [textAfterReformat - // stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet]; - // cursorPositionAfterReformat -= trimRange.location; - // } - // } - // } - textField.text = textAfterReformat; UITextPosition *pos = [textField positionFromPosition:textField.beginningOfDocument offset:(NSInteger)cursorPositionAfterReformat]; From 1411148c79823d5a4c796520a7d197b0daa6b256 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 16:24:16 -0500 Subject: [PATCH 034/493] Sketch out the 'onboarding phone number' view. --- .../src/ViewControllers/HomeView/HomeViewController.m | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index ff5d49af5..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,17 +482,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - id onboardingController = [OnboardingControllerImpl new]; - OnboardingPhoneNumberViewController *view = - [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; - // OnboardingPermissionsViewController *view = - // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:view]; - [self presentViewController:navigationController animated:YES completion:nil]; - }); } - (void)viewDidDisappear:(BOOL)animated From 21b618396d7e3ec8c7e2a59f8c4ed4f3925660d6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Feb 2019 16:40:21 -0500 Subject: [PATCH 035/493] Fix rebase breakage. --- .../Registration/OnboardingSplashViewController.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 6d474ddbf..14353ad1f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -27,8 +27,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_SPLASH_TITLE", comment: "Title of the 'onboarding splash' view.")) view.addSubview(titleLabel) - titleLabel.autoPinWidthToSuperviewMargins() - titleLabel.autoPinEdge(toSuperviewMargin: .top) + titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) // TODO: Finalize copy. let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_SPLASH_EXPLANATION", From 57394f00152d1b6541404304750d1548d700e76b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 09:23:50 -0500 Subject: [PATCH 036/493] Respond to CR. --- Signal/Signal-Info.plist | 4 -- Signal/src/AppDelegate.m | 6 ++- .../OnboardingPhoneNumberViewController.swift | 37 +++++++------------ Signal/src/util/MainAppContext.m | 9 ----- .../src/TestUtils/TestAppContext.m | 9 ----- SignalServiceKit/src/Util/AppContext.h | 11 +++++- .../utils/ShareAppExtensionContext.m | 9 ----- 7 files changed, 28 insertions(+), 57 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4fe947497..bbc073f5d 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -6,14 +6,10 @@ CarthageVersion 0.31.2 - DateTime - Wed Feb 13 22:13:11 UTC 2019 OSXVersion 10.14.3 WebRTCCommit 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 - XCodeVersion - 1000.1010 CFBundleDevelopmentRegion en diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index ca35cfd8b..4c4c7f017 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1478,7 +1478,11 @@ static NSTimeInterval launchStartedAt; rootViewController = [HomeViewController new]; } } else { - rootViewController = [RegistrationViewController new]; + if (OWSIsDebugBuild()) { + rootViewController = [[OnboardingControllerImpl new] initialViewController]; + } else { + rootViewController = [RegistrationViewController new]; + } navigationBarHidden = YES; } OWSAssertDebug(rootViewController); diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index cddbc39b5..64b398946 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -144,8 +144,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { super.viewWillAppear(animated) self.navigationController?.isNavigationBarHidden = false - - phoneNumberTextField.becomeFirstResponder() } public override func viewDidAppear(_ animated: Bool) { @@ -267,7 +265,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" private func debugValue(forKey key: String) -> String? { - guard CurrentAppContext().isDebugBuild() else { + guard OWSIsDebugBuild() else { return nil } @@ -281,7 +279,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { } private func setDebugValue(_ value: String, forKey key: String) { - guard CurrentAppContext().isDebugBuild() else { + guard OWSIsDebugBuild() else { return } @@ -310,13 +308,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // MARK: - Events - @objc func explanationLabelTapped(sender: UIGestureRecognizer) { - guard sender.state == .recognized else { - return - } - // TODO: - } - @objc func countryRowTapped(sender: UIGestureRecognizer) { guard sender.state == .recognized else { return @@ -334,7 +325,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { @objc func nextPressed() { Logger.info("") - onboardingController.onboardingPhoneNumberDidComplete(viewController: self) + parseAndTryToRegister() } // MARK: - Country Picker @@ -353,7 +344,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // MARK: - Register - private func didTapRegisterButton() { + private func parseAndTryToRegister() { guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), phoneNumberText.count > 0 else { OWSAlerts.showAlert(title: @@ -388,20 +379,20 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in - self.sendCode(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) }) } else { - sendCode(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) } } - private func sendCode(parsedPhoneNumber: String, - phoneNumberText: String, - countryCode: String) { + private func tryToRegister(parsedPhoneNumber: String, + phoneNumberText: String, + countryCode: String) { ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: true) { (modal) in self.setLastRegisteredCountryCode(value: countryCode) @@ -456,7 +447,7 @@ extension OnboardingPhoneNumberViewController: UITextFieldDelegate { } public func textFieldShouldReturn(_ textField: UITextField) -> Bool { - didTapRegisterButton() + parseAndTryToRegister() textField.resignFirstResponder() return false } diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index f3cf57c97..8631e9291 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -314,15 +314,6 @@ NSString *const ReportedApplicationStateDidChangeNotification = @"ReportedApplic return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m index 4ff166493..191442f93 100644 --- a/SignalServiceKit/src/TestUtils/TestAppContext.m +++ b/SignalServiceKit/src/TestUtils/TestAppContext.m @@ -148,15 +148,6 @@ NS_ASSUME_NONNULL_BEGIN return self.mockAppSharedDataDirectoryPath; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end #endif diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h index 5ebd5eb0d..bcb8cde8d 100755 --- a/SignalServiceKit/src/Util/AppContext.h +++ b/SignalServiceKit/src/Util/AppContext.h @@ -4,6 +4,15 @@ NS_ASSUME_NONNULL_BEGIN +static inline BOOL OWSIsDebugBuild() +{ +#ifdef DEBUG + return YES; +#else + return NO; +#endif +} + // These are fired whenever the corresponding "main app" or "app extension" // notification is fired. // @@ -102,8 +111,6 @@ NSString *NSStringForUIApplicationState(UIApplicationState value); - (NSUserDefaults *)appUserDefaults; -- (BOOL)isDebugBuild; - @end id CurrentAppContext(void); diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index 7e9cc3e21..2635afd28 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -234,15 +234,6 @@ NS_ASSUME_NONNULL_BEGIN return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end NS_ASSUME_NONNULL_END From 8a97503b1e00ce24657404300f64d6da7f27e7b1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 09:38:46 -0500 Subject: [PATCH 037/493] Sketch out CAPTCHA onboarding view. --- Signal.xcodeproj/project.pbxproj | 4 + .../OnboardingBaseViewController.swift | 17 +- .../OnboardingCaptchaViewController.swift | 471 ++++++++++++++++++ .../Registration/OnboardingController.swift | 10 + .../OnboardingPhoneNumberViewController.swift | 14 +- 5 files changed, 506 insertions(+), 10 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 8d157d008..40575582f 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -77,6 +77,7 @@ 3448E16022134C89004B052E /* OnboardingSplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */; }; 3448E1622213585C004B052E /* OnboardingBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */; }; 3448E16422135FFA004B052E /* OnboardingPhoneNumberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */; }; + 3448E1662215B313004B052E /* OnboardingCaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E1652215B313004B052E /* OnboardingCaptchaViewController.swift */; }; 344F248D2007CCD600CFB4F4 /* DisplayableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */; }; 345BC30C2047030700257B7C /* OWS2FASettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */; }; 3461284B1FD0B94000532771 /* SAELoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3461284A1FD0B93F00532771 /* SAELoadViewController.swift */; }; @@ -741,6 +742,7 @@ 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingSplashViewController.swift; sourceTree = ""; }; 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingBaseViewController.swift; sourceTree = ""; }; 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPhoneNumberViewController.swift; sourceTree = ""; }; + 3448E1652215B313004B052E /* OnboardingCaptchaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingCaptchaViewController.swift; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayableText.swift; sourceTree = ""; }; 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FASettingsViewController.h; sourceTree = ""; }; @@ -1466,6 +1468,7 @@ 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */, + 3448E1652215B313004B052E /* OnboardingCaptchaViewController.swift */, 3448E15D221333F5004B052E /* OnboardingController.swift */, 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */, @@ -3623,6 +3626,7 @@ 340FC8B5204DAC8D007AEB0F /* AboutTableViewController.m in Sources */, 34BECE2B1F74C12700D7438D /* DebugUIStress.m in Sources */, 340FC8B9204DAC8D007AEB0F /* UpdateGroupViewController.m in Sources */, + 3448E1662215B313004B052E /* OnboardingCaptchaViewController.swift in Sources */, 4574A5D61DD6704700C6B692 /* CallService.swift in Sources */, 340FC8A8204DAC8D007AEB0F /* CodeVerificationViewController.m in Sources */, 4521C3C01F59F3BA00B4C582 /* TextFieldHelper.swift in Sources */, diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 52cc3ff28..6027d0d00 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -24,7 +24,7 @@ public class OnboardingBaseViewController: OWSViewController { notImplemented() } - // MARK: - + // MARK: - Factory Methods func titleLabel(text: String) -> UILabel { let titleLabel = UILabel() @@ -69,7 +69,20 @@ public class OnboardingBaseViewController: OWSViewController { return button } - // MARK: Orientation + // MARK: - View Lifecycle + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + // TODO: Is there a better way to do this? + if let navigationController = self.navigationController as? OWSNavigationController { + SignalApp.shared().signUpFlowNavigationController = navigationController + } else { + owsFailDebug("Missing or invalid navigationController") + } + } + + // MARK: - Orientation public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { return .portrait diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift new file mode 100644 index 000000000..1ca5bb273 --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -0,0 +1,471 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +@objc +public class OnboardingCaptchaViewController: OnboardingBaseViewController { + + // MARK: - Dependencies + + private var tsAccountManager: TSAccountManager { + return TSAccountManager.sharedInstance() + } + + // MARK: - + + private let countryNameLabel = UILabel() + private let callingCodeLabel = UILabel() + private let phoneNumberTextField = UITextField() + private var nextButton: OWSFlatButton? + + override public func loadView() { + super.loadView() + + populateDefaults() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + // TODO: +// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) + + // Country + + let rowHeight: CGFloat = 40 + + countryNameLabel.textColor = Theme.primaryColor + countryNameLabel.font = UIFont.ows_dynamicTypeBody + countryNameLabel.setContentHuggingHorizontalLow() + countryNameLabel.setCompressionResistanceHorizontalLow() + + let countryIcon = UIImage(named: (CurrentAppContext().isRTL + ? "small_chevron_left" + : "small_chevron_right")) + let countryImageView = UIImageView(image: countryIcon?.withRenderingMode(.alwaysTemplate)) + countryImageView.tintColor = Theme.placeholderColor + countryImageView.setContentHuggingHigh() + countryImageView.setCompressionResistanceHigh() + + let countryRow = UIStackView(arrangedSubviews: [ + countryNameLabel, + countryImageView + ]) + countryRow.axis = .horizontal + countryRow.alignment = .center + countryRow.spacing = 10 + countryRow.isUserInteractionEnabled = true + countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) + countryRow.autoSetDimension(.height, toSize: rowHeight) + addBottomStroke(countryRow) + + callingCodeLabel.textColor = Theme.primaryColor + callingCodeLabel.font = UIFont.ows_dynamicTypeBody + callingCodeLabel.setContentHuggingHorizontalHigh() + callingCodeLabel.setCompressionResistanceHorizontalHigh() + callingCodeLabel.isUserInteractionEnabled = true + callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) + addBottomStroke(callingCodeLabel) + callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) + + phoneNumberTextField.textAlignment = .left + phoneNumberTextField.delegate = self + phoneNumberTextField.keyboardType = .numberPad + phoneNumberTextField.textColor = Theme.primaryColor + phoneNumberTextField.font = UIFont.ows_dynamicTypeBody + phoneNumberTextField.setContentHuggingHorizontalLow() + phoneNumberTextField.setCompressionResistanceHorizontalLow() + + addBottomStroke(phoneNumberTextField) + + let phoneNumberRow = UIStackView(arrangedSubviews: [ + callingCodeLabel, + phoneNumberTextField + ]) + phoneNumberRow.axis = .horizontal + phoneNumberRow.alignment = .fill + phoneNumberRow.spacing = 10 + phoneNumberRow.autoSetDimension(.height, toSize: rowHeight) + callingCodeLabel.autoMatch(.height, to: .height, of: phoneNumberTextField) + + // TODO: Finalize copy. + + let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", + comment: "Label for the 'next' button."), + selector: #selector(nextPressed)) + self.nextButton = nextButton + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() + + let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + topSpacer, + countryRow, + UIView.spacer(withHeight: 8), + phoneNumberRow, + bottomSpacer, + nextButton + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperviewMargins() + stackView.autoPinWidthToSuperviewMargins() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + } + + private func addBottomStroke(_ view: UIView) { + let strokeView = UIView() + strokeView.backgroundColor = Theme.middleGrayColor + view.addSubview(strokeView) + strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) + strokeView.autoPinWidthToSuperview() + strokeView.autoPinEdge(toSuperviewEdge: .bottom) + } + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.navigationController?.isNavigationBarHidden = false + + phoneNumberTextField.becomeFirstResponder() + + if tsAccountManager.isReregistering() { + // If re-registering, pre-populate the country (country code, calling code, country name) + // and phone number state. + guard let phoneNumberE164 = tsAccountManager.reregisterationPhoneNumber() else { + owsFailDebug("Could not resume re-registration; missing phone number.") + return + } + tryToReregister(phoneNumberE164: phoneNumberE164) + } + } + + private func tryToReregister(phoneNumberE164: String) { + guard phoneNumberE164.count > 0 else { + owsFailDebug("Could not resume re-registration; invalid phoneNumberE164.") + return + } + guard let parsedPhoneNumber = PhoneNumber(fromE164: phoneNumberE164) else { + owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") + return + } + guard let callingCode = parsedPhoneNumber.getCountryCode() else { + owsFailDebug("Could not resume re-registration; missing callingCode.") + return + } + let callingCodeText = "\(COUNTRY_CODE_PREFIX)\(callingCode)" + let countryCodes: [String] = + PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCodeText) + guard let countryCode = countryCodes.first else { + owsFailDebug("Could not resume re-registration; unknown countryCode.") + return + } + guard let countryName = PhoneNumberUtil.countryName(fromCountryCode: countryCode) else { + owsFailDebug("Could not resume re-registration; unknown countryName.") + return + } + if !phoneNumberE164.hasPrefix(callingCodeText) { + owsFailDebug("Could not resume re-registration; non-matching calling code.") + return + } + let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) + + update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + + phoneNumberTextField.text = phoneNumberWithoutCallingCode + // Don't let user edit their phone number while re-registering. + phoneNumberTextField.isEnabled = false + } + + // MARK: - + + private var countryName = "" + private var callingCode = "" + private var countryCode = "" + + private func populateDefaults() { + + var countryCode: String = PhoneNumber.defaultCountryCode() + if let lastRegisteredCountryCode = self.lastRegisteredCountryCode(), + lastRegisteredCountryCode.count > 0 { + countryCode = lastRegisteredCountryCode + } + + let callingCodeNumber: NSNumber = PhoneNumberUtil.sharedThreadLocal().nbPhoneNumberUtil.getCountryCode(forRegion: countryCode) + let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumber)" + + if let lastRegisteredPhoneNumber = self.lastRegisteredPhoneNumber(), + lastRegisteredPhoneNumber.count > 0, + lastRegisteredPhoneNumber.hasPrefix(callingCode) { + phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) + } + + var countryName = NSLocalizedString("UNKNOWN_COUNTRY_NAME", comment: "Label for unknown countries.") + if let countryNameDerived = PhoneNumberUtil.countryName(fromCountryCode: countryCode) { + countryName = countryNameDerived + } + + update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + } + + private func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + AssertIsOnMainThread() + + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + self.countryName = countryName + self.callingCode = callingCode + self.countryCode = countryCode + + countryNameLabel.text = countryName + callingCodeLabel.text = callingCode + + self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) + } + + // MARK: - Debug + + private let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" + private let kKeychainKey_LastRegisteredCountryCode = "kKeychainKey_LastRegisteredCountryCode" + private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" + + private func debugValue(forKey key: String) -> String? { + guard OWSIsDebugBuild() else { + return nil + } + + do { + let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) + return value + } catch { + owsFailDebug("Error: \(error)") + return nil + } + } + + private func setDebugValue(_ value: String, forKey key: String) { + guard OWSIsDebugBuild() else { + return + } + + do { + try CurrentAppContext().keychainStorage().set(string: value, service: kKeychainService_LastRegistered, key: key) + } catch { + owsFailDebug("Error: \(error)") + } + } + + private func lastRegisteredCountryCode() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) + } + + private func setLastRegisteredCountryCode(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) + } + + private func lastRegisteredPhoneNumber() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) + } + + private func setLastRegisteredPhoneNumber(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) + } + + // MARK: - Events + + @objc func countryRowTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + showCountryPicker() + } + + @objc func countryCodeTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + showCountryPicker() + } + + @objc func nextPressed() { + Logger.info("") + + parseAndTryToRegister() + } + + // MARK: - Country Picker + + private func showCountryPicker() { + guard !tsAccountManager.isReregistering() else { + return + } + + let countryCodeController = CountryCodeViewController() + countryCodeController.countryCodeDelegate = self + countryCodeController.interfaceOrientationMask = .portrait + let navigationController = OWSNavigationController(rootViewController: countryCodeController) + self.present(navigationController, animated: true, completion: nil) + } + + // MARK: - Register + + private func parseAndTryToRegister() { + guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), + phoneNumberText.count > 0 else { + OWSAlerts.showAlert(title: + NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", + comment: "Title of alert indicating that users needs to enter a phone number to register."), + message: + NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE", + comment: "Message of alert indicating that users needs to enter a phone number to register.")) + return + } + + let phoneNumber = "\(callingCode)\(phoneNumberText)" + guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), + localNumber.toE164().count > 0, + PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { + OWSAlerts.showAlert(title: + NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", + comment: "Title of alert indicating that users needs to enter a valid phone number to register."), + message: + NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE", + comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) + return + } + let parsedPhoneNumber = localNumber.toE164() + + if UIDevice.current.isIPad { + let countryCode = self.countryCode + OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", + comment: "alert title when registering an iPad"), + message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", + comment: "alert body when registering an iPad"), + proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", + comment: "button text to proceed with registration when on an iPad"), + proceedAction: { (_) in + self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) + }) + } else { + tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) + } + } + + private func tryToRegister(parsedPhoneNumber: String, + phoneNumberText: String, + countryCode: String) { + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: true) { (modal) in + self.setLastRegisteredCountryCode(value: countryCode) + self.setLastRegisteredPhoneNumber(value: phoneNumberText) + + self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, + success: { + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationSucceeded() + }) + } + }, failure: { (error) in + Logger.error("Error: \(error)") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationFailed(error: error as NSError) + }) + } + }, smsVerification: true) + } + } + + private func registrationSucceeded() { + self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) + } + + private func registrationFailed(error: NSError) { + if error.code == 400 { + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), + message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) + + } else { + OWSAlerts.showAlert(title: error.localizedDescription, + message: error.localizedRecoverySuggestion) + } + + phoneNumberTextField.becomeFirstResponder() + } +} + +// MARK: - + +extension OnboardingPhoneNumberViewController: UITextFieldDelegate { + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + // TODO: Fix auto-format of phone numbers. + ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) + + // Inform our caller that we took care of performing the change. + return false + } + + public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + parseAndTryToRegister() + textField.resignFirstResponder() + return false + } +} + +// MARK: - + +extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate { + public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + + // Trigger the formatting logic with a no-op edit. + _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") + } +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index fca6a964d..c43c80511 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -20,11 +20,16 @@ public protocol OnboardingController: class { @objc public class OnboardingControllerImpl: NSObject, OnboardingController { + + // MARK: - Factory Methods + public func initialViewController() -> UIViewController { let view = OnboardingSplashViewController(onboardingController: self) return view } + // MARK: - Transitions + public func onboardingSplashDidComplete(viewController: UIViewController) { let view = OnboardingPermissionsViewController(onboardingController: self) viewController.navigationController?.pushViewController(view, animated: true) @@ -47,4 +52,9 @@ public class OnboardingControllerImpl: NSObject, OnboardingController { // CodeVerificationViewController *vc = [CodeVerificationViewController new]; // [weakSelf.navigationController pushViewController:vc animated:YES]; } + + public func onboardingPhoneNumberDidRequireCaptcha(viewController: UIViewController) { + let view = OnboardingCaptchaViewController(onboardingController: self) + viewController.navigationController?.pushViewController(view, animated: true) + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 64b398946..3da7db472 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -24,13 +24,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { override public func loadView() { super.loadView() - // TODO: Is this still necessary? - if let navigationController = self.navigationController as? OWSNavigationController { - SignalApp.shared().signUpFlowNavigationController = navigationController - } else { - owsFailDebug("Missing or invalid navigationController") - } - populateDefaults() view.backgroundColor = Theme.backgroundColor @@ -422,7 +415,12 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { } private func registrationFailed(error: NSError) { - if error.code == 400 { + if error.code == 402 { + Logger.info("Captcha requested.") + + self.onboardingController.onboardingPhoneNumberDidRequireCaptcha(viewController: self) + return + } else if error.code == 400 { OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) From 9381220d8ff41e06145aa5b93bf417f5d62c9e21 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 09:59:07 -0500 Subject: [PATCH 038/493] Sketch out CAPTCHA onboarding view. --- Signal/src/AppDelegate.m | 2 +- .../HomeView/HomeViewController.m | 11 ++ .../OnboardingCaptchaViewController.swift | 149 ++++++------------ .../Registration/OnboardingController.swift | 130 +++++++++++++-- .../OnboardingPhoneNumberViewController.swift | 118 ++++---------- 5 files changed, 207 insertions(+), 203 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 4c4c7f017..ee6bfbbfe 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1479,7 +1479,7 @@ static NSTimeInterval launchStartedAt; } } else { if (OWSIsDebugBuild()) { - rootViewController = [[OnboardingControllerImpl new] initialViewController]; + rootViewController = [[OnboardingController new] initialViewController]; } else { rootViewController = [RegistrationViewController new]; } diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..167e27e05 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,6 +482,17 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + OnboardingController *onboardingController = [OnboardingController new]; + OnboardingCaptchaViewController *view = + [[OnboardingCaptchaViewController alloc] initWithOnboardingController:onboardingController]; + // OnboardingPermissionsViewController *view = + // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:view]; + [self presentViewController:navigationController animated:YES completion:nil]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 1ca5bb273..21242df8b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -30,7 +30,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { view.layoutMargins = .zero // TODO: -// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + // navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) @@ -95,8 +95,8 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { // TODO: Finalize copy. let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", - comment: "Label for the 'next' button."), - selector: #selector(nextPressed)) + comment: "Label for the 'next' button."), + selector: #selector(nextPressed)) self.nextButton = nextButton let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() @@ -187,7 +187,8 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { } let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) - update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + onboardingController.update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + updateState() phoneNumberTextField.text = phoneNumberWithoutCallingCode // Don't let user edit their phone number while re-registering. @@ -196,110 +197,46 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { // MARK: - - private var countryName = "" - private var callingCode = "" - private var countryCode = "" + private var countryName: String { + get { + return onboardingController.state.countryName + } + } + private var callingCode: String { + get { + AssertIsOnMainThread() + + return onboardingController.state.callingCode + } + } + private var countryCode: String { + get { + AssertIsOnMainThread() + + return onboardingController.state.countryCode + } + } private func populateDefaults() { - - var countryCode: String = PhoneNumber.defaultCountryCode() - if let lastRegisteredCountryCode = self.lastRegisteredCountryCode(), - lastRegisteredCountryCode.count > 0 { - countryCode = lastRegisteredCountryCode - } - - let callingCodeNumber: NSNumber = PhoneNumberUtil.sharedThreadLocal().nbPhoneNumberUtil.getCountryCode(forRegion: countryCode) - let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumber)" - - if let lastRegisteredPhoneNumber = self.lastRegisteredPhoneNumber(), + if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(), lastRegisteredPhoneNumber.count > 0, lastRegisteredPhoneNumber.hasPrefix(callingCode) { phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) } - var countryName = NSLocalizedString("UNKNOWN_COUNTRY_NAME", comment: "Label for unknown countries.") - if let countryNameDerived = PhoneNumberUtil.countryName(fromCountryCode: countryCode) { - countryName = countryNameDerived - } - - update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + updateState() } - private func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + private func updateState() { AssertIsOnMainThread() - guard countryCode.count > 0 else { - owsFailDebug("Invalid country code.") - return - } - guard countryName.count > 0 else { - owsFailDebug("Invalid country name.") - return - } - guard callingCode.count > 0 else { - owsFailDebug("Invalid calling code.") - return - } - - self.countryName = countryName - self.callingCode = callingCode - self.countryCode = countryCode - countryNameLabel.text = countryName callingCodeLabel.text = callingCode self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) } - // MARK: - Debug - - private let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" - private let kKeychainKey_LastRegisteredCountryCode = "kKeychainKey_LastRegisteredCountryCode" - private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" - - private func debugValue(forKey key: String) -> String? { - guard OWSIsDebugBuild() else { - return nil - } - - do { - let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) - return value - } catch { - owsFailDebug("Error: \(error)") - return nil - } - } - - private func setDebugValue(_ value: String, forKey key: String) { - guard OWSIsDebugBuild() else { - return - } - - do { - try CurrentAppContext().keychainStorage().set(string: value, service: kKeychainService_LastRegistered, key: key) - } catch { - owsFailDebug("Error: \(error)") - } - } - - private func lastRegisteredCountryCode() -> String? { - return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) - } - - private func setLastRegisteredCountryCode(value: String) { - setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) - } - - private func lastRegisteredPhoneNumber() -> String? { - return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) - } - - private func setLastRegisteredPhoneNumber(value: String) { - setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) - } - - // MARK: - Events + // MARK: - Events @objc func countryRowTapped(sender: UIGestureRecognizer) { guard sender.state == .recognized else { @@ -343,7 +280,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", comment: "Title of alert indicating that users needs to enter a phone number to register."), - message: + message: NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE", comment: "Message of alert indicating that users needs to enter a phone number to register.")) return @@ -356,7 +293,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", comment: "Title of alert indicating that users needs to enter a valid phone number to register."), - message: + message: NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE", comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) return @@ -366,11 +303,11 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { if UIDevice.current.isIPad { let countryCode = self.countryCode OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", - comment: "alert title when registering an iPad"), + comment: "alert title when registering an iPad"), message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", - comment: "alert body when registering an iPad"), + comment: "alert body when registering an iPad"), proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", - comment: "button text to proceed with registration when on an iPad"), + comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, phoneNumberText: phoneNumberText, @@ -388,8 +325,8 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { countryCode: String) { ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: true) { (modal) in - self.setLastRegisteredCountryCode(value: countryCode) - self.setLastRegisteredPhoneNumber(value: phoneNumberText) + OnboardingController.setLastRegisteredCountryCode(value: countryCode) + OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumberText) self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, success: { @@ -415,7 +352,12 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { } private func registrationFailed(error: NSError) { - if error.code == 400 { + if error.code == 402 { + Logger.info("Captcha requested.") + + self.onboardingController.onboardingPhoneNumberDidRequireCaptcha(viewController: self) + return + } else if error.code == 400 { OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) @@ -430,7 +372,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { // MARK: - -extension OnboardingPhoneNumberViewController: UITextFieldDelegate { +extension OnboardingCaptchaViewController: UITextFieldDelegate { public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { // TODO: Fix auto-format of phone numbers. ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) @@ -448,7 +390,7 @@ extension OnboardingPhoneNumberViewController: UITextFieldDelegate { // MARK: - -extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate { +extension OnboardingCaptchaViewController: CountryCodeViewControllerDelegate { public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { guard countryCode.count > 0 else { owsFailDebug("Invalid country code.") @@ -463,9 +405,10 @@ extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate return } - update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + onboardingController.update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + updateState() - // Trigger the formatting logic with a no-op edit. + // Trigger the formatting logic with a no-op edit. _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index c43c80511..dade4e87e 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -5,25 +5,50 @@ import UIKit @objc -public protocol OnboardingController: class { - func initialViewController() -> UIViewController +public class OnboardingState: NSObject { + public let countryName: String + public let callingCode: String + public let countryCode: String - func onboardingSplashDidComplete(viewController: UIViewController) + @objc + public init(countryName: String, + callingCode: String, + countryCode: String) { + self.countryName = countryName + self.callingCode = callingCode + self.countryCode = countryCode + } - func onboardingPermissionsWasSkipped(viewController: UIViewController) - func onboardingPermissionsDidComplete(viewController: UIViewController) + public static var defaultValue: OnboardingState { + AssertIsOnMainThread() - func onboardingPhoneNumberDidComplete(viewController: UIViewController) + var countryCode: String = PhoneNumber.defaultCountryCode() + if let lastRegisteredCountryCode = OnboardingController.lastRegisteredCountryCode(), + lastRegisteredCountryCode.count > 0 { + countryCode = lastRegisteredCountryCode + } + + let callingCodeNumber: NSNumber = PhoneNumberUtil.sharedThreadLocal().nbPhoneNumberUtil.getCountryCode(forRegion: countryCode) + let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumber)" + + var countryName = NSLocalizedString("UNKNOWN_COUNTRY_NAME", comment: "Label for unknown countries.") + if let countryNameDerived = PhoneNumberUtil.countryName(fromCountryCode: countryCode) { + countryName = countryNameDerived + } + + return OnboardingState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + } } -// MARK: - - @objc -public class OnboardingControllerImpl: NSObject, OnboardingController { +public class OnboardingController: NSObject { // MARK: - Factory Methods + @objc public func initialViewController() -> UIViewController { + AssertIsOnMainThread() + let view = OnboardingSplashViewController(onboardingController: self) return view } @@ -31,30 +56,117 @@ public class OnboardingControllerImpl: NSObject, OnboardingController { // MARK: - Transitions public func onboardingSplashDidComplete(viewController: UIViewController) { + AssertIsOnMainThread() + let view = OnboardingPermissionsViewController(onboardingController: self) viewController.navigationController?.pushViewController(view, animated: true) } public func onboardingPermissionsWasSkipped(viewController: UIViewController) { + AssertIsOnMainThread() + pushPhoneNumberView(viewController: viewController) } public func onboardingPermissionsDidComplete(viewController: UIViewController) { + AssertIsOnMainThread() + pushPhoneNumberView(viewController: viewController) } private func pushPhoneNumberView(viewController: UIViewController) { + AssertIsOnMainThread() + let view = OnboardingPhoneNumberViewController(onboardingController: self) viewController.navigationController?.pushViewController(view, animated: true) } public func onboardingPhoneNumberDidComplete(viewController: UIViewController) { + AssertIsOnMainThread() + // CodeVerificationViewController *vc = [CodeVerificationViewController new]; // [weakSelf.navigationController pushViewController:vc animated:YES]; } public func onboardingPhoneNumberDidRequireCaptcha(viewController: UIViewController) { + AssertIsOnMainThread() + let view = OnboardingCaptchaViewController(onboardingController: self) viewController.navigationController?.pushViewController(view, animated: true) } + + // MARK: - State + + public private(set) var state: OnboardingState = .defaultValue + + public func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + AssertIsOnMainThread() + + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + state = OnboardingState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + } + + // MARK: - Debug + + private static let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" + private static let kKeychainKey_LastRegisteredCountryCode = "kKeychainKey_LastRegisteredCountryCode" + private static let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" + + private class func debugValue(forKey key: String) -> String? { + AssertIsOnMainThread() + + guard OWSIsDebugBuild() else { + return nil + } + + do { + let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) + return value + } catch { + owsFailDebug("Error: \(error)") + return nil + } + } + + private class func setDebugValue(_ value: String, forKey key: String) { + AssertIsOnMainThread() + + guard OWSIsDebugBuild() else { + return + } + + do { + try CurrentAppContext().keychainStorage().set(string: value, service: kKeychainService_LastRegistered, key: key) + } catch { + owsFailDebug("Error: \(error)") + } + } + + public class func lastRegisteredCountryCode() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) + } + + public class func setLastRegisteredCountryCode(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) + } + + public class func lastRegisteredPhoneNumber() -> String? { + return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) + } + + public class func setLastRegisteredPhoneNumber(value: String) { + setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 3da7db472..21bef737f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -187,7 +187,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { } let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) - update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + onboardingController.update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) + updateState() phoneNumberTextField.text = phoneNumberWithoutCallingCode // Don't let user edit their phone number while re-registering. @@ -196,109 +197,45 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // MARK: - - private var countryName = "" - private var callingCode = "" - private var countryCode = "" + private var countryName: String { + get { + return onboardingController.state.countryName + } + } + private var callingCode: String { + get { + AssertIsOnMainThread() + + return onboardingController.state.callingCode + } + } + private var countryCode: String { + get { + AssertIsOnMainThread() + + return onboardingController.state.countryCode + } + } private func populateDefaults() { - - var countryCode: String = PhoneNumber.defaultCountryCode() - if let lastRegisteredCountryCode = self.lastRegisteredCountryCode(), - lastRegisteredCountryCode.count > 0 { - countryCode = lastRegisteredCountryCode - } - - let callingCodeNumber: NSNumber = PhoneNumberUtil.sharedThreadLocal().nbPhoneNumberUtil.getCountryCode(forRegion: countryCode) - let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumber)" - - if let lastRegisteredPhoneNumber = self.lastRegisteredPhoneNumber(), + if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(), lastRegisteredPhoneNumber.count > 0, lastRegisteredPhoneNumber.hasPrefix(callingCode) { phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) } - var countryName = NSLocalizedString("UNKNOWN_COUNTRY_NAME", comment: "Label for unknown countries.") - if let countryNameDerived = PhoneNumberUtil.countryName(fromCountryCode: countryCode) { - countryName = countryNameDerived - } - - update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + updateState() } - private func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + private func updateState() { AssertIsOnMainThread() - guard countryCode.count > 0 else { - owsFailDebug("Invalid country code.") - return - } - guard countryName.count > 0 else { - owsFailDebug("Invalid country name.") - return - } - guard callingCode.count > 0 else { - owsFailDebug("Invalid calling code.") - return - } - - self.countryName = countryName - self.callingCode = callingCode - self.countryCode = countryCode - countryNameLabel.text = countryName callingCodeLabel.text = callingCode self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) } - // MARK: - Debug - - private let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" - private let kKeychainKey_LastRegisteredCountryCode = "kKeychainKey_LastRegisteredCountryCode" - private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" - - private func debugValue(forKey key: String) -> String? { - guard OWSIsDebugBuild() else { - return nil - } - - do { - let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) - return value - } catch { - owsFailDebug("Error: \(error)") - return nil - } - } - - private func setDebugValue(_ value: String, forKey key: String) { - guard OWSIsDebugBuild() else { - return - } - - do { - try CurrentAppContext().keychainStorage().set(string: value, service: kKeychainService_LastRegistered, key: key) - } catch { - owsFailDebug("Error: \(error)") - } - } - - private func lastRegisteredCountryCode() -> String? { - return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) - } - - private func setLastRegisteredCountryCode(value: String) { - setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) - } - - private func lastRegisteredPhoneNumber() -> String? { - return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) - } - - private func setLastRegisteredPhoneNumber(value: String) { - setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) - } - // MARK: - Events @objc func countryRowTapped(sender: UIGestureRecognizer) { @@ -388,8 +325,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryCode: String) { ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: true) { (modal) in - self.setLastRegisteredCountryCode(value: countryCode) - self.setLastRegisteredPhoneNumber(value: phoneNumberText) + OnboardingController.setLastRegisteredCountryCode(value: countryCode) + OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumberText) self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, success: { @@ -468,7 +405,8 @@ extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate return } - update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + onboardingController.update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + updateState() // Trigger the formatting logic with a no-op edit. _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") From df12f71b74c6eef7aebf8d3e1629d21d6b53b965 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 11:16:50 -0500 Subject: [PATCH 039/493] Sketch out CAPTCHA onboarding view. --- .../OnboardingCaptchaViewController.swift | 482 +++++------------- .../Registration/OnboardingController.swift | 12 + .../OnboardingPhoneNumberViewController.swift | 1 - .../translations/en.lproj/Localizable.strings | 9 +- 4 files changed, 157 insertions(+), 347 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 21242df8b..c5c8e56b5 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -3,412 +3,208 @@ // import UIKit -import PromiseKit +import WebKit @objc public class OnboardingCaptchaViewController: OnboardingBaseViewController { - // MARK: - Dependencies - - private var tsAccountManager: TSAccountManager { - return TSAccountManager.sharedInstance() - } - - // MARK: - - - private let countryNameLabel = UILabel() - private let callingCodeLabel = UILabel() - private let phoneNumberTextField = UITextField() - private var nextButton: OWSFlatButton? + private var webView: WKWebView? override public func loadView() { super.loadView() - populateDefaults() - view.backgroundColor = Theme.backgroundColor + view.backgroundColor = .orange view.layoutMargins = .zero // TODO: // navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") - let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_CAPTCHA_TITLE", comment: "Title of the 'onboarding Captcha' view.")) - // Country - - let rowHeight: CGFloat = 40 - - countryNameLabel.textColor = Theme.primaryColor - countryNameLabel.font = UIFont.ows_dynamicTypeBody - countryNameLabel.setContentHuggingHorizontalLow() - countryNameLabel.setCompressionResistanceHorizontalLow() - - let countryIcon = UIImage(named: (CurrentAppContext().isRTL - ? "small_chevron_left" - : "small_chevron_right")) - let countryImageView = UIImageView(image: countryIcon?.withRenderingMode(.alwaysTemplate)) - countryImageView.tintColor = Theme.placeholderColor - countryImageView.setContentHuggingHigh() - countryImageView.setCompressionResistanceHigh() - - let countryRow = UIStackView(arrangedSubviews: [ - countryNameLabel, - countryImageView + let titleRow = UIStackView(arrangedSubviews: [ + titleLabel ]) - countryRow.axis = .horizontal - countryRow.alignment = .center - countryRow.spacing = 10 - countryRow.isUserInteractionEnabled = true - countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) - countryRow.autoSetDimension(.height, toSize: rowHeight) - addBottomStroke(countryRow) + titleRow.axis = .vertical + titleRow.alignment = .fill + titleRow.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 0, right: 16) + titleRow.isLayoutMarginsRelativeArrangement = true - callingCodeLabel.textColor = Theme.primaryColor - callingCodeLabel.font = UIFont.ows_dynamicTypeBody - callingCodeLabel.setContentHuggingHorizontalHigh() - callingCodeLabel.setCompressionResistanceHorizontalHigh() - callingCodeLabel.isUserInteractionEnabled = true - callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) - addBottomStroke(callingCodeLabel) - callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) - - phoneNumberTextField.textAlignment = .left - phoneNumberTextField.delegate = self - phoneNumberTextField.keyboardType = .numberPad - phoneNumberTextField.textColor = Theme.primaryColor - phoneNumberTextField.font = UIFont.ows_dynamicTypeBody - phoneNumberTextField.setContentHuggingHorizontalLow() - phoneNumberTextField.setCompressionResistanceHorizontalLow() - - addBottomStroke(phoneNumberTextField) - - let phoneNumberRow = UIStackView(arrangedSubviews: [ - callingCodeLabel, - phoneNumberTextField - ]) - phoneNumberRow.axis = .horizontal - phoneNumberRow.alignment = .fill - phoneNumberRow.spacing = 10 - phoneNumberRow.autoSetDimension(.height, toSize: rowHeight) - callingCodeLabel.autoMatch(.height, to: .height, of: phoneNumberTextField) - - // TODO: Finalize copy. - - let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", - comment: "Label for the 'next' button."), - selector: #selector(nextPressed)) - self.nextButton = nextButton - let topSpacer = UIView.vStretchingSpacer() - let bottomSpacer = UIView.vStretchingSpacer() + // We want the CAPTCHA web content to "fill the screen (honoring margins)". + // The way to do this with WKWebView is to inject a javascript snippet that + // manipulates the viewport. + let jscript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);" + let userScript = WKUserScript(source: jscript, injectionTime: .atDocumentEnd, forMainFrameOnly: true) + let wkUController = WKUserContentController() + wkUController.addUserScript(userScript) + let wkWebConfig = WKWebViewConfiguration() + wkWebConfig.userContentController = wkUController + let webView = WKWebView(frame: self.view.bounds, configuration: wkWebConfig) + self.webView = webView + webView.navigationDelegate = self + webView.allowsBackForwardNavigationGestures = false + webView.customUserAgent = "Signal iOS (+https://signal.org/download)" + webView.allowsLinkPreview = false +// webView.scrollView.contentInset = .zero +// webView.layoutMargins = .zero let stackView = UIStackView(arrangedSubviews: [ - titleLabel, - topSpacer, - countryRow, - UIView.spacer(withHeight: 8), - phoneNumberRow, - bottomSpacer, - nextButton + titleRow, + webView ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.layoutMargins = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperviewMargins() - stackView.autoPinWidthToSuperviewMargins() stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) - // Ensure whitespace is balanced, so inputs are vertically centered. - topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + NotificationCenter.default.addObserver(self, + selector: #selector(didBecomeActive), + name: NSNotification.Name.OWSApplicationDidBecomeActive, + object: nil) } - private func addBottomStroke(_ view: UIView) { - let strokeView = UIView() - strokeView.backgroundColor = Theme.middleGrayColor - view.addSubview(strokeView) - strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) - strokeView.autoPinWidthToSuperview() - strokeView.autoPinEdge(toSuperviewEdge: .bottom) + deinit { + NotificationCenter.default.removeObserver(self) } public override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) self.navigationController?.isNavigationBarHidden = false + + loadContent() + } + + fileprivate let contentUrl = "https://signalcaptchas.org/registration/generate.html" + + private func loadContent() { + guard let webView = webView else { + owsFailDebug("Missing webView.") + return + } + guard let url = URL(string: contentUrl) else { + owsFailDebug("Invalid URL.") + return + } + webView.load(URLRequest(url: url)) + webView.scrollView.contentOffset = .zero } public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) self.navigationController?.isNavigationBarHidden = false - - phoneNumberTextField.becomeFirstResponder() - - if tsAccountManager.isReregistering() { - // If re-registering, pre-populate the country (country code, calling code, country name) - // and phone number state. - guard let phoneNumberE164 = tsAccountManager.reregisterationPhoneNumber() else { - owsFailDebug("Could not resume re-registration; missing phone number.") - return - } - tryToReregister(phoneNumberE164: phoneNumberE164) - } } - private func tryToReregister(phoneNumberE164: String) { - guard phoneNumberE164.count > 0 else { - owsFailDebug("Could not resume re-registration; invalid phoneNumberE164.") - return - } - guard let parsedPhoneNumber = PhoneNumber(fromE164: phoneNumberE164) else { - owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") - return - } - guard let callingCode = parsedPhoneNumber.getCountryCode() else { - owsFailDebug("Could not resume re-registration; missing callingCode.") - return - } - let callingCodeText = "\(COUNTRY_CODE_PREFIX)\(callingCode)" - let countryCodes: [String] = - PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCodeText) - guard let countryCode = countryCodes.first else { - owsFailDebug("Could not resume re-registration; unknown countryCode.") - return - } - guard let countryName = PhoneNumberUtil.countryName(fromCountryCode: countryCode) else { - owsFailDebug("Could not resume re-registration; unknown countryName.") - return - } - if !phoneNumberE164.hasPrefix(callingCodeText) { - owsFailDebug("Could not resume re-registration; non-matching calling code.") - return - } - let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) + // MARK: - Notifications - onboardingController.update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) - updateState() - - phoneNumberTextField.text = phoneNumberWithoutCallingCode - // Don't let user edit their phone number while re-registering. - phoneNumberTextField.isEnabled = false - } - - // MARK: - - - private var countryName: String { - get { - return onboardingController.state.countryName - } - } - private var callingCode: String { - get { - AssertIsOnMainThread() - - return onboardingController.state.callingCode - } - } - private var countryCode: String { - get { - AssertIsOnMainThread() - - return onboardingController.state.countryCode - } - } - - private func populateDefaults() { - if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(), - lastRegisteredPhoneNumber.count > 0, - lastRegisteredPhoneNumber.hasPrefix(callingCode) { - phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) - } - - updateState() - } - - private func updateState() { + @objc func didBecomeActive() { AssertIsOnMainThread() - countryNameLabel.text = countryName - callingCodeLabel.text = callingCode - - self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) + loadContent() } // MARK: - Events - @objc func countryRowTapped(sender: UIGestureRecognizer) { - guard sender.state == .recognized else { - return - } - showCountryPicker() - } - - @objc func countryCodeTapped(sender: UIGestureRecognizer) { - guard sender.state == .recognized else { - return - } - showCountryPicker() - } - - @objc func nextPressed() { + private func didComplete(url: URL) { Logger.info("") - parseAndTryToRegister() - } - - // MARK: - Country Picker - - private func showCountryPicker() { - guard !tsAccountManager.isReregistering() else { - return - } - - let countryCodeController = CountryCodeViewController() - countryCodeController.countryCodeDelegate = self - countryCodeController.interfaceOrientationMask = .portrait - let navigationController = OWSNavigationController(rootViewController: countryCodeController) - self.present(navigationController, animated: true, completion: nil) - } - - // MARK: - Register - - private func parseAndTryToRegister() { - guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), - phoneNumberText.count > 0 else { - OWSAlerts.showAlert(title: - NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", - comment: "Title of alert indicating that users needs to enter a phone number to register."), - message: - NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE", - comment: "Message of alert indicating that users needs to enter a phone number to register.")) + // signalcaptcha://03AF6jDqXgf1PocNNrWRJEENZ9l6RAMIsUoESi2dFKkxTgE2qjdZGVjEW6SZNFQqeRRTgGqOii6zHGG--uLyC1HnhSmRt8wHeKxHcg1hsK4ucTusANIeFXVB8wPPiV7U_0w2jUFVak5clMCvW9_JBfbfzj51_e9sou8DYfwc_R6THuTBTdpSV8Nh0yJalgget-nSukCxh6FPA6hRVbw7lP3r-me1QCykHOfh-V29UVaQ4Fs5upHvwB5rtiViqT_HN8WuGmdIdGcaWxaqy1lQTgFSs2Shdj593wZiXfhJnCWAw9rMn3jSgIZhkFxdXwKOmslQ2E_I8iWkm6 + guard let host = url.host, + host.count > 0 else { + owsFailDebug("Missing host.") return } - let phoneNumber = "\(callingCode)\(phoneNumberText)" - guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), - localNumber.toE164().count > 0, - PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { - OWSAlerts.showAlert(title: - NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", - comment: "Title of alert indicating that users needs to enter a valid phone number to register."), - message: - NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE", - comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) - return - } - let parsedPhoneNumber = localNumber.toE164() - - if UIDevice.current.isIPad { - let countryCode = self.countryCode - OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", - comment: "alert title when registering an iPad"), - message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", - comment: "alert body when registering an iPad"), - proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", - comment: "button text to proceed with registration when on an iPad"), - proceedAction: { (_) in - self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) - }) - } else { - tryToRegister(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) - } - } - - private func tryToRegister(parsedPhoneNumber: String, - phoneNumberText: String, - countryCode: String) { - ModalActivityIndicatorViewController.present(fromViewController: self, - canCancel: true) { (modal) in - OnboardingController.setLastRegisteredCountryCode(value: countryCode) - OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumberText) - - self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, - success: { - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationSucceeded() - }) - } - }, failure: { (error) in - Logger.error("Error: \(error)") - - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationFailed(error: error as NSError) - }) - } - }, smsVerification: true) - } - } - - private func registrationSucceeded() { - self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) - } - - private func registrationFailed(error: NSError) { - if error.code == 402 { - Logger.info("Captcha requested.") - - self.onboardingController.onboardingPhoneNumberDidRequireCaptcha(viewController: self) - return - } else if error.code == 400 { - OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), - message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) - - } else { - OWSAlerts.showAlert(title: error.localizedDescription, - message: error.localizedRecoverySuggestion) - } - - phoneNumberTextField.becomeFirstResponder() + onboardingController. } +// +// @objc func countryRowTapped(sender: UIGestureRecognizer) { +// guard sender.state == .recognized else { +// return +// } +// showCountryPicker() +// } +// +// @objc func countryCodeTapped(sender: UIGestureRecognizer) { +// guard sender.state == .recognized else { +// return +// } +// showCountryPicker() +// } +// +// @objc func nextPressed() { +// Logger.info("") +// +// parseAndTryToRegister() +// } +// +// // MARK: - +// +// private func registrationSucceeded() { +// self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) +// } } // MARK: - -extension OnboardingCaptchaViewController: UITextFieldDelegate { - public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - // TODO: Fix auto-format of phone numbers. - ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) +extension OnboardingCaptchaViewController: WKNavigationDelegate { + public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) { + Logger.verbose("navigationAction: \(String(describing: navigationAction.request.url))") - // Inform our caller that we took care of performing the change. - return false + guard let url: URL = navigationAction.request.url else { + owsFailDebug("Missing URL.") + decisionHandler(.cancel) + return + } + if url.scheme == "signalcaptcha" { + decisionHandler(.cancel) + DispatchQueue.main.async { + didComplete(url: url) + } + return + } + + decisionHandler(.allow) } - public func textFieldShouldReturn(_ textField: UITextField) -> Bool { - parseAndTryToRegister() - textField.resignFirstResponder() - return false - } -} - -// MARK: - - -extension OnboardingCaptchaViewController: CountryCodeViewControllerDelegate { - public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { - guard countryCode.count > 0 else { - owsFailDebug("Invalid country code.") - return - } - guard countryName.count > 0 else { - owsFailDebug("Invalid country name.") - return - } - guard callingCode.count > 0 else { - owsFailDebug("Invalid calling code.") - return - } - - onboardingController.update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) - updateState() - - // Trigger the formatting logic with a no-op edit. - _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") + public func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) { + Logger.verbose("navigationResponse: \(String(describing: navigationResponse))") + + decisionHandler(.allow) + } + + public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) { + Logger.verbose("navigation: \(String(describing: navigation))") + } + + public func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) { + Logger.verbose("navigation: \(String(describing: navigation))") + } + + public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { + Logger.verbose("navigation: \(String(describing: navigation)), error: \(error)") + } + + public func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) { + Logger.verbose("navigation: \(String(describing: navigation))") + } + + public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { + Logger.verbose("navigation: \(String(describing: navigation))") + } + + public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) { + Logger.verbose("navigation: \(String(describing: navigation)), error: \(error)") + } + +// public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) + + public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) { + Logger.verbose("") } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index dade4e87e..5cb284c4b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -95,10 +95,22 @@ public class OnboardingController: NSObject { viewController.navigationController?.pushViewController(view, animated: true) } + public func onboardingCaptchaDidComplete(viewController: UIViewController, + captchaToken: String) { + AssertIsOnMainThread() + + self.captchaToken = captchaToken + +// let view = OnboardingCaptchaViewController(onboardingController: self) +// viewController.navigationController?.pushViewController(view, animated: true) + } + // MARK: - State public private(set) var state: OnboardingState = .defaultValue + private var captchaToken: String + public func update(withCountryName countryName: String, callingCode: String, countryCode: String) { AssertIsOnMainThread() diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 21bef737f..4a4ea1948 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -116,7 +116,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperviewMargins() - stackView.autoPinWidthToSuperviewMargins() stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index dfcb3443b..6de276e74 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1092,11 +1092,11 @@ /* Label for button that resets crop & rotation state. */ "IMAGE_EDITOR_RESET_BUTTON" = "Reset"; -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1508,6 +1508,9 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; + /* Explanation in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_EXPLANATION" = "ONBOARDING_PERMISSIONS_EXPLANATION"; From 58abf762442b613e32a9a974c467df8249f7e71a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 12:41:48 -0500 Subject: [PATCH 040/493] Sketch out CAPTCHA onboarding view. --- .../HomeView/HomeViewController.m | 5 +- .../CodeVerificationViewController.m | 8 +- .../OnboardingBaseViewController.swift | 68 ++++++++++++ .../OnboardingCaptchaViewController.swift | 59 ++++------ .../Registration/OnboardingController.swift | 103 ++++++++++++------ .../OnboardingPhoneNumberViewController.swift | 101 ++++++----------- .../Registration/RegistrationViewController.m | 1 + Signal/src/util/RegistrationUtils.m | 6 +- .../src/Account/TSAccountManager.h | 9 +- .../src/Account/TSAccountManager.m | 23 +++- .../Network/API/Requests/OWSRequestFactory.h | 3 +- .../Network/API/Requests/OWSRequestFactory.m | 14 ++- 12 files changed, 245 insertions(+), 155 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 167e27e05..7e7c40603 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -485,10 +485,11 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations dispatch_async(dispatch_get_main_queue(), ^{ OnboardingController *onboardingController = [OnboardingController new]; + [onboardingController + updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; + OnboardingCaptchaViewController *view = [[OnboardingCaptchaViewController alloc] initWithOnboardingController:onboardingController]; - // OnboardingPermissionsViewController *view = - // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:view]; [self presentViewController:navigationController animated:YES completion:nil]; diff --git a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m index 3a168ebd5..923955f0b 100644 --- a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m +++ b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m @@ -340,8 +340,8 @@ NS_ASSUME_NONNULL_BEGIN [_requestCodeAgainSpinner startAnimating]; __weak CodeVerificationViewController *weakSelf = self; - [self.tsAccountManager - rerequestSMSWithSuccess:^{ + [self.tsAccountManager rerequestSMSWithCaptchaToken:nil + success:^{ OWSLogInfo(@"Successfully requested SMS code"); [weakSelf enableServerActions:YES]; [weakSelf.requestCodeAgainSpinner stopAnimating]; @@ -363,8 +363,8 @@ NS_ASSUME_NONNULL_BEGIN [_requestCallSpinner startAnimating]; __weak CodeVerificationViewController *weakSelf = self; - [self.tsAccountManager - rerequestVoiceWithSuccess:^{ + [self.tsAccountManager rerequestVoiceWithCaptchaToken:nil + success:^{ OWSLogInfo(@"Successfully requested voice code"); [weakSelf enableServerActions:YES]; diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 6027d0d00..c14bd048d 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -7,6 +7,15 @@ import PromiseKit @objc public class OnboardingBaseViewController: OWSViewController { + + // MARK: - Dependencies + + private var tsAccountManager: TSAccountManager { + return TSAccountManager.sharedInstance() + } + + // MARK: - + // Unlike a delegate, we can and should retain a strong reference to the OnboardingController. let onboardingController: OnboardingController @@ -82,6 +91,65 @@ public class OnboardingBaseViewController: OWSViewController { } } + // MARK: - Registration + + func tryToRegister(smsVerification: Bool) { + + guard let phoneNumber = onboardingController.phoneNumber else { + owsFailDebug("Missing phoneNumber.") + return + } + + // We eagerly update this state, regardless of whether or not the + // registration request succeeds. + OnboardingController.setLastRegisteredCountryCode(value: onboardingController.countryState.countryCode) + OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumber.userInput) + + let captchaToken = onboardingController.captchaToken + + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: true) { (modal) in + + self.tsAccountManager.register(withPhoneNumber: phoneNumber.e164, + captchaToken: captchaToken, + success: { + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationSucceeded() + }) + } + }, failure: { (error) in + Logger.error("Error: \(error)") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationFailed(error: error as NSError) + }) + } + }, smsVerification: smsVerification) + } + } + + private func registrationSucceeded() { + self.onboardingController.onboardingRegistrationSucceeded(viewController: self) + } + + private func registrationFailed(error: NSError) { + if error.code == 402 { + Logger.info("Captcha requested.") + + self.onboardingController.onboardingDidRequireCaptcha(viewController: self) + return + } else if error.code == 400 { + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), + message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) + + } else { + OWSAlerts.showAlert(title: error.localizedDescription, + message: error.localizedRecoverySuggestion) + } + } + // MARK: - Orientation public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index c5c8e56b5..be9665057 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -14,7 +14,6 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { super.loadView() view.backgroundColor = Theme.backgroundColor - view.backgroundColor = .orange view.layoutMargins = .zero // TODO: @@ -45,8 +44,8 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { webView.allowsBackForwardNavigationGestures = false webView.customUserAgent = "Signal iOS (+https://signal.org/download)" webView.allowsLinkPreview = false -// webView.scrollView.contentInset = .zero -// webView.layoutMargins = .zero + webView.scrollView.contentInset = .zero + webView.layoutMargins = .zero let stackView = UIStackView(arrangedSubviews: [ titleRow, @@ -108,46 +107,36 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { loadContent() } - // MARK: - Events + // MARK: - - private func didComplete(url: URL) { + private func parseCaptchaAndTryToRegister(url: URL) { + Logger.info("") + + guard let captchaToken = parseCaptcha(url: url) else { + owsFailDebug("Could not parse captcha token: \(url)") + // TODO: Alert? + // + // Reload content so user can try again. + loadContent() + return + } + onboardingController.update(captchaToken: captchaToken) + + tryToRegister(smsVerification: false) + } + + private func parseCaptcha(url: URL) -> String? { Logger.info("") // signalcaptcha://03AF6jDqXgf1PocNNrWRJEENZ9l6RAMIsUoESi2dFKkxTgE2qjdZGVjEW6SZNFQqeRRTgGqOii6zHGG--uLyC1HnhSmRt8wHeKxHcg1hsK4ucTusANIeFXVB8wPPiV7U_0w2jUFVak5clMCvW9_JBfbfzj51_e9sou8DYfwc_R6THuTBTdpSV8Nh0yJalgget-nSukCxh6FPA6hRVbw7lP3r-me1QCykHOfh-V29UVaQ4Fs5upHvwB5rtiViqT_HN8WuGmdIdGcaWxaqy1lQTgFSs2Shdj593wZiXfhJnCWAw9rMn3jSgIZhkFxdXwKOmslQ2E_I8iWkm6 guard let host = url.host, host.count > 0 else { owsFailDebug("Missing host.") - return + return nil } - onboardingController. + return host } -// -// @objc func countryRowTapped(sender: UIGestureRecognizer) { -// guard sender.state == .recognized else { -// return -// } -// showCountryPicker() -// } -// -// @objc func countryCodeTapped(sender: UIGestureRecognizer) { -// guard sender.state == .recognized else { -// return -// } -// showCountryPicker() -// } -// -// @objc func nextPressed() { -// Logger.info("") -// -// parseAndTryToRegister() -// } -// -// // MARK: - -// -// private func registrationSucceeded() { -// self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) -// } } // MARK: - @@ -164,7 +153,7 @@ extension OnboardingCaptchaViewController: WKNavigationDelegate { if url.scheme == "signalcaptcha" { decisionHandler(.cancel) DispatchQueue.main.async { - didComplete(url: url) + self.parseCaptchaAndTryToRegister(url: url) } return } @@ -202,8 +191,6 @@ extension OnboardingCaptchaViewController: WKNavigationDelegate { Logger.verbose("navigation: \(String(describing: navigation)), error: \(error)") } -// public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) - public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) { Logger.verbose("") } diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 5cb284c4b..89cab9233 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -5,7 +5,7 @@ import UIKit @objc -public class OnboardingState: NSObject { +public class OnboardingCountryState: NSObject { public let countryName: String public let callingCode: String public let countryCode: String @@ -19,7 +19,7 @@ public class OnboardingState: NSObject { self.countryCode = countryCode } - public static var defaultValue: OnboardingState { + public static var defaultValue: OnboardingCountryState { AssertIsOnMainThread() var countryCode: String = PhoneNumber.defaultCountryCode() @@ -36,13 +36,35 @@ public class OnboardingState: NSObject { countryName = countryNameDerived } - return OnboardingState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + return OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) } } +// MARK: - + +@objc +public class OnboardingPhoneNumber: NSObject { + public let e164: String + public let userInput: String + + @objc + public init(e164: String, + userInput: String) { + self.e164 = e164 + self.userInput = userInput + } +} + +// MARK: - + @objc public class OnboardingController: NSObject { + @objc + public override init() { + super.init() + } + // MARK: - Factory Methods @objc @@ -58,6 +80,8 @@ public class OnboardingController: NSObject { public func onboardingSplashDidComplete(viewController: UIViewController) { AssertIsOnMainThread() + Logger.info("") + let view = OnboardingPermissionsViewController(onboardingController: self) viewController.navigationController?.pushViewController(view, animated: true) } @@ -65,12 +89,16 @@ public class OnboardingController: NSObject { public func onboardingPermissionsWasSkipped(viewController: UIViewController) { AssertIsOnMainThread() + Logger.info("") + pushPhoneNumberView(viewController: viewController) } public func onboardingPermissionsDidComplete(viewController: UIViewController) { AssertIsOnMainThread() + Logger.info("") + pushPhoneNumberView(viewController: viewController) } @@ -81,53 +109,64 @@ public class OnboardingController: NSObject { viewController.navigationController?.pushViewController(view, animated: true) } - public func onboardingPhoneNumberDidComplete(viewController: UIViewController) { + public func onboardingRegistrationSucceeded(viewController: UIViewController) { AssertIsOnMainThread() + Logger.info("") + // CodeVerificationViewController *vc = [CodeVerificationViewController new]; // [weakSelf.navigationController pushViewController:vc animated:YES]; } - public func onboardingPhoneNumberDidRequireCaptcha(viewController: UIViewController) { + public func onboardingDidRequireCaptcha(viewController: UIViewController) { AssertIsOnMainThread() + Logger.info("") + + guard let navigationController = viewController.navigationController else { + owsFailDebug("Missing navigationController.") + return + } + + // The service could demand CAPTCHA from the "phone number" view or later + // from the "code verification" view. The "Captcha" view should always appear + // immediately after the "phone number" view. + while navigationController.viewControllers.count > 1 && + !(navigationController.topViewController is OnboardingPhoneNumberViewController) { + navigationController.popViewController(animated: false) + } + let view = OnboardingCaptchaViewController(onboardingController: self) - viewController.navigationController?.pushViewController(view, animated: true) - } - - public func onboardingCaptchaDidComplete(viewController: UIViewController, - captchaToken: String) { - AssertIsOnMainThread() - - self.captchaToken = captchaToken - -// let view = OnboardingCaptchaViewController(onboardingController: self) -// viewController.navigationController?.pushViewController(view, animated: true) + navigationController.pushViewController(view, animated: true) } // MARK: - State - public private(set) var state: OnboardingState = .defaultValue + public private(set) var countryState: OnboardingCountryState = .defaultValue - private var captchaToken: String + public private(set) var phoneNumber: OnboardingPhoneNumber? - public func update(withCountryName countryName: String, callingCode: String, countryCode: String) { + public private(set) var captchaToken: String? + + @objc + public func update(countryState: OnboardingCountryState) { AssertIsOnMainThread() - guard countryCode.count > 0 else { - owsFailDebug("Invalid country code.") - return - } - guard countryName.count > 0 else { - owsFailDebug("Invalid country name.") - return - } - guard callingCode.count > 0 else { - owsFailDebug("Invalid calling code.") - return - } + self.countryState = countryState + } - state = OnboardingState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + @objc + public func update(phoneNumber: OnboardingPhoneNumber) { + AssertIsOnMainThread() + + self.phoneNumber = phoneNumber + } + + @objc + public func update(captchaToken: String) { + AssertIsOnMainThread() + + self.captchaToken = captchaToken } // MARK: - Debug diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 4a4ea1948..ffd677b3b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -165,13 +165,13 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") return } - guard let callingCode = parsedPhoneNumber.getCountryCode() else { + guard let callingCodeNumeric = parsedPhoneNumber.getCountryCode() else { owsFailDebug("Could not resume re-registration; missing callingCode.") return } - let callingCodeText = "\(COUNTRY_CODE_PREFIX)\(callingCode)" + let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumeric)" let countryCodes: [String] = - PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCodeText) + PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCode) guard let countryCode = countryCodes.first else { owsFailDebug("Could not resume re-registration; unknown countryCode.") return @@ -180,13 +180,28 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { owsFailDebug("Could not resume re-registration; unknown countryName.") return } - if !phoneNumberE164.hasPrefix(callingCodeText) { + if !phoneNumberE164.hasPrefix(callingCode) { owsFailDebug("Could not resume re-registration; non-matching calling code.") return } - let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCodeText.count) + let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCode.count) + + guard countryCode.count > 0 else { + owsFailDebug("Invalid country code.") + return + } + guard countryName.count > 0 else { + owsFailDebug("Invalid country name.") + return + } + guard callingCode.count > 0 else { + owsFailDebug("Invalid calling code.") + return + } + + let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + onboardingController.update(countryState: countryState) - onboardingController.update(withCountryName: countryName, callingCode: callingCodeText, countryCode: countryCode) updateState() phoneNumberTextField.text = phoneNumberWithoutCallingCode @@ -198,21 +213,21 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private var countryName: String { get { - return onboardingController.state.countryName + return onboardingController.countryState.countryName } } private var callingCode: String { get { AssertIsOnMainThread() - return onboardingController.state.callingCode + return onboardingController.countryState.callingCode } } private var countryCode: String { get { AssertIsOnMainThread() - return onboardingController.state.countryCode + return onboardingController.countryState.countryCode } } @@ -297,10 +312,11 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) return } - let parsedPhoneNumber = localNumber.toE164() + let e164PhoneNumber = localNumber.toE164() + + onboardingController.update(phoneNumber: OnboardingPhoneNumber(e164: e164PhoneNumber, userInput: phoneNumberText)) if UIDevice.current.isIPad { - let countryCode = self.countryCode OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", comment: "alert title when registering an iPad"), message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", @@ -308,65 +324,12 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in - self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + self.tryToRegister(smsVerification: false) }) } else { - tryToRegister(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + tryToRegister(smsVerification: false) } } - - private func tryToRegister(parsedPhoneNumber: String, - phoneNumberText: String, - countryCode: String) { - ModalActivityIndicatorViewController.present(fromViewController: self, - canCancel: true) { (modal) in - OnboardingController.setLastRegisteredCountryCode(value: countryCode) - OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumberText) - - self.tsAccountManager.register(withPhoneNumber: parsedPhoneNumber, - success: { - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationSucceeded() - }) - } - }, failure: { (error) in - Logger.error("Error: \(error)") - - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationFailed(error: error as NSError) - }) - } - }, smsVerification: true) - } - } - - private func registrationSucceeded() { - self.onboardingController.onboardingPhoneNumberDidComplete(viewController: self) - } - - private func registrationFailed(error: NSError) { - if error.code == 402 { - Logger.info("Captcha requested.") - - self.onboardingController.onboardingPhoneNumberDidRequireCaptcha(viewController: self) - return - } else if error.code == 400 { - OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), - message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) - - } else { - OWSAlerts.showAlert(title: error.localizedDescription, - message: error.localizedRecoverySuggestion) - } - - phoneNumberTextField.becomeFirstResponder() - } } // MARK: - @@ -382,7 +345,6 @@ extension OnboardingPhoneNumberViewController: UITextFieldDelegate { public func textFieldShouldReturn(_ textField: UITextField) -> Bool { parseAndTryToRegister() - textField.resignFirstResponder() return false } } @@ -404,7 +366,10 @@ extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate return } - onboardingController.update(withCountryName: countryName, callingCode: callingCode, countryCode: countryCode) + let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) + + onboardingController.update(countryState: countryState) + updateState() // Trigger the formatting logic with a no-op edit. diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index cbaf4172e..823d7385f 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -448,6 +448,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi __weak RegistrationViewController *weakSelf = self; [self.tsAccountManager registerWithPhoneNumber:parsedPhoneNumber + captchaToken:nil success:^{ OWSProdInfo([OWSAnalyticsEvents registrationRegisteredPhoneNumber]); diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m index 2789b6108..9a245cff5 100644 --- a/Signal/src/util/RegistrationUtils.m +++ b/Signal/src/util/RegistrationUtils.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "RegistrationUtils.h" @@ -59,8 +59,8 @@ NS_ASSUME_NONNULL_BEGIN presentFromViewController:fromViewController canCancel:NO backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) { - [self.tsAccountManager - registerWithPhoneNumber:self.tsAccountManager.reregisterationPhoneNumber + [self.tsAccountManager registerWithPhoneNumber:self.tsAccountManager.reregisterationPhoneNumber + captchaToken:nil success:^{ OWSLogInfo(@"re-registering: send verification code succeeded."); diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h index 92c873603..a2aff043e 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.h +++ b/SignalServiceKit/src/Account/TSAccountManager.h @@ -90,13 +90,18 @@ typedef NS_ENUM(NSUInteger, OWSRegistrationState) { #pragma mark - Register with phone number - (void)registerWithPhoneNumber:(NSString *)phoneNumber + captchaToken:(nullable NSString *)captchaToken success:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock smsVerification:(BOOL)isSMS; -- (void)rerequestSMSWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock; +- (void)rerequestSMSWithCaptchaToken:(nullable NSString *)captchaToken + success:(void (^)(void))successBlock + failure:(void (^)(NSError *error))failureBlock; -- (void)rerequestVoiceWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock; +- (void)rerequestVoiceWithCaptchaToken:(nullable NSString *)captchaToken + success:(void (^)(void))successBlock + failure:(void (^)(NSError *error))failureBlock; - (void)verifyAccountWithCode:(NSString *)verificationCode pin:(nullable NSString *)pin diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index d95b63c53..5e2d18a82 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -322,6 +322,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa } - (void)registerWithPhoneNumber:(NSString *)phoneNumber + captchaToken:(nullable NSString *)captchaToken success:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock smsVerification:(BOOL)isSMS @@ -339,6 +340,7 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa TSRequest *request = [OWSRequestFactory requestVerificationCodeRequestWithPhoneNumber:phoneNumber + captchaToken:captchaToken transport:(isSMS ? TSVerificationTransportSMS : TSVerificationTransportVoice)]; [[TSNetworkManager sharedManager] makeRequest:request @@ -357,20 +359,33 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa }]; } -- (void)rerequestSMSWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock +- (void)rerequestSMSWithCaptchaToken:(nullable NSString *)captchaToken + success:(void (^)(void))successBlock + failure:(void (^)(NSError *error))failureBlock { + // TODO: Can we remove phoneNumberAwaitingVerification? NSString *number = self.phoneNumberAwaitingVerification; OWSAssertDebug(number); - [self registerWithPhoneNumber:number success:successBlock failure:failureBlock smsVerification:YES]; + [self registerWithPhoneNumber:number + captchaToken:captchaToken + success:successBlock + failure:failureBlock + smsVerification:YES]; } -- (void)rerequestVoiceWithSuccess:(void (^)(void))successBlock failure:(void (^)(NSError *error))failureBlock +- (void)rerequestVoiceWithCaptchaToken:(nullable NSString *)captchaToken + success:(void (^)(void))successBlock + failure:(void (^)(NSError *error))failureBlock { NSString *number = self.phoneNumberAwaitingVerification; OWSAssertDebug(number); - [self registerWithPhoneNumber:number success:successBlock failure:failureBlock smsVerification:NO]; + [self registerWithPhoneNumber:number + captchaToken:captchaToken + success:successBlock + failure:failureBlock + smsVerification:NO]; } - (void)verifyAccountWithCode:(NSString *)verificationCode diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index b7ef07a7c..82da3e28f 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -56,6 +56,7 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { TSVerificationTransportVo + (TSRequest *)unregisterAccountRequest; + (TSRequest *)requestVerificationCodeRequestWithPhoneNumber:(NSString *)phoneNumber + captchaToken:(nullable NSString *)captchaToken transport:(TSVerificationTransport)transport; + (TSRequest *)submitMessageRequestWithRecipient:(NSString *)recipientId diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index bc2e4b6ae..ecc9a053b 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSRequestFactory.h" @@ -235,13 +235,21 @@ NS_ASSUME_NONNULL_BEGIN } + (TSRequest *)requestVerificationCodeRequestWithPhoneNumber:(NSString *)phoneNumber + captchaToken:(nullable NSString *)captchaToken transport:(TSVerificationTransport)transport { OWSAssertDebug(phoneNumber.length > 0); - NSString *path = [NSString stringWithFormat:@"%@/%@/code/%@?client=ios", + + NSString *querystring = @"client=ios"; + if (captchaToken.length > 0) { + querystring = [NSString stringWithFormat:@"%@&captcha=%@", querystring, captchaToken]; + } + + NSString *path = [NSString stringWithFormat:@"%@/%@/code/%@?%@", textSecureAccountsAPI, [self stringForTransport:transport], - phoneNumber]; + phoneNumber, + querystring]; TSRequest *request = [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; request.shouldHaveAuthorizationHeaders = NO; From 413d3cdbd3740fb31616cec9611cad84e0b02223 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 12:43:10 -0500 Subject: [PATCH 041/493] Sketch out CAPTCHA onboarding view. --- .../ViewControllers/HomeView/HomeViewController.m | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 7e7c40603..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,18 +482,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - OnboardingController *onboardingController = [OnboardingController new]; - [onboardingController - updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - - OnboardingCaptchaViewController *view = - [[OnboardingCaptchaViewController alloc] initWithOnboardingController:onboardingController]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:view]; - [self presentViewController:navigationController animated:YES completion:nil]; - }); } - (void)viewDidDisappear:(BOOL)animated From b9d94e77f6e2842f684e35cc88d6d0a2fc4f5ce3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 15:23:34 -0500 Subject: [PATCH 042/493] Respond to CR. --- .../OnboardingBaseViewController.swift | 67 ------------------ .../OnboardingCaptchaViewController.swift | 4 +- .../Registration/OnboardingController.swift | 70 ++++++++++++++++++- .../OnboardingPhoneNumberViewController.swift | 4 +- .../Network/API/Requests/OWSRequestFactory.m | 6 ++ 5 files changed, 79 insertions(+), 72 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index c14bd048d..d242b81e2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -8,14 +8,6 @@ import PromiseKit @objc public class OnboardingBaseViewController: OWSViewController { - // MARK: - Dependencies - - private var tsAccountManager: TSAccountManager { - return TSAccountManager.sharedInstance() - } - - // MARK: - - // Unlike a delegate, we can and should retain a strong reference to the OnboardingController. let onboardingController: OnboardingController @@ -91,65 +83,6 @@ public class OnboardingBaseViewController: OWSViewController { } } - // MARK: - Registration - - func tryToRegister(smsVerification: Bool) { - - guard let phoneNumber = onboardingController.phoneNumber else { - owsFailDebug("Missing phoneNumber.") - return - } - - // We eagerly update this state, regardless of whether or not the - // registration request succeeds. - OnboardingController.setLastRegisteredCountryCode(value: onboardingController.countryState.countryCode) - OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumber.userInput) - - let captchaToken = onboardingController.captchaToken - - ModalActivityIndicatorViewController.present(fromViewController: self, - canCancel: true) { (modal) in - - self.tsAccountManager.register(withPhoneNumber: phoneNumber.e164, - captchaToken: captchaToken, - success: { - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationSucceeded() - }) - } - }, failure: { (error) in - Logger.error("Error: \(error)") - - DispatchQueue.main.async { - modal.dismiss(completion: { - self.registrationFailed(error: error as NSError) - }) - } - }, smsVerification: smsVerification) - } - } - - private func registrationSucceeded() { - self.onboardingController.onboardingRegistrationSucceeded(viewController: self) - } - - private func registrationFailed(error: NSError) { - if error.code == 402 { - Logger.info("Captcha requested.") - - self.onboardingController.onboardingDidRequireCaptcha(viewController: self) - return - } else if error.code == 400 { - OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), - message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) - - } else { - OWSAlerts.showAlert(title: error.localizedDescription, - message: error.localizedRecoverySuggestion) - } - } - // MARK: - Orientation public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index be9665057..d9e152a8b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -122,12 +122,13 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { } onboardingController.update(captchaToken: captchaToken) - tryToRegister(smsVerification: false) + onboardingController.tryToRegister(fromViewController: self, smsVerification: false) } private func parseCaptcha(url: URL) -> String? { Logger.info("") + // Example URL: // signalcaptcha://03AF6jDqXgf1PocNNrWRJEENZ9l6RAMIsUoESi2dFKkxTgE2qjdZGVjEW6SZNFQqeRRTgGqOii6zHGG--uLyC1HnhSmRt8wHeKxHcg1hsK4ucTusANIeFXVB8wPPiV7U_0w2jUFVak5clMCvW9_JBfbfzj51_e9sou8DYfwc_R6THuTBTdpSV8Nh0yJalgget-nSukCxh6FPA6hRVbw7lP3r-me1QCykHOfh-V29UVaQ4Fs5upHvwB5rtiViqT_HN8WuGmdIdGcaWxaqy1lQTgFSs2Shdj593wZiXfhJnCWAw9rMn3jSgIZhkFxdXwKOmslQ2E_I8iWkm6 guard let host = url.host, host.count > 0 else { @@ -158,6 +159,7 @@ extension OnboardingCaptchaViewController: WKNavigationDelegate { return } + // Loading the Captcha content involves a series of actions. decisionHandler(.allow) } diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 89cab9233..532cc975f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -60,6 +60,14 @@ public class OnboardingPhoneNumber: NSObject { @objc public class OnboardingController: NSObject { + // MARK: - Dependencies + + private var tsAccountManager: TSAccountManager { + return TSAccountManager.sharedInstance() + } + + // MARK: - + @objc public override init() { super.init() @@ -209,7 +217,7 @@ public class OnboardingController: NSObject { return debugValue(forKey: kKeychainKey_LastRegisteredCountryCode) } - public class func setLastRegisteredCountryCode(value: String) { + private class func setLastRegisteredCountryCode(value: String) { setDebugValue(value, forKey: kKeychainKey_LastRegisteredCountryCode) } @@ -217,7 +225,65 @@ public class OnboardingController: NSObject { return debugValue(forKey: kKeychainKey_LastRegisteredPhoneNumber) } - public class func setLastRegisteredPhoneNumber(value: String) { + private class func setLastRegisteredPhoneNumber(value: String) { setDebugValue(value, forKey: kKeychainKey_LastRegisteredPhoneNumber) } + + // MARK: - Registration + + public func tryToRegister(fromViewController: UIViewController, + smsVerification: Bool) { + guard let phoneNumber = phoneNumber else { + owsFailDebug("Missing phoneNumber.") + return + } + + // We eagerly update this state, regardless of whether or not the + // registration request succeeds. + OnboardingController.setLastRegisteredCountryCode(value: countryState.countryCode) + OnboardingController.setLastRegisteredPhoneNumber(value: phoneNumber.userInput) + + let captchaToken = self.captchaToken + ModalActivityIndicatorViewController.present(fromViewController: fromViewController, + canCancel: true) { (modal) in + + self.tsAccountManager.register(withPhoneNumber: phoneNumber.e164, + captchaToken: captchaToken, + success: { + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationSucceeded(viewController: fromViewController) + }) + } + }, failure: { (error) in + Logger.error("Error: \(error)") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.registrationFailed(viewController: fromViewController, error: error as NSError) + }) + } + }, smsVerification: smsVerification) + } + } + + private func registrationSucceeded(viewController: UIViewController) { + onboardingRegistrationSucceeded(viewController: viewController) + } + + private func registrationFailed(viewController: UIViewController, error: NSError) { + if error.code == 402 { + Logger.info("Captcha requested.") + + onboardingDidRequireCaptcha(viewController: viewController) + return + } else if error.code == 400 { + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), + message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) + + } else { + OWSAlerts.showAlert(title: error.localizedDescription, + message: error.localizedRecoverySuggestion) + } + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index ffd677b3b..8846ae7f2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -324,10 +324,10 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in - self.tryToRegister(smsVerification: false) + self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) }) } else { - tryToRegister(smsVerification: false) + onboardingController.tryToRegister(fromViewController: self, smsVerification: false) } } } diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index ecc9a053b..c289cb3b4 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -245,6 +245,12 @@ NS_ASSUME_NONNULL_BEGIN querystring = [NSString stringWithFormat:@"%@&captcha=%@", querystring, captchaToken]; } + NSURLQueryItem *screenNameItem, *includeRTsItem; + screenNameItem = [NSURLQueryItem queryItemWithName:@"screen_name" value:@"joemasilotti"]; + includeRTsItem = [NSURLQueryItem queryItemWithName:@"include_rts" value:@"true"]; + components.queryItems = @[ screenNameItem, includeRTsItem ]; + url = components.URL; + NSString *path = [NSString stringWithFormat:@"%@/%@/code/%@?%@", textSecureAccountsAPI, [self stringForTransport:transport], From 91834454a94d5caa2ebc363d07a8703123441318 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 15:53:06 -0500 Subject: [PATCH 043/493] Respond to CR. --- .../src/Network/API/Requests/OWSRequestFactory.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index c289cb3b4..ecc9a053b 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -245,12 +245,6 @@ NS_ASSUME_NONNULL_BEGIN querystring = [NSString stringWithFormat:@"%@&captcha=%@", querystring, captchaToken]; } - NSURLQueryItem *screenNameItem, *includeRTsItem; - screenNameItem = [NSURLQueryItem queryItemWithName:@"screen_name" value:@"joemasilotti"]; - includeRTsItem = [NSURLQueryItem queryItemWithName:@"include_rts" value:@"true"]; - components.queryItems = @[ screenNameItem, includeRTsItem ]; - url = components.URL; - NSString *path = [NSString stringWithFormat:@"%@/%@/code/%@?%@", textSecureAccountsAPI, [self stringForTransport:transport], From f6d6dd767c4bc546f99e6dbb9fcbdae6631e08a9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 13:09:07 -0500 Subject: [PATCH 044/493] Update splash asset. --- .../Contents.json | 2 +- .../Screen Shot 2019-02-12 at 2.22.35 PM.png | Bin 36109 -> 0 bytes .../onboarding_splash.png | Bin 0 -> 105615 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png create mode 100644 Signal/Images.xcassets/onboarding_splash_hero.imageset/onboarding_splash.png diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json index 2eb68d3be..e4663220c 100644 --- a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json +++ b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "Screen Shot 2019-02-12 at 2.22.35 PM.png", + "filename" : "onboarding_splash.png", "scale" : "1x" }, { diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Screen Shot 2019-02-12 at 2.22.35 PM.png deleted file mode 100644 index 6ef277fb850fbe5c4fb308593fc2729d335bf4cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36109 zcmZU(18`+gw=Npnw%NfBI<{>)JGQlBI~^MxcWm3}*hvQ+TOB($|2gN~d#c{5T2*Ue zaAJLPj2We@D20qbfB*&thAbm3t_lVQ4)}Uq;9$OLil_DeeHDDI#l)0l#Kg#yT^uc} z?aaZz=n_qhjlan-(v1Ou#>Qh)4D<*to~n_Nv8u+sgMCwdgJeU-!(@3G`uf{=XxoE< zn7*AOeQu=L8zdwpY(j31YEBNK*%8

MvsweSNHnOzd0g?+W+60Ri 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 diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/onboarding_splash.png b/Signal/Images.xcassets/onboarding_splash_hero.imageset/onboarding_splash.png new file mode 100644 index 0000000000000000000000000000000000000000..b99099af24e7353f1309d5a36cb6b4032694edea GIT binary patch literal 105615 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 P1Ab&Bl_bhP7zO@+$#Cpq literal 0 HcmV?d00001 From 78ea3e565f2f507b1935e2ed083073067e619603 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 13:22:56 -0500 Subject: [PATCH 045/493] Update splash view. --- .../HomeView/HomeViewController.m | 12 ++++++ .../OnboardingBaseViewController.swift | 10 ++++- .../OnboardingCaptchaViewController.swift | 8 ---- .../OnboardingPermissionsViewController.swift | 12 ------ .../OnboardingPhoneNumberViewController.swift | 8 ---- .../OnboardingSplashViewController.swift | 37 +++++++------------ .../translations/en.lproj/Localizable.strings | 2 +- 7 files changed, 35 insertions(+), 54 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..6d525276b 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,6 +482,18 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + OnboardingController *onboardingController = [OnboardingController new]; + [onboardingController + updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; + + UIViewController *view = [onboardingController initialViewController]; + // [[OnboardingCaptchaViewController alloc] initWithOnboardingController:onboardingController]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:view]; + [self presentViewController:navigationController animated:YES completion:nil]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index d242b81e2..5ba07714a 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -31,7 +31,7 @@ public class OnboardingBaseViewController: OWSViewController { let titleLabel = UILabel() titleLabel.text = text titleLabel.textColor = Theme.primaryColor - titleLabel.font = UIFont.ows_dynamicTypeTitle2.ows_mediumWeight() + titleLabel.font = UIFont.ows_dynamicTypeTitle1.ows_mediumWeight() titleLabel.numberOfLines = 0 titleLabel.lineBreakMode = .byWordWrapping titleLabel.textAlignment = .center @@ -75,6 +75,8 @@ public class OnboardingBaseViewController: OWSViewController { public override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + self.navigationController?.isNavigationBarHidden = true + // TODO: Is there a better way to do this? if let navigationController = self.navigationController as? OWSNavigationController { SignalApp.shared().signUpFlowNavigationController = navigationController @@ -83,6 +85,12 @@ public class OnboardingBaseViewController: OWSViewController { } } + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.navigationController?.isNavigationBarHidden = true + } + // MARK: - Orientation public override var supportedInterfaceOrientations: UIInterfaceOrientationMask { diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index d9e152a8b..9f1f60103 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -73,8 +73,6 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { public override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - self.navigationController?.isNavigationBarHidden = false - loadContent() } @@ -93,12 +91,6 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { webView.scrollView.contentOffset = .zero } - public override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - self.navigationController?.isNavigationBarHidden = false - } - // MARK: - Notifications @objc func didBecomeActive() { diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index c19dd160d..434495541 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -65,18 +65,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { } } - public override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - self.navigationController?.isNavigationBarHidden = false - } - - public override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - self.navigationController?.isNavigationBarHidden = false - } - // MARK: Request Access private func requestAccess() { diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 8846ae7f2..2b738c0a7 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -132,17 +132,9 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { strokeView.autoPinEdge(toSuperviewEdge: .bottom) } - public override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - self.navigationController?.isNavigationBarHidden = false - } - public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - self.navigationController?.isNavigationBarHidden = false - phoneNumberTextField.becomeFirstResponder() if tsAccountManager.isReregistering() { diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 14353ad1f..0e7825748 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -14,9 +14,6 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { view.backgroundColor = Theme.backgroundColor view.layoutMargins = .zero - // TODO: - // navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") - let heroImage = UIImage(named: "onboarding_splash_hero") let heroImageView = UIImageView(image: heroImage) heroImageView.contentMode = .scaleAspectFit @@ -29,12 +26,16 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { view.addSubview(titleLabel) titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) - // TODO: Finalize copy. - let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_SPLASH_EXPLANATION", - comment: "Explanation in the 'onboarding splash' view."), - linkText: NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", - comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view."), - selector: #selector(explanationLabelTapped)) + let explanationLabel = UILabel() + explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", + comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view.") + explanationLabel.textColor = .ows_materialBlue + explanationLabel.font = UIFont.ows_dynamicTypeBody + explanationLabel.numberOfLines = 0 + explanationLabel.textAlignment = .center + explanationLabel.lineBreakMode = .byWordWrapping + explanationLabel.isUserInteractionEnabled = true + explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explanationLabelTapped))) // TODO: Make sure this all fits if dynamic font sizes are maxed out. let continueButton = self.button(title: NSLocalizedString("BUTTON_CONTINUE", @@ -46,9 +47,9 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { heroImageView, UIView.spacer(withHeight: 22), titleLabel, - UIView.spacer(withHeight: 56), + UIView.spacer(withHeight: 92), explanationLabel, - UIView.spacer(withHeight: 40), + UIView.spacer(withHeight: 24), continueButton ]) stackView.axis = .vertical @@ -56,23 +57,11 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) - stackView.autoPinWidthToSuperviewMargins() + stackView.autoPinWidthToSuperview() stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0) } - public override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - self.navigationController?.isNavigationBarHidden = true - } - - public override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - self.navigationController?.isNavigationBarHidden = true - } - // MARK: - Events @objc func explanationLabelTapped(sender: UIGestureRecognizer) { diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 6de276e74..18754b04b 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_SPLASH_EXPLANATION" = "By continuing, you agree to Signal's terms."; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms and Privacy Policy"; +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; From 8bdbe24bd0a1f09ab2fe30cbc6169d7571a0fb5e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 13:42:33 -0500 Subject: [PATCH 046/493] Update permissions view. --- .../HomeView/HomeViewController.m | 5 +- .../OnboardingBaseViewController.swift | 25 ++++---- .../OnboardingPermissionsViewController.swift | 58 +++++++------------ .../OnboardingSplashViewController.swift | 2 +- .../translations/en.lproj/Localizable.strings | 6 +- 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 6d525276b..640a097a3 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -488,8 +488,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [onboardingController updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - UIViewController *view = [onboardingController initialViewController]; - // [[OnboardingCaptchaViewController alloc] initWithOnboardingController:onboardingController]; + // UIViewController *view = [onboardingController initialViewController]; + UIViewController *view = + [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:view]; [self presentViewController:navigationController animated:YES completion:nil]; diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 5ba07714a..84c2455a9 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -38,22 +38,14 @@ public class OnboardingBaseViewController: OWSViewController { return titleLabel } - func explanationLabel(explanationText: String, linkText: String, selector: Selector) -> UILabel { - let explanationText = NSAttributedString(string: explanationText) - .rtlSafeAppend(NSAttributedString(string: " ")) - .rtlSafeAppend(linkText, - attributes: [ - NSAttributedStringKey.foregroundColor: UIColor.ows_materialBlue - ]) + func explanationLabel(explanationText: String) -> UILabel { let explanationLabel = UILabel() explanationLabel.textColor = Theme.secondaryColor explanationLabel.font = UIFont.ows_dynamicTypeCaption1 - explanationLabel.attributedText = explanationText + explanationLabel.text = explanationText explanationLabel.numberOfLines = 0 explanationLabel.textAlignment = .center explanationLabel.lineBreakMode = .byWordWrapping - explanationLabel.isUserInteractionEnabled = true - explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: selector)) return explanationLabel } @@ -70,6 +62,19 @@ public class OnboardingBaseViewController: OWSViewController { return button } + func linkButton(title: String, selector: Selector) -> OWSFlatButton { + // TODO: Make sure this all fits if dynamic font sizes are maxed out. + let buttonHeight: CGFloat = 48 + let button = OWSFlatButton.button(title: title, + font: OWSFlatButton.fontForHeight(buttonHeight), + titleColor: .ows_materialBlue, + backgroundColor: .white, + target: self, + selector: selector) + button.autoSetDimension(.height, toSize: buttonHeight) + return button + } + // MARK: - View Lifecycle public override func viewWillAppear(_ animated: Bool) { diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 434495541..9d39883eb 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -12,10 +12,7 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { super.loadView() view.backgroundColor = Theme.backgroundColor - view.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) - - // TODO: -// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") + view.layoutMargins = .zero navigationItem.rightBarButtonItem = UIBarButtonItem(title: NSLocalizedString("NAVIGATION_ITEM_SKIP_BUTTON", comment: "A button to skip a view."), style: .plain, @@ -23,46 +20,42 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { action: #selector(skipWasPressed)) let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.")) - view.addSubview(titleLabel) - titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) - // TODO: Finalize copy. let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", - comment: "Explanation in the 'onboarding permissions' view."), - linkText: NSLocalizedString("ONBOARDING_PERMISSIONS_LEARN_MORE_LINK", - comment: "Link to the 'learn more' in the 'onboarding permissions' view."), - selector: #selector(explanationLabelTapped)) + comment: "Explanation in the 'onboarding permissions' view.")) // TODO: Make sure this all fits if dynamic font sizes are maxed out. - let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON", + let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", comment: "Label for the 'give access' button in the 'onboarding permissions' view."), selector: #selector(giveAccessPressed)) - let notNowButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON", - comment: "Label for the 'not now' button in the 'onboarding permissions' view."), + let notNowButton = self.linkButton(title: NSLocalizedString("ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON", + comment: "Label for the 'not now' button in the 'onboarding permissions' view."), selector: #selector(notNowPressed)) - let buttonStack = UIStackView(arrangedSubviews: [ - giveAccessButton, - notNowButton - ]) - buttonStack.axis = .vertical - buttonStack.alignment = .fill - buttonStack.spacing = 12 - + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + UIView.spacer(withHeight: 20), explanationLabel, - buttonStack + topSpacer, + giveAccessButton, + UIView.spacer(withHeight: 12), + notNowButton, + bottomSpacer ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.spacing = 40 + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) - stackView.autoPinWidthToSuperviewMargins() - stackView.autoPinEdge(.top, to: .bottom, of: titleLabel, withOffset: 20, relation: .greaterThanOrEqual) - NSLayoutConstraint.autoSetPriority(.defaultHigh) { - stackView.autoVCenterInSuperview() - } + stackView.autoPinWidthToSuperview() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) } // MARK: Request Access @@ -105,13 +98,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { onboardingController.onboardingPermissionsWasSkipped(viewController: self) } - @objc func explanationLabelTapped(sender: UIGestureRecognizer) { - guard sender.state == .recognized else { - return - } - // TODO: - } - @objc func giveAccessPressed() { Logger.info("") diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 0e7825748..384a8084b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -30,7 +30,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view.") explanationLabel.textColor = .ows_materialBlue - explanationLabel.font = UIFont.ows_dynamicTypeBody + explanationLabel.font = UIFont.ows_dynamicTypeCaption1 explanationLabel.numberOfLines = 0 explanationLabel.textAlignment = .center explanationLabel.lineBreakMode = .byWordWrapping diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 18754b04b..070a8b3f5 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1512,10 +1512,10 @@ "ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "ONBOARDING_PERMISSIONS_EXPLANATION"; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Allowing Signal to send you notifications and access your contacts makes it easier to communicate with your friends. Your contact information is always transmitted securely."; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_GIVE_ACCESS_BUTTON" = "Give Access"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; /* Link to the 'learn more' in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_LEARN_MORE_LINK" = "Learn More"; @@ -1524,7 +1524,7 @@ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "We need access to your contacts and notifications"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; From 6bc46fad6662cc5158d764f9c821d28d93b1f766 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 15:08:00 -0500 Subject: [PATCH 047/493] Update permissions view. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 4 ++-- .../Registration/OnboardingPermissionsViewController.swift | 1 + .../Registration/OnboardingPhoneNumberViewController.swift | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 640a097a3..f77de2219 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -488,9 +488,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [onboardingController updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - // UIViewController *view = [onboardingController initialViewController]; + // UIViewController *view = [onboardingController initialViewController]; UIViewController *view = - [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; + [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:view]; [self presentViewController:navigationController animated:YES completion:nil]; diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 9d39883eb..5a9e9cc59 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -23,6 +23,7 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.")) + explanationLabel.setCompressionResistanceVerticalLow() // TODO: Make sure this all fits if dynamic font sizes are maxed out. let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 2b738c0a7..de2a8c4ad 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -29,9 +29,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { view.backgroundColor = Theme.backgroundColor view.layoutMargins = .zero - // TODO: -// navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") - let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) // Country @@ -115,7 +112,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) - stackView.autoPinWidthToSuperviewMargins() + stackView.autoPinWidthToSuperview() stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) @@ -228,6 +225,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { lastRegisteredPhoneNumber.count > 0, lastRegisteredPhoneNumber.hasPrefix(callingCode) { phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) + } else if let phoneNumber = onboardingController.phoneNumber { + phoneNumberTextField.text = phoneNumber.userInput } updateState() From 8cfe768e860940590821cc784e19a4889aebca4b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 16:20:29 -0500 Subject: [PATCH 048/493] Update font sizes in onboarding views. --- .../HomeView/HomeViewController.m | 6 +- .../OnboardingBaseViewController.swift | 16 ++-- .../OnboardingPermissionsViewController.swift | 1 - .../OnboardingPhoneNumberViewController.swift | 6 +- .../OnboardingSplashViewController.swift | 2 +- .../translations/en.lproj/Localizable.strings | 2 +- SignalMessaging/categories/UIFont+OWS.h | 14 +++- SignalMessaging/categories/UIFont+OWS.m | 80 ++++++++++++++++++- 8 files changed, 110 insertions(+), 17 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index f77de2219..2cc3f8337 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -488,9 +488,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [onboardingController updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - // UIViewController *view = [onboardingController initialViewController]; - UIViewController *view = - [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; + UIViewController *view = [onboardingController initialViewController]; + // UIViewController *view = + // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:view]; [self presentViewController:navigationController animated:YES completion:nil]; diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 84c2455a9..bd76bdb98 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -31,7 +31,7 @@ public class OnboardingBaseViewController: OWSViewController { let titleLabel = UILabel() titleLabel.text = text titleLabel.textColor = Theme.primaryColor - titleLabel.font = UIFont.ows_dynamicTypeTitle1.ows_mediumWeight() + titleLabel.font = UIFont.ows_dynamicTypeTitle1Clamped.ows_mediumWeight() titleLabel.numberOfLines = 0 titleLabel.lineBreakMode = .byWordWrapping titleLabel.textAlignment = .center @@ -41,7 +41,7 @@ public class OnboardingBaseViewController: OWSViewController { func explanationLabel(explanationText: String) -> UILabel { let explanationLabel = UILabel() explanationLabel.textColor = Theme.secondaryColor - explanationLabel.font = UIFont.ows_dynamicTypeCaption1 + explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped explanationLabel.text = explanationText explanationLabel.numberOfLines = 0 explanationLabel.textAlignment = .center @@ -51,9 +51,11 @@ public class OnboardingBaseViewController: OWSViewController { func button(title: String, selector: Selector) -> OWSFlatButton { // TODO: Make sure this all fits if dynamic font sizes are maxed out. - let buttonHeight: CGFloat = 48 + let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() + // Button height should be 48pt if the font is 17pt. + let buttonHeight = font.pointSize * 48 / 17 let button = OWSFlatButton.button(title: title, - font: OWSFlatButton.fontForHeight(buttonHeight), + font: font, titleColor: .white, backgroundColor: .ows_materialBlue, target: self, @@ -64,9 +66,11 @@ public class OnboardingBaseViewController: OWSViewController { func linkButton(title: String, selector: Selector) -> OWSFlatButton { // TODO: Make sure this all fits if dynamic font sizes are maxed out. - let buttonHeight: CGFloat = 48 + let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() + // Button height should be 48pt if the font is 17pt. + let buttonHeight = font.pointSize * 48 / 17 let button = OWSFlatButton.button(title: title, - font: OWSFlatButton.fontForHeight(buttonHeight), + font: font, titleColor: .ows_materialBlue, backgroundColor: .white, target: self, diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 5a9e9cc59..9d39883eb 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -23,7 +23,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.")) - explanationLabel.setCompressionResistanceVerticalLow() // TODO: Make sure this all fits if dynamic font sizes are maxed out. let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index de2a8c4ad..51e517767 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -36,7 +36,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let rowHeight: CGFloat = 40 countryNameLabel.textColor = Theme.primaryColor - countryNameLabel.font = UIFont.ows_dynamicTypeBody + countryNameLabel.font = UIFont.ows_dynamicTypeBodyClamped countryNameLabel.setContentHuggingHorizontalLow() countryNameLabel.setCompressionResistanceHorizontalLow() @@ -61,7 +61,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { addBottomStroke(countryRow) callingCodeLabel.textColor = Theme.primaryColor - callingCodeLabel.font = UIFont.ows_dynamicTypeBody + callingCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped callingCodeLabel.setContentHuggingHorizontalHigh() callingCodeLabel.setCompressionResistanceHorizontalHigh() callingCodeLabel.isUserInteractionEnabled = true @@ -73,7 +73,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.delegate = self phoneNumberTextField.keyboardType = .numberPad phoneNumberTextField.textColor = Theme.primaryColor - phoneNumberTextField.font = UIFont.ows_dynamicTypeBody + phoneNumberTextField.font = UIFont.ows_dynamicTypeBodyClamped phoneNumberTextField.setContentHuggingHorizontalLow() phoneNumberTextField.setCompressionResistanceHorizontalLow() diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 384a8084b..195e6dfa2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -30,7 +30,7 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view.") explanationLabel.textColor = .ows_materialBlue - explanationLabel.font = UIFont.ows_dynamicTypeCaption1 + explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped explanationLabel.numberOfLines = 0 explanationLabel.textAlignment = .center explanationLabel.lineBreakMode = .byWordWrapping diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 070a8b3f5..65fa69982 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1512,7 +1512,7 @@ "ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Allowing Signal to send you notifications and access your contacts makes it easier to communicate with your friends. Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h index e719dddcb..b0bcda463 100644 --- a/SignalMessaging/categories/UIFont+OWS.h +++ b/SignalMessaging/categories/UIFont+OWS.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -36,6 +36,18 @@ NS_ASSUME_NONNULL_BEGIN @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption1Font; @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption2Font; +#pragma mark - Dynamic Type Clamped + +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle1ClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle2ClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle3ClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeHeadlineClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeBodyClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeSubheadlineClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeFootnoteClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption1ClampedFont; +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption2ClampedFont; + #pragma mark - Styles - (UIFont *)ows_italic; diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 2cd08f628..6c237aec0 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "UIFont+OWS.h" @@ -97,6 +97,84 @@ NS_ASSUME_NONNULL_BEGIN return [UIFont preferredFontForTextStyle:UIFontTextStyleCaption2]; } +#pragma mark - Dynamic Type Clamped + ++ (UIFont *)preferredFontForTextStyleClamped:(UIFontTextStyle)fontTextStyle +{ + static NSDictionary *maxPointSizeMap = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + maxPointSizeMap = @{ + UIFontTextStyleTitle1 : @(34.0), + UIFontTextStyleTitle2 : @(28.0), + UIFontTextStyleTitle3 : @(26.0), + UIFontTextStyleHeadline : @(23.0), + UIFontTextStyleBody : @(23.0), + UIFontTextStyleSubheadline : @(21.0), + UIFontTextStyleFootnote : @(19.0), + UIFontTextStyleCaption1 : @(18.0), + UIFontTextStyleCaption2 : @(17.0), + }; + }); + + UIFont *font = [UIFont preferredFontForTextStyle:fontTextStyle]; + NSNumber *_Nullable maxPointSize = maxPointSizeMap[fontTextStyle]; + if (maxPointSize) { + if (maxPointSize.floatValue < font.pointSize) { + return [font fontWithSize:maxPointSize.floatValue]; + } + } else { + OWSFailDebug(@"Missing max point size for style: %@", fontTextStyle); + } + + return font; +} + ++ (UIFont *)ows_dynamicTypeTitle1ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleTitle1]; +} + ++ (UIFont *)ows_dynamicTypeTitle2ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleTitle2]; +} + ++ (UIFont *)ows_dynamicTypeTitle3ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleTitle3]; +} + ++ (UIFont *)ows_dynamicTypeHeadlineClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleHeadline]; +} + ++ (UIFont *)ows_dynamicTypeBodyClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleBody]; +} + ++ (UIFont *)ows_dynamicTypeSubheadlineClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleSubheadline]; +} + ++ (UIFont *)ows_dynamicTypeFootnoteClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleFootnote]; +} + ++ (UIFont *)ows_dynamicTypeCaption1ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleCaption1]; +} + ++ (UIFont *)ows_dynamicTypeCaption2ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleCaption2]; +} + #pragma mark - Styles - (UIFont *)ows_italic From 05d63fd6b552f630e037deab66992ee04964c2ba Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 16:22:51 -0500 Subject: [PATCH 049/493] Update font sizes in onboarding views. --- SignalMessaging/categories/UIFont+OWS.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 6c237aec0..a7a1a4451 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -101,6 +101,8 @@ NS_ASSUME_NONNULL_BEGIN + (UIFont *)preferredFontForTextStyleClamped:(UIFontTextStyle)fontTextStyle { + // We clamp the dynamic type sizes at the max size available + // without "larger accessibility sizes" enabled. static NSDictionary *maxPointSizeMap = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ From ee200aaed8f9a381f482e010e25ce3f1897c1d56 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 16:54:22 -0500 Subject: [PATCH 050/493] Add validation warnings to 'onboarding phone number' view. --- .../HomeView/HomeViewController.m | 6 +- .../OnboardingPhoneNumberViewController.swift | 78 ++++++++++++++++--- .../translations/en.lproj/Localizable.strings | 11 +-- 3 files changed, 74 insertions(+), 21 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2cc3f8337..2faf1d455 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -488,9 +488,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [onboardingController updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - UIViewController *view = [onboardingController initialViewController]; - // UIViewController *view = - // [[OnboardingPermissionsViewController alloc] initWithOnboardingController:onboardingController]; + // UIViewController *view = [onboardingController initialViewController]; + UIViewController *view = + [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:view]; [self presentViewController:navigationController animated:YES completion:nil]; diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 51e517767..b3820df34 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -20,6 +20,10 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private let callingCodeLabel = UILabel() private let phoneNumberTextField = UITextField() private var nextButton: OWSFlatButton? + private var phoneStrokeNormal: UIView? + private var phoneStrokeError: UIView? + private let validationWarningLabel = UILabel() + private var isPhoneNumberInvalid = false override public func loadView() { super.loadView() @@ -58,7 +62,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryRow.isUserInteractionEnabled = true countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) countryRow.autoSetDimension(.height, toSize: rowHeight) - addBottomStroke(countryRow) + _ = addBottomStroke(countryRow) callingCodeLabel.textColor = Theme.primaryColor callingCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped @@ -66,7 +70,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { callingCodeLabel.setCompressionResistanceHorizontalHigh() callingCodeLabel.isUserInteractionEnabled = true callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) - addBottomStroke(callingCodeLabel) + _ = addBottomStroke(callingCodeLabel) callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) phoneNumberTextField.textAlignment = .left @@ -77,7 +81,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.setContentHuggingHorizontalLow() phoneNumberTextField.setCompressionResistanceHorizontalLow() - addBottomStroke(phoneNumberTextField) + phoneStrokeNormal = addBottomStroke(phoneNumberTextField) + phoneStrokeError = addBottomStroke(phoneNumberTextField, color: .ows_destructiveRed, strokeWidth: 2) let phoneNumberRow = UIStackView(arrangedSubviews: [ callingCodeLabel, @@ -89,6 +94,16 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberRow.autoSetDimension(.height, toSize: rowHeight) callingCodeLabel.autoMatch(.height, to: .height, of: phoneNumberTextField) + validationWarningLabel.text = NSLocalizedString("ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING", + comment: "Label indicating that the phone number is invalid in the 'onboarding phone number' view.") + validationWarningLabel.textColor = .ows_destructiveRed + validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped + + let validationWarningRow = UIView() + validationWarningRow.addSubview(validationWarningLabel) + validationWarningLabel.autoPinHeightToSuperview() + validationWarningLabel.autoPinEdge(toSuperviewEdge: .trailing) + // TODO: Finalize copy. let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", @@ -104,6 +119,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryRow, UIView.spacer(withHeight: 8), phoneNumberRow, + UIView.spacer(withHeight: 8), + validationWarningRow, bottomSpacer, nextButton ]) @@ -118,15 +135,32 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // Ensure whitespace is balanced, so inputs are vertically centered. topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + + validationWarningLabel.autoPinEdge(.leading, to: .leading, of: phoneNumberTextField) } - private func addBottomStroke(_ view: UIView) { + private func addBottomStroke(_ view: UIView) -> UIView { + return addBottomStroke(view, color: Theme.middleGrayColor, strokeWidth: CGHairlineWidth()) + } + + private func addBottomStroke(_ view: UIView, color: UIColor, strokeWidth: CGFloat) -> UIView { let strokeView = UIView() - strokeView.backgroundColor = Theme.middleGrayColor + strokeView.backgroundColor = color view.addSubview(strokeView) - strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) + strokeView.autoSetDimension(.height, toSize: strokeWidth) strokeView.autoPinWidthToSuperview() strokeView.autoPinEdge(toSuperviewEdge: .bottom) + return strokeView + } + + // MARK: - View Lifecycle + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + isPhoneNumberInvalid = false + + updateViewState() } public override func viewDidAppear(_ animated: Bool) { @@ -191,11 +225,12 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) onboardingController.update(countryState: countryState) - updateState() - phoneNumberTextField.text = phoneNumberWithoutCallingCode + // Don't let user edit their phone number while re-registering. phoneNumberTextField.isEnabled = false + + updateViewState() } // MARK: - @@ -229,16 +264,26 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.text = phoneNumber.userInput } - updateState() + updateViewState() } - private func updateState() { + private func updateViewState() { AssertIsOnMainThread() countryNameLabel.text = countryName callingCodeLabel.text = callingCode self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) + + updateValidationWarnings() + } + + private func updateValidationWarnings() { + AssertIsOnMainThread() + + phoneStrokeNormal?.isHidden = isPhoneNumberInvalid + phoneStrokeError?.isHidden = !isPhoneNumberInvalid + validationWarningLabel.isHidden = !isPhoneNumberInvalid } // MARK: - Events @@ -282,6 +327,10 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private func parseAndTryToRegister() { guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), phoneNumberText.count > 0 else { + + isPhoneNumberInvalid = false + updateValidationWarnings() + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", comment: "Title of alert indicating that users needs to enter a phone number to register."), @@ -295,6 +344,10 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), localNumber.toE164().count > 0, PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { + + isPhoneNumberInvalid = false + updateValidationWarnings() + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", comment: "Title of alert indicating that users needs to enter a valid phone number to register."), @@ -330,6 +383,9 @@ extension OnboardingPhoneNumberViewController: UITextFieldDelegate { // TODO: Fix auto-format of phone numbers. ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) + isPhoneNumberInvalid = false + updateValidationWarnings() + // Inform our caller that we took care of performing the change. return false } @@ -361,7 +417,7 @@ extension OnboardingPhoneNumberViewController: CountryCodeViewControllerDelegate onboardingController.update(countryState: countryState) - updateState() + updateViewState() // Trigger the formatting logic with a no-op edit. _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 65fa69982..9c80faccb 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1511,14 +1511,11 @@ /* Title of the 'onboarding Captcha' view. */ "ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; -/* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; - /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; -/* Link to the 'learn more' in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_LEARN_MORE_LINK" = "Learn More"; +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; @@ -1529,8 +1526,8 @@ /* Title of the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; -/* Explanation in the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_EXPLANATION" = "By continuing, you agree to Signal's terms."; +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; From ead71d436e2ebf660b5db606b2a1ad7a4ce9f890 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 16:54:38 -0500 Subject: [PATCH 051/493] Clean up ahead of PR. --- .../ViewControllers/HomeView/HomeViewController.m | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2faf1d455..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,19 +482,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - OnboardingController *onboardingController = [OnboardingController new]; - [onboardingController - updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - - // UIViewController *view = [onboardingController initialViewController]; - UIViewController *view = - [[OnboardingPhoneNumberViewController alloc] initWithOnboardingController:onboardingController]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:view]; - [self presentViewController:navigationController animated:YES completion:nil]; - }); } - (void)viewDidDisappear:(BOOL)animated From d193eec371f5e9a669976b83370eadfc9b277fe9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 10:21:19 -0500 Subject: [PATCH 052/493] Sketch out the 'onboarding code verification' view. --- Signal.xcodeproj/project.pbxproj | 4 + .../HomeView/HomeViewController.m | 13 + .../OnboardingBaseViewController.swift | 25 +- .../Registration/OnboardingController.swift | 4 +- ...OnboardingVerificationViewController.swift | 374 ++++++++++++++++++ .../translations/en.lproj/Localizable.strings | 18 + 6 files changed, 422 insertions(+), 16 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 40575582f..0b34e517f 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -165,6 +165,7 @@ 3496957321A301A100DCFE74 /* OWSBackupJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 3496956A21A301A100DCFE74 /* OWSBackupJob.m */; }; 3496957421A301A100DCFE74 /* OWSBackupAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */; }; 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */; }; + 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */; }; 34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */; }; 34A6C28021E503E700B5B12E /* OWSImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */; }; 34A8B3512190A40E00218A25 /* MediaAlbumCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */; }; @@ -846,6 +847,7 @@ 3496956C21A301A100DCFE74 /* OWSBackupImportJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupImportJob.h; sourceTree = ""; }; 3496956D21A301A100DCFE74 /* OWSBackupIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupIO.h; sourceTree = ""; }; 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS111UDAttributesMigration.swift; sourceTree = ""; }; + 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = ""; }; 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWS2FARegistrationViewController.m; sourceTree = ""; }; 34A55F3620485464002CC6DE /* OWS2FARegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FARegistrationViewController.h; sourceTree = ""; }; 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSImagePickerController.swift; sourceTree = ""; }; @@ -1473,6 +1475,7 @@ 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */, 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */, + 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */, @@ -3537,6 +3540,7 @@ 34D1F0521F7E8EA30066283D /* GiphyDownloader.swift in Sources */, 340FC8BC204DAC8D007AEB0F /* FingerprintViewController.m in Sources */, 450DF2051E0D74AC003D14BE /* Platform.swift in Sources */, + 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */, 340FC8B2204DAC8D007AEB0F /* AdvancedSettingsTableViewController.m in Sources */, 452B999020A34B6B006F2F9E /* AddContactShareToExistingContactViewController.swift in Sources */, 346129991FD1E4DA00532771 /* SignalApp.m in Sources */, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..88eb9f6f0 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,6 +482,19 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + OnboardingController *onboardingController = [OnboardingController new]; + [onboardingController + updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; + + // UIViewController *view = [onboardingController initialViewController]; + UIViewController *view = + [[OnboardingVerificationViewController alloc] initWithOnboardingController:onboardingController]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:view]; + [self presentViewController:navigationController animated:YES completion:nil]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index bd76bdb98..ac9125a27 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -50,29 +50,26 @@ public class OnboardingBaseViewController: OWSViewController { } func button(title: String, selector: Selector) -> OWSFlatButton { - // TODO: Make sure this all fits if dynamic font sizes are maxed out. - let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() - // Button height should be 48pt if the font is 17pt. - let buttonHeight = font.pointSize * 48 / 17 - let button = OWSFlatButton.button(title: title, - font: font, - titleColor: .white, - backgroundColor: .ows_materialBlue, - target: self, - selector: selector) - button.autoSetDimension(.height, toSize: buttonHeight) - return button + return button(title: title, selector: selector, titleColor: .white, backgroundColor: .ows_materialBlue) } func linkButton(title: String, selector: Selector) -> OWSFlatButton { + return button(title: title, selector: selector, titleColor: .ows_materialBlue, backgroundColor: .white) + } + + func disabledLinkButton(title: String, selector: Selector) -> OWSFlatButton { + return self.button(title: title, selector: selector, titleColor: Theme.secondaryColor, backgroundColor: .white) + } + + private func button(title: String, selector: Selector, titleColor: UIColor, backgroundColor: UIColor) -> OWSFlatButton { // TODO: Make sure this all fits if dynamic font sizes are maxed out. let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() // Button height should be 48pt if the font is 17pt. let buttonHeight = font.pointSize * 48 / 17 let button = OWSFlatButton.button(title: title, font: font, - titleColor: .ows_materialBlue, - backgroundColor: .white, + titleColor: titleColor, + backgroundColor: backgroundColor, target: self, selector: selector) button.autoSetDimension(.height, toSize: buttonHeight) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 532cc975f..5909cd674 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -122,8 +122,8 @@ public class OnboardingController: NSObject { Logger.info("") - // CodeVerificationViewController *vc = [CodeVerificationViewController new]; - // [weakSelf.navigationController pushViewController:vc animated:YES]; + let view = OnboardingVerificationViewController(onboardingController: self) + viewController.navigationController?.pushViewController(view, animated: true) } public func onboardingDidRequireCaptcha(viewController: UIViewController) { diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift new file mode 100644 index 000000000..bba81af9b --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -0,0 +1,374 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit +import PromiseKit + +private class OnboardingCodeView: UIView { +} + +@objc +public class OnboardingVerificationViewController: OnboardingBaseViewController { + +// // MARK: - Dependencies +// +// private var tsAccountManager: TSAccountManager { +// return TSAccountManager.sharedInstance() +// } + + // MARK: - + + private let phoneNumberTextField = UITextField() +// private var nextButton: OWSFlatButton? + private var resendCodeLabel: OWSFlatButton? + private var resendCodeLink: OWSFlatButton? + + override public func loadView() { + super.loadView() + +// populateDefaults() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + var e164PhoneNumber = "" + if let phoneNumber = onboardingController.phoneNumber { + e164PhoneNumber = phoneNumber.e164 + } + let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: e164PhoneNumber) + let titleText = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_FORMAT", + comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), + formattedPhoneNumber) + let titleLabel = self.titleLabel(text: titleText) + + let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", + comment: "Label for the link that lets users change their phone number."), + selector: #selector(backLinkTapped)) + + let onboardingCodeView = OnboardingCodeView() + onboardingCodeView.addRedBorder() + +// resendCodeLabel.text = NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", +// comment: "Label for the link that lets users change their phone number."), +// resendCodeLabel.text = "TODO" +// resendCodeLabel.textColor = Theme.secondaryColor +// resendCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped + + // TODO: Copy. + let resendCodeLabel = disabledLinkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_LINK", + comment: "Label for the link that lets users request another verification code."), + selector: #selector(ignoreEvent)) + self.resendCodeLabel = resendCodeLabel + + let resendCodeLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_LINK", + comment: "Label for the link that lets users request another verification code."), + selector: #selector(resendCodeLinkTapped)) + self.resendCodeLink = resendCodeLink + + let resentCodeWrapper = UIView.container() + resentCodeWrapper.addSubview(resendCodeLabel) + resentCodeWrapper.addSubview(resendCodeLink) + resendCodeLabel.autoPinEdgesToSuperviewEdges() + resendCodeLink.autoPinEdgesToSuperviewEdges() + + // TODO: Finalize copy. + +// let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", +// comment: "Label for the 'next' button."), +// selector: #selector(nextPressed)) +// self.nextButton = nextButton + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() + + let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + UIView.spacer(withHeight: 21), + backLink, + topSpacer, + onboardingCodeView, +// countryRow, +// UIView.spacer(withHeight: 8), +// phoneNumberRow, + bottomSpacer, + resentCodeWrapper + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperview() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + } + +// private func addBottomStroke(_ view: UIView) { +// let strokeView = UIView() +// strokeView.backgroundColor = Theme.middleGrayColor +// view.addSubview(strokeView) +// strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) +// strokeView.autoPinWidthToSuperview() +// strokeView.autoPinEdge(toSuperviewEdge: .bottom) +// } +// +// public override func viewDidAppear(_ animated: Bool) { +// super.viewDidAppear(animated) +// +// phoneNumberTextField.becomeFirstResponder() +// +// if tsAccountManager.isReregistering() { +// // If re-registering, pre-populate the country (country code, calling code, country name) +// // and phone number state. +// guard let phoneNumberE164 = tsAccountManager.reregisterationPhoneNumber() else { +// owsFailDebug("Could not resume re-registration; missing phone number.") +// return +// } +// tryToReregister(phoneNumberE164: phoneNumberE164) +// } +// } +// +// private func tryToReregister(phoneNumberE164: String) { +// guard phoneNumberE164.count > 0 else { +// owsFailDebug("Could not resume re-registration; invalid phoneNumberE164.") +// return +// } +// guard let parsedPhoneNumber = PhoneNumber(fromE164: phoneNumberE164) else { +// owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") +// return +// } +// guard let callingCodeNumeric = parsedPhoneNumber.getCountryCode() else { +// owsFailDebug("Could not resume re-registration; missing callingCode.") +// return +// } +// let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumeric)" +// let countryCodes: [String] = +// PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCode) +// guard let countryCode = countryCodes.first else { +// owsFailDebug("Could not resume re-registration; unknown countryCode.") +// return +// } +// guard let countryName = PhoneNumberUtil.countryName(fromCountryCode: countryCode) else { +// owsFailDebug("Could not resume re-registration; unknown countryName.") +// return +// } +// if !phoneNumberE164.hasPrefix(callingCode) { +// owsFailDebug("Could not resume re-registration; non-matching calling code.") +// return +// } +// let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCode.count) +// +// guard countryCode.count > 0 else { +// owsFailDebug("Invalid country code.") +// return +// } +// guard countryName.count > 0 else { +// owsFailDebug("Invalid country name.") +// return +// } +// guard callingCode.count > 0 else { +// owsFailDebug("Invalid calling code.") +// return +// } +// +// let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) +// onboardingController.update(countryState: countryState) +// +// updateState() +// +// phoneNumberTextField.text = phoneNumberWithoutCallingCode +// // Don't let user edit their phone number while re-registering. +// phoneNumberTextField.isEnabled = false +// } +// +// // MARK: - +// +// private var countryName: String { +// get { +// return onboardingController.countryState.countryName +// } +// } +// private var callingCode: String { +// get { +// AssertIsOnMainThread() +// +// return onboardingController.countryState.callingCode +// } +// } +// private var countryCode: String { +// get { +// AssertIsOnMainThread() +// +// return onboardingController.countryState.countryCode +// } +// } +// +// private func populateDefaults() { +// if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(), +// lastRegisteredPhoneNumber.count > 0, +// lastRegisteredPhoneNumber.hasPrefix(callingCode) { +// phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) +// } else if let phoneNumber = onboardingController.phoneNumber { +// phoneNumberTextField.text = phoneNumber.userInput +// } +// +// updateState() +// } +// +// private func updateState() { +// AssertIsOnMainThread() +// +// countryNameLabel.text = countryName +// callingCodeLabel.text = callingCode +// +// self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) +// } +// +// // MARK: - Events +// +// @objc func countryRowTapped(sender: UIGestureRecognizer) { +// guard sender.state == .recognized else { +// return +// } +// showCountryPicker() +// } +// +// @objc func countryCodeTapped(sender: UIGestureRecognizer) { +// guard sender.state == .recognized else { +// return +// } +// showCountryPicker() +// } +// +// @objc func nextPressed() { +// Logger.info("") +// +// parseAndTryToRegister() +// } +// +// // MARK: - Country Picker +// +// private func showCountryPicker() { +// guard !tsAccountManager.isReregistering() else { +// return +// } +// +// let countryCodeController = CountryCodeViewController() +// countryCodeController.countryCodeDelegate = self +// countryCodeController.interfaceOrientationMask = .portrait +// let navigationController = OWSNavigationController(rootViewController: countryCodeController) +// self.present(navigationController, animated: true, completion: nil) +// } +// +// // MARK: - Register +// +// private func parseAndTryToRegister() { +// guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), +// phoneNumberText.count > 0 else { +// OWSAlerts.showAlert(title: +// NSLocalizedString("REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE", +// comment: "Title of alert indicating that users needs to enter a phone number to register."), +// message: +// NSLocalizedString("REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE", +// comment: "Message of alert indicating that users needs to enter a phone number to register.")) +// return +// } +// +// let phoneNumber = "\(callingCode)\(phoneNumberText)" +// guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), +// localNumber.toE164().count > 0, +// PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { +// OWSAlerts.showAlert(title: +// NSLocalizedString("REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE", +// comment: "Title of alert indicating that users needs to enter a valid phone number to register."), +// message: +// NSLocalizedString("REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE", +// comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) +// return +// } +// let e164PhoneNumber = localNumber.toE164() +// +// onboardingController.update(phoneNumber: OnboardingPhoneNumber(e164: e164PhoneNumber, userInput: phoneNumberText)) +// +// if UIDevice.current.isIPad { +// OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", +// comment: "alert title when registering an iPad"), +// message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", +// comment: "alert body when registering an iPad"), +// proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", +// comment: "button text to proceed with registration when on an iPad"), +// proceedAction: { (_) in +// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) +// }) +// } else { +// onboardingController.tryToRegister(fromViewController: self, smsVerification: false) +// } +// } + + // MARK: - Events + + @objc func backLinkTapped() { + Logger.info("") + + self.navigationController?.popViewController(animated: true) + } + + @objc func ignoreEvent() { + Logger.info("") + } + + @objc func resendCodeLinkTapped() { + Logger.info("") + + // TODO: +// self.navigationController?.popViewController(animated: true) + } +} + +//// MARK: - +// +//extension OnboardingVerificationViewController: UITextFieldDelegate { +// public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { +// // TODO: Fix auto-format of phone numbers. +// ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) +// +// // Inform our caller that we took care of performing the change. +// return false +// } +// +// public func textFieldShouldReturn(_ textField: UITextField) -> Bool { +// parseAndTryToRegister() +// return false +// } +//} +// +//// MARK: - +// +//extension OnboardingVerificationViewController: CountryCodeViewControllerDelegate { +// public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { +// guard countryCode.count > 0 else { +// owsFailDebug("Invalid country code.") +// return +// } +// guard countryName.count > 0 else { +// owsFailDebug("Invalid country name.") +// return +// } +// guard callingCode.count > 0 else { +// owsFailDebug("Invalid calling code.") +// return +// } +// +// let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) +// +// onboardingController.update(countryState: countryState) +// +// updateState() +// +// // Trigger the formatting logic with a no-op edit. +// _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") +// } +//} diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 9c80faccb..eb6c9dbb8 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1535,6 +1535,12 @@ /* Title of the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +/* Label for the link that lets users change their phone number. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_FORMAT" = "Enter the code we sent to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Settings"; @@ -1835,12 +1841,24 @@ /* Title of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE" = "Invalid Phone Number"; +/* Message of alert indicating that users needs to enter a valid phone number to register. */ +"REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE" = "REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE"; + +/* Title of alert indicating that users needs to enter a valid phone number to register. */ +"REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE" = "REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE"; + /* Message of alert indicating that users needs to enter a phone number to register. */ "REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a phone number to register."; /* Title of alert indicating that users needs to enter a phone number to register. */ "REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "No Phone Number"; +/* Message of alert indicating that users needs to enter a phone number to register. */ +"REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE" = "REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE"; + +/* Title of alert indicating that users needs to enter a phone number to register. */ +"REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE" = "REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE"; + /* notification action */ "REJECT_CALL_BUTTON_TITLE" = "Reject"; From 1f922aa478bd0d27226f8ec2f276510d4a1d03fc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 14:19:12 -0500 Subject: [PATCH 053/493] Sketch out the 'onboarding code verification' view. --- .../OnboardingCaptchaViewController.swift | 2 +- .../OnboardingPhoneNumberViewController.swift | 4 +- ...OnboardingVerificationViewController.swift | 689 ++++++++++-------- .../translations/en.lproj/Localizable.strings | 41 +- SignalMessaging/Views/OWSFlatButton.swift | 9 +- SignalMessaging/categories/UIFont+OWS.h | 1 + SignalMessaging/categories/UIFont+OWS.m | 6 + SignalServiceKit/src/Util/String+SSK.swift | 14 + 8 files changed, 448 insertions(+), 318 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 9f1f60103..aace0845b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -114,7 +114,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { } onboardingController.update(captchaToken: captchaToken) - onboardingController.tryToRegister(fromViewController: self, smsVerification: false) + onboardingController.tryToRegister(fromViewController: self, smsVerification: true) } private func parseCaptcha(url: URL) -> String? { diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index b3820df34..9ea1f70c6 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -368,10 +368,10 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in - self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) + self.onboardingController.tryToRegister(fromViewController: self, smsVerification: true) }) } else { - onboardingController.tryToRegister(fromViewController: self, smsVerification: false) + onboardingController.tryToRegister(fromViewController: self, smsVerification: true) } } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index bba81af9b..31c7f1b36 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -5,79 +5,264 @@ import UIKit import PromiseKit -private class OnboardingCodeView: UIView { +private protocol OnboardingCodeViewTextFieldDelegate { + func textFieldDidDeletePrevious() } +// MARK: - + +// Editing a code should feel seamless, as even though +// the UITextField only lets you edit a single digit at +// a time. For deletes to work properly, we need to +// detect delete events that would affect the _previous_ +// digit. +private class OnboardingCodeViewTextField: UITextField { + + fileprivate var codeDelegate: OnboardingCodeViewTextFieldDelegate? + + override func deleteBackward() { + var isDeletePrevious = false + if let selectedTextRange = selectedTextRange { + let cursorPosition = offset(from: beginningOfDocument, to: selectedTextRange.start) + if cursorPosition == 0 { + isDeletePrevious = true + } + } + + super.deleteBackward() + + if isDeletePrevious { + codeDelegate?.textFieldDidDeletePrevious() + } + } + +} + +// MARK: - + +protocol OnboardingCodeViewDelegate { + func codeViewDidChange() +} + +// MARK: - + +// The OnboardingCodeView is a special "verification code" +// editor that should feel like editing a single piece +// of text (ala UITextField) even though the individual +// digits of the code are visually separated. +// +// We use a separate UILabel for each digit, and move +// around a single UITextfield to let the user edit the +// last/next digit. +private class OnboardingCodeView: UIView { + + var delegate: OnboardingCodeViewDelegate? + + public init() { + super.init(frame: .zero) + + createSubviews() + + updateViewState() + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + private let digitCount = 6 + private var digitLabels = [UILabel]() + + // We use a single text field to edit the "current" digit. + // The "current" digit is usually the "last" + fileprivate let textfield = OnboardingCodeViewTextField() + private var currentDigitIndex = 0 + private var textfieldConstraints = [NSLayoutConstraint]() + + // The current complete text - the "model" for this view. + private var digitText = "" + + var isComplete: Bool { + return digitText.count == digitCount + } + + private func createSubviews() { + textfield.textAlignment = .left + textfield.delegate = self + textfield.keyboardType = .numberPad + textfield.textColor = Theme.primaryColor + textfield.font = UIFont.ows_dynamicTypeLargeTitle1Clamped + textfield.codeDelegate = self + + var digitViews = [UIView]() + (0.. (UIView, UILabel) { + let digitView = UIView() + + let digitLabel = UILabel() + digitLabel.text = text + digitLabel.font = UIFont.ows_dynamicTypeLargeTitle1Clamped + digitLabel.textColor = Theme.primaryColor + digitLabel.textAlignment = .center + digitView.addSubview(digitLabel) + digitLabel.autoCenterInSuperview() + + if hasStroke { + let strokeView = UIView.container() + strokeView.backgroundColor = Theme.primaryColor + digitView.addSubview(strokeView) + strokeView.autoPinWidthToSuperview() + strokeView.autoPinEdge(toSuperviewEdge: .bottom) + strokeView.autoSetDimension(.height, toSize: 1) + } + + let vMargin: CGFloat = 4 + let cellHeight: CGFloat = digitLabel.font.lineHeight + vMargin * 2 + let cellWidth: CGFloat = cellHeight * 2 / 3 + digitView.autoSetDimensions(to: CGSize(width: cellWidth, height: cellHeight)) + + return (digitView, digitLabel) + } + + private func digit(at index: Int) -> String { + guard index < digitText.count else { + return "" + } + return digitText.substring(from: index).trim(after: 1) + } + + // Ensure that all labels are displaying the correct + // digit (if any) and that the UITextField has replaced + // the "current" digit. + private func updateViewState() { + currentDigitIndex = min(digitCount - 1, + digitText.count) + + (0.. Bool { + return textfield.becomeFirstResponder() + } +} + +// MARK: - + +extension OnboardingCodeView: UITextFieldDelegate { + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString newString: String) -> Bool { + var oldText = "" + if let textFieldText = textField.text { + oldText = textFieldText + } + let left = oldText.substring(to: range.location) + let right = oldText.substring(from: range.location + range.length) + let unfiltered = left + newString + right + let characterSet = CharacterSet(charactersIn: "0123456789") + let filtered = unfiltered.components(separatedBy: characterSet.inverted).joined() + let filteredAndTrimmed = filtered.trim(after: 1) + textField.text = filteredAndTrimmed + + digitText = digitText.trim(after: currentDigitIndex) + filteredAndTrimmed + + updateViewState() + + // Inform our caller that we took care of performing the change. + return false + } + + public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + return false + } +} + +// MARK: - + +extension OnboardingCodeView: OnboardingCodeViewTextFieldDelegate { + public func textFieldDidDeletePrevious() { + guard digitText.count > 0 else { + return + } + digitText = digitText.substring(to: currentDigitIndex - 1) + + updateViewState() + } +} + +// MARK: - + @objc public class OnboardingVerificationViewController: OnboardingBaseViewController { -// // MARK: - Dependencies -// -// private var tsAccountManager: TSAccountManager { -// return TSAccountManager.sharedInstance() -// } + private enum CodeState { + case pending + case possiblyNotDelivered + case resent + } // MARK: - + private var codeState = CodeState.pending + + private var titleLabel: UILabel? private let phoneNumberTextField = UITextField() -// private var nextButton: OWSFlatButton? - private var resendCodeLabel: OWSFlatButton? - private var resendCodeLink: OWSFlatButton? + private let onboardingCodeView = OnboardingCodeView() + private var codeStateLink: OWSFlatButton? override public func loadView() { super.loadView() -// populateDefaults() - view.backgroundColor = Theme.backgroundColor view.layoutMargins = .zero - var e164PhoneNumber = "" - if let phoneNumber = onboardingController.phoneNumber { - e164PhoneNumber = phoneNumber.e164 - } - let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: e164PhoneNumber) - let titleText = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_FORMAT", - comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), - formattedPhoneNumber) - let titleLabel = self.titleLabel(text: titleText) + let titleLabel = self.titleLabel(text: "") + self.titleLabel = titleLabel let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", comment: "Label for the link that lets users change their phone number."), selector: #selector(backLinkTapped)) - let onboardingCodeView = OnboardingCodeView() - onboardingCodeView.addRedBorder() - -// resendCodeLabel.text = NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", -// comment: "Label for the link that lets users change their phone number."), -// resendCodeLabel.text = "TODO" -// resendCodeLabel.textColor = Theme.secondaryColor -// resendCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped - - // TODO: Copy. - let resendCodeLabel = disabledLinkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_LINK", - comment: "Label for the link that lets users request another verification code."), - selector: #selector(ignoreEvent)) - self.resendCodeLabel = resendCodeLabel - - let resendCodeLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_LINK", - comment: "Label for the link that lets users request another verification code."), + let codeStateLink = self.linkButton(title: "", selector: #selector(resendCodeLinkTapped)) - self.resendCodeLink = resendCodeLink + codeStateLink.enableMultilineLabel() + self.codeStateLink = codeStateLink - let resentCodeWrapper = UIView.container() - resentCodeWrapper.addSubview(resendCodeLabel) - resentCodeWrapper.addSubview(resendCodeLink) - resendCodeLabel.autoPinEdgesToSuperviewEdges() - resendCodeLink.autoPinEdgesToSuperviewEdges() - - // TODO: Finalize copy. - -// let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", -// comment: "Label for the 'next' button."), -// selector: #selector(nextPressed)) -// self.nextButton = nextButton let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() @@ -87,11 +272,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController backLink, topSpacer, onboardingCodeView, -// countryRow, -// UIView.spacer(withHeight: 8), -// phoneNumberRow, bottomSpacer, - resentCodeWrapper + codeStateLink ]) stackView.axis = .vertical stackView.alignment = .fill @@ -104,209 +286,122 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController // Ensure whitespace is balanced, so inputs are vertically centered. topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + + startCodeCountdown() + + updateCodeState() } -// private func addBottomStroke(_ view: UIView) { -// let strokeView = UIView() -// strokeView.backgroundColor = Theme.middleGrayColor -// view.addSubview(strokeView) -// strokeView.autoSetDimension(.height, toSize: CGHairlineWidth()) -// strokeView.autoPinWidthToSuperview() -// strokeView.autoPinEdge(toSuperviewEdge: .bottom) -// } -// -// public override func viewDidAppear(_ animated: Bool) { -// super.viewDidAppear(animated) -// -// phoneNumberTextField.becomeFirstResponder() -// -// if tsAccountManager.isReregistering() { -// // If re-registering, pre-populate the country (country code, calling code, country name) -// // and phone number state. -// guard let phoneNumberE164 = tsAccountManager.reregisterationPhoneNumber() else { -// owsFailDebug("Could not resume re-registration; missing phone number.") -// return -// } -// tryToReregister(phoneNumberE164: phoneNumberE164) -// } -// } -// -// private func tryToReregister(phoneNumberE164: String) { -// guard phoneNumberE164.count > 0 else { -// owsFailDebug("Could not resume re-registration; invalid phoneNumberE164.") -// return -// } -// guard let parsedPhoneNumber = PhoneNumber(fromE164: phoneNumberE164) else { -// owsFailDebug("Could not resume re-registration; couldn't parse phoneNumberE164.") -// return -// } -// guard let callingCodeNumeric = parsedPhoneNumber.getCountryCode() else { -// owsFailDebug("Could not resume re-registration; missing callingCode.") -// return -// } -// let callingCode = "\(COUNTRY_CODE_PREFIX)\(callingCodeNumeric)" -// let countryCodes: [String] = -// PhoneNumberUtil.sharedThreadLocal().countryCodes(fromCallingCode: callingCode) -// guard let countryCode = countryCodes.first else { -// owsFailDebug("Could not resume re-registration; unknown countryCode.") -// return -// } -// guard let countryName = PhoneNumberUtil.countryName(fromCountryCode: countryCode) else { -// owsFailDebug("Could not resume re-registration; unknown countryName.") -// return -// } -// if !phoneNumberE164.hasPrefix(callingCode) { -// owsFailDebug("Could not resume re-registration; non-matching calling code.") -// return -// } -// let phoneNumberWithoutCallingCode = phoneNumberE164.substring(from: callingCode.count) -// -// guard countryCode.count > 0 else { -// owsFailDebug("Invalid country code.") -// return -// } -// guard countryName.count > 0 else { -// owsFailDebug("Invalid country name.") -// return -// } -// guard callingCode.count > 0 else { -// owsFailDebug("Invalid calling code.") -// return -// } -// -// let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) -// onboardingController.update(countryState: countryState) -// -// updateState() -// -// phoneNumberTextField.text = phoneNumberWithoutCallingCode -// // Don't let user edit their phone number while re-registering. -// phoneNumberTextField.isEnabled = false -// } -// -// // MARK: - -// -// private var countryName: String { -// get { -// return onboardingController.countryState.countryName -// } -// } -// private var callingCode: String { -// get { -// AssertIsOnMainThread() -// -// return onboardingController.countryState.callingCode -// } -// } -// private var countryCode: String { -// get { -// AssertIsOnMainThread() -// -// return onboardingController.countryState.countryCode -// } -// } -// -// private func populateDefaults() { -// if let lastRegisteredPhoneNumber = OnboardingController.lastRegisteredPhoneNumber(), -// lastRegisteredPhoneNumber.count > 0, -// lastRegisteredPhoneNumber.hasPrefix(callingCode) { -// phoneNumberTextField.text = lastRegisteredPhoneNumber.substring(from: callingCode.count) -// } else if let phoneNumber = onboardingController.phoneNumber { -// phoneNumberTextField.text = phoneNumber.userInput -// } -// -// updateState() -// } -// -// private func updateState() { -// AssertIsOnMainThread() -// -// countryNameLabel.text = countryName -// callingCodeLabel.text = callingCode -// -// self.phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(forCountryCode: countryCode, callingCode: callingCode) -// } -// -// // MARK: - Events -// -// @objc func countryRowTapped(sender: UIGestureRecognizer) { -// guard sender.state == .recognized else { -// return -// } -// showCountryPicker() -// } -// -// @objc func countryCodeTapped(sender: UIGestureRecognizer) { -// guard sender.state == .recognized else { -// return -// } -// showCountryPicker() -// } -// -// @objc func nextPressed() { -// Logger.info("") -// -// parseAndTryToRegister() -// } -// -// // MARK: - Country Picker -// -// private func showCountryPicker() { -// guard !tsAccountManager.isReregistering() else { -// return -// } -// -// let countryCodeController = CountryCodeViewController() -// countryCodeController.countryCodeDelegate = self -// countryCodeController.interfaceOrientationMask = .portrait -// let navigationController = OWSNavigationController(rootViewController: countryCodeController) -// self.present(navigationController, animated: true, completion: nil) -// } -// -// // MARK: - Register -// -// private func parseAndTryToRegister() { -// guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), -// phoneNumberText.count > 0 else { -// OWSAlerts.showAlert(title: -// NSLocalizedString("REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE", -// comment: "Title of alert indicating that users needs to enter a phone number to register."), -// message: -// NSLocalizedString("REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE", -// comment: "Message of alert indicating that users needs to enter a phone number to register.")) -// return -// } -// -// let phoneNumber = "\(callingCode)\(phoneNumberText)" -// guard let localNumber = PhoneNumber.tryParsePhoneNumber(fromUserSpecifiedText: phoneNumber), -// localNumber.toE164().count > 0, -// PhoneNumberValidator().isValidForRegistration(phoneNumber: localNumber) else { -// OWSAlerts.showAlert(title: -// NSLocalizedString("REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE", -// comment: "Title of alert indicating that users needs to enter a valid phone number to register."), -// message: -// NSLocalizedString("REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE", -// comment: "Message of alert indicating that users needs to enter a valid phone number to register.")) -// return -// } -// let e164PhoneNumber = localNumber.toE164() -// -// onboardingController.update(phoneNumber: OnboardingPhoneNumber(e164: e164PhoneNumber, userInput: phoneNumberText)) -// -// if UIDevice.current.isIPad { -// OWSAlerts.showConfirmationAlert(title: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_TITLE", -// comment: "alert title when registering an iPad"), -// message: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BODY", -// comment: "alert body when registering an iPad"), -// proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", -// comment: "button text to proceed with registration when on an iPad"), -// proceedAction: { (_) in -// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) -// }) -// } else { -// onboardingController.tryToRegister(fromViewController: self, smsVerification: false) -// } -// } + // MARK: - Code State + + private let countdownDuration: TimeInterval = 60 + private var codeCountdownTimer: Timer? + private var codeCountdownStart: NSDate? + + deinit { + if let codeCountdownTimer = codeCountdownTimer { + codeCountdownTimer.invalidate() + } + } + + private func startCodeCountdown() { + codeCountdownStart = NSDate() + codeCountdownTimer = Timer.weakScheduledTimer(withTimeInterval: 1, target: self, selector: #selector(codeCountdownTimerFired), userInfo: nil, repeats: true) + } + + @objc + public func codeCountdownTimerFired() { + guard let codeCountdownStart = codeCountdownStart else { + owsFailDebug("Missing codeCountdownStart.") + return + } + guard let codeCountdownTimer = codeCountdownTimer else { + owsFailDebug("Missing codeCountdownTimer.") + return + } + + let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) + + guard countdownInterval < countdownDuration else { + // Countdown complete. + codeCountdownTimer.invalidate() + self.codeCountdownTimer = nil + + if codeState != .pending { + owsFailDebug("Unexpected codeState: \(codeState)") + } + codeState = .possiblyNotDelivered + updateCodeState() + return + } + + // Update the "code state" UI to reflect the countdown. + updateCodeState() + } + + private func updateCodeState() { + AssertIsOnMainThread() + + guard let codeCountdownStart = codeCountdownStart else { + owsFailDebug("Missing codeCountdownStart.") + return + } + guard let titleLabel = titleLabel else { + owsFailDebug("Missing titleLabel.") + return + } + guard let codeStateLink = codeStateLink else { + owsFailDebug("Missing codeStateLink.") + return + } + + var e164PhoneNumber = "" + if let phoneNumber = onboardingController.phoneNumber { + e164PhoneNumber = phoneNumber.e164 + } + let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: e164PhoneNumber) + + // Update titleLabel + switch codeState { + case .pending, .possiblyNotDelivered: + titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT", + comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), + formattedPhoneNumber) + case .resent: + titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT", + comment: "Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}."), + formattedPhoneNumber) + } + + // Update codeStateLink + switch codeState { + case .pending: + let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) + let countdownRemaining = max(0, countdownDuration - countdownInterval) + let formattedCountdown = OWSFormat.formatDurationSeconds(Int(round(countdownRemaining))) + let text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT", + comment: "Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}."), + formattedCountdown) + codeStateLink.setTitle(title: text, font: .ows_dynamicTypeBodyClamped, titleColor: Theme.secondaryColor) +// codeStateLink.setBackgroundColors(upColor: Theme.backgroundColor) + case .possiblyNotDelivered: + codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK", + comment: "Label for link that can be used when the original code did not arrive."), + font: .ows_dynamicTypeBodyClamped, + titleColor: .ows_materialBlue) + case .resent: + codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK", + comment: "Label for link that can be used when the resent code did not arrive."), + font: .ows_dynamicTypeBodyClamped, + titleColor: .ows_materialBlue) + } + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + _ = onboardingCodeView.becomeFirstResponder() + } // MARK: - Events @@ -323,52 +418,44 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController @objc func resendCodeLinkTapped() { Logger.info("") - // TODO: -// self.navigationController?.popViewController(animated: true) + switch codeState { + case .pending: + // Ignore taps until the countdown expires. + break + case .possiblyNotDelivered, .resent: + showResendActionSheet() + } + } + + private func showResendActionSheet() { + Logger.info("") + + let actionSheet = UIAlertController(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE", + comment: "Title for the 'resend code' alert in the 'onboarding verification' view."), + message: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE", + comment: "Message for the 'resend code' alert in the 'onboarding verification' view."), + preferredStyle: .actionSheet) + + actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON", + comment: "Label for the 'resend code by SMS' button in the 'onboarding verification' view."), + style: .default) { _ in + self.onboardingController.tryToRegister(fromViewController: self, smsVerification: true) + }) + actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON", + comment: "Label for the 'resend code by voice' button in the 'onboarding verification' view."), + style: .default) { _ in + self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) + }) + actionSheet.addAction(OWSAlerts.cancelAction) + + self.present(actionSheet, animated: true) } } -//// MARK: - -// -//extension OnboardingVerificationViewController: UITextFieldDelegate { -// public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { -// // TODO: Fix auto-format of phone numbers. -// ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) -// -// // Inform our caller that we took care of performing the change. -// return false -// } -// -// public func textFieldShouldReturn(_ textField: UITextField) -> Bool { -// parseAndTryToRegister() -// return false -// } -//} -// -//// MARK: - -// -//extension OnboardingVerificationViewController: CountryCodeViewControllerDelegate { -// public func countryCodeViewController(_ vc: CountryCodeViewController, didSelectCountryCode countryCode: String, countryName: String, callingCode: String) { -// guard countryCode.count > 0 else { -// owsFailDebug("Invalid country code.") -// return -// } -// guard countryName.count > 0 else { -// owsFailDebug("Invalid country name.") -// return -// } -// guard callingCode.count > 0 else { -// owsFailDebug("Invalid calling code.") -// return -// } -// -// let countryState = OnboardingCountryState(countryName: countryName, callingCode: callingCode, countryCode: countryCode) -// -// onboardingController.update(countryState: countryState) -// -// updateState() -// -// // Trigger the formatting logic with a no-op edit. -// _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") -// } -//} +// MARK: - + +extension OnboardingVerificationViewController: OnboardingCodeViewDelegate { + public func codeViewDidChange() { + // TODO: + } +} diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index eb6c9dbb8..06695486d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1538,8 +1538,35 @@ /* Label for the link that lets users change their phone number. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; +/* Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for the link that lets users request another verification code. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_LINK" = "ONBOARDING_VERIFICATION_RESEND_CODE_LINK"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Settings"; @@ -1841,24 +1868,12 @@ /* Title of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE" = "Invalid Phone Number"; -/* Message of alert indicating that users needs to enter a valid phone number to register. */ -"REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE" = "REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_MESSAGE"; - -/* Title of alert indicating that users needs to enter a valid phone number to register. */ -"REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE" = "REGISTRATION_VIEW_INVALID_VERIFICATION_ALERT_TITLE"; - /* Message of alert indicating that users needs to enter a phone number to register. */ "REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a phone number to register."; /* Title of alert indicating that users needs to enter a phone number to register. */ "REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "No Phone Number"; -/* Message of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE" = "REGISTRATION_VIEW_NO_VERIFICATION_ALERT_MESSAGE"; - -/* Title of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE" = "REGISTRATION_VIEW_NO_VERIFICATION_ALERT_TITLE"; - /* notification action */ "REJECT_CALL_BUTTON_TITLE" = "Reject"; diff --git a/SignalMessaging/Views/OWSFlatButton.swift b/SignalMessaging/Views/OWSFlatButton.swift index 7337aed5d..134ccdef9 100644 --- a/SignalMessaging/Views/OWSFlatButton.swift +++ b/SignalMessaging/Views/OWSFlatButton.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -167,4 +167,11 @@ public class OWSFlatButton: UIView { internal func buttonPressed() { pressedBlock?() } + + @objc + public func enableMultilineLabel() { + button.titleLabel?.numberOfLines = 0 + button.titleLabel?.lineBreakMode = .byWordWrapping + button.titleLabel?.textAlignment = .center + } } diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h index b0bcda463..88da5beb9 100644 --- a/SignalMessaging/categories/UIFont+OWS.h +++ b/SignalMessaging/categories/UIFont+OWS.h @@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Dynamic Type Clamped +@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeLargeTitle1ClampedFont; @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle1ClampedFont; @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle2ClampedFont; @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle3ClampedFont; diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index a7a1a4451..2d13b5dc6 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -107,6 +107,7 @@ NS_ASSUME_NONNULL_BEGIN static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ maxPointSizeMap = @{ + UIFontTextStyleLargeTitle : @(40.0), UIFontTextStyleTitle1 : @(34.0), UIFontTextStyleTitle2 : @(28.0), UIFontTextStyleTitle3 : @(26.0), @@ -132,6 +133,11 @@ NS_ASSUME_NONNULL_BEGIN return font; } ++ (UIFont *)ows_dynamicTypeLargeTitle1ClampedFont +{ + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleLargeTitle]; +} + + (UIFont *)ows_dynamicTypeTitle1ClampedFont { return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleTitle1]; diff --git a/SignalServiceKit/src/Util/String+SSK.swift b/SignalServiceKit/src/Util/String+SSK.swift index b3bdca923..6312dd677 100644 --- a/SignalServiceKit/src/Util/String+SSK.swift +++ b/SignalServiceKit/src/Util/String+SSK.swift @@ -5,6 +5,10 @@ import Foundation public extension String { + public var digitsOnly: String { + return (self as NSString).digitsOnly() + } + func rtlSafeAppend(_ string: String) -> String { return (self as NSString).rtlSafeAppend(string) } @@ -12,4 +16,14 @@ public extension String { public func substring(from index: Int) -> String { return String(self[self.index(self.startIndex, offsetBy: index)...]) } + + public func substring(to index: Int) -> String { + return String(self[.. String { + let index = min(maxCount, self.count) + return substring(to: index) + } } From efe5513c4e9fe1f2ceb1026daa7b41c10b267961 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 14:56:32 -0500 Subject: [PATCH 054/493] Sketch out the 'onboarding code verification' view. --- .../OnboardingBaseViewController.swift | 4 + .../Registration/OnboardingController.swift | 153 +++++++++++++++++- ...OnboardingVerificationViewController.swift | 22 ++- .../src/Account/TSAccountManager.h | 2 + 4 files changed, 179 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index ac9125a27..79bffb0c2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -82,6 +82,8 @@ public class OnboardingBaseViewController: OWSViewController { super.viewWillAppear(animated) self.navigationController?.isNavigationBarHidden = true + // Disable "back" gesture. + self.navigationController?.navigationItem.backBarButtonItem?.isEnabled = false // TODO: Is there a better way to do this? if let navigationController = self.navigationController as? OWSNavigationController { @@ -95,6 +97,8 @@ public class OnboardingBaseViewController: OWSViewController { super.viewDidAppear(animated) self.navigationController?.isNavigationBarHidden = true + // Disable "back" gesture. + self.navigationController?.navigationItem.backBarButtonItem?.isEnabled = false } // MARK: - Orientation diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 5909cd674..e500f393f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -66,6 +66,14 @@ public class OnboardingController: NSObject { return TSAccountManager.sharedInstance() } + private var accountManager: AccountManager { + return AppEnvironment.shared.accountManager + } + + private var backup: OWSBackup { + return AppEnvironment.shared.backup + } + // MARK: - @objc @@ -148,6 +156,97 @@ public class OnboardingController: NSObject { navigationController.pushViewController(view, animated: true) } + @objc + public func verificationDidComplete(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + if tsAccountManager.isReregistering() { + showProfileView(fromView: view) + } else { + checkCanImportBackup(fromView: view) + } + } + + private func showProfileView(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + guard let navigationController = view.navigationController else { + owsFailDebug("Missing navigationController") + return + } + + ProfileViewController.present(forRegistration: navigationController) + } + + private func showBackupRestoreView(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + guard let navigationController = view.navigationController else { + owsFailDebug("Missing navigationController") + return + } + + let restoreView = BackupRestoreViewController() + navigationController.setViewControllers([restoreView], animated: true) + } + + private func checkCanImportBackup(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + self.backup.checkCanImport({ (canImport) in + Logger.info("canImport: \(canImport)") + + if (canImport) { + self.backup.setHasPendingRestoreDecision(true) + + self.showBackupRestoreView(fromView: view) + } else { + self.showProfileView(fromView: view) + } + }) { (_) in + self.showBackupCheckFailedAlert(fromView: view) + } + } + + private func showBackupCheckFailedAlert(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + let alert = UIAlertController(title: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_TITLE", + comment: "Title for alert shown when the app failed to check for an existing backup."), + message: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_MESSAGE", + comment: "Message for alert shown when the app failed to check for an existing backup."), + preferredStyle: .alert) + alert.addAction(UIAlertAction(title: NSLocalizedString("REGISTER_FAILED_TRY_AGAIN", comment: ""), + style: .default) { (_) in + self.checkCanImportBackup(fromView: view) + }) + alert.addAction(UIAlertAction(title: NSLocalizedString("CHECK_FOR_BACKUP_DO_NOT_RESTORE", comment: "The label for the 'do not restore backup' button."), + style: .destructive) { (_) in + self.showProfileView(fromView: view) + }) + view.present(alert, animated: true) + } + + public func onboardingDidRequire2FAPin(viewController: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + // TODO: +// let view = OnboardingCaptchaViewController(onboardingController: self) +// navigationController.pushViewController(view, animated: true) + } + // MARK: - State public private(set) var countryState: OnboardingCountryState = .defaultValue @@ -276,7 +375,6 @@ public class OnboardingController: NSObject { Logger.info("Captcha requested.") onboardingDidRequireCaptcha(viewController: viewController) - return } else if error.code == 400 { OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_ERROR", comment: ""), message: NSLocalizedString("REGISTRATION_NON_VALID_NUMBER", comment: "")) @@ -286,4 +384,57 @@ public class OnboardingController: NSObject { message: error.localizedRecoverySuggestion) } } + + // MARK: - Verification + + public func tryToVerify(fromViewController: UIViewController, + verificationCode: String, + pin: String?) { + AssertIsOnMainThread() + + guard let phoneNumber = phoneNumber else { + owsFailDebug("Missing phoneNumber.") + return + } + + // Ensure the account manager state is up-to-date. + // + // TODO: We could skip this in production. + tsAccountManager.phoneNumberAwaitingVerification = phoneNumber.e164 + + ModalActivityIndicatorViewController.present(fromViewController: fromViewController, + canCancel: true) { (modal) in + + self.accountManager.register(verificationCode: verificationCode, pin: pin) + .done { (_) in + DispatchQueue.main.async { + modal.dismiss(completion: { + self.verificationDidComplete(fromView: fromViewController) + }) + } + }.catch({ (error) in + Logger.error("Error: \(error)") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.verificationFailed(fromViewController: fromViewController, error: error as NSError) + }) + } + }).retainUntilComplete() + } + } + + private func verificationFailed(fromViewController: UIViewController, error: NSError) { + if error.domain == OWSSignalServiceKitErrorDomain && + error.code == OWSErrorCode.registrationMissing2FAPIN.rawValue { + + Logger.info("Missing 2FA PIN.") + + onboardingDidRequire2FAPin(viewController: fromViewController) + } else { + OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VERIFICATION_FAILED_TITLE", comment: "Alert view title"), + message: error.localizedDescription, + fromViewController: fromViewController) + } + } } diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 31c7f1b36..471e000f9 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -85,6 +85,9 @@ private class OnboardingCodeView: UIView { var isComplete: Bool { return digitText.count == digitCount } + var verificationCode: String { + return digitText + } private func createSubviews() { textfield.textAlignment = .left @@ -203,11 +206,15 @@ extension OnboardingCodeView: UITextFieldDelegate { updateViewState() + self.delegate?.codeViewDidChange() + // Inform our caller that we took care of performing the change. return false } public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + self.delegate?.codeViewDidChange() + return false } } @@ -258,6 +265,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController comment: "Label for the link that lets users change their phone number."), selector: #selector(backLinkTapped)) + onboardingCodeView.delegate = self + let codeStateLink = self.linkButton(title: "", selector: #selector(resendCodeLinkTapped)) codeStateLink.enableMultilineLabel() @@ -450,12 +459,23 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController self.present(actionSheet, animated: true) } + + private func tryToVerify() { + Logger.info("") + + guard onboardingCodeView.isComplete else { + return + } + onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil) + } } // MARK: - extension OnboardingVerificationViewController: OnboardingCodeViewDelegate { public func codeViewDidChange() { - // TODO: + AssertIsOnMainThread() + + tryToVerify() } } diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h index a2aff043e..1f0baf7b5 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.h +++ b/SignalServiceKit/src/Account/TSAccountManager.h @@ -32,6 +32,8 @@ typedef NS_ENUM(NSUInteger, OWSRegistrationState) { @property (nonatomic, nullable) NSString *phoneNumberAwaitingVerification; #endif +- (void)setPhoneNumberAwaitingVerification:(NSString *_Nullable)phoneNumberAwaitingVerification; + #pragma mark - Initializers - (instancetype)init NS_UNAVAILABLE; From c2b2d38f24356bd74cde2b01ac2d2e2f10730647 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 14:58:06 -0500 Subject: [PATCH 055/493] Sketch out the 'onboarding code verification' view. --- .../ViewControllers/HomeView/HomeViewController.m | 13 ------------- .../Registration/OnboardingBaseViewController.swift | 4 ---- Signal/translations/en.lproj/Localizable.strings | 3 --- 3 files changed, 20 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 88eb9f6f0..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,19 +482,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - OnboardingController *onboardingController = [OnboardingController new]; - [onboardingController - updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - - // UIViewController *view = [onboardingController initialViewController]; - UIViewController *view = - [[OnboardingVerificationViewController alloc] initWithOnboardingController:onboardingController]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:view]; - [self presentViewController:navigationController animated:YES completion:nil]; - }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 79bffb0c2..7ed43e10a 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -57,10 +57,6 @@ public class OnboardingBaseViewController: OWSViewController { return button(title: title, selector: selector, titleColor: .ows_materialBlue, backgroundColor: .white) } - func disabledLinkButton(title: String, selector: Selector) -> OWSFlatButton { - return self.button(title: title, selector: selector, titleColor: Theme.secondaryColor, backgroundColor: .white) - } - private func button(title: String, selector: Selector, titleColor: UIColor, backgroundColor: UIColor) -> OWSFlatButton { // TODO: Make sure this all fits if dynamic font sizes are maxed out. let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 06695486d..a8bce1482 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1556,9 +1556,6 @@ /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; -/* Label for the link that lets users request another verification code. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_LINK" = "ONBOARDING_VERIFICATION_RESEND_CODE_LINK"; - /* Label for link that can be used when the resent code did not arrive. */ "ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; From 854a75ae65b53aa302734cf414858d14ad74c463 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 14:59:46 -0500 Subject: [PATCH 056/493] Sketch out the 'onboarding code verification' view. --- .../Registration/OnboardingVerificationViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 471e000f9..eb322987c 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -277,7 +277,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController let stackView = UIStackView(arrangedSubviews: [ titleLabel, - UIView.spacer(withHeight: 21), + UIView.spacer(withHeight: 12), backLink, topSpacer, onboardingCodeView, From b4aec587956fffa966936471d5f9b21a24322ec0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 15:03:20 -0500 Subject: [PATCH 057/493] Sketch out the 'onboarding code verification' view. --- .../Registration/OnboardingVerificationViewController.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index eb322987c..f5e64af43 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -420,10 +420,6 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController self.navigationController?.popViewController(animated: true) } - @objc func ignoreEvent() { - Logger.info("") - } - @objc func resendCodeLinkTapped() { Logger.info("") From 6c08f98fbbc4268541a2694c0e2cec822b6ba8fd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Feb 2019 18:36:45 -0700 Subject: [PATCH 058/493] replying to notification marks thread as read --- .../Notifications/AppNotifications.swift | 32 ++++++++++--------- .../src/Util/YapDatabase+Promise.swift | 20 ++++++++++++ 2 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 SignalServiceKit/src/Util/YapDatabase+Promise.swift diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 9f957e0cf..afe1ebc6b 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -613,15 +613,7 @@ class NotificationActionHandler { throw NotificationError.failDebug("unable to find thread with id: \(threadId)") } - return Promise { resolver in - self.dbConnection.asyncReadWrite({ transaction in - thread.markAllAsRead(with: transaction) - }, - completionBlock: { - self.notificationPresenter.cancelNotifications(threadId: threadId) - resolver.fulfill(()) - }) - } + return markAsRead(thread: thread) } func reply(userInfo: [AnyHashable: Any], replyText: String) throws -> Promise { @@ -633,12 +625,16 @@ class NotificationActionHandler { throw NotificationError.failDebug("unable to find thread with id: \(threadId)") } - return ThreadUtil.sendMessageNonDurably(text: replyText, - thread: thread, - quotedReplyModel: nil, - messageSender: messageSender).recover { error in - Logger.warn("Failed to send reply message from notification with error: \(error)") - self.notificationPresenter.notifyForFailedSend(inThread: thread) + return markAsRead(thread: thread).then { () -> Promise in + let sendPromise = ThreadUtil.sendMessageNonDurably(text: replyText, + thread: thread, + quotedReplyModel: nil, + messageSender: self.messageSender) + + return sendPromise.recover { error in + Logger.warn("Failed to send reply message from notification with error: \(error)") + self.notificationPresenter.notifyForFailedSend(inThread: thread) + } } } @@ -654,6 +650,12 @@ class NotificationActionHandler { signalApp.presentConversation(forThreadId: threadId, animated: shouldAnimate) return Promise.value(()) } + + private func markAsRead(thread: TSThread) -> Promise { + return dbConnection.readWritePromise { transaction in + thread.markAllAsRead(with: transaction) + } + } } extension ThreadUtil { diff --git a/SignalServiceKit/src/Util/YapDatabase+Promise.swift b/SignalServiceKit/src/Util/YapDatabase+Promise.swift new file mode 100644 index 000000000..2fe3351a2 --- /dev/null +++ b/SignalServiceKit/src/Util/YapDatabase+Promise.swift @@ -0,0 +1,20 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import PromiseKit + +public extension YapDatabaseConnection { + + @objc + func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> AnyPromise { + return AnyPromise(readWritePromise(block) as Promise) + } + + func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> Promise { + return Promise { resolver in + self.asyncReadWrite(block, completionBlock: resolver.fulfill) + } + } +} From 1844bdbebf7e450feb324ae9e7d942f4cd743f65 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 17:16:35 -0700 Subject: [PATCH 059/493] update pods --- Pods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pods b/Pods index 30865575d..434610837 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 30865575d8f4ef74dc51e5bde3eab1cf7d458784 +Subproject commit 434610837e73668d186716fd2e5b8913c84ef46a From 0d5f9e01034041ee3c96df4f485f481e4fa5b994 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 17:18:46 -0700 Subject: [PATCH 060/493] Disable UserNotifications for this release --- Signal/src/UserInterface/Notifications/AppNotifications.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index afe1ebc6b..280c250fc 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -137,7 +137,8 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { @objc public override init() { - if #available(iOS 10, *) { + let userNotificationsFeatureEnabled = false + if userNotificationsFeatureEnabled, #available(iOS 10, *) { self.adaptee = UserNotificationPresenterAdaptee() } else { self.adaptee = LegacyNotificationPresenterAdaptee() From 4aaac90d3166c1ca3a7718588419ed3b54fbd10c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 17:26:14 -0700 Subject: [PATCH 061/493] sync translations --- Signal/translations/fi.lproj/Localizable.strings | 2 +- Signal/translations/fr.lproj/Localizable.strings | 4 ++-- Signal/translations/hu.lproj/Localizable.strings | 2 +- Signal/translations/pl.lproj/Localizable.strings | 4 ++-- Signal/translations/ru.lproj/Localizable.strings | 10 +++++----- Signal/translations/sl.lproj/Localizable.strings | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 6746a2de9..a53ef464f 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Etsi yhteystietoja puhelinnumerolla"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Muistutus itselleni"; +"NOTE_TO_SELF" = "Viestit itselleni"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Olet saattanut saada uusia viestejä sillä aikaa, kun %@:si uudelleenkäynnistyi."; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index dc8596246..77fbab320 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -342,7 +342,7 @@ "CALL_USER_ALERT_CALL_BUTTON" = "Appeler"; /* Message format for alert offering to call a user. Embeds {{the user's display name or phone number}}. */ -"CALL_USER_ALERT_MESSAGE_FORMAT" = "Souhaitez-vous appeler%@ ?"; +"CALL_USER_ALERT_MESSAGE_FORMAT" = "Souhaitez-vous appeler %@ ?"; /* Title for alert offering to call a user. */ "CALL_USER_ALERT_TITLE" = "Appeler ?"; @@ -1006,7 +1006,7 @@ "GIF_VIEW_SEARCH_ERROR" = "Erreur. Touchez pour ressayer."; /* Indicates that the user's search had no results. */ -"GIF_VIEW_SEARCH_NO_RESULTS" = "Aucun résultat"; +"GIF_VIEW_SEARCH_NO_RESULTS" = "Il n’y a aucun résultat."; /* Placeholder text for the search field in GIF view */ "GIF_VIEW_SEARCH_PLACEHOLDER_TEXT" = "Saisir votre recherche"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index c3ba0ca62..dbed66afb 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Kontaktok keresése telefonszám alapján"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Privát feljegyzés"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "You may have received messages while your %@ was restarting."; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index a8bb1485c..fbf2fafe9 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -183,7 +183,7 @@ "BACKUP_EXPORT_ERROR_INVALID_CLOUDKIT_RESPONSE" = "Nieprawidłowa odpowiedź serwera"; /* Indicates that the cloud is being cleaned up. */ -"BACKUP_EXPORT_PHASE_CLEAN_UP" = "Czyszczenie kopii zapasowych"; +"BACKUP_EXPORT_PHASE_CLEAN_UP" = "Czyszczenie kopii zapasowej"; /* Indicates that the backup export is being configured. */ "BACKUP_EXPORT_PHASE_CONFIGURATION" = "Uruchamianie kopii zapasowej"; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Odszukaj kontakty po numerze telefonu"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Uwaga dla siebie"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Możliwe, że otrzymałeś wiadomości podczas restartowania %@."; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index bafd00db1..d83eccb1a 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Требуется доступ к микрофону"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Входящий вызов"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Позвонить"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Пропущенный вызов по причине изменения кода безопасности звонящего."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Пропущенный вызов"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Нет ответа"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Участники"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ в %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Дайте имя этой группе"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Отправить"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Ваше сообщение не было отправлено."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Ошибка отправки приглашения, пожалуйста, повторить попытку."; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 28b0d0f18..5b68433ff 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Poišči stike z vnosom telefonske številke"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Sporočilo sebi"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Možno je, da ste med ponovnim zagonom naprave %@ prejeli kakšno sporočilo."; From 35f79c1e9f6d4037e007f35b26eac655efe497d9 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 17:26:24 -0700 Subject: [PATCH 062/493] "Bump build to 2.36.0.7." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 148d4a7e4..4e0aaaa44 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.36.0.6 + 2.36.0.7 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 244a828ca..a4b9ea1c7 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.36.0 CFBundleVersion - 2.36.0.6 + 2.36.0.7 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From e1dc534fe69cbb40ae2f6dfe198942d45f7365dc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Feb 2019 09:52:09 -0500 Subject: [PATCH 063/493] Respond to CR. --- .../Registration/OnboardingController.swift | 6 ++-- ...OnboardingVerificationViewController.swift | 35 +++++++++---------- SignalServiceKit/src/Util/String+SSK.swift | 8 +---- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index e500f393f..000cce21f 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -201,7 +201,7 @@ public class OnboardingController: NSObject { Logger.info("") - self.backup.checkCanImport({ (canImport) in + backup.checkCanImport({ (canImport) in Logger.info("canImport: \(canImport)") if (canImport) { @@ -211,9 +211,9 @@ public class OnboardingController: NSObject { } else { self.showProfileView(fromView: view) } - }) { (_) in + }, failure: { (_) in self.showBackupCheckFailedAlert(fromView: view) - } + }) } private func showBackupCheckFailedAlert(fromView view: UIViewController) { diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index f5e64af43..751aa2d8b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -152,7 +152,7 @@ private class OnboardingCodeView: UIView { guard index < digitText.count else { return "" } - return digitText.substring(from: index).trim(after: 1) + return digitText.substring(from: index).substring(to: 1) } // Ensure that all labels are displaying the correct @@ -199,10 +199,10 @@ extension OnboardingCodeView: UITextFieldDelegate { let unfiltered = left + newString + right let characterSet = CharacterSet(charactersIn: "0123456789") let filtered = unfiltered.components(separatedBy: characterSet.inverted).joined() - let filteredAndTrimmed = filtered.trim(after: 1) + let filteredAndTrimmed = filtered.substring(to: 1) textField.text = filteredAndTrimmed - digitText = digitText.trim(after: currentDigitIndex) + filteredAndTrimmed + digitText = digitText.substring(to: currentDigitIndex) + filteredAndTrimmed updateViewState() @@ -238,14 +238,14 @@ extension OnboardingCodeView: OnboardingCodeViewTextFieldDelegate { public class OnboardingVerificationViewController: OnboardingBaseViewController { private enum CodeState { - case pending - case possiblyNotDelivered + case sent + case readyForResend case resent } // MARK: - - private var codeState = CodeState.pending + private var codeState = CodeState.sent private var titleLabel: UILabel? private let phoneNumberTextField = UITextField() @@ -308,14 +308,12 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController private var codeCountdownStart: NSDate? deinit { - if let codeCountdownTimer = codeCountdownTimer { - codeCountdownTimer.invalidate() - } + codeCountdownTimer?.invalidate() } private func startCodeCountdown() { codeCountdownStart = NSDate() - codeCountdownTimer = Timer.weakScheduledTimer(withTimeInterval: 1, target: self, selector: #selector(codeCountdownTimerFired), userInfo: nil, repeats: true) + codeCountdownTimer = Timer.weakScheduledTimer(withTimeInterval: 0.25, target: self, selector: #selector(codeCountdownTimerFired), userInfo: nil, repeats: true) } @objc @@ -336,10 +334,10 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController codeCountdownTimer.invalidate() self.codeCountdownTimer = nil - if codeState != .pending { + if codeState != .sent { owsFailDebug("Unexpected codeState: \(codeState)") } - codeState = .possiblyNotDelivered + codeState = .readyForResend updateCodeState() return } @@ -372,7 +370,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController // Update titleLabel switch codeState { - case .pending, .possiblyNotDelivered: + case .sent, .readyForResend: titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT", comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), formattedPhoneNumber) @@ -384,16 +382,15 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController // Update codeStateLink switch codeState { - case .pending: + case .sent: let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) let countdownRemaining = max(0, countdownDuration - countdownInterval) let formattedCountdown = OWSFormat.formatDurationSeconds(Int(round(countdownRemaining))) let text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT", - comment: "Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}."), + comment: "Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}."), formattedCountdown) codeStateLink.setTitle(title: text, font: .ows_dynamicTypeBodyClamped, titleColor: Theme.secondaryColor) -// codeStateLink.setBackgroundColors(upColor: Theme.backgroundColor) - case .possiblyNotDelivered: + case .readyForResend: codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK", comment: "Label for link that can be used when the original code did not arrive."), font: .ows_dynamicTypeBodyClamped, @@ -424,10 +421,10 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController Logger.info("") switch codeState { - case .pending: + case .sent: // Ignore taps until the countdown expires. break - case .possiblyNotDelivered, .resent: + case .readyForResend, .resent: showResendActionSheet() } } diff --git a/SignalServiceKit/src/Util/String+SSK.swift b/SignalServiceKit/src/Util/String+SSK.swift index 6312dd677..3b6684c5e 100644 --- a/SignalServiceKit/src/Util/String+SSK.swift +++ b/SignalServiceKit/src/Util/String+SSK.swift @@ -18,12 +18,6 @@ public extension String { } public func substring(to index: Int) -> String { - return String(self[.. String { - let index = min(maxCount, self.count) - return substring(to: index) + return String(prefix(index)) } } From e3946e57793544aec7909b30a6a77973da23958d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 15:43:32 -0500 Subject: [PATCH 064/493] Sketch out the 'onboarding code verification' view. --- .../Registration/OnboardingController.swift | 18 +++++-- .../OnboardingPhoneNumberViewController.swift | 1 + ...OnboardingVerificationViewController.swift | 52 ++++++++++++++++--- .../translations/en.lproj/Localizable.strings | 5 +- .../src/Network/API/TSNetworkManager.m | 2 +- 5 files changed, 66 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 000cce21f..a457b56fb 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -389,7 +389,8 @@ public class OnboardingController: NSObject { public func tryToVerify(fromViewController: UIViewController, verificationCode: String, - pin: String?) { + pin: String?, + isInvalidCodeCallback : @escaping () -> Void) { AssertIsOnMainThread() guard let phoneNumber = phoneNumber else { @@ -417,14 +418,19 @@ public class OnboardingController: NSObject { DispatchQueue.main.async { modal.dismiss(completion: { - self.verificationFailed(fromViewController: fromViewController, error: error as NSError) + self.verificationFailed(fromViewController: fromViewController, + error: error as NSError, + isInvalidCodeCallback: isInvalidCodeCallback) }) } }).retainUntilComplete() } } - private func verificationFailed(fromViewController: UIViewController, error: NSError) { + private func verificationFailed(fromViewController: UIViewController, error: NSError, + isInvalidCodeCallback : @escaping () -> Void) { + AssertIsOnMainThread() + if error.domain == OWSSignalServiceKitErrorDomain && error.code == OWSErrorCode.registrationMissing2FAPIN.rawValue { @@ -432,6 +438,12 @@ public class OnboardingController: NSObject { onboardingDidRequire2FAPin(viewController: fromViewController) } else { + if error.domain == OWSSignalServiceKitErrorDomain && + error.code == OWSErrorCode.userError.rawValue { + isInvalidCodeCallback() + } + + Logger.verbose("error: \(error.domain) \(error.code)") OWSAlerts.showAlert(title: NSLocalizedString("REGISTRATION_VERIFICATION_FAILED_TITLE", comment: "Alert view title"), message: error.localizedDescription, fromViewController: fromViewController) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 9ea1f70c6..388843b2b 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -98,6 +98,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { comment: "Label indicating that the phone number is invalid in the 'onboarding phone number' view.") validationWarningLabel.textColor = .ows_destructiveRed validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped + validationWarningLabel.autoSetDimension(.height, toSize: validationWarningLabel.font.lineHeight) let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 751aa2d8b..a19f2227e 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -72,6 +72,7 @@ private class OnboardingCodeView: UIView { private let digitCount = 6 private var digitLabels = [UILabel]() + private var digitStrokes = [UIView]() // We use a single text field to edit the "current" digit. // The "current" digit is usually the "last" @@ -99,13 +100,14 @@ private class OnboardingCodeView: UIView { var digitViews = [UIView]() (0.. (UIView, UILabel) { + private func makeCellView(text: String, hasStroke: Bool) -> (UIView, UILabel, UIView) { let digitView = UIView() let digitLabel = UILabel() @@ -131,8 +133,8 @@ private class OnboardingCodeView: UIView { digitView.addSubview(digitLabel) digitLabel.autoCenterInSuperview() + let strokeView = UIView.container() if hasStroke { - let strokeView = UIView.container() strokeView.backgroundColor = Theme.primaryColor digitView.addSubview(strokeView) strokeView.autoPinWidthToSuperview() @@ -145,7 +147,7 @@ private class OnboardingCodeView: UIView { let cellWidth: CGFloat = cellHeight * 2 / 3 digitView.autoSetDimensions(to: CGSize(width: cellWidth, height: cellHeight)) - return (digitView, digitLabel) + return (digitView, digitLabel, strokeView) } private func digit(at index: Int) -> String { @@ -184,6 +186,13 @@ private class OnboardingCodeView: UIView { public override func becomeFirstResponder() -> Bool { return textfield.becomeFirstResponder() } + + func setHasError(_ hasError: Bool) { + let backgroundColor = (hasError ? UIColor.ows_destructiveRed : Theme.primaryColor) + for digitStroke in digitStrokes { + digitStroke.backgroundColor = backgroundColor + } + } } // MARK: - @@ -251,6 +260,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController private let phoneNumberTextField = UITextField() private let onboardingCodeView = OnboardingCodeView() private var codeStateLink: OWSFlatButton? + private let errorLabel = UILabel() override public func loadView() { super.loadView() @@ -262,11 +272,23 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController self.titleLabel = titleLabel let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", - comment: "Label for the link that lets users change their phone number."), + comment: "Label for the link that lets users change their phone number in the onboarding views."), selector: #selector(backLinkTapped)) onboardingCodeView.delegate = self + errorLabel.text = NSLocalizedString("ONBOARDING_VERIFICATION_INVALID_CODE", + comment: "Label indicating that the verification code is incorrect in the 'onboarding verification' view.") + errorLabel.textColor = .ows_destructiveRed + errorLabel.font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() + errorLabel.textAlignment = .center + errorLabel.autoSetDimension(.height, toSize: errorLabel.font.lineHeight) + + // Wrap the error label in a row so that we can show/hide it without affecting view layout. + let errorRow = UIView() + errorRow.addSubview(errorLabel) + errorLabel.autoPinEdgesToSuperviewEdges() + let codeStateLink = self.linkButton(title: "", selector: #selector(resendCodeLinkTapped)) codeStateLink.enableMultilineLabel() @@ -281,6 +303,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController backLink, topSpacer, onboardingCodeView, + UIView.spacer(withHeight: 12), + errorRow, bottomSpacer, codeStateLink ]) @@ -299,6 +323,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController startCodeCountdown() updateCodeState() + + setHasInvalidCode(false) } // MARK: - Code State @@ -459,7 +485,17 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController guard onboardingCodeView.isComplete else { return } - onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil) + + setHasInvalidCode(false) + + onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil, isInvalidCodeCallback: { + self.setHasInvalidCode(true) + }) + } + + private func setHasInvalidCode(_ value: Bool) { + onboardingCodeView.setHasError(value) + errorLabel.isHidden = !value } } @@ -469,6 +505,8 @@ extension OnboardingVerificationViewController: OnboardingCodeViewDelegate { public func codeViewDidChange() { AssertIsOnMainThread() + setHasInvalidCode(false) + tryToVerify() } } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index a8bce1482..5bd79ce6d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1535,12 +1535,15 @@ /* Title of the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; -/* Label for the link that lets users change their phone number. */ +/* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; /* Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ "ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + /* Label for link that can be used when the original code did not arrive. */ "ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index 677b95473..bb0d4af62 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -517,7 +517,7 @@ dispatch_queue_t NetworkManagerQueue() if (self.tsAccountManager.isRegisteredAndReady) { [self.tsAccountManager setIsDeregistered:YES]; } else { - OWSFailDebug( + OWSLogWarn( @"Ignoring auth failure; not registered and ready: %@.", task.originalRequest.URL.absoluteString); } }); From afcacbb55c958cdff16a52c91408004c6e06a7a6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 16:46:06 -0500 Subject: [PATCH 065/493] Sketch out the 'onboarding profile' view. --- Signal.xcodeproj/project.pbxproj | 4 + Signal/src/Signal-Bridging-Header.h | 1 + Signal/src/ViewControllers/AvatarViewHelper.h | 4 +- .../HomeView/HomeViewController.m | 13 + .../ViewControllers/NewGroupViewController.m | 2 +- .../ViewControllers/ProfileViewController.m | 2 +- .../Registration/OnboardingController.swift | 18 + .../OnboardingPhoneNumberViewController.swift | 22 +- .../OnboardingProfileViewController.swift | 412 ++++++++++++++++++ ...OnboardingVerificationViewController.swift | 10 +- .../UpdateGroupViewController.m | 2 +- .../translations/en.lproj/Localizable.strings | 9 + 12 files changed, 468 insertions(+), 31 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 0b34e517f..6939b7a95 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -166,6 +166,7 @@ 3496957421A301A100DCFE74 /* OWSBackupAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */; }; 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */; }; 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */; }; + 34A4C62022175C5C0042EF2E /* OnboardingProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */; }; 34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */; }; 34A6C28021E503E700B5B12E /* OWSImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */; }; 34A8B3512190A40E00218A25 /* MediaAlbumCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */; }; @@ -848,6 +849,7 @@ 3496956D21A301A100DCFE74 /* OWSBackupIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupIO.h; sourceTree = ""; }; 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS111UDAttributesMigration.swift; sourceTree = ""; }; 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = ""; }; + 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingProfileViewController.swift; sourceTree = ""; }; 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWS2FARegistrationViewController.m; sourceTree = ""; }; 34A55F3620485464002CC6DE /* OWS2FARegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FARegistrationViewController.h; sourceTree = ""; }; 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSImagePickerController.swift; sourceTree = ""; }; @@ -1474,6 +1476,7 @@ 3448E15D221333F5004B052E /* OnboardingController.swift */, 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */, 3448E16322135FFA004B052E /* OnboardingPhoneNumberViewController.swift */, + 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */, 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */, 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, @@ -3491,6 +3494,7 @@ 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */, 34386A51207D0C01009F5D9C /* HomeViewController.m in Sources */, 34D1F0A91F867BFC0066283D /* ConversationViewCell.m in Sources */, + 34A4C62022175C5C0042EF2E /* OnboardingProfileViewController.swift in Sources */, 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */, EF764C351DB67CC5000D9A87 /* UIViewController+Permissions.m in Sources */, 45CD81EF1DC030E7004C9430 /* SyncPushTokensJob.swift in Sources */, diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index a8f7d2804..12e45a336 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -8,6 +8,7 @@ // Separate iOS Frameworks from other imports. #import "AppSettingsViewController.h" #import "AttachmentUploadView.h" +#import "AvatarViewHelper.h" #import "ContactCellView.h" #import "ContactTableViewCell.h" #import "ConversationViewCell.h" diff --git a/Signal/src/ViewControllers/AvatarViewHelper.h b/Signal/src/ViewControllers/AvatarViewHelper.h index 01d6b71f8..82ecc282d 100644 --- a/Signal/src/ViewControllers/AvatarViewHelper.h +++ b/Signal/src/ViewControllers/AvatarViewHelper.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol AvatarViewHelperDelegate -- (NSString *)avatarActionSheetTitle; +- (nullable NSString *)avatarActionSheetTitle; - (void)avatarDidChange:(UIImage *)image; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..a0b62b970 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,6 +482,19 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + OnboardingController *onboardingController = [OnboardingController new]; + [onboardingController + updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; + + // UIViewController *view = [onboardingController initialViewController]; + UIViewController *view = + [[OnboardingProfileViewController alloc] initWithOnboardingController:onboardingController]; + OWSNavigationController *navigationController = + [[OWSNavigationController alloc] initWithRootViewController:view]; + [self presentViewController:navigationController animated:YES completion:nil]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 258fd631a..562d97c37 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -612,7 +612,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - AvatarViewHelperDelegate -- (NSString *)avatarActionSheetTitle +- (nullable NSString *)avatarActionSheetTitle { return NSLocalizedString( @"NEW_GROUP_ADD_PHOTO_ACTION", @"Action Sheet title prompting the user for a group avatar"); diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 90d65feb1..2ce609506 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -573,7 +573,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat #pragma mark - AvatarViewHelperDelegate -- (NSString *)avatarActionSheetTitle +- (nullable NSString *)avatarActionSheetTitle { return NSLocalizedString( @"PROFILE_VIEW_AVATAR_ACTIONSHEET_TITLE", @"Action Sheet title prompting the user for a profile avatar"); diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index a457b56fb..c8b91a6df 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -450,3 +450,21 @@ public class OnboardingController: NSObject { } } } + +// MARK: - + +public extension UIView { + public func addBottomStroke() -> UIView { + return addBottomStroke(color: Theme.middleGrayColor, strokeWidth: CGHairlineWidth()) + } + + public func addBottomStroke(color: UIColor, strokeWidth: CGFloat) -> UIView { + let strokeView = UIView() + strokeView.backgroundColor = color + addSubview(strokeView) + strokeView.autoSetDimension(.height, toSize: strokeWidth) + strokeView.autoPinWidthToSuperview() + strokeView.autoPinEdge(toSuperviewEdge: .bottom) + return strokeView + } +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 388843b2b..ef0e7c791 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -62,7 +62,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryRow.isUserInteractionEnabled = true countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) countryRow.autoSetDimension(.height, toSize: rowHeight) - _ = addBottomStroke(countryRow) + _ = countryRow.addBottomStroke() callingCodeLabel.textColor = Theme.primaryColor callingCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped @@ -70,7 +70,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { callingCodeLabel.setCompressionResistanceHorizontalHigh() callingCodeLabel.isUserInteractionEnabled = true callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) - _ = addBottomStroke(callingCodeLabel) + _ = callingCodeLabel.addBottomStroke() callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) phoneNumberTextField.textAlignment = .left @@ -81,8 +81,8 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.setContentHuggingHorizontalLow() phoneNumberTextField.setCompressionResistanceHorizontalLow() - phoneStrokeNormal = addBottomStroke(phoneNumberTextField) - phoneStrokeError = addBottomStroke(phoneNumberTextField, color: .ows_destructiveRed, strokeWidth: 2) + phoneStrokeNormal = phoneNumberTextField.addBottomStroke() + phoneStrokeError = phoneNumberTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) let phoneNumberRow = UIStackView(arrangedSubviews: [ callingCodeLabel, @@ -140,20 +140,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { validationWarningLabel.autoPinEdge(.leading, to: .leading, of: phoneNumberTextField) } - private func addBottomStroke(_ view: UIView) -> UIView { - return addBottomStroke(view, color: Theme.middleGrayColor, strokeWidth: CGHairlineWidth()) - } - - private func addBottomStroke(_ view: UIView, color: UIColor, strokeWidth: CGFloat) -> UIView { - let strokeView = UIView() - strokeView.backgroundColor = color - view.addSubview(strokeView) - strokeView.autoSetDimension(.height, toSize: strokeWidth) - strokeView.autoPinWidthToSuperview() - strokeView.autoPinEdge(toSuperviewEdge: .bottom) - return strokeView - } - // MARK: - View Lifecycle public override func viewWillAppear(_ animated: Bool) { diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift new file mode 100644 index 000000000..7d00e4d48 --- /dev/null +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -0,0 +1,412 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public class OnboardingProfileViewController: OnboardingBaseViewController { + +// private var titleLabel: UILabel? +// private let phoneNumberTextField = UITextField() +// private let onboardingCodeView = OnboardingCodeView() +// private var codeStateLink: OWSFlatButton? +// private let errorLabel = UILabel() + private let avatarView = AvatarImageView() + private let nameTextfield = UITextField() + private var avatar: UIImage? + private let cameraCircle = UIView.container() + + private let avatarViewHelper = AvatarViewHelper() + + override public func loadView() { + super.loadView() + + avatarViewHelper.delegate = self + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PROFILE_TITLE", comment: "Title of the 'onboarding profile' view.")) + + let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PROFILE_EXPLANATION", + comment: "Explanation in the 'onboarding profile' view.")) + + let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", + comment: "Label for the 'next' button."), + selector: #selector(nextPressed)) + + avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarSize), height: CGFloat(avatarSize))) + + let cameraImageView = UIImageView() + cameraImageView.image = UIImage(named: "settings-avatar-camera") + cameraCircle.backgroundColor = Theme.backgroundColor + cameraCircle.addSubview(cameraImageView) + let cameraCircleDiameter: CGFloat = 40 + cameraCircle.autoSetDimensions(to: CGSize(width: cameraCircleDiameter, height: cameraCircleDiameter)) + cameraCircle.layer.shadowColor = UIColor(white: 0, alpha: 0.15).cgColor + cameraCircle.layer.shadowRadius = 5 + cameraCircle.layer.shadowOffset = CGSize(width: 1, height: 1) + cameraCircle.layer.shadowOpacity = 1 + cameraCircle.layer.cornerRadius = cameraCircleDiameter * 0.5 + cameraCircle.clipsToBounds = false + cameraImageView.autoCenterInSuperview() + + let avatarWrapper = UIView.container() + avatarWrapper.isUserInteractionEnabled = true + avatarWrapper.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(avatarTapped))) + avatarWrapper.addSubview(avatarView) + avatarView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)) + avatarWrapper.addSubview(cameraCircle) + cameraCircle.autoPinEdge(toSuperviewEdge: .trailing) + cameraCircle.autoPinEdge(toSuperviewEdge: .bottom) + + nameTextfield.textAlignment = .left + nameTextfield.delegate = self + nameTextfield.returnKeyType = .done + nameTextfield.textColor = Theme.primaryColor +// nameTextfield.tintColor = UIColor.ows_materialBlue + nameTextfield.font = UIFont.ows_dynamicTypeBodyClamped + nameTextfield.placeholder = NSLocalizedString("ONBOARDING_PROFILE_NAME_PLACEHOLDER", + comment: "Placeholder text for the profile name in the 'onboarding profile' view.") + nameTextfield.setContentHuggingHorizontalLow() + nameTextfield.setCompressionResistanceHorizontalLow() + + let nameWrapper = UIView.container() + nameWrapper.setCompressionResistanceHorizontalLow() + nameWrapper.setContentHuggingHorizontalLow() + nameWrapper.addSubview(nameTextfield) + nameTextfield.autoPinWidthToSuperview() + nameTextfield.autoPinEdge(toSuperviewEdge: .top, withInset: 8) + nameTextfield.autoPinEdge(toSuperviewEdge: .bottom, withInset: 8) + _ = nameWrapper.addBottomStroke() + + let profileRow = UIStackView(arrangedSubviews: [ + avatarWrapper, + nameWrapper + ]) + profileRow.axis = .horizontal + profileRow.alignment = .center + profileRow.spacing = 8 + + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() + + let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + topSpacer, + profileRow, + UIView.spacer(withHeight: 25), + explanationLabel, + UIView.spacer(withHeight: 20), + nextButton, + bottomSpacer + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperview() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + + updateAvatarView() + } + + private let avatarSize: UInt = 80 + + private func updateAvatarView() { + if let avatar = avatar { + avatarView.image = avatar + cameraCircle.isHidden = true + return + } + + let defaultAvatar = OWSContactAvatarBuilder(forLocalUserWithDiameter: avatarSize).buildDefaultImage() + avatarView.image = defaultAvatar + cameraCircle.isHidden = false + } + +// // MARK: - Code State +// +// private let countdownDuration: TimeInterval = 60 +// private var codeCountdownTimer: Timer? +// private var codeCountdownStart: NSDate? +// +// deinit { +// if let codeCountdownTimer = codeCountdownTimer { +// codeCountdownTimer.invalidate() +// } +// } +// +// private func startCodeCountdown() { +// codeCountdownStart = NSDate() +// codeCountdownTimer = Timer.weakScheduledTimer(withTimeInterval: 1, target: self, selector: #selector(codeCountdownTimerFired), userInfo: nil, repeats: true) +// } +// +// @objc +// public func codeCountdownTimerFired() { +// guard let codeCountdownStart = codeCountdownStart else { +// owsFailDebug("Missing codeCountdownStart.") +// return +// } +// guard let codeCountdownTimer = codeCountdownTimer else { +// owsFailDebug("Missing codeCountdownTimer.") +// return +// } +// +// let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) +// +// guard countdownInterval < countdownDuration else { +// // Countdown complete. +// codeCountdownTimer.invalidate() +// self.codeCountdownTimer = nil +// +// if codeState != .pending { +// owsFailDebug("Unexpected codeState: \(codeState)") +// } +// codeState = .possiblyNotDelivered +// updateCodeState() +// return +// } +// +// // Update the "code state" UI to reflect the countdown. +// updateCodeState() +// } +// +// private func updateCodeState() { +// AssertIsOnMainThread() +// +// guard let codeCountdownStart = codeCountdownStart else { +// owsFailDebug("Missing codeCountdownStart.") +// return +// } +// guard let titleLabel = titleLabel else { +// owsFailDebug("Missing titleLabel.") +// return +// } +// guard let codeStateLink = codeStateLink else { +// owsFailDebug("Missing codeStateLink.") +// return +// } +// +// var e164PhoneNumber = "" +// if let phoneNumber = onboardingController.phoneNumber { +// e164PhoneNumber = phoneNumber.e164 +// } +// let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: e164PhoneNumber) +// +// // Update titleLabel +// switch codeState { +// case .pending, .possiblyNotDelivered: +// titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT", +// comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), +// formattedPhoneNumber) +// case .resent: +// titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT", +// comment: "Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}."), +// formattedPhoneNumber) +// } +// +// // Update codeStateLink +// switch codeState { +// case .pending: +// let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) +// let countdownRemaining = max(0, countdownDuration - countdownInterval) +// let formattedCountdown = OWSFormat.formatDurationSeconds(Int(round(countdownRemaining))) +// let text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT", +// comment: "Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}."), +// formattedCountdown) +// codeStateLink.setTitle(title: text, font: .ows_dynamicTypeBodyClamped, titleColor: Theme.secondaryColor) +//// codeStateLink.setBackgroundColors(upColor: Theme.backgroundColor) +// case .possiblyNotDelivered: +// codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK", +// comment: "Label for link that can be used when the original code did not arrive."), +// font: .ows_dynamicTypeBodyClamped, +// titleColor: .ows_materialBlue) +// case .resent: +// codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK", +// comment: "Label for link that can be used when the resent code did not arrive."), +// font: .ows_dynamicTypeBodyClamped, +// titleColor: .ows_materialBlue) +// } +// } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + _ = nameTextfield.becomeFirstResponder() + } + + // MARK: - Events + + @objc func avatarTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + showAvatarActionSheet() + } + + @objc func nextPressed() { + Logger.info("") + + // TODO: +// parseAndTryToRegister() + } + + private func showAvatarActionSheet() { + AssertIsOnMainThread() + + Logger.info("") + + avatarViewHelper.showChangeAvatarUI() + +// let alert = UIAlertController(title: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_TITLE", +// comment: "Title for alert shown when the app failed to check for an existing backup."), +// message: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_MESSAGE", +// comment: "Message for alert shown when the app failed to check for an existing backup."), +// preferredStyle: .alert) +// alert.addAction(UIAlertAction(title: NSLocalizedString("REGISTER_FAILED_TRY_AGAIN", comment: ""), +// style: .default) { (_) in +// self.checkCanImportBackup(fromView: view) +// }) +// alert.addAction(UIAlertAction(title: NSLocalizedString("CHECK_FOR_BACKUP_DO_NOT_RESTORE", comment: "The label for the 'do not restore backup' button."), +// style: .destructive) { (_) in +// self.showProfileView(fromView: view) +// }) +// view.present(alert, animated: true) + } + + // @objc func backLinkTapped() { +// Logger.info("") +// +// self.navigationController?.popViewController(animated: true) +// } +// +// @objc func resendCodeLinkTapped() { +// Logger.info("") +// +// switch codeState { +// case .pending: +// // Ignore taps until the countdown expires. +// break +// case .possiblyNotDelivered, .resent: +// showResendActionSheet() +// } +// } +// +// private func showResendActionSheet() { +// Logger.info("") +// +// let actionSheet = UIAlertController(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE", +// comment: "Title for the 'resend code' alert in the 'onboarding verification' view."), +// message: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE", +// comment: "Message for the 'resend code' alert in the 'onboarding verification' view."), +// preferredStyle: .actionSheet) +// +// actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON", +// comment: "Label for the 'resend code by SMS' button in the 'onboarding verification' view."), +// style: .default) { _ in +// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: true) +// }) +// actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON", +// comment: "Label for the 'resend code by voice' button in the 'onboarding verification' view."), +// style: .default) { _ in +// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) +// }) +// actionSheet.addAction(OWSAlerts.cancelAction) +// +// self.present(actionSheet, animated: true) +// } +// +// private func tryToVerify() { +// Logger.info("") +// +// guard onboardingCodeView.isComplete else { +// return +// } +// +// setHasInvalidCode(false) +// +// onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil, isInvalidCodeCallback: { +// self.setHasInvalidCode(true) +// }) +// } +// +// private func setHasInvalidCode(_ value: Bool) { +// onboardingCodeView.setHasError(value) +// errorLabel.isHidden = !value +// } +//} +// +//// MARK: - +// +//extension OnboardingProfileViewController: OnboardingCodeViewDelegate { +// public func codeViewDidChange() { +// AssertIsOnMainThread() +// +// setHasInvalidCode(false) +// +// tryToVerify() +// } +} + +// MARK: - + +extension OnboardingProfileViewController: UITextFieldDelegate { + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + // // TODO: Fix auto-format of phone numbers. + // ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) + // + // isPhoneNumberInvalid = false + // updateValidationWarnings() + + // Inform our caller that we took care of performing the change. + return true + } + + public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + // parseAndTryToRegister() + return false + } +} + +// MARK: - + +extension OnboardingProfileViewController: AvatarViewHelperDelegate { + public func avatarActionSheetTitle() -> String? { + return nil + } + + public func avatarDidChange(_ image: UIImage) { + AssertIsOnMainThread() + + let maxDiameter = CGFloat(kOWSProfileManager_MaxAvatarDiameter) + avatar = image.resizedImage(toFillPixelSize: CGSize(width: maxDiameter, + height: maxDiameter)) + + updateAvatarView() + } + + public func fromViewController() -> UIViewController { + return self + } + + public func hasClearAvatarAction() -> Bool { + return avatar != nil + } + + public func clearAvatar() { + avatar = nil + + updateAvatarView() + } + + public func clearAvatarActionLabel() -> String { + return NSLocalizedString("PROFILE_VIEW_CLEAR_AVATAR", comment: "Label for action that clear's the user's profile avatar") + } +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index a19f2227e..48cb07bba 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -133,14 +133,8 @@ private class OnboardingCodeView: UIView { digitView.addSubview(digitLabel) digitLabel.autoCenterInSuperview() - let strokeView = UIView.container() - if hasStroke { - strokeView.backgroundColor = Theme.primaryColor - digitView.addSubview(strokeView) - strokeView.autoPinWidthToSuperview() - strokeView.autoPinEdge(toSuperviewEdge: .bottom) - strokeView.autoSetDimension(.height, toSize: 1) - } + let strokeColor = (hasStroke ? Theme.primaryColor : UIColor.clear) + let strokeView = digitView.addBottomStroke(color: strokeColor, strokeWidth: 1) let vMargin: CGFloat = 4 let cellHeight: CGFloat = digitLabel.font.lineHeight + vMargin * 2 diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index 1820ad17c..1baa19bec 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -485,7 +485,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - AvatarViewHelperDelegate -- (NSString *)avatarActionSheetTitle +- (nullable NSString *)avatarActionSheetTitle { return NSLocalizedString( @"NEW_GROUP_ADD_PHOTO_ACTION", @"Action Sheet title prompting the user for a group avatar"); diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 5bd79ce6d..f61ad1a2c 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1529,6 +1529,15 @@ /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; From ab3b79cfe537eda35302f9a68abdbbe18d41cea3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 17:20:16 -0500 Subject: [PATCH 066/493] Sketch out the 'onboarding profile' view. --- .../Registration/OnboardingController.swift | 18 ++ .../OnboardingProfileViewController.swift | 264 ++++-------------- 2 files changed, 70 insertions(+), 212 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index c8b91a6df..4ec897d27 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -247,6 +247,24 @@ public class OnboardingController: NSObject { // navigationController.pushViewController(view, animated: true) } + @objc + public func profileWasSkipped(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + // TODO: + } + + @objc + public func profileDidComplete(fromView view: UIViewController) { + AssertIsOnMainThread() + + Logger.info("") + + // TODO: + } + // MARK: - State public private(set) var countryState: OnboardingCountryState = .defaultValue diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift index 7d00e4d48..a8c3f9023 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -7,11 +7,14 @@ import UIKit @objc public class OnboardingProfileViewController: OnboardingBaseViewController { -// private var titleLabel: UILabel? -// private let phoneNumberTextField = UITextField() -// private let onboardingCodeView = OnboardingCodeView() -// private var codeStateLink: OWSFlatButton? -// private let errorLabel = UILabel() + // MARK: - Dependencies + + var profileManager: OWSProfileManager { + return OWSProfileManager.shared() + } + + // MARK: - + private let avatarView = AvatarImageView() private let nameTextfield = UITextField() private var avatar: UIImage? @@ -65,7 +68,6 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { nameTextfield.delegate = self nameTextfield.returnKeyType = .done nameTextfield.textColor = Theme.primaryColor -// nameTextfield.tintColor = UIColor.ows_materialBlue nameTextfield.font = UIFont.ows_dynamicTypeBodyClamped nameTextfield.placeholder = NSLocalizedString("ONBOARDING_PROFILE_NAME_PLACEHOLDER", comment: "Placeholder text for the profile name in the 'onboarding profile' view.") @@ -131,110 +133,48 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { cameraCircle.isHidden = false } -// // MARK: - Code State -// -// private let countdownDuration: TimeInterval = 60 -// private var codeCountdownTimer: Timer? -// private var codeCountdownStart: NSDate? -// -// deinit { -// if let codeCountdownTimer = codeCountdownTimer { -// codeCountdownTimer.invalidate() -// } -// } -// -// private func startCodeCountdown() { -// codeCountdownStart = NSDate() -// codeCountdownTimer = Timer.weakScheduledTimer(withTimeInterval: 1, target: self, selector: #selector(codeCountdownTimerFired), userInfo: nil, repeats: true) -// } -// -// @objc -// public func codeCountdownTimerFired() { -// guard let codeCountdownStart = codeCountdownStart else { -// owsFailDebug("Missing codeCountdownStart.") -// return -// } -// guard let codeCountdownTimer = codeCountdownTimer else { -// owsFailDebug("Missing codeCountdownTimer.") -// return -// } -// -// let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) -// -// guard countdownInterval < countdownDuration else { -// // Countdown complete. -// codeCountdownTimer.invalidate() -// self.codeCountdownTimer = nil -// -// if codeState != .pending { -// owsFailDebug("Unexpected codeState: \(codeState)") -// } -// codeState = .possiblyNotDelivered -// updateCodeState() -// return -// } -// -// // Update the "code state" UI to reflect the countdown. -// updateCodeState() -// } -// -// private func updateCodeState() { -// AssertIsOnMainThread() -// -// guard let codeCountdownStart = codeCountdownStart else { -// owsFailDebug("Missing codeCountdownStart.") -// return -// } -// guard let titleLabel = titleLabel else { -// owsFailDebug("Missing titleLabel.") -// return -// } -// guard let codeStateLink = codeStateLink else { -// owsFailDebug("Missing codeStateLink.") -// return -// } -// -// var e164PhoneNumber = "" -// if let phoneNumber = onboardingController.phoneNumber { -// e164PhoneNumber = phoneNumber.e164 -// } -// let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: e164PhoneNumber) -// -// // Update titleLabel -// switch codeState { -// case .pending, .possiblyNotDelivered: -// titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT", -// comment: "Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}."), -// formattedPhoneNumber) -// case .resent: -// titleLabel.text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT", -// comment: "Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}."), -// formattedPhoneNumber) -// } -// -// // Update codeStateLink -// switch codeState { -// case .pending: -// let countdownInterval = abs(codeCountdownStart.timeIntervalSinceNow) -// let countdownRemaining = max(0, countdownDuration - countdownInterval) -// let formattedCountdown = OWSFormat.formatDurationSeconds(Int(round(countdownRemaining))) -// let text = String(format: NSLocalizedString("ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT", -// comment: "Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}."), -// formattedCountdown) -// codeStateLink.setTitle(title: text, font: .ows_dynamicTypeBodyClamped, titleColor: Theme.secondaryColor) -//// codeStateLink.setBackgroundColors(upColor: Theme.backgroundColor) -// case .possiblyNotDelivered: -// codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK", -// comment: "Label for link that can be used when the original code did not arrive."), -// font: .ows_dynamicTypeBodyClamped, -// titleColor: .ows_materialBlue) -// case .resent: -// codeStateLink.setTitle(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK", -// comment: "Label for link that can be used when the resent code did not arrive."), -// font: .ows_dynamicTypeBodyClamped, -// titleColor: .ows_materialBlue) -// } -// } + // MARK: - + + private func normalizedProfileName() -> String? { + return nameTextfield.text?.ows_stripped() + } + + private func tryToComplete() { + + let profileName = self.normalizedProfileName() + let profileAvatar = self.avatar + + if profileName == nil, profileAvatar == nil { + onboardingController.profileWasSkipped(fromView: self) + return + } + + if let name = profileName, + profileManager.isProfileNameTooLong(name) { + OWSAlerts.showErrorAlert(message: NSLocalizedString("PROFILE_VIEW_ERROR_PROFILE_NAME_TOO_LONG", + comment: "Error message shown when user tries to update profile with a profile name that is too long.")) + return + } + + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: true) { (modal) in + + self.profileManager.updateLocalProfileName(profileName, avatarImage: profileAvatar, success: { + DispatchQueue.main.async { + modal.dismiss(completion: { + self.onboardingController.profileDidComplete(fromView: self) + }) + } + }, failure: { + DispatchQueue.main.async { + modal.dismiss(completion: { + OWSAlerts.showErrorAlert(message: NSLocalizedString("PROFILE_VIEW_ERROR_UPDATE_FAILED", + comment: "Error message shown when a profile update fails.")) + }) + } + }) + } + } public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) @@ -254,8 +194,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { @objc func nextPressed() { Logger.info("") - // TODO: -// parseAndTryToRegister() + tryToComplete() } private func showAvatarActionSheet() { @@ -264,113 +203,14 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { Logger.info("") avatarViewHelper.showChangeAvatarUI() - -// let alert = UIAlertController(title: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_TITLE", -// comment: "Title for alert shown when the app failed to check for an existing backup."), -// message: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_MESSAGE", -// comment: "Message for alert shown when the app failed to check for an existing backup."), -// preferredStyle: .alert) -// alert.addAction(UIAlertAction(title: NSLocalizedString("REGISTER_FAILED_TRY_AGAIN", comment: ""), -// style: .default) { (_) in -// self.checkCanImportBackup(fromView: view) -// }) -// alert.addAction(UIAlertAction(title: NSLocalizedString("CHECK_FOR_BACKUP_DO_NOT_RESTORE", comment: "The label for the 'do not restore backup' button."), -// style: .destructive) { (_) in -// self.showProfileView(fromView: view) -// }) -// view.present(alert, animated: true) } - - // @objc func backLinkTapped() { -// Logger.info("") -// -// self.navigationController?.popViewController(animated: true) -// } -// -// @objc func resendCodeLinkTapped() { -// Logger.info("") -// -// switch codeState { -// case .pending: -// // Ignore taps until the countdown expires. -// break -// case .possiblyNotDelivered, .resent: -// showResendActionSheet() -// } -// } -// -// private func showResendActionSheet() { -// Logger.info("") -// -// let actionSheet = UIAlertController(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE", -// comment: "Title for the 'resend code' alert in the 'onboarding verification' view."), -// message: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE", -// comment: "Message for the 'resend code' alert in the 'onboarding verification' view."), -// preferredStyle: .actionSheet) -// -// actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON", -// comment: "Label for the 'resend code by SMS' button in the 'onboarding verification' view."), -// style: .default) { _ in -// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: true) -// }) -// actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON", -// comment: "Label for the 'resend code by voice' button in the 'onboarding verification' view."), -// style: .default) { _ in -// self.onboardingController.tryToRegister(fromViewController: self, smsVerification: false) -// }) -// actionSheet.addAction(OWSAlerts.cancelAction) -// -// self.present(actionSheet, animated: true) -// } -// -// private func tryToVerify() { -// Logger.info("") -// -// guard onboardingCodeView.isComplete else { -// return -// } -// -// setHasInvalidCode(false) -// -// onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil, isInvalidCodeCallback: { -// self.setHasInvalidCode(true) -// }) -// } -// -// private func setHasInvalidCode(_ value: Bool) { -// onboardingCodeView.setHasError(value) -// errorLabel.isHidden = !value -// } -//} -// -//// MARK: - -// -//extension OnboardingProfileViewController: OnboardingCodeViewDelegate { -// public func codeViewDidChange() { -// AssertIsOnMainThread() -// -// setHasInvalidCode(false) -// -// tryToVerify() -// } } // MARK: - extension OnboardingProfileViewController: UITextFieldDelegate { - public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - // // TODO: Fix auto-format of phone numbers. - // ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) - // - // isPhoneNumberInvalid = false - // updateValidationWarnings() - - // Inform our caller that we took care of performing the change. - return true - } - public func textFieldShouldReturn(_ textField: UITextField) -> Bool { - // parseAndTryToRegister() + tryToComplete() return false } } From 3ac77e5b01cf8c9c30894759ac5ee14b834496e6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Feb 2019 17:21:23 -0500 Subject: [PATCH 067/493] Sketch out the 'onboarding profile' view. --- .../ViewControllers/HomeView/HomeViewController.m | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index a0b62b970..2e8ab8ba1 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -482,19 +482,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - OnboardingController *onboardingController = [OnboardingController new]; - [onboardingController - updateWithPhoneNumber:[[OnboardingPhoneNumber alloc] initWithE164:@"+13213214321" userInput:@"3213214321"]]; - - // UIViewController *view = [onboardingController initialViewController]; - UIViewController *view = - [[OnboardingProfileViewController alloc] initWithOnboardingController:onboardingController]; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:view]; - [self presentViewController:navigationController animated:YES completion:nil]; - }); } - (void)viewDidDisappear:(BOOL)animated From 0b55ecc682c37f6ee41942afee0b8f9288062e55 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Feb 2019 11:02:03 -0500 Subject: [PATCH 068/493] Sketch out the 'onboarding 2FA' view. --- Signal.xcodeproj/project.pbxproj | 4 + .../Onboarding2FAViewController.swift | 176 ++++++++++++++++++ .../Registration/OnboardingController.swift | 43 ++++- .../OnboardingPhoneNumberViewController.swift | 2 +- ...OnboardingVerificationViewController.swift | 10 +- .../translations/en.lproj/Localizable.strings | 14 +- 6 files changed, 237 insertions(+), 12 deletions(-) create mode 100644 Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 6939b7a95..683161dfc 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -165,6 +165,7 @@ 3496957321A301A100DCFE74 /* OWSBackupJob.m in Sources */ = {isa = PBXBuildFile; fileRef = 3496956A21A301A100DCFE74 /* OWSBackupJob.m */; }; 3496957421A301A100DCFE74 /* OWSBackupAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */; }; 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */; }; + 349ED990221B0194008045B0 /* Onboarding2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */; }; 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */; }; 34A4C62022175C5C0042EF2E /* OnboardingProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */; }; 34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */; }; @@ -848,6 +849,7 @@ 3496956C21A301A100DCFE74 /* OWSBackupImportJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupImportJob.h; sourceTree = ""; }; 3496956D21A301A100DCFE74 /* OWSBackupIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupIO.h; sourceTree = ""; }; 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS111UDAttributesMigration.swift; sourceTree = ""; }; + 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Onboarding2FAViewController.swift; sourceTree = ""; }; 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = ""; }; 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingProfileViewController.swift; sourceTree = ""; }; 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWS2FARegistrationViewController.m; sourceTree = ""; }; @@ -1471,6 +1473,7 @@ 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, + 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */, 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */, 3448E1652215B313004B052E /* OnboardingCaptchaViewController.swift */, 3448E15D221333F5004B052E /* OnboardingController.swift */, @@ -3530,6 +3533,7 @@ 4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */, 4CB5F26720F6E1E2004D1B42 /* MenuActionsViewController.swift in Sources */, 3496955E219B605E00DCFE74 /* PhotoLibrary.swift in Sources */, + 349ED990221B0194008045B0 /* Onboarding2FAViewController.swift in Sources */, 45D231771DC7E8F10034FA89 /* SessionResetJob.swift in Sources */, 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */, 452037D11EE84975004E4CDF /* DebugUISessionState.m in Sources */, diff --git a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift new file mode 100644 index 000000000..0918bd78e --- /dev/null +++ b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift @@ -0,0 +1,176 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +@objc +public class Onboarding2FAViewController: OnboardingBaseViewController { + + private let pinTextField = UITextField() + + private var pinStrokeNormal: UIView? + private var pinStrokeError: UIView? + private let validationWarningLabel = UILabel() + private var isPinInvalid = false { + didSet { + updateValidationWarnings() + } + } + + override public func loadView() { + super.loadView() + + view.backgroundColor = Theme.backgroundColor + view.layoutMargins = .zero + + let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_2FA_TITLE", comment: "Title of the 'onboarding 2FA' view.")) + + let explanationLabel1 = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_2FA_EXPLANATION_1", + comment: "The first explanation in the 'onboarding 2FA' view.")) + let explanationLabel2 = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_2FA_EXPLANATION_2", + comment: "The first explanation in the 'onboarding 2FA' view.")) + explanationLabel1.font = UIFont.ows_dynamicTypeCaption1 + explanationLabel2.font = UIFont.ows_dynamicTypeCaption1 + + pinTextField.textAlignment = .center + pinTextField.delegate = self + pinTextField.keyboardType = .numberPad + pinTextField.textColor = Theme.primaryColor + pinTextField.font = UIFont.ows_dynamicTypeBodyClamped + pinTextField.setContentHuggingHorizontalLow() + pinTextField.setCompressionResistanceHorizontalLow() + pinTextField.autoSetDimension(.height, toSize: 40) + + pinStrokeNormal = pinTextField.addBottomStroke() + pinStrokeError = pinTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) + + validationWarningLabel.text = NSLocalizedString("ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING", + comment: "Label indicating that the phone number is invalid in the 'onboarding phone number' view.") + validationWarningLabel.textColor = .ows_destructiveRed + validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped + validationWarningLabel.textAlignment = .center + + let validationWarningRow = UIView() + validationWarningRow.addSubview(validationWarningLabel) + validationWarningLabel.ows_autoPinToSuperviewEdges() + validationWarningRow.autoSetDimension(.height, toSize: validationWarningLabel.font.lineHeight) + + let forgotPinLink = self.linkButton(title: NSLocalizedString("ONBOARDING_2FA_FORGOT_PIN_LINK", + comment: "Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view."), + selector: #selector(forgotPinLinkTapped)) + + let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", + comment: "Label for the 'next' button."), + selector: #selector(nextPressed)) + + let topSpacer = UIView.vStretchingSpacer() + let bottomSpacer = UIView.vStretchingSpacer() + + let stackView = UIStackView(arrangedSubviews: [ + titleLabel, + UIView.spacer(withHeight: 10), + explanationLabel1, + UIView.spacer(withHeight: 10), + explanationLabel2, + + topSpacer, + pinTextField, + UIView.spacer(withHeight: 10), + validationWarningRow, + bottomSpacer, + forgotPinLink, + UIView.spacer(withHeight: 10), + nextButton + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.layoutMargins = UIEdgeInsets(top: 20, left: 32, bottom: 20, right: 32) + stackView.isLayoutMarginsRelativeArrangement = true + view.addSubview(stackView) + stackView.autoPinWidthToSuperview() + stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) + autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + // Ensure whitespace is balanced, so inputs are vertically centered. + topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) + + updateValidationWarnings() + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + _ = pinTextField.becomeFirstResponder() + } + + // MARK: - Events + + @objc func forgotPinLinkTapped() { + Logger.info("") + + OWSAlerts.showAlert(title: nil, message: NSLocalizedString("REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE", + comment: "Alert message explaining what happens if you forget your 'two-factor auth pin'.")) + } + + @objc func nextPressed() { + Logger.info("") + + tryToVerify() + } + + private func tryToVerify() { + Logger.info("") + + guard let pin = pinTextField.text?.ows_stripped(), + pin.count > 0 else { + isPinInvalid = true + return + } + + isPinInvalid = false + + onboardingController.update(twoFAPin: pin) + + onboardingController.tryToVerify(fromViewController: self, completion: { (outcome) in + if outcome == .invalid2FAPin { + self.isPinInvalid = true + } else if outcome == .invalidVerificationCode { + owsFailDebug("Invalid verification code in 2FA view.") + } + }) + } + + private func updateValidationWarnings() { + AssertIsOnMainThread() + + pinStrokeNormal?.isHidden = isPinInvalid + pinStrokeError?.isHidden = !isPinInvalid + validationWarningLabel.isHidden = !isPinInvalid + } +} + +// MARK: - + +extension Onboarding2FAViewController: UITextFieldDelegate { + public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { + let newString = string.digitsOnly + var oldText = "" + if let textFieldText = textField.text { + oldText = textFieldText + } + let left = oldText.substring(to: range.location) + let right = oldText.substring(from: range.location + range.length) + textField.text = left + newString + right + + isPinInvalid = false + + // Inform our caller that we took care of performing the change. + return false + } + + public func textFieldShouldReturn(_ textField: UITextField) -> Bool { + tryToVerify() + return false + } +} diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 4ec897d27..fd8f6124c 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -273,6 +273,10 @@ public class OnboardingController: NSObject { public private(set) var captchaToken: String? + public private(set) var verificationCode: String? + + public private(set) var twoFAPin: String? + @objc public func update(countryState: OnboardingCountryState) { AssertIsOnMainThread() @@ -294,6 +298,20 @@ public class OnboardingController: NSObject { self.captchaToken = captchaToken } + @objc + public func update(verificationCode: String) { + AssertIsOnMainThread() + + self.verificationCode = verificationCode + } + + @objc + public func update(twoFAPin: String) { + AssertIsOnMainThread() + + self.twoFAPin = twoFAPin + } + // MARK: - Debug private static let kKeychainService_LastRegistered = "kKeychainService_LastRegistered" @@ -405,26 +423,35 @@ public class OnboardingController: NSObject { // MARK: - Verification + public enum VerificationOutcome { + case success + case invalidVerificationCode + case invalid2FAPin + } + public func tryToVerify(fromViewController: UIViewController, - verificationCode: String, - pin: String?, - isInvalidCodeCallback : @escaping () -> Void) { + completion : @escaping (VerificationOutcome) -> Void) { AssertIsOnMainThread() guard let phoneNumber = phoneNumber else { owsFailDebug("Missing phoneNumber.") return } + guard let verificationCode = verificationCode else { + completion(.invalidVerificationCode) + return + } // Ensure the account manager state is up-to-date. // // TODO: We could skip this in production. tsAccountManager.phoneNumberAwaitingVerification = phoneNumber.e164 + let twoFAPin = self.twoFAPin ModalActivityIndicatorViewController.present(fromViewController: fromViewController, canCancel: true) { (modal) in - self.accountManager.register(verificationCode: verificationCode, pin: pin) + self.accountManager.register(verificationCode: verificationCode, pin: twoFAPin) .done { (_) in DispatchQueue.main.async { modal.dismiss(completion: { @@ -438,7 +465,7 @@ public class OnboardingController: NSObject { modal.dismiss(completion: { self.verificationFailed(fromViewController: fromViewController, error: error as NSError, - isInvalidCodeCallback: isInvalidCodeCallback) + completion: completion) }) } }).retainUntilComplete() @@ -446,7 +473,7 @@ public class OnboardingController: NSObject { } private func verificationFailed(fromViewController: UIViewController, error: NSError, - isInvalidCodeCallback : @escaping () -> Void) { + completion : @escaping (VerificationOutcome) -> Void) { AssertIsOnMainThread() if error.domain == OWSSignalServiceKitErrorDomain && @@ -454,11 +481,13 @@ public class OnboardingController: NSObject { Logger.info("Missing 2FA PIN.") + completion(.invalid2FAPin) + onboardingDidRequire2FAPin(viewController: fromViewController) } else { if error.domain == OWSSignalServiceKitErrorDomain && error.code == OWSErrorCode.userError.rawValue { - isInvalidCodeCallback() + completion(.invalidVerificationCode) } Logger.verbose("error: \(error.domain) \(error.code)") diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index ef0e7c791..830999486 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -103,7 +103,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) validationWarningLabel.autoPinHeightToSuperview() - validationWarningLabel.autoPinEdge(toSuperviewEdge: .trailing) + validationWarningLabel.autoPinEdge(toSuperviewEdge: .leading) // TODO: Finalize copy. diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 48cb07bba..3d21e96d6 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -251,7 +251,6 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController private var codeState = CodeState.sent private var titleLabel: UILabel? - private let phoneNumberTextField = UITextField() private let onboardingCodeView = OnboardingCodeView() private var codeStateLink: OWSFlatButton? private let errorLabel = UILabel() @@ -477,13 +476,18 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController Logger.info("") guard onboardingCodeView.isComplete else { + self.setHasInvalidCode(true) return } setHasInvalidCode(false) - onboardingController.tryToVerify(fromViewController: self, verificationCode: onboardingCodeView.verificationCode, pin: nil, isInvalidCodeCallback: { - self.setHasInvalidCode(true) + onboardingController.update(verificationCode: onboardingCodeView.verificationCode) + + onboardingController.tryToVerify(fromViewController: self, completion: { (outcome) in + if outcome == .invalidVerificationCode { + self.setHasInvalidCode(true) + } }) } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index f61ad1a2c..667a5f55d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1508,6 +1508,18 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + /* Title of the 'onboarding Captcha' view. */ "ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; @@ -1547,7 +1559,7 @@ /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; -/* Format for the label of the 'pending code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ "ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ From edf09c92f4b9ac91b10e792f6403af302387009d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Feb 2019 11:44:27 -0500 Subject: [PATCH 069/493] Rework "empty inbox" state. --- .../Contents.json | 21 ++++ .../human-1@3x.png | Bin 0 -> 47610 bytes .../Contents.json | 21 ++++ .../human-2@3x.png | Bin 0 -> 48052 bytes .../Contents.json | 21 ++++ .../human-3@3x.png | Bin 0 -> 52102 bytes .../Contents.json | 21 ++++ .../human-4@3x.png | Bin 0 -> 46878 bytes .../Contents.json | 21 ++++ .../human-5@3x.png | Bin 0 -> 56788 bytes .../AppSettings/OWSLinkDeviceViewController.m | 2 +- .../HomeView/HomeViewController.m | 108 +++++++----------- Signal/src/views/RemoteVideoView.m | 5 +- .../translations/en.lproj/Localizable.strings | 3 + SignalMessaging/categories/UIView+OWS.h | 1 + SignalMessaging/categories/UIView+OWS.m | 4 + 16 files changed, 157 insertions(+), 71 deletions(-) create mode 100644 Signal/Images.xcassets/home_empty_splash_1.imageset/Contents.json create mode 100644 Signal/Images.xcassets/home_empty_splash_1.imageset/human-1@3x.png create mode 100644 Signal/Images.xcassets/home_empty_splash_2.imageset/Contents.json create mode 100644 Signal/Images.xcassets/home_empty_splash_2.imageset/human-2@3x.png create mode 100644 Signal/Images.xcassets/home_empty_splash_3.imageset/Contents.json create mode 100644 Signal/Images.xcassets/home_empty_splash_3.imageset/human-3@3x.png create mode 100644 Signal/Images.xcassets/home_empty_splash_4.imageset/Contents.json create mode 100644 Signal/Images.xcassets/home_empty_splash_4.imageset/human-4@3x.png create mode 100644 Signal/Images.xcassets/home_empty_splash_5.imageset/Contents.json create mode 100644 Signal/Images.xcassets/home_empty_splash_5.imageset/human-5@3x.png diff --git a/Signal/Images.xcassets/home_empty_splash_1.imageset/Contents.json b/Signal/Images.xcassets/home_empty_splash_1.imageset/Contents.json new file mode 100644 index 000000000..c89f86a30 --- /dev/null +++ b/Signal/Images.xcassets/home_empty_splash_1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "human-1@3x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/home_empty_splash_1.imageset/human-1@3x.png b/Signal/Images.xcassets/home_empty_splash_1.imageset/human-1@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ec928120465c61716d4a6214350bf21adbfe4455 GIT binary patch literal 47610 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 a3Dw&yiJ4RgqyMGQIaeo+fyzwZa` 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 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/home_empty_splash_3.imageset/Contents.json b/Signal/Images.xcassets/home_empty_splash_3.imageset/Contents.json new file mode 100644 index 000000000..4def99f09 --- /dev/null +++ b/Signal/Images.xcassets/home_empty_splash_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "human-3@3x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/home_empty_splash_3.imageset/human-3@3x.png b/Signal/Images.xcassets/home_empty_splash_3.imageset/human-3@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb7a7653d2f3b2f3f1be410584e789571ee41ed GIT binary patch literal 52102 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

>-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�KaK7lpl~7G0y2OPl33>Dv|ln1=m_ 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 H*oOTN{_G>u literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m index b704db862..3c72976f5 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN [self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeLeading]; [self.qrScanningController.view autoPinEdgeToSuperviewEdge:ALEdgeTrailing]; [self.qrScanningController.view autoPinToTopLayoutGuideOfViewController:self withInset:0.f]; - [self.qrScanningController.view autoPinToAspectRatio:1.f]; + [self.qrScanningController.view autoPinToSquareAspectRatio]; UIView *bottomView = [UIView new]; [self.view addSubview:bottomView]; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2e8ab8ba1..45b039133 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -7,6 +7,7 @@ #import "AppSettingsViewController.h" #import "HomeViewCell.h" #import "NewContactThreadViewController.h" +#import "OWS2FARegistrationViewController.h" #import "OWSNavigationController.h" #import "OWSPrimaryStorage.h" #import "ProfileViewController.h" @@ -24,6 +25,7 @@ #import #import #import +#import #import #import #import @@ -68,7 +70,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations OWSBlockListCacheDelegate> @property (nonatomic) UITableView *tableView; -@property (nonatomic) UILabel *emptyBoxLabel; +@property (nonatomic) UIView *emptyInboxView; @property (nonatomic) YapDatabaseConnection *editingDbConnection; @property (nonatomic) YapDatabaseConnection *uiDatabaseConnection; @@ -328,17 +330,42 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.estimatedRowHeight = 60; - UILabel *emptyBoxLabel = [UILabel new]; - self.emptyBoxLabel = emptyBoxLabel; - [self.view addSubview:emptyBoxLabel]; - - // Let the label use as many lines as needed. It will very rarely be more than 2 but may happen for verbose locs. - [emptyBoxLabel setNumberOfLines:0]; - emptyBoxLabel.lineBreakMode = NSLineBreakByWordWrapping; - - [emptyBoxLabel autoPinLeadingToSuperviewMargin]; - [emptyBoxLabel autoPinTrailingToSuperviewMargin]; - [emptyBoxLabel autoAlignAxisToSuperviewAxis:ALAxisHorizontal]; + NSArray *emptyInboxImageNames = @[ + @"home_empty_splash_1", + @"home_empty_splash_2", + @"home_empty_splash_3", + @"home_empty_splash_4", + @"home_empty_splash_5", + ]; + NSString *emptyInboxImageName = emptyInboxImageNames[arc4random_uniform((uint32_t) emptyInboxImageNames.count)]; + UIImageView *emptyInboxImageView = [UIImageView new]; + emptyInboxImageView.image = [UIImage imageNamed:emptyInboxImageName]; + emptyInboxImageView.layer.minificationFilter = kCAFilterTrilinear; + emptyInboxImageView.layer.magnificationFilter = kCAFilterTrilinear; + [emptyInboxImageView autoPinToAspectRatioWithSize:emptyInboxImageView.image.size]; + + UILabel *emptyInboxLabel = [UILabel new]; + emptyInboxLabel.text = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", + @"Message shown in the home view when the inbox is empty."); + emptyInboxLabel.font = UIFont.ows_dynamicTypeBodyFont; + emptyInboxLabel.textColor = Theme.secondaryColor; + emptyInboxLabel.textAlignment = NSTextAlignmentCenter; + emptyInboxLabel.numberOfLines = 0; + emptyInboxLabel.lineBreakMode = NSLineBreakByWordWrapping; + + UIStackView *emptyInboxStack = [[UIStackView alloc] initWithArrangedSubviews:@[ + emptyInboxImageView, + emptyInboxLabel, + ]]; + emptyInboxStack.axis = UILayoutConstraintAxisVertical; + emptyInboxStack.alignment = UIStackViewAlignmentCenter; + emptyInboxStack.spacing = 12; + emptyInboxStack.layoutMargins = UIEdgeInsetsMake(50, 50, 50, 50); + emptyInboxStack.layoutMarginsRelativeArrangement = YES; + self.emptyInboxView = emptyInboxStack; + [self.view addSubview:emptyInboxStack]; + [emptyInboxStack autoPinWidthToSuperviewMargins]; + [emptyInboxStack autoVCenterInSuperview]; UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; pullToRefreshView.tintColor = [UIColor grayColor]; @@ -1445,67 +1472,14 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations NSUInteger archiveCount = self.numberOfArchivedThreads; if (self.homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0) { - [self updateEmptyBoxText]; [_tableView setHidden:YES]; - [_emptyBoxLabel setHidden:NO]; - } else if (self.homeViewMode == HomeViewMode_Archive && archiveCount == 0) { - [self updateEmptyBoxText]; - [_tableView setHidden:YES]; - [_emptyBoxLabel setHidden:NO]; + [self.emptyInboxView setHidden:NO]; } else { - [_emptyBoxLabel setHidden:YES]; [_tableView setHidden:NO]; + [self.emptyInboxView setHidden:YES]; } } -- (void)updateEmptyBoxText -{ - // TODO: Theme, review with design. - _emptyBoxLabel.textColor = [UIColor grayColor]; - _emptyBoxLabel.font = [UIFont ows_regularFontWithSize:18.f]; - _emptyBoxLabel.textAlignment = NSTextAlignmentCenter; - - NSString *firstLine = @""; - NSString *secondLine = @""; - - if (self.homeViewMode == HomeViewMode_Inbox) { - if ([Environment.shared.preferences hasSentAMessage]) { - firstLine = NSLocalizedString( - @"EMPTY_INBOX_TITLE", @"Header text an existing user sees when viewing an empty inbox"); - secondLine = NSLocalizedString( - @"EMPTY_INBOX_TEXT", @"Body text an existing user sees when viewing an empty inbox"); - } else { - firstLine = NSLocalizedString( - @"EMPTY_INBOX_NEW_USER_TITLE", @"Header text a new user sees when viewing an empty inbox"); - secondLine = NSLocalizedString( - @"EMPTY_INBOX_NEW_USER_TEXT", @"Body text a new user sees when viewing an empty inbox"); - } - } else { - OWSAssertDebug(self.homeViewMode == HomeViewMode_Archive); - firstLine = NSLocalizedString( - @"EMPTY_ARCHIVE_TITLE", @"Header text an existing user sees when viewing an empty archive"); - secondLine = NSLocalizedString( - @"EMPTY_ARCHIVE_TEXT", @"Body text an existing user sees when viewing an empty archive"); - } - NSMutableAttributedString *fullLabelString = - [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@\n%@", firstLine, secondLine]]; - - [fullLabelString addAttribute:NSFontAttributeName - value:[UIFont ows_boldFontWithSize:15.f] - range:NSMakeRange(0, firstLine.length)]; - [fullLabelString addAttribute:NSFontAttributeName - value:[UIFont ows_regularFontWithSize:14.f] - range:NSMakeRange(firstLine.length + 1, secondLine.length)]; - [fullLabelString addAttribute:NSForegroundColorAttributeName - value:Theme.primaryColor - range:NSMakeRange(0, firstLine.length)]; - // TODO: Theme, Review with design. - [fullLabelString addAttribute:NSForegroundColorAttributeName - value:Theme.secondaryColor - range:NSMakeRange(firstLine.length + 1, secondLine.length)]; - _emptyBoxLabel.attributedText = fullLabelString; -} - // We want to delay asking for a review until an opportune time. // If the user has *just* launched Signal they intend to do something, we don't want to interrupt them. // If the user hasn't sent a message, we don't want to ask them for a review yet. diff --git a/Signal/src/views/RemoteVideoView.m b/Signal/src/views/RemoteVideoView.m index f0926155d..4104d5ad0 100644 --- a/Signal/src/views/RemoteVideoView.m +++ b/Signal/src/views/RemoteVideoView.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "RemoteVideoView.h" @@ -104,7 +104,6 @@ NS_ASSUME_NONNULL_BEGIN } CGFloat aspectRatio = remoteVideoSize.width / remoteVideoSize.height; - OWSLogVerbose(@"Remote video size: width: %f height: %f ratio: %f", remoteVideoSize.width, remoteVideoSize.height, @@ -125,7 +124,7 @@ NS_ASSUME_NONNULL_BEGIN // to approximate "scale to fill" contentMode // - Pin aspect ratio // - Width and height is *at least* as wide as superview - [constraints addObject:[videoView autoPinToAspectRatio:aspectRatio]]; + [constraints addObject:[videoView autoPinToAspectRatioWithSize:remoteVideoSize]]; [constraints addObject:[videoView autoSetDimension:ALDimensionWidth toSize:containingView.width relation:NSLayoutRelationGreaterThanOrEqual]]; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 667a5f55d..01dc21dc7 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1122,6 +1122,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 0c47facd0..7a775e6ef 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -41,6 +41,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); - (void)autoPinHeightToHeightOfView:(UIView *)view; - (NSLayoutConstraint *)autoPinToSquareAspectRatio; +- (NSLayoutConstraint *)autoPinToAspectRatioWithSize:(CGSize)size; - (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio; #pragma mark - Content Hugging and Compression Resistance diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index a4999a0a3..8bdc03c17 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -142,6 +142,10 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) return [self autoPinToAspectRatio:1.0]; } +- (NSLayoutConstraint *)autoPinToAspectRatioWithSize:(CGSize)size { + return [self autoPinToAspectRatio:size.width / size.height]; +} + - (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio { // Clamp to ensure view has reasonable aspect ratio. From c4cc5f5744f8e238ba8ae6f1f829b211fa8e13e2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Feb 2019 12:17:20 -0500 Subject: [PATCH 070/493] Rework 'empty inbox' state of home view. --- .../HomeView/HomeViewController.m | 90 ++++++++++++++----- 1 file changed, 70 insertions(+), 20 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 45b039133..fff3554a9 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -71,6 +71,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations @property (nonatomic) UITableView *tableView; @property (nonatomic) UIView *emptyInboxView; +@property (nonatomic) UIView *firstConversationCueView; @property (nonatomic) YapDatabaseConnection *editingDbConnection; @property (nonatomic) YapDatabaseConnection *uiDatabaseConnection; @@ -330,6 +331,28 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.estimatedRowHeight = 60; + self.emptyInboxView = [self createEmptyInboxView]; + [self.view addSubview:self.emptyInboxView]; + [self.emptyInboxView autoPinWidthToSuperviewMargins]; + [self.emptyInboxView autoVCenterInSuperview]; + + self.firstConversationCueView = [self createFirstConversationCueView]; + [self.view addSubview:self.firstConversationCueView]; + [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeTop]; + [self.firstConversationCueView autoPinEdgeToSuperviewMargin:ALEdgeTrailing]; + [self.emptyInboxView autoPinWidthToSuperviewMargins]; + [self.emptyInboxView autoVCenterInSuperview]; + + UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; + pullToRefreshView.tintColor = [UIColor grayColor]; + [pullToRefreshView addTarget:self + action:@selector(pullToRefreshPerformed:) + forControlEvents:UIControlEventValueChanged]; + [self.tableView insertSubview:pullToRefreshView atIndex:0]; +} + +- (UIView *)createEmptyInboxView +{ NSArray *emptyInboxImageNames = @[ @"home_empty_splash_1", @"home_empty_splash_2", @@ -362,17 +385,44 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations emptyInboxStack.spacing = 12; emptyInboxStack.layoutMargins = UIEdgeInsetsMake(50, 50, 50, 50); emptyInboxStack.layoutMarginsRelativeArrangement = YES; - self.emptyInboxView = emptyInboxStack; - [self.view addSubview:emptyInboxStack]; - [emptyInboxStack autoPinWidthToSuperviewMargins]; - [emptyInboxStack autoVCenterInSuperview]; + return emptyInboxStack; +} - UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; - pullToRefreshView.tintColor = [UIColor grayColor]; - [pullToRefreshView addTarget:self - action:@selector(pullToRefreshPerformed:) - forControlEvents:UIControlEventValueChanged]; - [self.tableView insertSubview:pullToRefreshView atIndex:0]; +- (UIView *)createFirstConversationCueView +{ + NSArray *emptyInboxImageNames = @[ + @"home_empty_splash_1", + @"home_empty_splash_2", + @"home_empty_splash_3", + @"home_empty_splash_4", + @"home_empty_splash_5", + ]; + NSString *emptyInboxImageName = emptyInboxImageNames[arc4random_uniform((uint32_t)emptyInboxImageNames.count)]; + UIImageView *emptyInboxImageView = [UIImageView new]; + emptyInboxImageView.image = [UIImage imageNamed:emptyInboxImageName]; + emptyInboxImageView.layer.minificationFilter = kCAFilterTrilinear; + emptyInboxImageView.layer.magnificationFilter = kCAFilterTrilinear; + [emptyInboxImageView autoPinToAspectRatioWithSize:emptyInboxImageView.image.size]; + + UILabel *emptyInboxLabel = [UILabel new]; + emptyInboxLabel.text + = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", @"Message shown in the home view when the inbox is empty."); + emptyInboxLabel.font = UIFont.ows_dynamicTypeBodyFont; + emptyInboxLabel.textColor = Theme.secondaryColor; + emptyInboxLabel.textAlignment = NSTextAlignmentCenter; + emptyInboxLabel.numberOfLines = 0; + emptyInboxLabel.lineBreakMode = NSLineBreakByWordWrapping; + + UIStackView *emptyInboxStack = [[UIStackView alloc] initWithArrangedSubviews:@[ + emptyInboxImageView, + emptyInboxLabel, + ]]; + emptyInboxStack.axis = UILayoutConstraintAxisVertical; + emptyInboxStack.alignment = UIStackViewAlignmentCenter; + emptyInboxStack.spacing = 12; + emptyInboxStack.layoutMargins = UIEdgeInsetsMake(50, 50, 50, 50); + emptyInboxStack.layoutMarginsRelativeArrangement = YES; + return emptyInboxStack; } - (void)updateReminderViews @@ -408,7 +458,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self uiDatabaseConnection]; [self updateMappings]; - [self checkIfEmptyView]; + [self updateViewState]; [self updateReminderViews]; [self observeNotifications]; @@ -664,7 +714,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations } } - [self checkIfEmptyView]; + [self updateViewState]; [self applyDefaultBackButton]; if ([self updateHasArchivedThreadsRow]) { [self.tableView reloadData]; @@ -734,7 +784,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self updateHasArchivedThreadsRow]; [self reloadTableViewData]; - [self checkIfEmptyView]; + [self updateViewState]; // If the user hasn't already granted contact access // we don't want to request until they receive a message. @@ -749,7 +799,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations - (void)applicationWillEnterForeground:(NSNotification *)notification { - [self checkIfEmptyView]; + [self updateViewState]; } - (BOOL)hasAnyMessagesWithTransaction:(YapDatabaseReadTransaction *)transaction @@ -1176,7 +1226,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [thread removeWithTransaction:transaction]; }]; - [self checkIfEmptyView]; + [self updateViewState]; } - (void)archiveIndexPath:(NSIndexPath *)indexPath @@ -1198,7 +1248,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations break; } }]; - [self checkIfEmptyView]; + [self updateViewState]; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath @@ -1303,7 +1353,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self resetMappings]; [self reloadTableViewData]; - [self checkIfEmptyView]; + [self updateViewState]; [self updateReminderViews]; } @@ -1354,7 +1404,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { [self.threadMappings updateWithTransaction:transaction]; }]; - [self checkIfEmptyView]; + [self updateViewState]; return; } @@ -1379,7 +1429,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations // We want this regardless of if we're currently viewing the archive. // So we run it before the early return - [self checkIfEmptyView]; + [self updateViewState]; if ([sectionChanges count] == 0 && [rowChanges count] == 0) { return; @@ -1466,7 +1516,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations return [self numberOfThreadsInGroup:TSArchiveGroup]; } -- (void)checkIfEmptyView +- (void)updateViewState { NSUInteger inboxCount = self.numberOfInboxThreads; NSUInteger archiveCount = self.numberOfArchivedThreads; From d5944b4b9d8f16bfda3ccf3acd7a8a9b66004aa9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 09:52:10 -0500 Subject: [PATCH 071/493] Add first conversation prompt. --- .../HomeView/HomeViewController.m | 173 ++++++++++++++---- .../translations/en.lproj/Localizable.strings | 30 ++- 2 files changed, 147 insertions(+), 56 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index fff3554a9..ad56ac345 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -71,7 +71,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations @property (nonatomic) UITableView *tableView; @property (nonatomic) UIView *emptyInboxView; + @property (nonatomic) UIView *firstConversationCueView; +@property (nonatomic) UILabel *firstConversationLabel; @property (nonatomic) YapDatabaseConnection *editingDbConnection; @property (nonatomic) YapDatabaseConnection *uiDatabaseConnection; @@ -218,6 +220,10 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations OWSAssertIsOnMainThread(); [self reloadTableViewData]; + + if (!self.firstConversationCueView.isHidden) { + [self updateFirstConversationLabel]; + } } - (void)registrationStateDidChange:(id)notification @@ -336,12 +342,15 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations [self.emptyInboxView autoPinWidthToSuperviewMargins]; [self.emptyInboxView autoVCenterInSuperview]; - self.firstConversationCueView = [self createFirstConversationCueView]; + [self createFirstConversationCueView]; [self.view addSubview:self.firstConversationCueView]; - [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeTop]; - [self.firstConversationCueView autoPinEdgeToSuperviewMargin:ALEdgeTrailing]; - [self.emptyInboxView autoPinWidthToSuperviewMargins]; - [self.emptyInboxView autoVCenterInSuperview]; + [self.firstConversationCueView autoPinToTopLayoutGuideOfViewController:self withInset:0.f]; + [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeTrailing withInset:10]; + [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeLeading + withInset:10 + relation:NSLayoutRelationGreaterThanOrEqual]; + [self.firstConversationCueView autoPinEdgeToSuperviewMargin:ALEdgeBottom + relation:NSLayoutRelationGreaterThanOrEqual]; UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; pullToRefreshView.tintColor = [UIColor grayColor]; @@ -370,7 +379,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations UILabel *emptyInboxLabel = [UILabel new]; emptyInboxLabel.text = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", @"Message shown in the home view when the inbox is empty."); - emptyInboxLabel.font = UIFont.ows_dynamicTypeBodyFont; + emptyInboxLabel.font = UIFont.ows_dynamicTypeBodyClampedFont; emptyInboxLabel.textColor = Theme.secondaryColor; emptyInboxLabel.textAlignment = NSTextAlignmentCenter; emptyInboxLabel.numberOfLines = 0; @@ -388,41 +397,128 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations return emptyInboxStack; } -- (UIView *)createFirstConversationCueView +- (void)createFirstConversationCueView { - NSArray *emptyInboxImageNames = @[ - @"home_empty_splash_1", - @"home_empty_splash_2", - @"home_empty_splash_3", - @"home_empty_splash_4", - @"home_empty_splash_5", - ]; - NSString *emptyInboxImageName = emptyInboxImageNames[arc4random_uniform((uint32_t)emptyInboxImageNames.count)]; - UIImageView *emptyInboxImageView = [UIImageView new]; - emptyInboxImageView.image = [UIImage imageNamed:emptyInboxImageName]; - emptyInboxImageView.layer.minificationFilter = kCAFilterTrilinear; - emptyInboxImageView.layer.magnificationFilter = kCAFilterTrilinear; - [emptyInboxImageView autoPinToAspectRatioWithSize:emptyInboxImageView.image.size]; + const CGFloat kTailWidth = 16.f; + const CGFloat kTailHeight = 8.f; + const CGFloat kTailHMargin = 12.f; - UILabel *emptyInboxLabel = [UILabel new]; - emptyInboxLabel.text - = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", @"Message shown in the home view when the inbox is empty."); - emptyInboxLabel.font = UIFont.ows_dynamicTypeBodyFont; - emptyInboxLabel.textColor = Theme.secondaryColor; - emptyInboxLabel.textAlignment = NSTextAlignmentCenter; - emptyInboxLabel.numberOfLines = 0; - emptyInboxLabel.lineBreakMode = NSLineBreakByWordWrapping; + UILabel *label = [UILabel new]; + label.textColor = UIColor.ows_whiteColor; + label.font = UIFont.ows_dynamicTypeBodyClampedFont; + label.numberOfLines = 0; + label.lineBreakMode = NSLineBreakByWordWrapping; - UIStackView *emptyInboxStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - emptyInboxImageView, - emptyInboxLabel, - ]]; - emptyInboxStack.axis = UILayoutConstraintAxisVertical; - emptyInboxStack.alignment = UIStackViewAlignmentCenter; - emptyInboxStack.spacing = 12; - emptyInboxStack.layoutMargins = UIEdgeInsetsMake(50, 50, 50, 50); - emptyInboxStack.layoutMarginsRelativeArrangement = YES; - return emptyInboxStack; + OWSLayerView *layerView = [OWSLayerView new]; + layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 7, 16); + CAShapeLayer *shapeLayer = [CAShapeLayer new]; + shapeLayer.fillColor = [OWSConversationColor ows_wintergreenColor].CGColor; + [layerView.layer addSublayer:shapeLayer]; + layerView.layoutCallback = ^(UIView *view) { + UIBezierPath *bezierPath = [UIBezierPath new]; + + // Bubble + CGRect bubbleBounds = view.bounds; + bubbleBounds.origin.y += kTailHeight; + bubbleBounds.size.height -= kTailHeight; + [bezierPath appendPath:[UIBezierPath bezierPathWithRoundedRect:bubbleBounds cornerRadius:8]]; + + // Tail + CGPoint tailTop = CGPointMake(kTailHMargin + kTailWidth * 0.5f, 0.f); + CGPoint tailLeft = CGPointMake(kTailHMargin, kTailHeight); + CGPoint tailRight = CGPointMake(kTailHMargin + kTailWidth, kTailHeight); + if (!CurrentAppContext().isRTL) { + tailTop.x = view.width - tailTop.x; + tailLeft.x = view.width - tailLeft.x; + tailRight.x = view.width - tailRight.x; + } + [bezierPath moveToPoint:tailTop]; + [bezierPath addLineToPoint:tailLeft]; + [bezierPath addLineToPoint:tailRight]; + [bezierPath addLineToPoint:tailTop]; + shapeLayer.path = bezierPath.CGPath; + shapeLayer.frame = view.bounds; + }; + + [layerView addSubview:label]; + [label ows_autoPinToSuperviewMargins]; + + self.firstConversationCueView = layerView; + self.firstConversationLabel = label; +} + +- (void)updateFirstConversationLabel +{ + NSArray *signalAccounts = self.contactsManager.signalAccounts; + + NSString *formatString = @""; + NSMutableArray *contactNames = [NSMutableArray new]; + if (signalAccounts.count >= 3) { + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[0]]]; + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[1]]]; + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[2]]]; + + formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT", + @"Format string for a label offering to start a new conversation with your contacts, if you have at least " + @"3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}."); + } else if (signalAccounts.count >= 2) { + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[0]]]; + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[1]]]; + + formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT", + @"Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal " + @"contacts. Embeds {{The names of 2 of your Signal contacts}}."); + } else if (signalAccounts.count >= 3) { + [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[0]]]; + + formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT", + @"Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal " + @"contact. Embeds {{The name of 1 of your Signal contacts}}."); + } + + NSString *embedToken = @"%@"; + NSArray *formatSplits = [formatString componentsSeparatedByString:embedToken]; + // We need to use a complicated format string that possibly embeds multiple contact names. + // Translator error could easily lead to an invalid format string. + // We need to verify that it was translated properly. + BOOL isValidFormatString = (contactNames.count > 0 && formatSplits.count == contactNames.count + 1); + for (NSString *contactName in contactNames) { + if ([contactName containsString:embedToken]) { + isValidFormatString = NO; + } + } + + NSMutableAttributedString *_Nullable attributedString = nil; + if (isValidFormatString) { + attributedString = [[NSMutableAttributedString alloc] initWithString:formatString]; + while (contactNames.count > 0) { + NSString *contactName = contactNames.firstObject; + [contactNames removeObjectAtIndex:0]; + + NSRange range = [attributedString.string rangeOfString:embedToken]; + if (range.location == NSNotFound) { + // Error + attributedString = nil; + break; + } + + NSAttributedString *formattedName = [[NSAttributedString alloc] + initWithString:contactName + attributes:@{ + NSFontAttributeName : self.firstConversationLabel.font.ows_mediumWeight, + }]; + [attributedString replaceCharactersInRange:range withAttributedString:formattedName]; + } + } + + if (!attributedString) { + // The default case handles the no-contacts scenario and all error cases. + NSString *defaultText = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS", + @"A label offering to start a new conversation with your contacts, if you have no Signal contacts."); + attributedString = [[NSMutableAttributedString alloc] initWithString:defaultText]; + } + + self.firstConversationLabel.attributedText = [attributedString copy]; } - (void)updateReminderViews @@ -1524,6 +1620,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations if (self.homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0) { [_tableView setHidden:YES]; [self.emptyInboxView setHidden:NO]; + [self updateFirstConversationLabel]; } else { [_tableView setHidden:NO]; [self.emptyInboxView setHidden:YES]; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 01dc21dc7..7f5a585c4 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -819,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Let's switch to Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "None of your contacts have Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Why don't you invite someone?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1074,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; From 3bb49e7d76b566ef51b2714cf2f3c74dea20fc9b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 13:41:28 -0500 Subject: [PATCH 072/493] Respond to CR. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index ad56ac345..2f4feb057 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -461,14 +461,14 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT", @"Format string for a label offering to start a new conversation with your contacts, if you have at least " @"3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}."); - } else if (signalAccounts.count >= 2) { + } else if (signalAccounts.count == 2) { [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[0]]]; [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[1]]]; formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT", @"Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal " @"contacts. Embeds {{The names of 2 of your Signal contacts}}."); - } else if (signalAccounts.count >= 3) { + } else if (signalAccounts.count == 1) { [contactNames addObject:[self.contactsManager displayNameForSignalAccount:signalAccounts[0]]]; formatString = NSLocalizedString(@"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT", From 850b369076536c8db097d399fcb5617436405383 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 10:25:56 -0500 Subject: [PATCH 073/493] Clean up onboarding changes. --- .../OnboardingBaseViewController.swift | 1 - .../OnboardingCaptchaViewController.swift | 3 -- .../Registration/OnboardingController.swift | 34 ++++++++++++++++--- .../OnboardingPermissionsViewController.swift | 2 -- .../OnboardingPhoneNumberViewController.swift | 2 -- .../OnboardingSplashViewController.swift | 1 - 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 7ed43e10a..ee9f380b0 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -58,7 +58,6 @@ public class OnboardingBaseViewController: OWSViewController { } private func button(title: String, selector: Selector, titleColor: UIColor, backgroundColor: UIColor) -> OWSFlatButton { - // TODO: Make sure this all fits if dynamic font sizes are maxed out. let font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() // Button height should be 48pt if the font is 17pt. let buttonHeight = font.pointSize * 48 / 17 diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index aace0845b..91cc9ed5d 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -16,9 +16,6 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { view.backgroundColor = Theme.backgroundColor view.layoutMargins = .zero - // TODO: - // navigationItem.title = NSLocalizedString("SETTINGS_BACKUP", comment: "Label for the backup view in app settings.") - let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_CAPTCHA_TITLE", comment: "Title of the 'onboarding Captcha' view.")) let titleRow = UIStackView(arrangedSubviews: [ diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index fd8f6124c..385f387a9 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -242,9 +242,13 @@ public class OnboardingController: NSObject { Logger.info("") - // TODO: -// let view = OnboardingCaptchaViewController(onboardingController: self) -// navigationController.pushViewController(view, animated: true) + guard let navigationController = viewController.navigationController else { + owsFailDebug("Missing navigationController") + return + } + + let view = Onboarding2FAViewController(onboardingController: self) + navigationController.pushViewController(view, animated: true) } @objc @@ -253,7 +257,7 @@ public class OnboardingController: NSObject { Logger.info("") - // TODO: + showHomeView(view: view) } @objc @@ -262,7 +266,27 @@ public class OnboardingController: NSObject { Logger.info("") - // TODO: + showHomeView(view: view) + } + + private func showHomeView(view: UIViewController) { + AssertIsOnMainThread() + + guard let navigationController = view.navigationController else { + owsFailDebug("Missing navigationController") + return + } + + // In production, this view will never be presented in a modal. + // During testing (debug UI, etc.), it may be a modal. + let isModal = navigationController.presentingViewController != nil + if isModal { + view.dismiss(animated: true, completion: { + SignalApp.shared().showHomeView() + }) + } else { + SignalApp.shared().showHomeView() + } } // MARK: - State diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 9d39883eb..904eed0a3 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -24,7 +24,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.")) - // TODO: Make sure this all fits if dynamic font sizes are maxed out. let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", comment: "Label for the 'give access' button in the 'onboarding permissions' view."), selector: #selector(giveAccessPressed)) @@ -63,7 +62,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { private func requestAccess() { Logger.info("") - // TODO: We need to defer app's request notification permissions until onboarding is complete. requestContactsAccess().then { _ in return PushRegistrationManager.shared.registerUserNotificationSettings() }.done { [weak self] in diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 830999486..7f9d8a7a7 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -105,8 +105,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { validationWarningLabel.autoPinHeightToSuperview() validationWarningLabel.autoPinEdge(toSuperviewEdge: .leading) - // TODO: Finalize copy. - let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 195e6dfa2..c0c23b4a4 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -37,7 +37,6 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { explanationLabel.isUserInteractionEnabled = true explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explanationLabelTapped))) - // TODO: Make sure this all fits if dynamic font sizes are maxed out. let continueButton = self.button(title: NSLocalizedString("BUTTON_CONTINUE", comment: "Label for 'continue' button."), selector: #selector(continuePressed)) From f7d659bdef474209c744eaf0bcd68c7629fcc6a1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 10:27:47 -0500 Subject: [PATCH 074/493] Clean up onboarding changes. --- Signal/src/environment/SignalApp.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 1b7f2a2df..2e2921c58 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "SignalApp.h" @@ -166,6 +166,9 @@ NS_ASSUME_NONNULL_BEGIN AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate; appDelegate.window.rootViewController = navigationController; OWSAssertDebug([navigationController.topViewController isKindOfClass:[HomeViewController class]]); + + // Clear the signUpFlowNavigationController. + [self setSignUpFlowNavigationController:nil]; } @end From ef5cd5344e139810717af4b39e119ad4faf7a939 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 11:31:45 -0500 Subject: [PATCH 075/493] Fix the auto-format of phone numbers in the onboarding views. --- .../OnboardingPhoneNumberViewController.swift | 11 ++- .../ViewControllers/ViewControllerUtils.h | 8 ++ .../ViewControllers/ViewControllerUtils.m | 73 +++++++++++++++++-- 3 files changed, 83 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 7f9d8a7a7..724fb6871 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -103,7 +103,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) validationWarningLabel.autoPinHeightToSuperview() - validationWarningLabel.autoPinEdge(toSuperviewEdge: .leading) + validationWarningLabel.autoPinEdge(toSuperviewEdge: .trailing) let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), @@ -216,6 +216,9 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.isEnabled = false updateViewState() + + // Trigger the formatting logic with a no-op edit. + _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") } // MARK: - @@ -250,6 +253,9 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { } updateViewState() + + // Trigger the formatting logic with a no-op edit. + _ = textField(phoneNumberTextField, shouldChangeCharactersIn: NSRange(location: 0, length: 0), replacementString: "") } private func updateViewState() { @@ -365,8 +371,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { extension OnboardingPhoneNumberViewController: UITextFieldDelegate { public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - // TODO: Fix auto-format of phone numbers. - ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode) + ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode, prefix: callingCode) isPhoneNumberInvalid = false updateValidationWarnings() diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.h b/SignalMessaging/ViewControllers/ViewControllerUtils.h index 38b26561d..ed30d0e4c 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.h +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.h @@ -22,6 +22,14 @@ extern NSString *const TappedStatusBarNotification; replacementString:(NSString *)insertionText countryCode:(NSString *)countryCode; +// If non-null, the prefix should represent the calling code +// prefix for the number, e.g. +1. ++ (void)phoneNumberTextField:(UITextField *)textField + shouldChangeCharactersInRange:(NSRange)range + replacementString:(NSString *)insertionText + countryCode:(NSString *)countryCode + prefix:(nullable NSString *)prefix; + + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText; diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.m b/SignalMessaging/ViewControllers/ViewControllerUtils.m index 441e3e797..c8023e942 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.m +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.m @@ -90,20 +90,81 @@ const NSUInteger kMax2FAPinLength = 16; // reformat the phone number, trying to keep the cursor beside the inserted or deleted digit NSUInteger cursorPositionAfterChange = MIN(left.length + center.length, textAfterChange.length); - NSString *textAfterReformat = - [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textAfterChange - withSpecifiedCountryCodeString:countryCode]; + NSString *textToFormat = textAfterChange; + NSString *formattedText = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textToFormat + withSpecifiedCountryCodeString:countryCode]; NSUInteger cursorPositionAfterReformat = [PhoneNumberUtil translateCursorPosition:cursorPositionAfterChange - from:textAfterChange - to:textAfterReformat + from:textToFormat + to:formattedText stickingRightward:isJustDeletion]; - textField.text = textAfterReformat; + // PhoneNumber's formatting logic requires a calling code. + // + // If we want to edit the phone number separately from the calling code + // (e.g. in the new onboarding views), we need to temporarily prepend the + // calling code during formatting, then remove it afterward. This is + // non-trivial since the calling code itself can be affected by the + // formatting. Additionally, we need to ensure that this prepend/remove + // doesn't affect the cursor position. + BOOL hasPrefix = prefix.length > 0; + if (hasPrefix) { + // Prepend the prefix. + NSString *textToFormatWithPrefix = [prefix stringByAppendingString:textAfterChange]; + // Format with the prefix. + NSString *formattedTextWithPrefix = + [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textToFormatWithPrefix + withSpecifiedCountryCodeString:countryCode]; + // Determine the new cursor position with the prefix. + NSUInteger cursorPositionWithPrefix = [PhoneNumberUtil translateCursorPosition:cursorPositionAfterChange + from:textToFormat + to:formattedTextWithPrefix + stickingRightward:isJustDeletion]; + // Try to determine how much of the formatted text is derived + // from the prefix. + NSString *_Nullable formattedPrefix = + [self findFormattedPrefixForPrefix:prefix formattedText:formattedTextWithPrefix]; + if (formattedPrefix && cursorPositionWithPrefix >= formattedPrefix.length) { + // Remove the prefix from the formatted text. + formattedText = [formattedTextWithPrefix substringFromIndex:formattedPrefix.length]; + // Adjust the cursor position accordingly. + cursorPositionAfterReformat = cursorPositionWithPrefix - formattedPrefix.length; + } + } + + textField.text = formattedText; UITextPosition *pos = [textField positionFromPosition:textField.beginningOfDocument offset:(NSInteger)cursorPositionAfterReformat]; [textField setSelectedTextRange:[textField textRangeFromPosition:pos toPosition:pos]]; } ++ (nullable NSString *)findFormattedPrefixForPrefix:(NSString *)prefix formattedText:(NSString *)formattedText +{ + NSCharacterSet *characterSet = [[NSCharacterSet characterSetWithCharactersInString:@"+0123456789"] invertedSet]; + NSString *filteredPrefix = + [[prefix componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; + NSString *filteredText = + [[formattedText componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; + if (filteredPrefix.length < 1 || filteredText.length < 1 || ![filteredText hasPrefix:filteredPrefix]) { + OWSFailDebug(@"Invalid prefix: '%@' for formatted text: '%@'", prefix, formattedText); + return nil; + } + NSString *filteredTextWithoutPrefix = [filteredText substringFromIndex:filteredPrefix.length]; + // To find the "formatted prefix", try to find the shortest "tail" of formattedText + // which after being filtered is equivalent to the "filtered text" - "filter prefix". + // The "formatted prefix" is the "head" that corresponds to that "tail". + for (NSUInteger substringLength = 1; substringLength < formattedText.length - 1; substringLength++) { + NSUInteger pivot = formattedText.length - substringLength; + NSString *head = [formattedText substringToIndex:pivot]; + NSString *tail = [formattedText substringFromIndex:pivot]; + NSString *filteredTail = + [[tail componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; + if ([filteredTail isEqualToString:filteredTextWithoutPrefix]) { + return head; + } + } + return nil; +} + + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText From 4d4b840787e7e6e5743c4b9010bb70ccddc42758 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 13:59:49 -0500 Subject: [PATCH 076/493] Respond to CR. --- .../OnboardingPhoneNumberViewController.swift | 2 +- .../Registration/RegistrationViewController.m | 2 +- .../SelectRecipientViewController.m | 2 +- .../ViewControllers/ViewControllerUtils.h | 12 +-- .../ViewControllers/ViewControllerUtils.m | 78 +------------------ 5 files changed, 8 insertions(+), 88 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index 724fb6871..bd521d2db 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -371,7 +371,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { extension OnboardingPhoneNumberViewController: UITextFieldDelegate { public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, countryCode: countryCode, prefix: callingCode) + ViewControllerUtils.phoneNumber(textField, shouldChangeCharactersIn: range, replacementString: string, callingCode: callingCode) isPhoneNumberInvalid = false updateValidationWarnings() diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index 823d7385f..2a2a0d914 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -552,7 +552,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi [ViewControllerUtils phoneNumberTextField:textField shouldChangeCharactersInRange:range replacementString:insertionText - countryCode:_callingCode]; + callingCode:_callingCode]; return NO; // inform our caller that we took care of performing the change } diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index 01c06b2ce..006bd0c9c 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -423,7 +423,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien [ViewControllerUtils phoneNumberTextField:textField shouldChangeCharactersInRange:range replacementString:insertionText - countryCode:_callingCode]; + callingCode:_callingCode]; [self updatePhoneNumberButtonEnabling]; diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.h b/SignalMessaging/ViewControllers/ViewControllerUtils.h index ed30d0e4c..f027db313 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.h +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.h @@ -17,18 +17,12 @@ extern NSString *const TappedStatusBarNotification; // This convenience function can be used to reformat the contents of // a phone number text field as the user modifies its text by typing, // pasting, etc. +// +// "callingCode" should be of the form: "+1". + (void)phoneNumberTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText - countryCode:(NSString *)countryCode; - -// If non-null, the prefix should represent the calling code -// prefix for the number, e.g. +1. -+ (void)phoneNumberTextField:(UITextField *)textField - shouldChangeCharactersInRange:(NSRange)range - replacementString:(NSString *)insertionText - countryCode:(NSString *)countryCode - prefix:(nullable NSString *)prefix; + callingCode:(NSString *)callingCode; + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range diff --git a/SignalMessaging/ViewControllers/ViewControllerUtils.m b/SignalMessaging/ViewControllers/ViewControllerUtils.m index c8023e942..96896f08a 100644 --- a/SignalMessaging/ViewControllers/ViewControllerUtils.m +++ b/SignalMessaging/ViewControllers/ViewControllerUtils.m @@ -21,20 +21,7 @@ const NSUInteger kMax2FAPinLength = 16; + (void)phoneNumberTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText - countryCode:(NSString *)countryCode -{ - return [self phoneNumberTextField:textField - shouldChangeCharactersInRange:range - replacementString:insertionText - countryCode:countryCode - prefix:nil]; -} - -+ (void)phoneNumberTextField:(UITextField *)textField - shouldChangeCharactersInRange:(NSRange)range - replacementString:(NSString *)insertionText - countryCode:(NSString *)countryCode - prefix:(nullable NSString *)prefix + callingCode:(NSString *)callingCode { // Phone numbers takes many forms. // @@ -92,79 +79,18 @@ const NSUInteger kMax2FAPinLength = 16; NSString *textToFormat = textAfterChange; NSString *formattedText = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textToFormat - withSpecifiedCountryCodeString:countryCode]; + withSpecifiedCountryCodeString:callingCode]; NSUInteger cursorPositionAfterReformat = [PhoneNumberUtil translateCursorPosition:cursorPositionAfterChange from:textToFormat to:formattedText stickingRightward:isJustDeletion]; - // PhoneNumber's formatting logic requires a calling code. - // - // If we want to edit the phone number separately from the calling code - // (e.g. in the new onboarding views), we need to temporarily prepend the - // calling code during formatting, then remove it afterward. This is - // non-trivial since the calling code itself can be affected by the - // formatting. Additionally, we need to ensure that this prepend/remove - // doesn't affect the cursor position. - BOOL hasPrefix = prefix.length > 0; - if (hasPrefix) { - // Prepend the prefix. - NSString *textToFormatWithPrefix = [prefix stringByAppendingString:textAfterChange]; - // Format with the prefix. - NSString *formattedTextWithPrefix = - [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:textToFormatWithPrefix - withSpecifiedCountryCodeString:countryCode]; - // Determine the new cursor position with the prefix. - NSUInteger cursorPositionWithPrefix = [PhoneNumberUtil translateCursorPosition:cursorPositionAfterChange - from:textToFormat - to:formattedTextWithPrefix - stickingRightward:isJustDeletion]; - // Try to determine how much of the formatted text is derived - // from the prefix. - NSString *_Nullable formattedPrefix = - [self findFormattedPrefixForPrefix:prefix formattedText:formattedTextWithPrefix]; - if (formattedPrefix && cursorPositionWithPrefix >= formattedPrefix.length) { - // Remove the prefix from the formatted text. - formattedText = [formattedTextWithPrefix substringFromIndex:formattedPrefix.length]; - // Adjust the cursor position accordingly. - cursorPositionAfterReformat = cursorPositionWithPrefix - formattedPrefix.length; - } - } - textField.text = formattedText; UITextPosition *pos = [textField positionFromPosition:textField.beginningOfDocument offset:(NSInteger)cursorPositionAfterReformat]; [textField setSelectedTextRange:[textField textRangeFromPosition:pos toPosition:pos]]; } -+ (nullable NSString *)findFormattedPrefixForPrefix:(NSString *)prefix formattedText:(NSString *)formattedText -{ - NSCharacterSet *characterSet = [[NSCharacterSet characterSetWithCharactersInString:@"+0123456789"] invertedSet]; - NSString *filteredPrefix = - [[prefix componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; - NSString *filteredText = - [[formattedText componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; - if (filteredPrefix.length < 1 || filteredText.length < 1 || ![filteredText hasPrefix:filteredPrefix]) { - OWSFailDebug(@"Invalid prefix: '%@' for formatted text: '%@'", prefix, formattedText); - return nil; - } - NSString *filteredTextWithoutPrefix = [filteredText substringFromIndex:filteredPrefix.length]; - // To find the "formatted prefix", try to find the shortest "tail" of formattedText - // which after being filtered is equivalent to the "filtered text" - "filter prefix". - // The "formatted prefix" is the "head" that corresponds to that "tail". - for (NSUInteger substringLength = 1; substringLength < formattedText.length - 1; substringLength++) { - NSUInteger pivot = formattedText.length - substringLength; - NSString *head = [formattedText substringToIndex:pivot]; - NSString *tail = [formattedText substringFromIndex:pivot]; - NSString *filteredTail = - [[tail componentsSeparatedByCharactersInSet:characterSet] componentsJoinedByString:@""]; - if ([filteredTail isEqualToString:filteredTextWithoutPrefix]) { - return head; - } - } - return nil; -} - + (void)ows2FAPINTextField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText From 4b38653ee5343cb3246d803699149899901b097d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 12:50:44 -0700 Subject: [PATCH 077/493] "Bump build to 2.37.0.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 34c264718..38e447462 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.36.0 + 2.37.0 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.36.0.7 + 2.37.0.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index a4b9ea1c7..69bb0f83d 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.36.0 + 2.37.0 CFBundleVersion - 2.36.0.7 + 2.37.0.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 247eab22ca4b33691ea8208abbfa1584c29e6a66 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 13:05:33 -0700 Subject: [PATCH 078/493] reenable UNUserNotifications --- Signal/src/UserInterface/Notifications/AppNotifications.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 280c250fc..1f5673ccf 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -137,7 +137,7 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { @objc public override init() { - let userNotificationsFeatureEnabled = false + let userNotificationsFeatureEnabled = true if userNotificationsFeatureEnabled, #available(iOS 10, *) { self.adaptee = UserNotificationPresenterAdaptee() } else { From a01cb04d8532358d6bdac2ba3f5f35b1918d4dfd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 13:31:43 -0700 Subject: [PATCH 079/493] FIX: Onboarding controller sets phoneNumberAwaitingForVerification --- SignalServiceKit/src/Account/TSAccountManager.h | 5 ----- SignalServiceKit/src/Account/TSAccountManager.m | 5 ----- 2 files changed, 10 deletions(-) diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h index 1f0baf7b5..6cced2d2c 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.h +++ b/SignalServiceKit/src/Account/TSAccountManager.h @@ -27,12 +27,7 @@ typedef NS_ENUM(NSUInteger, OWSRegistrationState) { @interface TSAccountManager : NSObject -// This property is exposed for testing purposes only. -#ifdef DEBUG @property (nonatomic, nullable) NSString *phoneNumberAwaitingVerification; -#endif - -- (void)setPhoneNumberAwaitingVerification:(NSString *_Nullable)phoneNumberAwaitingVerification; #pragma mark - Initializers diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 5e2d18a82..976de737e 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -46,11 +46,6 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa @property (atomic, readonly) BOOL isRegistered; -// This property is exposed publicly for testing purposes only. -#ifndef DEBUG -@property (nonatomic, nullable) NSString *phoneNumberAwaitingVerification; -#endif - @property (nonatomic, nullable) NSString *cachedLocalNumber; @property (nonatomic, readonly) YapDatabaseConnection *dbConnection; From 0dc0ef64480abd7e8a6d6f009950af440deef6c3 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 13:39:03 -0700 Subject: [PATCH 080/493] "Bump build to 2.37.0.1." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 38e447462..e670a5381 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.0 + 2.37.0.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 69bb0f83d..64c3539a2 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.0 + 2.37.0.1 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From a02531d2246279a5fb122d6a7a6f69d46ac7df9c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 18 Jan 2019 09:00:23 -0500 Subject: [PATCH 081/493] Add accessibility identifiers to registration view. --- .../Registration/RegistrationViewController.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index 2a2a0d914..374e2c742 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN +#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) +#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) + #ifdef DEBUG NSString *const kKeychainService_LastRegistered = @"kKeychainService_LastRegistered"; @@ -81,6 +86,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi self.view.userInteractionEnabled = YES; [self.view addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backgroundTapped:)]]; + self.view.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"root_view"); UIView *headerWrapper = [UIView containerView]; [self.view addSubview:headerWrapper]; @@ -112,6 +118,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi legalTopMatterLabel.textAlignment = NSTextAlignmentCenter; legalTopMatterLabel.attributedText = attributedLegalTopMatter; legalTopMatterLabel.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, legalTopMatterLabel); UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapLegalTerms:)]; @@ -157,6 +164,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi [countryRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(countryCodeRowWasTapped:)]]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, countryRow); UILabel *countryNameLabel = [UILabel new]; countryNameLabel.text @@ -216,6 +224,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi [phoneNumberRow addSubview:phoneNumberTextField]; [phoneNumberTextField autoVCenterInSuperview]; [phoneNumberTextField autoPinTrailingToSuperviewMargin]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, phoneNumberTextField); UILabel *examplePhoneNumberLabel = [UILabel new]; self.examplePhoneNumberLabel = examplePhoneNumberLabel; @@ -253,6 +262,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi [activateButton autoPinLeadingAndTrailingToSuperviewMargin]; [activateButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:separatorView2 withOffset:15]; [activateButton autoSetDimension:ALDimensionHeight toSize:kActivateButtonHeight]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, activateButton); UIActivityIndicatorView *spinnerView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; @@ -282,6 +292,8 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi withOffset:ScaleFromIPhone5To7Plus(8, 12)]; [bottomLegalLinkButton setCompressionResistanceHigh]; [bottomLegalLinkButton setContentHuggingHigh]; + + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, bottomLegalLinkButton); } - (void)viewDidAppear:(BOOL)animated From d0e4e081ef3560b0205273b72181c31bc283c170 Mon Sep 17 00:00:00 2001 From: Nancy Mast Date: Thu, 7 Feb 2019 15:18:29 -0800 Subject: [PATCH 082/493] added accessibility ids to HomeViewController and ProfileViewController --- .../src/ViewControllers/HomeView/HomeViewController.m | 10 ++++++++-- Signal/src/ViewControllers/ProfileViewController.m | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2f4feb057..81a3fbc38 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -38,6 +38,13 @@ NS_ASSUME_NONNULL_BEGIN +NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversationsReuseIdentifier"; + +#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) +#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) + typedef NS_ENUM(NSInteger, HomeViewMode) { HomeViewMode_Archive, HomeViewMode_Inbox, @@ -60,8 +67,6 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { HomeViewControllerSectionArchiveButton, }; -NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversationsReuseIdentifier"; - @interface HomeViewController () Date: Tue, 19 Feb 2019 16:11:36 -0500 Subject: [PATCH 083/493] Move the accessibility identifier macros into UIUtil.h. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 5 ----- Signal/src/ViewControllers/ProfileViewController.m | 6 +----- .../Registration/RegistrationViewController.m | 6 +----- SignalMessaging/utils/UIUtil.h | 5 +++++ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 81a3fbc38..e3aa1b7d8 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -40,11 +40,6 @@ NS_ASSUME_NONNULL_BEGIN NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversationsReuseIdentifier"; -#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) -#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) - typedef NS_ENUM(NSInteger, HomeViewMode) { HomeViewMode_Archive, HomeViewMode_Inbox, diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 8321fb872..96417a830 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -18,14 +18,10 @@ #import #import #import +#import NS_ASSUME_NONNULL_BEGIN -#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) -#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) - typedef NS_ENUM(NSInteger, ProfileViewMode) { ProfileViewMode_AppSettings = 0, ProfileViewMode_Registration, diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m index 374e2c742..1f9de366e 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ b/Signal/src/ViewControllers/Registration/RegistrationViewController.m @@ -15,14 +15,10 @@ #import #import #import +#import NS_ASSUME_NONNULL_BEGIN -#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) -#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) - #ifdef DEBUG NSString *const kKeychainService_LastRegistered = @"kKeychainService_LastRegistered"; diff --git a/SignalMessaging/utils/UIUtil.h b/SignalMessaging/utils/UIUtil.h index 5119c7eda..715c4be62 100644 --- a/SignalMessaging/utils/UIUtil.h +++ b/SignalMessaging/utils/UIUtil.h @@ -7,6 +7,11 @@ #import #import +#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ +([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) +#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ +_variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) + typedef void (^completionBlock)(void); /** From 34585bdeb32a8bd6e6f18b1d2620765f525073d5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 19:11:10 -0700 Subject: [PATCH 084/493] Increase message retries --- SignalServiceKit/src/Network/MessageSenderJobQueue.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Network/MessageSenderJobQueue.swift b/SignalServiceKit/src/Network/MessageSenderJobQueue.swift index ea121ca0c..e2891998d 100644 --- a/SignalServiceKit/src/Network/MessageSenderJobQueue.swift +++ b/SignalServiceKit/src/Network/MessageSenderJobQueue.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -81,7 +81,7 @@ public class MessageSenderJobQueue: NSObject, JobQueue { public typealias DurableOperationType = MessageSenderOperation public static let jobRecordLabel: String = "MessageSender" - public static let maxRetries: UInt = 10 + public static let maxRetries: UInt = 30 public let requiresInternet: Bool = true public var runningOperations: [MessageSenderOperation] = [] @@ -211,7 +211,7 @@ public class MessageSenderOperation: OWSOperation, DurableOperation { // ... // try 11 delay: 61.31s let backoffFactor = 1.9 - let maxBackoff = kHourInterval + let maxBackoff = 15 * kMinuteInterval let seconds = 0.1 * min(maxBackoff, pow(backoffFactor, Double(self.jobRecord.failureCount))) return seconds From 29b49d6f43bb03c32c93e5df3811c758c5b01104 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 10:23:11 -0500 Subject: [PATCH 085/493] Enable new onboarding in production. --- Signal/src/AppDelegate.m | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 03fc5d67a..1a6860b7b 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1479,11 +1479,7 @@ static NSTimeInterval launchStartedAt; rootViewController = [HomeViewController new]; } } else { - if (OWSIsDebugBuild()) { - rootViewController = [[OnboardingController new] initialViewController]; - } else { - rootViewController = [RegistrationViewController new]; - } + rootViewController = [[OnboardingController new] initialViewController]; navigationBarHidden = YES; } OWSAssertDebug(rootViewController); From a6ee64fe75b9ddaa336ce41cfe8f51e6bb2469b3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 10:25:26 -0500 Subject: [PATCH 086/493] "Bump build to 2.37.0.2." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index e670a5381..3a5412e01 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.1 + 2.37.0.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 64c3539a2..d569851bb 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.1 + 2.37.0.2 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 9471f24cf38519a74f46fa7c45acc96c11ac02d2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 17:20:07 -0500 Subject: [PATCH 087/493] Introduce ConversationSnapshot. --- .../ConversationViewController.m | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a40183cd2..891f994c2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,6 +108,25 @@ typedef enum : NSUInteger { #pragma mark - +// We use snapshots to ensure that the view has a consistent +// representation of view model state which is not updated +// when the view is not observing view model changes. +@interface ConversationSnapshot : NSObject + +@property (nonatomic) NSArray> *viewItems; +@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; +@property (nonatomic) BOOL canLoadMoreItems; + +@end + +#pragma mark - + +@implementation ConversationSnapshot + +@end + +#pragma mark - + @interface ConversationViewController () > *)viewItems { - return self.conversationViewModel.viewItems; + return self.conversationSnapshot.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationViewModel.dynamicInteractions; + return self.conversationSnapshot.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -1696,7 +1718,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -4136,6 +4158,7 @@ typedef enum : NSUInteger { if (self.shouldObserveVMUpdates) { OWSLogVerbose(@"resume observation of view model."); + [self updateConversationSnapshot]; [self resetContentAndLayout]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4610,6 +4633,7 @@ typedef enum : NSUInteger { return; } + [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4901,6 +4925,17 @@ typedef enum : NSUInteger { [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; } +#pragma mark - Conversation Snapshot + +- (void)updateConversationSnapshot +{ + ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; + conversationSnapshot.viewItems = self.conversationViewModel.viewItems; + conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; + conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; + _conversationSnapshot = conversationSnapshot; +} + @end NS_ASSUME_NONNULL_END From 8b3d08c7e3e166b13013b93d5ebd386571a6ea6d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 17:49:40 -0500 Subject: [PATCH 088/493] Introduce ConversationSnapshot. --- .../ConversationViewController.m | 26 +++++++++---- .../ConversationView/ConversationViewModel.h | 2 +- .../ConversationView/ConversationViewModel.m | 39 ++++++++++++------- SignalMessaging/utils/ThreadUtil.m | 15 +++++++ 4 files changed, 59 insertions(+), 23 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 891f994c2..a5c976bea 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -450,11 +450,11 @@ typedef enum : NSUInteger { NSString *_Nullable recipientId = notification.userInfo[kNSNotificationKey_ProfileRecipientId]; NSData *_Nullable groupId = notification.userInfo[kNSNotificationKey_ProfileGroupId]; if (recipientId.length > 0 && [self.thread.recipientIdentifiers containsObject:recipientId]) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } else if (groupId.length > 0 && self.thread.isGroupThread) { TSGroupThread *groupThread = (TSGroupThread *)self.thread; if ([groupThread.groupModel.groupId isEqualToData:groupId]) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; [self ensureBannerState]; } } @@ -868,6 +868,7 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; + [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -2437,7 +2438,7 @@ typedef enum : NSUInteger { - (void)contactsViewHelperDidUpdateContacts { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)createConversationScrollButtons @@ -2475,7 +2476,7 @@ typedef enum : NSUInteger { _hasUnreadMessages = hasUnreadMessages; self.scrollDownButton.hasUnreadMessages = hasUnreadMessages; - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)scrollDownButtonTapped @@ -2620,7 +2621,7 @@ typedef enum : NSUInteger { [self showApprovalDialogForAttachment:attachment]; [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)messageWasSent:(TSOutgoingMessage *)message @@ -2980,7 +2981,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } }]; } @@ -3626,7 +3627,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } }); } @@ -4029,7 +4030,7 @@ typedef enum : NSUInteger { [self clearDraft]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } } @@ -4927,6 +4928,15 @@ typedef enum : NSUInteger { #pragma mark - Conversation Snapshot +- (void)tryToUpdateConversationSnapshot +{ + if (!self.isObservingVMUpdates) { + return; + } + + [self updateConversationSnapshot]; +} + - (void)updateConversationSnapshot { ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index c4d781b3a..902413760 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -93,7 +93,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { focusMessageIdOnOpen:(nullable NSString *)focusMessageIdOnOpen delegate:(id)delegate NS_DESIGNATED_INITIALIZER; -- (void)ensureDynamicInteractions; +- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary; - (void)clearUnreadMessagesIndicator; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index a5e589734..f1086644e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -273,7 +273,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; { OWSAssertIsOnMainThread(); - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)profileWhitelistDidChange:(NSNotification *)notification @@ -308,7 +308,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.typingIndicatorsSender = [self.typingIndicators typingRecipientIdForThread:self.thread]; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; [self.primaryStorage updateUIDatabaseConnectionToLatest]; [self createNewMessageMapping]; @@ -464,21 +464,32 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; } -- (void)ensureDynamicInteractions +- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary { OWSAssertIsOnMainThread(); const int currentMaxRangeSize = (int)self.messageMapping.desiredLength; const int maxRangeSize = MAX(kConversationInitialMaxRangeSize, currentMaxRangeSize); - self.dynamicInteractions = [ThreadUtil ensureDynamicInteractionsForThread:self.thread - contactsManager:self.contactsManager - blockingManager:self.blockingManager - dbConnection:self.editingDatabaseConnection - hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator - lastUnreadIndicator:self.dynamicInteractions.unreadIndicator - focusMessageId:self.focusMessageIdOnOpen - maxRangeSize:maxRangeSize]; + ThreadDynamicInteractions *dynamicInteractions = + [ThreadUtil ensureDynamicInteractionsForThread:self.thread + contactsManager:self.contactsManager + blockingManager:self.blockingManager + dbConnection:self.editingDatabaseConnection + hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator + lastUnreadIndicator:self.dynamicInteractions.unreadIndicator + focusMessageId:self.focusMessageIdOnOpen + maxRangeSize:maxRangeSize]; + BOOL didChange = ![NSObject isNullableObject:self.dynamicInteractions equalTo:dynamicInteractions]; + self.dynamicInteractions = dynamicInteractions; + + if (didChange && updateIfNecessary) { + if (![self reloadViewItems]) { + OWSFailDebug(@"Failed to reload view items."); + } + + [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; + } } - (nullable id)viewItemForUnreadMessagesIndicator @@ -519,7 +530,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; if (self.dynamicInteractions.unreadIndicator) { // If we've just cleared the "unread messages" indicator, // update the dynamic interactions. - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } } @@ -962,7 +973,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); @@ -1584,7 +1595,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 2d5b182f3..f42badd4c 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -45,6 +45,21 @@ NS_ASSUME_NONNULL_BEGIN self.unreadIndicator = nil; } +- (BOOL)isEqual:(id)object +{ + if (self == object) { + return YES; + } + + if (![object isKindOfClass:[ThreadDynamicInteractions class]]) { + return NO; + } + + ThreadDynamicInteractions *other = (ThreadDynamicInteractions *)object; + return ([NSObject isNullableObject:self.focusMessagePosition equalTo:other.focusMessagePosition] && + [NSObject isNullableObject:self.unreadIndicator equalTo:other.unreadIndicator]); +} + @end #pragma mark - From 01cc5cb36a4b22aed9346139721eee0a0008670e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 10:56:36 -0500 Subject: [PATCH 089/493] "Bump build to 2.37.0.3." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 3a5412e01..5ce47d308 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.2 + 2.37.0.3 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index d569851bb..d9e2eb8bb 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.2 + 2.37.0.3 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From dd1d02593a1c5a324d1ae04a7abda7c65931ed88 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 20:27:23 -0500 Subject: [PATCH 090/493] Fix "first conversation cue" visibility. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index e3aa1b7d8..2b34e195b 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -1621,10 +1621,12 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { if (self.homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0) { [_tableView setHidden:YES]; [self.emptyInboxView setHidden:NO]; + [self.firstConversationCueView setHidden:NO]; [self updateFirstConversationLabel]; } else { [_tableView setHidden:NO]; [self.emptyInboxView setHidden:YES]; + [self.firstConversationCueView setHidden:YES]; } } From 467dde2bc9bfc42b3911204beb97ff40b84db8c9 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 20:35:53 -0700 Subject: [PATCH 091/493] Try to avoid generating link previews while user is actively editing the URL --- .../ConversationInputTextView.h | 3 +- .../ConversationInputTextView.m | 5 ++ .../ConversationInputToolbar.m | 10 +++- .../Interactions/OWSLinkPreview.swift | 52 ++++++++++++++----- 4 files changed, 56 insertions(+), 14 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h index 726ac1627..1b499ec73 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol ConversationTextViewToolbarDelegate - (void)textViewDidChange:(UITextView *)textView; +- (void)textViewDidChangeSelection:(UITextView *)textView; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m index a23327590..be67f543d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m @@ -189,6 +189,11 @@ NS_ASSUME_NONNULL_BEGIN [self.textViewToolbarDelegate textViewDidChange:self]; } +- (void)textViewDidChangeSelection:(UITextView *)textView +{ + [self.textViewToolbarDelegate textViewDidChangeSelection:self]; +} + #pragma mark - Key Commands - (nullable NSArray *)keyCommands diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 791564043..b351b4d54 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -869,6 +869,11 @@ const CGFloat kMaxTextViewHeight = 98; [self updateInputLinkPreview]; } +- (void)textViewDidChangeSelection:(UITextView *)textView +{ + [self updateInputLinkPreview]; +} + - (void)updateHeightWithTextView:(UITextView *)textView { // compute new height assuming width is unchanged @@ -922,7 +927,10 @@ const CGFloat kMaxTextViewHeight = 98; return; } - NSString *_Nullable previewUrl = [OWSLinkPreview previewUrlForMessageBodyText:body]; + // It's key that we use the *raw/unstripped* text, so we can reconcile cursor position with the + // selectedRange. + NSString *_Nullable previewUrl = [OWSLinkPreview previewUrlForRawBodyText:self.inputTextView.text + selectedRange:self.inputTextView.selectedRange]; if (previewUrl.length < 1) { [self clearLinkPreviewStateAndView]; return; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 26df0bedb..9dfcede47 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -432,7 +432,11 @@ public class OWSLinkPreview: MTLModel { private static var previewUrlCache: NSCache = NSCache() @objc - public class func previewUrl(forMessageBodyText body: String?) -> String? { + public class func previewUrl(forRawBodyText body: String?, selectedRange: NSRange) -> String? { + return previewUrl(forMessageBodyText: body, selectedRange: selectedRange) + } + + public class func previewUrl(forMessageBodyText body: String?, selectedRange: NSRange?) -> String? { AssertIsOnMainThread() // Exit early if link previews are not enabled in order to avoid @@ -440,10 +444,15 @@ public class OWSLinkPreview: MTLModel { guard OWSLinkPreview.featureEnabled else { return nil } + guard SSKPreferences.areLinkPreviewsEnabled() else { return nil } + guard let body = body else { + return nil + } + if let cachedUrl = previewUrlCache.object(forKey: body as AnyObject) as? String { Logger.verbose("URL parsing cache hit.") guard cachedUrl.count > 0 else { @@ -451,27 +460,45 @@ public class OWSLinkPreview: MTLModel { } return cachedUrl } - let previewUrls = allPreviewUrls(forMessageBodyText: body) - guard let previewUrl = previewUrls.first else { + let previewUrlMatches = allPreviewUrlMatches(forMessageBodyText: body) + guard let urlMatch = previewUrlMatches.first else { // Use empty string to indicate "no preview URL" in the cache. previewUrlCache.setObject("" as AnyObject, forKey: body as AnyObject) return nil } - previewUrlCache.setObject(previewUrl as AnyObject, forKey: body as AnyObject) - return previewUrl + if let selectedRange = selectedRange { + Logger.verbose("match: urlString: \(urlMatch.urlString) range: \(urlMatch.matchRange) selectedRange: \(selectedRange)") + if selectedRange.location != body.count, + urlMatch.matchRange.intersection(selectedRange) != nil { + Logger.debug("ignoring URL, since the user is currently editing it.") + // we don't want to cache the result here, as we want to fetch the link preview + // if the user moves the cursor. + return nil + } + Logger.debug("considering URL, since the user is not currently editing it.") + } + + previewUrlCache.setObject(urlMatch.urlString as AnyObject, forKey: body as AnyObject) + return urlMatch.urlString } - class func allPreviewUrls(forMessageBodyText body: String?) -> [String] { + struct URLMatchResult { + let urlString: String + let matchRange: NSRange + } + + class func allPreviewUrls(forMessageBodyText body: String) -> [String] { + return allPreviewUrlMatches(forMessageBodyText: body).map { $0.urlString } + } + + class func allPreviewUrlMatches(forMessageBodyText body: String) -> [URLMatchResult] { guard OWSLinkPreview.featureEnabled else { return [] } guard SSKPreferences.areLinkPreviewsEnabled() else { return [] } - guard let body = body else { - return [] - } let detector: NSDataDetector do { @@ -481,7 +508,7 @@ public class OWSLinkPreview: MTLModel { return [] } - var previewUrls = [String]() + var urlMatches: [URLMatchResult] = [] let matches = detector.matches(in: body, options: [], range: NSRange(location: 0, length: body.count)) for match in matches { guard let matchURL = match.url else { @@ -490,10 +517,11 @@ public class OWSLinkPreview: MTLModel { } let urlString = matchURL.absoluteString if isValidLinkUrl(urlString) { - previewUrls.append(urlString) + let matchResult = URLMatchResult(urlString: urlString, matchRange: match.range) + urlMatches.append(matchResult) } } - return previewUrls + return urlMatches } // MARK: - Preview Construction From 6d6d076c086c15760e8236e0f4758c69e677e91b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Feb 2019 20:47:40 -0700 Subject: [PATCH 092/493] Use correct cache for LinkPreviewDraft, add stricter typing to help avoid similar issues. --- .../src/Messages/Interactions/OWSLinkPreview.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 9dfcede47..7483b7fd6 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -429,7 +429,7 @@ public class OWSLinkPreview: MTLModel { // MARK: - Text Parsing // This cache should only be accessed on main thread. - private static var previewUrlCache: NSCache = NSCache() + private static var previewUrlCache: NSCache = NSCache() @objc public class func previewUrl(forRawBodyText body: String?, selectedRange: NSRange) -> String? { @@ -453,7 +453,7 @@ public class OWSLinkPreview: MTLModel { return nil } - if let cachedUrl = previewUrlCache.object(forKey: body as AnyObject) as? String { + if let cachedUrl = previewUrlCache.object(forKey: body as NSString) as String? { Logger.verbose("URL parsing cache hit.") guard cachedUrl.count > 0 else { return nil @@ -463,7 +463,7 @@ public class OWSLinkPreview: MTLModel { let previewUrlMatches = allPreviewUrlMatches(forMessageBodyText: body) guard let urlMatch = previewUrlMatches.first else { // Use empty string to indicate "no preview URL" in the cache. - previewUrlCache.setObject("" as AnyObject, forKey: body as AnyObject) + previewUrlCache.setObject("", forKey: body as NSString) return nil } @@ -479,7 +479,7 @@ public class OWSLinkPreview: MTLModel { Logger.debug("considering URL, since the user is not currently editing it.") } - previewUrlCache.setObject(urlMatch.urlString as AnyObject, forKey: body as AnyObject) + previewUrlCache.setObject(urlMatch.urlString as NSString, forKey: body as NSString) return urlMatch.urlString } @@ -527,12 +527,12 @@ public class OWSLinkPreview: MTLModel { // MARK: - Preview Construction // This cache should only be accessed on serialQueue. - private static var linkPreviewDraftCache: NSCache = NSCache() + private static var linkPreviewDraftCache: NSCache = NSCache() private class func cachedLinkPreview(forPreviewUrl previewUrl: String) -> OWSLinkPreviewDraft? { var result: OWSLinkPreviewDraft? serialQueue.sync { - result = linkPreviewDraftCache.object(forKey: previewUrl as AnyObject) + result = linkPreviewDraftCache.object(forKey: previewUrl as NSString) } return result } @@ -550,7 +550,7 @@ public class OWSLinkPreview: MTLModel { } serialQueue.sync { - previewUrlCache.setObject(linkPreviewDraft, forKey: previewUrl as AnyObject) + linkPreviewDraftCache.setObject(linkPreviewDraft, forKey: previewUrl as NSString) } } From cdb8663c810aeeac7fbe9622207e88ddf3a289ef Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 19:05:49 -0700 Subject: [PATCH 093/493] fix up selecting after url case --- Signal/test/util/ProtoParsingTest.m | 6 +- .../Interactions/OWSLinkPreview.swift | 3 +- .../tests/Messages/OWSLinkPreviewTest.swift | 104 ++++++++++++++++-- 3 files changed, 101 insertions(+), 12 deletions(-) diff --git a/Signal/test/util/ProtoParsingTest.m b/Signal/test/util/ProtoParsingTest.m index 6bb0e75d0..6e06aebbc 100644 --- a/Signal/test/util/ProtoParsingTest.m +++ b/Signal/test/util/ProtoParsingTest.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "SignalBaseTest.h" @@ -63,6 +63,10 @@ NS_ASSUME_NONNULL_BEGIN return nil; } +- (nonnull NSString *)displayNameForPhoneIdentifier:(NSString * _Nullable)recipientId transaction:(nonnull YapDatabaseReadTransaction *)transaction { + return nil; +} + @end #pragma mark - diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 7483b7fd6..5663017dd 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -469,8 +469,9 @@ public class OWSLinkPreview: MTLModel { if let selectedRange = selectedRange { Logger.verbose("match: urlString: \(urlMatch.urlString) range: \(urlMatch.matchRange) selectedRange: \(selectedRange)") + let cursorAtEndOfMatch = urlMatch.matchRange.location + urlMatch.matchRange.length == selectedRange.location if selectedRange.location != body.count, - urlMatch.matchRange.intersection(selectedRange) != nil { + (urlMatch.matchRange.intersection(selectedRange) != nil || cursorAtEndOfMatch) { Logger.debug("ignoring URL, since the user is currently editing it.") // we don't want to cache the result here, as we want to fetch the link preview // if the user moves the cursor. diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index db5a1743c..41ec45fe2 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -169,19 +169,20 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { } func testPreviewUrlForMessageBodyText() { - XCTAssertNil(OWSLinkPreview.previewUrl(forMessageBodyText: "")) - XCTAssertNil(OWSLinkPreview.previewUrl(forMessageBodyText: "alice bob jim")) - XCTAssertNil(OWSLinkPreview.previewUrl(forMessageBodyText: "alice bob jim http://")) - XCTAssertNil(OWSLinkPreview.previewUrl(forMessageBodyText: "alice bob jim http://a.com")) + Assert(bodyText: "", extractsLink: nil) + Assert(bodyText: "alice bob jim", extractsLink: nil) + Assert(bodyText: "alice bob jim http://", extractsLink: nil) + Assert(bodyText: "alice bob jim http://a.com", extractsLink: nil) - XCTAssertEqual(OWSLinkPreview.previewUrl(forMessageBodyText: "https://www.youtube.com/watch?v=tP-Ipsat90c"), - "https://www.youtube.com/watch?v=tP-Ipsat90c") - XCTAssertEqual(OWSLinkPreview.previewUrl(forMessageBodyText: "alice bob https://www.youtube.com/watch?v=tP-Ipsat90c jim"), - "https://www.youtube.com/watch?v=tP-Ipsat90c") + Assert(bodyText: "https://www.youtube.com/watch?v=tP-Ipsat90c", + extractsLink: "https://www.youtube.com/watch?v=tP-Ipsat90c") + + Assert(bodyText: "alice bob https://www.youtube.com/watch?v=tP-Ipsat90c jim", + extractsLink: "https://www.youtube.com/watch?v=tP-Ipsat90c") // If there are more than one, take the first. - XCTAssertEqual(OWSLinkPreview.previewUrl(forMessageBodyText: "alice bob https://www.youtube.com/watch?v=tP-Ipsat90c jim https://www.youtube.com/watch?v=other-url carol"), - "https://www.youtube.com/watch?v=tP-Ipsat90c") + Assert(bodyText: "alice bob https://www.youtube.com/watch?v=tP-Ipsat90c jim https://www.youtube.com/watch?v=other-url carol", + extractsLink: "https://www.youtube.com/watch?v=tP-Ipsat90c") } func testUtils() { @@ -454,4 +455,87 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { options: [], range: NSRange(location: 0, length: text.utf16.count))) } + + func testCursorPositions() { + // sanity check + Assert(bodyText: "https://www.youtube.com/watch?v=testCursorPositionsa", + extractsLink: "https://www.youtube.com/watch?v=testCursorPositionsa", + selectedRange: nil) + + // Don't extract link if cursor is touching text + let text2 = "https://www.youtube.com/watch?v=testCursorPositionsb" + XCTAssertEqual(text2.count, 52) + Assert(bodyText: text2, + extractsLink: nil, + selectedRange: NSRange(location: 51, length: 0)) + + Assert(bodyText: text2, + extractsLink: nil, + selectedRange: NSRange(location: 51, length: 10)) + + Assert(bodyText: text2, + extractsLink: nil, + selectedRange: NSRange(location: 0, length: 0)) + + // Unless the cursor is at the end of the text + Assert(bodyText: text2, + extractsLink: "https://www.youtube.com/watch?v=testCursorPositionsb", + selectedRange: NSRange(location: 52, length: 0)) + + // Once extracted, keep the existing link preview, even if the cursor moves back. + Assert(bodyText: text2, + extractsLink: "https://www.youtube.com/watch?v=testCursorPositionsb", + selectedRange: NSRange(location: 51, length: 0)) + + let text3 = "foo https://www.youtube.com/watch?v=testCursorPositionsc bar" + XCTAssertEqual(text3.count, 60) + + // front edge + Assert(bodyText: text3, + extractsLink: nil, + selectedRange: NSRange(location: 4, length: 0)) + + // middle + Assert(bodyText: text3, + extractsLink: nil, + selectedRange: NSRange(location: 4, length: 0)) + + // rear edge + Assert(bodyText: text3, + extractsLink: nil, + selectedRange: NSRange(location: 56, length: 0)) + + // extract link if selecting after link + Assert(bodyText: text3, + extractsLink: "https://www.youtube.com/watch?v=testCursorPositionsc", + selectedRange: NSRange(location: 57, length: 0)) + + let text4 = "bar https://www.youtube.com/watch?v=testCursorPositionsd foo" + XCTAssertEqual(text4.count, 60) + + // front edge + Assert(bodyText: text4, + extractsLink: nil, + selectedRange: NSRange(location: 4, length: 0)) + + // middle + Assert(bodyText: text4, + extractsLink: nil, + selectedRange: NSRange(location: 20, length: 0)) + + // rear edge + Assert(bodyText: text4, + extractsLink: nil, + selectedRange: NSRange(location: 56, length: 0)) + + // extract link if selecting before link + Assert(bodyText: text4, + extractsLink: "https://www.youtube.com/watch?v=testCursorPositionsd", + selectedRange: NSRange(location: 3, length: 0)) + } + + private func Assert(bodyText: String, extractsLink link: String?, selectedRange: NSRange? = nil, file: StaticString = #file, line: UInt = #line) { + let actual = OWSLinkPreview.previewUrl(forMessageBodyText: bodyText, selectedRange: selectedRange) + XCTAssertEqual(actual, link, file: file, line: line) + } } From 3f1312da6b38386473647732cdcfdf1a92866bbe Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 11:42:52 -0500 Subject: [PATCH 094/493] Revert "Introduce ConversationSnapshot." This reverts commit 8b3d08c7e3e166b13013b93d5ebd386571a6ea6d. --- .../ConversationViewController.m | 26 ++++--------- .../ConversationView/ConversationViewModel.h | 2 +- .../ConversationView/ConversationViewModel.m | 39 +++++++------------ SignalMessaging/utils/ThreadUtil.m | 15 ------- 4 files changed, 23 insertions(+), 59 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a5c976bea..891f994c2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -450,11 +450,11 @@ typedef enum : NSUInteger { NSString *_Nullable recipientId = notification.userInfo[kNSNotificationKey_ProfileRecipientId]; NSData *_Nullable groupId = notification.userInfo[kNSNotificationKey_ProfileGroupId]; if (recipientId.length > 0 && [self.thread.recipientIdentifiers containsObject:recipientId]) { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } else if (groupId.length > 0 && self.thread.isGroupThread) { TSGroupThread *groupThread = (TSGroupThread *)self.thread; if ([groupThread.groupModel.groupId isEqualToData:groupId]) { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; [self ensureBannerState]; } } @@ -868,7 +868,6 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; - [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -2438,7 +2437,7 @@ typedef enum : NSUInteger { - (void)contactsViewHelperDidUpdateContacts { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } - (void)createConversationScrollButtons @@ -2476,7 +2475,7 @@ typedef enum : NSUInteger { _hasUnreadMessages = hasUnreadMessages; self.scrollDownButton.hasUnreadMessages = hasUnreadMessages; - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } - (void)scrollDownButtonTapped @@ -2621,7 +2620,7 @@ typedef enum : NSUInteger { [self showApprovalDialogForAttachment:attachment]; [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } - (void)messageWasSent:(TSOutgoingMessage *)message @@ -2981,7 +2980,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } }]; } @@ -3627,7 +3626,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } }); } @@ -4030,7 +4029,7 @@ typedef enum : NSUInteger { [self clearDraft]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self.conversationViewModel ensureDynamicInteractions]; } } @@ -4928,15 +4927,6 @@ typedef enum : NSUInteger { #pragma mark - Conversation Snapshot -- (void)tryToUpdateConversationSnapshot -{ - if (!self.isObservingVMUpdates) { - return; - } - - [self updateConversationSnapshot]; -} - - (void)updateConversationSnapshot { ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index 902413760..c4d781b3a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -93,7 +93,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { focusMessageIdOnOpen:(nullable NSString *)focusMessageIdOnOpen delegate:(id)delegate NS_DESIGNATED_INITIALIZER; -- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary; +- (void)ensureDynamicInteractions; - (void)clearUnreadMessagesIndicator; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index f1086644e..a5e589734 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -273,7 +273,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; { OWSAssertIsOnMainThread(); - [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self ensureDynamicInteractions]; } - (void)profileWhitelistDidChange:(NSNotification *)notification @@ -308,7 +308,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.typingIndicatorsSender = [self.typingIndicators typingRecipientIdForThread:self.thread]; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; + [self ensureDynamicInteractions]; [self.primaryStorage updateUIDatabaseConnectionToLatest]; [self createNewMessageMapping]; @@ -464,32 +464,21 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; } -- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary +- (void)ensureDynamicInteractions { OWSAssertIsOnMainThread(); const int currentMaxRangeSize = (int)self.messageMapping.desiredLength; const int maxRangeSize = MAX(kConversationInitialMaxRangeSize, currentMaxRangeSize); - ThreadDynamicInteractions *dynamicInteractions = - [ThreadUtil ensureDynamicInteractionsForThread:self.thread - contactsManager:self.contactsManager - blockingManager:self.blockingManager - dbConnection:self.editingDatabaseConnection - hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator - lastUnreadIndicator:self.dynamicInteractions.unreadIndicator - focusMessageId:self.focusMessageIdOnOpen - maxRangeSize:maxRangeSize]; - BOOL didChange = ![NSObject isNullableObject:self.dynamicInteractions equalTo:dynamicInteractions]; - self.dynamicInteractions = dynamicInteractions; - - if (didChange && updateIfNecessary) { - if (![self reloadViewItems]) { - OWSFailDebug(@"Failed to reload view items."); - } - - [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; - } + self.dynamicInteractions = [ThreadUtil ensureDynamicInteractionsForThread:self.thread + contactsManager:self.contactsManager + blockingManager:self.blockingManager + dbConnection:self.editingDatabaseConnection + hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator + lastUnreadIndicator:self.dynamicInteractions.unreadIndicator + focusMessageId:self.focusMessageIdOnOpen + maxRangeSize:maxRangeSize]; } - (nullable id)viewItemForUnreadMessagesIndicator @@ -530,7 +519,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; if (self.dynamicInteractions.unreadIndicator) { // If we've just cleared the "unread messages" indicator, // update the dynamic interactions. - [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; + [self ensureDynamicInteractions]; } } @@ -973,7 +962,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; + [self ensureDynamicInteractions]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); @@ -1595,7 +1584,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; + [self ensureDynamicInteractions]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index f42badd4c..2d5b182f3 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -45,21 +45,6 @@ NS_ASSUME_NONNULL_BEGIN self.unreadIndicator = nil; } -- (BOOL)isEqual:(id)object -{ - if (self == object) { - return YES; - } - - if (![object isKindOfClass:[ThreadDynamicInteractions class]]) { - return NO; - } - - ThreadDynamicInteractions *other = (ThreadDynamicInteractions *)object; - return ([NSObject isNullableObject:self.focusMessagePosition equalTo:other.focusMessagePosition] && - [NSObject isNullableObject:self.unreadIndicator equalTo:other.unreadIndicator]); -} - @end #pragma mark - From 67632a48e6e08205936ad3c085bacfbf0946569f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 11:43:02 -0500 Subject: [PATCH 095/493] Revert "Introduce ConversationSnapshot." This reverts commit 9471f24cf38519a74f46fa7c45acc96c11ac02d2. --- .../ConversationViewController.m | 41 ++----------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 891f994c2..a40183cd2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,25 +108,6 @@ typedef enum : NSUInteger { #pragma mark - -// We use snapshots to ensure that the view has a consistent -// representation of view model state which is not updated -// when the view is not observing view model changes. -@interface ConversationSnapshot : NSObject - -@property (nonatomic) NSArray> *viewItems; -@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; -@property (nonatomic) BOOL canLoadMoreItems; - -@end - -#pragma mark - - -@implementation ConversationSnapshot - -@end - -#pragma mark - - @interface ConversationViewController () > *)viewItems { - return self.conversationSnapshot.viewItems; + return self.conversationViewModel.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationSnapshot.dynamicInteractions; + return self.conversationViewModel.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -1718,7 +1696,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -4158,7 +4136,6 @@ typedef enum : NSUInteger { if (self.shouldObserveVMUpdates) { OWSLogVerbose(@"resume observation of view model."); - [self updateConversationSnapshot]; [self resetContentAndLayout]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4633,7 +4610,6 @@ typedef enum : NSUInteger { return; } - [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4925,17 +4901,6 @@ typedef enum : NSUInteger { [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; } -#pragma mark - Conversation Snapshot - -- (void)updateConversationSnapshot -{ - ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; - conversationSnapshot.viewItems = self.conversationViewModel.viewItems; - conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; - conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; - _conversationSnapshot = conversationSnapshot; -} - @end NS_ASSUME_NONNULL_END From aa8fd9e69cbd921fea4cf8132952432db356c9e3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 17:35:46 -0500 Subject: [PATCH 096/493] Remove old registration views. --- Signal.xcodeproj/project.pbxproj | 18 - Signal/src/AppDelegate.m | 9 +- Signal/src/Signal-Bridging-Header.h | 1 - .../src/ViewControllers/DebugUI/DebugUIMisc.m | 3 +- .../HomeView/HomeViewController.m | 1 - .../OWS2FARegistrationViewController.h | 15 - .../OWS2FARegistrationViewController.m | 161 ----- .../CodeVerificationViewController.h | 15 - .../CodeVerificationViewController.m | 509 -------------- ...OnboardingVerificationViewController.swift | 28 + .../Registration/RegistrationController.swift | 107 ++- .../Registration/RegistrationViewController.h | 13 - .../Registration/RegistrationViewController.m | 646 ------------------ Signal/src/util/AppUpdateNag.swift | 4 +- Signal/src/util/RegistrationUtils.m | 17 +- .../SelectRecipientViewController.m | 2 - 16 files changed, 89 insertions(+), 1460 deletions(-) delete mode 100644 Signal/src/ViewControllers/OWS2FARegistrationViewController.h delete mode 100644 Signal/src/ViewControllers/OWS2FARegistrationViewController.m delete mode 100644 Signal/src/ViewControllers/Registration/CodeVerificationViewController.h delete mode 100644 Signal/src/ViewControllers/Registration/CodeVerificationViewController.m delete mode 100644 Signal/src/ViewControllers/Registration/RegistrationViewController.h delete mode 100644 Signal/src/ViewControllers/Registration/RegistrationViewController.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 683161dfc..bcd165bdf 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; }; 34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; - 340FC8A7204DAC8D007AEB0F /* RegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */; }; - 340FC8A8204DAC8D007AEB0F /* CodeVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; 340FC8AB204DAC8D007AEB0F /* DomainFrontingCountryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87D204DAC8C007AEB0F /* DomainFrontingCountryViewController.m */; }; @@ -168,7 +166,6 @@ 349ED990221B0194008045B0 /* Onboarding2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */; }; 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */; }; 34A4C62022175C5C0042EF2E /* OnboardingProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */; }; - 34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */; }; 34A6C28021E503E700B5B12E /* OWSImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */; }; 34A8B3512190A40E00218A25 /* MediaAlbumCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */; }; 34ABB2C42090C59700C727A6 /* OWSResaveCollectionDBMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 34ABB2C22090C59600C727A6 /* OWSResaveCollectionDBMigration.m */; }; @@ -639,10 +636,6 @@ 34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; - 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistrationViewController.m; sourceTree = ""; }; - 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodeVerificationViewController.m; sourceTree = ""; }; - 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistrationViewController.h; sourceTree = ""; }; - 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeVerificationViewController.h; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsViewController.m; sourceTree = ""; }; 340FC87D204DAC8C007AEB0F /* DomainFrontingCountryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DomainFrontingCountryViewController.m; sourceTree = ""; }; @@ -852,8 +845,6 @@ 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Onboarding2FAViewController.swift; sourceTree = ""; }; 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = ""; }; 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingProfileViewController.swift; sourceTree = ""; }; - 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWS2FARegistrationViewController.m; sourceTree = ""; }; - 34A55F3620485464002CC6DE /* OWS2FARegistrationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWS2FARegistrationViewController.h; sourceTree = ""; }; 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSImagePickerController.swift; sourceTree = ""; }; 34A8B3502190A40E00218A25 /* MediaAlbumCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaAlbumCellView.swift; sourceTree = ""; }; 34ABB2C22090C59600C727A6 /* OWSResaveCollectionDBMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSResaveCollectionDBMigration.m; sourceTree = ""; }; @@ -1471,8 +1462,6 @@ isa = PBXGroup; children = ( 3441FD9E21A3604F00BB9542 /* BackupRestoreViewController.swift */, - 340FC879204DAC8C007AEB0F /* CodeVerificationViewController.h */, - 340FC877204DAC8C007AEB0F /* CodeVerificationViewController.m */, 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */, 3448E1612213585C004B052E /* OnboardingBaseViewController.swift */, 3448E1652215B313004B052E /* OnboardingCaptchaViewController.swift */, @@ -1483,8 +1472,6 @@ 3448E15F22134C88004B052E /* OnboardingSplashViewController.swift */, 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */, 346E9D5321B040B600562252 /* RegistrationController.swift */, - 340FC878204DAC8C007AEB0F /* RegistrationViewController.h */, - 340FC876204DAC8C007AEB0F /* RegistrationViewController.m */, ); path = Registration; sourceTree = ""; @@ -1871,8 +1858,6 @@ 34B3F8501E8DF1700035BE1A /* NewContactThreadViewController.m */, 34B3F8541E8DF1700035BE1A /* NewGroupViewController.h */, 34B3F8551E8DF1700035BE1A /* NewGroupViewController.m */, - 34A55F3620485464002CC6DE /* OWS2FARegistrationViewController.h */, - 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */, 45D2AC01204885170033C692 /* OWS2FAReminderViewController.swift */, 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */, 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */, @@ -3515,7 +3500,6 @@ 3430FE181F7751D4000EC51B /* GiphyAPI.swift in Sources */, 4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */, 346E9D5421B040B700562252 /* RegistrationController.swift in Sources */, - 34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */, 340FC8AD204DAC8D007AEB0F /* OWSLinkedDevicesTableViewController.m in Sources */, 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */, 4C090A1B210FD9C7001FD7F9 /* HapticFeedback.swift in Sources */, @@ -3607,7 +3591,6 @@ 45FBC5D11DF8592E00E9B410 /* SignalCall.swift in Sources */, 340FC8BB204DAC8D007AEB0F /* OWSAddToContactViewController.m in Sources */, 45F32C232057297A00A300D5 /* MediaPageViewController.swift in Sources */, - 340FC8A7204DAC8D007AEB0F /* RegistrationViewController.m in Sources */, 452C468F1E427E200087B011 /* OutboundCallInitiator.swift in Sources */, 34D2CCDA2062E7D000CB1A14 /* OWSScreenLockUI.m in Sources */, 45F170BB1E2FC5D3003FC1F2 /* CallAudioService.swift in Sources */, @@ -3640,7 +3623,6 @@ 340FC8B9204DAC8D007AEB0F /* UpdateGroupViewController.m in Sources */, 3448E1662215B313004B052E /* OnboardingCaptchaViewController.swift in Sources */, 4574A5D61DD6704700C6B692 /* CallService.swift in Sources */, - 340FC8A8204DAC8D007AEB0F /* CodeVerificationViewController.m in Sources */, 4521C3C01F59F3BA00B4C582 /* TextFieldHelper.swift in Sources */, 34D2CCDF206939B400CB1A14 /* DebugUIMessagesAction.m in Sources */, 340FC8AC204DAC8D007AEB0F /* PrivacySettingsTableViewController.m in Sources */, diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 1a6860b7b..fc580a824 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -3,7 +3,6 @@ // #import "AppDelegate.h" -#import "CodeVerificationViewController.h" #import "DebugLogger.h" #import "HomeViewController.h" #import "MainAppContext.h" @@ -12,7 +11,6 @@ #import "OWSOrphanDataCleaner.h" #import "OWSScreenLockUI.h" #import "Pastelog.h" -#import "RegistrationViewController.h" #import "Signal-Swift.h" #import "SignalApp.h" #import "SignalsNavigationController.h" @@ -632,10 +630,11 @@ static NSTimeInterval launchStartedAt; if ([signupController isKindOfClass:[OWSNavigationController class]]) { OWSNavigationController *navController = (OWSNavigationController *)signupController; UIViewController *controller = [navController.childViewControllers lastObject]; - if ([controller isKindOfClass:[CodeVerificationViewController class]]) { - CodeVerificationViewController *cvvc = (CodeVerificationViewController *)controller; + if ([controller isKindOfClass:[OnboardingVerificationViewController class]]) { + OnboardingVerificationViewController *verificationView + = (OnboardingVerificationViewController *)controller; NSString *verificationCode = [url.path substringFromIndex:1]; - [cvvc setVerificationCodeAndTryToVerify:verificationCode]; + [verificationView setVerificationCodeAndTryToVerify:verificationCode]; return YES; } else { OWSLogWarn(@"Not the verification view controller we expected. Got %@ instead", diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 12e45a336..fd0a20bb9 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -41,7 +41,6 @@ #import "PinEntryView.h" #import "PrivacySettingsTableViewController.h" #import "ProfileViewController.h" -#import "RegistrationViewController.h" #import "RemoteVideoView.h" #import "SignalApp.h" #import "UIViewController+Permissions.h" diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index 844a074c8..c14efff16 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m @@ -7,7 +7,6 @@ #import "OWSBackup.h" #import "OWSCountryMetadata.h" #import "OWSTableViewController.h" -#import "RegistrationViewController.h" #import "Signal-Swift.h" #import "ThreadUtil.h" #import @@ -168,7 +167,7 @@ NS_ASSUME_NONNULL_BEGIN [Environment.shared.preferences unsetRecordedAPNSTokens]; - RegistrationViewController *viewController = [RegistrationViewController new]; + UIViewController *viewController = [[OnboardingController new] initialViewController]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:viewController]; navigationController.navigationBarHidden = YES; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 2b34e195b..c21f0968c 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -7,7 +7,6 @@ #import "AppSettingsViewController.h" #import "HomeViewCell.h" #import "NewContactThreadViewController.h" -#import "OWS2FARegistrationViewController.h" #import "OWSNavigationController.h" #import "OWSPrimaryStorage.h" #import "ProfileViewController.h" diff --git a/Signal/src/ViewControllers/OWS2FARegistrationViewController.h b/Signal/src/ViewControllers/OWS2FARegistrationViewController.h deleted file mode 100644 index 2b6bcd050..000000000 --- a/Signal/src/ViewControllers/OWS2FARegistrationViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface OWS2FARegistrationViewController : OWSViewController - -@property (nonatomic) NSString *verificationCode; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/OWS2FARegistrationViewController.m b/Signal/src/ViewControllers/OWS2FARegistrationViewController.m deleted file mode 100644 index 8b285eb31..000000000 --- a/Signal/src/ViewControllers/OWS2FARegistrationViewController.m +++ /dev/null @@ -1,161 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "OWS2FARegistrationViewController.h" -#import "PinEntryView.h" -#import "ProfileViewController.h" -#import "Signal-Swift.h" -#import -#import -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface OWS2FARegistrationViewController () - -@property (nonatomic) PinEntryView *entryView; - -@end - -#pragma mark - - -@implementation OWS2FARegistrationViewController - -#pragma mark - Dependencies - -- (AccountManager *)accountManager -{ - return AppEnvironment.shared.accountManager; -} - -#pragma mark - View Lifecycle - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - // The navigation bar is hidden in the registration workflow. - if (self.navigationController.navigationBarHidden) { - [self.navigationController setNavigationBarHidden:NO animated:YES]; - } - self.navigationItem.hidesBackButton = YES; - - self.title = NSLocalizedString(@"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE", - @"Navigation title shown when user is re-registering after having enabled registration lock"); - - self.view.backgroundColor = [Theme backgroundColor]; - - PinEntryView *entryView = [PinEntryView new]; - self.entryView = entryView; - entryView.delegate = self; - [self.view addSubview:entryView]; - - entryView.instructionsText = NSLocalizedString( - @"REGISTER_2FA_INSTRUCTIONS", @"Instructions to enter the 'two-factor auth pin' in the 2FA registration view."); - - // Layout - [entryView autoPinToTopLayoutGuideOfViewController:self withInset:0]; - [entryView autoPinEdgeToSuperviewMargin:ALEdgeLeft]; - [entryView autoPinEdgeToSuperviewMargin:ALEdgeRight]; - [entryView autoPinToBottomLayoutGuideOfViewController:self withInset:0]; -} - -- (void)viewWillAppear:(BOOL)animated -{ - [super viewWillAppear:animated]; -} - -- (void)viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - - [self.entryView makePinTextFieldFirstResponder]; -} - -#pragma mark - PinEntryViewDelegate - -- (void)pinEntryView:(PinEntryView *)entryView submittedPinCode:(NSString *)pinCode -{ - OWSAssertDebug(self.entryView.hasValidPin); - - [self tryToRegisterWithPinCode:pinCode]; -} - -- (void)pinEntryViewForgotPinLinkTapped:(PinEntryView *)entryView -{ - NSString *alertBody = NSLocalizedString(@"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE", - @"Alert message explaining what happens if you forget your 'two-factor auth pin'."); - [OWSAlerts showAlertWithTitle:nil message:alertBody]; -} - -#pragma mark - Registration - -- (void)tryToRegisterWithPinCode:(NSString *)pinCode -{ - OWSAssertDebug(self.entryView.hasValidPin); - OWSAssertDebug(self.verificationCode.length > 0); - OWSAssertDebug(pinCode.length > 0); - - OWSLogInfo(@""); - - __weak OWS2FARegistrationViewController *weakSelf = self; - - [ModalActivityIndicatorViewController - presentFromViewController:self - canCancel:NO - backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) { - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringCode]); - [[self.accountManager registerObjcWithVerificationCode:self.verificationCode pin:pinCode] - .then(^{ - OWSAssertIsOnMainThread(); - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringSubmittedCode]); - [[OWS2FAManager sharedManager] mark2FAAsEnabledWithPin:pinCode]; - - OWSLogInfo(@"Successfully registered Signal account."); - dispatch_async(dispatch_get_main_queue(), ^{ - [modalActivityIndicator dismissWithCompletion:^{ - OWSAssertIsOnMainThread(); - - [weakSelf verificationWasCompleted]; - }]; - }); - }) - .catch(^(NSError *error) { - OWSAssertIsOnMainThread(); - OWSProdInfo([OWSAnalyticsEvents registrationRegistrationFailed]); - OWSLogError(@"error verifying challenge: %@", error); - dispatch_async(dispatch_get_main_queue(), ^{ - [modalActivityIndicator dismissWithCompletion:^{ - OWSAssertIsOnMainThread(); - - [OWSAlerts - showAlertWithTitle:NSLocalizedString( - @"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE", - @"Title for alert indicating that attempt to " - @"register with 'two-factor auth' failed.") - message:error.localizedDescription]; - - [weakSelf.entryView makePinTextFieldFirstResponder]; - }]; - }); - }) retainUntilComplete]; - }]; -} - -- (void)verificationWasCompleted -{ - [RegistrationController verificationWasCompletedFromView:self]; -} - -#pragma mark - Orientation - -- (UIInterfaceOrientationMask)supportedInterfaceOrientations -{ - return UIInterfaceOrientationMaskPortrait; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.h b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.h deleted file mode 100644 index 492aaa68b..000000000 --- a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CodeVerificationViewController : OWSViewController - -- (void)setVerificationCodeAndTryToVerify:(NSString *)verificationCode; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m b/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m deleted file mode 100644 index 923955f0b..000000000 --- a/Signal/src/ViewControllers/Registration/CodeVerificationViewController.m +++ /dev/null @@ -1,509 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "CodeVerificationViewController.h" -#import "OWS2FARegistrationViewController.h" -#import "ProfileViewController.h" -#import "Signal-Swift.h" -#import -#import -#import -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CodeVerificationViewController () - -// Where the user enters the verification code they wish to document -@property (nonatomic) UITextField *challengeTextField; - -@property (nonatomic) UILabel *phoneNumberLabel; - -//// User action buttons -@property (nonatomic) OWSFlatButton *submitButton; -@property (nonatomic) UIButton *sendCodeViaSMSAgainButton; -@property (nonatomic) UIButton *sendCodeViaVoiceButton; - -@property (nonatomic) UIActivityIndicatorView *submitCodeSpinner; -@property (nonatomic) UIActivityIndicatorView *requestCodeAgainSpinner; -@property (nonatomic) UIActivityIndicatorView *requestCallSpinner; - -@end - -#pragma mark - - -@implementation CodeVerificationViewController - -#pragma mark - Dependencies - -- (TSAccountManager *)tsAccountManager -{ - OWSAssertDebug(SSKEnvironment.shared.tsAccountManager); - - return SSKEnvironment.shared.tsAccountManager; -} - -- (AccountManager *)accountManager -{ - return AppEnvironment.shared.accountManager; -} - -#pragma mark - View Lifecycle - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - self.shouldUseTheme = NO; - - [self createViews]; - - [self initializeKeyboardHandlers]; -} - -- (void)viewWillAppear:(BOOL)animated -{ - [super viewWillAppear:animated]; - [self enableServerActions:YES]; - [self updatePhoneNumberLabel]; -} - -- (void)viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - [_challengeTextField becomeFirstResponder]; -} - -#pragma mark - - -- (void)createViews -{ - self.view.backgroundColor = [UIColor whiteColor]; - self.view.opaque = YES; - - UIColor *signalBlueColor = [UIColor ows_signalBrandBlueColor]; - - UIView *header = [UIView new]; - header.backgroundColor = signalBlueColor; - [self.view addSubview:header]; - [header autoPinWidthToSuperview]; - [header autoPinEdgeToSuperviewEdge:ALEdgeTop]; - // The header will grow to accomodate the titleLabel's height. - - UILabel *titleLabel = [UILabel new]; - titleLabel.textColor = [UIColor whiteColor]; - titleLabel.text = [self phoneNumberText]; - titleLabel.font = [UIFont ows_mediumFontWithSize:20.f]; - [header addSubview:titleLabel]; - [titleLabel autoPinToTopLayoutGuideOfViewController:self withInset:0]; - [titleLabel autoPinEdgeToSuperviewEdge:ALEdgeBottom]; - [titleLabel autoSetDimension:ALDimensionHeight toSize:40]; - [titleLabel autoHCenterInSuperview]; - - // This view is used in more than one context. - // - // * Usually, it is pushed atop RegistrationViewController in which - // case we want a "back" button. - // * It can also be used to re-register from the app's "de-registration" - // views, in which case RegistrationViewController is not used and we - // do _not_ want a "back" button. - if (self.navigationController.viewControllers.count > 1) { - UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [backButton - setTitle:NSLocalizedString(@"VERIFICATION_BACK_BUTTON", @"button text for back button on verification view") - forState:UIControlStateNormal]; - [backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - backButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; - [header addSubview:backButton]; - [backButton autoPinLeadingToSuperviewMarginWithInset:10.f]; - [backButton autoAlignAxis:ALAxisHorizontal toSameAxisOfView:titleLabel]; - [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; - } - - _phoneNumberLabel = [UILabel new]; - _phoneNumberLabel.textColor = [UIColor ows_darkGrayColor]; - _phoneNumberLabel.font = [UIFont ows_regularFontWithSize:20.f]; - _phoneNumberLabel.numberOfLines = 2; - _phoneNumberLabel.adjustsFontSizeToFitWidth = YES; - _phoneNumberLabel.textAlignment = NSTextAlignmentCenter; - [self.view addSubview:_phoneNumberLabel]; - [_phoneNumberLabel autoPinWidthToSuperviewWithMargin:ScaleFromIPhone5(32)]; - [_phoneNumberLabel autoPinEdge:ALEdgeTop - toEdge:ALEdgeBottom - ofView:header - withOffset:ScaleFromIPhone5To7Plus(30, 100)]; - - const CGFloat kHMargin = 36; - - if (UIDevice.currentDevice.isShorterThanIPhone5) { - _challengeTextField = [DismissableTextField new]; - } else { - _challengeTextField = [OWSTextField new]; - } - - _challengeTextField.textColor = [UIColor blackColor]; - _challengeTextField.placeholder = NSLocalizedString(@"VERIFICATION_CHALLENGE_DEFAULT_TEXT", - @"Text field placeholder for SMS verification code during registration"); - _challengeTextField.font = [UIFont ows_lightFontWithSize:21.f]; - _challengeTextField.textAlignment = NSTextAlignmentCenter; - _challengeTextField.keyboardType = UIKeyboardTypeNumberPad; - _challengeTextField.delegate = self; - [self.view addSubview:_challengeTextField]; - [_challengeTextField autoPinWidthToSuperviewWithMargin:kHMargin]; - [_challengeTextField autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_phoneNumberLabel withOffset:25]; - - UIView *underscoreView = [UIView new]; - underscoreView.backgroundColor = [UIColor colorWithWhite:0.5 alpha:1.f]; - [self.view addSubview:underscoreView]; - [underscoreView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_challengeTextField withOffset:3]; - [underscoreView autoPinWidthToSuperviewWithMargin:kHMargin]; - [underscoreView autoSetDimension:ALDimensionHeight toSize:1.f]; - - const CGFloat kSubmitButtonHeight = 47.f; - // NOTE: We use ows_signalBrandBlueColor instead of ows_materialBlueColor - // throughout the onboarding flow to be consistent with the headers. - OWSFlatButton *submitButton = - [OWSFlatButton buttonWithTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SUBMIT_CODE", - @"button text during registration to submit your SMS verification code.") - font:[OWSFlatButton fontForHeight:kSubmitButtonHeight] - titleColor:[UIColor whiteColor] - backgroundColor:[UIColor ows_signalBrandBlueColor] - target:self - selector:@selector(submitVerificationCode)]; - self.submitButton = submitButton; - [self.view addSubview:_submitButton]; - [_submitButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:underscoreView withOffset:15]; - [_submitButton autoPinWidthToSuperviewWithMargin:kHMargin]; - [_submitButton autoSetDimension:ALDimensionHeight toSize:kSubmitButtonHeight]; - - const CGFloat kSpinnerSize = 20; - const CGFloat kSpinnerSpacing = ScaleFromIPhone5To7Plus(5, 15); - - _submitCodeSpinner = - [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - [_submitButton addSubview:_submitCodeSpinner]; - [_submitCodeSpinner autoSetDimension:ALDimensionWidth toSize:kSpinnerSize]; - [_submitCodeSpinner autoSetDimension:ALDimensionHeight toSize:kSpinnerSize]; - [_submitCodeSpinner autoVCenterInSuperview]; - [_submitCodeSpinner autoPinTrailingToSuperviewMarginWithInset:kSpinnerSpacing]; - - _sendCodeViaSMSAgainButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _sendCodeViaSMSAgainButton.backgroundColor = [UIColor whiteColor]; - [_sendCodeViaSMSAgainButton setTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SUBMIT_AGAIN", - @"button text during registration to request another SMS code be sent") - forState:UIControlStateNormal]; - [_sendCodeViaSMSAgainButton setTitleColor:signalBlueColor forState:UIControlStateNormal]; - _sendCodeViaSMSAgainButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; - [_sendCodeViaSMSAgainButton addTarget:self - action:@selector(sendCodeViaSMSAction:) - forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:_sendCodeViaSMSAgainButton]; - [_sendCodeViaSMSAgainButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_submitButton withOffset:10]; - [_sendCodeViaSMSAgainButton autoPinWidthToSuperviewWithMargin:kHMargin]; - [_sendCodeViaSMSAgainButton autoSetDimension:ALDimensionHeight toSize:35]; - - _requestCodeAgainSpinner = - [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - [_sendCodeViaSMSAgainButton addSubview:_requestCodeAgainSpinner]; - [_requestCodeAgainSpinner autoSetDimension:ALDimensionWidth toSize:kSpinnerSize]; - [_requestCodeAgainSpinner autoSetDimension:ALDimensionHeight toSize:kSpinnerSize]; - [_requestCodeAgainSpinner autoVCenterInSuperview]; - [_requestCodeAgainSpinner autoPinTrailingToSuperviewMarginWithInset:kSpinnerSpacing]; - - _sendCodeViaVoiceButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _sendCodeViaVoiceButton.backgroundColor = [UIColor whiteColor]; - [_sendCodeViaVoiceButton - setTitle:NSLocalizedString(@"VERIFICATION_CHALLENGE_SEND_VIA_VOICE", - @"button text during registration to request phone number verification be done via phone call") - forState:UIControlStateNormal]; - [_sendCodeViaVoiceButton setTitleColor:signalBlueColor forState:UIControlStateNormal]; - _sendCodeViaVoiceButton.titleLabel.font = [UIFont ows_mediumFontWithSize:14.f]; - [_sendCodeViaVoiceButton addTarget:self - action:@selector(sendCodeViaVoiceAction:) - forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:_sendCodeViaVoiceButton]; - [_sendCodeViaVoiceButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:_sendCodeViaSMSAgainButton]; - [_sendCodeViaVoiceButton autoPinWidthToSuperviewWithMargin:kHMargin]; - [_sendCodeViaVoiceButton autoSetDimension:ALDimensionHeight toSize:35]; - - _requestCallSpinner = - [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - [_sendCodeViaVoiceButton addSubview:_requestCallSpinner]; - [_requestCallSpinner autoSetDimension:ALDimensionWidth toSize:kSpinnerSize]; - [_requestCallSpinner autoSetDimension:ALDimensionHeight toSize:kSpinnerSize]; - [_requestCallSpinner autoVCenterInSuperview]; - [_requestCallSpinner autoPinTrailingToSuperviewMarginWithInset:kSpinnerSpacing]; -} - -- (NSString *)phoneNumberText -{ - OWSAssertDebug([TSAccountManager localNumber] != nil); - return [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:[TSAccountManager localNumber]]; -} - -- (void)updatePhoneNumberLabel -{ - _phoneNumberLabel.text = - [NSString stringWithFormat:NSLocalizedString(@"VERIFICATION_PHONE_NUMBER_FORMAT", - @"Label indicating the phone number currently being verified."), - [self phoneNumberText]]; -} - -- (void)startActivityIndicator -{ - [self.submitCodeSpinner startAnimating]; - [self enableServerActions:NO]; - [self.challengeTextField resignFirstResponder]; -} - -- (void)stopActivityIndicator -{ - [self enableServerActions:YES]; - [self.submitCodeSpinner stopAnimating]; -} - -- (void)submitVerificationCode -{ - [self startActivityIndicator]; - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringCode]); - __weak CodeVerificationViewController *weakSelf = self; - [[self.accountManager registerObjcWithVerificationCode:[self validationCodeFromTextField] pin:nil] - .then(^{ - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringSubmittedCode]); - - OWSLogInfo(@"Successfully registered Signal account."); - dispatch_async(dispatch_get_main_queue(), ^{ - [weakSelf stopActivityIndicator]; - [weakSelf verificationWasCompleted]; - }); - }) - .catch(^(NSError *error) { - OWSLogError(@"error: %@, %@, %zd", [error class], error.domain, error.code); - OWSProdInfo([OWSAnalyticsEvents registrationRegistrationFailed]); - OWSLogError(@"error verifying challenge: %@", error); - dispatch_async(dispatch_get_main_queue(), ^{ - [weakSelf stopActivityIndicator]; - - if ([error.domain isEqualToString:OWSSignalServiceKitErrorDomain] - && error.code == OWSErrorCodeRegistrationMissing2FAPIN) { - CodeVerificationViewController *strongSelf = weakSelf; - if (!strongSelf) { - return; - } - OWSLogInfo(@"Showing 2FA registration view."); - OWS2FARegistrationViewController *viewController = [OWS2FARegistrationViewController new]; - viewController.verificationCode = strongSelf.validationCodeFromTextField; - [strongSelf.navigationController pushViewController:viewController animated:YES]; - } else { - [weakSelf presentAlertWithVerificationError:error]; - [weakSelf.challengeTextField becomeFirstResponder]; - } - }); - }) retainUntilComplete]; -} - -- (void)verificationWasCompleted -{ - [RegistrationController verificationWasCompletedFromView:self]; -} - -- (void)presentAlertWithVerificationError:(NSError *)error -{ - UIAlertController *alert; - alert = [UIAlertController - alertControllerWithTitle:NSLocalizedString(@"REGISTRATION_VERIFICATION_FAILED_TITLE", @"Alert view title") - message:error.localizedDescription - preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:[UIAlertAction actionWithTitle:CommonStrings.dismissButton - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self.challengeTextField becomeFirstResponder]; - }]]; - - [self presentViewController:alert animated:YES completion:nil]; -} - -- (NSString *)validationCodeFromTextField -{ - return [self.challengeTextField.text stringByReplacingOccurrencesOfString:@"-" withString:@""]; -} - -#pragma mark - Actions - -- (void)sendCodeViaSMSAction:(id)sender -{ - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringRequestedNewCodeBySms]); - - [self enableServerActions:NO]; - - [_requestCodeAgainSpinner startAnimating]; - __weak CodeVerificationViewController *weakSelf = self; - [self.tsAccountManager rerequestSMSWithCaptchaToken:nil - success:^{ - OWSLogInfo(@"Successfully requested SMS code"); - [weakSelf enableServerActions:YES]; - [weakSelf.requestCodeAgainSpinner stopAnimating]; - } - failure:^(NSError *error) { - OWSLogError(@"Failed to request SMS code with error: %@", error); - [weakSelf showRegistrationErrorMessage:error]; - [weakSelf enableServerActions:YES]; - [weakSelf.requestCodeAgainSpinner stopAnimating]; - [weakSelf.challengeTextField becomeFirstResponder]; - }]; -} - -- (void)sendCodeViaVoiceAction:(id)sender -{ - OWSProdInfo([OWSAnalyticsEvents registrationRegisteringRequestedNewCodeByVoice]); - - [self enableServerActions:NO]; - - [_requestCallSpinner startAnimating]; - __weak CodeVerificationViewController *weakSelf = self; - [self.tsAccountManager rerequestVoiceWithCaptchaToken:nil - success:^{ - OWSLogInfo(@"Successfully requested voice code"); - - [weakSelf enableServerActions:YES]; - [weakSelf.requestCallSpinner stopAnimating]; - } - failure:^(NSError *error) { - OWSLogError(@"Failed to request voice code with error: %@", error); - [weakSelf showRegistrationErrorMessage:error]; - [weakSelf enableServerActions:YES]; - [weakSelf.requestCallSpinner stopAnimating]; - [weakSelf.challengeTextField becomeFirstResponder]; - }]; -} - -- (void)showRegistrationErrorMessage:(NSError *)registrationError -{ - [OWSAlerts showAlertWithTitle:registrationError.localizedDescription - message:registrationError.localizedRecoverySuggestion]; -} - -- (void)enableServerActions:(BOOL)enabled -{ - [_submitButton setEnabled:enabled]; - [_sendCodeViaSMSAgainButton setEnabled:enabled]; - [_sendCodeViaVoiceButton setEnabled:enabled]; -} - -- (void)backButtonPressed:(id)sender -{ - OWSProdInfo([OWSAnalyticsEvents registrationVerificationBack]); - - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Keyboard notifications - -- (void)initializeKeyboardHandlers -{ - UITapGestureRecognizer *outsideTabRecognizer = - [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboardFromAppropriateSubView)]; - [self.view addGestureRecognizer:outsideTabRecognizer]; - self.view.userInteractionEnabled = YES; -} - -- (void)dismissKeyboardFromAppropriateSubView -{ - [self.view endEditing:NO]; -} - -- (BOOL)textField:(UITextField *)textField - shouldChangeCharactersInRange:(NSRange)range - replacementString:(NSString *)insertionText -{ - - // Verification codes take this form: "123-456". - // - // * We only want to let the user "6 decimal digits + 1 hyphen = 7". - // * The user shouldn't have to enter the hyphen - it should be added automatically. - // * The user should be able to copy and paste freely. - // * Invalid input (including extraneous hyphens) should be simply ignored. - // - // We accomplish this by being permissive and trying to "take as much of the user - // input as possible". - // - // * Always accept deletes. - // * Ignore invalid input. - // * Take partial input if possible. - - NSString *oldText = textField.text; - // Construct the new contents of the text field by: - // 1. Determining the "left" substring: the contents of the old text _before_ the deletion range. - // Filtering will remove non-decimal digit characters like hyphen "-". - NSString *left = [oldText substringToIndex:range.location].digitsOnly; - // 2. Determining the "right" substring: the contents of the old text _after_ the deletion range. - NSString *right = [oldText substringFromIndex:range.location + range.length].digitsOnly; - // 3. Determining the "center" substring: the contents of the new insertion text. - NSString *center = insertionText.digitsOnly; - // 3a. Trim the tail of the "center" substring to ensure that we don't end up - // with more than 6 decimal digits. - while (center.length > 0 && left.length + center.length + right.length > 6) { - center = [center substringToIndex:center.length - 1]; - } - // 4. Construct the "raw" new text by concatenating left, center and right. - NSString *rawNewText = [[left stringByAppendingString:center] stringByAppendingString:right]; - // 5. Construct the "formatted" new text by inserting a hyphen if necessary. - NSString *formattedNewText - = (rawNewText.length <= 3 ? rawNewText - : [[[rawNewText substringToIndex:3] stringByAppendingString:@"-"] - stringByAppendingString:[rawNewText substringFromIndex:3]]); - textField.text = formattedNewText; - - // Move the cursor after the newly inserted text. - NSUInteger newInsertionPoint = left.length + center.length; - if (newInsertionPoint > 3) { - // Nudge the cursor to the right to reflect the hyphen - // if necessary. - newInsertionPoint++; - } - UITextPosition *newPosition = - [textField positionFromPosition:textField.beginningOfDocument offset:(NSInteger)newInsertionPoint]; - textField.selectedTextRange = [textField textRangeFromPosition:newPosition toPosition:newPosition]; - - return NO; -} - -- (BOOL)textFieldShouldReturn:(UITextField *)textField -{ - [self submitVerificationCode]; - [textField resignFirstResponder]; - return NO; -} - -- (void)setVerificationCodeAndTryToVerify:(NSString *)verificationCode -{ - NSString *rawNewText = verificationCode.digitsOnly; - NSString *formattedNewText - = (rawNewText.length <= 3 ? rawNewText - : [[[rawNewText substringToIndex:3] stringByAppendingString:@"-"] - stringByAppendingString:[rawNewText substringFromIndex:3]]); - self.challengeTextField.text = formattedNewText; - // Move the cursor after the newly inserted text. - UITextPosition *newPosition = [self.challengeTextField endOfDocument]; - self.challengeTextField.selectedTextRange = - [self.challengeTextField textRangeFromPosition:newPosition toPosition:newPosition]; - [self submitVerificationCode]; -} - -- (UIStatusBarStyle)preferredStatusBarStyle -{ - return UIStatusBarStyleLightContent; -} - -#pragma mark - Orientation - -- (UIInterfaceOrientationMask)supportedInterfaceOrientations -{ - return UIInterfaceOrientationMaskPortrait; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 3d21e96d6..e43d9f2e3 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -187,6 +187,14 @@ private class OnboardingCodeView: UIView { digitStroke.backgroundColor = backgroundColor } } + + fileprivate func set(verificationCode: String) { + digitText = verificationCode + + updateViewState() + + self.delegate?.codeViewDidChange() + } } // MARK: - @@ -251,10 +259,16 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController private var codeState = CodeState.sent private var titleLabel: UILabel? + private var backLink: UIView? private let onboardingCodeView = OnboardingCodeView() private var codeStateLink: OWSFlatButton? private let errorLabel = UILabel() + @objc + public func hideBackLink() { + backLink?.isHidden = true + } + override public func loadView() { super.loadView() @@ -267,6 +281,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", comment: "Label for the link that lets users change their phone number in the onboarding views."), selector: #selector(backLinkTapped)) + self.backLink = backLink onboardingCodeView.delegate = self @@ -495,6 +510,19 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController onboardingCodeView.setHasError(value) errorLabel.isHidden = !value } + + @objc + public func setVerificationCodeAndTryToVerify(_ verificationCode: String) { + AssertIsOnMainThread() + + let filteredCode = verificationCode.digitsOnly + guard filteredCode.count > 0 else { + owsFailDebug("Invalid code: \(verificationCode)") + return + } + + onboardingCodeView.set(verificationCode: filteredCode) + } } // MARK: - diff --git a/Signal/src/ViewControllers/Registration/RegistrationController.swift b/Signal/src/ViewControllers/Registration/RegistrationController.swift index 58ce9b616..25e9c63cd 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit @@ -23,30 +23,6 @@ public class RegistrationController: NSObject { // MARK: - - @objc - public class func verificationWasCompleted(fromView view: UIViewController) { - AssertIsOnMainThread() - - if tsAccountManager.isReregistering() { - showProfileView(fromView: view) - } else { - checkCanImportBackup(fromView: view) - } - } - - private class func showProfileView(fromView view: UIViewController) { - AssertIsOnMainThread() - - Logger.info("") - - guard let navigationController = view.navigationController else { - owsFailDebug("Missing navigationController") - return - } - - ProfileViewController.present(forRegistration: navigationController) - } - private class func showBackupRestoreView(fromView view: UIViewController) { AssertIsOnMainThread() @@ -61,44 +37,45 @@ public class RegistrationController: NSObject { navigationController.setViewControllers([restoreView], animated: true) } - private class func checkCanImportBackup(fromView view: UIViewController) { - AssertIsOnMainThread() - - Logger.info("") - - self.backup.checkCanImport({ (canImport) in - Logger.info("canImport: \(canImport)") - - if (canImport) { - self.backup.setHasPendingRestoreDecision(true) - - self.showBackupRestoreView(fromView: view) - } else { - self.showProfileView(fromView: view) - } - }) { (_) in - self.showBackupCheckFailedAlert(fromView: view) - } - } - - private class func showBackupCheckFailedAlert(fromView view: UIViewController) { - AssertIsOnMainThread() - - Logger.info("") - - let alert = UIAlertController(title: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_TITLE", - comment: "Title for alert shown when the app failed to check for an existing backup."), - message: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_MESSAGE", - comment: "Message for alert shown when the app failed to check for an existing backup."), - preferredStyle: .alert) - alert.addAction(UIAlertAction(title: NSLocalizedString("REGISTER_FAILED_TRY_AGAIN", comment: ""), - style: .default) { (_) in - self.checkCanImportBackup(fromView: view) - }) - alert.addAction(UIAlertAction(title: NSLocalizedString("CHECK_FOR_BACKUP_DO_NOT_RESTORE", comment: "The label for the 'do not restore backup' button."), - style: .destructive) { (_) in - self.showProfileView(fromView: view) - }) - view.present(alert, animated: true) - } + // TODO: OnboardingController will eventually need to do something like this. +// private class func checkCanImportBackup(fromView view: UIViewController) { +// AssertIsOnMainThread() +// +// Logger.info("") +// +// self.backup.checkCanImport({ (canImport) in +// Logger.info("canImport: \(canImport)") +// +// if (canImport) { +// self.backup.setHasPendingRestoreDecision(true) +// +// self.showBackupRestoreView(fromView: view) +// } else { +// self.showProfileView(fromView: view) +// } +// }) { (_) in +// self.showBackupCheckFailedAlert(fromView: view) +// } +// } +// +// private class func showBackupCheckFailedAlert(fromView view: UIViewController) { +// AssertIsOnMainThread() +// +// Logger.info("") +// +// let alert = UIAlertController(title: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_TITLE", +// comment: "Title for alert shown when the app failed to check for an existing backup."), +// message: NSLocalizedString("CHECK_FOR_BACKUP_FAILED_MESSAGE", +// comment: "Message for alert shown when the app failed to check for an existing backup."), +// preferredStyle: .alert) +// alert.addAction(UIAlertAction(title: NSLocalizedString("REGISTER_FAILED_TRY_AGAIN", comment: ""), +// style: .default) { (_) in +// self.checkCanImportBackup(fromView: view) +// }) +// alert.addAction(UIAlertAction(title: NSLocalizedString("CHECK_FOR_BACKUP_DO_NOT_RESTORE", comment: "The label for the 'do not restore backup' button."), +// style: .destructive) { (_) in +// self.showProfileView(fromView: view) +// }) +// view.present(alert, animated: true) +// } } diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.h b/Signal/src/ViewControllers/Registration/RegistrationViewController.h deleted file mode 100644 index 32cbe803c..000000000 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RegistrationViewController : OWSViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/Registration/RegistrationViewController.m b/Signal/src/ViewControllers/Registration/RegistrationViewController.m deleted file mode 100644 index 1f9de366e..000000000 --- a/Signal/src/ViewControllers/Registration/RegistrationViewController.m +++ /dev/null @@ -1,646 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "RegistrationViewController.h" -#import "CodeVerificationViewController.h" -#import "CountryCodeViewController.h" -#import "PhoneNumber.h" -#import "PhoneNumberUtil.h" -#import "Signal-Swift.h" -#import "TSAccountManager.h" -#import "UIView+OWS.h" -#import "ViewControllerUtils.h" -#import -#import -#import -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -#ifdef DEBUG - -NSString *const kKeychainService_LastRegistered = @"kKeychainService_LastRegistered"; -NSString *const kKeychainKey_LastRegisteredCountryCode = @"kKeychainKey_LastRegisteredCountryCode"; -NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegisteredPhoneNumber"; - -#endif - -@interface RegistrationViewController () - -@property (nonatomic) NSString *countryCode; -@property (nonatomic) NSString *callingCode; - -@property (nonatomic) UILabel *countryCodeLabel; -@property (nonatomic) UITextField *phoneNumberTextField; -@property (nonatomic) UILabel *examplePhoneNumberLabel; -@property (nonatomic) OWSFlatButton *activateButton; -@property (nonatomic) UIActivityIndicatorView *spinnerView; - -@end - -#pragma mark - - -@implementation RegistrationViewController - -#pragma mark - Dependencies - -- (TSAccountManager *)tsAccountManager -{ - OWSAssertDebug(SSKEnvironment.shared.tsAccountManager); - - return SSKEnvironment.shared.tsAccountManager; -} - -#pragma mark - - -- (void)loadView -{ - [super loadView]; - - self.shouldUseTheme = NO; - - [self createViews]; - - // Do any additional setup after loading the view. - [self populateDefaultCountryNameAndCode]; - OWSAssertDebug([self.navigationController isKindOfClass:[OWSNavigationController class]]); - [SignalApp.sharedApp setSignUpFlowNavigationController:(OWSNavigationController *)self.navigationController]; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - OWSProdInfo([OWSAnalyticsEvents registrationBegan]); -} - -- (void)createViews -{ - self.view.backgroundColor = [UIColor whiteColor]; - self.view.userInteractionEnabled = YES; - [self.view - addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backgroundTapped:)]]; - self.view.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"root_view"); - - UIView *headerWrapper = [UIView containerView]; - [self.view addSubview:headerWrapper]; - headerWrapper.backgroundColor = UIColor.ows_signalBrandBlueColor; - [headerWrapper autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsZero excludingEdge:ALEdgeBottom]; - - UILabel *headerLabel = [UILabel new]; - headerLabel.text = NSLocalizedString(@"REGISTRATION_TITLE_LABEL", @""); - headerLabel.textColor = [UIColor whiteColor]; - headerLabel.font = [UIFont ows_mediumFontWithSize:ScaleFromIPhone5To7Plus(20.f, 24.f)]; - - NSString *legalTopMatterFormat = NSLocalizedString(@"REGISTRATION_LEGAL_TOP_MATTER_FORMAT", - @"legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink"); - NSString *legalTopMatterLinkWord = NSLocalizedString( - @"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE", @"embedded in legal topmatter, styled as a link"); - NSString *legalTopMatter = [NSString stringWithFormat:legalTopMatterFormat, legalTopMatterLinkWord]; - NSMutableAttributedString *attributedLegalTopMatter = - [[NSMutableAttributedString alloc] initWithString:legalTopMatter]; - NSRange linkRange = [legalTopMatter rangeOfString:legalTopMatterLinkWord]; - NSDictionary *linkStyleAttributes = @{ - NSUnderlineStyleAttributeName : @(NSUnderlineStyleSingle | NSUnderlinePatternSolid), - }; - [attributedLegalTopMatter setAttributes:linkStyleAttributes range:linkRange]; - - UILabel *legalTopMatterLabel = [UILabel new]; - legalTopMatterLabel.textColor = UIColor.whiteColor; - legalTopMatterLabel.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(13.f, 15.f)]; - legalTopMatterLabel.numberOfLines = 0; - legalTopMatterLabel.textAlignment = NSTextAlignmentCenter; - legalTopMatterLabel.attributedText = attributedLegalTopMatter; - legalTopMatterLabel.userInteractionEnabled = YES; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, legalTopMatterLabel); - - UITapGestureRecognizer *tapGesture = - [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapLegalTerms:)]; - [legalTopMatterLabel addGestureRecognizer:tapGesture]; - - UIStackView *headerContent = [[UIStackView alloc] initWithArrangedSubviews:@[ headerLabel ]]; - [headerContent addArrangedSubview:legalTopMatterLabel]; - headerContent.axis = UILayoutConstraintAxisVertical; - headerContent.alignment = UIStackViewAlignmentCenter; - headerContent.spacing = ScaleFromIPhone5To7Plus(8, 16); - headerContent.layoutMarginsRelativeArrangement = YES; - - { - CGFloat topMargin = ScaleFromIPhone5To7Plus(4, 16); - CGFloat bottomMargin = ScaleFromIPhone5To7Plus(8, 16); - headerContent.layoutMargins = UIEdgeInsetsMake(topMargin, 40, bottomMargin, 40); - } - - [headerWrapper addSubview:headerContent]; - [headerContent autoPinToTopLayoutGuideOfViewController:self withInset:0]; - [headerContent autoPinEdgesToSuperviewMarginsExcludingEdge:ALEdgeTop]; - - const CGFloat kRowHeight = 60.f; - const CGFloat kRowHMargin = 20.f; - const CGFloat kSeparatorHeight = 1.f; - const CGFloat kExamplePhoneNumberVSpacing = 8.f; - const CGFloat fontSizePoints = ScaleFromIPhone5To7Plus(16.f, 20.f); - - UIView *contentView = [UIView containerView]; - [contentView setHLayoutMargins:kRowHMargin]; - contentView.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:contentView]; - [contentView autoPinToBottomLayoutGuideOfViewController:self withInset:0]; - [contentView autoPinWidthToSuperview]; - [contentView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:headerContent]; - - // Country - UIView *countryRow = [UIView containerView]; - [contentView addSubview:countryRow]; - [countryRow autoPinLeadingAndTrailingToSuperviewMargin]; - [countryRow autoPinEdgeToSuperviewEdge:ALEdgeTop]; - [countryRow autoSetDimension:ALDimensionHeight toSize:kRowHeight]; - [countryRow - addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(countryCodeRowWasTapped:)]]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, countryRow); - - UILabel *countryNameLabel = [UILabel new]; - countryNameLabel.text - = NSLocalizedString(@"REGISTRATION_DEFAULT_COUNTRY_NAME", @"Label for the country code field"); - countryNameLabel.textColor = [UIColor blackColor]; - countryNameLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints]; - [countryRow addSubview:countryNameLabel]; - [countryNameLabel autoVCenterInSuperview]; - [countryNameLabel autoPinLeadingToSuperviewMargin]; - - UILabel *countryCodeLabel = [UILabel new]; - self.countryCodeLabel = countryCodeLabel; - countryCodeLabel.textColor = [UIColor ows_materialBlueColor]; - countryCodeLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints + 2.f]; - [countryRow addSubview:countryCodeLabel]; - [countryCodeLabel autoVCenterInSuperview]; - [countryCodeLabel autoPinTrailingToSuperviewMargin]; - - UIView *separatorView1 = [UIView new]; - separatorView1.backgroundColor = [UIColor colorWithWhite:0.75f alpha:1.f]; - [contentView addSubview:separatorView1]; - [separatorView1 autoPinWidthToSuperview]; - [separatorView1 autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:countryRow]; - [separatorView1 autoSetDimension:ALDimensionHeight toSize:kSeparatorHeight]; - - // Phone Number - UIView *phoneNumberRow = [UIView containerView]; - [contentView addSubview:phoneNumberRow]; - [phoneNumberRow autoPinLeadingAndTrailingToSuperviewMargin]; - [phoneNumberRow autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:separatorView1]; - [phoneNumberRow autoSetDimension:ALDimensionHeight toSize:kRowHeight]; - - UILabel *phoneNumberLabel = [UILabel new]; - phoneNumberLabel.text - = NSLocalizedString(@"REGISTRATION_PHONENUMBER_BUTTON", @"Label for the phone number textfield"); - phoneNumberLabel.textColor = [UIColor blackColor]; - phoneNumberLabel.font = [UIFont ows_mediumFontWithSize:fontSizePoints]; - [phoneNumberRow addSubview:phoneNumberLabel]; - [phoneNumberLabel autoVCenterInSuperview]; - [phoneNumberLabel autoPinLeadingToSuperviewMargin]; - - UITextField *phoneNumberTextField; - if (UIDevice.currentDevice.isShorterThanIPhone5) { - phoneNumberTextField = [DismissableTextField new]; - } else { - phoneNumberTextField = [OWSTextField new]; - } - - phoneNumberTextField.textAlignment = NSTextAlignmentRight; - phoneNumberTextField.delegate = self; - phoneNumberTextField.keyboardType = UIKeyboardTypeNumberPad; - phoneNumberTextField.placeholder = NSLocalizedString( - @"REGISTRATION_ENTERNUMBER_DEFAULT_TEXT", @"Placeholder text for the phone number textfield"); - self.phoneNumberTextField = phoneNumberTextField; - phoneNumberTextField.textColor = [UIColor ows_materialBlueColor]; - phoneNumberTextField.font = [UIFont ows_mediumFontWithSize:fontSizePoints + 2]; - [phoneNumberRow addSubview:phoneNumberTextField]; - [phoneNumberTextField autoVCenterInSuperview]; - [phoneNumberTextField autoPinTrailingToSuperviewMargin]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, phoneNumberTextField); - - UILabel *examplePhoneNumberLabel = [UILabel new]; - self.examplePhoneNumberLabel = examplePhoneNumberLabel; - examplePhoneNumberLabel.font = [UIFont ows_regularFontWithSize:fontSizePoints - 2.f]; - examplePhoneNumberLabel.textColor = Theme.middleGrayColor; - [contentView addSubview:examplePhoneNumberLabel]; - [examplePhoneNumberLabel autoPinTrailingToSuperviewMargin]; - [examplePhoneNumberLabel autoPinEdge:ALEdgeTop - toEdge:ALEdgeBottom - ofView:phoneNumberTextField - withOffset:kExamplePhoneNumberVSpacing]; - - UIView *separatorView2 = [UIView new]; - separatorView2.backgroundColor = [UIColor colorWithWhite:0.75f alpha:1.f]; - [contentView addSubview:separatorView2]; - [separatorView2 autoPinWidthToSuperview]; - [separatorView2 autoPinEdge:ALEdgeTop - toEdge:ALEdgeBottom - ofView:phoneNumberRow - withOffset:examplePhoneNumberLabel.font.lineHeight]; - [separatorView2 autoSetDimension:ALDimensionHeight toSize:kSeparatorHeight]; - - // Activate Button - const CGFloat kActivateButtonHeight = 47.f; - // NOTE: We use ows_signalBrandBlueColor instead of ows_materialBlueColor - // throughout the onboarding flow to be consistent with the headers. - OWSFlatButton *activateButton = [OWSFlatButton buttonWithTitle:NSLocalizedString(@"REGISTRATION_VERIFY_DEVICE", @"") - font:[OWSFlatButton fontForHeight:kActivateButtonHeight] - titleColor:[UIColor whiteColor] - backgroundColor:[UIColor ows_signalBrandBlueColor] - target:self - selector:@selector(didTapRegisterButton)]; - self.activateButton = activateButton; - [contentView addSubview:activateButton]; - [activateButton autoPinLeadingAndTrailingToSuperviewMargin]; - [activateButton autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:separatorView2 withOffset:15]; - [activateButton autoSetDimension:ALDimensionHeight toSize:kActivateButtonHeight]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, activateButton); - - UIActivityIndicatorView *spinnerView = - [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - self.spinnerView = spinnerView; - [activateButton addSubview:spinnerView]; - [spinnerView autoVCenterInSuperview]; - [spinnerView autoSetDimension:ALDimensionWidth toSize:20.f]; - [spinnerView autoSetDimension:ALDimensionHeight toSize:20.f]; - [spinnerView autoPinTrailingToSuperviewMarginWithInset:20.f]; - [spinnerView stopAnimating]; - - NSString *bottomTermsLinkText = NSLocalizedString(@"REGISTRATION_LEGAL_TERMS_LINK", - @"one line label below submit button on registration screen, which links to an external webpage."); - UIButton *bottomLegalLinkButton = [UIButton new]; - bottomLegalLinkButton.titleLabel.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(13.f, 15.f)]; - [bottomLegalLinkButton setTitleColor:UIColor.ows_materialBlueColor forState:UIControlStateNormal]; - [bottomLegalLinkButton setTitle:bottomTermsLinkText forState:UIControlStateNormal]; - [contentView addSubview:bottomLegalLinkButton]; - [bottomLegalLinkButton addTarget:self - action:@selector(didTapLegalTerms:) - forControlEvents:UIControlEventTouchUpInside]; - - [bottomLegalLinkButton autoPinLeadingAndTrailingToSuperviewMargin]; - [bottomLegalLinkButton autoPinEdge:ALEdgeTop - toEdge:ALEdgeBottom - ofView:activateButton - withOffset:ScaleFromIPhone5To7Plus(8, 12)]; - [bottomLegalLinkButton setCompressionResistanceHigh]; - [bottomLegalLinkButton setContentHuggingHigh]; - - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, bottomLegalLinkButton); -} - -- (void)viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - - [self.activateButton setEnabled:YES]; - [self.spinnerView stopAnimating]; - [self.phoneNumberTextField becomeFirstResponder]; - - if (self.tsAccountManager.isReregistering) { - // If re-registering, pre-populate the country (country code, calling code, country name) - // and phone number state. - NSString *_Nullable phoneNumberE164 = self.tsAccountManager.reregisterationPhoneNumber; - if (!phoneNumberE164) { - OWSFailDebug(@"Could not resume re-registration; missing phone number."); - } else if ([self tryToApplyPhoneNumberE164:phoneNumberE164]) { - // Don't let user edit their phone number while re-registering. - self.phoneNumberTextField.enabled = NO; - } - } -} - -- (BOOL)tryToApplyPhoneNumberE164:(NSString *)phoneNumberE164 -{ - OWSAssertDebug(phoneNumberE164); - - if (phoneNumberE164.length < 1) { - OWSFailDebug(@"Could not resume re-registration; invalid phoneNumberE164."); - return NO; - } - PhoneNumber *_Nullable parsedPhoneNumber = [PhoneNumber phoneNumberFromE164:phoneNumberE164]; - if (!parsedPhoneNumber) { - OWSFailDebug(@"Could not resume re-registration; couldn't parse phoneNumberE164."); - return NO; - } - NSNumber *_Nullable callingCode = parsedPhoneNumber.getCountryCode; - if (!callingCode) { - OWSFailDebug(@"Could not resume re-registration; missing callingCode."); - return NO; - } - NSString *callingCodeText = [NSString stringWithFormat:@"+%d", callingCode.intValue]; - NSArray *_Nullable countryCodes = - [PhoneNumberUtil.sharedThreadLocal countryCodesFromCallingCode:callingCodeText]; - if (countryCodes.count < 1) { - OWSFailDebug(@"Could not resume re-registration; unknown countryCode."); - return NO; - } - NSString *countryCode = countryCodes.firstObject; - NSString *_Nullable countryName = [PhoneNumberUtil countryNameFromCountryCode:countryCode]; - if (!countryName) { - OWSFailDebug(@"Could not resume re-registration; unknown countryName."); - return NO; - } - if (![phoneNumberE164 hasPrefix:callingCodeText]) { - OWSFailDebug(@"Could not resume re-registration; non-matching calling code."); - return NO; - } - NSString *phoneNumberWithoutCallingCode = [phoneNumberE164 substringFromIndex:callingCodeText.length]; - - [self updateCountryWithName:countryName callingCode:callingCodeText countryCode:countryCode]; - self.phoneNumberTextField.text = phoneNumberWithoutCallingCode; - - return YES; -} - -#pragma mark - Country - -- (void)populateDefaultCountryNameAndCode -{ - NSString *countryCode = [PhoneNumber defaultCountryCode]; - -#ifdef DEBUG - if ([self lastRegisteredCountryCode].length > 0) { - countryCode = [self lastRegisteredCountryCode]; - } - self.phoneNumberTextField.text = [self lastRegisteredPhoneNumber]; -#endif - - NSNumber *callingCode = [[PhoneNumberUtil sharedThreadLocal].nbPhoneNumberUtil getCountryCodeForRegion:countryCode]; - NSString *countryName = [PhoneNumberUtil countryNameFromCountryCode:countryCode]; - [self updateCountryWithName:countryName - callingCode:[NSString stringWithFormat:@"%@%@", COUNTRY_CODE_PREFIX, callingCode] - countryCode:countryCode]; -} - -- (void)updateCountryWithName:(NSString *)countryName - callingCode:(NSString *)callingCode - countryCode:(NSString *)countryCode -{ - OWSAssertIsOnMainThread(); - OWSAssertDebug(countryName.length > 0); - OWSAssertDebug(callingCode.length > 0); - OWSAssertDebug(countryCode.length > 0); - - _countryCode = countryCode; - _callingCode = callingCode; - - NSString *title = [NSString stringWithFormat:@"%@ (%@)", callingCode, countryCode.localizedUppercaseString]; - self.countryCodeLabel.text = title; - [self.countryCodeLabel setNeedsLayout]; - - self.examplePhoneNumberLabel.text = - [ViewControllerUtils examplePhoneNumberForCountryCode:countryCode callingCode:callingCode]; - [self.examplePhoneNumberLabel setNeedsLayout]; -} - -#pragma mark - Actions - -- (void)didTapRegisterButton -{ - NSString *phoneNumberText = [_phoneNumberTextField.text ows_stripped]; - if (phoneNumberText.length < 1) { - [OWSAlerts - showAlertWithTitle:NSLocalizedString(@"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE", - @"Title of alert indicating that users needs to enter a phone number to register.") - message: - NSLocalizedString(@"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE", - @"Message of alert indicating that users needs to enter a phone number to register.")]; - return; - } - - NSString *countryCode = self.countryCode; - NSString *phoneNumber = [NSString stringWithFormat:@"%@%@", _callingCode, phoneNumberText]; - PhoneNumber *localNumber = [PhoneNumber tryParsePhoneNumberFromUserSpecifiedText:phoneNumber]; - NSString *parsedPhoneNumber = localNumber.toE164; - if (parsedPhoneNumber.length < 1 - || ![[PhoneNumberValidator new] isValidForRegistrationWithPhoneNumber:localNumber]) { - [OWSAlerts showAlertWithTitle: - NSLocalizedString(@"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE", - @"Title of alert indicating that users needs to enter a valid phone number to register.") - message:NSLocalizedString(@"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE", - @"Message of alert indicating that users needs to enter a valid phone number " - @"to register.")]; - return; - } - - if (UIDevice.currentDevice.isIPad) { - [OWSAlerts showConfirmationAlertWithTitle:NSLocalizedString(@"REGISTRATION_IPAD_CONFIRM_TITLE", - @"alert title when registering an iPad") - message:NSLocalizedString(@"REGISTRATION_IPAD_CONFIRM_BODY", - @"alert body when registering an iPad") - proceedTitle:NSLocalizedString(@"REGISTRATION_IPAD_CONFIRM_BUTTON", - @"button text to proceed with registration when on an iPad") - proceedAction:^(UIAlertAction *_Nonnull action) { - [self sendCodeActionWithParsedPhoneNumber:parsedPhoneNumber - phoneNumberText:phoneNumberText - countryCode:countryCode]; - }]; - } else { - [self sendCodeActionWithParsedPhoneNumber:parsedPhoneNumber - phoneNumberText:phoneNumberText - countryCode:countryCode]; - } -} - -- (void)sendCodeActionWithParsedPhoneNumber:(NSString *)parsedPhoneNumber - phoneNumberText:(NSString *)phoneNumberText - countryCode:(NSString *)countryCode -{ - [self.activateButton setEnabled:NO]; - [self.spinnerView startAnimating]; - [self.phoneNumberTextField resignFirstResponder]; - - __weak RegistrationViewController *weakSelf = self; - [self.tsAccountManager registerWithPhoneNumber:parsedPhoneNumber - captchaToken:nil - success:^{ - OWSProdInfo([OWSAnalyticsEvents registrationRegisteredPhoneNumber]); - - [weakSelf.spinnerView stopAnimating]; - - CodeVerificationViewController *vc = [CodeVerificationViewController new]; - [weakSelf.navigationController pushViewController:vc animated:YES]; - -#ifdef DEBUG - [weakSelf setLastRegisteredCountryCode:countryCode]; - [weakSelf setLastRegisteredPhoneNumber:phoneNumberText]; -#endif - } - failure:^(NSError *error) { - if (error.code == 400) { - [OWSAlerts showAlertWithTitle:NSLocalizedString(@"REGISTRATION_ERROR", nil) - message:NSLocalizedString(@"REGISTRATION_NON_VALID_NUMBER", nil)]; - } else { - [OWSAlerts showAlertWithTitle:error.localizedDescription message:error.localizedRecoverySuggestion]; - } - - [weakSelf.activateButton setEnabled:YES]; - [weakSelf.spinnerView stopAnimating]; - [weakSelf.phoneNumberTextField becomeFirstResponder]; - } - smsVerification:YES]; -} - -- (void)countryCodeRowWasTapped:(UIGestureRecognizer *)sender -{ - if (self.tsAccountManager.isReregistering) { - // Don't let user edit their phone number while re-registering. - return; - } - - if (sender.state == UIGestureRecognizerStateRecognized) { - [self changeCountryCodeTapped]; - } -} - -- (void)didTapLegalTerms:(UIButton *)sender -{ - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; -} - -- (void)changeCountryCodeTapped -{ - CountryCodeViewController *countryCodeController = [CountryCodeViewController new]; - countryCodeController.countryCodeDelegate = self; - countryCodeController.interfaceOrientationMask = UIInterfaceOrientationMaskPortrait; - OWSNavigationController *navigationController = - [[OWSNavigationController alloc] initWithRootViewController:countryCodeController]; - [self presentViewController:navigationController animated:YES completion:nil]; -} - -- (void)backgroundTapped:(UIGestureRecognizer *)sender -{ - if (sender.state == UIGestureRecognizerStateRecognized) { - [self.phoneNumberTextField becomeFirstResponder]; - } -} - -#pragma mark - CountryCodeViewControllerDelegate - -- (void)countryCodeViewController:(CountryCodeViewController *)vc - didSelectCountryCode:(NSString *)countryCode - countryName:(NSString *)countryName - callingCode:(NSString *)callingCode -{ - OWSAssertDebug(countryCode.length > 0); - OWSAssertDebug(countryName.length > 0); - OWSAssertDebug(callingCode.length > 0); - - [self updateCountryWithName:countryName callingCode:callingCode countryCode:countryCode]; - - // Trigger the formatting logic with a no-op edit. - [self textField:self.phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""]; -} - -#pragma mark - Keyboard notifications - -- (void)initializeKeyboardHandlers -{ - UITapGestureRecognizer *outsideTabRecognizer = - [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboardFromAppropriateSubView)]; - [self.view addGestureRecognizer:outsideTabRecognizer]; -} - -- (void)dismissKeyboardFromAppropriateSubView -{ - [self.view endEditing:NO]; -} - -#pragma mark - UITextFieldDelegate - -- (BOOL)textField:(UITextField *)textField - shouldChangeCharactersInRange:(NSRange)range - replacementString:(NSString *)insertionText -{ - - [ViewControllerUtils phoneNumberTextField:textField - shouldChangeCharactersInRange:range - replacementString:insertionText - callingCode:_callingCode]; - - return NO; // inform our caller that we took care of performing the change -} - -- (BOOL)textFieldShouldReturn:(UITextField *)textField -{ - [self didTapRegisterButton]; - [textField resignFirstResponder]; - return NO; -} - -#pragma mark - Debug - -#ifdef DEBUG - -- (NSString *_Nullable)debugValueForKey:(NSString *)key -{ - OWSCAssertDebug([NSThread isMainThread]); - OWSCAssertDebug(key.length > 0); - - NSError *error; - NSString *_Nullable value = - [CurrentAppContext().keychainStorage stringForService:kKeychainService_LastRegistered key:key error:&error]; - if (error || !value) { - OWSLogWarn(@"Could not retrieve 'last registered' value from keychain: %@.", error); - return nil; - } - return value; -} - -- (void)setDebugValue:(NSString *)value forKey:(NSString *)key -{ - OWSCAssertDebug([NSThread isMainThread]); - OWSCAssertDebug(key.length > 0); - OWSCAssertDebug(value.length > 0); - - NSError *error; - BOOL success = [CurrentAppContext().keychainStorage setString:value - service:kKeychainService_LastRegistered - key:key - error:&error]; - if (!success || error) { - OWSLogError(@"Error persisting 'last registered' value in keychain: %@", error); - } -} - -- (NSString *_Nullable)lastRegisteredCountryCode -{ - return [self debugValueForKey:kKeychainKey_LastRegisteredCountryCode]; -} - -- (void)setLastRegisteredCountryCode:(NSString *)value -{ - [self setDebugValue:value forKey:kKeychainKey_LastRegisteredCountryCode]; -} - -- (NSString *_Nullable)lastRegisteredPhoneNumber -{ - return [self debugValueForKey:kKeychainKey_LastRegisteredPhoneNumber]; -} - -- (void)setLastRegisteredPhoneNumber:(NSString *)value -{ - [self setDebugValue:value forKey:kKeychainKey_LastRegisteredPhoneNumber]; -} - -#endif - -- (UIStatusBarStyle)preferredStatusBarStyle -{ - return UIStatusBarStyleLightContent; -} - -#pragma mark - Orientation - -- (UIInterfaceOrientationMask)supportedInterfaceOrientations -{ - return UIInterfaceOrientationMaskPortrait; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/Signal/src/util/AppUpdateNag.swift b/Signal/src/util/AppUpdateNag.swift index f183b283d..4f5c9e47f 100644 --- a/Signal/src/util/AppUpdateNag.swift +++ b/Signal/src/util/AppUpdateNag.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -115,7 +115,7 @@ class AppUpdateNag: NSObject { } switch frontmostViewController { - case is HomeViewController, is RegistrationViewController: + case is HomeViewController, is OnboardingSplashViewController: self.setLastNagDate(Date()) self.clearFirstHeardOfNewVersionDate() presentUpgradeNag(appStoreRecord: appStoreRecord) diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m index 9a245cff5..bc1b479ed 100644 --- a/Signal/src/util/RegistrationUtils.m +++ b/Signal/src/util/RegistrationUtils.m @@ -3,8 +3,8 @@ // #import "RegistrationUtils.h" -#import "CodeVerificationViewController.h" #import "OWSNavigationController.h" +#import "Signal-Swift.h" #import #import #import @@ -59,16 +59,23 @@ NS_ASSUME_NONNULL_BEGIN presentFromViewController:fromViewController canCancel:NO backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) { - [self.tsAccountManager registerWithPhoneNumber:self.tsAccountManager.reregisterationPhoneNumber + NSString *phoneNumber = self.tsAccountManager.reregisterationPhoneNumber; + [self.tsAccountManager registerWithPhoneNumber:phoneNumber captchaToken:nil success:^{ OWSLogInfo(@"re-registering: send verification code succeeded."); dispatch_async(dispatch_get_main_queue(), ^{ [modalActivityIndicator dismissWithCompletion:^{ - CodeVerificationViewController *viewController = - [CodeVerificationViewController new]; - + OnboardingController *onboardingController = [OnboardingController new]; + OnboardingPhoneNumber *onboardingPhoneNumber = + [[OnboardingPhoneNumber alloc] initWithE164:phoneNumber + userInput:phoneNumber]; + [onboardingController updateWithPhoneNumber:onboardingPhoneNumber]; + OnboardingVerificationViewController *viewController = + [[OnboardingVerificationViewController alloc] + initWithOnboardingController:onboardingController]; + [viewController hideBackLink]; OWSNavigationController *navigationController = [[OWSNavigationController alloc] initWithRootViewController:viewController]; navigationController.navigationBarHidden = YES; diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index 006bd0c9c..4319895d8 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -414,8 +414,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien #pragma mark - UITextFieldDelegate -// TODO: This logic resides in both RegistrationViewController and here. -// We should refactor it out into a utility function. - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)insertionText From 93e09be18eb484a715de0d661b2a196b0ebed097 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 18:07:08 -0500 Subject: [PATCH 097/493] Apply design feedback from Myles. --- .../OnboardingCaptchaViewController.swift | 10 +++++++++- .../Registration/OnboardingController.swift | 2 +- Signal/translations/en.lproj/Localizable.strings | 2 +- SignalMessaging/categories/UIFont+OWS.m | 16 ++++++++++++---- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 91cc9ed5d..24615ab78 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -23,7 +23,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { ]) titleRow.axis = .vertical titleRow.alignment = .fill - titleRow.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 0, right: 16) + titleRow.layoutMargins = UIEdgeInsets(top: 10, left: 0, bottom: 0, right: 0) titleRow.isLayoutMarginsRelativeArrangement = true // We want the CAPTCHA web content to "fill the screen (honoring margins)". @@ -71,6 +71,14 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { super.viewWillAppear(animated) loadContent() + + webView?.scrollView.contentOffset = .zero + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + webView?.scrollView.contentOffset = .zero } fileprivate let contentUrl = "https://signalcaptchas.org/registration/generate.html" diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 385f387a9..fc5676d6a 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -353,7 +353,7 @@ public class OnboardingController: NSObject { let value = try CurrentAppContext().keychainStorage().string(forService: kKeychainService_LastRegistered, key: key) return value } catch { - owsFailDebug("Error: \(error)") + // The value may not be present in the keychain. return nil } } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 7f5a585c4..799bd1eba 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1518,7 +1518,7 @@ "ONBOARDING_2FA_TITLE" = "Registration Lock"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "We need to verify that you're human"; +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 2d13b5dc6..28e26021d 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -3,6 +3,7 @@ // #import "UIFont+OWS.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -106,8 +107,7 @@ NS_ASSUME_NONNULL_BEGIN static NSDictionary *maxPointSizeMap = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - maxPointSizeMap = @{ - UIFontTextStyleLargeTitle : @(40.0), + NSMutableDictionary *map = [@{ UIFontTextStyleTitle1 : @(34.0), UIFontTextStyleTitle2 : @(28.0), UIFontTextStyleTitle3 : @(26.0), @@ -117,7 +117,11 @@ NS_ASSUME_NONNULL_BEGIN UIFontTextStyleFootnote : @(19.0), UIFontTextStyleCaption1 : @(18.0), UIFontTextStyleCaption2 : @(17.0), - }; + } mutableCopy]; + if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0)) { + map[UIFontTextStyleLargeTitle] = @(40.0); + } + maxPointSizeMap = map; }); UIFont *font = [UIFont preferredFontForTextStyle:fontTextStyle]; @@ -135,7 +139,11 @@ NS_ASSUME_NONNULL_BEGIN + (UIFont *)ows_dynamicTypeLargeTitle1ClampedFont { - return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleLargeTitle]; + if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0)) { + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleLargeTitle]; + } else { + return [UIFont preferredFontForTextStyleClamped:UIFontTextStyleTitle1]; + } } + (UIFont *)ows_dynamicTypeTitle1ClampedFont From 9402e088b2f239bb08d1c49c1f208d6e76494878 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 09:53:49 -0500 Subject: [PATCH 098/493] Apply design feedback from Myles. --- Signal.xcodeproj/project.pbxproj | 4 ++ .../PrivacySettingsTableViewController.m | 2 +- .../HomeView/HomeViewController.m | 37 +++++++++++--- .../OnboardingPermissionsViewController.swift | 12 ++--- .../OnboardingProfileViewController.swift | 5 +- SignalMessaging/utils/AppPreferences.swift | 37 ++++++++++++++ SignalServiceKit/src/Contacts/TSThread.m | 7 +++ .../Interactions/OWSLinkPreview.swift | 10 ++-- .../src/Storage/YapDatabaseConnection+OWS.m | 8 ++- .../src/Storage/YapDatabaseTransaction+OWS.h | 3 +- .../src/Storage/YapDatabaseTransaction+OWS.m | 16 +++++- .../src/Util/SSKPreferences.swift | 49 +++++++++++++++---- 12 files changed, 152 insertions(+), 38 deletions(-) create mode 100644 SignalMessaging/utils/AppPreferences.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index bcd165bdf..aadd52a2a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -164,6 +164,7 @@ 3496957421A301A100DCFE74 /* OWSBackupAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496956B21A301A100DCFE74 /* OWSBackupAPI.swift */; }; 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */; }; 349ED990221B0194008045B0 /* Onboarding2FAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */; }; + 349ED992221EE80D008045B0 /* AppPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349ED991221EE80D008045B0 /* AppPreferences.swift */; }; 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */; }; 34A4C62022175C5C0042EF2E /* OnboardingProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */; }; 34A6C28021E503E700B5B12E /* OWSImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */; }; @@ -843,6 +844,7 @@ 3496956D21A301A100DCFE74 /* OWSBackupIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBackupIO.h; sourceTree = ""; }; 349EA07B2162AEA700F7B17F /* OWS111UDAttributesMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS111UDAttributesMigration.swift; sourceTree = ""; }; 349ED98F221B0194008045B0 /* Onboarding2FAViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Onboarding2FAViewController.swift; sourceTree = ""; }; + 349ED991221EE80D008045B0 /* AppPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppPreferences.swift; sourceTree = ""; }; 34A4C61D221613D00042EF2E /* OnboardingVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingVerificationViewController.swift; sourceTree = ""; }; 34A4C61F22175C5C0042EF2E /* OnboardingProfileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingProfileViewController.swift; sourceTree = ""; }; 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSImagePickerController.swift; sourceTree = ""; }; @@ -1568,6 +1570,7 @@ 34480B471FD0A60200BC14EF /* utils */ = { isa = PBXGroup; children = ( + 349ED991221EE80D008045B0 /* AppPreferences.swift */, 452EC6E0205FF5DC000E787C /* Bench.swift */, 4C948FF62146EB4800349F0D /* BlockListCache.swift */, 343D3D991E9283F100165CA4 /* BlockListUIUtils.h */, @@ -3423,6 +3426,7 @@ 34612A071FD7238600532771 /* OWSSyncManager.m in Sources */, 450C801220AD1D5B00F3A091 /* UIDevice+featureSupport.swift in Sources */, 451F8A471FD715BA005CB9DA /* OWSAvatarBuilder.m in Sources */, + 349ED992221EE80D008045B0 /* AppPreferences.swift in Sources */, 34AC09E7211B39B100997B47 /* MessageApprovalViewController.swift in Sources */, 34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */, 34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */, diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index de08936f7..fd8b67056 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -433,7 +433,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s - (void)didToggleLinkPreviewsEnabled:(UISwitch *)sender { OWSLogInfo(@"toggled to: %@", (sender.isOn ? @"ON" : @"OFF")); - [SSKPreferences setAreLinkPreviewsEnabledWithValue:sender.isOn]; + SSKPreferences.areLinkPreviewsEnabled = sender.isOn; } - (void)show2FASettings diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index c21f0968c..96125433d 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -345,7 +345,10 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self createFirstConversationCueView]; [self.view addSubview:self.firstConversationCueView]; [self.firstConversationCueView autoPinToTopLayoutGuideOfViewController:self withInset:0.f]; - [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeTrailing withInset:10]; + // This inset bakes in assumptions about UINavigationBar layout, but I'm not sure + // there's a better way to do it, since it isn't safe to use iOS auto layout with + // UINavigationBar contents. + [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeTrailing withInset:6.f]; [self.firstConversationCueView autoPinEdgeToSuperviewEdge:ALEdgeLeading withInset:10 relation:NSLayoutRelationGreaterThanOrEqual]; @@ -410,9 +413,9 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { label.lineBreakMode = NSLineBreakByWordWrapping; OWSLayerView *layerView = [OWSLayerView new]; - layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 7, 16); + layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 11, 16); CAShapeLayer *shapeLayer = [CAShapeLayer new]; - shapeLayer.fillColor = [OWSConversationColor ows_wintergreenColor].CGColor; + shapeLayer.fillColor = UIColor.ows_signalBlueColor.CGColor; [layerView.layer addSublayer:shapeLayer]; layerView.layoutCallback = ^(UIView *view) { UIBezierPath *bezierPath = [UIBezierPath new]; @@ -443,10 +446,24 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [layerView addSubview:label]; [label ows_autoPinToSuperviewMargins]; + layerView.userInteractionEnabled = YES; + [layerView + addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self + action:@selector(firstConversationCueWasTapped:)]]; + self.firstConversationCueView = layerView; self.firstConversationLabel = label; } +- (void)firstConversationCueWasTapped:(UITapGestureRecognizer *)gestureRecognizer +{ + OWSLogInfo(@""); + + AppPreferences.hasDimissedFirstConversationCue = YES; + + [self updateViewState]; +} + - (void)updateFirstConversationLabel { NSArray *signalAccounts = self.contactsManager.signalAccounts; @@ -1453,7 +1470,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self updateReminderViews]; } -#pragma mark Database delegates +#pragma mark - Database delegates - (YapDatabaseConnection *)uiDatabaseConnection { @@ -1614,10 +1631,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { - (void)updateViewState { - NSUInteger inboxCount = self.numberOfInboxThreads; - NSUInteger archiveCount = self.numberOfArchivedThreads; - - if (self.homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0) { + if (self.shouldShowFirstConversationCue) { [_tableView setHidden:YES]; [self.emptyInboxView setHidden:NO]; [self.firstConversationCueView setHidden:NO]; @@ -1629,6 +1643,13 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { } } +- (BOOL)shouldShowFirstConversationCue +{ + return (self.homeViewMode == HomeViewMode_Inbox && self.numberOfInboxThreads == 0 + && self.numberOfArchivedThreads == 0 && !AppPreferences.hasDimissedFirstConversationCue + && !SSKPreferences.hasSavedThread); +} + // We want to delay asking for a review until an opportune time. // If the user has *just* launched Signal they intend to do something, we don't want to interrupt them. // If the user hasn't sent a message, we don't want to ask them for a review yet. diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 904eed0a3..1500343a1 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -32,17 +32,14 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { comment: "Label for the 'not now' button in the 'onboarding permissions' view."), selector: #selector(notNowPressed)) - let topSpacer = UIView.vStretchingSpacer() - let bottomSpacer = UIView.vStretchingSpacer() let stackView = UIStackView(arrangedSubviews: [ titleLabel, UIView.spacer(withHeight: 20), explanationLabel, - topSpacer, - giveAccessButton, - UIView.spacer(withHeight: 12), + UIView.vStretchingSpacer(), notNowButton, - bottomSpacer + UIView.spacer(withHeight: 12), + giveAccessButton ]) stackView.axis = .vertical stackView.alignment = .fill @@ -52,9 +49,6 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { stackView.autoPinWidthToSuperview() stackView.autoPin(toTopLayoutGuideOf: self, withInset: 0) stackView.autoPin(toBottomLayoutGuideOf: self, withInset: 0) - - // Ensure whitespace is balanced, so inputs are vertically centered. - topSpacer.autoMatch(.height, to: .height, of: bottomSpacer) } // MARK: Request Access diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift index a8c3f9023..052409b28 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -100,9 +100,8 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { profileRow, UIView.spacer(withHeight: 25), explanationLabel, - UIView.spacer(withHeight: 20), - nextButton, - bottomSpacer + bottomSpacer, + nextButton ]) stackView.axis = .vertical stackView.alignment = .fill diff --git a/SignalMessaging/utils/AppPreferences.swift b/SignalMessaging/utils/AppPreferences.swift new file mode 100644 index 000000000..a0721dc63 --- /dev/null +++ b/SignalMessaging/utils/AppPreferences.swift @@ -0,0 +1,37 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +@objc +public class AppPreferences: NSObject { + // Never instantiate this class. + private override init() {} + + private static let collection = "AppPreferences" + + // MARK: - + + private static let hasDimissedFirstConversationCueKey = "hasDimissedFirstConversationCue" + + @objc + public static var hasDimissedFirstConversationCue: Bool { + get { + return getBool(key: hasDimissedFirstConversationCueKey) + } + set { + setBool(newValue, key: hasDimissedFirstConversationCueKey) + } + } + + // MARK: - + + private class func getBool(key: String, defaultValue: Bool = false) -> Bool { + return OWSPrimaryStorage.dbReadConnection().bool(forKey: key, inCollection: collection, defaultValue: defaultValue) + } + + private class func setBool(_ value: Bool, key: String) { + OWSPrimaryStorage.dbReadWriteConnection().setBool(value, forKey: key, inCollection: collection) + } +} diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m index 441557ff9..744e7c655 100644 --- a/SignalServiceKit/src/Contacts/TSThread.m +++ b/SignalServiceKit/src/Contacts/TSThread.m @@ -151,6 +151,13 @@ ConversationColorName const kConversationColorName_Default = ConversationColorNa return self; } +- (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction +{ + [super saveWithTransaction:transaction]; + + [SSKPreferences setHasSavedThreadWithValue:YES transaction:transaction]; +} + - (void)removeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { [self removeAllThreadInteractionsWithTransaction:transaction]; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 5663017dd..01d416d77 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -195,7 +195,7 @@ public class OWSLinkPreview: MTLModel { guard OWSLinkPreview.featureEnabled else { throw LinkPreviewError.noPreview } - guard SSKPreferences.areLinkPreviewsEnabled() else { + guard SSKPreferences.areLinkPreviewsEnabled else { throw LinkPreviewError.noPreview } let imageAttachmentId = OWSLinkPreview.saveAttachmentIfPossible(inputFilePath: info.imageFilePath, @@ -445,7 +445,7 @@ public class OWSLinkPreview: MTLModel { return nil } - guard SSKPreferences.areLinkPreviewsEnabled() else { + guard SSKPreferences.areLinkPreviewsEnabled else { return nil } @@ -497,7 +497,7 @@ public class OWSLinkPreview: MTLModel { guard OWSLinkPreview.featureEnabled else { return [] } - guard SSKPreferences.areLinkPreviewsEnabled() else { + guard SSKPreferences.areLinkPreviewsEnabled else { return [] } @@ -546,7 +546,7 @@ public class OWSLinkPreview: MTLModel { guard OWSLinkPreview.featureEnabled else { return } - guard SSKPreferences.areLinkPreviewsEnabled() else { + guard SSKPreferences.areLinkPreviewsEnabled else { return } @@ -565,7 +565,7 @@ public class OWSLinkPreview: MTLModel { guard OWSLinkPreview.featureEnabled else { return Promise(error: LinkPreviewError.featureDisabled) } - guard SSKPreferences.areLinkPreviewsEnabled() else { + guard SSKPreferences.areLinkPreviewsEnabled else { return Promise(error: LinkPreviewError.featureDisabled) } guard let previewUrl = previewUrl else { diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m index 7da0d63a7..12d47b08e 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "YapDatabaseConnection+OWS.h" @@ -137,6 +137,12 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(key.length > 0); OWSAssertDebug(collection.length > 0); + NSNumber *_Nullable oldValue = [self objectForKey:key inCollection:collection ofExpectedType:[NSNumber class]]; + if (oldValue && [@(value) isEqual:oldValue]) { + // Skip redundant writes. + return; + } + [self setObject:@(value) forKey:key inCollection:collection]; } diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h index 3a98dad0f..d4326e8da 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)restoreSnapshotOfCollection:(NSString *)collection snapshotFilePath:(NSString *)snapshotFilePath; #endif +- (void)setBool:(BOOL)value forKey:(NSString *)key inCollection:(NSString *)collection; - (void)setDate:(NSDate *)value forKey:(NSString *)key inCollection:(NSString *)collection; @end diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m index 70de63012..626472aad 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "YapDatabaseTransaction+OWS.h" @@ -149,6 +149,20 @@ NS_ASSUME_NONNULL_BEGIN } #endif +- (void)setBool:(BOOL)value forKey:(NSString *)key inCollection:(NSString *)collection +{ + OWSAssertDebug(key.length > 0); + OWSAssertDebug(collection.length > 0); + + NSNumber *_Nullable oldValue = [self objectForKey:key inCollection:collection ofExpectedType:[NSNumber class]]; + if (oldValue && [@(value) isEqual:oldValue]) { + // Skip redundant writes. + return; + } + + [self setObject:@(value) forKey:key inCollection:collection]; +} + - (void)setDate:(NSDate *)value forKey:(NSString *)key inCollection:(NSString *)collection { [self setObject:@(value.timeIntervalSince1970) forKey:key inCollection:collection]; diff --git a/SignalServiceKit/src/Util/SSKPreferences.swift b/SignalServiceKit/src/Util/SSKPreferences.swift index d81e01581..64c7e5795 100644 --- a/SignalServiceKit/src/Util/SSKPreferences.swift +++ b/SignalServiceKit/src/Util/SSKPreferences.swift @@ -10,20 +10,51 @@ public class SSKPreferences: NSObject { private override init() {} private static let collection = "SSKPreferences" + + // MARK: - + private static let areLinkPreviewsEnabledKey = "areLinkPreviewsEnabled" @objc - public class func areLinkPreviewsEnabled() -> Bool { - return OWSPrimaryStorage.dbReadConnection().bool(forKey: areLinkPreviewsEnabledKey, - inCollection: collection, - defaultValue: true) + public static var areLinkPreviewsEnabled: Bool { + get { + return getBool(key: areLinkPreviewsEnabledKey, defaultValue: true) + } + set { + setBool(newValue, key: areLinkPreviewsEnabledKey) + + SSKEnvironment.shared.syncManager.sendConfigurationSyncMessage() + } + } + + // MARK: - + + private static let hasSavedThreadKey = "hasSavedThread" + + @objc + public static var hasSavedThread: Bool { + get { + return getBool(key: hasSavedThreadKey) + } + set { + setBool(newValue, key: hasSavedThreadKey) + } } @objc - public class func setAreLinkPreviewsEnabled(value: Bool) { - OWSPrimaryStorage.dbReadWriteConnection().setBool(value, - forKey: areLinkPreviewsEnabledKey, - inCollection: collection) - SSKEnvironment.shared.syncManager.sendConfigurationSyncMessage() + public class func setHasSavedThread(value: Bool, transaction: YapDatabaseReadWriteTransaction) { + transaction.setBool(value, + forKey: areLinkPreviewsEnabledKey, + inCollection: collection) + } + + // MARK: - + + private class func getBool(key: String, defaultValue: Bool = false) -> Bool { + return OWSPrimaryStorage.dbReadConnection().bool(forKey: key, inCollection: collection, defaultValue: defaultValue) + } + + private class func setBool(_ value: Bool, key: String) { + OWSPrimaryStorage.dbReadWriteConnection().setBool(value, forKey: key, inCollection: collection) } } From 089eec41362955bfd4bf811bb4108f4897a239e6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 12:06:19 -0500 Subject: [PATCH 099/493] Skip HEAD for proxied content downloads. --- .../Network/ProxiedContentDownloader.swift | 69 ++++++++++++++----- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index f819355b8..b8d7d6457 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -180,6 +180,27 @@ public class ProxiedContentAssetRequest: NSObject { super.init() } + static let k1MB: UInt = 1024 * 1024 + static let k500KB: UInt = 500 * 1024 + static let k100KB: UInt = 100 * 1024 + static let k50KB: UInt = 50 * 1024 + static let k10KB: UInt = 10 * 1024 + static let k1KB: UInt = 1 * 1024 + + // Returns the possible segment sizes in + // largest-to-smallest order. + private static var possibleSegmentSizes: [UInt] { + AssertIsOnMainThread() + + return [k1MB, k500KB, k100KB, k50KB, k10KB, k1KB ] + } + + fileprivate static var smallestPossibleSegmentSize: UInt { + AssertIsOnMainThread() + + return k1KB + } + private func segmentSize() -> UInt { AssertIsOnMainThread() @@ -190,13 +211,7 @@ public class ProxiedContentAssetRequest: NSObject { return 0 } - let k1MB: UInt = 1024 * 1024 - let k500KB: UInt = 500 * 1024 - let k100KB: UInt = 100 * 1024 - let k50KB: UInt = 50 * 1024 - let k10KB: UInt = 10 * 1024 - let k1KB: UInt = 1 * 1024 - for segmentSize in [k1MB, k500KB, k100KB, k50KB, k10KB, k1KB ] { + for segmentSize in ProxiedContentAssetRequest.possibleSegmentSizes { if contentLength >= segmentSize { return segmentSize } @@ -640,18 +655,16 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio // try to do so now. assetRequest.state = .requestingSize + let segmentStart: UInt = 0 + let segmentLength: UInt = ProxiedContentAssetRequest.smallestPossibleSegmentSize var request = URLRequest(url: assetRequest.assetDescription.url as URL) - request.httpMethod = "HEAD" request.httpShouldUsePipelining = true - // Some services like Reddit will severely rate-limit requests without a user agent. - request.addValue("Signal iOS (+https://signal.org/download)", forHTTPHeaderField: "User-Agent") - - let task = downloadSession.dataTask(with: request, completionHandler: { data, response, error -> Void in - if let data = data, data.count > 0 { - owsFailDebug("HEAD request has unexpected body: \(data.count).") - } + let rangeHeaderValue = "bytes=\(segmentStart)-\(segmentStart + segmentLength - 1)" + request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") + let task = downloadSession.dataTask(with: request, completionHandler: { _, response, error -> Void in self.handleAssetSizeResponse(assetRequest: assetRequest, response: response, error: error) }) + assetRequest.contentLengthTask = task task.resume() } else { @@ -690,13 +703,33 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio self.assetRequestDidFail(assetRequest: assetRequest) return } - guard let contentLengthString = httpResponse.allHeaderFields["Content-Length"] as? String else { - owsFailDebug("Asset size response is missing content length.") + var firstContentRangeString: String? + for header in httpResponse.allHeaderFields.keys { + guard let headerString = header as? String else { + owsFailDebug("Invalid header: \(header)") + continue + } + if headerString.lowercased() == "content-range" { + firstContentRangeString = httpResponse.allHeaderFields[header] as? String + } + } + guard let contentRangeString = firstContentRangeString else { + owsFailDebug("Asset size response is missing content range.") assetRequest.state = .failed self.assetRequestDidFail(assetRequest: assetRequest) return } - guard let contentLength = Int(contentLengthString) else { + + // Example: content-range: bytes 0-1023/7630 + guard let contentLengthString = NSRegularExpression.parseFirstMatch(pattern: "^bytes \\d+\\-\\d+/(\\d+)$", + text: contentRangeString) else { + owsFailDebug("Asset size response has invalid content range.") + assetRequest.state = .failed + self.assetRequestDidFail(assetRequest: assetRequest) + return + } + guard contentLengthString.count > 0, + let contentLength = Int(contentLengthString) else { owsFailDebug("Asset size response has unparsable content length.") assetRequest.state = .failed self.assetRequestDidFail(assetRequest: assetRequest) From f006972c39e0ddb89d1b7cf6f44a4a02d401a934 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 14:43:53 -0500 Subject: [PATCH 100/493] Skip HEAD for proxied content downloads. --- .../Network/ProxiedContentDownloader.swift | 102 ++++++++++++------ 1 file changed, 68 insertions(+), 34 deletions(-) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index b8d7d6457..1fda351f6 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -162,8 +162,6 @@ public class ProxiedContentAssetRequest: NSObject { AssertIsOnMainThread() assert(oldValue == 0) assert(contentLength > 0) - - createSegments() } } public weak var contentLengthTask: URLSessionDataTask? @@ -219,7 +217,7 @@ public class ProxiedContentAssetRequest: NSObject { return contentLength } - private func createSegments() { + fileprivate func createSegments(withInitialData initialData: Data) { AssertIsOnMainThread() let segmentLength = segmentSize() @@ -228,8 +226,20 @@ public class ProxiedContentAssetRequest: NSObject { } let contentLength = UInt(self.contentLength) - var nextSegmentStart: UInt = 0 - var index: UInt = 0 + // Make the initial segment. + let assetSegment = ProxiedContentAssetSegment(index: 0, + segmentStart: 0, + segmentLength: UInt(initialData.count), + redundantLength: 0) + // "Download" the initial segment using the initialData. + assetSegment.state = .downloading + assetSegment.append(data: initialData) + // Mark the initial segment as complete. + assetSegment.state = .complete + segments.append(assetSegment) + + var nextSegmentStart = UInt(initialData.count) + var index: UInt = 1 while nextSegmentStart < contentLength { var segmentStart: UInt = nextSegmentStart var redundantLength: UInt = 0 @@ -549,31 +559,40 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio DispatchQueue.main.async { assetSegment.state = .complete - if assetRequest.areAllSegmentsComplete() { - // If the asset request has completed all of its segments, - // try to write the asset to file. - assetRequest.state = .complete - - // Move write off main thread. - DispatchQueue.global().async { - guard let downloadFolderPath = self.downloadFolderPath else { - owsFailDebug("Missing downloadFolderPath") - return - } - guard let asset = assetRequest.writeAssetToFile(downloadFolderPath: downloadFolderPath) else { - self.segmentRequestDidFail(assetRequest: assetRequest, assetSegment: assetSegment) - return - } - self.assetRequestDidSucceed(assetRequest: assetRequest, asset: asset) - } - } else { + if !self.tryToCompleteRequest(assetRequest: assetRequest) { self.processRequestQueueSync() } } } - private func assetRequestDidSucceed(assetRequest: ProxiedContentAssetRequest, asset: ProxiedContentAsset) { + // Returns true if the request is completed. + private func tryToCompleteRequest(assetRequest: ProxiedContentAssetRequest) -> Bool { + AssertIsOnMainThread() + guard assetRequest.areAllSegmentsComplete() else { + return false + } + + // If the asset request has completed all of its segments, + // try to write the asset to file. + assetRequest.state = .complete + + // Move write off main thread. + DispatchQueue.global().async { + guard let downloadFolderPath = self.downloadFolderPath else { + owsFailDebug("Missing downloadFolderPath") + return + } + guard let asset = assetRequest.writeAssetToFile(downloadFolderPath: downloadFolderPath) else { + self.segmentRequestDidFail(assetRequest: assetRequest) + return + } + self.assetRequestDidSucceed(assetRequest: assetRequest, asset: asset) + } + return true + } + + private func assetRequestDidSucceed(assetRequest: ProxiedContentAssetRequest, asset: ProxiedContentAsset) { DispatchQueue.main.async { self.assetMap.set(key: assetRequest.assetDescription.url, value: asset) self.removeAssetRequestFromQueue(assetRequest: assetRequest) @@ -581,11 +600,14 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio } } - // TODO: If we wanted to implement segment retry, we'll need to add - // a segmentRequestDidFail() method. - private func segmentRequestDidFail(assetRequest: ProxiedContentAssetRequest, assetSegment: ProxiedContentAssetSegment) { + private func segmentRequestDidFail(assetRequest: ProxiedContentAssetRequest, assetSegment: ProxiedContentAssetSegment? = nil) { DispatchQueue.main.async { - assetSegment.state = .failed + if let assetSegment = assetSegment { + assetSegment.state = .failed + + // TODO: If we wanted to implement segment retry, we'd do so here. + // For now, we just fail the entire asset request. + } assetRequest.state = .failed self.assetRequestDidFail(assetRequest: assetRequest) } @@ -652,17 +674,18 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio if assetRequest.state == .waiting { // If asset request hasn't yet determined the resource size, - // try to do so now. + // try to do so now, by requesting a small initial segment. assetRequest.state = .requestingSize let segmentStart: UInt = 0 - let segmentLength: UInt = ProxiedContentAssetRequest.smallestPossibleSegmentSize + // Vary the initial segment size to obscure the length of the response headers. + let segmentLength: UInt = 1024 + UInt(arc4random_uniform(1024)) var request = URLRequest(url: assetRequest.assetDescription.url as URL) request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(segmentStart)-\(segmentStart + segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") - let task = downloadSession.dataTask(with: request, completionHandler: { _, response, error -> Void in - self.handleAssetSizeResponse(assetRequest: assetRequest, response: response, error: error) + let task = downloadSession.dataTask(with: request, completionHandler: { data, response, error -> Void in + self.handleAssetSizeResponse(assetRequest: assetRequest, data: data, response: response, error: error) }) assetRequest.contentLengthTask = task @@ -691,12 +714,19 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio processRequestQueueSync() } - private func handleAssetSizeResponse(assetRequest: ProxiedContentAssetRequest, response: URLResponse?, error: Error?) { + private func handleAssetSizeResponse(assetRequest: ProxiedContentAssetRequest, data: Data?, response: URLResponse?, error: Error?) { guard error == nil else { assetRequest.state = .failed self.assetRequestDidFail(assetRequest: assetRequest) return } + guard let data = data, + data.count > 0 else { + owsFailDebug("Asset size response missing data.") + assetRequest.state = .failed + self.assetRequestDidFail(assetRequest: assetRequest) + return + } guard let httpResponse = response as? HTTPURLResponse else { owsFailDebug("Asset size response is invalid.") assetRequest.state = .failed @@ -744,8 +774,12 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio DispatchQueue.main.async { assetRequest.contentLength = contentLength + assetRequest.createSegments(withInitialData: data) assetRequest.state = .active - self.processRequestQueueSync() + + if !self.tryToCompleteRequest(assetRequest: assetRequest) { + self.processRequestQueueSync() + } } } From a47930f6136c97056d558d49b0274624eeafc3ee Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 14:55:37 -0500 Subject: [PATCH 101/493] Skip HEAD for proxied content downloads. --- .../Network/ProxiedContentDownloader.swift | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index 1fda351f6..de3c2c25f 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -178,27 +178,6 @@ public class ProxiedContentAssetRequest: NSObject { super.init() } - static let k1MB: UInt = 1024 * 1024 - static let k500KB: UInt = 500 * 1024 - static let k100KB: UInt = 100 * 1024 - static let k50KB: UInt = 50 * 1024 - static let k10KB: UInt = 10 * 1024 - static let k1KB: UInt = 1 * 1024 - - // Returns the possible segment sizes in - // largest-to-smallest order. - private static var possibleSegmentSizes: [UInt] { - AssertIsOnMainThread() - - return [k1MB, k500KB, k100KB, k50KB, k10KB, k1KB ] - } - - fileprivate static var smallestPossibleSegmentSize: UInt { - AssertIsOnMainThread() - - return k1KB - } - private func segmentSize() -> UInt { AssertIsOnMainThread() @@ -209,7 +188,13 @@ public class ProxiedContentAssetRequest: NSObject { return 0 } - for segmentSize in ProxiedContentAssetRequest.possibleSegmentSizes { + let k1MB: UInt = 1024 * 1024 + let k500KB: UInt = 500 * 1024 + let k100KB: UInt = 100 * 1024 + let k50KB: UInt = 50 * 1024 + let k10KB: UInt = 10 * 1024 + let k1KB: UInt = 1 * 1024 + for segmentSize in [k1MB, k500KB, k100KB, k50KB, k10KB, k1KB ] { if contentLength >= segmentSize { return segmentSize } From 40768825c8ec36000faabcb1b2186a908089c961 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 16:25:07 -0500 Subject: [PATCH 102/493] Pad proxied request sizes. --- .../Network/ProxiedContentDownloader.swift | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index de3c2c25f..11a67f11d 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -669,6 +669,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(segmentStart)-\(segmentStart + segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") + padRequestSize(request: &request) let task = downloadSession.dataTask(with: request, completionHandler: { data, response, error -> Void in self.handleAssetSizeResponse(assetRequest: assetRequest, data: data, response: response, error: error) }) @@ -688,6 +689,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(assetSegment.segmentStart)-\(assetSegment.segmentStart + assetSegment.segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") + padRequestSize(request: &request) let task: URLSessionDataTask = downloadSession.dataTask(with: request) task.assetRequest = assetRequest task.assetSegment = assetSegment @@ -699,6 +701,61 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio processRequestQueueSync() } + private func padRequestSize(request: inout URLRequest) { + guard let sizeEstimate: UInt = estimateRequestSize(request: request) else { + owsFailDebug("Could not estimate request size.") + return + } + // We pad the estimated size to an even multiple of paddingQuantum (plus the + // extra ": " and "\r\n"). The exact size doesn't matter so long as the + // padding is consistent. + let paddingQuantum: UInt = 1024 + let paddingSize = paddingQuantum - (sizeEstimate % paddingQuantum) + let padding = String(repeating: ".", count: Int(paddingSize)) + request.addValue(padding, forHTTPHeaderField: "SignalPadding") + } + + private func estimateRequestSize(request: URLRequest) -> UInt? { + // iOS doesn't offer an exact way to measure request sizes on the wire, + // but we can reliably estimate request sizes using the "knowns", e.g. + // HTTP method, path, querystring, headers. The "unknowns" should be + // consistent between requests. + + guard let url = request.url?.absoluteString else { + owsFailDebug("Request missing URL.") + return nil + } + guard let components = URLComponents(string: url) else { + owsFailDebug("Request has invalid URL.") + return nil + } + + var result: Int = 0 + + if let httpMethod = request.httpMethod { + result += httpMethod.count + } + result += components.percentEncodedPath.count + if let percentEncodedQuery = components.percentEncodedQuery { + result += percentEncodedQuery.count + } + if let allHTTPHeaderFields = request.allHTTPHeaderFields { + if allHTTPHeaderFields.count != 1 { + owsFailDebug("Request has unexpected number of headers.") + } + for (key, value) in allHTTPHeaderFields { + // Each header has 4 extra bytes: + // + // * Two for the key/value separator ": " + // * Two for "\r\n", the line break in the HTTP protocol spec. + result += key.count + value.count + 4 + } + } else { + owsFailDebug("Request has no headers.") + } + return UInt(result) + } + private func handleAssetSizeResponse(assetRequest: ProxiedContentAssetRequest, data: Data?, response: URLResponse?, error: Error?) { guard error == nil else { assetRequest.state = .failed From 32965a0c140cbcf7db3c83e4ddcf5f9d64444eb1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 14:47:42 -0500 Subject: [PATCH 103/493] Respond to CR. --- SignalServiceKit/src/Network/ProxiedContentDownloader.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index 11a67f11d..eea007546 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -753,6 +753,9 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio } else { owsFailDebug("Request has no headers.") } + if let httpBody = request.httpBody { + result += httpBody.count + } return UInt(result) } From f36373e3ca858fbdf47645ccc92eaf3ed2599f12 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:11:29 -0500 Subject: [PATCH 104/493] Add 'sent update' transcripts to proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 29 +- .../src/Protos/Generated/SSKProto.swift | 252 ++++++++++++++++++ .../Protos/Generated/SignalService.pb.swift | 157 +++++++++++ 3 files changed, 429 insertions(+), 9 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index bbca43987..ccbaae55f 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -267,6 +267,16 @@ message SyncMessage { repeated UnidentifiedDeliveryStatus unidentifiedStatus = 5; } + message SentUpdate { + message UnidentifiedDeliveryStatus { + optional string destination = 1; + optional bool unidentified = 2; + } + optional string destination = 1; + optional uint64 timestamp = 2; + repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; + } + message Contacts { // @required optional AttachmentPointer blob = 1; @@ -310,15 +320,16 @@ message SyncMessage { optional bool linkPreviews = 4; } - optional Sent sent = 1; - optional Contacts contacts = 2; - optional Groups groups = 3; - optional Request request = 4; - repeated Read read = 5; - optional Blocked blocked = 6; - optional Verified verified = 7; - optional Configuration configuration = 9; - optional bytes padding = 8; + optional Sent sent = 1; + optional SentUpdate sentUpdate = 10; + optional Contacts contacts = 2; + optional Groups groups = 3; + optional Request request = 4; + repeated Read read = 5; + optional Blocked blocked = 6; + optional Verified verified = 7; + optional Configuration configuration = 9; + optional bytes padding = 8; } message AttachmentPointer { diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index e4002e51c..02395d413 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3734,6 +3734,241 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { #endif +// MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus + +@objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus: NSObject { + + // MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder + + @objc public class func builder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { + return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() + } + + // asBuilder() constructs a builder that reflects the proto's contents. + @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { + let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() + if let _value = destination { + builder.setDestination(_value) + } + if hasUnidentified { + builder.setUnidentified(unidentified) + } + return builder + } + + @objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder: NSObject { + + private var proto = SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus() + + @objc fileprivate override init() {} + + @objc public func setDestination(_ valueParam: String) { + proto.destination = valueParam + } + + @objc public func setUnidentified(_ valueParam: Bool) { + proto.unidentified = valueParam + } + + @objc public func build() throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto) + } + + @objc public func buildSerializedData() throws -> Data { + return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto).serializedData() + } + } + + fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus + + @objc public var destination: String? { + guard proto.hasDestination else { + return nil + } + return proto.destination + } + @objc public var hasDestination: Bool { + return proto.hasDestination + } + + @objc public var unidentified: Bool { + return proto.unidentified + } + @objc public var hasUnidentified: Bool { + return proto.hasUnidentified + } + + private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) { + self.proto = proto + } + + @objc + public func serializedData() throws -> Data { + return try self.proto.serializedData() + } + + @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + let proto = try SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus(serializedData: serializedData) + return try parseProto(proto) + } + + fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - + + // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - + + let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto) + return result + } + + @objc public override var debugDescription: String { + return "\(proto)" + } +} + +#if DEBUG + +extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus? { + return try! self.build() + } +} + +#endif + +// MARK: - SSKProtoSyncMessageSentUpdate + +@objc public class SSKProtoSyncMessageSentUpdate: NSObject { + + // MARK: - SSKProtoSyncMessageSentUpdateBuilder + + @objc public class func builder() -> SSKProtoSyncMessageSentUpdateBuilder { + return SSKProtoSyncMessageSentUpdateBuilder() + } + + // asBuilder() constructs a builder that reflects the proto's contents. + @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateBuilder { + let builder = SSKProtoSyncMessageSentUpdateBuilder() + if let _value = destination { + builder.setDestination(_value) + } + if hasTimestamp { + builder.setTimestamp(timestamp) + } + builder.setUnidentifiedStatus(unidentifiedStatus) + return builder + } + + @objc public class SSKProtoSyncMessageSentUpdateBuilder: NSObject { + + private var proto = SignalServiceProtos_SyncMessage.SentUpdate() + + @objc fileprivate override init() {} + + @objc public func setDestination(_ valueParam: String) { + proto.destination = valueParam + } + + @objc public func setTimestamp(_ valueParam: UInt64) { + proto.timestamp = valueParam + } + + @objc public func addUnidentifiedStatus(_ valueParam: SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus) { + var items = proto.unidentifiedStatus + items.append(valueParam.proto) + proto.unidentifiedStatus = items + } + + @objc public func setUnidentifiedStatus(_ wrappedItems: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { + proto.unidentifiedStatus = wrappedItems.map { $0.proto } + } + + @objc public func build() throws -> SSKProtoSyncMessageSentUpdate { + return try SSKProtoSyncMessageSentUpdate.parseProto(proto) + } + + @objc public func buildSerializedData() throws -> Data { + return try SSKProtoSyncMessageSentUpdate.parseProto(proto).serializedData() + } + } + + fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate + + @objc public let unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] + + @objc public var destination: String? { + guard proto.hasDestination else { + return nil + } + return proto.destination + } + @objc public var hasDestination: Bool { + return proto.hasDestination + } + + @objc public var timestamp: UInt64 { + return proto.timestamp + } + @objc public var hasTimestamp: Bool { + return proto.hasTimestamp + } + + private init(proto: SignalServiceProtos_SyncMessage.SentUpdate, + unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { + self.proto = proto + self.unidentifiedStatus = unidentifiedStatus + } + + @objc + public func serializedData() throws -> Data { + return try self.proto.serializedData() + } + + @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdate { + let proto = try SignalServiceProtos_SyncMessage.SentUpdate(serializedData: serializedData) + return try parseProto(proto) + } + + fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate) throws -> SSKProtoSyncMessageSentUpdate { + var unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] = [] + unidentifiedStatus = try proto.unidentifiedStatus.map { try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto($0) } + + // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdate - + + // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdate - + + let result = SSKProtoSyncMessageSentUpdate(proto: proto, + unidentifiedStatus: unidentifiedStatus) + return result + } + + @objc public override var debugDescription: String { + return "\(proto)" + } +} + +#if DEBUG + +extension SSKProtoSyncMessageSentUpdate { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageSentUpdate.SSKProtoSyncMessageSentUpdateBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdate? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageContacts @objc public class SSKProtoSyncMessageContacts: NSObject { @@ -4434,6 +4669,9 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild if let _value = sent { builder.setSent(_value) } + if let _value = sentUpdate { + builder.setSentUpdate(_value) + } if let _value = contacts { builder.setContacts(_value) } @@ -4469,6 +4707,10 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild proto.sent = valueParam.proto } + @objc public func setSentUpdate(_ valueParam: SSKProtoSyncMessageSentUpdate) { + proto.sentUpdate = valueParam.proto + } + @objc public func setContacts(_ valueParam: SSKProtoSyncMessageContacts) { proto.contacts = valueParam.proto } @@ -4520,6 +4762,8 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild @objc public let sent: SSKProtoSyncMessageSent? + @objc public let sentUpdate: SSKProtoSyncMessageSentUpdate? + @objc public let contacts: SSKProtoSyncMessageContacts? @objc public let groups: SSKProtoSyncMessageGroups? @@ -4546,6 +4790,7 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild private init(proto: SignalServiceProtos_SyncMessage, sent: SSKProtoSyncMessageSent?, + sentUpdate: SSKProtoSyncMessageSentUpdate?, contacts: SSKProtoSyncMessageContacts?, groups: SSKProtoSyncMessageGroups?, request: SSKProtoSyncMessageRequest?, @@ -4555,6 +4800,7 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild configuration: SSKProtoSyncMessageConfiguration?) { self.proto = proto self.sent = sent + self.sentUpdate = sentUpdate self.contacts = contacts self.groups = groups self.request = request @@ -4580,6 +4826,11 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild sent = try SSKProtoSyncMessageSent.parseProto(proto.sent) } + var sentUpdate: SSKProtoSyncMessageSentUpdate? = nil + if proto.hasSentUpdate { + sentUpdate = try SSKProtoSyncMessageSentUpdate.parseProto(proto.sentUpdate) + } + var contacts: SSKProtoSyncMessageContacts? = nil if proto.hasContacts { contacts = try SSKProtoSyncMessageContacts.parseProto(proto.contacts) @@ -4619,6 +4870,7 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild let result = SSKProtoSyncMessage(proto: proto, sent: sent, + sentUpdate: sentUpdate, contacts: contacts, groups: groups, request: request, diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index caa6a045b..eda7d1520 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1452,6 +1452,15 @@ struct SignalServiceProtos_SyncMessage { /// Clears the value of `sent`. Subsequent reads from it will return its default value. mutating func clearSent() {_uniqueStorage()._sent = nil} + var sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate { + get {return _storage._sentUpdate ?? SignalServiceProtos_SyncMessage.SentUpdate()} + set {_uniqueStorage()._sentUpdate = newValue} + } + /// Returns true if `sentUpdate` has been explicitly set. + var hasSentUpdate: Bool {return _storage._sentUpdate != nil} + /// Clears the value of `sentUpdate`. Subsequent reads from it will return its default value. + mutating func clearSentUpdate() {_uniqueStorage()._sentUpdate = nil} + var contacts: SignalServiceProtos_SyncMessage.Contacts { get {return _storage._contacts ?? SignalServiceProtos_SyncMessage.Contacts()} set {_uniqueStorage()._contacts = newValue} @@ -1606,6 +1615,70 @@ struct SignalServiceProtos_SyncMessage { fileprivate var _storage = _StorageClass.defaultInstance } + struct SentUpdate { + // SwiftProtobuf.Message conformance is added in an extension below. See the + // `Message` and `Message+*Additions` files in the SwiftProtobuf library for + // methods supported on all messages. + + var destination: String { + get {return _destination ?? String()} + set {_destination = newValue} + } + /// Returns true if `destination` has been explicitly set. + var hasDestination: Bool {return self._destination != nil} + /// Clears the value of `destination`. Subsequent reads from it will return its default value. + mutating func clearDestination() {self._destination = nil} + + var timestamp: UInt64 { + get {return _timestamp ?? 0} + set {_timestamp = newValue} + } + /// Returns true if `timestamp` has been explicitly set. + var hasTimestamp: Bool {return self._timestamp != nil} + /// Clears the value of `timestamp`. Subsequent reads from it will return its default value. + mutating func clearTimestamp() {self._timestamp = nil} + + var unidentifiedStatus: [SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus] = [] + + var unknownFields = SwiftProtobuf.UnknownStorage() + + struct UnidentifiedDeliveryStatus { + // SwiftProtobuf.Message conformance is added in an extension below. See the + // `Message` and `Message+*Additions` files in the SwiftProtobuf library for + // methods supported on all messages. + + var destination: String { + get {return _destination ?? String()} + set {_destination = newValue} + } + /// Returns true if `destination` has been explicitly set. + var hasDestination: Bool {return self._destination != nil} + /// Clears the value of `destination`. Subsequent reads from it will return its default value. + mutating func clearDestination() {self._destination = nil} + + var unidentified: Bool { + get {return _unidentified ?? false} + set {_unidentified = newValue} + } + /// Returns true if `unidentified` has been explicitly set. + var hasUnidentified: Bool {return self._unidentified != nil} + /// Clears the value of `unidentified`. Subsequent reads from it will return its default value. + mutating func clearUnidentified() {self._unidentified = nil} + + var unknownFields = SwiftProtobuf.UnknownStorage() + + init() {} + + fileprivate var _destination: String? = nil + fileprivate var _unidentified: Bool? = nil + } + + init() {} + + fileprivate var _destination: String? = nil + fileprivate var _timestamp: UInt64? = nil + } + struct Contacts { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -3715,6 +3788,7 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. static let protoMessageName: String = _protobuf_package + ".SyncMessage" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "sent"), + 10: .same(proto: "sentUpdate"), 2: .same(proto: "contacts"), 3: .same(proto: "groups"), 4: .same(proto: "request"), @@ -3727,6 +3801,7 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. fileprivate class _StorageClass { var _sent: SignalServiceProtos_SyncMessage.Sent? = nil + var _sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate? = nil var _contacts: SignalServiceProtos_SyncMessage.Contacts? = nil var _groups: SignalServiceProtos_SyncMessage.Groups? = nil var _request: SignalServiceProtos_SyncMessage.Request? = nil @@ -3742,6 +3817,7 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. init(copying source: _StorageClass) { _sent = source._sent + _sentUpdate = source._sentUpdate _contacts = source._contacts _groups = source._groups _request = source._request @@ -3774,6 +3850,7 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. case 7: try decoder.decodeSingularMessageField(value: &_storage._verified) case 8: try decoder.decodeSingularBytesField(value: &_storage._padding) case 9: try decoder.decodeSingularMessageField(value: &_storage._configuration) + case 10: try decoder.decodeSingularMessageField(value: &_storage._sentUpdate) default: break } } @@ -3809,6 +3886,9 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. if let v = _storage._configuration { try visitor.visitSingularMessageField(value: v, fieldNumber: 9) } + if let v = _storage._sentUpdate { + try visitor.visitSingularMessageField(value: v, fieldNumber: 10) + } } try unknownFields.traverse(visitor: &visitor) } @@ -3819,6 +3899,7 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. let _storage = _args.0 let rhs_storage = _args.1 if _storage._sent != rhs_storage._sent {return false} + if _storage._sentUpdate != rhs_storage._sentUpdate {return false} if _storage._contacts != rhs_storage._contacts {return false} if _storage._groups != rhs_storage._groups {return false} if _storage._request != rhs_storage._request {return false} @@ -3964,6 +4045,82 @@ extension SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus: Swift } } +extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { + static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".SentUpdate" + static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ + 1: .same(proto: "destination"), + 2: .same(proto: "timestamp"), + 3: .same(proto: "unidentifiedStatus"), + ] + + mutating func decodeMessage(decoder: inout D) throws { + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._destination) + case 2: try decoder.decodeSingularUInt64Field(value: &self._timestamp) + case 3: try decoder.decodeRepeatedMessageField(value: &self.unidentifiedStatus) + default: break + } + } + } + + func traverse(visitor: inout V) throws { + if let v = self._destination { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._timestamp { + try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) + } + if !self.unidentifiedStatus.isEmpty { + try visitor.visitRepeatedMessageField(value: self.unidentifiedStatus, fieldNumber: 3) + } + try unknownFields.traverse(visitor: &visitor) + } + + static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate, rhs: SignalServiceProtos_SyncMessage.SentUpdate) -> Bool { + if lhs._destination != rhs._destination {return false} + if lhs._timestamp != rhs._timestamp {return false} + if lhs.unidentifiedStatus != rhs.unidentifiedStatus {return false} + if lhs.unknownFields != rhs.unknownFields {return false} + return true + } +} + +extension SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { + static let protoMessageName: String = SignalServiceProtos_SyncMessage.SentUpdate.protoMessageName + ".UnidentifiedDeliveryStatus" + static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ + 1: .same(proto: "destination"), + 2: .same(proto: "unidentified"), + ] + + mutating func decodeMessage(decoder: inout D) throws { + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._destination) + case 2: try decoder.decodeSingularBoolField(value: &self._unidentified) + default: break + } + } + } + + func traverse(visitor: inout V) throws { + if let v = self._destination { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._unidentified { + try visitor.visitSingularBoolField(value: v, fieldNumber: 2) + } + try unknownFields.traverse(visitor: &visitor) + } + + static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, rhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) -> Bool { + if lhs._destination != rhs._destination {return false} + if lhs._unidentified != rhs._unidentified {return false} + if lhs.unknownFields != rhs.unknownFields {return false} + return true + } +} + extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Contacts" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ From 907159f3f4898f5f6b31c2ce272040eb17ad1938 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:11:43 -0500 Subject: [PATCH 105/493] Process 'sent update' transcripts. --- .../src/Devices/OWSRecordTranscriptJob.h | 10 ++-- .../src/Devices/OWSRecordTranscriptJob.m | 38 ++++---------- .../src/Messages/OWSMessageManager.m | 50 ++++++++++--------- 3 files changed, 41 insertions(+), 57 deletions(-) diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h index 02a2048c4..abbeeff41 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -12,11 +12,11 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSRecordTranscriptJob : NSObject - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript - NS_DESIGNATED_INITIALIZER; -- (void)runWithAttachmentHandler:(void (^)(NSArray *attachmentStreams))attachmentHandler - transaction:(YapDatabaseReadWriteTransaction *)transaction; ++ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript + attachmentHandler:(void (^)( + NSArray *attachmentStreams))attachmentHandler + transaction:(YapDatabaseReadWriteTransaction *)transaction; @end diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index a20f84d39..801bdcf47 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -18,71 +18,53 @@ NS_ASSUME_NONNULL_BEGIN -@interface OWSRecordTranscriptJob () - -@property (nonatomic, readonly) OWSIncomingSentMessageTranscript *incomingSentMessageTranscript; - -@end - -#pragma mark - - @implementation OWSRecordTranscriptJob -- (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript -{ - self = [super init]; - if (!self) { - return self; - } - - _incomingSentMessageTranscript = incomingSentMessageTranscript; - - return self; -} - #pragma mark - Dependencies -- (OWSPrimaryStorage *)primaryStorage ++ (OWSPrimaryStorage *)primaryStorage { OWSAssertDebug(SSKEnvironment.shared.primaryStorage); return SSKEnvironment.shared.primaryStorage; } -- (TSNetworkManager *)networkManager ++ (TSNetworkManager *)networkManager { OWSAssertDebug(SSKEnvironment.shared.networkManager); return SSKEnvironment.shared.networkManager; } -- (OWSReadReceiptManager *)readReceiptManager ++ (OWSReadReceiptManager *)readReceiptManager { OWSAssert(SSKEnvironment.shared.readReceiptManager); return SSKEnvironment.shared.readReceiptManager; } -- (id)contactsManager ++ (id)contactsManager { OWSAssertDebug(SSKEnvironment.shared.contactsManager); return SSKEnvironment.shared.contactsManager; } -- (OWSAttachmentDownloads *)attachmentDownloads ++ (OWSAttachmentDownloads *)attachmentDownloads { return SSKEnvironment.shared.attachmentDownloads; } #pragma mark - -- (void)runWithAttachmentHandler:(void (^)(NSArray *attachmentStreams))attachmentHandler - transaction:(YapDatabaseReadWriteTransaction *)transaction ++ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)transcript + attachmentHandler:(void (^)( + NSArray *attachmentStreams))attachmentHandler + transaction:(YapDatabaseReadWriteTransaction *)transaction { + OWSAssertDebug(transcript); OWSAssertDebug(transaction); - OWSIncomingSentMessageTranscript *transcript = self.incomingSentMessageTranscript; OWSLogInfo(@"Recording transcript in thread: %@ timestamp: %llu", transcript.thread.uniqueId, transcript.timestamp); if (transcript.isEndSessionMessage) { diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 3c8858186..094768123 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -863,9 +863,6 @@ NS_ASSUME_NONNULL_BEGIN [[OWSIncomingSentMessageTranscript alloc] initWithProto:syncMessage.sent transaction:transaction]; - OWSRecordTranscriptJob *recordJob = - [[OWSRecordTranscriptJob alloc] initWithIncomingSentMessageTranscript:transcript]; - SSKProtoDataMessage *_Nullable dataMessage = syncMessage.sent.message; if (!dataMessage) { OWSFailDebug(@"Missing dataMessage."); @@ -883,29 +880,34 @@ NS_ASSUME_NONNULL_BEGIN } if ([self isDataMessageGroupAvatarUpdate:syncMessage.sent.message]) { - [recordJob - runWithAttachmentHandler:^(NSArray *attachmentStreams) { - OWSAssertDebug(attachmentStreams.count == 1); - TSAttachmentStream *attachmentStream = attachmentStreams.firstObject; - [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - TSGroupThread *_Nullable groupThread = - [TSGroupThread threadWithGroupId:dataMessage.group.id transaction:transaction]; - if (!groupThread) { - OWSFailDebug(@"ignoring sync group avatar update for unknown group."); - return; - } + [OWSRecordTranscriptJob + processIncomingSentMessageTranscript:transcript + attachmentHandler:^(NSArray *attachmentStreams) { + OWSAssertDebug(attachmentStreams.count == 1); + TSAttachmentStream *attachmentStream = attachmentStreams.firstObject; + [self.dbConnection readWriteWithBlock:^( + YapDatabaseReadWriteTransaction *transaction) { + TSGroupThread *_Nullable groupThread = + [TSGroupThread threadWithGroupId:dataMessage.group.id + transaction:transaction]; + if (!groupThread) { + OWSFailDebug(@"ignoring sync group avatar update for unknown group."); + return; + } - [groupThread updateAvatarWithAttachmentStream:attachmentStream transaction:transaction]; - }]; - } - transaction:transaction]; + [groupThread updateAvatarWithAttachmentStream:attachmentStream + transaction:transaction]; + }]; + } + transaction:transaction]; } else { - [recordJob - runWithAttachmentHandler:^(NSArray *attachmentStreams) { - OWSLogDebug( - @"successfully fetched transcript attachments: %lu", (unsigned long)attachmentStreams.count); - } - transaction:transaction]; + [OWSRecordTranscriptJob + processIncomingSentMessageTranscript:transcript + attachmentHandler:^(NSArray *attachmentStreams) { + OWSLogDebug(@"successfully fetched transcript attachments: %lu", + (unsigned long)attachmentStreams.count); + } + transaction:transaction]; } } else if (syncMessage.request) { if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) { From b53243da31322d6e9ad029cacb531273f8185649 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:22:31 -0500 Subject: [PATCH 106/493] Add 'sent update' transcripts to proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 4 +- .../src/Protos/Generated/SSKProto.swift | 60 ++++++++++--------- .../Protos/Generated/SignalService.pb.swift | 28 +++++---- 3 files changed, 50 insertions(+), 42 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index ccbaae55f..1274a7b48 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -272,7 +272,9 @@ message SyncMessage { optional string destination = 1; optional bool unidentified = 2; } - optional string destination = 1; + // @required + optional bytes groupId = 1; + // @required optional uint64 timestamp = 2; repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; } diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 02395d413..412867092 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3848,19 +3848,13 @@ extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMe // MARK: - SSKProtoSyncMessageSentUpdateBuilder - @objc public class func builder() -> SSKProtoSyncMessageSentUpdateBuilder { - return SSKProtoSyncMessageSentUpdateBuilder() + @objc public class func builder(groupID: Data, timestamp: UInt64) -> SSKProtoSyncMessageSentUpdateBuilder { + return SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) } // asBuilder() constructs a builder that reflects the proto's contents. @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateBuilder { - let builder = SSKProtoSyncMessageSentUpdateBuilder() - if let _value = destination { - builder.setDestination(_value) - } - if hasTimestamp { - builder.setTimestamp(timestamp) - } + let builder = SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) builder.setUnidentifiedStatus(unidentifiedStatus) return builder } @@ -3871,8 +3865,15 @@ extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMe @objc fileprivate override init() {} - @objc public func setDestination(_ valueParam: String) { - proto.destination = valueParam + @objc fileprivate init(groupID: Data, timestamp: UInt64) { + super.init() + + setGroupID(groupID) + setTimestamp(timestamp) + } + + @objc public func setGroupID(_ valueParam: Data) { + proto.groupID = valueParam } @objc public func setTimestamp(_ valueParam: UInt64) { @@ -3900,28 +3901,19 @@ extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMe fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate + @objc public let groupID: Data + + @objc public let timestamp: UInt64 + @objc public let unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] - @objc public var destination: String? { - guard proto.hasDestination else { - return nil - } - return proto.destination - } - @objc public var hasDestination: Bool { - return proto.hasDestination - } - - @objc public var timestamp: UInt64 { - return proto.timestamp - } - @objc public var hasTimestamp: Bool { - return proto.hasTimestamp - } - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate, + groupID: Data, + timestamp: UInt64, unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { self.proto = proto + self.groupID = groupID + self.timestamp = timestamp self.unidentifiedStatus = unidentifiedStatus } @@ -3936,6 +3928,16 @@ extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMe } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate) throws -> SSKProtoSyncMessageSentUpdate { + guard proto.hasGroupID else { + throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: groupID") + } + let groupID = proto.groupID + + guard proto.hasTimestamp else { + throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: timestamp") + } + let timestamp = proto.timestamp + var unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] = [] unidentifiedStatus = try proto.unidentifiedStatus.map { try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto($0) } @@ -3944,6 +3946,8 @@ extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMe // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdate - let result = SSKProtoSyncMessageSentUpdate(proto: proto, + groupID: groupID, + timestamp: timestamp, unidentifiedStatus: unidentifiedStatus) return result } diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index eda7d1520..7cb550360 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1620,15 +1620,17 @@ struct SignalServiceProtos_SyncMessage { // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. - var destination: String { - get {return _destination ?? String()} - set {_destination = newValue} + /// @required + var groupID: Data { + get {return _groupID ?? SwiftProtobuf.Internal.emptyData} + set {_groupID = newValue} } - /// Returns true if `destination` has been explicitly set. - var hasDestination: Bool {return self._destination != nil} - /// Clears the value of `destination`. Subsequent reads from it will return its default value. - mutating func clearDestination() {self._destination = nil} + /// Returns true if `groupID` has been explicitly set. + var hasGroupID: Bool {return self._groupID != nil} + /// Clears the value of `groupID`. Subsequent reads from it will return its default value. + mutating func clearGroupID() {self._groupID = nil} + /// @required var timestamp: UInt64 { get {return _timestamp ?? 0} set {_timestamp = newValue} @@ -1675,7 +1677,7 @@ struct SignalServiceProtos_SyncMessage { init() {} - fileprivate var _destination: String? = nil + fileprivate var _groupID: Data? = nil fileprivate var _timestamp: UInt64? = nil } @@ -4048,7 +4050,7 @@ extension SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus: Swift extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".SentUpdate" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "destination"), + 1: .same(proto: "groupId"), 2: .same(proto: "timestamp"), 3: .same(proto: "unidentifiedStatus"), ] @@ -4056,7 +4058,7 @@ extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, Swi mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &self._destination) + case 1: try decoder.decodeSingularBytesField(value: &self._groupID) case 2: try decoder.decodeSingularUInt64Field(value: &self._timestamp) case 3: try decoder.decodeRepeatedMessageField(value: &self.unidentifiedStatus) default: break @@ -4065,8 +4067,8 @@ extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - if let v = self._destination { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) + if let v = self._groupID { + try visitor.visitSingularBytesField(value: v, fieldNumber: 1) } if let v = self._timestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) @@ -4078,7 +4080,7 @@ extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, Swi } static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate, rhs: SignalServiceProtos_SyncMessage.SentUpdate) -> Bool { - if lhs._destination != rhs._destination {return false} + if lhs._groupID != rhs._groupID {return false} if lhs._timestamp != rhs._timestamp {return false} if lhs.unidentifiedStatus != rhs.unidentifiedStatus {return false} if lhs.unknownFields != rhs.unknownFields {return false} From 304c285540f003279589c2f7696a0bdb4e54bd53 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:43:05 -0500 Subject: [PATCH 107/493] Add 'sent update' transcripts to proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 1 + .../src/Protos/Generated/SSKProto.swift | 37 ++++++++++--------- .../Protos/Generated/SignalService.pb.swift | 1 + 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 1274a7b48..afb9170ba 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -269,6 +269,7 @@ message SyncMessage { message SentUpdate { message UnidentifiedDeliveryStatus { + // @required optional string destination = 1; optional bool unidentified = 2; } diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 412867092..96a68f7bd 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3740,16 +3740,13 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { // MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder - @objc public class func builder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() + @objc public class func builder(destination: String) -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { + return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) } // asBuilder() constructs a builder that reflects the proto's contents. @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() - if let _value = destination { - builder.setDestination(_value) - } + let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) if hasUnidentified { builder.setUnidentified(unidentified) } @@ -3762,6 +3759,12 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { @objc fileprivate override init() {} + @objc fileprivate init(destination: String) { + super.init() + + setDestination(destination) + } + @objc public func setDestination(_ valueParam: String) { proto.destination = valueParam } @@ -3781,15 +3784,7 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus - @objc public var destination: String? { - guard proto.hasDestination else { - return nil - } - return proto.destination - } - @objc public var hasDestination: Bool { - return proto.hasDestination - } + @objc public let destination: String @objc public var unidentified: Bool { return proto.unidentified @@ -3798,8 +3793,10 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { return proto.hasUnidentified } - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) { + private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, + destination: String) { self.proto = proto + self.destination = destination } @objc @@ -3813,11 +3810,17 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + guard proto.hasDestination else { + throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: destination") + } + let destination = proto.destination + // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto) + let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto, + destination: destination) return result } diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index 7cb550360..b40305e1c 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1649,6 +1649,7 @@ struct SignalServiceProtos_SyncMessage { // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. + /// @required var destination: String { get {return _destination ?? String()} set {_destination = newValue} From ccc1bd3331c22018f4af0ab9f296bc10afe4c0ec Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:43:30 -0500 Subject: [PATCH 108/493] Process 'sent update' transcripts. --- .../src/Devices/OWSRecordTranscriptJob.h | 6 ++ .../src/Devices/OWSRecordTranscriptJob.m | 96 +++++++++++++++++++ .../src/Messages/OWSMessageManager.m | 5 +- 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h index abbeeff41..016c47ef9 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h @@ -5,6 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @class OWSIncomingSentMessageTranscript; +@class SSKProtoSyncMessageSentUpdate; @class TSAttachmentStream; @class YapDatabaseReadWriteTransaction; @@ -18,6 +19,11 @@ NS_ASSUME_NONNULL_BEGIN NSArray *attachmentStreams))attachmentHandler transaction:(YapDatabaseReadWriteTransaction *)transaction; ++ (BOOL)areSentUpdatesEnabled; + ++ (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate + transaction:(YapDatabaseReadWriteTransaction *)transaction; + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 801bdcf47..0be9fefc7 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -10,11 +10,13 @@ #import "OWSReadReceiptManager.h" #import "SSKEnvironment.h" #import "TSAttachmentPointer.h" +#import "TSGroupThread.h" #import "TSInfoMessage.h" #import "TSNetworkManager.h" #import "TSOutgoingMessage.h" #import "TSQuotedMessage.h" #import "TSThread.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -65,6 +67,13 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(transcript); OWSAssertDebug(transaction); + if (self.dataMessage.group) { + _thread = [TSGroupThread getOrCreateThreadWithGroupId:_dataMessage.group.id transaction:transaction]; + } else { + _thread = [TSContactThread getOrCreateThreadWithContactId:_recipientId transaction:transaction]; + } + + OWSLogInfo(@"Recording transcript in thread: %@ timestamp: %llu", transcript.thread.uniqueId, transcript.timestamp); if (transcript.isEndSessionMessage) { @@ -171,6 +180,93 @@ NS_ASSUME_NONNULL_BEGIN } } +#pragma mark - + ++ (BOOL)areSentUpdatesEnabled +{ + return NO; +} + ++ (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate + transaction:(YapDatabaseReadWriteTransaction *)transaction +{ + OWSAssertDebug(sentUpdate); + OWSAssertDebug(transaction); + + if (!self.areSentUpdatesEnabled) { + OWSFailDebug(@"Ignoring 'sent update' transcript; disabled."); + return; + } + + uint64_t timestamp = sentUpdate.timestamp; + if (timestamp < 1) { + OWSFailDebug(@"'Sent update' transcript has invalid timestamp."); + return; + } + + NSData *groupId = sentUpdate.groupID; + if (groupId.length < 1) { + OWSFailDebug(@"'Sent update' transcript has invalid groupId."); + return; + } + + NSArray *statusProtos = sentUpdate.unidentifiedStatus; + if (statusProtos.count < 1) { + OWSFailDebug(@"'Sent update' transcript is missing statusProtos."); + return; + } + + NSMutableArray *nonUdRecipientIds = [NSMutableArray new]; + NSMutableArray *udRecipientIds = [NSMutableArray new]; + for (SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus *statusProto in statusProtos) { + NSString *recipientId = statusProto.destination; + if (statusProto.unidentified) { + [udRecipientIds addObject:recipientId]; + } else { + [nonUdRecipientIds addObject:recipientId]; + } + } + + NSArray *messages + = (NSArray *)[TSInteraction interactionsWithTimestamp:timestamp + ofClass:[TSOutgoingMessage class] + withTransaction:transaction]; + if (messages.count < 1) { + // This message may have disappeared. + OWSLogError(@"No matching message with timestamp: %llu.", timestamp); + return; + } + + BOOL messageFound = NO; + for (TSOutgoingMessage *message in messages) { + TSThread *thread = [message threadWithTransaction:transaction]; + if (!thread.isGroupThread) { + continue; + } + TSGroupThread *groupThread = (TSGroupThread *)thread; + if (![groupThread.groupModel.groupId isEqual:groupId]) { + continue; + } + + OWSLogInfo(@"Processing 'sent update' transcript in thread: %@, timestamp: %llu, nonUdRecipientIds: %d, " + @"udRecipientIds: %d.", + thread.uniqueId, + timestamp, + (int)nonUdRecipientIds.count, + (int)udRecipientIds.count); + + [message updateWithWasSentFromLinkedDeviceWithUDRecipientIds:udRecipientIds + nonUdRecipientIds:nonUdRecipientIds + transaction:transaction]; + messageFound = YES; + } + + if (!messageFound) { + // This message may have disappeared. + OWSLogError(@"No matching message with timestamp: %llu.", timestamp); + } +} + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 094768123..b20b21ce7 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -860,8 +860,7 @@ NS_ASSUME_NONNULL_BEGIN if (syncMessage.sent) { OWSIncomingSentMessageTranscript *transcript = - [[OWSIncomingSentMessageTranscript alloc] initWithProto:syncMessage.sent - transaction:transaction]; + [[OWSIncomingSentMessageTranscript alloc] initWithProto:syncMessage.sent transaction:transaction]; SSKProtoDataMessage *_Nullable dataMessage = syncMessage.sent.message; if (!dataMessage) { @@ -909,6 +908,8 @@ NS_ASSUME_NONNULL_BEGIN } transaction:transaction]; } + } else if (syncMessage.sentUpdate) { + [OWSRecordTranscriptJob processSentUpdateTranscript:syncMessage.sentUpdate transaction:transaction]; } else if (syncMessage.request) { if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) { // We respond asynchronously because populating the sync message will From 6ce84e7f9bd52dbc5255aa76b75726a3427ea82f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 09:52:19 -0500 Subject: [PATCH 109/493] Process 'sent update' transcripts. --- .../src/Devices/OWSRecordTranscriptJob.m | 9 +++++++++ .../Messages/Interactions/TSOutgoingMessage.h | 1 + .../Messages/Interactions/TSOutgoingMessage.m | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 0be9fefc7..d8c3425ef 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -161,6 +161,7 @@ NS_ASSUME_NONNULL_BEGIN [outgoingMessage saveWithTransaction:transaction]; [outgoingMessage updateWithWasSentFromLinkedDeviceWithUDRecipientIds:transcript.udRecipientIds nonUdRecipientIds:transcript.nonUdRecipientIds + isSentUpdate:NO transaction:transaction]; [[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:outgoingMessage expirationStartedAt:transcript.expirationStartedAt @@ -239,6 +240,13 @@ NS_ASSUME_NONNULL_BEGIN BOOL messageFound = NO; for (TSOutgoingMessage *message in messages) { + if (!message.isFromLinkedDevice) { + // isFromLinkedDevice isn't always set for very old linked messages, but: + // + // a) We should never receive a "sent update" for a very old message. + // b) It's safe to discard suspicious "sent updates." + continue; + } TSThread *thread = [message threadWithTransaction:transaction]; if (!thread.isGroupThread) { continue; @@ -257,6 +265,7 @@ NS_ASSUME_NONNULL_BEGIN [message updateWithWasSentFromLinkedDeviceWithUDRecipientIds:udRecipientIds nonUdRecipientIds:nonUdRecipientIds + isSentUpdate:YES transaction:transaction]; messageFound = YES; } diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h index b007d7fc4..f75a997cc 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h @@ -220,6 +220,7 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) { - (void)updateWithWasSentFromLinkedDeviceWithUDRecipientIds:(nullable NSArray *)udRecipientIds nonUdRecipientIds:(nullable NSArray *)nonUdRecipientIds + isSentUpdate:(BOOL)isSentUpdate transaction:(YapDatabaseReadWriteTransaction *)transaction; // This method is used to rewrite the recipient list with a single recipient. diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 208f6035a..c2768391e 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -753,7 +753,9 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt - (void)updateWithWasSentFromLinkedDeviceWithUDRecipientIds:(nullable NSArray *)udRecipientIds nonUdRecipientIds:(nullable NSArray *)nonUdRecipientIds - transaction:(YapDatabaseReadWriteTransaction *)transaction { + isSentUpdate:(BOOL)isSentUpdate + transaction:(YapDatabaseReadWriteTransaction *)transaction +{ OWSAssertDebug(transaction); [self @@ -788,6 +790,19 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt recipientState.wasSentByUD = NO; recipientStateMap[recipientId] = recipientState; } + + if (isSentUpdate) { + // If this is a "sent update", make sure that: + // + // a) "Sent updates" should never remove any recipients. We end up with the + // union of the existing and new recipients. + // b) "Sent updates" should never downgrade the "recipient state" for any + // recipients. Prefer existing "recipient state"; "sent updates" only + // add new recipients at the "sent" state. + [recipientStateMap removeObjectsForKeys:self.recipientStateMap.allKeys]; + [recipientStateMap addEntriesFromDictionary:self.recipientStateMap]; + } + [message setRecipientStateMap:recipientStateMap]; } else { // Otherwise assume this is a legacy message before UD was introduced, and mark From 4f19d03bdc4a4e645e1787cb18ba82edaeb30abe Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 10:11:09 -0500 Subject: [PATCH 110/493] Send 'sent update' sync messages. --- .../src/Devices/OWSRecordTranscriptJob.h | 2 - .../src/Devices/OWSRecordTranscriptJob.m | 14 +-- .../OWSOutgoingSentUpdateMessageTranscript.h | 25 +++++ .../OWSOutgoingSentUpdateMessageTranscript.m | 100 ++++++++++++++++++ .../Messages/Interactions/TSOutgoingMessage.h | 5 + .../Messages/Interactions/TSOutgoingMessage.m | 7 +- .../src/Messages/OWSMessageSender.m | 78 +++++++++++--- 7 files changed, 202 insertions(+), 29 deletions(-) create mode 100644 SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h create mode 100644 SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h index 016c47ef9..7969a58ee 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h @@ -19,8 +19,6 @@ NS_ASSUME_NONNULL_BEGIN NSArray *attachmentStreams))attachmentHandler transaction:(YapDatabaseReadWriteTransaction *)transaction; -+ (BOOL)areSentUpdatesEnabled; - + (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate transaction:(YapDatabaseReadWriteTransaction *)transaction; diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index d8c3425ef..bb871ae5e 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -67,13 +67,6 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(transcript); OWSAssertDebug(transaction); - if (self.dataMessage.group) { - _thread = [TSGroupThread getOrCreateThreadWithGroupId:_dataMessage.group.id transaction:transaction]; - } else { - _thread = [TSContactThread getOrCreateThreadWithContactId:_recipientId transaction:transaction]; - } - - OWSLogInfo(@"Recording transcript in thread: %@ timestamp: %llu", transcript.thread.uniqueId, transcript.timestamp); if (transcript.isEndSessionMessage) { @@ -183,18 +176,13 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -+ (BOOL)areSentUpdatesEnabled -{ - return NO; -} - + (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate transaction:(YapDatabaseReadWriteTransaction *)transaction { OWSAssertDebug(sentUpdate); OWSAssertDebug(transaction); - if (!self.areSentUpdatesEnabled) { + if (!AreSentUpdatesEnabled()) { OWSFailDebug(@"Ignoring 'sent update' transcript; disabled."); return; } diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h new file mode 100644 index 000000000..7678eb12b --- /dev/null +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h @@ -0,0 +1,25 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +#import "OWSOutgoingSyncMessage.h" + +NS_ASSUME_NONNULL_BEGIN + +@class TSOutgoingMessage; + +/** + * Notifies your other registered devices (if you have any) that you've sent a message. + * This way the message you just sent can appear on all your devices. + */ +@interface OWSOutgoingSentUpdateMessageTranscript : OWSOutgoingSyncMessage + +- (instancetype)init NS_UNAVAILABLE; + +- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message + transaction:(YapDatabaseReadTransaction *)transaction NS_DESIGNATED_INITIALIZER; +- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m new file mode 100644 index 000000000..2ec1e8390 --- /dev/null +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m @@ -0,0 +1,100 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +#import "OWSOutgoingSentUpdateMessageTranscript.h" +#import "TSGroupThread.h" +#import "TSOutgoingMessage.h" +#import "TSThread.h" +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface TSOutgoingMessage (OWSOutgoingSentMessageTranscript) + +/** + * Normally this is private, but we need to embed this + * data structure within our own. + * + * recipientId is nil when building "sent" sync messages for messages + * sent to groups. + */ +- (nullable SSKProtoDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId; + +@end + +@interface OWSOutgoingSentUpdateMessageTranscript () + +@property (nonatomic, readonly) TSOutgoingMessage *message; +@property (nonatomic, readonly) TSGroupThread *groupThread; + +@end + +@implementation OWSOutgoingSentUpdateMessageTranscript + +- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message + transaction:(YapDatabaseReadTransaction *)transaction +{ + self = [super init]; + + if (!self) { + return self; + } + + _message = message; + _groupThread = (TSGroupThread *)[message threadWithTransaction:transaction]; + + return self; +} + +- (nullable instancetype)initWithCoder:(NSCoder *)coder +{ + return [super initWithCoder:coder]; +} + +- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder +{ + SSKProtoSyncMessageSentUpdateBuilder *sentBuilder = + [SSKProtoSyncMessageSentUpdate builderWithGroupID:self.groupThread.groupModel.groupId + timestamp:self.message.timestamp]; + + for (NSString *recipientId in self.message.sentRecipientIds) { + TSOutgoingMessageRecipientState *_Nullable recipientState = + [self.message recipientStateForRecipientId:recipientId]; + if (!recipientState) { + OWSFailDebug(@"missing recipient state for: %@", recipientId); + continue; + } + if (recipientState.state != OWSOutgoingMessageRecipientStateSent) { + OWSFailDebug(@"unexpected recipient state for: %@", recipientId); + continue; + } + + NSError *error; + SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder *statusBuilder = + [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus builderWithDestination:recipientId]; + [statusBuilder setUnidentified:recipientState.wasSentByUD]; + SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus *_Nullable status = + [statusBuilder buildAndReturnError:&error]; + if (error || !status) { + OWSFailDebug(@"Couldn't build UD status proto: %@", error); + continue; + } + [sentBuilder addUnidentifiedStatus:status]; + } + + NSError *error; + SSKProtoSyncMessageSentUpdate *_Nullable sentUpdateProto = [sentBuilder buildAndReturnError:&error]; + if (error || !sentUpdateProto) { + OWSFailDebug(@"could not build protobuf: %@", error); + return nil; + } + + SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder]; + [syncMessageBuilder setSentUpdate:sentUpdateProto]; + return syncMessageBuilder; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h index f75a997cc..80995e2b2 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h @@ -6,6 +6,11 @@ NS_ASSUME_NONNULL_BEGIN +// Feature flag. +// +// TODO: Remove. +BOOL AreSentUpdatesEnabled(void); + typedef NS_ENUM(NSInteger, TSOutgoingMessageState) { // The message is either: // a) Enqueued for sending. diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index c2768391e..988e9b5d7 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN +BOOL AreSentUpdatesEnabled(void) +{ + return NO; +} + NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRecipientAll"; NSString *NSStringForOutgoingMessageState(TSOutgoingMessageState value) @@ -1104,7 +1109,7 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt - (BOOL)shouldSyncTranscript { - return !self.hasSyncedTranscript; + return YES; } - (NSString *)statusDescription diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 303b2b74e..e05625603 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -18,6 +18,7 @@ #import "OWSMessageServiceParams.h" #import "OWSOperation.h" #import "OWSOutgoingSentMessageTranscript.h" +#import "OWSOutgoingSentUpdateMessageTranscript.h" #import "OWSOutgoingSyncMessage.h" #import "OWSPrimaryStorage+PreKeyStore.h" #import "OWSPrimaryStorage+SignedPreKeyStore.h" @@ -1391,20 +1392,27 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; return success(); } - [self - sendSyncTranscriptForMessage:message - success:^{ - // TODO: We might send to a recipient, then to another recipient on retry. - // To ensure desktop receives all "delivery status" info, we might - // want to send a transcript after every send that reaches _any_ - // new recipients. - [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [message updateWithHasSyncedTranscript:YES transaction:transaction]; - }]; + if (message.hasSyncedTranscript) { + if (!AreSentUpdatesEnabled()) { + return success(); + } + [self sendSyncUpdateTranscriptForMessage:message + success:^{ + success(); + } + failure:failure]; + } else { + [self sendSyncTranscriptForMessage:message + success:^{ + [self.dbConnection + readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [message updateWithHasSyncedTranscript:YES transaction:transaction]; + }]; - success(); - } - failure:failure]; + success(); + } + failure:failure]; + } } - (void)sendSyncTranscriptForMessage:(TSOutgoingMessage *)message @@ -1439,6 +1447,50 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; [self sendMessageToRecipient:messageSend]; } +- (void)sendSyncUpdateTranscriptForMessage:(TSOutgoingMessage *)message + success:(void (^)(void))success + failure:(RetryableFailureHandler)failure +{ + NSString *recipientId = self.tsAccountManager.localNumber; + + __block OWSOutgoingSentUpdateMessageTranscript *transcript; + __block BOOL isGroupThread = NO; + __block SignalRecipient *recipient; + [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + isGroupThread = message.thread.isGroupThread; + + if (isGroupThread) { + recipient = [SignalRecipient markRecipientAsRegisteredAndGet:recipientId transaction:transaction]; + transcript = [[OWSOutgoingSentUpdateMessageTranscript alloc] initWithOutgoingMessage:message + transaction:transaction]; + } + }]; + + if (!isGroupThread) { + // We only send "sent update" transcripts for group messages. + return success(); + } + + OWSMessageSend *messageSend = [[OWSMessageSend alloc] initWithMessage:transcript + thread:message.thread + recipient:recipient + senderCertificate:nil + udAccess:nil + localNumber:self.tsAccountManager.localNumber + success:^{ + OWSLogInfo(@"Successfully sent 'sent update' sync transcript."); + + success(); + } + failure:^(NSError *error) { + OWSLogInfo( + @"Failed to send 'sent update' sync transcript: %@ (isRetryable: %d)", error, [error isRetryable]); + + failure(error); + }]; + [self sendMessageToRecipient:messageSend]; +} + - (NSArray *)throws_deviceMessagesForMessageSend:(OWSMessageSend *)messageSend { OWSAssertDebug(messageSend.message); From 5f3a03a06a231dcac341548ea70bd5f9a8cbed5c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 10:19:46 -0500 Subject: [PATCH 111/493] Add 'sent update' transcripts to proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index afb9170ba..91cd701f2 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -268,16 +268,16 @@ message SyncMessage { } message SentUpdate { - message UnidentifiedDeliveryStatus { - // @required - optional string destination = 1; - optional bool unidentified = 2; - } - // @required - optional bytes groupId = 1; - // @required - optional uint64 timestamp = 2; - repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; + message UnidentifiedDeliveryStatus { + // @required + optional string destination = 1; + optional bool unidentified = 2; + } + // @required + optional bytes groupId = 1; + // @required + optional uint64 timestamp = 2; + repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; } message Contacts { From f19915fb75e496923da020d42ebdb79b31187622 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 10:50:19 -0500 Subject: [PATCH 112/493] Add 'is update' flag to 'sent message' transcript proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 33 +-- .../src/Protos/Generated/SSKProto.swift | 273 +----------------- .../Protos/Generated/SignalService.pb.swift | 177 ++---------- 3 files changed, 41 insertions(+), 442 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 91cd701f2..4c5ccaadf 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -265,19 +265,7 @@ message SyncMessage { optional DataMessage message = 3; optional uint64 expirationStartTimestamp = 4; repeated UnidentifiedDeliveryStatus unidentifiedStatus = 5; - } - - message SentUpdate { - message UnidentifiedDeliveryStatus { - // @required - optional string destination = 1; - optional bool unidentified = 2; - } - // @required - optional bytes groupId = 1; - // @required - optional uint64 timestamp = 2; - repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; + optional bool isUpdate = 6 [default = false]; } message Contacts { @@ -323,16 +311,15 @@ message SyncMessage { optional bool linkPreviews = 4; } - optional Sent sent = 1; - optional SentUpdate sentUpdate = 10; - optional Contacts contacts = 2; - optional Groups groups = 3; - optional Request request = 4; - repeated Read read = 5; - optional Blocked blocked = 6; - optional Verified verified = 7; - optional Configuration configuration = 9; - optional bytes padding = 8; + optional Sent sent = 1; + optional Contacts contacts = 2; + optional Groups groups = 3; + optional Request request = 4; + repeated Read read = 5; + optional Blocked blocked = 6; + optional Verified verified = 7; + optional Configuration configuration = 9; + optional bytes padding = 8; } message AttachmentPointer { diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 96a68f7bd..cd1cacd2f 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3602,6 +3602,9 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS builder.setExpirationStartTimestamp(expirationStartTimestamp) } builder.setUnidentifiedStatus(unidentifiedStatus) + if hasIsUpdate { + builder.setIsUpdate(isUpdate) + } return builder } @@ -3637,6 +3640,10 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS proto.unidentifiedStatus = wrappedItems.map { $0.proto } } + @objc public func setIsUpdate(_ valueParam: Bool) { + proto.isUpdate = valueParam + } + @objc public func build() throws -> SSKProtoSyncMessageSent { return try SSKProtoSyncMessageSent.parseProto(proto) } @@ -3676,6 +3683,13 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS return proto.hasExpirationStartTimestamp } + @objc public var isUpdate: Bool { + return proto.isUpdate + } + @objc public var hasIsUpdate: Bool { + return proto.hasIsUpdate + } + private init(proto: SignalServiceProtos_SyncMessage.Sent, message: SSKProtoDataMessage?, unidentifiedStatus: [SSKProtoSyncMessageSentUnidentifiedDeliveryStatus]) { @@ -3734,248 +3748,6 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { #endif -// MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - -@objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus: NSObject { - - // MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder - - @objc public class func builder(destination: String) -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) - } - - // asBuilder() constructs a builder that reflects the proto's contents. - @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) - if hasUnidentified { - builder.setUnidentified(unidentified) - } - return builder - } - - @objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder: NSObject { - - private var proto = SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus() - - @objc fileprivate override init() {} - - @objc fileprivate init(destination: String) { - super.init() - - setDestination(destination) - } - - @objc public func setDestination(_ valueParam: String) { - proto.destination = valueParam - } - - @objc public func setUnidentified(_ valueParam: Bool) { - proto.unidentified = valueParam - } - - @objc public func build() throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto) - } - - @objc public func buildSerializedData() throws -> Data { - return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto).serializedData() - } - } - - fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus - - @objc public let destination: String - - @objc public var unidentified: Bool { - return proto.unidentified - } - @objc public var hasUnidentified: Bool { - return proto.hasUnidentified - } - - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, - destination: String) { - self.proto = proto - self.destination = destination - } - - @objc - public func serializedData() throws -> Data { - return try self.proto.serializedData() - } - - @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - let proto = try SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus(serializedData: serializedData) - return try parseProto(proto) - } - - fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - guard proto.hasDestination else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: destination") - } - let destination = proto.destination - - // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - - let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto, - destination: destination) - return result - } - - @objc public override var debugDescription: String { - return "\(proto)" - } -} - -#if DEBUG - -extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - @objc public func serializedDataIgnoringErrors() -> Data? { - return try! self.serializedData() - } -} - -extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus? { - return try! self.build() - } -} - -#endif - -// MARK: - SSKProtoSyncMessageSentUpdate - -@objc public class SSKProtoSyncMessageSentUpdate: NSObject { - - // MARK: - SSKProtoSyncMessageSentUpdateBuilder - - @objc public class func builder(groupID: Data, timestamp: UInt64) -> SSKProtoSyncMessageSentUpdateBuilder { - return SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) - } - - // asBuilder() constructs a builder that reflects the proto's contents. - @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateBuilder { - let builder = SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) - builder.setUnidentifiedStatus(unidentifiedStatus) - return builder - } - - @objc public class SSKProtoSyncMessageSentUpdateBuilder: NSObject { - - private var proto = SignalServiceProtos_SyncMessage.SentUpdate() - - @objc fileprivate override init() {} - - @objc fileprivate init(groupID: Data, timestamp: UInt64) { - super.init() - - setGroupID(groupID) - setTimestamp(timestamp) - } - - @objc public func setGroupID(_ valueParam: Data) { - proto.groupID = valueParam - } - - @objc public func setTimestamp(_ valueParam: UInt64) { - proto.timestamp = valueParam - } - - @objc public func addUnidentifiedStatus(_ valueParam: SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus) { - var items = proto.unidentifiedStatus - items.append(valueParam.proto) - proto.unidentifiedStatus = items - } - - @objc public func setUnidentifiedStatus(_ wrappedItems: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { - proto.unidentifiedStatus = wrappedItems.map { $0.proto } - } - - @objc public func build() throws -> SSKProtoSyncMessageSentUpdate { - return try SSKProtoSyncMessageSentUpdate.parseProto(proto) - } - - @objc public func buildSerializedData() throws -> Data { - return try SSKProtoSyncMessageSentUpdate.parseProto(proto).serializedData() - } - } - - fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate - - @objc public let groupID: Data - - @objc public let timestamp: UInt64 - - @objc public let unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] - - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate, - groupID: Data, - timestamp: UInt64, - unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { - self.proto = proto - self.groupID = groupID - self.timestamp = timestamp - self.unidentifiedStatus = unidentifiedStatus - } - - @objc - public func serializedData() throws -> Data { - return try self.proto.serializedData() - } - - @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdate { - let proto = try SignalServiceProtos_SyncMessage.SentUpdate(serializedData: serializedData) - return try parseProto(proto) - } - - fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate) throws -> SSKProtoSyncMessageSentUpdate { - guard proto.hasGroupID else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: groupID") - } - let groupID = proto.groupID - - guard proto.hasTimestamp else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: timestamp") - } - let timestamp = proto.timestamp - - var unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] = [] - unidentifiedStatus = try proto.unidentifiedStatus.map { try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto($0) } - - // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdate - - - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdate - - - let result = SSKProtoSyncMessageSentUpdate(proto: proto, - groupID: groupID, - timestamp: timestamp, - unidentifiedStatus: unidentifiedStatus) - return result - } - - @objc public override var debugDescription: String { - return "\(proto)" - } -} - -#if DEBUG - -extension SSKProtoSyncMessageSentUpdate { - @objc public func serializedDataIgnoringErrors() -> Data? { - return try! self.serializedData() - } -} - -extension SSKProtoSyncMessageSentUpdate.SSKProtoSyncMessageSentUpdateBuilder { - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdate? { - return try! self.build() - } -} - -#endif - // MARK: - SSKProtoSyncMessageContacts @objc public class SSKProtoSyncMessageContacts: NSObject { @@ -4676,9 +4448,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild if let _value = sent { builder.setSent(_value) } - if let _value = sentUpdate { - builder.setSentUpdate(_value) - } if let _value = contacts { builder.setContacts(_value) } @@ -4714,10 +4483,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild proto.sent = valueParam.proto } - @objc public func setSentUpdate(_ valueParam: SSKProtoSyncMessageSentUpdate) { - proto.sentUpdate = valueParam.proto - } - @objc public func setContacts(_ valueParam: SSKProtoSyncMessageContacts) { proto.contacts = valueParam.proto } @@ -4769,8 +4534,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild @objc public let sent: SSKProtoSyncMessageSent? - @objc public let sentUpdate: SSKProtoSyncMessageSentUpdate? - @objc public let contacts: SSKProtoSyncMessageContacts? @objc public let groups: SSKProtoSyncMessageGroups? @@ -4797,7 +4560,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild private init(proto: SignalServiceProtos_SyncMessage, sent: SSKProtoSyncMessageSent?, - sentUpdate: SSKProtoSyncMessageSentUpdate?, contacts: SSKProtoSyncMessageContacts?, groups: SSKProtoSyncMessageGroups?, request: SSKProtoSyncMessageRequest?, @@ -4807,7 +4569,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild configuration: SSKProtoSyncMessageConfiguration?) { self.proto = proto self.sent = sent - self.sentUpdate = sentUpdate self.contacts = contacts self.groups = groups self.request = request @@ -4833,11 +4594,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild sent = try SSKProtoSyncMessageSent.parseProto(proto.sent) } - var sentUpdate: SSKProtoSyncMessageSentUpdate? = nil - if proto.hasSentUpdate { - sentUpdate = try SSKProtoSyncMessageSentUpdate.parseProto(proto.sentUpdate) - } - var contacts: SSKProtoSyncMessageContacts? = nil if proto.hasContacts { contacts = try SSKProtoSyncMessageContacts.parseProto(proto.contacts) @@ -4877,7 +4633,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild let result = SSKProtoSyncMessage(proto: proto, sent: sent, - sentUpdate: sentUpdate, contacts: contacts, groups: groups, request: request, diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index b40305e1c..ad5bb91b0 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1452,15 +1452,6 @@ struct SignalServiceProtos_SyncMessage { /// Clears the value of `sent`. Subsequent reads from it will return its default value. mutating func clearSent() {_uniqueStorage()._sent = nil} - var sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate { - get {return _storage._sentUpdate ?? SignalServiceProtos_SyncMessage.SentUpdate()} - set {_uniqueStorage()._sentUpdate = newValue} - } - /// Returns true if `sentUpdate` has been explicitly set. - var hasSentUpdate: Bool {return _storage._sentUpdate != nil} - /// Clears the value of `sentUpdate`. Subsequent reads from it will return its default value. - mutating func clearSentUpdate() {_uniqueStorage()._sentUpdate = nil} - var contacts: SignalServiceProtos_SyncMessage.Contacts { get {return _storage._contacts ?? SignalServiceProtos_SyncMessage.Contacts()} set {_uniqueStorage()._contacts = newValue} @@ -1577,6 +1568,15 @@ struct SignalServiceProtos_SyncMessage { set {_uniqueStorage()._unidentifiedStatus = newValue} } + var isUpdate: Bool { + get {return _storage._isUpdate ?? false} + set {_uniqueStorage()._isUpdate = newValue} + } + /// Returns true if `isUpdate` has been explicitly set. + var hasIsUpdate: Bool {return _storage._isUpdate != nil} + /// Clears the value of `isUpdate`. Subsequent reads from it will return its default value. + mutating func clearIsUpdate() {_uniqueStorage()._isUpdate = nil} + var unknownFields = SwiftProtobuf.UnknownStorage() struct UnidentifiedDeliveryStatus { @@ -1615,73 +1615,6 @@ struct SignalServiceProtos_SyncMessage { fileprivate var _storage = _StorageClass.defaultInstance } - struct SentUpdate { - // SwiftProtobuf.Message conformance is added in an extension below. See the - // `Message` and `Message+*Additions` files in the SwiftProtobuf library for - // methods supported on all messages. - - /// @required - var groupID: Data { - get {return _groupID ?? SwiftProtobuf.Internal.emptyData} - set {_groupID = newValue} - } - /// Returns true if `groupID` has been explicitly set. - var hasGroupID: Bool {return self._groupID != nil} - /// Clears the value of `groupID`. Subsequent reads from it will return its default value. - mutating func clearGroupID() {self._groupID = nil} - - /// @required - var timestamp: UInt64 { - get {return _timestamp ?? 0} - set {_timestamp = newValue} - } - /// Returns true if `timestamp` has been explicitly set. - var hasTimestamp: Bool {return self._timestamp != nil} - /// Clears the value of `timestamp`. Subsequent reads from it will return its default value. - mutating func clearTimestamp() {self._timestamp = nil} - - var unidentifiedStatus: [SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus] = [] - - var unknownFields = SwiftProtobuf.UnknownStorage() - - struct UnidentifiedDeliveryStatus { - // SwiftProtobuf.Message conformance is added in an extension below. See the - // `Message` and `Message+*Additions` files in the SwiftProtobuf library for - // methods supported on all messages. - - /// @required - var destination: String { - get {return _destination ?? String()} - set {_destination = newValue} - } - /// Returns true if `destination` has been explicitly set. - var hasDestination: Bool {return self._destination != nil} - /// Clears the value of `destination`. Subsequent reads from it will return its default value. - mutating func clearDestination() {self._destination = nil} - - var unidentified: Bool { - get {return _unidentified ?? false} - set {_unidentified = newValue} - } - /// Returns true if `unidentified` has been explicitly set. - var hasUnidentified: Bool {return self._unidentified != nil} - /// Clears the value of `unidentified`. Subsequent reads from it will return its default value. - mutating func clearUnidentified() {self._unidentified = nil} - - var unknownFields = SwiftProtobuf.UnknownStorage() - - init() {} - - fileprivate var _destination: String? = nil - fileprivate var _unidentified: Bool? = nil - } - - init() {} - - fileprivate var _groupID: Data? = nil - fileprivate var _timestamp: UInt64? = nil - } - struct Contacts { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -3791,7 +3724,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. static let protoMessageName: String = _protobuf_package + ".SyncMessage" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "sent"), - 10: .same(proto: "sentUpdate"), 2: .same(proto: "contacts"), 3: .same(proto: "groups"), 4: .same(proto: "request"), @@ -3804,7 +3736,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. fileprivate class _StorageClass { var _sent: SignalServiceProtos_SyncMessage.Sent? = nil - var _sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate? = nil var _contacts: SignalServiceProtos_SyncMessage.Contacts? = nil var _groups: SignalServiceProtos_SyncMessage.Groups? = nil var _request: SignalServiceProtos_SyncMessage.Request? = nil @@ -3820,7 +3751,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. init(copying source: _StorageClass) { _sent = source._sent - _sentUpdate = source._sentUpdate _contacts = source._contacts _groups = source._groups _request = source._request @@ -3853,7 +3783,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. case 7: try decoder.decodeSingularMessageField(value: &_storage._verified) case 8: try decoder.decodeSingularBytesField(value: &_storage._padding) case 9: try decoder.decodeSingularMessageField(value: &_storage._configuration) - case 10: try decoder.decodeSingularMessageField(value: &_storage._sentUpdate) default: break } } @@ -3889,9 +3818,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. if let v = _storage._configuration { try visitor.visitSingularMessageField(value: v, fieldNumber: 9) } - if let v = _storage._sentUpdate { - try visitor.visitSingularMessageField(value: v, fieldNumber: 10) - } } try unknownFields.traverse(visitor: &visitor) } @@ -3902,7 +3828,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. let _storage = _args.0 let rhs_storage = _args.1 if _storage._sent != rhs_storage._sent {return false} - if _storage._sentUpdate != rhs_storage._sentUpdate {return false} if _storage._contacts != rhs_storage._contacts {return false} if _storage._groups != rhs_storage._groups {return false} if _storage._request != rhs_storage._request {return false} @@ -3928,6 +3853,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt 3: .same(proto: "message"), 4: .same(proto: "expirationStartTimestamp"), 5: .same(proto: "unidentifiedStatus"), + 6: .same(proto: "isUpdate"), ] fileprivate class _StorageClass { @@ -3936,6 +3862,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt var _message: SignalServiceProtos_DataMessage? = nil var _expirationStartTimestamp: UInt64? = nil var _unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] + var _isUpdate: Bool? = nil static let defaultInstance = _StorageClass() @@ -3947,6 +3874,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt _message = source._message _expirationStartTimestamp = source._expirationStartTimestamp _unidentifiedStatus = source._unidentifiedStatus + _isUpdate = source._isUpdate } } @@ -3967,6 +3895,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt case 3: try decoder.decodeSingularMessageField(value: &_storage._message) case 4: try decoder.decodeSingularUInt64Field(value: &_storage._expirationStartTimestamp) case 5: try decoder.decodeRepeatedMessageField(value: &_storage._unidentifiedStatus) + case 6: try decoder.decodeSingularBoolField(value: &_storage._isUpdate) default: break } } @@ -3990,6 +3919,9 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if !_storage._unidentifiedStatus.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._unidentifiedStatus, fieldNumber: 5) } + if let v = _storage._isUpdate { + try visitor.visitSingularBoolField(value: v, fieldNumber: 6) + } } try unknownFields.traverse(visitor: &visitor) } @@ -4004,6 +3936,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if _storage._message != rhs_storage._message {return false} if _storage._expirationStartTimestamp != rhs_storage._expirationStartTimestamp {return false} if _storage._unidentifiedStatus != rhs_storage._unidentifiedStatus {return false} + if _storage._isUpdate != rhs_storage._isUpdate {return false} return true } if !storagesAreEqual {return false} @@ -4048,82 +3981,6 @@ extension SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus: Swift } } -extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { - static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".SentUpdate" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "groupId"), - 2: .same(proto: "timestamp"), - 3: .same(proto: "unidentifiedStatus"), - ] - - mutating func decodeMessage(decoder: inout D) throws { - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &self._groupID) - case 2: try decoder.decodeSingularUInt64Field(value: &self._timestamp) - case 3: try decoder.decodeRepeatedMessageField(value: &self.unidentifiedStatus) - default: break - } - } - } - - func traverse(visitor: inout V) throws { - if let v = self._groupID { - try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._timestamp { - try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) - } - if !self.unidentifiedStatus.isEmpty { - try visitor.visitRepeatedMessageField(value: self.unidentifiedStatus, fieldNumber: 3) - } - try unknownFields.traverse(visitor: &visitor) - } - - static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate, rhs: SignalServiceProtos_SyncMessage.SentUpdate) -> Bool { - if lhs._groupID != rhs._groupID {return false} - if lhs._timestamp != rhs._timestamp {return false} - if lhs.unidentifiedStatus != rhs.unidentifiedStatus {return false} - if lhs.unknownFields != rhs.unknownFields {return false} - return true - } -} - -extension SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { - static let protoMessageName: String = SignalServiceProtos_SyncMessage.SentUpdate.protoMessageName + ".UnidentifiedDeliveryStatus" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "destination"), - 2: .same(proto: "unidentified"), - ] - - mutating func decodeMessage(decoder: inout D) throws { - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &self._destination) - case 2: try decoder.decodeSingularBoolField(value: &self._unidentified) - default: break - } - } - } - - func traverse(visitor: inout V) throws { - if let v = self._destination { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._unidentified { - try visitor.visitSingularBoolField(value: v, fieldNumber: 2) - } - try unknownFields.traverse(visitor: &visitor) - } - - static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, rhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) -> Bool { - if lhs._destination != rhs._destination {return false} - if lhs._unidentified != rhs._unidentified {return false} - if lhs.unknownFields != rhs.unknownFields {return false} - return true - } -} - extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Contacts" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ From 01b1df5375c753bade3fd1d2ea85bc1dbca8f34e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 11:02:55 -0500 Subject: [PATCH 113/493] Add 'is update' flag to 'sent message' transcript proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 2 +- .../src/Protos/Generated/SSKProto.swift | 16 ++++++------ .../Protos/Generated/SignalService.pb.swift | 26 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 4c5ccaadf..8269f38ec 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -265,7 +265,7 @@ message SyncMessage { optional DataMessage message = 3; optional uint64 expirationStartTimestamp = 4; repeated UnidentifiedDeliveryStatus unidentifiedStatus = 5; - optional bool isUpdate = 6 [default = false]; + optional bool isRecipientUpdate = 6 [default = false]; } message Contacts { diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index cd1cacd2f..af4c2e52b 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3602,8 +3602,8 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS builder.setExpirationStartTimestamp(expirationStartTimestamp) } builder.setUnidentifiedStatus(unidentifiedStatus) - if hasIsUpdate { - builder.setIsUpdate(isUpdate) + if hasIsRecipientUpdate { + builder.setIsRecipientUpdate(isRecipientUpdate) } return builder } @@ -3640,8 +3640,8 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS proto.unidentifiedStatus = wrappedItems.map { $0.proto } } - @objc public func setIsUpdate(_ valueParam: Bool) { - proto.isUpdate = valueParam + @objc public func setIsRecipientUpdate(_ valueParam: Bool) { + proto.isRecipientUpdate = valueParam } @objc public func build() throws -> SSKProtoSyncMessageSent { @@ -3683,11 +3683,11 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS return proto.hasExpirationStartTimestamp } - @objc public var isUpdate: Bool { - return proto.isUpdate + @objc public var isRecipientUpdate: Bool { + return proto.isRecipientUpdate } - @objc public var hasIsUpdate: Bool { - return proto.hasIsUpdate + @objc public var hasIsRecipientUpdate: Bool { + return proto.hasIsRecipientUpdate } private init(proto: SignalServiceProtos_SyncMessage.Sent, diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index ad5bb91b0..b023dec52 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1568,14 +1568,14 @@ struct SignalServiceProtos_SyncMessage { set {_uniqueStorage()._unidentifiedStatus = newValue} } - var isUpdate: Bool { - get {return _storage._isUpdate ?? false} - set {_uniqueStorage()._isUpdate = newValue} + var isRecipientUpdate: Bool { + get {return _storage._isRecipientUpdate ?? false} + set {_uniqueStorage()._isRecipientUpdate = newValue} } - /// Returns true if `isUpdate` has been explicitly set. - var hasIsUpdate: Bool {return _storage._isUpdate != nil} - /// Clears the value of `isUpdate`. Subsequent reads from it will return its default value. - mutating func clearIsUpdate() {_uniqueStorage()._isUpdate = nil} + /// Returns true if `isRecipientUpdate` has been explicitly set. + var hasIsRecipientUpdate: Bool {return _storage._isRecipientUpdate != nil} + /// Clears the value of `isRecipientUpdate`. Subsequent reads from it will return its default value. + mutating func clearIsRecipientUpdate() {_uniqueStorage()._isRecipientUpdate = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -3853,7 +3853,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt 3: .same(proto: "message"), 4: .same(proto: "expirationStartTimestamp"), 5: .same(proto: "unidentifiedStatus"), - 6: .same(proto: "isUpdate"), + 6: .same(proto: "isRecipientUpdate"), ] fileprivate class _StorageClass { @@ -3862,7 +3862,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt var _message: SignalServiceProtos_DataMessage? = nil var _expirationStartTimestamp: UInt64? = nil var _unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] - var _isUpdate: Bool? = nil + var _isRecipientUpdate: Bool? = nil static let defaultInstance = _StorageClass() @@ -3874,7 +3874,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt _message = source._message _expirationStartTimestamp = source._expirationStartTimestamp _unidentifiedStatus = source._unidentifiedStatus - _isUpdate = source._isUpdate + _isRecipientUpdate = source._isRecipientUpdate } } @@ -3895,7 +3895,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt case 3: try decoder.decodeSingularMessageField(value: &_storage._message) case 4: try decoder.decodeSingularUInt64Field(value: &_storage._expirationStartTimestamp) case 5: try decoder.decodeRepeatedMessageField(value: &_storage._unidentifiedStatus) - case 6: try decoder.decodeSingularBoolField(value: &_storage._isUpdate) + case 6: try decoder.decodeSingularBoolField(value: &_storage._isRecipientUpdate) default: break } } @@ -3919,7 +3919,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if !_storage._unidentifiedStatus.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._unidentifiedStatus, fieldNumber: 5) } - if let v = _storage._isUpdate { + if let v = _storage._isRecipientUpdate { try visitor.visitSingularBoolField(value: v, fieldNumber: 6) } } @@ -3936,7 +3936,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if _storage._message != rhs_storage._message {return false} if _storage._expirationStartTimestamp != rhs_storage._expirationStartTimestamp {return false} if _storage._unidentifiedStatus != rhs_storage._unidentifiedStatus {return false} - if _storage._isUpdate != rhs_storage._isUpdate {return false} + if _storage._isRecipientUpdate != rhs_storage._isRecipientUpdate {return false} return true } if !storagesAreEqual {return false} From e27e27cc3abaf432c2c49a93988239c6f13a7173 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 11:25:45 -0500 Subject: [PATCH 114/493] Send and process 'recipient update' sync messages. --- .../src/Devices/OWSRecordTranscriptJob.h | 3 - .../src/Devices/OWSRecordTranscriptJob.m | 63 +++++------ .../OWSIncomingSentMessageTranscript.h | 3 +- .../OWSIncomingSentMessageTranscript.m | 36 ++++--- .../OWSOutgoingSentMessageTranscript.h | 5 +- .../OWSOutgoingSentMessageTranscript.m | 13 ++- .../OWSOutgoingSentUpdateMessageTranscript.h | 25 ----- .../OWSOutgoingSentUpdateMessageTranscript.m | 100 ------------------ .../Messages/Interactions/TSOutgoingMessage.h | 2 +- .../Messages/Interactions/TSOutgoingMessage.m | 7 +- .../src/Messages/OWSMessageManager.m | 4 +- .../src/Messages/OWSMessageSender.m | 93 +++++----------- 12 files changed, 107 insertions(+), 247 deletions(-) delete mode 100644 SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h delete mode 100644 SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h index 7969a58ee..c8ff5ef94 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h @@ -19,9 +19,6 @@ NS_ASSUME_NONNULL_BEGIN NSArray *attachmentStreams))attachmentHandler transaction:(YapDatabaseReadWriteTransaction *)transaction; -+ (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate - transaction:(YapDatabaseReadWriteTransaction *)transaction; - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index bb871ae5e..23433dda0 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -67,6 +67,13 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(transcript); OWSAssertDebug(transaction); + if (transcript.isRecipientUpdate) { + // "Recipient updates" are processed completely separately in order + // to avoid resurrecting threads or messages. + [self processRecipientUpdateWithTranscript:transcript transaction:transaction]; + return; + } + OWSLogInfo(@"Recording transcript in thread: %@ timestamp: %llu", transcript.thread.uniqueId, transcript.timestamp); if (transcript.isEndSessionMessage) { @@ -176,46 +183,39 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -+ (void)processSentUpdateTranscript:(SSKProtoSyncMessageSentUpdate *)sentUpdate - transaction:(YapDatabaseReadWriteTransaction *)transaction ++ (void)processRecipientUpdateWithTranscript:(OWSIncomingSentMessageTranscript *)transcript + transaction:(YapDatabaseReadWriteTransaction *)transaction { - OWSAssertDebug(sentUpdate); + OWSAssertDebug(transcript); OWSAssertDebug(transaction); - if (!AreSentUpdatesEnabled()) { - OWSFailDebug(@"Ignoring 'sent update' transcript; disabled."); + if (!AreRecipientUpdatesEnabled()) { + OWSFailDebug(@"Ignoring 'recipient update' transcript; disabled."); return; } - uint64_t timestamp = sentUpdate.timestamp; + if (transcript.udRecipientIds.count < 1 && transcript.nonUdRecipientIds.count < 1) { + OWSFailDebug(@"Ignoring empty 'recipient update' transcript."); + return; + } + + uint64_t timestamp = transcript.timestamp; if (timestamp < 1) { - OWSFailDebug(@"'Sent update' transcript has invalid timestamp."); + OWSFailDebug(@"'recipient update' transcript has invalid timestamp."); return; } - NSData *groupId = sentUpdate.groupID; + if (!transcript.thread.isGroupThread) { + OWSFailDebug(@"'recipient update' has missing or invalid thread."); + return; + } + TSGroupThread *groupThread = (TSGroupThread *)transcript.thread; + NSData *groupId = groupThread.groupModel.groupId; if (groupId.length < 1) { - OWSFailDebug(@"'Sent update' transcript has invalid groupId."); + OWSFailDebug(@"'recipient update' transcript has invalid groupId."); return; } - NSArray *statusProtos = sentUpdate.unidentifiedStatus; - if (statusProtos.count < 1) { - OWSFailDebug(@"'Sent update' transcript is missing statusProtos."); - return; - } - - NSMutableArray *nonUdRecipientIds = [NSMutableArray new]; - NSMutableArray *udRecipientIds = [NSMutableArray new]; - for (SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus *statusProto in statusProtos) { - NSString *recipientId = statusProto.destination; - if (statusProto.unidentified) { - [udRecipientIds addObject:recipientId]; - } else { - [nonUdRecipientIds addObject:recipientId]; - } - } - NSArray *messages = (NSArray *)[TSInteraction interactionsWithTimestamp:timestamp ofClass:[TSOutgoingMessage class] @@ -244,17 +244,18 @@ NS_ASSUME_NONNULL_BEGIN continue; } - OWSLogInfo(@"Processing 'sent update' transcript in thread: %@, timestamp: %llu, nonUdRecipientIds: %d, " + OWSLogInfo(@"Processing 'recipient update' transcript in thread: %@, timestamp: %llu, nonUdRecipientIds: %d, " @"udRecipientIds: %d.", thread.uniqueId, timestamp, - (int)nonUdRecipientIds.count, - (int)udRecipientIds.count); + (int)transcript.nonUdRecipientIds.count, + (int)transcript.udRecipientIds.count); - [message updateWithWasSentFromLinkedDeviceWithUDRecipientIds:udRecipientIds - nonUdRecipientIds:nonUdRecipientIds + [message updateWithWasSentFromLinkedDeviceWithUDRecipientIds:transcript.udRecipientIds + nonUdRecipientIds:transcript.nonUdRecipientIds isSentUpdate:YES transaction:transaction]; + messageFound = YES; } diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h index 06c8b8aff..f31996d6b 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h @@ -33,10 +33,11 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly, nullable) NSData *groupId; @property (nonatomic, readonly) NSString *body; @property (nonatomic, readonly) NSArray *attachmentPointerProtos; -@property (nonatomic, readonly) TSThread *thread; +@property (nonatomic, readonly, nullable) TSThread *thread; @property (nonatomic, readonly, nullable) TSQuotedMessage *quotedMessage; @property (nonatomic, readonly, nullable) OWSContact *contact; @property (nonatomic, readonly, nullable) OWSLinkPreview *linkPreview; +@property (nonatomic, readonly) BOOL isRecipientUpdate; // If either nonUdRecipientIds or udRecipientIds is nil, // this is either a legacy transcript or it reflects a legacy sync message. diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m index 81f13f9dc..06c350dc1 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m @@ -36,23 +36,33 @@ NS_ASSUME_NONNULL_BEGIN _isGroupUpdate = _dataMessage.group != nil && (_dataMessage.group.type == SSKProtoGroupContextTypeUpdate); _isExpirationTimerUpdate = (_dataMessage.flags & SSKProtoDataMessageFlagsExpirationTimerUpdate) != 0; _isEndSessionMessage = (_dataMessage.flags & SSKProtoDataMessageFlagsEndSession) != 0; + _isRecipientUpdate = sentProto.isRecipientUpdate; - if (self.dataMessage.group) { - _thread = [TSGroupThread getOrCreateThreadWithGroupId:_dataMessage.group.id transaction:transaction]; + if (self.isRecipientUpdate) { + // Fetch, don't create. We don't want recipient updates to resurrect messages or threads. + if (self.dataMessage.group) { + _thread = [TSGroupThread fetchObjectWithUniqueID:_dataMessage.group.id transaction:transaction]; + } + // Skip the other processing for recipient updates. } else { - _thread = [TSContactThread getOrCreateThreadWithContactId:_recipientId transaction:transaction]; - } + if (self.dataMessage.group) { + _thread = [TSGroupThread getOrCreateThreadWithGroupId:_dataMessage.group.id transaction:transaction]; + } else { + _thread = [TSContactThread getOrCreateThreadWithContactId:_recipientId transaction:transaction]; + } - _quotedMessage = [TSQuotedMessage quotedMessageForDataMessage:_dataMessage thread:_thread transaction:transaction]; - _contact = [OWSContacts contactForDataMessage:_dataMessage transaction:transaction]; + _quotedMessage = + [TSQuotedMessage quotedMessageForDataMessage:_dataMessage thread:_thread transaction:transaction]; + _contact = [OWSContacts contactForDataMessage:_dataMessage transaction:transaction]; - NSError *linkPreviewError; - _linkPreview = [OWSLinkPreview buildValidatedLinkPreviewWithDataMessage:_dataMessage - body:_body - transaction:transaction - error:&linkPreviewError]; - if (linkPreviewError && ![OWSLinkPreview isNoPreviewError:linkPreviewError]) { - OWSLogError(@"linkPreviewError: %@", linkPreviewError); + NSError *linkPreviewError; + _linkPreview = [OWSLinkPreview buildValidatedLinkPreviewWithDataMessage:_dataMessage + body:_body + transaction:transaction + error:&linkPreviewError]; + if (linkPreviewError && ![OWSLinkPreview isNoPreviewError:linkPreviewError]) { + OWSLogError(@"linkPreviewError: %@", linkPreviewError); + } } if (sentProto.unidentifiedStatus.count > 0) { diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h index 56494bf81..ff47ee6e2 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSOutgoingSyncMessage.h" @@ -16,7 +16,8 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message + isRecipientUpdate:(BOOL)isRecipientUpdate NS_DESIGNATED_INITIALIZER; - (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; @end diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m index e19f5bea3..8b34eeea7 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSOutgoingSentMessageTranscript.h" @@ -22,18 +22,25 @@ NS_ASSUME_NONNULL_BEGIN @end +#pragma mark - + @interface OWSOutgoingSentMessageTranscript () @property (nonatomic, readonly) TSOutgoingMessage *message; + // sentRecipientId is the recipient of message, for contact thread messages. // It is used to identify the thread/conversation to desktop. @property (nonatomic, readonly, nullable) NSString *sentRecipientId; +@property (nonatomic, readonly) BOOL isRecipientUpdate; + @end +#pragma mark - + @implementation OWSOutgoingSentMessageTranscript -- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message +- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message isRecipientUpdate:(BOOL)isRecipientUpdate { self = [super init]; @@ -44,6 +51,7 @@ NS_ASSUME_NONNULL_BEGIN _message = message; // This will be nil for groups. _sentRecipientId = message.thread.contactIdentifier; + _isRecipientUpdate = isRecipientUpdate; return self; } @@ -58,6 +66,7 @@ NS_ASSUME_NONNULL_BEGIN SSKProtoSyncMessageSentBuilder *sentBuilder = [SSKProtoSyncMessageSent builder]; [sentBuilder setTimestamp:self.message.timestamp]; [sentBuilder setDestination:self.sentRecipientId]; + [sentBuilder setIsRecipientUpdate:self.isRecipientUpdate]; SSKProtoDataMessage *_Nullable dataMessage = [self.message buildDataMessage:self.sentRecipientId]; if (!dataMessage) { diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h deleted file mode 100644 index 7678eb12b..000000000 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "OWSOutgoingSyncMessage.h" - -NS_ASSUME_NONNULL_BEGIN - -@class TSOutgoingMessage; - -/** - * Notifies your other registered devices (if you have any) that you've sent a message. - * This way the message you just sent can appear on all your devices. - */ -@interface OWSOutgoingSentUpdateMessageTranscript : OWSOutgoingSyncMessage - -- (instancetype)init NS_UNAVAILABLE; - -- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message - transaction:(YapDatabaseReadTransaction *)transaction NS_DESIGNATED_INITIALIZER; -- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m deleted file mode 100644 index 2ec1e8390..000000000 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentUpdateMessageTranscript.m +++ /dev/null @@ -1,100 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -#import "OWSOutgoingSentUpdateMessageTranscript.h" -#import "TSGroupThread.h" -#import "TSOutgoingMessage.h" -#import "TSThread.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface TSOutgoingMessage (OWSOutgoingSentMessageTranscript) - -/** - * Normally this is private, but we need to embed this - * data structure within our own. - * - * recipientId is nil when building "sent" sync messages for messages - * sent to groups. - */ -- (nullable SSKProtoDataMessage *)buildDataMessage:(NSString *_Nullable)recipientId; - -@end - -@interface OWSOutgoingSentUpdateMessageTranscript () - -@property (nonatomic, readonly) TSOutgoingMessage *message; -@property (nonatomic, readonly) TSGroupThread *groupThread; - -@end - -@implementation OWSOutgoingSentUpdateMessageTranscript - -- (instancetype)initWithOutgoingMessage:(TSOutgoingMessage *)message - transaction:(YapDatabaseReadTransaction *)transaction -{ - self = [super init]; - - if (!self) { - return self; - } - - _message = message; - _groupThread = (TSGroupThread *)[message threadWithTransaction:transaction]; - - return self; -} - -- (nullable instancetype)initWithCoder:(NSCoder *)coder -{ - return [super initWithCoder:coder]; -} - -- (nullable SSKProtoSyncMessageBuilder *)syncMessageBuilder -{ - SSKProtoSyncMessageSentUpdateBuilder *sentBuilder = - [SSKProtoSyncMessageSentUpdate builderWithGroupID:self.groupThread.groupModel.groupId - timestamp:self.message.timestamp]; - - for (NSString *recipientId in self.message.sentRecipientIds) { - TSOutgoingMessageRecipientState *_Nullable recipientState = - [self.message recipientStateForRecipientId:recipientId]; - if (!recipientState) { - OWSFailDebug(@"missing recipient state for: %@", recipientId); - continue; - } - if (recipientState.state != OWSOutgoingMessageRecipientStateSent) { - OWSFailDebug(@"unexpected recipient state for: %@", recipientId); - continue; - } - - NSError *error; - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder *statusBuilder = - [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus builderWithDestination:recipientId]; - [statusBuilder setUnidentified:recipientState.wasSentByUD]; - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus *_Nullable status = - [statusBuilder buildAndReturnError:&error]; - if (error || !status) { - OWSFailDebug(@"Couldn't build UD status proto: %@", error); - continue; - } - [sentBuilder addUnidentifiedStatus:status]; - } - - NSError *error; - SSKProtoSyncMessageSentUpdate *_Nullable sentUpdateProto = [sentBuilder buildAndReturnError:&error]; - if (error || !sentUpdateProto) { - OWSFailDebug(@"could not build protobuf: %@", error); - return nil; - } - - SSKProtoSyncMessageBuilder *syncMessageBuilder = [SSKProtoSyncMessage builder]; - [syncMessageBuilder setSentUpdate:sentUpdateProto]; - return syncMessageBuilder; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h index 80995e2b2..bc06b8f98 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN // Feature flag. // // TODO: Remove. -BOOL AreSentUpdatesEnabled(void); +BOOL AreRecipientUpdatesEnabled(void); typedef NS_ENUM(NSInteger, TSOutgoingMessageState) { // The message is either: diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 988e9b5d7..355a05b71 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN -BOOL AreSentUpdatesEnabled(void) +BOOL AreRecipientUpdatesEnabled(void) { return NO; } @@ -820,7 +820,10 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt } } } - [message setIsFromLinkedDevice:YES]; + + if (!isSentUpdate) { + [message setIsFromLinkedDevice:YES]; + } }]; } diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index b20b21ce7..720ab9b68 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -878,7 +878,7 @@ NS_ASSUME_NONNULL_BEGIN } } - if ([self isDataMessageGroupAvatarUpdate:syncMessage.sent.message]) { + if ([self isDataMessageGroupAvatarUpdate:syncMessage.sent.message] && !syncMessage.sent.isRecipientUpdate) { [OWSRecordTranscriptJob processIncomingSentMessageTranscript:transcript attachmentHandler:^(NSArray *attachmentStreams) { @@ -908,8 +908,6 @@ NS_ASSUME_NONNULL_BEGIN } transaction:transaction]; } - } else if (syncMessage.sentUpdate) { - [OWSRecordTranscriptJob processSentUpdateTranscript:syncMessage.sentUpdate transaction:transaction]; } else if (syncMessage.request) { if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) { // We respond asynchronously because populating the sync message will diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index e05625603..dcbf6b8f2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -18,7 +18,6 @@ #import "OWSMessageServiceParams.h" #import "OWSOperation.h" #import "OWSOutgoingSentMessageTranscript.h" -#import "OWSOutgoingSentUpdateMessageTranscript.h" #import "OWSOutgoingSyncMessage.h" #import "OWSPrimaryStorage+PreKeyStore.h" #import "OWSPrimaryStorage+SignedPreKeyStore.h" @@ -1392,35 +1391,45 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; return success(); } + BOOL shouldSendTranscript = NO; + BOOL isRecipientUpdate = NO; if (message.hasSyncedTranscript) { - if (!AreSentUpdatesEnabled()) { - return success(); + shouldSendTranscript = YES; + } else if (AreRecipientUpdatesEnabled()) { + __block BOOL isGroupThread = NO; + [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { + isGroupThread = [message threadWithTransaction:transaction].isGroupThread; + }]; + if (isGroupThread) { + shouldSendTranscript = YES; + isRecipientUpdate = YES; } - [self sendSyncUpdateTranscriptForMessage:message - success:^{ - success(); - } - failure:failure]; - } else { - [self sendSyncTranscriptForMessage:message - success:^{ - [self.dbConnection - readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [message updateWithHasSyncedTranscript:YES transaction:transaction]; - }]; - - success(); - } - failure:failure]; } + + if (!shouldSendTranscript) { + return success(); + } + + [self + sendSyncTranscriptForMessage:message + isRecipientUpdate:isRecipientUpdate + success:^{ + [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [message updateWithHasSyncedTranscript:YES transaction:transaction]; + }]; + + success(); + } + failure:failure]; } - (void)sendSyncTranscriptForMessage:(TSOutgoingMessage *)message + isRecipientUpdate:(BOOL)isRecipientUpdate success:(void (^)(void))success failure:(RetryableFailureHandler)failure { OWSOutgoingSentMessageTranscript *sentMessageTranscript = - [[OWSOutgoingSentMessageTranscript alloc] initWithOutgoingMessage:message]; + [[OWSOutgoingSentMessageTranscript alloc] initWithOutgoingMessage:message isRecipientUpdate:isRecipientUpdate]; NSString *recipientId = self.tsAccountManager.localNumber; __block SignalRecipient *recipient; @@ -1447,50 +1456,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; [self sendMessageToRecipient:messageSend]; } -- (void)sendSyncUpdateTranscriptForMessage:(TSOutgoingMessage *)message - success:(void (^)(void))success - failure:(RetryableFailureHandler)failure -{ - NSString *recipientId = self.tsAccountManager.localNumber; - - __block OWSOutgoingSentUpdateMessageTranscript *transcript; - __block BOOL isGroupThread = NO; - __block SignalRecipient *recipient; - [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - isGroupThread = message.thread.isGroupThread; - - if (isGroupThread) { - recipient = [SignalRecipient markRecipientAsRegisteredAndGet:recipientId transaction:transaction]; - transcript = [[OWSOutgoingSentUpdateMessageTranscript alloc] initWithOutgoingMessage:message - transaction:transaction]; - } - }]; - - if (!isGroupThread) { - // We only send "sent update" transcripts for group messages. - return success(); - } - - OWSMessageSend *messageSend = [[OWSMessageSend alloc] initWithMessage:transcript - thread:message.thread - recipient:recipient - senderCertificate:nil - udAccess:nil - localNumber:self.tsAccountManager.localNumber - success:^{ - OWSLogInfo(@"Successfully sent 'sent update' sync transcript."); - - success(); - } - failure:^(NSError *error) { - OWSLogInfo( - @"Failed to send 'sent update' sync transcript: %@ (isRetryable: %d)", error, [error isRetryable]); - - failure(error); - }]; - [self sendMessageToRecipient:messageSend]; -} - - (NSArray *)throws_deviceMessagesForMessageSend:(OWSMessageSend *)messageSend { OWSAssertDebug(messageSend.message); From bb7d328267c0e74880ba6f1258ebe376ee5bf7ea Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 11:33:58 -0500 Subject: [PATCH 115/493] Send and process 'recipient update' sync messages. --- SignalServiceKit/src/Messages/OWSMessageSender.m | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index dcbf6b8f2..57654f78f 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1396,14 +1396,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; if (message.hasSyncedTranscript) { shouldSendTranscript = YES; } else if (AreRecipientUpdatesEnabled()) { - __block BOOL isGroupThread = NO; - [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { - isGroupThread = [message threadWithTransaction:transaction].isGroupThread; - }]; - if (isGroupThread) { - shouldSendTranscript = YES; - isRecipientUpdate = YES; - } + shouldSendTranscript = YES; + isRecipientUpdate = YES; } if (!shouldSendTranscript) { From 6ef65ad9d6178fd555cb61a269fc805b00eeb494 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 11:48:58 -0500 Subject: [PATCH 116/493] Send and process 'recipient update' sync messages. --- SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m | 5 +++++ .../DeviceSyncing/OWSIncomingSentMessageTranscript.m | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 23433dda0..a619dd832 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -244,6 +244,11 @@ NS_ASSUME_NONNULL_BEGIN continue; } + if (!message.isFromLinkedDevice) { + OWSFailDebug(@"Ignoring 'recipient update' for message which was sent locally."); + continue; + } + OWSLogInfo(@"Processing 'recipient update' transcript in thread: %@, timestamp: %llu, nonUdRecipientIds: %d, " @"udRecipientIds: %d.", thread.uniqueId, diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m index 06c350dc1..87ee6ddbb 100644 --- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m +++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m @@ -41,7 +41,9 @@ NS_ASSUME_NONNULL_BEGIN if (self.isRecipientUpdate) { // Fetch, don't create. We don't want recipient updates to resurrect messages or threads. if (self.dataMessage.group) { - _thread = [TSGroupThread fetchObjectWithUniqueID:_dataMessage.group.id transaction:transaction]; + _thread = [TSGroupThread threadWithGroupId:_dataMessage.group.id transaction:transaction]; + } else { + OWSFailDebug(@"We should never receive a 'recipient update' for messages in contact threads."); } // Skip the other processing for recipient updates. } else { From 5f0de5c36d0a6c87c05d21e27769ef592bce9b98 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 15:21:00 -0500 Subject: [PATCH 117/493] Respond to CR. --- .../src/Messages/Interactions/TSOutgoingMessage.m | 3 ++- SignalServiceKit/src/Messages/OWSMessageSender.m | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m index 355a05b71..2fa564da7 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m @@ -804,7 +804,8 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt // b) "Sent updates" should never downgrade the "recipient state" for any // recipients. Prefer existing "recipient state"; "sent updates" only // add new recipients at the "sent" state. - [recipientStateMap removeObjectsForKeys:self.recipientStateMap.allKeys]; + // + // Therefore we retain all existing entries in the recipient state map. [recipientStateMap addEntriesFromDictionary:self.recipientStateMap]; } diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 57654f78f..87e14a868 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1391,19 +1391,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; return success(); } - BOOL shouldSendTranscript = NO; - BOOL isRecipientUpdate = NO; - if (message.hasSyncedTranscript) { - shouldSendTranscript = YES; - } else if (AreRecipientUpdatesEnabled()) { - shouldSendTranscript = YES; - isRecipientUpdate = YES; - } - + BOOL shouldSendTranscript = (AreRecipientUpdatesEnabled() || !message.hasSyncedTranscript); if (!shouldSendTranscript) { return success(); } + BOOL isRecipientUpdate = message.hasSyncedTranscript; [self sendSyncTranscriptForMessage:message isRecipientUpdate:isRecipientUpdate From d14386430af3db4197b6e8ac029a96c033350078 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 15:42:48 -0500 Subject: [PATCH 118/493] Update camera asset in onboarding profile view. --- .../Contents.json | 23 ++++++++++++++++++ .../camera-filled-24@1x.png | Bin 0 -> 322 bytes .../camera-filled-24@2x.png | Bin 0 -> 582 bytes .../camera-filled-24@3x.png | Bin 0 -> 832 bytes .../OnboardingProfileViewController.swift | 3 ++- 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Signal/Images.xcassets/settings-avatar-camera-2.imageset/Contents.json create mode 100644 Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@1x.png create mode 100644 Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@2x.png create mode 100644 Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@3x.png diff --git a/Signal/Images.xcassets/settings-avatar-camera-2.imageset/Contents.json b/Signal/Images.xcassets/settings-avatar-camera-2.imageset/Contents.json new file mode 100644 index 000000000..fd1818ed3 --- /dev/null +++ b/Signal/Images.xcassets/settings-avatar-camera-2.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "camera-filled-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "camera-filled-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "camera-filled-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@1x.png b/Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..937e5fb77d7501d4d9292e8f38f01b9322b9c15c GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px_rz z7sn8f&bOhrd7BM*_N=yIP&Qzap5l8-BenV8*Xe;T*m@3d=NR2(>SHWiQz9q<6`g4_SOZ53>Z68h9KY$B5l%Ial4+y*y#J!nQU)Wp36R z&UZF{-L>AV)Y9yybm8@quUV%ULm2#y1uH7Wgr+cT?U=GlZ)!kv?jGieHC;~Oxm(O) z6V`W|I;~(krm1G|lVS6AH3#ctbEk!DA9rn(;!!D1zS|MOaQ*b&jd`vrt|zlMc#F%5 z>(!JUR#jp>>BY{ImF*FCC0*>j&nJcj5!NTYHGj4I442#eb2-)@r;=munijL;Ft z1nRkU?u?(Hj!XbI=TKL$+ZNp_1*XX!e_c71$!UvMZv0|*JE^gN72 z)B#!>0PqEe5~LvP{hOvhgm4OK>jn_>wcZEX;Q0V=(=Ci`Oc{(LP#YILAjnf|?}ysw zj=+yG^A4Od+hgB}MWh4g%w`o(1(}; zBHl@hJIu*{I8ICH7nZ8OW#o+>J(J^}pAl3YBKsA}-1{0ZZE^U{NEYZ{fc` Uf;9m$Pyhe`07*qoM6N<$f)(QX>;M1& literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@3x.png b/Signal/Images.xcassets/settings-avatar-camera-2.imageset/camera-filled-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea3ae25bb4624b5f5ab9678b2ce3017248c3fe GIT binary patch literal 832 zcmV-G1Hb%MDfuD^0XiX4z42c*aWDRMxH z9FQUhq-ZffA%veHgi8n^&a{-r2XSDfG?TVA0QgL<8r$b0W#kq&=H(P zAd!U5;Fv=q2@Sx!FAT>N5=oE@D}Dfgkttj+Hewy#rFvEY0)QO=Tsj7mTdK>Bt1GEH zmzcrXGY-~bd#=uR1HzWGRydOtTavit8bU}h=L`UE0W%s zY$WCUia{FRo<%{9|1$>>%5`M&?H*8i^IOhWC8%xd*2MYIMlt?EMgK-P>?jdJ7_h=a zb}5aZrx@dzJoImrJ++EYF~&d=!9E6!QkTM!Xu`?C!=fum*Hs@|;^43HpJ#_o)G$nEaZ&=>nvhR{1bM+bpkX*}~mh zW9K}!VW95<(8%OvF?TsKeyRgD$G{5EAl6> zea}{FKv!mBw-_MweI<9zP-{RVNdfplQrd~jn=3=L{A^y415)IG6geP8tpRb{mcK|! zJ8^k)WvEtbKySFebF1ca6De=>-SnWrqKlbN-U@lQpL223YhR1`YMvO!!1se5*n*<( zDArfT_oQ#E`%?`+7ehVjTZo+2pKQR6w%;0000< KMNUMnLSTZ%>Tk&a literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift index 052409b28..b88e8a4fb 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -42,7 +42,8 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarSize), height: CGFloat(avatarSize))) let cameraImageView = UIImageView() - cameraImageView.image = UIImage(named: "settings-avatar-camera") + cameraImageView.image = UIImage(named: "settings-avatar-camera-2")?.withRenderingMode(.alwaysTemplate) + cameraImageView.tintColor = Theme.secondaryColor cameraCircle.backgroundColor = Theme.backgroundColor cameraCircle.addSubview(cameraImageView) let cameraCircleDiameter: CGFloat = 40 From 20d22f63951a48a9fbc56ab261e5df9a1d8c0a67 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 15:08:41 -0500 Subject: [PATCH 119/493] Add user agent for proxied requests. --- SignalServiceKit/src/Network/ProxiedContentDownloader.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index eea007546..a9cee113a 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -657,6 +657,8 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio return } + let userAgent = "Signal iOS (+https://signal.org/download)" + if assetRequest.state == .waiting { // If asset request hasn't yet determined the resource size, // try to do so now, by requesting a small initial segment. @@ -669,6 +671,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(segmentStart)-\(segmentStart + segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") + request.addValue(userAgent, forHTTPHeaderField: "User-Agent") padRequestSize(request: &request) let task = downloadSession.dataTask(with: request, completionHandler: { data, response, error -> Void in self.handleAssetSizeResponse(assetRequest: assetRequest, data: data, response: response, error: error) @@ -689,6 +692,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(assetSegment.segmentStart)-\(assetSegment.segmentStart + assetSegment.segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") + request.addValue(userAgent, forHTTPHeaderField: "User-Agent") padRequestSize(request: &request) let task: URLSessionDataTask = downloadSession.dataTask(with: request) task.assetRequest = assetRequest @@ -740,7 +744,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio result += percentEncodedQuery.count } if let allHTTPHeaderFields = request.allHTTPHeaderFields { - if allHTTPHeaderFields.count != 1 { + if allHTTPHeaderFields.count != 2 { owsFailDebug("Request has unexpected number of headers.") } for (key, value) in allHTTPHeaderFields { From fabd3996c2ebf7e3616e73dd04f4d6b2185fd4fe Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Feb 2019 12:44:30 -0700 Subject: [PATCH 120/493] pop view if message is deleted - use global ui database connection --- .../ConversationViewController.m | 16 +- .../ConversationSearchViewController.swift | 6 +- .../MediaGalleryViewController.swift | 233 ++++++++++++------ .../MediaPageViewController.swift | 4 +- .../MediaTileViewController.swift | 4 +- .../MessageDetailViewController.swift | 64 +++-- .../OWSConversationSettingsViewController.m | 1 - SignalMessaging/utils/Bench.swift | 20 +- .../src/Storage/OWSMediaGalleryFinder.h | 15 +- .../src/Storage/OWSMediaGalleryFinder.m | 21 +- .../src/Util/YapDatabase+Promise.swift | 32 +++ 11 files changed, 305 insertions(+), 111 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a40183cd2..ce8f314aa 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -123,6 +123,7 @@ typedef enum : NSUInteger { ConversationViewCellDelegate, ConversationInputTextViewDelegate, MessageActionsDelegate, + MessageDetailViewDelegate, MenuActionsViewControllerDelegate, OWSMessageBubbleViewDelegate, UICollectionViewDelegate, @@ -1924,6 +1925,14 @@ typedef enum : NSUInteger { [self populateReplyForViewItem:conversationViewItem]; } +#pragma mark - MessageDetailViewDelegate + +- (void)detailViewMessageWasDeleted:(MessageDetailViewController *)messageDetailViewController +{ + OWSLogInfo(@""); + [self.navigationController popToViewController:self animated:YES]; +} + #pragma mark - MenuActionsViewControllerDelegate - (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController @@ -2158,7 +2167,6 @@ typedef enum : NSUInteger { MediaGallery *mediaGallery = [[MediaGallery alloc] initWithThread:self.thread - uiDatabaseConnection:self.uiDatabaseConnection options:MediaGalleryOptionSliderEnabled | MediaGalleryOptionShowAllMediaButton]; [mediaGallery presentDetailViewFromViewController:self mediaAttachment:attachmentStream replacingView:imageView]; @@ -2181,7 +2189,6 @@ typedef enum : NSUInteger { MediaGallery *mediaGallery = [[MediaGallery alloc] initWithThread:self.thread - uiDatabaseConnection:self.uiDatabaseConnection options:MediaGalleryOptionSliderEnabled | MediaGalleryOptionShowAllMediaButton]; [mediaGallery presentDetailViewFromViewController:self mediaAttachment:attachmentStream replacingView:imageView]; @@ -2358,12 +2365,13 @@ typedef enum : NSUInteger { OWSAssertDebug([conversationItem.interaction isKindOfClass:[TSMessage class]]); TSMessage *message = (TSMessage *)conversationItem.interaction; - MessageDetailViewController *view = + MessageDetailViewController *detailVC = [[MessageDetailViewController alloc] initWithViewItem:conversationItem message:message thread:self.thread mode:MessageMetadataViewModeFocusOnMetadata]; - [self.navigationController pushViewController:view animated:YES]; + detailVC.delegate = self; + [self.navigationController pushViewController:detailVC animated:YES]; } - (void)populateReplyForViewItem:(id)conversationItem diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift index 09a672925..95f3c10cc 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift +++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift @@ -73,8 +73,8 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel tableView.register(ContactTableViewCell.self, forCellReuseIdentifier: ContactTableViewCell.reuseIdentifier()) NotificationCenter.default.addObserver(self, - selector: #selector(yapDatabaseModified), - name: NSNotification.Name.YapDatabaseModified, + selector: #selector(uiDatabaseModified), + name: .OWSUIDatabaseConnectionDidUpdate, object: OWSPrimaryStorage.shared().dbNotificationObject) NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), @@ -101,7 +101,7 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel NotificationCenter.default.removeObserver(self) } - @objc internal func yapDatabaseModified(notification: NSNotification) { + @objc internal func uiDatabaseModified(notification: NSNotification) { AssertIsOnMainThread() refreshSearchResults() diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift index 540f8aeab..984678ce2 100644 --- a/Signal/src/ViewControllers/MediaGalleryViewController.swift +++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift @@ -229,11 +229,11 @@ protocol MediaGalleryDataSource: class { func showAllMedia(focusedItem: MediaGalleryItem) func dismissMediaDetailViewController(_ mediaDetailViewController: MediaPageViewController, animated isAnimated: Bool, completion: (() -> Void)?) - func delete(items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) + func delete(items: [MediaGalleryItem], initiatedBy: AnyObject) } protocol MediaGalleryDataSourceDelegate: class { - func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) + func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: AnyObject) func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, deletedSections: IndexSet, deletedItems: [IndexPath]) } @@ -318,7 +318,10 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel private var pageViewController: MediaPageViewController? - private let uiDatabaseConnection: YapDatabaseConnection + private var uiDatabaseConnection: YapDatabaseConnection { + return OWSPrimaryStorage.shared().uiDatabaseConnection + } + private let editingDatabaseConnection: YapDatabaseConnection private let mediaGalleryFinder: OWSMediaGalleryFinder @@ -334,16 +337,19 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel } @objc - init(thread: TSThread, uiDatabaseConnection: YapDatabaseConnection, options: MediaGalleryOption = []) { + init(thread: TSThread, options: MediaGalleryOption = []) { self.thread = thread - assert(uiDatabaseConnection.isInLongLivedReadTransaction()) - self.uiDatabaseConnection = uiDatabaseConnection self.editingDatabaseConnection = OWSPrimaryStorage.shared().newDatabaseConnection() self.options = options self.mediaGalleryFinder = OWSMediaGalleryFinder(thread: thread) super.init() + + NotificationCenter.default.addObserver(self, + selector: #selector(uiDatabaseDidUpdate), + name: .OWSUIDatabaseConnectionDidUpdate, + object: OWSPrimaryStorage.shared().dbNotificationObject) } // MARK: Present/Dismiss @@ -709,7 +715,70 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel ] } - // MARK: MediaGalleryDataSource + // MARK: - Database Notifications + + @objc + func uiDatabaseDidUpdate(notification: Notification) { + guard let notifications = notification.userInfo?[OWSUIDatabaseConnectionNotificationsKey] as? [Notification] else { + owsFailDebug("notifications was unexpectedly nil") + return + } + + guard mediaGalleryFinder.hasMediaChanges(in: notifications, dbConnection: uiDatabaseConnection) else { + Logger.verbose("no changes for thread: \(thread)") + return + } + + let rowChanges = extractRowChanges(notifications: notifications) + assert(rowChanges.count > 0) + + process(rowChanges: rowChanges) + } + + func extractRowChanges(notifications: [Notification]) -> [YapDatabaseViewRowChange] { + return notifications.flatMap { notification -> [YapDatabaseViewRowChange] in + guard let userInfo = notification.userInfo else { + owsFailDebug("userInfo was unexpectedly nil") + return [] + } + + guard let extensionChanges = userInfo["extensions"] as? [AnyHashable: Any] else { + owsFailDebug("extensionChanges was unexpectedly nil") + return [] + } + + guard let galleryData = extensionChanges[OWSMediaGalleryFinder.databaseExtensionName()] as? [AnyHashable: Any] else { + owsFailDebug("galleryData was unexpectedly nil") + return [] + } + + guard let galleryChanges = galleryData["changes"] as? [Any] else { + owsFailDebug("gallerlyChanges was unexpectedly nil") + return [] + } + + return galleryChanges.compactMap { $0 as? YapDatabaseViewRowChange } + } + } + + func process(rowChanges: [YapDatabaseViewRowChange]) { + let deleteChanges = rowChanges.filter { $0.type == .delete } + + let deletedItems: [MediaGalleryItem] = deleteChanges.compactMap { (deleteChange: YapDatabaseViewRowChange) -> MediaGalleryItem? in + guard let deletedItem = self.galleryItems.first(where: { galleryItem in + galleryItem.attachmentStream.uniqueId == deleteChange.collectionKey.key + }) else { + Logger.debug("deletedItem was never loaded - no need to remove.") + return nil + } + + return deletedItem + } + + self.delete(items: deletedItems, initiatedBy: self) + } + + // MARK: - MediaGalleryDataSource lazy var mediaTileViewController: MediaTileViewController = { let vc = MediaTileViewController(mediaGalleryDataSource: self, uiDatabaseConnection: self.uiDatabaseConnection) @@ -777,6 +846,10 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel } } + enum MediaGalleryError: Error { + case itemNoLongerExists + } + func ensureGalleryItemsLoaded(_ direction: GalleryDirection, item: MediaGalleryItem, amount: UInt, completion: ((IndexSet, [IndexPath]) -> Void)? = nil ) { var galleryItems: [MediaGalleryItem] = self.galleryItems @@ -786,92 +859,102 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel var newGalleryItems: [MediaGalleryItem] = [] var newDates: [GalleryDate] = [] - Bench(title: "fetching gallery items") { - self.uiDatabaseConnection.read { transaction in + do { + try Bench(title: "fetching gallery items") { + try self.uiDatabaseConnection.read { transaction in + guard let index = self.mediaGalleryFinder.mediaIndex(attachment: item.attachmentStream, transaction: transaction) else { + throw MediaGalleryError.itemNoLongerExists + } + let initialIndex: Int = index.intValue + let mediaCount: Int = Int(self.mediaGalleryFinder.mediaCount(transaction: transaction)) - let initialIndex: Int = Int(self.mediaGalleryFinder.mediaIndex(attachment: item.attachmentStream, transaction: transaction)) - let mediaCount: Int = Int(self.mediaGalleryFinder.mediaCount(transaction: transaction)) + let requestRange: Range = { () -> Range in + let range: Range = { () -> Range in + switch direction { + case .around: + // To keep it simple, this isn't exactly *amount* sized if `message` window overlaps the end or + // beginning of the view. Still, we have sufficient buffer to fetch more as the user swipes. + let start: Int = initialIndex - Int(amount) / 2 + let end: Int = initialIndex + Int(amount) / 2 - let requestRange: Range = { () -> Range in - let range: Range = { () -> Range in - switch direction { - case .around: - // To keep it simple, this isn't exactly *amount* sized if `message` window overlaps the end or - // beginning of the view. Still, we have sufficient buffer to fetch more as the user swipes. - let start: Int = initialIndex - Int(amount) / 2 - let end: Int = initialIndex + Int(amount) / 2 + return start.. (requestSet.count / 2) - // ...but we always fulfill even small requests if we're getting just the tail end of a gallery. - let isFetchingEdgeOfGallery = (self.fetchedIndexSet.count - unfetchedSet.count) < requestSet.count - - guard isSubstantialRequest || isFetchingEdgeOfGallery else { - Logger.debug("ignoring small fetch request: \(unfetchedSet.count)") - return - } - - Logger.debug("fetching set: \(unfetchedSet)") - let nsRange: NSRange = NSRange(location: unfetchedSet.min()!, length: unfetchedSet.count) - self.mediaGalleryFinder.enumerateMediaAttachments(range: nsRange, transaction: transaction) { (attachment: TSAttachment) in - - guard !self.deletedAttachments.contains(attachment) else { - Logger.debug("skipping \(attachment) which has been deleted.") + let requestSet = IndexSet(integersIn: requestRange) + guard !self.fetchedIndexSet.contains(integersIn: requestSet) else { + Logger.debug("all requested messages have already been loaded.") return } - guard let item: MediaGalleryItem = self.buildGalleryItem(attachment: attachment, transaction: transaction) else { - owsFailDebug("unexpectedly failed to buildGalleryItem") + let unfetchedSet = requestSet.subtracting(self.fetchedIndexSet) + + // For perf we only want to fetch a substantially full batch... + let isSubstantialRequest = unfetchedSet.count > (requestSet.count / 2) + // ...but we always fulfill even small requests if we're getting just the tail end of a gallery. + let isFetchingEdgeOfGallery = (self.fetchedIndexSet.count - unfetchedSet.count) < requestSet.count + + guard isSubstantialRequest || isFetchingEdgeOfGallery else { + Logger.debug("ignoring small fetch request: \(unfetchedSet.count)") return } - let date = item.galleryDate + Logger.debug("fetching set: \(unfetchedSet)") + let nsRange: NSRange = NSRange(location: unfetchedSet.min()!, length: unfetchedSet.count) + self.mediaGalleryFinder.enumerateMediaAttachments(range: nsRange, transaction: transaction) { (attachment: TSAttachment) in - galleryItems.append(item) - if sections[date] != nil { - sections[date]!.append(item) + guard !self.deletedAttachments.contains(attachment) else { + Logger.debug("skipping \(attachment) which has been deleted.") + return + } - // so we can update collectionView - newGalleryItems.append(item) - } else { - sectionDates.append(date) - sections[date] = [item] + guard let item: MediaGalleryItem = self.buildGalleryItem(attachment: attachment, transaction: transaction) else { + owsFailDebug("unexpectedly failed to buildGalleryItem") + return + } - // so we can update collectionView - newDates.append(date) - newGalleryItems.append(item) + let date = item.galleryDate + + galleryItems.append(item) + if sections[date] != nil { + sections[date]!.append(item) + + // so we can update collectionView + newGalleryItems.append(item) + } else { + sectionDates.append(date) + sections[date] = [item] + + // so we can update collectionView + newDates.append(date) + newGalleryItems.append(item) + } } - } - self.fetchedIndexSet = self.fetchedIndexSet.union(unfetchedSet) - self.hasFetchedOldest = self.fetchedIndexSet.min() == 0 - self.hasFetchedMostRecent = self.fetchedIndexSet.max() == mediaCount - 1 + self.fetchedIndexSet = self.fetchedIndexSet.union(unfetchedSet) + self.hasFetchedOldest = self.fetchedIndexSet.min() == 0 + self.hasFetchedMostRecent = self.fetchedIndexSet.max() == mediaCount - 1 + } } + } catch MediaGalleryError.itemNoLongerExists { + Logger.debug("Ignoring reload, since item no longer exists.") + return + } catch { + owsFailDebug("unexpected error: \(error)") + return } // TODO only sort if changed @@ -919,7 +1002,7 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel dataSourceDelegates.append(Weak(value: dataSourceDelegate)) } - func delete(items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) { + func delete(items: [MediaGalleryItem], initiatedBy: AnyObject) { AssertIsOnMainThread() Logger.info("with items: \(items.map { ($0.attachmentStream, $0.message.timestamp) })") diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 76d8960ac..412eb652e 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -401,11 +401,11 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou // MARK: MediaGalleryDataSourceDelegate - func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) { + func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: AnyObject) { Logger.debug("") guard let currentItem = self.currentItem else { - owsFailDebug("currentItem was unexpectedly nil") + owsFailDebug("currentItem was unexpectedly nil") return } diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift index 9b4006bb5..357b8912f 100644 --- a/Signal/src/ViewControllers/MediaTileViewController.swift +++ b/Signal/src/ViewControllers/MediaTileViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -610,7 +610,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa // MARK: MediaGalleryDataSourceDelegate - func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) { + func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: AnyObject) { Logger.debug("") guard let collectionView = self.collectionView else { diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 251269d44..9618576e2 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -12,8 +12,17 @@ enum MessageMetadataViewMode: UInt { case focusOnMetadata } +@objc +protocol MessageDetailViewDelegate: AnyObject { + func detailViewMessageWasDeleted(_ messageDetailViewController: MessageDetailViewController) +} + +@objc class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDelegate, OWSMessageBubbleViewDelegate, ContactShareViewHelperDelegate { + @objc + weak var delegate: MessageDetailViewDelegate? + // MARK: Properties let uiDatabaseConnection: YapDatabaseConnection @@ -67,7 +76,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele self.viewItem = viewItem self.message = message self.mode = mode - self.uiDatabaseConnection = OWSPrimaryStorage.shared().newDatabaseConnection() + self.uiDatabaseConnection = OWSPrimaryStorage.shared().uiDatabaseConnection self.conversationStyle = ConversationStyle(thread: thread) super.init(nibName: nil, bundle: nil) @@ -80,8 +89,13 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele self.contactShareViewHelper = ContactShareViewHelper(contactsManager: contactsManager) contactShareViewHelper.delegate = self - self.uiDatabaseConnection.beginLongLivedReadTransaction() - updateDBConnectionAndMessageToLatest() + do { + try updateDBConnectionAndMessageToLatest() + } catch DetailViewError.messageWasDeleted { + self.delegate?.detailViewMessageWasDeleted(self) + } catch { + owsFailDebug("unexpected error") + } self.conversationStyle.viewWidth = view.width() @@ -93,8 +107,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele self.view.layoutIfNeeded() NotificationCenter.default.addObserver(self, - selector: #selector(yapDatabaseModified), - name: NSNotification.Name.YapDatabaseModified, + selector: #selector(uiDatabaseDidUpdate), + name: .OWSUIDatabaseConnectionDidUpdate, object: OWSPrimaryStorage.shared().dbNotificationObject) } @@ -524,19 +538,23 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele // MARK: - Actions + enum DetailViewError: Error { + case messageWasDeleted + } + // This method should be called after self.databaseConnection.beginLongLivedReadTransaction(). - private func updateDBConnectionAndMessageToLatest() { + private func updateDBConnectionAndMessageToLatest() throws { AssertIsOnMainThread() - self.uiDatabaseConnection.read { transaction in + try self.uiDatabaseConnection.read { transaction in guard let uniqueId = self.message.uniqueId else { Logger.error("Message is missing uniqueId.") return } guard let newMessage = TSInteraction.fetch(uniqueId: uniqueId, transaction: transaction) as? TSMessage else { - Logger.error("Couldn't reload message.") - return + Logger.error("Message was deleted") + throw DetailViewError.messageWasDeleted } self.message = newMessage self.attachment = self.fetchAttachment(transaction: transaction) @@ -544,20 +562,25 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele } } - @objc internal func yapDatabaseModified(notification: NSNotification) { + @objc internal func uiDatabaseDidUpdate(notification: NSNotification) { AssertIsOnMainThread() guard !wasDeleted else { - // Item was deleted. Don't bother re-rendering, it will fail and we'll soon be dismissed. + // Item was deleted in the tile view gallery. + // Don't bother re-rendering, it will fail and we'll soon be dismissed. return } - let notifications = self.uiDatabaseConnection.beginLongLivedReadTransaction() + guard let notifications = notification.userInfo?[OWSUIDatabaseConnectionNotificationsKey] as? [Notification] else { + owsFailDebug("notifications was unexpectedly nil") + return + } guard let uniqueId = self.message.uniqueId else { Logger.error("Message is missing uniqueId.") return } + guard self.uiDatabaseConnection.hasChange(forKey: uniqueId, inCollection: TSInteraction.collection(), in: notifications) else { @@ -565,7 +588,16 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele return } - updateDBConnectionAndMessageToLatest() + do { + try updateDBConnectionAndMessageToLatest() + } catch DetailViewError.messageWasDeleted { + DispatchQueue.main.async { + self.delegate?.detailViewMessageWasDeleted(self) + } + return + } catch { + owsFailDebug("unexpected error: \(error)") + } updateContent() } @@ -616,14 +648,14 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele // MARK: OWSMessageBubbleViewDelegate func didTapImageViewItem(_ viewItem: ConversationViewItem, attachmentStream: TSAttachmentStream, imageView: UIView) { - let mediaGallery = MediaGallery(thread: self.thread, uiDatabaseConnection: self.uiDatabaseConnection) + let mediaGallery = MediaGallery(thread: self.thread) mediaGallery.addDataSourceDelegate(self) mediaGallery.presentDetailView(fromViewController: self, mediaAttachment: attachmentStream, replacingView: imageView) } func didTapVideoViewItem(_ viewItem: ConversationViewItem, attachmentStream: TSAttachmentStream, imageView: UIView) { - let mediaGallery = MediaGallery(thread: self.thread, uiDatabaseConnection: self.uiDatabaseConnection) + let mediaGallery = MediaGallery(thread: self.thread) mediaGallery.addDataSourceDelegate(self) mediaGallery.presentDetailView(fromViewController: self, mediaAttachment: attachmentStream, replacingView: imageView) @@ -732,7 +764,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele // MediaGalleryDataSourceDelegate - func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: MediaGalleryDataSourceDelegate) { + func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: AnyObject) { Logger.info("") guard (items.map({ $0.message }) == [self.message]) else { diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 4df03214e..a85f43e42 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -1318,7 +1318,6 @@ const CGFloat kIconViewLength = 24; OWSLogDebug(@""); MediaGallery *mediaGallery = [[MediaGallery alloc] initWithThread:self.thread - uiDatabaseConnection:self.uiDatabaseConnection options:MediaGalleryOptionSliderEnabled]; self.mediaGallery = mediaGallery; diff --git a/SignalMessaging/utils/Bench.swift b/SignalMessaging/utils/Bench.swift index cf79debb5..34afa6385 100644 --- a/SignalMessaging/utils/Bench.swift +++ b/SignalMessaging/utils/Bench.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -9,7 +9,10 @@ import Foundation /// /// BenchAsync(title: "my benchmark") { completeBenchmark in /// foo { +/// // consider benchmarking of "foo" complete /// completeBenchmark() +/// +/// // call any completion handler foo might have /// fooCompletion() /// } /// } @@ -30,6 +33,21 @@ public func Bench(title: String, block: () -> Void) { } } +public func Bench(title: String, block: () throws -> Void) throws { + var thrownError: Error? + BenchAsync(title: title) { finish in + do { + try block() + } catch { + thrownError = error + } + finish() + } + if let errorToRethrow = thrownError { + throw errorToRethrow + } +} + /// When it's not convenient to retain the event completion handler, e.g. when the measured event /// crosses multiple classes, you can use the BenchEvent tools /// diff --git a/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.h b/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.h index 5fcbb6108..c583b33ac 100644 --- a/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.h +++ b/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -7,7 +7,10 @@ NS_ASSUME_NONNULL_BEGIN @class OWSStorage; @class TSAttachment; @class TSThread; +@class YapDatabaseAutoViewTransaction; +@class YapDatabaseConnection; @class YapDatabaseReadTransaction; +@class YapDatabaseViewRowChange; @interface OWSMediaGalleryFinder : NSObject @@ -19,8 +22,8 @@ NS_ASSUME_NONNULL_BEGIN - (NSUInteger)mediaCountWithTransaction:(YapDatabaseReadTransaction *)transaction NS_SWIFT_NAME(mediaCount(transaction:)); // The ordinal position of an attachment within a thread's media gallery -- (NSUInteger)mediaIndexForAttachment:(TSAttachment *)attachment - transaction:(YapDatabaseReadTransaction *)transaction +- (nullable NSNumber *)mediaIndexForAttachment:(TSAttachment *)attachment + transaction:(YapDatabaseReadTransaction *)transaction NS_SWIFT_NAME(mediaIndex(attachment:transaction:)); - (nullable TSAttachment *)oldestMediaAttachmentWithTransaction:(YapDatabaseReadTransaction *)transaction @@ -33,8 +36,14 @@ NS_ASSUME_NONNULL_BEGIN block:(void (^)(TSAttachment *))attachmentBlock NS_SWIFT_NAME(enumerateMediaAttachments(range:transaction:block:)); +- (BOOL)hasMediaChangesInNotifications:(NSArray *)notifications + dbConnection:(YapDatabaseConnection *)dbConnection; + #pragma mark - Extension registration +@property (nonatomic, readonly) NSString *mediaGroup; +- (YapDatabaseAutoViewTransaction *)galleryExtensionWithTransaction:(YapDatabaseReadTransaction *)transaction + NS_SWIFT_NAME(galleryExtension(transaction:)); + (NSString *)databaseExtensionName; + (void)asyncRegisterDatabaseExtensionsWithPrimaryStorage:(OWSStorage *)storage; diff --git a/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.m b/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.m index 3af82d088..7a22c368a 100644 --- a/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.m +++ b/SignalServiceKit/src/Storage/OWSMediaGalleryFinder.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSMediaGalleryFinder.h" @@ -43,7 +43,8 @@ static NSString *const OWSMediaGalleryFinderExtensionName = @"OWSMediaGalleryFin return [[self galleryExtensionWithTransaction:transaction] numberOfItemsInGroup:self.mediaGroup]; } -- (NSUInteger)mediaIndexForAttachment:(TSAttachment *)attachment transaction:(YapDatabaseReadTransaction *)transaction +- (nullable NSNumber *)mediaIndexForAttachment:(TSAttachment *)attachment + transaction:(YapDatabaseReadTransaction *)transaction { NSString *groupId; NSUInteger index; @@ -53,10 +54,13 @@ static NSString *const OWSMediaGalleryFinderExtensionName = @"OWSMediaGalleryFin forKey:attachment.uniqueId inCollection:[TSAttachment collection]]; - OWSAssertDebug(wasFound); + if (!wasFound) { + return nil; + } + OWSAssertDebug([self.mediaGroup isEqual:groupId]); - return index; + return @(index); } - (nullable TSAttachment *)oldestMediaAttachmentWithTransaction:(YapDatabaseReadTransaction *)transaction @@ -88,6 +92,15 @@ static NSString *const OWSMediaGalleryFinderExtensionName = @"OWSMediaGalleryFin }]; } +- (BOOL)hasMediaChangesInNotifications:(NSArray *)notifications + dbConnection:(YapDatabaseConnection *)dbConnection +{ + YapDatabaseAutoViewConnection *extConnection = [dbConnection ext:OWSMediaGalleryFinderExtensionName]; + OWSAssert(extConnection); + + return [extConnection hasChangesForGroup:self.mediaGroup inNotifications:notifications]; +} + #pragma mark - Util - (YapDatabaseAutoViewTransaction *)galleryExtensionWithTransaction:(YapDatabaseReadTransaction *)transaction diff --git a/SignalServiceKit/src/Util/YapDatabase+Promise.swift b/SignalServiceKit/src/Util/YapDatabase+Promise.swift index 2fe3351a2..89d7029ed 100644 --- a/SignalServiceKit/src/Util/YapDatabase+Promise.swift +++ b/SignalServiceKit/src/Util/YapDatabase+Promise.swift @@ -17,4 +17,36 @@ public extension YapDatabaseConnection { self.asyncReadWrite(block, completionBlock: resolver.fulfill) } } + + func read(_ block: @escaping (YapDatabaseReadTransaction) throws -> Void) throws { + var errorToRaise: Error? = nil + + read { transaction in + do { + try block(transaction) + } catch { + errorToRaise = error + } + } + + if let errorToRaise = errorToRaise { + throw errorToRaise + } + } + + func readWrite(_ block: @escaping (YapDatabaseReadWriteTransaction) throws -> Void) throws { + var errorToRaise: Error? = nil + + readWrite { transaction in + do { + try block(transaction) + } catch { + errorToRaise = error + } + } + + if let errorToRaise = errorToRaise { + throw errorToRaise + } + } } From 7a4041cdde26f7a6281c3e19434bd5447912d4b8 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Feb 2019 10:37:46 -0700 Subject: [PATCH 121/493] Cache dark theme preference This is a hot path --- SignalMessaging/appearance/Theme.m | 42 +++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/appearance/Theme.m b/SignalMessaging/appearance/Theme.m index b0d66e3bf..24c3bd54b 100644 --- a/SignalMessaging/appearance/Theme.m +++ b/SignalMessaging/appearance/Theme.m @@ -16,24 +16,60 @@ NSString *const ThemeDidChangeNotification = @"ThemeDidChangeNotification"; NSString *const ThemeCollection = @"ThemeCollection"; NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled"; + +@interface Theme () + +@property (nonatomic) NSNumber *isDarkThemeEnabledNumber; + +@end + @implementation Theme ++ (instancetype)sharedInstance +{ + static dispatch_once_t onceToken; + static Theme *instance; + dispatch_once(&onceToken, ^{ + instance = [Theme new]; + }); + + return instance; +} + + (BOOL)isDarkThemeEnabled { + return [self.sharedInstance isDarkThemeEnabled]; +} + +- (BOOL)isDarkThemeEnabled +{ + OWSAssertIsOnMainThread(); + if (!CurrentAppContext().isMainApp) { // Ignore theme in app extensions. return NO; } - return [OWSPrimaryStorage.sharedManager.dbReadConnection boolForKey:ThemeKeyThemeEnabled - inCollection:ThemeCollection - defaultValue:NO]; + if (self.isDarkThemeEnabledNumber == nil) { + BOOL isDarkThemeEnabled = [OWSPrimaryStorage.sharedManager.dbReadConnection boolForKey:ThemeKeyThemeEnabled + inCollection:ThemeCollection + defaultValue:NO]; + self.isDarkThemeEnabledNumber = @(isDarkThemeEnabled); + } + + return self.isDarkThemeEnabledNumber.boolValue; } + (void)setIsDarkThemeEnabled:(BOOL)value +{ + return [self.sharedInstance setIsDarkThemeEnabled:value]; +} + +- (void)setIsDarkThemeEnabled:(BOOL)value { OWSAssertIsOnMainThread(); + self.isDarkThemeEnabledNumber = @(value); [OWSPrimaryStorage.sharedManager.dbReadWriteConnection setBool:value forKey:ThemeKeyThemeEnabled inCollection:ThemeCollection]; From 645a26cbdf9acbb647d7a1b39407781a43f2b9bf Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Feb 2019 10:58:21 -0700 Subject: [PATCH 122/493] use connection pool for reads --- SignalServiceKit/src/Storage/OWSPrimaryStorage.m | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m index 8afb8cf7b..1b04aedd3 100644 --- a/SignalServiceKit/src/Storage/OWSPrimaryStorage.m +++ b/SignalServiceKit/src/Storage/OWSPrimaryStorage.m @@ -52,6 +52,7 @@ void VerifyRegistrationsForPrimaryStorage(OWSStorage *storage) @property (atomic) BOOL areAsyncRegistrationsComplete; @property (atomic) BOOL areSyncRegistrationsComplete; +@property (nonatomic, readonly) YapDatabaseConnectionPool *dbReadPool; @end @@ -75,10 +76,10 @@ void VerifyRegistrationsForPrimaryStorage(OWSStorage *storage) if (self) { [self loadDatabase]; - _dbReadConnection = [self newDatabaseConnection]; + _dbReadPool = [[YapDatabaseConnectionPool alloc] initWithDatabase:self.database]; _dbReadWriteConnection = [self newDatabaseConnection]; _uiDatabaseConnection = [self newDatabaseConnection]; - + // Increase object cache limit. Default is 250. _uiDatabaseConnection.objectCacheLimit = 500; [_uiDatabaseConnection beginLongLivedReadTransaction]; @@ -156,7 +157,8 @@ void VerifyRegistrationsForPrimaryStorage(OWSStorage *storage) - (void)resetStorage { - _dbReadConnection = nil; + _dbReadPool = nil; + _uiDatabaseConnection = nil; _dbReadWriteConnection = nil; [super resetStorage]; @@ -426,6 +428,11 @@ void VerifyRegistrationsForPrimaryStorage(OWSStorage *storage) return OWSPrimaryStorage.sharedManager.dbReadConnection; } +- (YapDatabaseConnection *)dbReadConnection +{ + return self.dbReadPool.connection; +} + + (YapDatabaseConnection *)dbReadWriteConnection { return OWSPrimaryStorage.sharedManager.dbReadWriteConnection; From 680b844f3c077ec4e762a3210195ee5573ea44e1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 21 Feb 2019 17:05:18 -0700 Subject: [PATCH 123/493] Allow all windows to do landscape, fixes: 1. Remove undesirable animation from portrait->landscape when minimizizing in landscape and relaunching in landscape. 2. This also seems to fix the intermittently misplaced toolbar when launching in landscape. I believe this is a consequence of fix #1 --- Signal/Signal-Info.plist | 4 - Signal/src/AppDelegate.m | 171 ++---------------- .../ViewControllers/CallViewController.swift | 6 +- .../ViewControllers/OWSNavigationController.m | 2 +- .../ScreenLockViewController.m | 4 +- SignalMessaging/utils/OWSWindowManager.m | 8 +- 6 files changed, 24 insertions(+), 171 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5ce47d308..ff7bae766 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -145,10 +145,6 @@ UIStatusBarStyle UIStatusBarStyleLightContent - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIViewControllerBasedStatusBarAppearance diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index fc580a824..5b7b757e2 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -64,35 +64,6 @@ static NSTimeInterval launchStartedAt; @property (nonatomic) BOOL areVersionMigrationsComplete; @property (nonatomic) BOOL didAppLaunchFail; -// Signal iOS uses multiple "key" windows, e.g. the screen lock window. -// We usually switch "key" windows while becoming active. At the same -// time, we often change the state of our orientation mask. -// -// For reasons unknown, this confuses iOS and leads to very strange -// behavior, e.g.: -// -// * Multiple activation of the app returning from the background, e.g. -// transitions from "background, inactive" -> "foreground, inactive" -// -> "foreground, active" -> "foreground, inactive" -> -// "foreground, active". -// * Multiple (sometimes incomplete) orientation changes while becoming -// active. -// * The side effects of orientation changes (e.g. safe area insets) -// being left in a bad state. -// -// The solution: -// -// * Lock app in portrait unless "foreground, active". -// * Don't "unlock" until the app has been "foreground, active" -// for a short duration (to allow activation process to safely complete). -// * After unlocking, try to rotate to the current device orientation. -// -// The user experience is reasonable: if the user activates the app -// while in landscape, the user sees a rotation animation. -@property (nonatomic) BOOL isLandscapeEnabled; -@property (nonatomic) BOOL shouldEnableLandscape; -@property (nonatomic, nullable) NSTimer *landscapeTimer; - @end #pragma mark - @@ -189,28 +160,26 @@ static NSTimeInterval launchStartedAt; #pragma mark - -- (void)applicationDidEnterBackground:(UIApplication *)application { - OWSLogWarn(@"applicationDidEnterBackground."); - - [self updateShouldEnableLandscape]; +- (void)applicationDidEnterBackground:(UIApplication *)application +{ + OWSLogInfo(@"applicationDidEnterBackground."); [DDLog flushLog]; } -- (void)applicationWillEnterForeground:(UIApplication *)application { - OWSLogWarn(@"applicationWillEnterForeground."); - - [self updateShouldEnableLandscape]; +- (void)applicationWillEnterForeground:(UIApplication *)application +{ + OWSLogInfo(@"applicationWillEnterForeground."); } - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - OWSLogWarn(@"applicationDidReceiveMemoryWarning."); + OWSLogInfo(@"applicationDidReceiveMemoryWarning."); } - (void)applicationWillTerminate:(UIApplication *)application { - OWSLogWarn(@"applicationWillTerminate."); + OWSLogInfo(@"applicationWillTerminate."); [DDLog flushLog]; } @@ -329,14 +298,6 @@ static NSTimeInterval launchStartedAt; selector:@selector(registrationLockDidChange:) name:NSNotificationName_2FAStateDidChange object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(isScreenBlockActiveDidChange:) - name:IsScreenBlockActiveDidChangeNotification - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(reportedApplicationStateDidChange:) - name:ReportedApplicationStateDidChangeNotification - object:nil]; OWSLogInfo(@"application: didFinishLaunchingWithOptions completed."); @@ -675,8 +636,6 @@ static NSTimeInterval launchStartedAt; // be called _before_ we become active. [self clearAllNotificationsAndRestoreBadgeCount]; - [self updateShouldEnableLandscape]; - OWSLogInfo(@"applicationDidBecomeActive completed."); } @@ -779,7 +738,8 @@ static NSTimeInterval launchStartedAt; OWSLogInfo(@"handleActivation completed."); } -- (void)applicationWillResignActive:(UIApplication *)application { +- (void)applicationWillResignActive:(UIApplication *)application +{ OWSAssertIsOnMainThread(); if (self.didAppLaunchFail) { @@ -789,7 +749,6 @@ static NSTimeInterval launchStartedAt; OWSLogWarn(@"applicationWillResignActive."); - [self updateShouldEnableLandscape]; [self clearAllNotificationsAndRestoreBadgeCount]; [DDLog flushLog]; @@ -1008,111 +967,15 @@ static NSTimeInterval launchStartedAt; - (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window { - // See comments on isLandscapeEnabled property. - if (!self.isLandscapeEnabled) { - return UIInterfaceOrientationMaskPortrait; - } - // We use isAppForegroundAndActive which depends on "reportedApplicationState" - // and therefore is more conservative about being active. - if (!CurrentAppContext().isAppForegroundAndActive) { - return UIInterfaceOrientationMaskPortrait; - } - // This clause shouldn't be necessary, but it's nice to - // be explicit about our invariants. - if (!self.hasInitialRootViewController) { - return UIInterfaceOrientationMaskPortrait; - } - if (self.windowManager.hasCall) { + OWSLogInfo(@"has call"); // The call-banner window is only suitable for portrait display return UIInterfaceOrientationMaskPortrait; } - - if (!window) { - // If `window` is nil, be permissive. Otherwise orientation - // gets messed up during presentation of windows. - return UIInterfaceOrientationMaskAllButUpsideDown; - } - - if (![self.windowManager isAppWindow:window]) { - // iOS uses various windows for animations, transitions, etc. - // e.g. _UIInteractiveHighlightEffectWindow, - // UITextEffectsWindow. - // - // We should be permissive with these windows. - return UIInterfaceOrientationMaskAllButUpsideDown; - } - - if (window == self.windowManager.menuActionsWindow) { - return UIInterfaceOrientationMaskAllButUpsideDown; - } - - if (self.windowManager.rootWindow != window) { - return UIInterfaceOrientationMaskPortrait; - } return UIInterfaceOrientationMaskAllButUpsideDown; } -// See comments on isLandscapeEnabled property. -- (void)updateShouldEnableLandscape -{ - OWSAssertIsOnMainThread(); - - // We use isAppForegroundAndActive which depends on "reportedApplicationState" - // and therefore is more conservative about being active. - self.shouldEnableLandscape = (CurrentAppContext().isAppForegroundAndActive && [AppReadiness isAppReady] - && ![OWSWindowManager sharedManager].isScreenBlockActive); -} - -// See comments on isLandscapeEnabled property. -- (void)setShouldEnableLandscape:(BOOL)shouldEnableLandscape -{ - if (_shouldEnableLandscape == shouldEnableLandscape) { - return; - } - - _shouldEnableLandscape = shouldEnableLandscape; - - void (^disableLandscape)(void) = ^{ - BOOL wasEnabled = self.isLandscapeEnabled; - self.isLandscapeEnabled = NO; - [self.landscapeTimer invalidate]; - self.landscapeTimer = nil; - - if (wasEnabled) { - [UIViewController attemptRotationToDeviceOrientation]; - } - }; - - if (shouldEnableLandscape) { - disableLandscape(); - - // Enable Async - NSTimeInterval delay = 0.35f; - self.landscapeTimer = [NSTimer weakScheduledTimerWithTimeInterval:delay - target:self - selector:@selector(enableLandscape) - userInfo:nil - repeats:NO]; - } else { - // Disable. - disableLandscape(); - } -} - -// See comments on isLandscapeEnabled property. -- (void)enableLandscape -{ - OWSAssertIsOnMainThread(); - - self.isLandscapeEnabled = YES; - [self.landscapeTimer invalidate]; - self.landscapeTimer = nil; - - [UIViewController attemptRotationToDeviceOrientation]; -} - #pragma mark Push Notifications Delegate Methods - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo { @@ -1381,8 +1244,6 @@ static NSTimeInterval launchStartedAt; [self.primaryStorage touchDbAsync]; - [self updateShouldEnableLandscape]; - // Every time the user upgrades to a new version: // // * Update account attributes. @@ -1445,16 +1306,6 @@ static NSTimeInterval launchStartedAt; [self enableBackgroundRefreshIfNecessary]; } -- (void)isScreenBlockActiveDidChange:(NSNotification *)notification -{ - [self updateShouldEnableLandscape]; -} - -- (void)reportedApplicationStateDidChange:(NSNotification *)notification -{ - [self updateShouldEnableLandscape]; -} - - (void)ensureRootViewController { OWSAssertIsOnMainThread(); diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift index cb2872c0b..cb6b5360b 100644 --- a/Signal/src/ViewControllers/CallViewController.swift +++ b/Signal/src/ViewControllers/CallViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -226,6 +226,10 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, object: nil) } + override var supportedInterfaceOrientations: UIInterfaceOrientationMask { + return .portrait + } + // MARK: - Create Views func createViews() { diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m index a9bd8230e..901cb1517 100644 --- a/SignalMessaging/ViewControllers/OWSNavigationController.m +++ b/SignalMessaging/ViewControllers/OWSNavigationController.m @@ -202,7 +202,7 @@ NS_ASSUME_NONNULL_BEGIN if (self.topViewController) { return self.topViewController.supportedInterfaceOrientations; } else { - return UIInterfaceOrientationMaskPortrait; + return UIInterfaceOrientationMaskAllButUpsideDown; } } diff --git a/SignalMessaging/ViewControllers/ScreenLockViewController.m b/SignalMessaging/ViewControllers/ScreenLockViewController.m index d2f5543e7..74afe0844 100644 --- a/SignalMessaging/ViewControllers/ScreenLockViewController.m +++ b/SignalMessaging/ViewControllers/ScreenLockViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "ScreenLockViewController.h" @@ -151,7 +151,7 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) - (UIInterfaceOrientationMask)supportedInterfaceOrientations { - return UIInterfaceOrientationMaskPortrait; + return UIInterfaceOrientationMaskAllButUpsideDown; } @end diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m index 057a0d624..deea32f06 100644 --- a/SignalMessaging/utils/OWSWindowManager.m +++ b/SignalMessaging/utils/OWSWindowManager.m @@ -101,7 +101,7 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) - (UIInterfaceOrientationMask)supportedInterfaceOrientations { - return UIInterfaceOrientationMaskPortrait; + return UIInterfaceOrientationMaskAllButUpsideDown; } @end @@ -120,7 +120,7 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) - (UIInterfaceOrientationMask)supportedInterfaceOrientations { - return UIInterfaceOrientationMaskPortrait; + return UIInterfaceOrientationMaskAllButUpsideDown; } @end @@ -374,7 +374,9 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) [self.callNavigationController popToRootViewControllerAnimated:NO]; [self.callNavigationController pushViewController:callViewController animated:NO]; self.shouldShowCallView = YES; - + // CallViewController only supports portrait, but if we're _already_ landscape it won't + // automatically switch. + [UIDevice.currentDevice ows_setOrientation:UIInterfaceOrientationPortrait]; [self ensureWindowState]; } From 59cd14047703d328d5b0d65f2724c95cec0c6e6a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Feb 2019 18:12:28 -0700 Subject: [PATCH 124/493] "Bump build to 2.37.0.4." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index ff7bae766..ca8b9c8a8 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.3 + 2.37.0.4 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index d9e2eb8bb..97d4709d9 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.3 + 2.37.0.4 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 0f98d63365f641452edff90720a8911a858c5145 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 16:30:48 -0500 Subject: [PATCH 125/493] Tweak name of proxied request padding header. --- SignalServiceKit/src/Network/ProxiedContentDownloader.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index a9cee113a..3d13e3830 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -716,7 +716,7 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio let paddingQuantum: UInt = 1024 let paddingSize = paddingQuantum - (sizeEstimate % paddingQuantum) let padding = String(repeating: ".", count: Int(paddingSize)) - request.addValue(padding, forHTTPHeaderField: "SignalPadding") + request.addValue(padding, forHTTPHeaderField: "X-SignalPadding") } private func estimateRequestSize(request: URLRequest) -> UInt? { From a218d6c4650bffbea8b60351cff394a214388d3e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Feb 2019 20:20:16 -0700 Subject: [PATCH 126/493] Send first chars of longtext in protobuf --- Podfile | 4 +-- Podfile.lock | 13 ++++----- .../ConversationViewController.m | 27 +++++-------------- SignalMessaging/utils/ThreadUtil.m | 16 +++++++++++ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Podfile b/Podfile index 2495e35ea..d87aeac1f 100644 --- a/Podfile +++ b/Podfile @@ -9,8 +9,8 @@ def shared_pods # OWS Pods ### - pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] - # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] + # pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] + pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"] # pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"] diff --git a/Podfile.lock b/Podfile.lock index 3a77793d9..f8d35f79b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -200,8 +200,8 @@ DEPENDENCIES: - PromiseKit (= 6.5.3) - PureLayout - Reachability - - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`) - - SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`) + - SignalCoreKit (from `../SignalCoreKit`) + - SignalCoreKit/Tests (from `../SignalCoreKit`) - SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`) - SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`) - SignalServiceKit (from `.`) @@ -240,7 +240,7 @@ EXTERNAL SOURCES: :branch: signal-master :git: https://github.com/signalapp/Mantle SignalCoreKit: - :git: https://github.com/signalapp/SignalCoreKit.git + :path: "../SignalCoreKit" SignalMetadataKit: :git: https://github.com/signalapp/SignalMetadataKit SignalServiceKit: @@ -268,9 +268,6 @@ CHECKOUT OPTIONS: Mantle: :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :git: https://github.com/signalapp/Mantle - SignalCoreKit: - :commit: 2bf143469ab82fb35379fe9f5085450edefb2a2a - :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 :git: https://github.com/signalapp/SignalMetadataKit @@ -294,7 +291,7 @@ SPEC CHECKSUMS: PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b + SignalCoreKit: 2d5db80cda950a892383a4002146ec0d81460ce1 SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 SignalServiceKit: c637b66e485538dda76836a1ec560dc556035430 SQLCipher: 4636a257060f6f1b4e143a143028b61a2b462d0d @@ -304,6 +301,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: b0748e1cca7826f2ed132c495589e6aea9b7d743 +PODFILE CHECKSUM: 15fd183a8e1c41a9df76d3cdb28f415e2d6c4ab5 COCOAPODS: 1.5.3 diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ce8f314aa..c699e63e9 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3975,26 +3975,13 @@ typedef enum : NSUInteger { // which are presented as normal text messages. BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; __block TSOutgoingMessage *message; - - if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { - DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text]; - SignalAttachment *attachment = - [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; - // TODO we should redundantly send the first n chars in the body field so it can be viewed - // on clients that don't support oversized text messgaes, (and potentially generate a preview - // before the attachment is downloaded) - message = [ThreadUtil enqueueMessageWithAttachment:attachment - inThread:self.thread - quotedReplyModel:self.inputToolbar.quotedReply]; - } else { - [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - message = [ThreadUtil enqueueMessageWithText:text - inThread:self.thread - quotedReplyModel:self.inputToolbar.quotedReply - linkPreviewDraft:self.inputToolbar.linkPreviewDraft - transaction:transaction]; - }]; - } + [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + message = [ThreadUtil enqueueMessageWithText:text + inThread:self.thread + quotedReplyModel:self.inputToolbar.quotedReply + linkPreviewDraft:self.inputToolbar.linkPreviewDraft + transaction:transaction]; + }]; [self.conversationViewModel appendUnsavedOutgoingTextMessage:message]; [self messageWasSent:message]; diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 2d5b182f3..50040b5ae 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -71,6 +71,22 @@ NS_ASSUME_NONNULL_BEGIN linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft transaction:(YapDatabaseReadTransaction *)transaction { + + NSString *truncatedText; + SignalAttachment *_Nullable oversizeTextAttachment; + + if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { + truncatedText = [text truncatedToByteCount:kOversizeTextMessageSizeThreshold]; + DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text]; + if (dataSource) { + oversizeTextAttachment = + [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; + } + } else { + truncatedText = text; + oversizeTextAttachment = nil; + } + OWSDisappearingMessagesConfiguration *configuration = [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:transaction]; From bc4260b444a41b66d051979c5b86ab50ab5fa099 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Feb 2019 10:32:41 -0700 Subject: [PATCH 127/493] Send long-text with other attachments --- .../ConversationViewController.m | 14 +- .../ConversationView/ConversationViewItem.m | 66 ++++---- .../ViewControllers/DebugUI/DebugUIMessages.m | 76 ++++----- .../src/ViewControllers/DebugUI/DebugUIMisc.m | 27 +++- .../SharingThreadPickerViewController.m | 2 +- SignalMessaging/utils/ThreadUtil.h | 16 +- SignalMessaging/utils/ThreadUtil.m | 147 +++++++++--------- .../src/Messages/Interactions/TSMessage.h | 3 + .../src/Messages/Interactions/TSMessage.m | 37 ++++- 9 files changed, 219 insertions(+), 169 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index c699e63e9..5104aa509 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3604,10 +3604,16 @@ typedef enum : NSUInteger { } BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; - TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments - messageBody:messageText - inThread:self.thread - quotedReplyModel:self.inputToolbar.quotedReply]; + + __block TSOutgoingMessage *message; + [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + message = [ThreadUtil enqueueMessageWithText:messageText + mediaAttachments:attachments + inThread:self.thread + quotedReplyModel:self.inputToolbar.quotedReply + linkPreviewDraft:nil + transaction:transaction]; + }]; [self messageWasSent:message]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index fa13720a0..49844d050 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -592,10 +592,26 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } } - NSArray *attachments = [message attachmentsWithTransaction:transaction]; + NSString *_Nullable bodyText = [message bodyTextWithTransaction:transaction]; + if (bodyText) { + self.displayableBodyText = [self displayableBodyTextForText:bodyText interactionId:message.uniqueId]; + } + + // Even though displayableBodyText could have already been assigned from the oversized text + // attachment, it's also possible that for new messages we'd first cached the truncated body + // text. So if an AttachmentStream now exists we explicitly use the text from the attachment. + TSAttachment *_Nullable oversizeTextAttachment = [message oversizeTextAttachmentWithTransaction:transaction]; + if (oversizeTextAttachment != nil && [oversizeTextAttachment isKindOfClass:[TSAttachmentStream class]]) { + TSAttachmentStream *oversizeTextAttachmentStream = (TSAttachmentStream *)oversizeTextAttachment; + self.messageCellType = OWSMessageCellType_OversizeTextMessage; + self.displayableBodyText = [self displayableBodyTextForOversizeTextAttachment:oversizeTextAttachmentStream + interactionId:message.uniqueId]; + } + + NSArray *mediaAttachments = [message mediaAttachmentsWithTransaction:transaction]; if ([message isMediaAlbumWithTransaction:transaction]) { - OWSAssertDebug(attachments.count > 0); - NSArray *mediaAlbumItems = [self mediaAlbumItemsForAttachments:attachments]; + OWSAssertDebug(mediaAttachments.count > 0); + NSArray *mediaAlbumItems = [self mediaAlbumItemsForAttachments:mediaAttachments]; if (mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = mediaAlbumItems.firstObject; @@ -608,30 +624,16 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) self.mediaAlbumItems = mediaAlbumItems; self.messageCellType = OWSMessageCellType_MediaAlbum; - NSString *_Nullable albumTitle = [message bodyTextWithTransaction:transaction]; - if (!albumTitle && mediaAlbumItems.count == 1) { - // If the album contains only one option, use its caption as the - // the album title. - albumTitle = mediaAlbumItems.firstObject.caption; - } - if (albumTitle) { - self.displayableBodyText = [self displayableBodyTextForText:albumTitle interactionId:message.uniqueId]; - } return; } + // Only media galleries should have more than one attachment. - OWSAssertDebug(attachments.count <= 1); - - TSAttachment *_Nullable attachment = attachments.firstObject; - if (attachment) { - if ([attachment isKindOfClass:[TSAttachmentStream class]]) { - self.attachmentStream = (TSAttachmentStream *)attachment; - - if ([attachment.contentType isEqualToString:OWSMimeTypeOversizeTextMessage]) { - self.messageCellType = OWSMessageCellType_OversizeTextMessage; - self.displayableBodyText = [self displayableBodyTextForOversizeTextAttachment:self.attachmentStream - interactionId:message.uniqueId]; - } else if ([self.attachmentStream isAudio]) { + OWSAssertDebug(mediaAttachments.count <= 1); + TSAttachment *_Nullable mediaAttachment = mediaAttachments.firstObject; + if (mediaAttachment) { + if ([mediaAttachment isKindOfClass:[TSAttachmentStream class]]) { + self.attachmentStream = (TSAttachmentStream *)mediaAttachment; + if ([self.attachmentStream isAudio]) { CGFloat audioDurationSeconds = [self.attachmentStream audioDurationSeconds]; if (audioDurationSeconds > 0) { self.audioDurationSeconds = audioDurationSeconds; @@ -639,34 +641,28 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } else { self.messageCellType = OWSMessageCellType_GenericAttachment; } - } else { + } else if (self.messageCellType == OWSMessageCellType_Unknown) { self.messageCellType = OWSMessageCellType_GenericAttachment; } - } else if ([attachment isKindOfClass:[TSAttachmentPointer class]]) { + } else if ([mediaAttachment isKindOfClass:[TSAttachmentPointer class]]) { self.messageCellType = OWSMessageCellType_DownloadingAttachment; - self.attachmentPointer = (TSAttachmentPointer *)attachment; + self.attachmentPointer = (TSAttachmentPointer *)mediaAttachment; } else { OWSFailDebug(@"Unknown attachment type"); } } - // Ignore message body for oversize text attachments. - if (message.body.length > 0) { - if (self.hasBodyText) { - OWSFailDebug(@"oversize text message has unexpected caption."); - } - + if (self.hasBodyText) { // If we haven't already assigned an attachment type at this point, message.body isn't a caption, // it's a stand-alone text message. if (self.messageCellType == OWSMessageCellType_Unknown) { OWSAssertDebug(message.attachmentIds.count == 0); self.messageCellType = OWSMessageCellType_TextMessage; } - self.displayableBodyText = [self displayableBodyTextForText:message.body interactionId:message.uniqueId]; OWSAssertDebug(self.displayableBodyText); } - if (self.hasBodyText && attachment == nil && message.linkPreview) { + if (self.hasBodyText && message.linkPreview) { self.linkPreview = message.linkPreview; if (message.linkPreview.imageAttachmentId.length > 0) { TSAttachment *_Nullable linkPreviewAttachment = diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 8a69619e1..660c0362e 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -390,12 +390,12 @@ NS_ASSUME_NONNULL_BEGIN }]; } -+ (void)sendAttachment:(NSString *)filePath - thread:(TSThread *)thread - label:(NSString *)label - hasCaption:(BOOL)hasCaption - success:(nullable void (^)(void))success - failure:(nullable void (^)(void))failure ++ (void)sendAttachmentWithFilePath:(NSString *)filePath + thread:(TSThread *)thread + label:(NSString *)label + hasCaption:(BOOL)hasCaption + success:(nullable void (^)(void))success + failure:(nullable void (^)(void))failure { OWSAssertDebug(filePath); OWSAssertDebug(thread); @@ -425,7 +425,9 @@ NS_ASSUME_NONNULL_BEGIN [DDLog flushLog]; } OWSAssertDebug(![attachment hasError]); - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + + [self sendAttachment:attachment thread:thread messageBody:messageBody]; + success(); } @@ -551,12 +553,12 @@ NS_ASSUME_NONNULL_BEGIN ActionFailureBlock failure) { dispatch_async(dispatch_get_main_queue(), ^{ OWSAssertDebug(fakeAssetLoader.filePath.length > 0); - [self sendAttachment:fakeAssetLoader.filePath - thread:thread - label:label - hasCaption:hasCaption - success:success - failure:failure]; + [self sendAttachmentWithFilePath:fakeAssetLoader.filePath + thread:thread + label:label + hasCaption:hasCaption + success:success + failure:failure]; }); } prepareBlock:fakeAssetLoader.prepareBlock]; @@ -1732,19 +1734,25 @@ NS_ASSUME_NONNULL_BEGIN return attachment; } -+ (void)sendAttachment:(NSString *)filePath ++ (void)sendAttachment:(nullable SignalAttachment *)attachment thread:(TSThread *)thread - success:(nullable void (^)(void))success - failure:(nullable void (^)(void))failure + messageBody:(nullable NSString *)messageBody { - OWSAssertDebug(filePath); - OWSAssertDebug(thread); - - SignalAttachment *attachment = [self signalAttachmentForFilePath:filePath]; - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; - success(); + [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + NSArray *attachments = @[]; + if (attachment != nil) { + attachments = @[ attachment ]; + } + [ThreadUtil enqueueMessageWithText:messageBody + mediaAttachments:attachments + inThread:thread + quotedReplyModel:nil + linkPreviewDraft:nil + transaction:transaction]; + }]; } + + (DebugUIMessagesAction *)fakeIncomingTextMessageAction:(TSThread *)thread text:(NSString *)text { OWSAssertDebug(thread); @@ -3342,11 +3350,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac + (void)sendOversizeTextMessage:(TSThread *)thread { - NSString *message = [self randomOversizeText]; - DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:message]; - SignalAttachment *attachment = - [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + [self sendAttachment:nil thread:thread messageBody:[self randomOversizeText]]; } + (NSData *)createRandomNSDataOfSize:(size_t)size @@ -3379,7 +3383,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac // style them indistinguishably from a separate text message. attachment.captionText = [self randomCaptionText]; } - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + [self sendAttachment:attachment thread:thread messageBody:nil]; } + (SSKProtoEnvelope *)createEnvelopeForThread:(TSThread *)thread @@ -4445,7 +4449,7 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac [DDLog flushLog]; } OWSAssertDebug(![attachment hasError]); - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + [self sendAttachment:attachment thread:thread messageBody:nil]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ sendUnsafeFile(); @@ -4759,12 +4763,14 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac [attachments addObject:attachment]; } - [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments - messageBody:messageBody - inThread:thread - quotedReplyModel:nil]; - OWSLogError(@"timestamp: %llu.", message.timestamp); + [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { + TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithText:messageBody + mediaAttachments:attachments + inThread:thread + quotedReplyModel:nil + linkPreviewDraft:nil + transaction:transaction]; + OWSLogDebug(@"timestamp: %llu.", message.timestamp); }]; } diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m index c14efff16..a3671bd51 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m @@ -33,6 +33,13 @@ NS_ASSUME_NONNULL_BEGIN @implementation DebugUIMisc +#pragma mark - Dependencies + ++ (YapDatabaseConnection *)dbConnection +{ + return [OWSPrimaryStorage.sharedManager dbReadWriteConnection]; +} + #pragma mark - Factory Methods - (NSString *)name @@ -252,11 +259,23 @@ NS_ASSUME_NONNULL_BEGIN SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType]; NSData *databasePassword = [OWSPrimaryStorage.sharedManager databasePassword]; attachment.captionText = [databasePassword hexadecimalString]; + [self sendAttachment:attachment thread:thread]; +} + ++ (void)sendAttachment:(SignalAttachment *)attachment thread:(TSThread *)thread +{ if (!attachment || [attachment hasError]) { OWSFailDebug(@"attachment[%@]: %@", [attachment sourceFilename], [attachment errorName]); return; } - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + [ThreadUtil enqueueMessageWithText:nil + mediaAttachments:@[ attachment ] + inThread:thread + quotedReplyModel:nil + linkPreviewDraft:nil + transaction:transaction]; + }]; } + (void)sendUnencryptedDatabase:(TSThread *)thread @@ -274,11 +293,7 @@ NS_ASSUME_NONNULL_BEGIN DataSource *_Nullable dataSource = [DataSourcePath dataSourceWithFilePath:filePath shouldDeleteOnDeallocation:YES]; [dataSource setSourceFilename:fileName]; SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType]; - if (!attachment || [attachment hasError]) { - OWSFailDebug(@"attachment[%@]: %@", [attachment sourceFilename], [attachment errorName]); - return; - } - [ThreadUtil enqueueMessageWithAttachment:attachment inThread:thread quotedReplyModel:nil]; + [self sendAttachment:attachment thread:thread]; } #ifdef DEBUG diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index f29816b53..b14ddc605 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "SharingThreadPickerViewController.h" diff --git a/SignalMessaging/utils/ThreadUtil.h b/SignalMessaging/utils/ThreadUtil.h index 47e9e3763..aa1923d3b 100644 --- a/SignalMessaging/utils/ThreadUtil.h +++ b/SignalMessaging/utils/ThreadUtil.h @@ -44,20 +44,18 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Durable Message Enqueue -+ (TSOutgoingMessage *)enqueueMessageWithText:(NSString *)text ++ (TSOutgoingMessage *)enqueueMessageWithText:(NSString *)fullMessageText inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft transaction:(YapDatabaseReadTransaction *)transaction; -+ (TSOutgoingMessage *)enqueueMessageWithAttachment:(SignalAttachment *)attachment - inThread:(TSThread *)thread - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel; - -+ (TSOutgoingMessage *)enqueueMessageWithAttachments:(NSArray *)attachments - messageBody:(nullable NSString *)messageBody - inThread:(TSThread *)thread - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel; ++ (TSOutgoingMessage *)enqueueMessageWithText:(nullable NSString *)fullMessageText + mediaAttachments:(NSArray *)attachments + inThread:(TSThread *)thread + quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft + transaction:(YapDatabaseReadTransaction *)transaction; + (TSOutgoingMessage *)enqueueMessageWithContactShare:(OWSContact *)contactShare inThread:(TSThread *)thread; + (void)enqueueLeaveGroupMessageInThread:(TSGroupThread *)thread; diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 50040b5ae..c4ec5a10c 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -9,6 +9,7 @@ #import "OWSUnreadIndicator.h" #import "TSUnreadIndicatorInteraction.h" #import +#import #import #import #import @@ -65,58 +66,18 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Durable Message Enqueue -+ (TSOutgoingMessage *)enqueueMessageWithText:(NSString *)text ++ (TSOutgoingMessage *)enqueueMessageWithText:(NSString *)fullMessageText inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft transaction:(YapDatabaseReadTransaction *)transaction { - - NSString *truncatedText; - SignalAttachment *_Nullable oversizeTextAttachment; - - if ([text lengthOfBytesUsingEncoding:NSUTF8StringEncoding] >= kOversizeTextMessageSizeThreshold) { - truncatedText = [text truncatedToByteCount:kOversizeTextMessageSizeThreshold]; - DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:text]; - if (dataSource) { - oversizeTextAttachment = - [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; - } - } else { - truncatedText = text; - oversizeTextAttachment = nil; - } - - OWSDisappearingMessagesConfiguration *configuration = - [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:transaction]; - - uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); - - TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:thread - messageBody:text - attachmentId:nil - expiresInSeconds:expiresInSeconds - quotedMessage:[quotedReplyModel buildQuotedMessageForSending] - linkPreview:nil]; - - [BenchManager benchAsyncWithTitle:@"Saving outgoing message" block:^(void (^benchmarkCompletion)(void)) { - // To avoid blocking the send flow, we dispatch an async write from within this read transaction - [self.dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction * _Nonnull writeTransaction) { - [message saveWithTransaction:writeTransaction]; - - OWSLinkPreview *_Nullable linkPreview = - [self linkPreviewForLinkPreviewDraft:linkPreviewDraft transaction:writeTransaction]; - if (linkPreview) { - [message updateWithLinkPreview:linkPreview transaction:writeTransaction]; - } - - [self.messageSenderJobQueue addMessage:message transaction:writeTransaction]; - } - completionBlock:benchmarkCompletion]; - }]; - - return message; + return [self enqueueMessageWithText:fullMessageText + mediaAttachments:@[] + inThread:thread + quotedReplyModel:quotedReplyModel + linkPreviewDraft:linkPreviewDraft + transaction:transaction]; } + (nullable OWSLinkPreview *)linkPreviewForLinkPreviewDraft:(nullable OWSLinkPreviewDraft *)linkPreviewDraft @@ -137,40 +98,48 @@ NS_ASSUME_NONNULL_BEGIN return linkPreview; } -+ (TSOutgoingMessage *)enqueueMessageWithAttachment:(SignalAttachment *)attachment - inThread:(TSThread *)thread - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel -{ - return [self enqueueMessageWithAttachments:@[ - attachment, - ] - messageBody:attachment.captionText - inThread:thread - quotedReplyModel:quotedReplyModel]; -} - -+ (TSOutgoingMessage *)enqueueMessageWithAttachments:(NSArray *)attachments - messageBody:(nullable NSString *)messageBody - inThread:(TSThread *)thread - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel ++ (TSOutgoingMessage *)enqueueMessageWithText:(nullable NSString *)fullMessageText + mediaAttachments:(NSArray *)attachmentsParam + inThread:(TSThread *)thread + quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft + transaction:(YapDatabaseReadTransaction *)transaction { OWSAssertIsOnMainThread(); - OWSAssertDebug(attachments.count > 0); OWSAssertDebug(thread); + + NSString *truncatedText; + NSArray *attachments = attachmentsParam; + if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] < kOversizeTextMessageSizeThreshold) { + truncatedText = fullMessageText; + } else { + truncatedText = [fullMessageText ows_truncatedToByteCount:kOversizeTextMessageSizeThreshold]; + DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:fullMessageText]; + if (dataSource) { + SignalAttachment *oversizeTextAttachment = + [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; + attachments = [attachmentsParam arrayByAddingObject:oversizeTextAttachment]; + } else { + OWSFailDebug(@"dataSource was unexpectedly nil"); + } + } + + OWSDisappearingMessagesConfiguration *configuration = + [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId transaction:transaction]; + + uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); + for (SignalAttachment *attachment in attachments) { OWSAssertDebug(!attachment.hasError); OWSAssertDebug(attachment.mimeType.length > 0); } - OWSDisappearingMessagesConfiguration *configuration = - [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId]; - - uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); BOOL isVoiceMessage = (attachments.count == 1 && attachments.lastObject.isVoiceMessage); + TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:thread - messageBody:messageBody + messageBody:truncatedText attachmentIds:[NSMutableArray new] expiresInSeconds:expiresInSeconds expireStartedAt:0 @@ -180,12 +149,40 @@ NS_ASSUME_NONNULL_BEGIN contactShare:nil linkPreview:nil]; - NSMutableArray *attachmentInfos = [NSMutableArray new]; - for (SignalAttachment *attachment in attachments) { - OWSOutgoingAttachmentInfo *attachmentInfo = [attachment buildOutgoingAttachmentInfoWithMessage:message]; - [attachmentInfos addObject:attachmentInfo]; - } - [self.messageSenderJobQueue addMediaMessage:message attachmentInfos:attachmentInfos isTemporaryAttachment:NO]; + [BenchManager + benchAsyncWithTitle:@"Saving outgoing message" + block:^(void (^benchmarkCompletion)(void)) { + // To avoid blocking the send flow, we dispatch an async write from within this read + // transaction + [self.dbConnection + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull writeTransaction) { + [message saveWithTransaction:writeTransaction]; + + OWSLinkPreview *_Nullable linkPreview = + [self linkPreviewForLinkPreviewDraft:linkPreviewDraft + transaction:writeTransaction]; + if (linkPreview) { + [message updateWithLinkPreview:linkPreview transaction:writeTransaction]; + } + + if (attachments.count == 0) { + [self.messageSenderJobQueue addMessage:message transaction:writeTransaction]; + } else { + NSMutableArray *attachmentInfos = + [NSMutableArray new]; + for (SignalAttachment *attachment in attachments) { + OWSOutgoingAttachmentInfo *attachmentInfo = + [attachment buildOutgoingAttachmentInfoWithMessage:message]; + [attachmentInfos addObject:attachmentInfo]; + } + + [self.messageSenderJobQueue addMediaMessage:message + attachmentInfos:attachmentInfos + isTemporaryAttachment:NO]; + } + } + completionBlock:benchmarkCompletion]; + }]; return message; } diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.h b/SignalServiceKit/src/Messages/Interactions/TSMessage.h index 2050aa7c7..83155957f 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.h @@ -45,6 +45,9 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)hasAttachments; - (NSArray *)attachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction; +- (NSArray *)mediaAttachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction; +- (nullable TSAttachment *)oversizeTextAttachmentWithTransaction:(YapDatabaseReadTransaction *)transaction; + - (void)removeAttachment:(TSAttachment *)attachment transaction:(YapDatabaseReadWriteTransaction *)transaction NS_SWIFT_NAME(removeAttachment(_:transaction:)); diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index c51a4919e..0b44980da 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -219,6 +219,26 @@ static const NSUInteger OWSMessageSchemaVersion = 4; return [attachments copy]; } +- (NSArray *)attachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction + contentType:(NSString *)contentType +{ + NSArray *attachments = [self attachmentsWithTransaction:transaction]; + return [attachments filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(TSAttachment *evaluatedObject, + NSDictionary *_Nullable bindings) { + return [evaluatedObject.contentType isEqualToString:contentType]; + }]]; +} + +- (NSArray *)attachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction + exceptContentType:(NSString *)contentType +{ + NSArray *attachments = [self attachmentsWithTransaction:transaction]; + return [attachments filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(TSAttachment *evaluatedObject, + NSDictionary *_Nullable bindings) { + return ![evaluatedObject.contentType isEqualToString:contentType]; + }]]; +} + - (void)removeAttachment:(TSAttachment *)attachment transaction:(YapDatabaseReadWriteTransaction *)transaction; { OWSAssertDebug([self.attachmentIds containsObject:attachment.uniqueId]); @@ -257,15 +277,24 @@ static const NSUInteger OWSMessageSchemaVersion = 4; } } +- (nullable TSAttachment *)oversizeTextAttachmentWithTransaction:(YapDatabaseReadTransaction *)transaction +{ + return [self attachmentsWithTransaction:transaction contentType:OWSMimeTypeOversizeTextMessage].firstObject; +} + +- (NSArray *)mediaAttachmentsWithTransaction:(YapDatabaseReadTransaction *)transaction +{ + return [self attachmentsWithTransaction:transaction exceptContentType:OWSMimeTypeOversizeTextMessage]; +} + - (nullable NSString *)oversizeTextWithTransaction:(YapDatabaseReadTransaction *)transaction { - if (self.attachmentIds.count != 1) { + TSAttachment *_Nullable attachment = [self oversizeTextAttachmentWithTransaction:transaction]; + if (!attachment) { return nil; } - TSAttachment *_Nullable attachment = [self attachmentsWithTransaction:transaction].firstObject; - if (![OWSMimeTypeOversizeTextMessage isEqualToString:attachment.contentType] - || ![attachment isKindOfClass:TSAttachmentStream.class]) { + if (![attachment isKindOfClass:TSAttachmentStream.class]) { return nil; } From b7989e9384f07e7ef87a8439e2973bcf576ae50f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Feb 2019 17:07:24 -0700 Subject: [PATCH 128/493] feature flag approval sending --- .../AttachmentApprovalViewController.swift | 64 ++++++++++--------- SignalMessaging/utils/ThreadUtil.m | 10 ++- SignalServiceKit/src/Util/FeatureFlags.swift | 22 +++++++ 3 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 SignalServiceKit/src/Util/FeatureFlags.swift diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index a0416c31b..61b3c3918 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1861,47 +1861,49 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { - let existingText: String = textView.text ?? "" - let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) + if !FeatureFlags.sendingMediaWithOversizeText { + let existingText: String = textView.text ?? "" + let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) - // Don't complicate things by mixing media attachments with oversize text attachments - guard proposedText.utf8.count <= kOversizeTextMessageSizeThreshold else { - Logger.debug("long text was truncated") - self.lengthLimitLabel.isHidden = false + // Don't complicate things by mixing media attachments with oversize text attachments + guard proposedText.utf8.count <= kOversizeTextMessageSizeThreshold else { + Logger.debug("long text was truncated") + self.lengthLimitLabel.isHidden = false - // `range` represents the section of the existing text we will replace. We can re-use that space. - // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be - // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is - // to just measure the utf8 encoded bytes of the replaced substring. - let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count + // `range` represents the section of the existing text we will replace. We can re-use that space. + // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be + // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is + // to just measure the utf8 encoded bytes of the replaced substring. + let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count - // Accept as much of the input as we can - let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete - if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + // Accept as much of the input as we can + let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete + if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false } + self.lengthLimitLabel.isHidden = true - return false - } - self.lengthLimitLabel.isHidden = true + // After verifying the byte-length is sufficiently small, verify the character count is within bounds. + guard proposedText.count <= kMaxMessageBodyCharacterCount else { + Logger.debug("hit attachment message body character count limit") - // After verifying the byte-length is sufficiently small, verify the character count is within bounds. - guard proposedText.count <= kMaxMessageBodyCharacterCount else { - Logger.debug("hit attachment message body character count limit") + self.lengthLimitLabel.isHidden = false - self.lengthLimitLabel.isHidden = false + // `range` represents the section of the existing text we will replace. We can re-use that space. + let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count - // `range` represents the section of the existing text we will replace. We can re-use that space. - let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count + // Accept as much of the input as we can + let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete + if charBudget >= 0 { + let acceptableNewText = String(text.prefix(charBudget)) + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } - // Accept as much of the input as we can - let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete - if charBudget >= 0 { - let acceptableNewText = String(text.prefix(charBudget)) - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + return false } - - return false } // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index c4ec5a10c..99a0b714f 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -113,7 +113,15 @@ NS_ASSUME_NONNULL_BEGIN if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] < kOversizeTextMessageSizeThreshold) { truncatedText = fullMessageText; } else { - truncatedText = [fullMessageText ows_truncatedToByteCount:kOversizeTextMessageSizeThreshold]; + if (SSKFeatureFlags.sendingMediaWithOversizeText) { + truncatedText = [fullMessageText ows_truncatedToByteCount:kOversizeTextMessageSizeThreshold]; + } else { + // Legacy iOS clients already support receiving long text, but they assume _any_ body + // text is the _full_ body text. So until we consider "rollout" complete, we maintain + // the legacy sending behavior, which does not include the truncated text in the + // websocket proto. + truncatedText = nil; + } DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithOversizeText:fullMessageText]; if (dataSource) { SignalAttachment *oversizeTextAttachment = diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift new file mode 100644 index 000000000..539085932 --- /dev/null +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -0,0 +1,22 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +/// By centralizing feature flags here and documenting their rollout plan, it's easier to review +/// which feature flags are in play. +@objc(SSKFeatureFlags) +public class FeatureFlags: NSObject { + + /// iOS has long supported sending oversized text as a sidecar attachment. The other clients + /// simply displayed it as a text attachment. As part of the new cross-client long-text feature, + /// we want to be able to display long text with attachments as well. Existing iOS clients + /// won't properly display this, so we'll need to wait a while for rollout. + /// The stakes aren't __too__ high, because legacy clients won't lose data - they just won't + /// see the media attached to a long text message until they update their client. + @objc + public static var sendingMediaWithOversizeText: Bool { + return false + } +} From 7e5256856c230547b866c6275caca97bb8dc72ee Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Feb 2019 17:37:03 -0700 Subject: [PATCH 129/493] render media+longText message --- .../Cells/OWSMessageBubbleView.m | 29 +-------------- .../ConversationView/ConversationViewItem.h | 1 - .../ConversationView/ConversationViewItem.m | 37 ++++++------------- .../AttachmentApprovalViewController.swift | 4 +- SignalMessaging/utils/ThreadUtil.m | 2 +- .../src/Messages/Attachments/TSAttachment.h | 3 +- .../src/Messages/Attachments/TSAttachment.m | 7 +++- .../src/Messages/Interactions/TSMessage.h | 2 - .../src/Messages/Interactions/TSMessage.m | 14 ------- 9 files changed, 23 insertions(+), 76 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 11d84f1bd..ad71ee1ab 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -217,28 +217,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage; } -#pragma mark - - -- (BOOL)hasBodyTextContent -{ - switch (self.cellType) { - case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: - return YES; - case OWSMessageCellType_GenericAttachment: - case OWSMessageCellType_DownloadingAttachment: - case OWSMessageCellType_Audio: - // Is there a caption? - return self.hasBodyText; - case OWSMessageCellType_ContactShare: - return NO; - case OWSMessageCellType_MediaAlbum: - // Is there an album title? - return self.hasBodyText; - } -} - #pragma mark - Load - (void)configureViews @@ -296,7 +274,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: break; case OWSMessageCellType_Audio: OWSAssertDebug(self.viewItem.attachmentStream); @@ -593,7 +570,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_DownloadingAttachment: @@ -608,7 +584,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: return NO; case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: @@ -1000,8 +975,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes CGSize result = CGSizeZero; switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: { + case OWSMessageCellType_TextMessage: { return nil; } case OWSMessageCellType_Audio: @@ -1397,7 +1371,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: break; case OWSMessageCellType_Audio: OWSAssertDebug(self.viewItem.attachmentStream); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h index 4a980afb9..4a04b5133 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h @@ -10,7 +10,6 @@ NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSInteger, OWSMessageCellType) { OWSMessageCellType_Unknown, OWSMessageCellType_TextMessage, - OWSMessageCellType_OversizeTextMessage, OWSMessageCellType_Audio, OWSMessageCellType_GenericAttachment, OWSMessageCellType_DownloadingAttachment, diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 49844d050..b1d5a3f04 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -22,8 +22,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (cellType) { case OWSMessageCellType_TextMessage: return @"OWSMessageCellType_TextMessage"; - case OWSMessageCellType_OversizeTextMessage: - return @"OWSMessageCellType_OversizeTextMessage"; case OWSMessageCellType_Audio: return @"OWSMessageCellType_Audio"; case OWSMessageCellType_GenericAttachment: @@ -592,27 +590,21 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } } - NSString *_Nullable bodyText = [message bodyTextWithTransaction:transaction]; - if (bodyText) { - self.displayableBodyText = [self displayableBodyTextForText:bodyText interactionId:message.uniqueId]; - } - - // Even though displayableBodyText could have already been assigned from the oversized text - // attachment, it's also possible that for new messages we'd first cached the truncated body - // text. So if an AttachmentStream now exists we explicitly use the text from the attachment. TSAttachment *_Nullable oversizeTextAttachment = [message oversizeTextAttachmentWithTransaction:transaction]; if (oversizeTextAttachment != nil && [oversizeTextAttachment isKindOfClass:[TSAttachmentStream class]]) { TSAttachmentStream *oversizeTextAttachmentStream = (TSAttachmentStream *)oversizeTextAttachment; - self.messageCellType = OWSMessageCellType_OversizeTextMessage; self.displayableBodyText = [self displayableBodyTextForOversizeTextAttachment:oversizeTextAttachmentStream interactionId:message.uniqueId]; + } else { + NSString *_Nullable bodyText = [message bodyTextWithTransaction:transaction]; + if (bodyText) { + self.displayableBodyText = [self displayableBodyTextForText:bodyText interactionId:message.uniqueId]; + } } NSArray *mediaAttachments = [message mediaAttachmentsWithTransaction:transaction]; - if ([message isMediaAlbumWithTransaction:transaction]) { - OWSAssertDebug(mediaAttachments.count > 0); - NSArray *mediaAlbumItems = [self mediaAlbumItemsForAttachments:mediaAttachments]; - + NSArray *mediaAlbumItems = [self mediaAlbumItemsForAttachments:mediaAttachments]; + if (mediaAlbumItems.count > 0) { if (mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = mediaAlbumItems.firstObject; if (mediaAlbumItem.attachmentStream && !mediaAlbumItem.attachmentStream.isValidVisualMedia) { @@ -629,6 +621,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) // Only media galleries should have more than one attachment. OWSAssertDebug(mediaAttachments.count <= 1); + TSAttachment *_Nullable mediaAttachment = mediaAttachments.firstObject; if (mediaAttachment) { if ([mediaAttachment isKindOfClass:[TSAttachmentStream class]]) { @@ -653,10 +646,10 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } if (self.hasBodyText) { - // If we haven't already assigned an attachment type at this point, message.body isn't a caption, - // it's a stand-alone text message. if (self.messageCellType == OWSMessageCellType_Unknown) { - OWSAssertDebug(message.attachmentIds.count == 0); + OWSAssertDebug(message.attachmentIds.count == 0 + || (message.attachmentIds.count == 1 && + [message oversizeTextAttachmentWithTransaction:transaction] != nil)); self.messageCellType = OWSMessageCellType_TextMessage; } OWSAssertDebug(self.displayableBodyText); @@ -696,7 +689,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (NSArray *)mediaAlbumItemsForAttachments:(NSArray *)attachments { OWSAssertIsOnMainThread(); - OWSAssertDebug(attachments.count > 0); NSMutableArray *mediaAlbumItems = [NSMutableArray new]; for (TSAttachment *attachment in attachments) { @@ -852,7 +844,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_Audio: case OWSMessageCellType_MediaAlbum: case OWSMessageCellType_GenericAttachment: { @@ -881,7 +872,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: { OWSFailDebug(@"No media to copy"); break; @@ -932,7 +922,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: OWSFailDebug(@"No media to share."); break; @@ -968,7 +957,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: @@ -992,7 +980,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: @@ -1028,7 +1015,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: OWSFailDebug(@"Cannot save text data."); break; @@ -1111,7 +1097,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextMessage: - case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 61b3c3918..cb179cc56 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1866,7 +1866,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) // Don't complicate things by mixing media attachments with oversize text attachments - guard proposedText.utf8.count <= kOversizeTextMessageSizeThreshold else { + guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { Logger.debug("long text was truncated") self.lengthLimitLabel.isHidden = false @@ -1887,7 +1887,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { self.lengthLimitLabel.isHidden = true // After verifying the byte-length is sufficiently small, verify the character count is within bounds. - guard proposedText.count <= kMaxMessageBodyCharacterCount else { + guard proposedText.count < kMaxMessageBodyCharacterCount else { Logger.debug("hit attachment message body character count limit") self.lengthLimitLabel.isHidden = false diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 99a0b714f..de3fd3e95 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -110,7 +110,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *truncatedText; NSArray *attachments = attachmentsParam; - if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] < kOversizeTextMessageSizeThreshold) { + if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] <= kOversizeTextMessageSizeThreshold) { truncatedText = fullMessageText; } else { if (SSKFeatureFlags.sendingMediaWithOversizeText) { diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h index 01bb3c40f..fea89979b 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSYapDatabaseObject.h" @@ -93,6 +93,7 @@ typedef NS_ENUM(NSUInteger, TSAttachmentType) { @property (nonatomic, readonly) BOOL isAudio; @property (nonatomic, readonly) BOOL isVoiceMessage; @property (nonatomic, readonly) BOOL isVisualMedia; +@property (nonatomic, readonly) BOOL isOversizeText; + (NSString *)emojiForMimeType:(NSString *)contentType; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m index 29842075f..692f1ac52 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSAttachment.h" @@ -273,6 +273,11 @@ NSUInteger const TSAttachmentSchemaVersion = 4; return [MIMETypeUtil isVisualMedia:self.contentType]; } +- (BOOL)isOversizeText +{ + return [self.contentType isEqualToString:OWSMimeTypeOversizeTextMessage]; +} + - (nullable NSString *)sourceFilename { return _sourceFilename.filterFilename; diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.h b/SignalServiceKit/src/Messages/Interactions/TSMessage.h index 83155957f..9f836b04c 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.h +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.h @@ -55,8 +55,6 @@ NS_ASSUME_NONNULL_BEGIN // quoted reply thumbnails, contact share avatars, link preview images, etc. - (NSArray *)allAttachmentIds; -- (BOOL)isMediaAlbumWithTransaction:(YapDatabaseReadTransaction *)transaction; - - (void)setQuotedMessageThumbnailAttachmentStream:(TSAttachmentStream *)attachmentStream; - (nullable NSString *)oversizeTextWithTransaction:(YapDatabaseReadTransaction *)transaction; diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index 0b44980da..8ccd7d19d 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -249,20 +249,6 @@ static const NSUInteger OWSMessageSchemaVersion = 4; [self saveWithTransaction:transaction]; } -- (BOOL)isMediaAlbumWithTransaction:(YapDatabaseReadTransaction *)transaction -{ - NSArray *attachments = [self attachmentsWithTransaction:transaction]; - if (attachments.count < 1) { - return NO; - } - for (TSAttachment *attachment in attachments) { - if (!attachment.isVisualMedia) { - return NO; - } - } - return YES; -} - - (NSString *)debugDescription { if ([self hasAttachments] && self.body.length > 0) { From c6a3772a5e799fff5695cef6217a24c5c2dc45b2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 09:20:06 -0700 Subject: [PATCH 130/493] clearer constant names --- .../ColorPickerViewController.swift | 2 +- .../Cells/OWSMessageBubbleView.m | 22 +++++----- .../ConversationView/ConversationViewItem.h | 4 +- .../ConversationView/ConversationViewItem.m | 44 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Signal/src/ViewControllers/ColorPickerViewController.swift b/Signal/src/ViewControllers/ColorPickerViewController.swift index c72f2a14c..7c89d5b5f 100644 --- a/Signal/src/ViewControllers/ColorPickerViewController.swift +++ b/Signal/src/ViewControllers/ColorPickerViewController.swift @@ -325,7 +325,7 @@ private class MockConversationViewItem: NSObject, ConversationViewItem { var lastAudioMessageView: OWSAudioMessageView? var audioDurationSeconds: CGFloat = 0 var audioProgressSeconds: CGFloat = 0 - var messageCellType: OWSMessageCellType = .textMessage + var messageCellType: OWSMessageCellType = .textOnlyMessage var displayableBodyText: DisplayableText? var attachmentStream: TSAttachmentStream? var attachmentPointer: TSAttachmentPointer? diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index ad71ee1ab..72ce21c1b 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -273,7 +273,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes UIView *_Nullable bodyMediaView = nil; switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: break; case OWSMessageCellType_Audio: OWSAssertDebug(self.viewItem.attachmentStream); @@ -288,7 +288,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_ContactShare: bodyMediaView = [self loadViewForContactShare]; break; - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: bodyMediaView = [self loadViewForMediaAlbum]; break; } @@ -569,13 +569,13 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes { switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_DownloadingAttachment: case OWSMessageCellType_ContactShare: return NO; - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: return YES; } } @@ -583,13 +583,13 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (BOOL)hasBodyMediaView { switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: return NO; case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_DownloadingAttachment: case OWSMessageCellType_ContactShare: - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: return YES; } } @@ -597,7 +597,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (BOOL)hasFullWidthMediaView { return (self.hasBodyMediaWithThumbnail || self.cellType == OWSMessageCellType_ContactShare - || self.cellType == OWSMessageCellType_MediaAlbum); + || self.cellType == OWSMessageCellType_MediaMessage); } - (BOOL)canFooterOverlayMedia @@ -975,7 +975,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes CGSize result = CGSizeZero; switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: { + case OWSMessageCellType_TextOnlyMessage: { return nil; } case OWSMessageCellType_Audio: @@ -997,7 +997,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes result = CGSizeMake(maxMessageWidth, [OWSContactShareView bubbleHeight]); break; - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: result = [OWSMediaAlbumCellView layoutSizeForMaxMessageWidth:maxMessageWidth items:self.viewItem.mediaAlbumItems]; @@ -1370,7 +1370,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: break; case OWSMessageCellType_Audio: OWSAssertDebug(self.viewItem.attachmentStream); @@ -1394,7 +1394,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_ContactShare: [self.delegate didTapContactShareViewItem:self.viewItem]; break; - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { OWSAssertDebug(self.bodyMediaView); OWSAssertDebug(self.viewItem.mediaAlbumItems.count > 0); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h index 4a04b5133..3ec982aeb 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSInteger, OWSMessageCellType) { OWSMessageCellType_Unknown, - OWSMessageCellType_TextMessage, + OWSMessageCellType_TextOnlyMessage, OWSMessageCellType_Audio, OWSMessageCellType_GenericAttachment, OWSMessageCellType_DownloadingAttachment, OWSMessageCellType_ContactShare, - OWSMessageCellType_MediaAlbum, + OWSMessageCellType_MediaMessage, }; NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index b1d5a3f04..33424a478 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -20,8 +20,8 @@ NS_ASSUME_NONNULL_BEGIN NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (cellType) { - case OWSMessageCellType_TextMessage: - return @"OWSMessageCellType_TextMessage"; + case OWSMessageCellType_TextOnlyMessage: + return @"OWSMessageCellType_TextOnlyMessage"; case OWSMessageCellType_Audio: return @"OWSMessageCellType_Audio"; case OWSMessageCellType_GenericAttachment: @@ -32,8 +32,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) return @"OWSMessageCellType_Unknown"; case OWSMessageCellType_ContactShare: return @"OWSMessageCellType_ContactShare"; - case OWSMessageCellType_MediaAlbum: - return @"OWSMessageCellType_MediaAlbum"; + case OWSMessageCellType_MediaMessage: + return @"OWSMessageCellType_MediaMessage"; } } @@ -615,7 +615,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } self.mediaAlbumItems = mediaAlbumItems; - self.messageCellType = OWSMessageCellType_MediaAlbum; + self.messageCellType = OWSMessageCellType_MediaMessage; return; } @@ -650,7 +650,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSAssertDebug(message.attachmentIds.count == 0 || (message.attachmentIds.count == 1 && [message oversizeTextAttachmentWithTransaction:transaction] != nil)); - self.messageCellType = OWSMessageCellType_TextMessage; + self.messageCellType = OWSMessageCellType_TextOnlyMessage; } OWSAssertDebug(self.displayableBodyText); } @@ -681,7 +681,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) // Messages of unknown type (including messages with missing attachments) // are rendered like empty text messages, but without any interactivity. OWSLogWarn(@"Treating unknown message as empty text message: %@ %llu", message.class, message.timestamp); - self.messageCellType = OWSMessageCellType_TextMessage; + self.messageCellType = OWSMessageCellType_TextOnlyMessage; self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO]; } } @@ -843,9 +843,9 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (void)copyTextAction { switch (self.messageCellType) { - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_Audio: - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: case OWSMessageCellType_GenericAttachment: { OWSAssertDebug(self.displayableBodyText); [UIPasteboard.generalPasteboard setString:self.displayableBodyText.fullText]; @@ -871,7 +871,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: { OWSFailDebug(@"No media to copy"); break; @@ -885,7 +885,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); break; } - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { if (self.mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = self.mediaAlbumItems.firstObject; if (mediaAlbumItem.attachmentStream && mediaAlbumItem.attachmentStream.isValidVisualMedia) { @@ -921,7 +921,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: OWSFailDebug(@"No media to share."); break; @@ -933,7 +933,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSFailDebug(@"Can't share not-yet-downloaded attachment"); break; } - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { // TODO: We need a "canShareMediaAction" method. OWSAssertDebug(self.mediaAlbumItems); NSMutableArray *attachmentStreams = [NSMutableArray new]; @@ -956,14 +956,14 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: return NO; case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_DownloadingAttachment: - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { if (self.mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = self.mediaAlbumItems.firstObject; if (mediaAlbumItem.attachmentStream && mediaAlbumItem.attachmentStream.isValidVisualMedia) { @@ -979,7 +979,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: @@ -987,7 +987,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_DownloadingAttachment: return NO; - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { for (ConversationMediaAlbumItem *mediaAlbumItem in self.mediaAlbumItems) { if (!mediaAlbumItem.attachmentStream) { continue; @@ -1014,7 +1014,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: OWSFailDebug(@"Cannot save text data."); break; @@ -1028,7 +1028,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSFailDebug(@"Can't save not-yet-downloaded attachment"); break; } - case OWSMessageCellType_MediaAlbum: { + case OWSMessageCellType_MediaMessage: { [self saveMediaAlbumItems]; break; } @@ -1096,7 +1096,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) { switch (self.messageCellType) { case OWSMessageCellType_Unknown: - case OWSMessageCellType_TextMessage: + case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_ContactShare: return NO; case OWSMessageCellType_Audio: @@ -1105,14 +1105,14 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_DownloadingAttachment: { return NO; } - case OWSMessageCellType_MediaAlbum: + case OWSMessageCellType_MediaMessage: return self.firstValidAlbumAttachment != nil; } } - (BOOL)mediaAlbumHasFailedAttachment { - OWSAssertDebug(self.messageCellType == OWSMessageCellType_MediaAlbum); + OWSAssertDebug(self.messageCellType == OWSMessageCellType_MediaMessage); OWSAssertDebug(self.mediaAlbumItems.count > 0); for (ConversationMediaAlbumItem *mediaAlbumItem in self.mediaAlbumItems) { From f1623b6037e499666d0bdcc35daaf4706d45ad17 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 09:43:05 -0700 Subject: [PATCH 131/493] missing nullability text --- SignalMessaging/utils/ThreadUtil.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index de3fd3e95..099e56448 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -108,7 +108,7 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertIsOnMainThread(); OWSAssertDebug(thread); - NSString *truncatedText; + NSString *_Nullable truncatedText; NSArray *attachments = attachmentsParam; if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] <= kOversizeTextMessageSizeThreshold) { truncatedText = fullMessageText; From cc94d6946a5e34be0e594a0615b7e36b601840e4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 13:39:55 -0700 Subject: [PATCH 132/493] update pods --- Podfile | 4 ++-- Podfile.lock | 13 ++++++++----- Pods | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Podfile b/Podfile index d87aeac1f..2495e35ea 100644 --- a/Podfile +++ b/Podfile @@ -9,8 +9,8 @@ def shared_pods # OWS Pods ### - # pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] - pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] + pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"] + # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"] pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"] # pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"] diff --git a/Podfile.lock b/Podfile.lock index f8d35f79b..efec89b65 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -200,8 +200,8 @@ DEPENDENCIES: - PromiseKit (= 6.5.3) - PureLayout - Reachability - - SignalCoreKit (from `../SignalCoreKit`) - - SignalCoreKit/Tests (from `../SignalCoreKit`) + - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`) + - SignalCoreKit/Tests (from `https://github.com/signalapp/SignalCoreKit.git`) - SignalMetadataKit (from `https://github.com/signalapp/SignalMetadataKit`) - SignalMetadataKit/Tests (from `https://github.com/signalapp/SignalMetadataKit`) - SignalServiceKit (from `.`) @@ -240,7 +240,7 @@ EXTERNAL SOURCES: :branch: signal-master :git: https://github.com/signalapp/Mantle SignalCoreKit: - :path: "../SignalCoreKit" + :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :git: https://github.com/signalapp/SignalMetadataKit SignalServiceKit: @@ -268,6 +268,9 @@ CHECKOUT OPTIONS: Mantle: :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :git: https://github.com/signalapp/Mantle + SignalCoreKit: + :commit: 061f41321675ffe5af5e547d578bbd2266a46d33 + :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 :git: https://github.com/signalapp/SignalMetadataKit @@ -291,7 +294,7 @@ SPEC CHECKSUMS: PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SignalCoreKit: 2d5db80cda950a892383a4002146ec0d81460ce1 + SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 SignalServiceKit: c637b66e485538dda76836a1ec560dc556035430 SQLCipher: 4636a257060f6f1b4e143a143028b61a2b462d0d @@ -301,6 +304,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: 15fd183a8e1c41a9df76d3cdb28f415e2d6c4ab5 +PODFILE CHECKSUM: b0748e1cca7826f2ed132c495589e6aea9b7d743 COCOAPODS: 1.5.3 diff --git a/Pods b/Pods index 434610837..4e153f47e 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 434610837e73668d186716fd2e5b8913c84ef46a +Subproject commit 4e153f47ef16d84b3256dd5d3884c708fdf0ab33 From 7b174e9b0264553afe2ead96faa464baeb212ee7 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Feb 2019 10:07:08 -0700 Subject: [PATCH 133/493] correct constants. This test appears to be testing real-world iPhone dimensions, but the expected results were all based on the previous test which tests convenient "round" numbers. --- .../views/ImageEditor/ImageEditorModelTest.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift index 1d7f62f72..161aa4efc 100644 --- a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift @@ -40,12 +40,12 @@ class ImageEditorModelTest: SignalBaseTest { let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSizePixels, transform: transform) let affineTransform = transform.affineTransform(viewSize: viewSize) - XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).x, accuracy: 0.1) - XCTAssertEqual(0.0, imageFrame.topLeft.applying(affineTransform).y, accuracy: 0.1) - XCTAssertEqual(100.0, imageFrame.center.applying(affineTransform).x, accuracy: 0.1) - XCTAssertEqual(150.0, imageFrame.center.applying(affineTransform).y, accuracy: 0.1) - XCTAssertEqual(200.0, imageFrame.bottomRight.applying(affineTransform).x, accuracy: 0.1) - XCTAssertEqual(300.0, imageFrame.bottomRight.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(+167.5, imageFrame.topLeft.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(-298.0, imageFrame.topLeft.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(+502.5, imageFrame.center.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(+297.5, imageFrame.center.applying(affineTransform).y, accuracy: 0.1) + XCTAssertEqual(+837.5, imageFrame.bottomRight.applying(affineTransform).x, accuracy: 0.1) + XCTAssertEqual(+893.0, imageFrame.bottomRight.applying(affineTransform).y, accuracy: 0.1) } func testAffineTransformComposition() { From a7e8f9713c31b1c6f16ae7fe6aa29c38a4c0d7e6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Feb 2019 10:07:57 -0700 Subject: [PATCH 134/493] Try to account for variability in network backed tests --- .../tests/Messages/OWSLinkPreviewTest.swift | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index 41ec45fe2..79d93e0d0 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -6,6 +6,11 @@ import Foundation @testable import SignalServiceKit import XCTest +func XCTAssertMatch(expectedPattern: String, actualText: String, file: StaticString = #file, line: UInt = #line) { + let regex = try! NSRegularExpression(pattern: expectedPattern, options: []) + XCTAssert(regex.hasMatch(input: actualText), "\(actualText) did not match pattern \(expectedPattern)", file: file, line: line) +} + class OWSLinkPreviewTest: SSKBaseTestSwift { override func setUp() { @@ -382,7 +387,13 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { XCTAssertNotNil(content) XCTAssertEqual(content.title, "Walter \"MFPallytime\" on Instagram: “Lol gg”") - XCTAssertEqual(content.imageUrl, "https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com") + // Actual URL can change based on network response + // https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com + // It seems like some parts of the URL are stable, so we can pattern match, but if this continues to be brittle we may choose + // to remove it or stub the network response + XCTAssertMatch(expectedPattern: "^https://.*.cdninstagram.com/.*/47690175_2275988962411653_1145978227188801192_n.jpg\\?.*$", + actualText: content.imageUrl!) +// XCTAssertEqual(content.imageUrl, "https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com") expectation.fulfill() }.catch { (error) in @@ -403,7 +414,12 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { XCTAssertNotNil(content) XCTAssertEqual(content.title, "Walter \"MFPallytime\" on Instagram: “Lol gg”") - XCTAssertEqual(content.imageUrl, "https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com") + // Actual URL can change based on network response + // https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com + // It seems like some parts of the URL are stable, so we can pattern match, but if this continues to be brittle we may choose + // to remove it or stub the network response + XCTAssertMatch(expectedPattern: "^https://.*.cdninstagram.com/.*/47690175_2275988962411653_1145978227188801192_n.jpg\\?.*$", + actualText: content.imageUrl!) expectation.fulfill() }.catch { (error) in From 233bc3858b45347d72283b2fe362ea9ff4bd117c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 21 Feb 2019 14:16:29 -0700 Subject: [PATCH 135/493] dismiss menu actions when selected item is deleted --- .../ConversationView/ConversationViewController.m | 7 +++++++ .../ConversationView/ConversationViewModel.h | 3 +++ .../ConversationView/ConversationViewModel.m | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 5104aa509..788a68e65 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2044,6 +2044,7 @@ typedef enum : NSUInteger { menuActionsViewController.delegate = self; + self.conversationViewModel.mostRecentMenuActionsViewItem = cell.viewItem; [[OWSWindowManager sharedManager] showMenuActionsWindow:menuActionsViewController]; [self updateShouldObserveVMUpdates]; @@ -4820,6 +4821,12 @@ typedef enum : NSUInteger { [self scrollToBottomAnimated:NO]; } +- (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem +{ + OWSAssertIsOnMainThread(); + [[OWSWindowManager sharedManager] hideMenuActionsWindow]; +} + #pragma mark - Orientation - (void)viewWillTransitionToSize:(CGSize)size diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index c4d781b3a..a855c6f4c 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -74,6 +74,8 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { // to prod the view to reset its scroll state, etc. - (void)conversationViewModelDidReset; +- (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem; + - (BOOL)isObservingVMUpdates; - (ConversationStyle *)conversationStyle; @@ -87,6 +89,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { @property (nonatomic, readonly) NSArray> *viewItems; @property (nonatomic, nullable) NSString *focusMessageIdOnOpen; @property (nonatomic, readonly, nullable) ThreadDynamicInteractions *dynamicInteractions; +@property (nonatomic, nullable) id mostRecentMenuActionsViewItem; - (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithThread:(TSThread *)thread diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index a5e589734..602a4fc0d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -583,6 +583,12 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } + NSString *_Nullable mostRecentMenuActionsInterationId = self.mostRecentMenuActionsViewItem.interaction.uniqueId; + if (mostRecentMenuActionsInterationId != nil && + [diff.removedItemIds containsObject:mostRecentMenuActionsInterationId]) { + [self.delegate conversationViewModelDidDeleteMostRecentMenuActionsViewItem]; + } + NSMutableSet *diffAddedItemIds = [diff.addedItemIds mutableCopy]; NSMutableSet *diffRemovedItemIds = [diff.removedItemIds mutableCopy]; NSMutableSet *diffUpdatedItemIds = [diff.updatedItemIds mutableCopy]; From c15084c6f40ac2960b625f7a0d1031efbe32997f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 15:11:56 -0700 Subject: [PATCH 136/493] "Bump build to 2.36.1.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4e0aaaa44..d1138dfe8 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.36.0 + 2.36.1 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.36.0.7 + 2.36.1.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index a4b9ea1c7..0adf7f59a 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.36.0 + 2.36.1 CFBundleVersion - 2.36.0.7 + 2.36.1.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 72082edad8dad33083ecd555f7e70fa80a200226 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 12:58:15 -0500 Subject: [PATCH 137/493] Fix a visual bug that would sometimes occur while rendering settings switches. Thanks to Gunnar C. Pope for the bug report. --- .../AdvancedSettingsTableViewController.m | 31 +++++---- .../AppSettings/BlockListViewController.m | 38 ++++++----- .../NotificationSettingsViewController.m | 6 +- .../OWSBackupSettingsViewController.m | 8 ++- .../PrivacySettingsTableViewController.m | 68 +++++++++++++------ .../OWSConversationSettingsViewController.m | 5 ++ .../ViewControllers/OWSTableViewController.h | 12 ++-- .../ViewControllers/OWSTableViewController.m | 21 ++++-- 8 files changed, 124 insertions(+), 65 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index 294ba1beb..fb4c72b6a 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -89,7 +89,9 @@ NS_ASSUME_NONNULL_BEGIN OWSTableSection *loggingSection = [OWSTableSection new]; loggingSection.headerTitle = NSLocalizedString(@"LOGGING_SECTION", nil); [loggingSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_DEBUGLOG", @"") - isOn:[OWSPreferences isLoggingEnabled] + isOnBlock:^{ + return [OWSPreferences isLoggingEnabled]; + } target:weakSelf selector:@selector(didToggleEnableLogSwitch:)]]; @@ -160,21 +162,26 @@ NS_ASSUME_NONNULL_BEGIN // * ...The internet is not reachable, since we don't want to let users to activate // censorship circumvention unnecessarily, e.g. if they just don't have a valid // internet connection. - BOOL isManualCensorshipCircumventionOnEnabled - = (OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated + OWSTableSwitchBlock isCensorshipCircumventionOnBlock = ^{ + if (OWSSignalService.sharedInstance.hasCensoredPhoneNumber) { + return YES; + } else { + return OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated; + } + }; + Reachability *reachability = self.reachability; + OWSTableSwitchBlock isManualCensorshipCircumventionOnEnabledBlock = ^{ + BOOL isAnySocketOpen = TSSocketManager.shared.highestSocketState == OWSWebSocketStateOpen; + BOOL value = (OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated || (!OWSSignalService.sharedInstance.hasCensoredPhoneNumber && !isAnySocketOpen - && weakSelf.reachability.isReachable)); - BOOL isCensorshipCircumventionOn = NO; - if (OWSSignalService.sharedInstance.hasCensoredPhoneNumber) { - isCensorshipCircumventionOn = YES; - } else { - isCensorshipCircumventionOn = OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated; - } + && reachability.isReachable)); + return value; + }; [censorshipSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION", @"Label for the 'manual censorship circumvention' switch.") - isOn:isCensorshipCircumventionOn - isEnabled:isManualCensorshipCircumventionOnEnabled + isOnBlock:isCensorshipCircumventionOnBlock + isEnabledBlock:isManualCensorshipCircumventionOnEnabledBlock target:weakSelf selector:@selector(didToggleEnableCensorshipCircumventionSwitch:)]]; diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index 5d6d7a82a..e2c62a0e0 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "BlockListViewController.h" @@ -91,21 +91,23 @@ NS_ASSUME_NONNULL_BEGIN @"BLOCK_LIST_BLOCKED_USERS_SECTION", @"Section header for users that have been blocked"); for (NSString *phoneNumber in blockedPhoneNumbers) { - [blockedContactsSection - addItem:[OWSTableItem - itemWithCustomCellBlock:^{ - ContactTableViewCell *cell = [ContactTableViewCell new]; - [cell configureWithRecipientId:phoneNumber]; - return cell; - } - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - [BlockListUIUtils showUnblockPhoneNumberActionSheet:phoneNumber - fromViewController:weakSelf - blockingManager:helper.blockingManager - contactsManager:helper.contactsManager - completionBlock:nil]; - }]]; + [blockedContactsSection addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + ContactTableViewCell *cell = [ContactTableViewCell new]; + [cell configureWithRecipientId:phoneNumber]; + return cell; + } + customRowHeight:UITableViewAutomaticDimension + actionBlock:^{ + [BlockListUIUtils + showUnblockPhoneNumberActionSheet:phoneNumber + fromViewController:weakSelf + blockingManager:helper.blockingManager + contactsManager:helper.contactsManager + completionBlock:^(BOOL isBlocked) { + [weakSelf updateTableContents]; + }]; + }]]; } [contents addSection:blockedContactsSection]; } @@ -142,7 +144,9 @@ NS_ASSUME_NONNULL_BEGIN displayName:groupName fromViewController:weakSelf blockingManager:helper.blockingManager - completionBlock:nil]; + completionBlock:^(BOOL isBlocked) { + [weakSelf updateTableContents]; + }]; }]]; } [contents addSection:blockedGroupsSection]; diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m index 94a9ca09e..7b9f0cfa2 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "NotificationSettingsViewController.h" @@ -56,7 +56,9 @@ @"Table cell switch label. When disabled, Signal will not play notification sounds while the app is in the " @"foreground."); [soundsSection addItem:[OWSTableItem switchItemWithText:inAppSoundsLabelText - isOn:[prefs soundInForeground] + isOnBlock:^{ + return [prefs soundInForeground]; + } target:weakSelf selector:@selector(didToggleSoundNotificationsSwitch:)]]; [contents addSection:soundsSection]; diff --git a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m index 0dae62597..3ea0311aa 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSBackupSettingsViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSBackupSettingsViewController.h" @@ -117,7 +117,9 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem switchItemWithText: NSLocalizedString(@"SETTINGS_BACKUP_ENABLING_SWITCH", @"Label for switch in settings that controls whether or not backup is enabled.") - isOn:isBackupEnabled + isOnBlock:^{ + return [OWSBackup.sharedManager isBackupEnabled]; + } target:self selector:@selector(isBackupEnabledDidChange:)]]; [contents addSection:enableSection]; @@ -187,6 +189,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)isBackupEnabledDidChange:(UISwitch *)sender { [OWSBackup.sharedManager setIsBackupEnabled:sender.isOn]; + + [self updateTableContents]; } #pragma mark - Events diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index de08936f7..3d0d8efc2 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -98,11 +98,14 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s = NSLocalizedString(@"SETTINGS_READ_RECEIPT", @"Label for the 'read receipts' setting."); readReceiptsSection.footerTitle = NSLocalizedString( @"SETTINGS_READ_RECEIPTS_SECTION_FOOTER", @"An explanation of the 'read receipts' setting."); - [readReceiptsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_READ_RECEIPT", - @"Label for the 'read receipts' setting.") - isOn:[self.readReceiptManager areReadReceiptsEnabled] - target:weakSelf - selector:@selector(didToggleReadReceiptsSwitch:)]]; + [readReceiptsSection + addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_READ_RECEIPT", + @"Label for the 'read receipts' setting.") + isOnBlock:^{ + return [OWSReadReceiptManager.sharedManager areReadReceiptsEnabled]; + } + target:weakSelf + selector:@selector(didToggleReadReceiptsSwitch:)]]; [contents addSection:readReceiptsSection]; OWSTableSection *typingIndicatorsSection = [OWSTableSection new]; @@ -110,11 +113,14 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s = NSLocalizedString(@"SETTINGS_TYPING_INDICATORS", @"Label for the 'typing indicators' setting."); typingIndicatorsSection.footerTitle = NSLocalizedString( @"SETTINGS_TYPING_INDICATORS_FOOTER", @"An explanation of the 'typing indicators' setting."); - [typingIndicatorsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_TYPING_INDICATORS", - @"Label for the 'typing indicators' setting.") - isOn:[self.typingIndicators areTypingIndicatorsEnabled] - target:weakSelf - selector:@selector(didToggleTypingIndicatorsSwitch:)]]; + [typingIndicatorsSection + addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_TYPING_INDICATORS", + @"Label for the 'typing indicators' setting.") + isOnBlock:^{ + return [SSKEnvironment.shared.typingIndicators areTypingIndicatorsEnabled]; + } + target:weakSelf + selector:@selector(didToggleTypingIndicatorsSwitch:)]]; [contents addSection:typingIndicatorsSection]; OWSTableSection *screenLockSection = [OWSTableSection new]; @@ -126,7 +132,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_LOCK_SWITCH_LABEL", @"Label for the 'enable screen lock' switch of the privacy settings.") - isOn:OWSScreenLock.sharedManager.isScreenLockEnabled + isOnBlock:^{ + return [OWSScreenLock.sharedManager isScreenLockEnabled]; + } target:self selector:@selector(isScreenLockEnabledDidChange:)]]; [contents addSection:screenLockSection]; @@ -150,10 +158,13 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s OWSTableSection *screenSecuritySection = [OWSTableSection new]; screenSecuritySection.headerTitle = NSLocalizedString(@"SETTINGS_SECURITY_TITLE", @"Section header"); screenSecuritySection.footerTitle = NSLocalizedString(@"SETTINGS_SCREEN_SECURITY_DETAIL", nil); - [screenSecuritySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_SECURITY", @"") - isOn:[self.preferences screenSecurityIsEnabled] - target:weakSelf - selector:@selector(didToggleScreenSecuritySwitch:)]]; + [screenSecuritySection + addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_SECURITY", @"") + isOnBlock:^{ + return [Environment.shared.preferences screenSecurityIsEnabled]; + } + target:weakSelf + selector:@selector(didToggleScreenSecuritySwitch:)]]; [contents addSection:screenSecuritySection]; // Allow calls to connect directly vs. using TURN exclusively @@ -165,7 +176,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [callingSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString( @"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE", @"Table cell label") - isOn:[self.preferences doCallsHideIPAddress] + isOnBlock:^{ + return [Environment.shared.preferences doCallsHideIPAddress]; + } target:weakSelf selector:@selector(didToggleCallsHideIPAddressSwitch:)]]; [contents addSection:callingSection]; @@ -176,7 +189,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s addItem:[OWSTableItem switchItemWithText:NSLocalizedString( @"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE", @"Short table cell label") - isOn:[self.preferences isSystemCallLogEnabled] + isOnBlock:^{ + return [Environment.shared.preferences isSystemCallLogEnabled]; + } target:weakSelf selector:@selector(didToggleEnableSystemCallLogSwitch:)]]; callKitSection.footerTitle = NSLocalizedString( @@ -188,14 +203,19 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s = NSLocalizedString(@"SETTINGS_SECTION_CALL_KIT_DESCRIPTION", @"Settings table section footer."); [callKitSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_CALLKIT_TITLE", @"Short table cell label") - isOn:[self.preferences isCallKitEnabled] + isOnBlock:^{ + return [Environment.shared.preferences isCallKitEnabled]; + } target:weakSelf selector:@selector(didToggleEnableCallKitSwitch:)]]; if (self.preferences.isCallKitEnabled) { [callKitSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE", @"Label for 'CallKit privacy' preference") - isOn:![self.preferences isCallKitPrivacyEnabled] + isOnBlock:^{ + return (BOOL) ! + [Environment.shared.preferences isCallKitPrivacyEnabled]; + } target:weakSelf selector:@selector(didToggleEnableCallKitPrivacySwitch:)]]; } @@ -260,7 +280,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s UISwitch *cellSwitch = [UISwitch new]; cell.accessoryView = cellSwitch; - [cellSwitch setOn:weakSelf.preferences.shouldShowUnidentifiedDeliveryIndicators]; + [cellSwitch setOn:Environment.shared.preferences.shouldShowUnidentifiedDeliveryIndicators]; [cellSwitch addTarget:weakSelf action:@selector(didToggleUDShowIndicatorsSwitch:) forControlEvents:UIControlEventValueChanged]; @@ -290,7 +310,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s OWSTableSection *unidentifiedDeliveryUnrestrictedSection = [OWSTableSection new]; OWSTableItem *unrestrictedAccessItem = [OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS", @"switch label") - isOn:weakSelf.udManager.shouldAllowUnrestrictedAccessLocal + isOnBlock:^{ + return [SSKEnvironment.shared.udManager shouldAllowUnrestrictedAccessLocal]; + } target:weakSelf selector:@selector(didToggleUDUnrestrictedAccessSwitch:)]; [unidentifiedDeliveryUnrestrictedSection addItem:unrestrictedAccessItem]; @@ -313,7 +335,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [linkPreviewsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_LINK_PREVIEWS", @"Setting for enabling & disabling link previews.") - isOn:SSKPreferences.areLinkPreviewsEnabled + isOnBlock:^{ + return [SSKPreferences areLinkPreviewsEnabled]; + } target:weakSelf selector:@selector(didToggleLinkPreviewsEnabled:)]]; linkPreviewsSection.headerTitle = NSLocalizedString( diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 4df03214e..922bf8218 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -1122,6 +1122,7 @@ const CGFloat kIconViewLength = 24; BOOL isCurrentlyBlocked = [self.blockingManager isThreadBlocked:self.thread]; + __weak OWSConversationSettingsViewController *weakSelf = self; if (blockConversationSwitch.isOn) { OWSAssertDebug(!isCurrentlyBlocked); if (isCurrentlyBlocked) { @@ -1135,6 +1136,8 @@ const CGFloat kIconViewLength = 24; completionBlock:^(BOOL isBlocked) { // Update switch state if user cancels action. blockConversationSwitch.on = isBlocked; + + [weakSelf updateTableContents]; }]; } else { @@ -1149,6 +1152,8 @@ const CGFloat kIconViewLength = 24; completionBlock:^(BOOL isBlocked) { // Update switch state if user cancels action. blockConversationSwitch.on = isBlocked; + + [weakSelf updateTableContents]; }]; } } diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.h b/SignalMessaging/ViewControllers/OWSTableViewController.h index bbf69e576..bc24cc005 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.h +++ b/SignalMessaging/ViewControllers/OWSTableViewController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -47,6 +47,7 @@ extern const CGFloat kOWSTable_DefaultCellHeight; typedef void (^OWSTableActionBlock)(void); typedef void (^OWSTableSubPageBlock)(UIViewController *viewController); typedef UITableViewCell *_Nonnull (^OWSTableCustomCellBlock)(void); +typedef BOOL (^OWSTableSwitchBlock)(void); @interface OWSTableItem : NSObject @@ -103,11 +104,14 @@ typedef UITableViewCell *_Nonnull (^OWSTableCustomCellBlock)(void); + (OWSTableItem *)longDisclosureItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock; -+ (OWSTableItem *)switchItemWithText:(NSString *)text isOn:(BOOL)isOn target:(id)target selector:(SEL)selector; ++ (OWSTableItem *)switchItemWithText:(NSString *)text + isOnBlock:(OWSTableSwitchBlock)isOnBlock + target:(id)target + selector:(SEL)selector; + (OWSTableItem *)switchItemWithText:(NSString *)text - isOn:(BOOL)isOn - isEnabled:(BOOL)isEnabled + isOnBlock:(OWSTableSwitchBlock)isOnBlock + isEnabledBlock:(OWSTableSwitchBlock)isEnabledBlock target:(id)target selector:(SEL)selector; diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m index 2b7c7a882..e6caf9962 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.m +++ b/SignalMessaging/ViewControllers/OWSTableViewController.m @@ -366,14 +366,23 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; return item; } -+ (OWSTableItem *)switchItemWithText:(NSString *)text isOn:(BOOL)isOn target:(id)target selector:(SEL)selector ++ (OWSTableItem *)switchItemWithText:(NSString *)text + isOnBlock:(OWSTableSwitchBlock)isOnBlock + target:(id)target + selector:(SEL)selector { - return [self switchItemWithText:text isOn:isOn isEnabled:YES target:target selector:selector]; + return [self switchItemWithText:text + isOnBlock:(OWSTableSwitchBlock)isOnBlock + isEnabledBlock:^{ + return YES; + } + target:target + selector:selector]; } + (OWSTableItem *)switchItemWithText:(NSString *)text - isOn:(BOOL)isOn - isEnabled:(BOOL)isEnabled + isOnBlock:(OWSTableSwitchBlock)isOnBlock + isEnabledBlock:(OWSTableSwitchBlock)isEnabledBlock target:(id)target selector:(SEL)selector { @@ -389,9 +398,9 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; UISwitch *cellSwitch = [UISwitch new]; cell.accessoryView = cellSwitch; - [cellSwitch setOn:isOn]; + [cellSwitch setOn:isOnBlock()]; [cellSwitch addTarget:weakTarget action:selector forControlEvents:UIControlEventValueChanged]; - cellSwitch.enabled = isEnabled; + cellSwitch.enabled = isEnabledBlock(); cell.selectionStyle = UITableViewCellSelectionStyleNone; From 2c961380c084782632b3eabd3f1b8d1ac5305087 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 15:17:48 -0700 Subject: [PATCH 138/493] update translations --- .../translations/ca.lproj/Localizable.strings | 16 +- .../translations/de.lproj/Localizable.strings | 14 +- .../translations/et.lproj/Localizable.strings | 32 +- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/gl.lproj/Localizable.strings | 2 +- .../translations/ja.lproj/Localizable.strings | 6 +- .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_PT.lproj/Localizable.strings | 852 +++++++++--------- .../translations/ro.lproj/Localizable.strings | 10 +- 9 files changed, 468 insertions(+), 468 deletions(-) diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 5aed148c1..ba7562ce1 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -2,20 +2,20 @@ "AB_PERMISSION_MISSING_ACTION_NOT_NOW" = "Ara no"; /* Action sheet item */ -"ACCEPT_NEW_IDENTITY_ACTION" = "Accepta el nou número de seguretat"; +"ACCEPT_NEW_IDENTITY_ACTION" = "Accepta el número de seguretat nou"; /* Label for 'audio call' button in contact view. */ -"ACTION_AUDIO_CALL" = "Trucada d'audio"; +"ACTION_AUDIO_CALL" = "Trucada Signal"; /* Label for 'invite' button in contact view. */ -"ACTION_INVITE" = "Convida a Signal"; +"ACTION_INVITE" = "Convida al Signal"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ -"ACTION_SEND_MESSAGE" = "Envia missatge"; +"ACTION_SEND_MESSAGE" = "Envia-li un missatge"; /* Label for 'share contact' button. */ -"ACTION_SHARE_CONTACT" = "Comparteix contacte"; +"ACTION_SHARE_CONTACT" = "Comparteix el contacte"; /* Label for 'video call' button in contact view. */ "ACTION_VIDEO_CALL" = "Trucada de video"; @@ -33,7 +33,7 @@ "ADD_GROUP_MEMBER_VIEW_TITLE" = "Afegeix un membre"; /* Message shown in conversation view that offers to share your profile with a group. */ -"ADD_GROUP_TO_PROFILE_WHITELIST_OFFER" = "Vols compartir el teu perfil amb aquest grup?"; +"ADD_GROUP_TO_PROFILE_WHITELIST_OFFER" = "Voleu compartir el perfil amb aquest grup?"; /* Message shown in conversation view that offers to add an unknown user to your phone's contacts. */ "ADD_TO_CONTACTS_OFFER" = "Vols afegir aquest usuari als teus contactes?"; @@ -1479,7 +1479,7 @@ "NOTIFICATIONS_NONE" = "Sense nom ni contingut"; /* Table cell switch label. When disabled, Signal will not play notification sounds while the app is in the foreground. */ -"NOTIFICATIONS_SECTION_INAPP" = "Jugueu mentre l'aplicació estigui oberta"; +"NOTIFICATIONS_SECTION_INAPP" = "Sona si l'aplicació està oberta"; /* Label for settings UI that allows user to change the notification sound. */ "NOTIFICATIONS_SECTION_SOUNDS" = "Sons"; @@ -1896,7 +1896,7 @@ "SEARCH_SECTION_MESSAGES" = "Missatges"; /* No comment provided by engineer. */ -"SECURE_SESSION_RESET" = "La sessió segura a estat reiniciada."; +"SECURE_SESSION_RESET" = "La sessió segura ha estat reiniciada."; /* Label for 'select GIF to attach' action sheet button */ "SELECT_GIF_BUTTON" = "GIF"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 377f99a21..1a8d74c16 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -180,7 +180,7 @@ "BACKUP_EXPORT_ERROR_COULD_NOT_EXPORT" = "Sicherungsdaten konnten nicht exportiert werden."; /* Error indicating that the app received an invalid response from CloudKit. */ -"BACKUP_EXPORT_ERROR_INVALID_CLOUDKIT_RESPONSE" = "Ungültige Serverantwort"; +"BACKUP_EXPORT_ERROR_INVALID_CLOUDKIT_RESPONSE" = "Ungültige Dienstantwort"; /* Indicates that the cloud is being cleaned up. */ "BACKUP_EXPORT_PHASE_CLEAN_UP" = "Sicherung wird bereinigt"; @@ -447,7 +447,7 @@ "COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Du kannst den Zugriff auf deine Kontakte in der iOS-App »Einstellungen« aktivieren, um zu sehen, welche deiner Kontakte Signal verwenden."; /* No comment provided by engineer. */ -"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Dies setzt die App in ihren Ursprungszustand zurück. Dabei werden alle deine Nachrichten und dein Benutzerkonto auf dem Server gelöscht. Nach Abschluss des Vorgangs beendet sich die App automatisch."; +"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Dies setzt die App in ihren Ursprungszustand zurück. Dabei werden alle deine Nachrichten und dein Benutzerkonto vom Server gelöscht. Nach Abschluss des Vorgangs beendet sich die App automatisch."; /* No comment provided by engineer. */ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Möchtest du dein Benutzerkonto wirklich löschen?"; @@ -480,7 +480,7 @@ "CONTACT_CELL_IS_NO_LONGER_VERIFIED" = "Nicht verifiziert"; /* No comment provided by engineer. */ -"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Nicht registrierte Rufnummer"; +"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Unregistrierte Rufnummer"; /* Label for the 'edit name' button in the contact share approval view. */ "CONTACT_EDIT_NAME_BUTTON" = "Bearbeiten"; @@ -627,7 +627,7 @@ "CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP" = "Diese Gruppe kann dein Profil sehen."; /* Indicates that user's profile has been shared with a user. */ -"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Dieser Benutzer kann dein Profil sehen."; +"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Benutzer kann dein Profil sehen."; /* Button to confirm that user wants to share their profile with a user or group. */ "CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE" = "Profil teilen"; @@ -1240,7 +1240,7 @@ "MESSAGE_ACTION_DELETE_MESSAGE" = "Diese Nachricht löschen"; /* Action sheet button subtitle */ -"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Sie wird nur auf diesem Gerät gelöscht"; +"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Wird nur auf diesem Gerät gelöscht."; /* Action sheet button title */ "MESSAGE_ACTION_DETAILS" = "Mehr Details"; @@ -1288,7 +1288,7 @@ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_UPLOADING" = "Wird hochgeladen"; /* Label for messages without a body or attachment in the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "Nachricht hat keinen Inhalt oder Anhang."; +"MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "Nachricht hat weder Inhalt noch Anhang."; /* Label for the 'received date & time' field of the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME" = "Empfangen"; @@ -2340,7 +2340,7 @@ "UNNAMED_DEVICE" = "Unbenanntes Gerät"; /* No comment provided by engineer. */ -"UNREGISTER_SIGNAL_FAIL" = "Löschen des Benutzerkontos gescheitert."; +"UNREGISTER_SIGNAL_FAIL" = "Deregistrieren gescheitert."; /* No comment provided by engineer. */ "UNSUPPORTED_ATTACHMENT" = "Nicht unterstützten Anhangstyp erhalten."; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index cd41a9164..b1c46b3ee 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Ligipääs mikrofonile on vajalik"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "Sissetulev kõne"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Helista"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "Vastamata kõne, sest helistaja turvanumber on muutunud."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "Vastamata kõne"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Vastust pole"; @@ -1081,16 +1081,16 @@ "HOME_VIEW_TITLE_INBOX" = "Signal"; /* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; +"IMAGE_EDITOR_BRUSH_BUTTON" = "Pihusti"; /* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +"IMAGE_EDITOR_CROP_BUTTON" = "Kärbi"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ -"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; +"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Sa ei saa jagada rohkem kui %@ üksust."; /* alert title */ -"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Failed to select attachment."; +"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Manuse laadimine ei õnnestunud."; /* Call setup status label */ "IN_CALL_CONNECTING" = "Ühendumine..."; @@ -1183,7 +1183,7 @@ "LINK_NEW_DEVICE_TITLE" = "Ühenda uus seade"; /* Label for link previews with an unknown host. */ -"LINK_PREVIEW_UNKNOWN_DOMAIN" = "Link Preview"; +"LINK_PREVIEW_UNKNOWN_DOMAIN" = "Lingi eelvaade"; /* Menu item and navbar title for the device manager */ "LINKED_DEVICES_TITLE" = "Ühendatud seadmed"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Liige"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ grupile %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Lisa grupivestlusele nimi"; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Leia kontaktid numbri järgi"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Märkus endale"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Sa võisid %@'i taaskäivitamise ajal saada sõnumeid."; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Saada"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Sinu sõnumi saatmine ei õnnestunud."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Kutse saatmine ei õnnestunud, palun proovi hiljem uuesti."; @@ -2082,13 +2082,13 @@ "SETTINGS_LEGAL_TERMS_CELL" = "Tingimused ja privaatsuspoliitika"; /* Setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; +"SETTINGS_LINK_PREVIEWS" = "Saada linkide eelvaateid"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Eelvaated on toetatud Imgur, Instagram, Reddit ja YouTube linkide puhul"; /* Header for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; +"SETTINGS_LINK_PREVIEWS_HEADER" = "Linkide eelvaated"; /* Title for settings activity */ "SETTINGS_NAV_BAR_TITLE" = "Sätted"; @@ -2370,10 +2370,10 @@ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Valikulised linkide eelvaated on nüüd toetatud populaarseimate saitide puhul."; /* Subtitle for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Seda funktsiooni on võimalik igal ajal keelata või lubada Signali sätetes (Privaatsus > Saada linkide eelvaateid)."; /* Header for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Link Previews"; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Linkide eelvaated"; /* Description for notification audio customization */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Nüüd saad valida nii vaikimisi helina kui ka igale vestlusele eraldi. Kõned kasutavad seda helinat, mille oled valinud kontaktide jaoks telefonis."; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 77fbab320..d590d4452 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -1605,7 +1605,7 @@ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "Le code balayé ne semble pas être un numéro de sécurité. Utilisez-vous tous les deux une version à jour de Signal ?"; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Si vous souhaitez vérifier la sécurité du chiffrement de bout en bout avec %@, comparez les numéros ci-dessus avec ceux sur son appareil.\n\nVous pouvez aussi balayé le code sur son appareil ou lui demander de balayer le vôtre."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Si vous souhaitez vérifier la sécurité du chiffrement de bout en bout avec %@, comparez les numéros ci-dessus avec ceux sur son appareil.\n\nVous pouvez aussi balayer le code sur son appareil ou lui demander de balayer le vôtre."; /* Navbar title */ "PRIVACY_VERIFICATION_TITLE" = "Vérifier le numéro de sécurité"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 7e541637e..9b714968b 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Atopar contactos por número de teléfono"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Notificarmo"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "You may have received messages while your %@ was restarting."; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index a1ac1ceaa..5eae96cf9 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -1183,7 +1183,7 @@ "LINK_NEW_DEVICE_TITLE" = "新しい端末を追加"; /* Label for link previews with an unknown host. */ -"LINK_PREVIEW_UNKNOWN_DOMAIN" = "リンクのプレビュー"; +"LINK_PREVIEW_UNKNOWN_DOMAIN" = "リンクプレビュー"; /* Menu item and navbar title for the device manager */ "LINKED_DEVICES_TITLE" = "追加される端末"; @@ -2088,7 +2088,7 @@ "SETTINGS_LINK_PREVIEWS_FOOTER" = "リンクプレビューは、次のサービスに対応しています: Imgur, Instagram, Reddit, YouTube"; /* Header for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_HEADER" = "リンクのプレビュー"; +"SETTINGS_LINK_PREVIEWS_HEADER" = "リンクプレビュー"; /* Title for settings activity */ "SETTINGS_NAV_BAR_TITLE" = "設定"; @@ -2373,7 +2373,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "この機能は、Signalの設定（プライバシー > リンクプレビューを送る）で有効化できます。"; /* Header for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "リンクのプレビュー"; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "リンクプレビュー"; /* Description for notification audio customization */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "通知音を相手ごとに設定できるようになりました。"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index fbf2fafe9..dba6296ca 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Odszukaj kontakty po numerze telefonu"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Uwaga dla siebie"; +"NOTE_TO_SELF" = "Moje notatki"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Możliwe, że otrzymałeś wiadomości podczas restartowania %@."; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 81d0b87fb..ba84bc080 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1,36 +1,36 @@ /* Button text to dismiss missing contacts permission alert */ -"AB_PERMISSION_MISSING_ACTION_NOT_NOW" = "Agora Não"; +"AB_PERMISSION_MISSING_ACTION_NOT_NOW" = "Agora não"; /* Action sheet item */ -"ACCEPT_NEW_IDENTITY_ACTION" = "Aceitar Novo Número de Segurança"; +"ACCEPT_NEW_IDENTITY_ACTION" = "Aceitar novo número de segurança"; /* Label for 'audio call' button in contact view. */ -"ACTION_AUDIO_CALL" = "Chamada Signal"; +"ACTION_AUDIO_CALL" = "Chamada do Signal"; /* Label for 'invite' button in contact view. */ "ACTION_INVITE" = "Convidar para o Signal"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ -"ACTION_SEND_MESSAGE" = "Enviar Mensagem"; +"ACTION_SEND_MESSAGE" = "Enviar mensagem"; /* Label for 'share contact' button. */ -"ACTION_SHARE_CONTACT" = "Partilhar Contacto"; +"ACTION_SHARE_CONTACT" = "Partilhar contacto"; /* Label for 'video call' button in contact view. */ -"ACTION_VIDEO_CALL" = "Video-Chamada"; +"ACTION_VIDEO_CALL" = "Videochamada"; /* A label for the 'add by phone number' button in the 'add group member' view */ "ADD_GROUP_MEMBER_VIEW_BUTTON" = "Adicionar"; /* Title for the 'add contact' section of the 'add group member' view. */ -"ADD_GROUP_MEMBER_VIEW_CONTACT_TITLE" = "Adicionar Contacto"; +"ADD_GROUP_MEMBER_VIEW_CONTACT_TITLE" = "Adicionar contacto"; /* Title for the 'add by phone number' section of the 'add group member' view. */ -"ADD_GROUP_MEMBER_VIEW_PHONE_NUMBER_TITLE" = "Adicionar por número de Telefone"; +"ADD_GROUP_MEMBER_VIEW_PHONE_NUMBER_TITLE" = "Adicionar por número de telefone"; /* Title for the 'add group member' view. */ -"ADD_GROUP_MEMBER_VIEW_TITLE" = "Adicionar Membro"; +"ADD_GROUP_MEMBER_VIEW_TITLE" = "Adicionar membro"; /* Message shown in conversation view that offers to share your profile with a group. */ "ADD_GROUP_TO_PROFILE_WHITELIST_OFFER" = "Deseja partilhar o seu perfil com este grupo?"; @@ -45,7 +45,7 @@ "ALERT_DISCARD_BUTTON" = "Descartar"; /* The label for the 'don't save' button in action sheets. */ -"ALERT_DONT_SAVE" = "Não Guardar"; +"ALERT_DONT_SAVE" = "Não guardar"; /* No comment provided by engineer. */ "ALERT_ERROR_TITLE" = "Erro"; @@ -57,10 +57,10 @@ "ANSWER_CALL_BUTTON_TITLE" = "Atender"; /* notification body */ -"APN_Message" = "Nova Mensagem!"; +"APN_Message" = "Nova mensagem!"; /* Message for the 'app launch failed' alert. */ -"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal não pode iniciar. Por favor envie os seus relatórios de errors para a nossa equipa para que consigamos resolver o problema para support@signal.org ."; +"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Não foi possível iniciar o Signal. Por favor, envie os seus relatório da depuração para support@signal.org de forma a que a nossa equipa consiga resolver este problema."; /* Title for the 'app launch failed' alert. */ "APP_LAUNCH_FAILURE_ALERT_TITLE" = "Erro"; @@ -69,7 +69,7 @@ "APP_SETTINGS_EDIT_PROFILE_NAME_PROMPT" = "Introduza o seu nome."; /* Label for the 'dismiss' button in the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_DISMISS_BUTTON" = "Agora Não"; +"APP_UPDATE_NAG_ALERT_DISMISS_BUTTON" = "Agora não"; /* Message format for the 'new app version available' alert. Embeds: {{The latest app version number}} */ "APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "A versão %@ está disponível na App Store."; @@ -78,7 +78,7 @@ "APP_UPDATE_NAG_ALERT_TITLE" = "Está disponível uma nova versão do Signal "; /* Label for the 'update' button in the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "Actualizar"; +"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "Atualizar"; /* Name of application */ "APPLICATION_NAME" = "Signal"; @@ -102,7 +102,7 @@ "ATTACHMENT_APPROVAL_FILE_SIZE_FORMAT" = "Tamanho: %@"; /* One-line label indicating the user can add no more text to the media message field. */ -"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "Limite da Mensagem atingido."; +"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "Atingido o limite da mensagem."; /* Label for 'send' button in the 'attachment approval' dialog. */ "ATTACHMENT_APPROVAL_SEND_BUTTON" = "Enviar"; @@ -111,7 +111,7 @@ "ATTACHMENT_DEFAULT_FILENAME" = "Anexo"; /* Status label when an attachment download has failed. */ -"ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Falha a descarregar. Toque para tentar novamente."; +"ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Falha ao descarregar. Toque para tentar novamente."; /* Status label when an attachment is currently downloading */ "ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "A descarregar..."; @@ -120,34 +120,34 @@ "ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Em espera"; /* The title of the 'attachment error' alert. */ -"ATTACHMENT_ERROR_ALERT_TITLE" = "Erro ao Enviar Anexo"; +"ATTACHMENT_ERROR_ALERT_TITLE" = "Erro ao enviar o anexo"; /* Attachment error message for image attachments which could not be converted to JPEG */ -"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Incapaz de converter a imagem."; +"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Não foi possível converter a imagem."; /* Attachment error message for video attachments which could not be converted to MP4 */ -"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "Incapaz de processar o vídeo."; +"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "Não foi possível processar o vídeo."; /* Attachment error message for image attachments which cannot be parsed */ -"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "Incapaz de processar a imagem."; +"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "Não foi possível processar a imagem."; /* Attachment error message for image attachments in which metadata could not be removed */ "ATTACHMENT_ERROR_COULD_NOT_REMOVE_METADATA" = "Não foi possível remover os metadados da imagem."; /* Attachment error message for image attachments which could not be resized */ -"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Incapaz de redimensionar a imagem."; +"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Não foi possível redimensionar a imagem."; /* Attachment error message for attachments whose data exceed file size limits */ -"ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE" = "Anexo é demasiado grande."; +"ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE" = "O anexo é demasiado grande."; /* Attachment error message for attachments with invalid data */ -"ATTACHMENT_ERROR_INVALID_DATA" = "Anexo contém conteúdo inválido."; +"ATTACHMENT_ERROR_INVALID_DATA" = "O anexo contém conteúdo inválido."; /* Attachment error message for attachments with an invalid file format */ -"ATTACHMENT_ERROR_INVALID_FILE_FORMAT" = "Anexo tem um tipo de ficheiro inválido."; +"ATTACHMENT_ERROR_INVALID_FILE_FORMAT" = "O anexo tem um tipo de ficheiro inválido."; /* Attachment error message for attachments without any data */ -"ATTACHMENT_ERROR_MISSING_DATA" = "Anexo está vazio"; +"ATTACHMENT_ERROR_MISSING_DATA" = "O anexo está vazio"; /* Accessibility hint describing what you can do with the attachment button */ "ATTACHMENT_HINT" = "Escolha ou tire uma fotografia e depois envie-a."; @@ -159,70 +159,70 @@ "ATTACHMENT_MENU_CONTACT_BUTTON" = "Contacto"; /* Alert title when picking a document fails for an unknown reason */ -"ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE" = "Falha a escolher documento. "; +"ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE" = "Falha a escolher o documento. "; /* Alert body when picking a document fails because user picked a directory/bundle */ "ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY" = "O Signal não consegue tratar deste ficheiro no seu estado actual. Tente criar uma versão comprimida do ficheiro e depois tente envia-lo."; /* Alert title when picking a document fails because user picked a directory/bundle */ -"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE" = "Ficheiro Não Suportado"; +"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE" = "Ficheiro não suportado"; /* Short text label for a voice message attachment, used for thread preview and on the lock screen */ "ATTACHMENT_TYPE_VOICE_MESSAGE" = "Mensagem de voz"; /* action sheet button title to enable built in speaker during a call */ -"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "Alta Voz"; +"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "Alta voz"; /* button text for back button */ -"BACK_BUTTON" = "Atrás"; +"BACK_BUTTON" = "Voltar"; /* Error indicating the backup export could not export the user's data. */ -"BACKUP_EXPORT_ERROR_COULD_NOT_EXPORT" = "Dados de backup não foram exportados."; +"BACKUP_EXPORT_ERROR_COULD_NOT_EXPORT" = "Os dados de backup não foram exportados."; /* Error indicating that the app received an invalid response from CloudKit. */ -"BACKUP_EXPORT_ERROR_INVALID_CLOUDKIT_RESPONSE" = "Resposta do Serviço inválida"; +"BACKUP_EXPORT_ERROR_INVALID_CLOUDKIT_RESPONSE" = "Resposta do serviço inválida"; /* Indicates that the cloud is being cleaned up. */ -"BACKUP_EXPORT_PHASE_CLEAN_UP" = "A Limpar Backup"; +"BACKUP_EXPORT_PHASE_CLEAN_UP" = "A limpar cópia de segurança"; /* Indicates that the backup export is being configured. */ -"BACKUP_EXPORT_PHASE_CONFIGURATION" = "A inicializar Backup"; +"BACKUP_EXPORT_PHASE_CONFIGURATION" = "A inicializar cópia de segurança"; /* Indicates that the database data is being exported. */ -"BACKUP_EXPORT_PHASE_DATABASE_EXPORT" = "Exportar Dados"; +"BACKUP_EXPORT_PHASE_DATABASE_EXPORT" = "Exportar dados"; /* Indicates that the backup export data is being exported. */ -"BACKUP_EXPORT_PHASE_EXPORT" = "A exportar Backup"; +"BACKUP_EXPORT_PHASE_EXPORT" = "A exportar cópia de segurança"; /* Indicates that the backup export data is being uploaded. */ -"BACKUP_EXPORT_PHASE_UPLOAD" = "A enviar Backup"; +"BACKUP_EXPORT_PHASE_UPLOAD" = "A enviar cópia de segurança"; /* Error indicating the backup import could not import the user's data. */ -"BACKUP_IMPORT_ERROR_COULD_NOT_IMPORT" = "Não foi possível importar backup."; +"BACKUP_IMPORT_ERROR_COULD_NOT_IMPORT" = "Não foi possível importar a cópia de segurança."; /* Indicates that the backup import is being configured. */ -"BACKUP_IMPORT_PHASE_CONFIGURATION" = "A configurar Backup"; +"BACKUP_IMPORT_PHASE_CONFIGURATION" = "A configurar cópia de segurança"; /* Indicates that the backup import data is being downloaded. */ -"BACKUP_IMPORT_PHASE_DOWNLOAD" = "A descarregar Dados do Backup"; +"BACKUP_IMPORT_PHASE_DOWNLOAD" = "A descarregar dados da cópia de segurança"; /* Indicates that the backup import data is being finalized. */ -"BACKUP_IMPORT_PHASE_FINALIZING" = "A finalizar Backup"; +"BACKUP_IMPORT_PHASE_FINALIZING" = "A finalizar cópia de segurança"; /* Indicates that the backup import data is being imported. */ -"BACKUP_IMPORT_PHASE_IMPORT" = "A importar backup."; +"BACKUP_IMPORT_PHASE_IMPORT" = "A importar cópia de segurança."; /* Indicates that the backup database is being restored. */ -"BACKUP_IMPORT_PHASE_RESTORING_DATABASE" = "A Restaurar Base de dados"; +"BACKUP_IMPORT_PHASE_RESTORING_DATABASE" = "A restaurar base de dados"; /* Indicates that the backup import data is being restored. */ -"BACKUP_IMPORT_PHASE_RESTORING_FILES" = "A restaurar Ficheiros"; +"BACKUP_IMPORT_PHASE_RESTORING_FILES" = "A restaurar ficheiros"; /* Label for the backup restore decision section. */ "BACKUP_RESTORE_DECISION_TITLE" = "Cópia de segurança disponível"; /* Label for the backup restore description. */ -"BACKUP_RESTORE_DESCRIPTION" = "A restaurar a cópia de segurança"; +"BACKUP_RESTORE_DESCRIPTION" = "A restaurar cópia de segurança"; /* Label for the backup restore progress. */ "BACKUP_RESTORE_PROGRESS" = "Progresso"; @@ -234,31 +234,31 @@ "BACKUP_UNEXPECTED_ERROR" = "Erro inesperado com a cópia de segurança"; /* An explanation of the consequences of blocking a group. */ -"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Não voltará a receber mensagens ou actualizações deste grupo."; +"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Não voltará a receber mensagens ou atualizações deste grupo."; /* Button label for the 'block' button */ "BLOCK_LIST_BLOCK_BUTTON" = "Bloquear"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ -"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Bloquear e Sair do grupo \"%@\"?"; +"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Bloquear e sair do grupo \"%@\"?"; /* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */ "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "Bloquear %@?"; /* Section header for groups that have been blocked */ -"BLOCK_LIST_BLOCKED_GROUPS_SECTION" = "Grupos Bloqueados"; +"BLOCK_LIST_BLOCKED_GROUPS_SECTION" = "Grupos bloqueados"; /* Section header for users that have been blocked */ -"BLOCK_LIST_BLOCKED_USERS_SECTION" = "Utilizadores Bloqueados"; +"BLOCK_LIST_BLOCKED_USERS_SECTION" = "Utilizadores bloqueados"; /* Button label for the 'unblock' button */ "BLOCK_LIST_UNBLOCK_BUTTON" = "Desbloquear"; /* Action sheet body when confirming you want to unblock a group */ -"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Membros actuais poderão voltar a adicionar o seu contacto ao grupo."; +"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Os membros actuais poderão voltar a adicionar o seu contacto ao grupo."; /* Action sheet title when confirming you want to unblock a group. */ -"BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "Desbloquear este Grupo?"; +"BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "Desbloquear este grupo?"; /* A format for the 'unblock conversation' action sheet title. Embeds the {{conversation title}}. */ "BLOCK_LIST_UNBLOCK_TITLE_FORMAT" = "Desbloquear %@?"; @@ -273,7 +273,7 @@ "BLOCK_LIST_VIEW_BLOCKED_ALERT_TITLE" = "Utilizador bloqueado"; /* The title of the 'group blocked' alert. */ -"BLOCK_LIST_VIEW_BLOCKED_GROUP_ALERT_TITLE" = "Grupo Bloqueado"; +"BLOCK_LIST_VIEW_BLOCKED_GROUP_ALERT_TITLE" = "Grupo bloqueado"; /* The message of the 'You can't block yourself' alert. */ "BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE" = "Não se pode bloquear a si mesmo."; @@ -285,7 +285,7 @@ "BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@ foi desbloqueado."; /* Alert body after unblocking a group. */ -"BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Membros actuais podem agora voltar a adicionar o seu contacto ao grupo."; +"BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Os membros atuais podem agora voltar a adicionar o seu contacto ao grupo."; /* Action sheet that will block an unknown user. */ "BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION" = "Bloquear"; @@ -294,7 +294,7 @@ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "Bloquear %@?"; /* An explanation of the consequences of blocking another user. */ -"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Utilizadores bloqueados não poderão telefonar-lhe ou enviar-lhe mensagens."; +"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Os utilizadores bloqueados não poderão telefonar-lhe ou enviar-lhe mensagens."; /* Label for 'continue' button. */ "BUTTON_CONTINUE" = "Continuar"; @@ -306,7 +306,7 @@ "BUTTON_REDO" = "Refazer"; /* Button text to enable batch selection mode */ -"BUTTON_SELECT" = "Seleccionar"; +"BUTTON_SELECT" = "Selecionar"; /* Label for undo button. */ "BUTTON_UNDO" = "Desfazer"; @@ -315,10 +315,10 @@ "CALL_AGAIN_BUTTON_TITLE" = "Chamar novamente"; /* Alert message when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_MESSAGE" = "O Signal necessita de acesso ao seu microfone para poder realizar chamadas e gravar mensagens de voz. Pode dar acesso nas Configurações."; +"CALL_AUDIO_PERMISSION_MESSAGE" = "O Signal necessita de ter acesso ao seu microfone para poder realizar chamadas e gravar mensagens de voz. Pode dar acesso nas Definições."; /* Alert title when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_TITLE" = "Requer Acesso ao Microfone"; +"CALL_AUDIO_PERMISSION_TITLE" = "Requer acesso ao microfone"; /* notification body */ "CALL_INCOMING_NOTIFICATION_BODY" = "☎️ A receber chamada"; @@ -333,7 +333,7 @@ "CALL_MISSED_NOTIFICATION_BODY" = "☎️ Chamada perdida"; /* Call setup status label after outgoing call times out */ -"CALL_SCREEN_STATUS_NO_ANSWER" = "Sem Resposta"; +"CALL_SCREEN_STATUS_NO_ANSWER" = "Sem resposta"; /* embeds {{Call Status}} in call screen label. For ongoing calls, {{Call Status}} is a seconds timer like 01:23, otherwise {{Call Status}} is a short text like 'Ringing', 'Busy', or 'Failed Call' */ "CALL_STATUS_FORMAT" = "Signal %@"; @@ -363,46 +363,46 @@ "CALL_VIEW_MUTE_LABEL" = "Silenciar"; /* Reminder to the user of the benefits of enabling CallKit and disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Pode atender chamadas directamente através do ecrã bloqueado e ver o nome e número de telefone para chamadas se alterar as configurações do Signal."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Pode ativar a integração de chamadas iOS nas suas definições de privacidade do Signal de forma a poder atender chamadas diretamente através do ecrã bloqueado."; /* Reminder to the user of the benefits of disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Pode activar a integração de chamadas iOS nas configurações de privacidade do Signal para ver o nome e número de telefone das chamadas que receber."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Pode ativar a integração de chamadas iOS nas suas definições de privacidade do Signal para ver o nome e número de telefone das chamadas que receber."; /* Label for button that dismiss the call view's settings nag. */ "CALL_VIEW_SETTINGS_NAG_NOT_NOW_BUTTON" = "Agora não"; /* Label for button that shows the privacy settings. */ -"CALL_VIEW_SETTINGS_NAG_SHOW_CALL_SETTINGS" = "Mostrar Definições de Privacidade"; +"CALL_VIEW_SETTINGS_NAG_SHOW_CALL_SETTINGS" = "Mostrar definições de privacidade"; /* Accessibility label to toggle front- vs. rear-facing camera */ -"CALL_VIEW_SWITCH_CAMERA_DIRECTION" = "Trocar de Câmara"; +"CALL_VIEW_SWITCH_CAMERA_DIRECTION" = "Trocar de câmara"; /* Accessibility label to switch to audio only */ "CALL_VIEW_SWITCH_TO_AUDIO_LABEL" = "Trocar para chamada áudio"; /* Accessibility label to switch to video call */ -"CALL_VIEW_SWITCH_TO_VIDEO_LABEL" = "Trocar para chamada vídeo"; +"CALL_VIEW_SWITCH_TO_VIDEO_LABEL" = "Trocar para videochamada"; /* Label for the 'return to call' banner. */ "CALL_WINDOW_RETURN_TO_CALL" = "Tocar para voltar à chamada"; /* notification action */ -"CALLBACK_BUTTON_TITLE" = "Chamar Novamente"; +"CALLBACK_BUTTON_TITLE" = "Ligar de volta"; /* The generic name used for calls if CallKit privacy is enabled */ -"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Utilizador Signal"; +"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Utilizador do Signal"; /* Message for alert explaining that a user cannot be verified. */ -"CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Não pode ser verificado até ter trocado mensagens."; +"CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Este utilizador não pode ser verificado até você trocar mensagens com ele."; /* Title for alert explaining that a user cannot be verified. */ "CANT_VERIFY_IDENTITY_ALERT_TITLE" = "Erro"; /* Title for the 'censorship circumvention country' view. */ -"CENSORSHIP_CIRCUMVENTION_COUNTRY_VIEW_TITLE" = "Seleccione País"; +"CENSORSHIP_CIRCUMVENTION_COUNTRY_VIEW_TITLE" = "Selecionar país"; /* The label for the 'do not restore backup' button. */ -"CHECK_FOR_BACKUP_DO_NOT_RESTORE" = "Não Restaurar"; +"CHECK_FOR_BACKUP_DO_NOT_RESTORE" = "Não restaurar"; /* Message for alert shown when the app failed to check for an existing backup. */ "CHECK_FOR_BACKUP_FAILED_MESSAGE" = "Não foi possível determinar se existe uma cópia de segurança que possa ser restaurada."; @@ -414,22 +414,22 @@ "CHECK_FOR_BACKUP_RESTORE" = "Restaurar"; /* Error indicating that the app could not determine that user's iCloud account status */ -"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "O Signal não consegui determinar o estado da sua conta iCloud. Autentique-se na sua conta iCloud nas configurações do iOS para fazer uma cópia de segurança dos seus dados do Signal."; +"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "O Signal não conseguiu determinar o estado da sua conta iCloud. Autentique-se na sua conta iCloud nas definições do iOS para fazer uma cópia de segurança dos seus dados do Signal."; /* Error indicating that user does not have an iCloud account. */ -"CLOUDKIT_STATUS_NO_ACCOUNT" = "Sem conta iCloud. Autentique-se na sua conta iCloud nas configurações do iOS para fazer uma cópia de segurança dos seus dados do Signal."; +"CLOUDKIT_STATUS_NO_ACCOUNT" = "Sem conta iCloud. Autentique-se na sua conta iCloud nas definições do iOS para fazer uma cópia de segurança dos seus dados do Signal."; /* Error indicating that the app was prevented from accessing the user's iCloud account. */ -"CLOUDKIT_STATUS_RESTRICTED" = "O Signal têm o acesso barrado à sua conta iCloud para fazer cópias de segurança. Forneça o acesso do Signal à sua conta iCloud nas configurações do iOS para fazer uma cópia de segurança dos seus dados do Signal."; +"CLOUDKIT_STATUS_RESTRICTED" = "O Signal têm o acesso barrado à sua conta iCloud para fazer cópias de segurança. Forneça o acesso do Signal à sua conta iCloud nas definições do iOS para fazer uma cópia de segurança dos seus dados do Signal."; /* The first of two messages demonstrating the chosen conversation color, by rendering this message in an outgoing message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_1" = "Escolha a cor das mensagens nesta conversa."; +"COLOR_PICKER_DEMO_MESSAGE_1" = "Escolha a cor das mensagens para esta conversa."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ "COLOR_PICKER_DEMO_MESSAGE_2" = "Apenas você verá a cor que escolheu."; /* Modal Sheet title when picking a conversation color. */ -"COLOR_PICKER_SHEET_TITLE" = "Cor da Conversa"; +"COLOR_PICKER_SHEET_TITLE" = "Cor da conversa"; /* Activity Sheet label */ "COMPARE_SAFETY_NUMBER_ACTION" = "Comparar com o copiado"; @@ -444,28 +444,28 @@ "COMPOSE_MESSAGE_INVITE_SECTION_TITLE" = "Convidar"; /* Multi-line label explaining why compose-screen contact picker is empty. */ -"COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Para ver quais dos seus contactos são utilizadores Signal, permita o acesso aos Contactos nas Configurações do Sistema."; +"COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Para ver quais dos seus contactos são utilizadores do Signal, permita o acesso aos contactos nas definições iOS da aplicação."; /* No comment provided by engineer. */ -"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Isto irá repôr as definições de origem da aplicação, apagando todas as mensagens e desregistando-se do servidor. A aplicaçāo fechar-se-á após os dados terem sido removidos."; +"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Isto irá repor as definições de origem da aplicação, eliminando todas as mensagens e removendo o registo do servidor. A aplicação fechar-se-á após este processo estar completo."; /* No comment provided by engineer. */ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Deseja realmente eliminar a sua conta?"; /* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Não poderá receber ou enviar mensagens neste grupo."; +"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Não poderá receber ou enviar mensagens deste grupo."; /* Alert title */ "CONFIRM_LEAVE_GROUP_TITLE" = "Deseja sair do grupo?"; /* Button text */ -"CONFIRM_LINK_NEW_DEVICE_ACTION" = "Associar Novo Dispositivo"; +"CONFIRM_LINK_NEW_DEVICE_ACTION" = "Associar novo dispositivo"; /* Action sheet body presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ "CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ poderá ter reinstalado ou mudado de dispositivo. Verifique o número de segurança para assegurar a sua privacidade."; /* Action sheet title presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ -"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Número de segurança com %@ mudou."; +"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "O número de segurança com %@ mudou."; /* Generic button text to proceed with an action */ "CONFIRMATION_TITLE" = "Confirmar"; @@ -477,10 +477,10 @@ "CONTACT_CELL_IS_BLOCKED" = "Bloqueado"; /* An indicator that a contact is no longer verified. */ -"CONTACT_CELL_IS_NO_LONGER_VERIFIED" = "Não Verificado"; +"CONTACT_CELL_IS_NO_LONGER_VERIFIED" = "Não verificado"; /* No comment provided by engineer. */ -"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Número Não Registado"; +"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Número não registado"; /* Label for the 'edit name' button in the contact share approval view. */ "CONTACT_EDIT_NAME_BUTTON" = "Editar"; @@ -516,7 +516,7 @@ "CONTACT_FIELD_GIVEN_NAME" = "Nome"; /* Label for the 'middle name' field of a contact. */ -"CONTACT_FIELD_MIDDLE_NAME" = "Segundo Nome"; +"CONTACT_FIELD_MIDDLE_NAME" = "Segundo nome"; /* Label for the 'name prefix' field of a contact. */ "CONTACT_FIELD_NAME_PREFIX" = "Prefixo"; @@ -534,58 +534,58 @@ "CONTACT_PICKER_NO_EMAILS_AVAILABLE" = "E-mail indisponível."; /* table cell subtitle when contact card has no known phone number */ -"CONTACT_PICKER_NO_PHONE_NUMBERS_AVAILABLE" = "Não existe número de telefone."; +"CONTACT_PICKER_NO_PHONE_NUMBERS_AVAILABLE" = "Sem número de telefone disponível."; /* navbar title for contact picker when sharing a contact */ -"CONTACT_PICKER_TITLE" = "Seleccionar Contacto"; +"CONTACT_PICKER_TITLE" = "Selecionar contacto"; /* Title for the 'Approve contact share' view. */ -"CONTACT_SHARE_APPROVAL_VIEW_TITLE" = "Partilhar Contacto"; +"CONTACT_SHARE_APPROVAL_VIEW_TITLE" = "Partilhar contacto"; /* Title for the 'edit contact share name' view. */ -"CONTACT_SHARE_EDIT_NAME_VIEW_TITLE" = "Editar Nome"; +"CONTACT_SHARE_EDIT_NAME_VIEW_TITLE" = "Editar nome"; /* Error indicating that an invalid contact cannot be shared. */ "CONTACT_SHARE_INVALID_CONTACT" = "Contacto inválido."; /* Error indicating that at least one contact field must be selected before sharing a contact. */ -"CONTACT_SHARE_NO_FIELDS_SELECTED" = "Não tem campos seleccionados."; +"CONTACT_SHARE_NO_FIELDS_SELECTED" = "Sem campos de contacto selecionados."; /* Label for 'open address in maps app' button in contact view. */ "CONTACT_VIEW_OPEN_ADDRESS_IN_MAPS_APP" = "Abrir no Mapas"; /* Label for 'open email in email app' button in contact view. */ -"CONTACT_VIEW_OPEN_EMAIL_IN_EMAIL_APP" = "Enviar E-mail"; +"CONTACT_VIEW_OPEN_EMAIL_IN_EMAIL_APP" = "Enviar e-mail"; /* Indicates that a contact has no name. */ -"CONTACT_WITHOUT_NAME" = "Contacto Sem Nome"; +"CONTACT_WITHOUT_NAME" = "Contacto sem nome"; /* Message for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Isto não pode ser desfeito."; /* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Apagar conversa?"; +"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Eliminar conversa?"; /* title for conversation settings screen */ -"CONVERSATION_SETTINGS" = "Definições da Conversa"; +"CONVERSATION_SETTINGS" = "Definições da conversa"; /* Label for 'new contact' button in conversation settings view. */ -"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Adicionar a um Contacto Existente"; +"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Adicionar a um contacto existente"; /* table cell label in conversation settings */ -"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Bloquear este Grupo"; +"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Bloquear este grupo"; /* table cell label in conversation settings */ "CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Bloquear este utilizador"; /* Navbar title when viewing settings for a 1-on-1 thread */ -"CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Info. Contacto"; +"CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Informação de contacto"; /* Label for table cell which leads to picking a new conversation color */ -"CONVERSATION_SETTINGS_CONVERSATION_COLOR" = "Cor da Conversa"; +"CONVERSATION_SETTINGS_CONVERSATION_COLOR" = "Cor da conversa"; /* Navbar title when viewing settings for a group thread */ -"CONVERSATION_SETTINGS_GROUP_INFO_TITLE" = "Grupo"; +"CONVERSATION_SETTINGS_GROUP_INFO_TITLE" = "Informação de grupo"; /* Title of the 'mute this thread' action sheet. */ "CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE" = "Silenciar"; @@ -594,7 +594,7 @@ "CONVERSATION_SETTINGS_MUTE_LABEL" = "Silenciado"; /* Indicates that the current thread is not muted. */ -"CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Não Silenciado"; +"CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Não silenciado"; /* Label for button to mute a thread for a day. */ "CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION" = "Silenciar por um dia"; @@ -615,13 +615,13 @@ "CONVERSATION_SETTINGS_MUTED_UNTIL_FORMAT" = "até %@"; /* Label for 'new contact' button in conversation settings view. */ -"CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar Novo Contacto"; +"CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar novo contacto"; /* Label for button that opens conversation settings. */ -"CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tocar para Alterar"; +"CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tocar para alterar"; /* Label for button to unmute a thread. */ -"CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Remover do Silêncio"; +"CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Remover do silêncio"; /* Indicates that user's profile has been shared with a group. */ "CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP" = "Este grupo pode ver o seu perfil."; @@ -630,16 +630,16 @@ "CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Este utilizador pode ver o seu perfil."; /* Button to confirm that user wants to share their profile with a user or group. */ -"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE" = "Partilhar Perfil"; +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE" = "Partilhar perfil"; /* Action that shares user profile with a group. */ -"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP" = "Partilhar o Seu Perfil"; +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP" = "Partilhar o seu perfil"; /* Action that shares user profile with a user. */ -"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER" = "Partilhar o Seu Perfil"; +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER" = "Partilhar o seu perfil"; /* Message shown in conversation view that offers to add an unknown user to your phone's contacts. */ -"CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER" = "Adicionar aos Contactos"; +"CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER" = "Adicionar aos contactos"; /* Message shown in conversation view that offers to share your profile with a user. */ "CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER" = "Partilhar o seu perfil com este utilizador"; @@ -651,34 +651,34 @@ "CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "A carregar mais mensagens..."; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ -"CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Toque para Mais"; +"CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Toque para mais"; /* Message shown in conversation view that offers to block an unknown user. */ "CONVERSATION_VIEW_UNKNOWN_CONTACT_BLOCK_OFFER" = "Bloquear este utilizador"; /* ActionSheet title */ -"CORRUPTED_SESSION_DESCRIPTION" = "Reiniciar a sua sessão permitirá que receba mensagens de %@ novamente, mas não poderá recuperar as mensagens corrompidas."; +"CORRUPTED_SESSION_DESCRIPTION" = "Reiniciar a sua sessão permitirá que receba novamente mensagens de %@, mas não poderá recuperar as mensagens corrompidas."; /* No comment provided by engineer. */ -"COUNTRYCODE_SELECT_TITLE" = "Selecione Código do País"; +"COUNTRYCODE_SELECT_TITLE" = "Selecione código do país"; /* Accessibility label for the create group new group button */ "CREATE_NEW_GROUP" = "Criar novo grupo"; /* Title for the 'crop/scale image' dialog. */ -"CROP_SCALE_IMAGE_VIEW_TITLE" = "Mover e Redimensionar"; +"CROP_SCALE_IMAGE_VIEW_TITLE" = "Mover e redimensionar"; /* Subtitle shown while the app is updating its database. */ -"DATABASE_VIEW_OVERLAY_SUBTITLE" = "Isto pode demorar alguns minutos."; +"DATABASE_VIEW_OVERLAY_SUBTITLE" = "Isto poderá demorar alguns minutos."; /* Title shown while the app is updating its database. */ -"DATABASE_VIEW_OVERLAY_TITLE" = "A Optimizar a Base de Dados"; +"DATABASE_VIEW_OVERLAY_TITLE" = "A optimizar a base de dados"; /* Format string for a relative time, expressed as a certain number of hours in the past. Embeds {{The number of hours}}. */ -"DATE_HOURS_AGO_FORMAT" = " Há %@H"; +"DATE_HOURS_AGO_FORMAT" = " Há %@h atrás"; /* Format string for a relative time, expressed as a certain number of minutes in the past. Embeds {{The number of minutes}}. */ -"DATE_MINUTES_AGO_FORMAT" = "Há %@min"; +"DATE_MINUTES_AGO_FORMAT" = "Há %@min atrás"; /* The present; the current time. */ "DATE_NOW" = "Agora"; @@ -699,38 +699,38 @@ "DEBUG_LOG_ALERT_ERROR_UPLOADING_LOG" = "Não foi possível enviar os relatórios de erros."; /* Message of the debug log alert. */ -"DEBUG_LOG_ALERT_MESSAGE" = "Que deseja fazer com o endereço para o seu Relatório de Erros?"; +"DEBUG_LOG_ALERT_MESSAGE" = "Que deseja fazer com o endereço para o seu relatório de depuração?"; /* Error indicating that no debug logs could be found. */ -"DEBUG_LOG_ALERT_NO_LOGS" = "Não foi possível encontrar os relatórios de erros."; +"DEBUG_LOG_ALERT_NO_LOGS" = "Não foi possível encontrar nenhum relatório de erros."; /* Label for the 'Open a Bug Report' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_BUG_REPORT" = "Abrir Relatório de Bugs"; +"DEBUG_LOG_ALERT_OPTION_BUG_REPORT" = "Abrir relatório de erros"; /* Label for the 'copy link' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_COPY_LINK" = "Copiar Endereço"; +"DEBUG_LOG_ALERT_OPTION_COPY_LINK" = "Copiar endereço"; /* Label for the 'email debug log' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_EMAIL" = "Suporte via E-mail"; +"DEBUG_LOG_ALERT_OPTION_EMAIL" = "Suporte via e-mail"; /* Label for the 'send to last thread' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD" = "Adicionar à última Thread de Erros"; +"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD" = "Adicionar ao último tópico de erros"; /* Label for the 'send to self' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF" = "Enviar para Mim"; +"DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF" = "Enviar para mim"; /* Label for the 'Share' option of the debug log alert. */ "DEBUG_LOG_ALERT_OPTION_SHARE" = "Partilhar"; /* Title of the alert shown for failures while uploading debug logs. Title of the debug log alert. */ -"DEBUG_LOG_ALERT_TITLE" = "Mais Um Passo"; +"DEBUG_LOG_ALERT_TITLE" = "Mais um passo"; /* Error indicating that the app could not launch the Email app. */ -"DEBUG_LOG_COULD_NOT_EMAIL" = "Não foi possível abrir a app de Email."; +"DEBUG_LOG_COULD_NOT_EMAIL" = "Não foi possível abrir a aplicação de e-mail."; /* Message of the alert before redirecting to GitHub Issues. */ -"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "O link para o \"gist\" foi copiado para o seu clipboard. Vai ser redireccionado para a lista de problemas do GitHub."; +"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "O link para o \"gist\" foi copiado para a sua área de trabalho. Vai ser redireccionado para a lista de problemas do GitHub."; /* Title of the alert before redirecting to GitHub Issues. */ "DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "Redireccionar para GitHub"; @@ -739,52 +739,52 @@ "DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Voltar a registar este número"; /* Label warning the user that they have been de-registered. */ -"DEREGISTRATION_WARNING" = "O dispositivo já não se encontra registado. O número de telefone poderá estar registado com o Signal noutro dispositivo. Toque para voltar a registar."; +"DEREGISTRATION_WARNING" = "O dispositivo já não se encontra registado. O seu número de telefone poderá estar registado com o Signal noutro dispositivo. Toque para voltar a registar."; /* {{Short Date}} when device last communicated with Signal Server. */ -"DEVICE_LAST_ACTIVE_AT_LABEL" = "Activo pela última vez: %@"; +"DEVICE_LAST_ACTIVE_AT_LABEL" = "Ativo pela última vez: %@"; /* {{Short Date}} when device was linked. */ "DEVICE_LINKED_AT_LABEL" = "Associado: %@"; /* Alert title that can occur when viewing device manager. */ -"DEVICE_LIST_UPDATE_FAILED_TITLE" = "Falha na actualização da lista de dispositivos."; +"DEVICE_LIST_UPDATE_FAILED_TITLE" = "Falha na atualização da lista de dispositivos."; /* table cell label in conversation settings */ "DISAPPEARING_MESSAGES" = "Destruição de mensagens"; /* Info Message when added to a group which has enabled disappearing messages. Embeds {{time amount}} before messages disappear, see the *_TIME_AMOUNT strings for context. */ -"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "As mensagens nesta conversa irão desaparecer depois de %@."; +"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "As mensagens nesta conversa irão ser destruídas depois de %@."; /* subheading in conversation settings */ -"DISAPPEARING_MESSAGES_DESCRIPTION" = "Quando activado, as mensages enviadas e recebidas nesta conversa irão desaparecer depois de serem lidas."; +"DISAPPEARING_MESSAGES_DESCRIPTION" = "Quando ativado, as mensagens enviadas e recebidas nesta conversa irão ser destruídas após terem sido lidas."; /* Accessibility hint that contains current timeout information */ -"DISAPPEARING_MESSAGES_HINT" = "As mensagens irão desaparecer após %@."; +"DISAPPEARING_MESSAGES_HINT" = "As mensagens irão ser destruídas após %@."; /* Accessibility label for disappearing messages */ -"DISAPPEARING_MESSAGES_LABEL" = "Definições de destruição de mensagens"; +"DISAPPEARING_MESSAGES_LABEL" = "Definições da destruição de mensagens"; /* Short text to dismiss current modal / actionsheet / screen */ "DISMISS_BUTTON_TEXT" = "Ignorar"; /* Section title for the 'domain fronting country' view. */ -"DOMAIN_FRONTING_COUNTRY_VIEW_SECTION_HEADER" = "Localização da Circunscrição de Censura"; +"DOMAIN_FRONTING_COUNTRY_VIEW_SECTION_HEADER" = "Localização da circunscrição de censura"; /* Alert body for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Pode dar acesso nas Configurações."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Pode dar acesso nas definições iOS da aplicação."; /* Alert title for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "O Signal necessita de acesso aos Contactos para Editar a Informação dos Contactos."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "O Signal necessita de ter acesso aos contactos para poder editar a informação dos contactos."; /* table cell label in conversation settings */ -"EDIT_GROUP_ACTION" = "Editar Grupo"; +"EDIT_GROUP_ACTION" = "Editar grupo"; /* a title for the contacts section of the 'new/update group' view. */ "EDIT_GROUP_CONTACTS_SECTION_TITLE" = "Contactos"; /* The navbar title for the 'update group' view. */ -"EDIT_GROUP_DEFAULT_TITLE" = "Editar Grupo"; +"EDIT_GROUP_DEFAULT_TITLE" = "Editar grupo"; /* Label for the cell that lets you add a new member to a group. */ "EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Adicionar..."; @@ -811,16 +811,16 @@ "EDIT_TXT" = "Editar"; /* body of email sent to contacts when inviting to install Signal. Embeds {{link to install Signal}} and {{link to the Signal home page}} */ -"EMAIL_INVITE_BODY" = "Olá,\n\nUltimamente tenho usado o Signal para manter as minhas conversas no meu iPhone privadas. Gostaria que tu também o instalasses, para podermos estar confiantes que mais ninguém pode ler as nossas mensagens nem ouvir as nossas chamadas.\n\nO Signal está disponível para iPhone e Android. Faz download aqui: %@\n\nO Signal funciona como qualquer outra App de mensagens, podes enviar fotos e video, fazer chamadas e criar mensagens de grupo. A melhor parte é que mais ninguém poderá ve-las, nem os criadores do Signal!\n\nPodes ler mais sobre a Open Whisper Systems, as pessoas por detrás do Signal aqui: %@"; +"EMAIL_INVITE_BODY" = "Olá,\n\nUltimamente tenho usado o Signal para manter as minhas conversas do meu iPhone privadas. Gostaria que tu também o instalasses, para podermos estar confiantes que mais ninguém pode ler as nossas mensagens nem ouvir as nossas chamadas.\n\nO Signal está disponível para iPhone e Android. Faz download aqui: %@\n\nO Signal funciona como qualquer outra aplicação de mensagens, podes enviar fotos e video, fazer chamadas e criar mensagens de grupo. A melhor parte é que mais ninguém as poderá ver, nem os criadores do Signal!\n\nPodes ler mais sobre a Open Whisper Systems, as pessoas por detrás do Signal aqui: %@"; /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Vamos mudar para o Signal"; /* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Pode arquivar conversas inactivas a partir da sua Caixa de Entrada."; +"EMPTY_ARCHIVE_TEXT" = "Pode arquivar conversas inativas a partir da sua caixa de entrada."; /* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Limpe a sua Lista de Conversas"; +"EMPTY_ARCHIVE_TITLE" = "Limpe a sua lista de conversas"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nenhum dos seus contactos têm o Signal."; @@ -841,37 +841,37 @@ "EMPTY_INBOX_TITLE" = "Não existem mensagens."; /* Indicates that user should confirm their 'two factor auth pin'. */ -"ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirmar PIN"; +"ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirme o seu PIN"; /* Error indicating that attempt to disable 'two-factor auth' failed. */ -"ENABLE_2FA_VIEW_COULD_NOT_DISABLE_2FA" = "Não foi possível desactivar o Bloqueio de Registo"; +"ENABLE_2FA_VIEW_COULD_NOT_DISABLE_2FA" = "Não foi possível desativar o 'Bloqueio de registo'"; /* Error indicating that attempt to enable 'two-factor auth' failed. */ -"ENABLE_2FA_VIEW_COULD_NOT_ENABLE_2FA" = "Não foi possível activar o Bloqueio de Registo"; +"ENABLE_2FA_VIEW_COULD_NOT_ENABLE_2FA" = "Não foi possível ativar o 'Bloqueio de registo'"; /* Label for the 'enable two-factor auth' item in the settings view */ -"ENABLE_2FA_VIEW_DISABLE_2FA" = "Desactivar"; +"ENABLE_2FA_VIEW_DISABLE_2FA" = "Desativar"; /* Label for the 'enable two-factor auth' item in the settings view */ -"ENABLE_2FA_VIEW_ENABLE_2FA" = "Activar"; +"ENABLE_2FA_VIEW_ENABLE_2FA" = "Ativar"; /* Label for the 'next' button in the 'enable two factor auth' views. */ "ENABLE_2FA_VIEW_NEXT_BUTTON" = "Seguinte"; /* Error indicating that the entered 'two-factor auth PINs' do not match. */ -"ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "PIN não corresponde."; +"ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "O PIN não corresponde."; /* Indicates that user should select a 'two factor auth pin'. */ -"ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Introduzir um PIN para Bloqueio de Registo. Esta ir-lhe-á ser pedido da próxima vez que registe este número com o Signal."; +"ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Introduza um PIN para bloqueio de registo. Este PIN ser-lhe-á pedido da próxima vez que registe este número de telefone com o Signal."; /* Indicates that user has 'two factor auth pin' disabled. */ -"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Para aumentar a sua segurança active o PIN de Bloqueio de Registo. Este ser-lhe-á pedido da próxima vez que registe este número com o Signal."; +"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Para aumentar a sua segurança ative o PIN de bloqueio de registo. Este PIN ser-lhe-á pedido da próxima vez que registe este número de telefone com o Signal."; /* Indicates that user has 'two factor auth pin' enabled. */ -"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "O Bloqueio de Registo está activado. Precisa de introduzir um PIN quando registe este número com o Signal."; +"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "O bloqueio de registo encontra-se ativo. Precisa de introduzir este PIN quando se registar novamente no Signal com este número de telefone."; /* Title for the 'enable two factor auth PIN' views. */ -"ENABLE_2FA_VIEW_TITLE" = "Bloqueio de Registo"; +"ENABLE_2FA_VIEW_TITLE" = "Bloqueio de registo"; /* Call setup status label */ "END_CALL_RESPONDER_IS_BUSY" = "Ocupado"; @@ -889,13 +889,13 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Incapaz de enviar."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou a envio da mensagem para o utilizador porque o bloqueou anteriormente."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou o envio da mensagem para o utilizador porque o bloqueou anteriormente."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha devido a falha a escrever o anexo."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha a escrever e enviar o anexo."; /* Generic error used whenever Signal can't contact the server */ -"ERROR_DESCRIPTION_NO_INTERNET" = "O signal foi incapaz de se ligar à internet. Por favor tente novamente."; +"ERROR_DESCRIPTION_NO_INTERNET" = "O Signal foi incapaz de se ligar à internet. Por favor, tente novamente."; /* Error indicating that an outgoing message had no valid recipients. */ "ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Falha no envio de mensagem visto não ter destinatários válidos."; @@ -904,7 +904,7 @@ "ERROR_DESCRIPTION_REQUEST_FAILED" = "Falha no pedido à rede."; /* Error indicating that a socket request timed out. */ -"ERROR_DESCRIPTION_REQUEST_TIMED_OUT" = "Pedido à rede expirou."; +"ERROR_DESCRIPTION_REQUEST_TIMED_OUT" = "O pedido à rede expirou."; /* Error indicating that a socket response failed. */ "ERROR_DESCRIPTION_RESPONSE_FAILED" = "Resposta inválida do serviço."; @@ -913,7 +913,7 @@ "ERROR_DESCRIPTION_SENDING_UNAUTHORIZED" = "O seu dispositivo já não se encontra registado para o seu número de telefone. Deverá remover e reinstalar o Signal."; /* Generic server error */ -"ERROR_DESCRIPTION_SERVER_FAILURE" = "Falha no Servidor. Por favor tente mais tarde."; +"ERROR_DESCRIPTION_SERVER_FAILURE" = "Falha no servidor. Por favor, tente mais tarde."; /* Worst case generic error message */ "ERROR_DESCRIPTION_UNKNOWN_ERROR" = "Ocorreu um erro desconhecido."; @@ -922,7 +922,7 @@ "ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "O contacto não é um utilizador Signal."; /* Error message when unable to receive an attachment because the sending client is too old. */ -"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Falha no anexo: Peça ao seu contacto para actualizar o Signal e reenviar a mensagem."; +"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Falha no anexo: Peça ao seu contacto para atualizar o Signal e reenviar a mensagem."; /* No comment provided by engineer. */ "ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Recebeu uma mensagem duplicada."; @@ -937,7 +937,7 @@ "ERROR_MESSAGE_INVALID_VERSION" = "Recebeu uma mensagem não compatível com esta versão."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_NO_SESSION" = "Nenhuma sessão disponível para este contacto."; +"ERROR_MESSAGE_NO_SESSION" = "Não existe nenhuma sessão disponível para este contacto."; /* Shown when signal users safety numbers changed */ "ERROR_MESSAGE_NON_BLOCKING_IDENTITY_CHANGE" = "Número de segurança alterado."; @@ -952,10 +952,10 @@ "ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "O número de segurança mudou."; /* Format string for 'unregistered user' error. Embeds {{the unregistered user's name or signal id}}. */ -"ERROR_UNREGISTERED_USER_FORMAT" = "Desregistar Utilizador: %@"; +"ERROR_UNREGISTERED_USER_FORMAT" = "Remover registo do utilizador: %@"; /* Button to dismiss/ignore the one time splash screen that appears after upgrading */ -"EXPERIENCE_UPGRADE_DISMISS_BUTTON" = "Agora Não"; +"EXPERIENCE_UPGRADE_DISMISS_BUTTON" = "Agora não"; /* action sheet header when re-sending message which failed because of too many attempts */ "FAILED_SENDING_BECAUSE_RATE_LIMIT" = "Estão a ocorrer demasiadas falhas com este contacto. Por favor, volte a tentar mais tarde."; @@ -967,10 +967,10 @@ "FAILED_VERIFICATION_TITLE" = "Falha ao verificar o número de segurança!"; /* Button that marks user as verified after a successful fingerprint scan. */ -"FINGERPRINT_SCAN_VERIFY_BUTTON" = " Marcar como Verificado "; +"FINGERPRINT_SCAN_VERIFY_BUTTON" = " Marcar como verificado "; /* No comment provided by engineer. */ -"FINGERPRINT_SHRED_KEYMATERIAL_BUTTON" = "Reiniciar Sessão"; +"FINGERPRINT_SHRED_KEYMATERIAL_BUTTON" = "Reiniciar sessão"; /* Accessibility label for finishing new group */ "FINISH_GROUP_CREATION_LABEL" = "Finalizar criação do grupo"; @@ -988,7 +988,7 @@ "GENERIC_ATTACHMENT_LABEL" = "Anexo"; /* Error displayed when there is a failure fetching a GIF from the remote service. */ -"GIF_PICKER_ERROR_FETCH_FAILURE" = "Falha a carregar o GIF. Por favor, verifique que está online."; +"GIF_PICKER_ERROR_FETCH_FAILURE" = "Falha a carregar o GIF solicitado. Por favor, verifique que está on-line."; /* Generic error displayed when picking a GIF */ "GIF_PICKER_ERROR_GENERIC" = "Ocorreu um erro desconhecido."; @@ -997,19 +997,19 @@ "GIF_PICKER_FAILURE_ALERT_TITLE" = "Erro ao escolher GIF"; /* Alert message shown when user tries to search for GIFs without entering any search terms. */ -"GIF_PICKER_VIEW_MISSING_QUERY" = "Procura"; +"GIF_PICKER_VIEW_MISSING_QUERY" = "Por favor, insira a sua pesquisa."; /* Title for the 'GIF picker' dialog. */ "GIF_PICKER_VIEW_TITLE" = "Pesquisa de GIFs"; /* Indicates that an error occurred while searching. */ -"GIF_VIEW_SEARCH_ERROR" = "Erro. Toque Novamente."; +"GIF_VIEW_SEARCH_ERROR" = "Erro. Toque para tentar novamente."; /* Indicates that the user's search had no results. */ -"GIF_VIEW_SEARCH_NO_RESULTS" = "Sem Resultados."; +"GIF_VIEW_SEARCH_NO_RESULTS" = "Sem resultados."; /* Placeholder text for the search field in GIF view */ -"GIF_VIEW_SEARCH_PLACEHOLDER_TEXT" = "Pesquisar"; +"GIF_VIEW_SEARCH_PLACEHOLDER_TEXT" = "Insira a sua pesquisa"; /* No comment provided by engineer. */ "GROUP_AVATAR_CHANGED" = "Avatar alterado."; @@ -1021,22 +1021,22 @@ "GROUP_CREATION_FAILED" = "Nem todos os membros foram adicionados ao grupo. Toque para tentar novamente."; /* Conversation settings table section title */ -"GROUP_MANAGEMENT_SECTION" = "Gestão do Grupo"; +"GROUP_MANAGEMENT_SECTION" = "Gestão do grupo"; /* No comment provided by engineer. */ "GROUP_MEMBER_JOINED" = "%@ juntou-se ao grupo."; /* No comment provided by engineer. */ -"GROUP_MEMBER_LEFT" = "%@ deixou o grupo."; +"GROUP_MEMBER_LEFT" = "%@ abandonou o grupo."; /* Button label to add information to an unknown contact */ -"GROUP_MEMBERS_ADD_CONTACT_INFO" = "Adicionar Contacto"; +"GROUP_MEMBERS_ADD_CONTACT_INFO" = "Adicionar contacto"; /* Button label for the 'call group member' button */ -"GROUP_MEMBERS_CALL" = "Chamar"; +"GROUP_MEMBERS_CALL" = "Telefonar"; /* Label for the button that clears all verification errors in the 'group members' view. */ -"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Retirar Verificação Para Todos"; +"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Retirar verificação para todos"; /* Label for the 'reset all no-longer-verified group members' confirmation alert. */ "GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE" = "Isto irá retirar as verificações de todos os membros do grupo cujos números de segurança mudaram desde a última vez que foram verificados."; @@ -1045,25 +1045,25 @@ "GROUP_MEMBERS_SECTION_TITLE_MEMBERS" = "Membros"; /* Title for the 'no longer verified' section of the 'group members' view. */ -"GROUP_MEMBERS_SECTION_TITLE_NO_LONGER_VERIFIED" = "Contacto deixou de estar marcado como Verificado"; +"GROUP_MEMBERS_SECTION_TITLE_NO_LONGER_VERIFIED" = "Deixou de estar marcado como verificado"; /* Button label for the 'send message to group member' button */ -"GROUP_MEMBERS_SEND_MESSAGE" = "Enviar Mensagem"; +"GROUP_MEMBERS_SEND_MESSAGE" = "Enviar mensagem"; /* Button label for the 'show contact info' button */ -"GROUP_MEMBERS_VIEW_CONTACT_INFO" = "Informação do Contacto"; +"GROUP_MEMBERS_VIEW_CONTACT_INFO" = "Informação do contacto"; /* No comment provided by engineer. */ "GROUP_TITLE_CHANGED" = "O título é agora '%@'."; /* No comment provided by engineer. */ -"GROUP_UPDATED" = "Grupo actualizado."; +"GROUP_UPDATED" = "Grupo atualizado."; /* No comment provided by engineer. */ -"GROUP_YOU_LEFT" = "Saiu do grupo."; +"GROUP_YOU_LEFT" = "Você abandonou o grupo."; /* Label for 'archived conversations' button. */ -"HOME_VIEW_ARCHIVED_CONVERSATIONS" = "Conversas Arquivadas"; +"HOME_VIEW_ARCHIVED_CONVERSATIONS" = "Conversas arquivadas"; /* Table cell subtitle label for a conversation the user has blocked. */ "HOME_VIEW_BLOCKED_CONVERSATION" = "Bloqueado"; @@ -1099,28 +1099,28 @@ "IN_CALL_RECONNECTING" = "A voltar a ligar..."; /* Call setup status label */ -"IN_CALL_RINGING" = "A chamar..."; +"IN_CALL_RINGING" = "A tocar..."; /* Call setup status label */ -"IN_CALL_SECURING" = "Atendida. Activar a segurança..."; +"IN_CALL_SECURING" = "Atendida. A ativar a segurança..."; /* Call setup status label */ -"IN_CALL_TERMINATED" = "Chamada Terminada."; +"IN_CALL_TERMINATED" = "Chamada terminada."; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estas conversas estão arquivadas. Irão aparecer na caixa de entrada se receber mensagens novas."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estas conversas estão arquivadas e ião aparecer na caixa de entrada caso receba novas mensagens."; /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ -"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Pode activar o acesso aos contactos nas configurações do iOS para ver os nomes na lista de conversas do Signal."; +"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Pode ativar o acesso aos contactos nas definições do iOS para ver os nomes na lista de conversas do Signal."; /* info message text in conversation view */ -"INCOMING_CALL" = "Chamada recebida"; +"INCOMING_CALL" = "A receber chamada"; /* info message recorded in conversation history when local user declined a call */ "INCOMING_DECLINED_CALL" = "Rejeitou uma chamada"; /* info message text in conversation view */ -"INCOMING_INCOMPLETE_CALL" = "A Receber Chamada"; +"INCOMING_INCOMPLETE_CALL" = "A receber chamada"; /* info message text shown in conversation view */ "INFO_MESSAGE_MISSED_CALL_DUE_TO_CHANGED_IDENITY" = "Chamada não atendida visto que o número de segurança mudou."; @@ -1129,10 +1129,10 @@ "INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE" = "Ficheiro áudio inválido."; /* Alert body when contacts disabled while trying to invite contacts to signal */ -"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Para convidar os seus contactos para o Signal necessita de permitir o acesso aos Contactos nas Configurações do Sistema."; +"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Para convidar os seus contactos para o Signal necessita de permitir o acesso aos contactos nas definições iOS da aplicação."; /* Alert title when contacts disabled while trying to invite contacts to signal */ -"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "Permitir Acesso aos Contactos"; +"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "Permitir acesso aos contactos"; /* Label for the cell that presents the 'invite contacts' workflow. */ "INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Convidar amigos para o Signal"; @@ -1141,7 +1141,7 @@ "INVITE_FRIENDS_PICKER_SEARCHBAR_PLACEHOLDER" = "Procurar"; /* Navbar title */ -"INVITE_FRIENDS_PICKER_TITLE" = "Convidar Amigos"; +"INVITE_FRIENDS_PICKER_TITLE" = "Convidar amigos"; /* Alert warning that sending an invite to multiple users will create a group message whose recipients will be able to see each other. */ "INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "Convidar vários utilizadores ao mesmo tempo irá enviar uma mensagem de grupo em que os utilizadores se poderão ver entre eles."; @@ -1153,19 +1153,19 @@ "KEEP_MESSAGES_FOREVER" = "As mensagens não irão desaparecer."; /* Confirmation button within contextual alert */ -"LEAVE_BUTTON_TITLE" = "Sair"; +"LEAVE_BUTTON_TITLE" = "Abandonar"; /* table cell label in conversation settings */ -"LEAVE_GROUP_ACTION" = "Sair do Grupo"; +"LEAVE_GROUP_ACTION" = "Abandonar o grupo"; /* report an invalid linking code */ -"LINK_DEVICE_INVALID_CODE_BODY" = "O código QR não é válido, verifique que está a scanear o código QR apresentado no dispositivo que deseja associar."; +"LINK_DEVICE_INVALID_CODE_BODY" = "O código QR é inválido, verifique que está a digitalizar o código QR apresentado no dispositivo que deseja associar."; /* report an invalid linking code */ "LINK_DEVICE_INVALID_CODE_TITLE" = "Falha na associação do dispositivo"; /* confirm the users intent to link a new device */ -"LINK_DEVICE_PERMISSION_ALERT_BODY" = "Este dispositivo será capaz de ver os seus grupos e contactos, ler as suas mensages, enviar mensagens em seu nome."; +"LINK_DEVICE_PERMISSION_ALERT_BODY" = "Este dispositivo será capaz de ver os seus grupos e contactos, ler as suas mensagens e enviar mensagens em seu nome."; /* confirm the users intent to link a new device */ "LINK_DEVICE_PERMISSION_ALERT_TITLE" = "Associar este dispositivo?"; @@ -1174,25 +1174,25 @@ "LINK_DEVICE_RESTART" = "Tentar novamente"; /* QR Scanning screen instructions, placed alongside a camera view for scanning QR Codes */ -"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "Scaneie o código QR que se encontra no dispositivo a associar."; +"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "Digitalize o código QR que se encontra no dispositivo a associar."; /* Subheading for 'Link New Device' navigation */ -"LINK_NEW_DEVICE_SUBTITLE" = "Scanear código QR"; +"LINK_NEW_DEVICE_SUBTITLE" = "Digitalizar código QR"; /* Navigation title when scanning QR code to add new device. */ -"LINK_NEW_DEVICE_TITLE" = "Associar"; +"LINK_NEW_DEVICE_TITLE" = "Associar um novo dispositivo"; /* Label for link previews with an unknown host. */ "LINK_PREVIEW_UNKNOWN_DOMAIN" = "Pré-visualização de hiperligações"; /* Menu item and navbar title for the device manager */ -"LINKED_DEVICES_TITLE" = "Dispositivos"; +"LINKED_DEVICES_TITLE" = "Dispositivos associados"; /* Alert Title */ "LINKING_DEVICE_FAILED_TITLE" = "Falha na associação do dispositivo"; /* table cell label in conversation settings */ -"LIST_GROUP_MEMBERS_ACTION" = "Membros do Grupo"; +"LIST_GROUP_MEMBERS_ACTION" = "Membros do grupo"; /* No comment provided by engineer. */ "LOGGING_SECTION" = "Relatórios"; @@ -1201,7 +1201,7 @@ "LONG_TEXT_VIEW_TITLE" = "Mensagem"; /* nav bar button item */ -"MEDIA_DETAIL_VIEW_ALL_MEDIA_BUTTON" = "Todos os Média"; +"MEDIA_DETAIL_VIEW_ALL_MEDIA_BUTTON" = "Todos os média"; /* media picker option to take photo or video */ "MEDIA_FROM_CAMERA_BUTTON" = "Câmara"; @@ -1210,13 +1210,13 @@ "MEDIA_FROM_DOCUMENT_PICKER_BUTTON" = "Documento"; /* media picker option to choose from library */ -"MEDIA_FROM_LIBRARY_BUTTON" = "Biblioteca de Fotos"; +"MEDIA_FROM_LIBRARY_BUTTON" = "Biblioteca de fotos"; /* Confirmation button text to delete selected media from the gallery, embeds {{number of messages}} */ -"MEDIA_GALLERY_DELETE_MULTIPLE_MESSAGES_FORMAT" = "Apagar %d Mensagens"; +"MEDIA_GALLERY_DELETE_MULTIPLE_MESSAGES_FORMAT" = "Apagar %d mensagens"; /* Confirmation button text to delete selected media message from the gallery */ -"MEDIA_GALLERY_DELETE_SINGLE_MESSAGE" = "Apagar Mensagem"; +"MEDIA_GALLERY_DELETE_SINGLE_MESSAGE" = "Eliminar mensagem"; /* embeds {{sender name}} and {{sent datetime}}, e.g. 'Sarah on 10/30/18, 3:29' */ "MEDIA_GALLERY_LANDSCAPE_TITLE_FORMAT" = "%@ em %@"; @@ -1231,25 +1231,25 @@ "MEDIA_GALLERY_THIS_MONTH_HEADER" = "Este mês"; /* Action sheet button title */ -"MESSAGE_ACTION_COPY_MEDIA" = "Copiar Media"; +"MESSAGE_ACTION_COPY_MEDIA" = "Copiar média"; /* Action sheet button title */ -"MESSAGE_ACTION_COPY_TEXT" = "Copiar Mensagem"; +"MESSAGE_ACTION_COPY_TEXT" = "Copiar mensagem"; /* Action sheet button title */ -"MESSAGE_ACTION_DELETE_MESSAGE" = "Apagar esta Mensagem"; +"MESSAGE_ACTION_DELETE_MESSAGE" = "Eliminar esta mensagem"; /* Action sheet button subtitle */ -"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Será apenas apagada neste dispositivo."; +"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Será apenas eliminada neste dispositivo."; /* Action sheet button title */ -"MESSAGE_ACTION_DETAILS" = "Mais Info"; +"MESSAGE_ACTION_DETAILS" = "Mais informação"; /* Action sheet button title */ "MESSAGE_ACTION_REPLY" = "Responder a esta mensagem"; /* Action sheet button title */ -"MESSAGE_ACTION_SAVE_MEDIA" = "Guardar Media"; +"MESSAGE_ACTION_SAVE_MEDIA" = "Guardar média"; /* Title for the 'message approval' dialog. */ "MESSAGE_APPROVAL_DIALOG_TITLE" = "Mensagem"; @@ -1258,7 +1258,7 @@ "MESSAGE_APPROVAL_RECIPIENT_LABEL" = "Para:"; /* No comment provided by engineer. */ -"MESSAGE_COMPOSEVIEW_TITLE" = "Nova Mensagem"; +"MESSAGE_COMPOSEVIEW_TITLE" = "Nova mensagem"; /* Label for file size of attachments in the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE" = "Tamanho do ficheiro"; @@ -1300,7 +1300,7 @@ "MESSAGE_METADATA_VIEW_SENT_DATE_TIME" = "Enviado"; /* Label for the original filename of any attachment in the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_SOURCE_FILENAME" = "Nome do Ficheiro"; +"MESSAGE_METADATA_VIEW_SOURCE_FILENAME" = "Nome do ficheiro"; /* Title for the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_TITLE" = "Mensagem"; @@ -1330,63 +1330,63 @@ "MESSAGE_STATUS_SENT" = "Enviado"; /* status message while attachment is uploading */ -"MESSAGE_STATUS_UPLOADING" = "A enviar..."; +"MESSAGE_STATUS_UPLOADING" = "A carregar..."; /* placeholder text for the editable message field */ -"MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Nova Mensagem"; +"MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Nova mensagem"; /* Indicates that one member of this group conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@: contacto deixou de estar marcado como verificado. Toque aqui para ver opções. "; +"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ deixou de estar marcado como verificado. Toque para opções. "; /* Indicates that this 1:1 conversation has been blocked. */ -"MESSAGES_VIEW_CONTACT_BLOCKED" = "Bloqueou este Utilizador"; +"MESSAGES_VIEW_CONTACT_BLOCKED" = "Bloqueou este utilizador"; /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@: contacto deixou de estar marcado como verificado. Toque aqui para ver opções. "; +"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ deixou de estar marcado como verificado. Toque para opções. "; /* Indicates that a single member of this group has been blocked. */ -"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "Bloqueou 1 Membro deste Grupo"; +"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "Você bloqueou um membro deste grupo"; /* Indicates that this group conversation has been blocked. */ -"MESSAGES_VIEW_GROUP_BLOCKED" = "Bloqueou Este Grupo"; +"MESSAGES_VIEW_GROUP_BLOCKED" = "Você bloqueou este grupo"; /* Indicates that some members of this group has been blocked. Embeds {{the number of blocked users in this group}}. */ -"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = " Bloqueou %@ Membros deste Grupo "; +"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = " Você bloqueou %@ membros deste grupo "; /* Text for banner in group conversation view that offers to share your profile with this group. */ -"MESSAGES_VIEW_GROUP_PROFILE_WHITELIST_BANNER" = "Deseja partilhar o seu perfil com este Grupo?"; +"MESSAGES_VIEW_GROUP_PROFILE_WHITELIST_BANNER" = "Deseja partilhar o seu perfil com este grupo?"; /* Indicates that more than one member of this group conversation is no longer verified. */ -"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "Mais de um membro do grupo não se encontra marcado como verificado. Toque para opções."; +"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "Vários membros deste grupo deixaram de se encontrarem marcados como verificados. Toque para opções."; /* The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation. */ -"MESSAGES_VIEW_TITLE_SUBTITLE" = "Toque para ver definições"; +"MESSAGES_VIEW_TITLE_SUBTITLE" = "Toque aqui para as definições"; /* Indicator that separates read from unread messages. */ -"MESSAGES_VIEW_UNREAD_INDICATOR" = "Mensagens Novas "; +"MESSAGES_VIEW_UNREAD_INDICATOR" = "Novas mensagens"; /* Messages that indicates that there are more unseen messages. */ -"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES" = "Há mais mensagens não lidas."; +"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES" = "Existem mais mensagens não lidas."; /* Messages that indicates that there are more unseen messages including safety number changes. */ -"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "Há mais mensagens não lidas (incluindo mudanças no número de segurança)."; +"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "Existem mais mensagens não lidas (incluindo mudanças no número de segurança)."; /* info message text in conversation view */ "MISSED_CALL" = "Chamada não atendida"; /* Alert body Alert body when camera is not authorized */ -"MISSING_CAMERA_PERMISSION_MESSAGE" = "Para fazer video-chamadas no Signal, pode activar a sua câmara nas configurações do iOS."; +"MISSING_CAMERA_PERMISSION_MESSAGE" = "Para fazer videochamadas no Signal, pode ativar a sua câmara nas definições iOS da aplicação."; /* Alert title Alert title when camera is not authorized */ "MISSING_CAMERA_PERMISSION_TITLE" = "O Signal necessita de acesso à sua câmara."; /* Alert body when user has previously denied media library access */ -"MISSING_MEDIA_LIBRARY_PERMISSION_MESSAGE" = "Pode dar acesso nas Configurações."; +"MISSING_MEDIA_LIBRARY_PERMISSION_MESSAGE" = "Pode ativar esta permissão nas definições iOS da aplicação."; /* Alert title when user has previously denied media library access */ -"MISSING_MEDIA_LIBRARY_PERMISSION_TITLE" = "Signal Necessita de Acesso à sua Biblioteca de Média para fazer isto."; +"MISSING_MEDIA_LIBRARY_PERMISSION_TITLE" = "O Signal necessita de acesso à sua biblioteca de média para esta funcionalidade."; /* alert title: cannot link - reached max linked devices */ "MULTIDEVICE_PAIRING_MAX_DESC" = "Não lhe é permitido emparelhar mais dispositivos."; @@ -1398,28 +1398,28 @@ "MUTE_BEHAVIOR_EXPLANATION" = "Não receberá notificações de conversas silenciadas."; /* A button to skip a view. */ -"NAVIGATION_ITEM_SKIP_BUTTON" = "Passar à frente"; +"NAVIGATION_ITEM_SKIP_BUTTON" = "Saltar"; /* No comment provided by engineer. */ -"NETWORK_ERROR_RECOVERY" = "Verifique que está online e tente novamente por favor."; +"NETWORK_ERROR_RECOVERY" = "Por favor, confirme que está on-line e tente novamente."; /* Indicates to the user that censorship circumvention has been activated. */ -"NETWORK_STATUS_CENSORSHIP_CIRCUMVENTION_ACTIVE" = "Circunscrição de Censura: Ligado"; +"NETWORK_STATUS_CENSORSHIP_CIRCUMVENTION_ACTIVE" = "Circunscrição de censura: On"; /* No comment provided by engineer. */ "NETWORK_STATUS_CONNECTED" = "Ligado"; /* No comment provided by engineer. */ -"NETWORK_STATUS_CONNECTING" = "A Ligar"; +"NETWORK_STATUS_CONNECTING" = "A ligar"; /* Error indicating that this device is no longer registered. */ "NETWORK_STATUS_DEREGISTERED" = "Deixou de estar registado"; /* No comment provided by engineer. */ -"NETWORK_STATUS_HEADER" = "Estado da Rede"; +"NETWORK_STATUS_HEADER" = "Estado da rede"; /* No comment provided by engineer. */ -"NETWORK_STATUS_OFFLINE" = "Offline"; +"NETWORK_STATUS_OFFLINE" = "Off-line"; /* A label the cell that lets you add a new member to a group. */ "NEW_CONVERSATION_FIND_BY_PHONE_NUMBER" = "Procurar por número de telefone"; @@ -1428,7 +1428,7 @@ "NEW_GROUP_ADD_NON_CONTACT" = "Adicionar por número de telefone"; /* Action Sheet title prompting the user for a group avatar */ -"NEW_GROUP_ADD_PHOTO_ACTION" = "Definir Foto de Grupo"; +"NEW_GROUP_ADD_PHOTO_ACTION" = "Definir foto de grupo"; /* The title for the 'create group' button. */ "NEW_GROUP_CREATE_BUTTON" = "Criar"; @@ -1446,7 +1446,7 @@ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Nome do grupo"; /* a title for the non-contacts section of the 'new group' view. */ -"NEW_GROUP_NON_CONTACTS_SECTION_TITLE" = "Outros Utilizadores"; +"NEW_GROUP_NON_CONTACTS_SECTION_TITLE" = "Outros utilizadores"; /* The alert message if user tries to exit the new group view without saving changes. */ "NEW_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Deseja descartar estas alterações?"; @@ -1455,40 +1455,40 @@ "NEW_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "Alterações não guardadas"; /* No comment provided by engineer. */ -"new_message" = " Nova Mensagem "; +"new_message" = " Nova mensagem "; /* A label for the 'add by phone number' button in the 'new non-contact conversation' view */ "NEW_NONCONTACT_CONVERSATION_VIEW_BUTTON" = "Procurar"; /* Title for the 'new non-contact conversation' view. */ -"NEW_NONCONTACT_CONVERSATION_VIEW_TITLE" = "Procurar Utilizador"; +"NEW_NONCONTACT_CONVERSATION_VIEW_TITLE" = "Procurar utilizador"; /* Label for a button that lets users search for contacts by phone number */ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Procurar contactos por número de telefone"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Nota para Mim"; +"NOTE_TO_SELF" = "Nota para mim"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Poderá receber mensagens enquanto %@ estiver a reiniciar."; /* No comment provided by engineer. */ -"NOTIFICATIONS_FOOTER_WARNING" = "Devido a problemas conhecidos da Push Framework da Apple, a pré-visualização de mensagens apenas será mostrada se a mensagem foi recebida no espaço de 30 segundos depois desta ter sido enviada. Devido a isto as notificações da aplicação poderão estar incorrectas."; +"NOTIFICATIONS_FOOTER_WARNING" = "Devido a problemas conhecidos da push framework da Apple, a pré-visualização de mensagens apenas será exibida se a mensagem foi recebida no espaço de 30 segundos depois desta ter sido enviada. Devido a isto as notificações da aplicação poderão estar incorrectas."; /* No comment provided by engineer. */ -"NOTIFICATIONS_NONE" = "Sem nome ou Conteúdo"; +"NOTIFICATIONS_NONE" = "Sem nome ou conteúdo"; /* Table cell switch label. When disabled, Signal will not play notification sounds while the app is in the foreground. */ -"NOTIFICATIONS_SECTION_INAPP" = "Tocar enquanto a App está aberta."; +"NOTIFICATIONS_SECTION_INAPP" = "Tocar enquanto a aplicação está aberta."; /* Label for settings UI that allows user to change the notification sound. */ "NOTIFICATIONS_SECTION_SOUNDS" = "Sons"; /* No comment provided by engineer. */ -"NOTIFICATIONS_SENDER_AND_MESSAGE" = "Nome e Conteúdo"; +"NOTIFICATIONS_SENDER_AND_MESSAGE" = "Nome e conteúdo"; /* No comment provided by engineer. */ -"NOTIFICATIONS_SENDER_ONLY" = "Apenas Nome"; +"NOTIFICATIONS_SENDER_ONLY" = "Apenas nome"; /* No comment provided by engineer. */ "NOTIFICATIONS_SHOW" = "Mostrar"; @@ -1503,10 +1503,10 @@ "OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ desactivou a destruição de mensagens."; /* Info Message when {{other user}} updates message expiration to {{time amount}}, see the *_TIME_AMOUNT strings for context. */ -"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ definiu o tempo para a destruição de mensagens para %@."; +"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ definiu o tempo da destruição de mensagens para %@."; /* Label warning the user that the Signal service may be down. */ -"OUTAGE_WARNING" = "O Signal está a ter alguns problemas técnicos. Estamos a trabalhar para restituir o serviço o mais rápido possível."; +"OUTAGE_WARNING" = "O Signal está a ter alguns problemas técnicos. Estamos a trabalhar para restituir o serviço o mais rapidamente possível."; /* info message text in conversation view */ "OUTGOING_CALL" = "Chamada efectuada"; @@ -1527,10 +1527,10 @@ "PHONE_NUMBER_TYPE_AND_INDEX_NAME_FORMAT" = "%@ %@"; /* Label for 'Home' phone numbers. */ -"PHONE_NUMBER_TYPE_HOME" = "Pessoal"; +"PHONE_NUMBER_TYPE_HOME" = "Casa"; /* Label for 'HomeFAX' phone numbers. */ -"PHONE_NUMBER_TYPE_HOME_FAX" = "Fax Pessoal"; +"PHONE_NUMBER_TYPE_HOME_FAX" = "Fax pessoal"; /* Label for 'iPhone' phone numbers. */ "PHONE_NUMBER_TYPE_IPHONE" = "iPhone"; @@ -1557,61 +1557,61 @@ "PHONE_NUMBER_TYPE_WORK" = "Trabalho"; /* Label for 'Work FAX' phone numbers. */ -"PHONE_NUMBER_TYPE_WORK_FAX" = "Trabalho Fax"; +"PHONE_NUMBER_TYPE_WORK_FAX" = "Fax do trabalho"; /* label for system photo collections which have no name. */ -"PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum Sem Nome"; +"PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sem nome"; /* Accessibility label for button to start media playback */ "PLAY_BUTTON_ACCESSABILITY_LABEL" = "Reproduzir"; /* Label indicating that the user is not verified. Embeds {{the user's name or phone number}}. */ -"PRIVACY_IDENTITY_IS_NOT_VERIFIED_FORMAT" = "%@: contacto não está verificado."; +"PRIVACY_IDENTITY_IS_NOT_VERIFIED_FORMAT" = "Você não marcou %@como verificado."; /* Badge indicating that the user is verified. */ "PRIVACY_IDENTITY_IS_VERIFIED_BADGE" = "Verificado"; /* Label indicating that the user is verified. Embeds {{the user's name or phone number}}. */ -"PRIVACY_IDENTITY_IS_VERIFIED_FORMAT" = "%@: contacto está verificado."; +"PRIVACY_IDENTITY_IS_VERIFIED_FORMAT" = "%@ está verificado."; /* Label for a link to more information about safety numbers and verification. */ -"PRIVACY_SAFETY_NUMBERS_LEARN_MORE" = "Saber Mais"; +"PRIVACY_SAFETY_NUMBERS_LEARN_MORE" = "Saber mais"; /* Button that shows the 'scan with camera' view. */ -"PRIVACY_TAP_TO_SCAN" = "Toque para Scanear"; +"PRIVACY_TAP_TO_SCAN" = "Toque para digitalizar"; /* Button that lets user mark another user's identity as unverified. */ -"PRIVACY_UNVERIFY_BUTTON" = "Retirar Verificação"; +"PRIVACY_UNVERIFY_BUTTON" = "Retirar verificação"; /* Alert body when verifying with {{contact name}} */ -"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Isto não parece o seu número de segurança com %@. Está a verificar o contacto correcto?"; +"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Isto não parece o seu número de segurança com %@. Está a verificar o contacto correto?"; /* Alert body */ -"PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD" = "O número copiado não parece o número de segurança correcto para esta conversa."; +"PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD" = "O número copiado não parece o número de segurança correto para esta conversa."; /* Alert body for user error */ -"PRIVACY_VERIFICATION_FAILED_NO_SAFETY_NUMBERS_IN_CLIPBOARD" = "O Signal não conseguiu encontrar um número de segurança no seu clipboard. Copiou-o correctamente?"; +"PRIVACY_VERIFICATION_FAILED_NO_SAFETY_NUMBERS_IN_CLIPBOARD" = "O Signal não conseguiu encontrar um número de segurança na sua área de trabalho. Copiou-o corretamente?"; /* Alert body when verifying with {{contact name}} */ -"PRIVACY_VERIFICATION_FAILED_THEY_HAVE_WRONG_KEY_FOR_ME" = "Cada par de utilizadores Signal partilha um número de segurança diferente. Verifique que %@ está a mostrar o *seu* número de segurança"; +"PRIVACY_VERIFICATION_FAILED_THEY_HAVE_WRONG_KEY_FOR_ME" = "Cada par de utilizadores do Signal partilha um número de segurança diferente. Verifique que %@ está a mostrar o *seu* número de segurança distinto."; /* alert body */ -"PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "Está a usar uma verão antiga. Necessita de fazer update para verificar."; +"PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "Está a usar uma verão antiga do Signal. Necessita de fazer uma atualização antes de poder verificar."; /* alert body */ -"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "A pessoa com quem está a conversar está a utilizar uma versão antiga. Ela necessita de fazer update para a poder verificar."; +"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "A pessoa com quem está a conversar está a utilizar uma versão antiga do Signal. Essa pessoa necessita de fazer uma atualização antes de você poder verificar."; /* alert body */ -"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "O código scaneado não parece um código de um número de segurança. Verifique que ambas as versões do signal estão actualizadas."; +"PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "O código digitalizado não parece ser um código de um número de segurança. Verifique que ambas as versões do Signal (a sua e a da outra pessoa) estão atualizadas."; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Se deseja verificar a segurança da sua cifragem ponto-a-ponto com %@, compare os números acima com os do outro dispositivo.\n\nTambém poderá scanear directamente o código nos dispositivos."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Se deseja verificar a segurança da sua cifragem ponto-a-ponto com %@, compare os números acima com os do outro dispositivo.\n\nTambém poderá digitalizar diretamente o código nono dispositivo da outra pessoa ou, pedir para essa pessoa digitalizar o código do seu dispositivo."; /* Navbar title */ -"PRIVACY_VERIFICATION_TITLE" = "Verificar Número de Segurança"; +"PRIVACY_VERIFICATION_TITLE" = "Verificar número de segurança"; /* Button that lets user mark another user's identity as verified. */ -"PRIVACY_VERIFY_BUTTON" = "Marcar como Verificado"; +"PRIVACY_VERIFY_BUTTON" = "Marcar como verificado"; /* No comment provided by engineer. */ "PROCEED_BUTTON" = "Continuar"; @@ -1623,16 +1623,16 @@ "PROFILE_NAME_LABEL_FORMAT" = "~%@"; /* Action Sheet title prompting the user for a profile avatar */ -"PROFILE_VIEW_AVATAR_ACTIONSHEET_TITLE" = "Definir Avatar de Perfil"; +"PROFILE_VIEW_AVATAR_ACTIONSHEET_TITLE" = "Definir avatar do perfil"; /* Label for action that clear's the user's profile avatar */ -"PROFILE_VIEW_CLEAR_AVATAR" = "Remover Avatar"; +"PROFILE_VIEW_CLEAR_AVATAR" = "Remover avatar"; /* Error message shown when user tries to update profile with a profile name that is too long. */ "PROFILE_VIEW_ERROR_PROFILE_NAME_TOO_LONG" = "O seu nome de perfil é demasiado longo."; /* Error message shown when a profile update fails. */ -"PROFILE_VIEW_ERROR_UPDATE_FAILED" = "Falha ao actualizar o perfil."; +"PROFILE_VIEW_ERROR_UPDATE_FAILED" = "Falha ao atualizar o perfil."; /* Default text for the profile name field of the profile view. */ "PROFILE_VIEW_NAME_DEFAULT_TEXT" = "Introduza o seu nome"; @@ -1641,10 +1641,10 @@ "PROFILE_VIEW_PROFILE_AVATAR_FIELD" = "Avatar"; /* Description of the user profile. */ -"PROFILE_VIEW_PROFILE_DESCRIPTION" = "O seu Perfil Signal estará visível para todos os seus contactos, quando inicia novas conversas, e quando o partilha com outros utilizadores ou grupos. "; +"PROFILE_VIEW_PROFILE_DESCRIPTION" = "O seu perfil do Signal estará visível para todos os seus contactos, quando inicia novas conversas, e quando você o partilha com outros utilizadores e grupos. "; /* Link to more information about the user profile. */ -"PROFILE_VIEW_PROFILE_DESCRIPTION_LINK" = "Toque para ver mais."; +"PROFILE_VIEW_PROFILE_DESCRIPTION_LINK" = "Toque para saber mais."; /* Label for the profile name field of the profile view. */ "PROFILE_VIEW_PROFILE_NAME_FIELD" = "Nome de perfil"; @@ -1656,37 +1656,37 @@ "PROFILE_VIEW_TITLE" = "Perfil"; /* Notification action button title */ -"PUSH_MANAGER_MARKREAD" = "Marcar como Lida"; +"PUSH_MANAGER_MARKREAD" = "Marcar como lida"; /* Notification action button title */ "PUSH_MANAGER_REPLY" = "Responder"; /* Title of alert shown when push tokens sync job succeeds. */ -"PUSH_REGISTER_SUCCESS" = "Reinscrever-se nas Push Notifications."; +"PUSH_REGISTER_SUCCESS" = "Reinscreveu-se com sucesso nas notificações push."; /* Used in table section header and alert view title contexts */ -"PUSH_REGISTER_TITLE" = "Push Notifications"; +"PUSH_REGISTER_TITLE" = "Notificações push"; /* No comment provided by engineer. */ "QUESTIONMARK_PUNCTUATION" = "?"; /* Indicates the author of a quoted message. Embeds {{the author's name or phone number}}. */ -"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "Responder a %@"; +"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "A responder a %@"; /* message header label when someone else is quoting you */ "QUOTED_REPLY_AUTHOR_INDICATOR_YOU" = "A responder-lhe"; /* message header label when quoting yourself */ -"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "A responder-se a si próprio"; +"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "A responder a si próprio"; /* Footer label that appears below quoted messages when the quoted content was not derived locally. When the local user doesn't have a copy of the message being quoted, e.g. if it had since been deleted, we instead show the content specified by the sender. */ -"QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "A mensagem original não foi encontrada."; +"QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "Não foi encontrada a mensagem original."; /* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message was since deleted. */ "QUOTED_REPLY_ORIGINAL_MESSAGE_DELETED" = "A mensagem original já não se encontra disponível."; /* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message didn't exist when the quote was received. */ -"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED" = "A mensagem original não foi encontrada."; +"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED" = "Não foi encontrada a mensagem original."; /* Indicates this message is a quoted reply to an attachment of unknown type. */ "QUOTED_REPLY_TYPE_ATTACHMENT" = "Anexo"; @@ -1707,49 +1707,49 @@ "REGISTER_2FA_FORGOT_PIN" = "Esqueci-me do PIN."; /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ -"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "O Registo deste número de telefone será possível sem o seu PIN de Bloqueio de Registo depois de 7 dias sem que o número tenha estado activo no Signal. "; +"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "O registo deste número de telefone será possível sem o seu PIN de bloqueio de registo após 7 dias sem que o número tenha estado ativo no Signal. "; /* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Este número de telefone tem o Bloqueio de Registo activado. Por favor introduza o seu PIN de Bloqueio de Registo.\n\nO seu PIN de Bloqueio de Registo é distinto do código de verificação que lhe é enviado durante o último passo do registo."; +"REGISTER_2FA_INSTRUCTIONS" = "Este número de telefone tem o bloqueio de registo ativo. Por favor introduza o seu PIN de bloqueio de registo.\n\nO seu PIN de bloqueio de registo é distinto do código de verificação que lhe é enviado durante o último passo do registo."; /* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Falha no Registo"; +"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Falha no registo"; /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Enviar"; /* No comment provided by engineer. */ -"REGISTER_CONTACTS_WELCOME" = "Bem-vindo!"; +"REGISTER_CONTACTS_WELCOME" = "Bem-vindo(a)!"; /* No comment provided by engineer. */ -"REGISTER_FAILED_TRY_AGAIN" = "Tente Novamente"; +"REGISTER_FAILED_TRY_AGAIN" = "Tentar novamente"; /* No comment provided by engineer. */ -"REGISTER_RATE_LIMITING_BODY" = "Tentou demasiado rápido. Por favor espere um minuto antes de voltar a tentar."; +"REGISTER_RATE_LIMITING_BODY" = "Tentou demasiadas vezes. Por favor espere um minuto antes de voltar a tentar."; /* No comment provided by engineer. */ "REGISTER_RATE_LIMITING_ERROR" = "Tentou demasiadas vezes. Por favor espere um minuto antes de voltar a tentar."; /* Title of alert shown when push tokens sync job fails. */ -"REGISTRATION_BODY" = "Falhou a reinscrição nas Push Notifications."; +"REGISTRATION_BODY" = "Falhou a reinscrição nas notificações push."; /* Label for the country code field */ -"REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código do País"; +"REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código do país"; /* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueio de Registo"; +"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueio de registo"; /* Placeholder text for the phone number textfield */ -"REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introduza um N.º"; +"REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introduza um n.º"; /* No comment provided by engineer. */ -"REGISTRATION_ERROR" = "Erro no Registo"; +"REGISTRATION_ERROR" = "Erro no registo"; /* alert body during registration */ -"REGISTRATION_ERROR_BLANK_VERIFICATION_CODE" = "Não é possível activar a sua conta até verificar o código que lhe foi enviado."; +"REGISTRATION_ERROR_BLANK_VERIFICATION_CODE" = "Não é possível ativar a sua conta até que você verifique o código que lhe foi enviado."; /* alert body when registering an iPad */ -"REGISTRATION_IPAD_CONFIRM_BODY" = "O serviço de registo estará indisponível a partir de qualquer outro dispositivo registado com este número."; +"REGISTRATION_IPAD_CONFIRM_BODY" = "Ao registar agora irá desativar o Signal em qualquer outro dispositivo atualmente registado com este número."; /* button text to proceed with registration when on an iPad */ "REGISTRATION_IPAD_CONFIRM_BUTTON" = "Registar este iPad"; @@ -1758,49 +1758,49 @@ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Já possui uma conta Signal?"; /* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Termos e Política de Privacidade"; +"REGISTRATION_LEGAL_TERMS_LINK" = "Termos e política de privacidade"; /* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ "REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ao registar o seu dispositivo, está a aceitar %@ do Signal"; /* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "Termos"; +"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "termos"; /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Este formato de número de telefone não é suportado, por favor contacte o nosso suporte técnico."; /* Label for the phone number textfield */ -"REGISTRATION_PHONENUMBER_BUTTON" = "N.º de Telefone"; +"REGISTRATION_PHONENUMBER_BUTTON" = "N.º de telefone"; /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "É necessário registar-se antes de poder enviar a mensagem."; /* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "O Meu Número"; +"REGISTRATION_TITLE_LABEL" = "O seu n.º de telefone"; /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Falha na verificação"; /* Error message indicating that registration failed due to a missing or incorrect verification code. */ -"REGISTRATION_VERIFICATION_FAILED_WRONG_CODE_DESCRIPTION" = "Os números que submeteu não coincidem com os que enviamos. Por favor verifique novamente."; +"REGISTRATION_VERIFICATION_FAILED_WRONG_CODE_DESCRIPTION" = "Os números que submeteu não coincidem com os que enviamos. Deseja verificar novamente?"; /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ -"REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN Incorrecto para Bloqueio de Registo"; +"REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN de bloqueio de registo incorreto"; /* No comment provided by engineer. */ "REGISTRATION_VERIFY_DEVICE" = "Registar"; /* Message of alert indicating that users needs to enter a valid phone number to register. */ -"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor introduza um número de telefone válido."; +"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor, introduza um número de telefone válido."; /* Title of alert indicating that users needs to enter a valid phone number to register. */ -"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE" = "Número de Telefone Inválido"; +"REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE" = "Número de telefone inválido"; /* Message of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor introduza um número de telefone a registar."; +"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor, introduza um número de telefone para registar."; /* Title of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "Sem Número de Telefone"; +"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "Sem número de telefone"; /* notification action */ "REJECT_CALL_BUTTON_TITLE" = "Rejeitar"; @@ -1809,49 +1809,49 @@ "RELAY_REGISTERED_ERROR_RECOVERY" = "O número de telefone que pretende registar já se encontra registado noutro servidor, por favor desregiste-o e tente novamente."; /* Body text for when user is periodically prompted to enter their registration lock PIN */ -"REMINDER_2FA_BODY" = "O Bloqueio de Registo está activo para o seu número de telefone. Para ajudar a memorizar o seu PIN para o Bloqueio de Registo, o Signal pedirá para confirma-lo periodicamente."; +"REMINDER_2FA_BODY" = "O bloqueio de registo está ativo para o seu número. Para ajudar a memorizar o seu PIN de bloqueio de registo, o Signal vai pedir para o confirmar periodicamente."; /* Body header for when user is periodically prompted to enter their registration lock PIN */ "REMINDER_2FA_BODY_HEADER" = "Lembrete:"; /* Alert message explaining what happens if you forget your 'two-factor auth pin' */ -"REMINDER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "O Bloqueio de Registo ajuda a proteger o seu número de telefone de tentativas não autorizadas de registo. Esta característica pode ser desactivada a qualquer altura nas definições de privacidade."; +"REMINDER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "O PIN de registo ajuda-o/a a proteger o seu número de telefone de tentativas não autorizadas de registo. Esta capacidade pode ser desativada em qualquer altura, acedendo às definições de privacidade do Signal"; /* Navbar title for when user is periodically prompted to enter their registration lock PIN */ -"REMINDER_2FA_NAV_TITLE" = "Introduza o seu PIN para o Bloqueio de Registo"; +"REMINDER_2FA_NAV_TITLE" = "Introduza o seu PIN de bloqueio de registo"; /* Alert body after wrong guess for 'two-factor auth pin' reminder activity */ "REMINDER_2FA_WRONG_PIN_ALERT_BODY" = "Pode alterar o PIN nas definições de privacidade."; /* Alert title after wrong guess for 'two-factor auth pin' reminder activity */ -"REMINDER_2FA_WRONG_PIN_ALERT_TITLE" = "PIN Incorrecto."; +"REMINDER_2FA_WRONG_PIN_ALERT_TITLE" = "PIN incorrecto."; /* No comment provided by engineer. */ -"REREGISTER_FOR_PUSH" = "Reinscrever-se nas Push Notifications"; +"REREGISTER_FOR_PUSH" = "Reinscrever-se nas notificações push "; /* Generic text for button that retries whatever the last action was. */ "RETRY_BUTTON_TEXT" = "Tentar novamente"; /* button title to confirm adding a recipient to a group when their safety number has recently changed */ -"SAFETY_NUMBER_CHANGED_CONFIRM_ADD_TO_GROUP_ACTION" = "Adicionar ao Grupo ainda assim"; +"SAFETY_NUMBER_CHANGED_CONFIRM_ADD_TO_GROUP_ACTION" = "Mesmo assim, adicionar ao grupo"; /* alert button text to confirm placing an outgoing call after the recipients Safety Number has changed. */ -"SAFETY_NUMBER_CHANGED_CONFIRM_CALL_ACTION" = "Chamar ainda assim"; +"SAFETY_NUMBER_CHANGED_CONFIRM_CALL_ACTION" = "Mesmo assim, telefonar"; /* button title to confirm sending to a recipient whose safety number recently changed */ -"SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Enviar ainda assim"; +"SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Mesmo assim, enviar"; /* Snippet to share {{safety number}} with a friend. sent e.g. via SMS */ -"SAFETY_NUMBER_SHARE_FORMAT" = "O nosso Número de Segurança Signal:\n%@"; +"SAFETY_NUMBER_SHARE_FORMAT" = "O nosso número de segurança signal:\n%@"; /* Action sheet heading */ "SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "O número de segurança com %@ mudou. Poderá querer verificá-lo."; /* label presented once scanning (camera) view is visible. */ -"SCAN_CODE_INSTRUCTIONS" = "Scaneie o código QR no dispositivo do seu contacto."; +"SCAN_CODE_INSTRUCTIONS" = "Digitalize o código QR no dispositivo do seu contacto."; /* Title for the 'scan QR code' view. */ -"SCAN_QR_CODE_VIEW_TITLE" = " Scanear código QR"; +"SCAN_QR_CODE_VIEW_TITLE" = "Digitalizar código QR"; /* Indicates a delay of zero seconds, and that 'screen lock activity' will timeout immediately. */ "SCREEN_LOCK_ACTIVITY_TIMEOUT_NONE" = "Instantaneamente"; @@ -1863,22 +1863,22 @@ "SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_FAILED" = "Autenticação falhou."; /* Indicates that Touch ID/Face ID/Phone Passcode is 'locked out' on this device due to authentication failures. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_LOCKOUT" = "Demasiadas tentativas de autenticação. Por favor tente mais tarde."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_LOCKOUT" = "Demasiadas tentativas de autenticação. Por favor, tente mais tarde."; /* Indicates that Touch ID/Face ID/Phone Passcode are not available on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Deve activar a password alfa-numérica do iOS para usar o Bloqueio de Ecrã."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Deverá ativar a palavra-passe nas definições do seu iOS para poder utilizar o bloqueio de ecrã."; /* Indicates that Touch ID/Face ID/Phone Passcode is not configured on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Deve activar a password alfa-numérica do iOS para usar o Bloqueio de Ecrã."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Deverá ativar a palavra-passe nas definições do seu iOS para poder utilizar o bloqueio de ecrã."; /* Indicates that Touch ID/Face ID/Phone Passcode passcode is not set. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Deve activar a password alfa-numérica do iOS para usar o Bloqueio de Ecrã."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Deverá ativar a palavra-passe nas definições do seu iOS para poder utilizar o bloqueio de ecrã."; /* Description of how and why Signal iOS uses Touch ID/Face ID/Phone Passcode to unlock 'screen lock'. */ "SCREEN_LOCK_REASON_UNLOCK_SCREEN_LOCK" = "Autentique-se para abrir o Signal."; /* Title for alert indicating that screen lock could not be unlocked. */ -"SCREEN_LOCK_UNLOCK_FAILED" = "Falha na Autenticação"; +"SCREEN_LOCK_UNLOCK_FAILED" = "Falha na autenticação"; /* Label for button on lock screen that lets users unlock Signal. */ "SCREEN_LOCK_UNLOCK_SIGNAL" = "Desbloquear o Signal"; @@ -1887,7 +1887,7 @@ "SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT" = "Procurar por nome ou número"; /* section header for search results that match a contact who doesn't have an existing conversation */ -"SEARCH_SECTION_CONTACTS" = "Outros Contactos"; +"SEARCH_SECTION_CONTACTS" = "Outros contactos"; /* section header for search results that match existing conversations (either group or contact conversations) */ "SEARCH_SECTION_CONVERSATIONS" = "Conversas"; @@ -1896,19 +1896,19 @@ "SEARCH_SECTION_MESSAGES" = "Mensagens"; /* No comment provided by engineer. */ -"SECURE_SESSION_RESET" = "Sessão segura foi reiniciada."; +"SECURE_SESSION_RESET" = "Foi reiniciada uma sessão segura."; /* Label for 'select GIF to attach' action sheet button */ "SELECT_GIF_BUTTON" = "GIF"; /* Table section header for conversations you haven't recently used. */ -"SELECT_THREAD_TABLE_OTHER_CHATS_TITLE" = "Outros Contactos"; +"SELECT_THREAD_TABLE_OTHER_CHATS_TITLE" = "Outros contactos"; /* Table section header for recently active conversations */ "SELECT_THREAD_TABLE_RECENT_CHATS_TITLE" = "Conversas recentes"; /* No comment provided by engineer. */ -"SEND_AGAIN_BUTTON" = "Enviar Novamente"; +"SEND_AGAIN_BUTTON" = "Reenviar"; /* Label for the button to send a message */ "SEND_BUTTON_TITLE" = "Enviar"; @@ -1917,7 +1917,7 @@ "SEND_FAILED_NOTIFICATION_BODY" = "Não foi possível enviar a sua mensagem."; /* Alert body after invite failed */ -"SEND_INVITE_FAILURE" = "Falha a enviar o convite, por favor tente mais tarde."; +"SEND_INVITE_FAILURE" = "Falha a enviar o convite. Por favor, tente mais tarde."; /* Alert body after invite succeeded */ "SEND_INVITE_SUCCESS" = "Convidou o seu amigo para usar o Signal!"; @@ -1929,46 +1929,46 @@ "SEND_SMS_CONFIRM_TITLE" = "Convidar um amigo por SMS inseguro?"; /* No comment provided by engineer. */ -"SEND_SMS_INVITE_TITLE" = "Deseja convidar o seguinte número para usar Signal:"; +"SEND_SMS_INVITE_TITLE" = "Deseja convidar o seguinte número para utilizar o Signal:"; /* Navbar title */ "SETTINGS_ABOUT" = "Acerca de"; /* Title for the 'block contact' section of the 'add to block list' view. */ -"SETTINGS_ADD_TO_BLOCK_LIST_BLOCK_CONTACT_TITLE" = "Bloquear Contacto"; +"SETTINGS_ADD_TO_BLOCK_LIST_BLOCK_CONTACT_TITLE" = "Bloquear contacto"; /* Title for the 'block phone number' section of the 'add to block list' view. */ -"SETTINGS_ADD_TO_BLOCK_LIST_BLOCK_PHONE_NUMBER_TITLE" = "Bloquear Número de Telefone"; +"SETTINGS_ADD_TO_BLOCK_LIST_BLOCK_PHONE_NUMBER_TITLE" = "Bloquear número de telefone"; /* Title for the 'add to block list' view. */ "SETTINGS_ADD_TO_BLOCK_LIST_TITLE" = "Bloquear"; /* Label for the 'manual censorship circumvention' switch. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION" = " Circunscrição de Censura "; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION" = " Circunscrição de censura "; /* Label for the 'manual censorship circumvention' country. Embeds {{the manual censorship circumvention country}}. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_COUNTRY_FORMAT" = "Localização: %@"; /* Table footer for the 'censorship circumvention' section when censorship circumvention can be manually enabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER" = "Se activada, o Signal ira tentar circunscrever a censura. Apenas active esta opção em locais onde o Signal é censurado."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER" = "Se ativo, o Signal ira tentar circunscrever a censura. Apenas ative esta opção em locais onde o Signal é censurado."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A circunscrição de censura foi activada baseada no número de telefone da sua conta."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A circunscrição de censura foi ativada baseada no número de telefone da sua conta."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Circunscrição de censura só pode ser activada enquanto existe ligação à internet."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Circunscrição de censura só pode ser ativada enquanto existe ligação à internet."; /* Table footer for the 'censorship circumvention' section shown when the app is connected to the Signal service. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_WEBSOCKET_CONNECTED" = "A circunscrição de censura não é necessária, já se encontra ligado ao serviço Signal."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_WEBSOCKET_CONNECTED" = "A circunscrição de censura não é necessária, já se encontra ligado ao serviço do Signal."; /* Table header for the 'censorship circumvention' section. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = " Circunscrição de Censura"; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = " Circunscrição de censura"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_DEBUGLOG" = "Activar Relatório de Erros"; +"SETTINGS_ADVANCED_DEBUGLOG" = "Ativar relatório de depuração"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Enviar Relatório de Erros"; +"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Enviar relatório de depuração"; /* No comment provided by engineer. */ "SETTINGS_ADVANCED_TITLE" = "Avançado"; @@ -1977,16 +1977,16 @@ "SETTINGS_AUDIO_DEFAULT_TONE_LABEL_FORMAT" = "%@ (por defeito)"; /* Label for the backup view in app settings. */ -"SETTINGS_BACKUP" = "Backup"; +"SETTINGS_BACKUP" = "Cópia de segurança"; /* Label for 'backup now' button in the backup settings view. */ -"SETTINGS_BACKUP_BACKUP_NOW" = "Efectuar Backup Agora"; +"SETTINGS_BACKUP_BACKUP_NOW" = "Efetuar cópia de segurança agora"; /* Label for 'cancel backup' button in the backup settings view. */ -"SETTINGS_BACKUP_CANCEL_BACKUP" = "Cancelar Backup"; +"SETTINGS_BACKUP_CANCEL_BACKUP" = "Cancelar cópia de segurança"; /* Label for switch in settings that controls whether or not backup is enabled. */ -"SETTINGS_BACKUP_ENABLING_SWITCH" = "Backup Activo"; +"SETTINGS_BACKUP_ENABLING_SWITCH" = "Cópia de segurança ativa"; /* Label for iCloud status row in the in the backup settings view. */ "SETTINGS_BACKUP_ICLOUD_STATUS" = "Estado do iCloud"; @@ -1995,13 +1995,13 @@ "SETTINGS_BACKUP_IMPORT_STATUS_FAILED" = "Falha a restaurar da cópia de segurança"; /* Indicates that app is not restoring up. */ -"SETTINGS_BACKUP_IMPORT_STATUS_IDLE" = "Restauro da Cópia de Segurança Inactivo"; +"SETTINGS_BACKUP_IMPORT_STATUS_IDLE" = "Restauro da cópia de segurança inativo"; /* Indicates that app is restoring up. */ -"SETTINGS_BACKUP_IMPORT_STATUS_IN_PROGRESS" = "A Restaurar Cópia de Segurança"; +"SETTINGS_BACKUP_IMPORT_STATUS_IN_PROGRESS" = "A restaurar cópia de segurança"; /* Indicates that the last backup restore succeeded. */ -"SETTINGS_BACKUP_IMPORT_STATUS_SUCCEEDED" = "Restauro da Cópia de Segurança Bem Sucedido"; +"SETTINGS_BACKUP_IMPORT_STATUS_SUCCEEDED" = "Restauro da cópia de segurança bem sucedido"; /* Label for phase row in the in the backup settings view. */ "SETTINGS_BACKUP_PHASE" = "Fase"; @@ -2013,58 +2013,58 @@ "SETTINGS_BACKUP_STATUS" = "Estado"; /* Indicates that the last backup failed. */ -"SETTINGS_BACKUP_STATUS_FAILED" = "Backup Falhou"; +"SETTINGS_BACKUP_STATUS_FAILED" = "Falha ao criar cópia de segurança"; /* Indicates that app is not backing up. */ "SETTINGS_BACKUP_STATUS_IDLE" = "A esperar"; /* Indicates that app is backing up. */ -"SETTINGS_BACKUP_STATUS_IN_PROGRESS" = "A Efectuar Backup"; +"SETTINGS_BACKUP_STATUS_IN_PROGRESS" = "A efetuar cópia de segurança"; /* Indicates that the last backup succeeded. */ -"SETTINGS_BACKUP_STATUS_SUCCEEDED" = "Backup Efectuado com Sucesso"; +"SETTINGS_BACKUP_STATUS_SUCCEEDED" = "Cópia de segurança efetuada com sucesso"; /* A label for the 'add phone number' button in the block list table. */ -"SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Adicionar um Utilizador Bloqueado"; +"SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Adicionar um utilizador bloqueado"; /* A label that indicates the user has no Signal contacts. */ "SETTINGS_BLOCK_LIST_NO_CONTACTS" = "Não possui contactos no Signal."; /* A label that indicates the user's search has no matching results. */ -"SETTINGS_BLOCK_LIST_NO_SEARCH_RESULTS" = "Sem Resultados"; +"SETTINGS_BLOCK_LIST_NO_SEARCH_RESULTS" = "Pesquisa sem resultados"; /* Label for the block list section of the settings view */ -"SETTINGS_BLOCK_LIST_TITLE" = "Utilizadores Bloqueados"; +"SETTINGS_BLOCK_LIST_TITLE" = "Utilizadores bloqueados"; /* Table cell label */ "SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE" = "Passar chamadas pelo Signal"; /* User settings section footer, a detailed explanation */ -"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE_DETAIL" = "Todas as suas chamadas passarão pelo servidor Signal para evitar revelar o seu endereço IP ao seu contacto. Quando activada a chamada terá pior qualidade."; +"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE_DETAIL" = "Todas as suas chamadas passarão pelo servidor Signal para evitar revelar o seu endereço IP ao seu contacto. Quando ativa a chamada verá reduzida a sua qualidade."; /* No comment provided by engineer. */ -"SETTINGS_CLEAR_HISTORY" = "Apagar Histórico"; +"SETTINGS_CLEAR_HISTORY" = "Apagar histórico de conversação"; /* No comment provided by engineer. */ -"SETTINGS_COPYRIGHT" = "Copyright Signal Messenger\nDistribuição guiada pela licença GPLv3"; +"SETTINGS_COPYRIGHT" = "Copyright Signal Messenger \n Distribuição guiada pela licença GPLv3"; /* No comment provided by engineer. */ -"SETTINGS_DELETE_ACCOUNT_BUTTON" = "Eliminar Conta"; +"SETTINGS_DELETE_ACCOUNT_BUTTON" = "Eliminar conta"; /* Label for 'delete data' button. */ -"SETTINGS_DELETE_DATA_BUTTON" = "Apagar Todos os Dados"; +"SETTINGS_DELETE_DATA_BUTTON" = "Apagar todos os dados"; /* Alert message before user confirms clearing history */ -"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Tem a certeza que quer apagar todo o seu histórico (mensagens, anexos, registo de chamadas ...) ? Esta acção é irreversível."; +"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Tem a certeza que quer apagar todo o seu histórico (mensagens, anexos, registo de chamadas ...) ? Esta ação é irreversível."; /* Confirmation text for button which deletes all message, calling, attachments, etc. */ -"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Apagar Tudo"; +"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Apagar tudo"; /* No comment provided by engineer. */ "SETTINGS_HELP_HEADER" = "Ajuda"; /* Section header */ -"SETTINGS_HISTORYLOG_TITLE" = "Apagar Histórico"; +"SETTINGS_HISTORYLOG_TITLE" = "Apagar histórico de conversação"; /* No comment provided by engineer. */ "SETTINGS_INFORMATION_HEADER" = "Informação"; @@ -2073,13 +2073,13 @@ "SETTINGS_INVITE_TITLE" = "Convide os seus amigos"; /* content of tweet when inviting via twitter - please do not translate URL */ -"SETTINGS_INVITE_TWITTER_TEXT" = "Podes contactar-me através do @signalapp. Podes descarrega-lo desde https://signal.org/download/"; +"SETTINGS_INVITE_TWITTER_TEXT" = "Podes contactar-me através de @signalapp. Podes descarrega-lo desde https://signal.org/download/"; /* Label for settings view that allows user to change the notification sound. */ -"SETTINGS_ITEM_NOTIFICATION_SOUND" = "Som de Mensagem"; +"SETTINGS_ITEM_NOTIFICATION_SOUND" = "Som de mensagem"; /* table cell label */ -"SETTINGS_LEGAL_TERMS_CELL" = "Termos e Política de Privacidade"; +"SETTINGS_LEGAL_TERMS_CELL" = "Termos e política de privacidade"; /* Setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS" = "Enviar pré-visualização de hiperligações"; @@ -2094,58 +2094,58 @@ "SETTINGS_NAV_BAR_TITLE" = "Definições"; /* table section footer */ -"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Notificações de Chamada e Mensagem poderão aparecer enquanto o seu telefone está bloqueado. Poderá querer limitar o que é apresentado."; +"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "As notificações de chamada e mensagem poderão aparecer enquanto o seu telefone está bloqueado. Poderá querer limitar o que é apresentado."; /* table section header */ -"SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Notificações"; +"SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Conteúdo das notificações"; /* No comment provided by engineer. */ "SETTINGS_NOTIFICATIONS" = "Notificações"; /* Label for 'CallKit privacy' preference */ -"SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE" = "Mostrar Nome e Número"; +"SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE" = "Mostrar nome e número"; /* Settings table section footer. */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Mostrar chamadas em lista \"Recente\" na App Telefone"; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Mostrar chamadas em lista \"Recente\" na aplicação telefone do iOS."; /* Short table cell label */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "Mostrar Chamadas em Recente"; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "Mostrar chamadas em \"Recente\""; /* Short table cell label */ -"SETTINGS_PRIVACY_CALLKIT_TITLE" = "Integração de chamadas iOS"; +"SETTINGS_PRIVACY_CALLKIT_TITLE" = "Integração nas chamadas iOS"; /* Settings table view cell label */ "SETTINGS_PRIVACY_TITLE" = "Privacidade"; /* Label for the 'read receipts' setting. */ -"SETTINGS_READ_RECEIPT" = "Notificações de Leitura"; +"SETTINGS_READ_RECEIPT" = "Notificações de leitura"; /* An explanation of the 'read receipts' setting. */ "SETTINGS_READ_RECEIPTS_SECTION_FOOTER" = "Veja e partilhe quando as mensagens são lidas. Esta definição é opcional e aplica-se a todas as suas conversas."; /* Label for re-registration button. */ -"SETTINGS_REREGISTER_BUTTON" = "Voltar a Registar"; +"SETTINGS_REREGISTER_BUTTON" = "Voltar a registar"; /* Label for the 'screen lock activity timeout' setting of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT" = "Tempo para o Bloqueio de Ecrã "; +"SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT" = "Tempo para o bloqueio de ecrã "; /* Footer for the 'screen lock' section of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Desbloqueie o ecrã do Signal usando Touch ID, Face ID, ou o seu código do iOS. Poderá sempre receber chamadas e notificações de mensagens enquanto tenha o ecrã bloqueado. As notificações do Signal permitem alterar a informação que é apresentada."; +"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Desbloqueie o ecrã do Signal utilizando o Touch ID, Face ID, ou o seu código do iOS. Poderá sempre receber chamadas e notificações de mensagens enquanto tenha o ecrã bloqueado. As definições das notificações do Signal permitem alterar a informação que é apresentada."; /* Title for the 'screen lock' section of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SECTION_TITLE" = "Bloqueio de Ecrã "; +"SETTINGS_SCREEN_LOCK_SECTION_TITLE" = "Bloqueio de ecrã "; /* Label for the 'enable screen lock' switch of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SWITCH_LABEL" = "Bloqueio de Ecrã "; +"SETTINGS_SCREEN_LOCK_SWITCH_LABEL" = "Bloqueio de ecrã "; /* No comment provided by engineer. */ -"SETTINGS_SCREEN_SECURITY" = "Activar Segurança de Ecrã"; +"SETTINGS_SCREEN_SECURITY" = "Ativar a segurança de ecrã"; /* No comment provided by engineer. */ -"SETTINGS_SCREEN_SECURITY_DETAIL" = "Prevenir pré-visualizações do Signal no app switcher."; +"SETTINGS_SCREEN_SECURITY_DETAIL" = "Prevenir pré-visualizações do Signal no alternador da aplicação."; /* Settings table section footer. */ -"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "A integração de chamadas iOS mostra as chamadas Signal no seu lock screen e no seu histórico de chamadas. Se o iCloud estiver activado, o histórico de chamadas será partilhado com a Apple."; +"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "A integração nas chamadas iOS mostra as chamadas Signal no seu ecrã de bloqueio e no seu histórico de chamadas. Se o iCloud estiver ativado, o histórico de chamadas será partilhado com a Apple."; /* Label for the notifications section of conversation settings view. */ "SETTINGS_SECTION_NOTIFICATIONS" = "Notificações"; @@ -2154,55 +2154,55 @@ "SETTINGS_SECTION_SOUNDS" = "Sons"; /* settings topic header for table section */ -"SETTINGS_SECTION_TITLE_CALLING" = "Chamadas"; +"SETTINGS_SECTION_TITLE_CALLING" = "A chamar"; /* Section header */ -"SETTINGS_SECURITY_TITLE" = "Segurança de Ecrã"; +"SETTINGS_SECURITY_TITLE" = "Segurança de ecrã"; /* No comment provided by engineer. */ "SETTINGS_SUPPORT" = "Suporte"; /* Indicates that 'two factor auth' is disabled in the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Desactivado"; +"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Desativada"; /* Indicates that 'two factor auth' is enabled in the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_ENABLED" = "Activado"; +"SETTINGS_TWO_FACTOR_AUTH_ENABLED" = "Ativada"; /* Label for the 'two factor auth' item of the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_ITEM" = "Bloqueio de Registo"; +"SETTINGS_TWO_FACTOR_AUTH_ITEM" = "Bloqueio de registo"; /* Title for the 'two factor auth' section of the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_TITLE" = "Bloqueio de Registo"; +"SETTINGS_TWO_FACTOR_AUTH_TITLE" = "Bloqueio de registo"; /* Label for the 'typing indicators' setting. */ -"SETTINGS_TYPING_INDICATORS" = "Indicadores de Escrita"; +"SETTINGS_TYPING_INDICATORS" = "Indicadores de escrita"; /* An explanation of the 'typing indicators' setting. */ "SETTINGS_TYPING_INDICATORS_FOOTER" = "Veja e partilhe quando as mensagens estão a ser escritas. Esta definição é opcional e aplica-se a todas as conversas."; /* Label for a link to more info about unidentified delivery. */ -"SETTINGS_UNIDENTIFIED_DELIVERY_LEARN_MORE" = "Saber Mais"; +"SETTINGS_UNIDENTIFIED_DELIVERY_LEARN_MORE" = "Saber mais"; /* table section label */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SECTION_TITLE" = "Emissor Selado"; +"SETTINGS_UNIDENTIFIED_DELIVERY_SECTION_TITLE" = "Emissor selado"; /* switch label */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Indicadores de Visualização"; +"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Indicadores de visualização"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Mostrar um ícone de estado quando seleciona \"Mais info\" em mensagens que foram entregues utilizando o emissor selado."; +"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Mostrar um ícone de estado quando seleciona \"Mais informação\" em mensagens que foram entregues utilizando o emissor selado."; /* switch label */ -"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS" = "Permitir de Todos"; +"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS" = "Permitir de todos"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Activar o emissor selado para mensagens recebidas de números que não se encontram na sua lista de contactos e pessoas com as quais não partilhou o seu perfil."; +"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Ativar o emissor selado para mensagens recebidas de números que não se encontram na sua lista de contactos e pessoas com as quais não partilhou o seu perfil."; /* No comment provided by engineer. */ "SETTINGS_VERSION" = "Versão"; /* action sheet item to open native mail app */ -"SHARE_ACTION_MAIL" = "Email"; +"SHARE_ACTION_MAIL" = "E-mail"; /* action sheet item to open native messages app */ "SHARE_ACTION_MESSAGE" = "Mensagem"; @@ -2214,52 +2214,52 @@ "SHARE_EXTENSION_FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_FORMAT" = "O seu número de segurança com %@ mudou recentemente. Poderá querer verificá-lo na aplicação principal antes de reenviar."; /* Indicates that the share extension is still loading. */ -"SHARE_EXTENSION_LOADING" = "A Carregar..."; +"SHARE_EXTENSION_LOADING" = "A carregar..."; /* Message indicating that the share extension cannot be used until the user has registered in the main app. */ -"SHARE_EXTENSION_NOT_REGISTERED_MESSAGE" = "Lançar Signal para registar."; +"SHARE_EXTENSION_NOT_REGISTERED_MESSAGE" = "Iniciar a aplicação Signal para registar."; /* Title indicating that the share extension cannot be used until the user has registered in the main app. */ -"SHARE_EXTENSION_NOT_REGISTERED_TITLE" = "Não Registado"; +"SHARE_EXTENSION_NOT_REGISTERED_TITLE" = "Não registado"; /* Message indicating that the share extension cannot be used until the main app has been launched at least once. */ -"SHARE_EXTENSION_NOT_YET_MIGRATED_MESSAGE" = "Lançar Signal pra actualizar ou registar."; +"SHARE_EXTENSION_NOT_YET_MIGRATED_MESSAGE" = "Iniciar a aplicação Signal para atualizar ou registar."; /* Title indicating that the share extension cannot be used until the main app has been launched at least once. */ -"SHARE_EXTENSION_NOT_YET_MIGRATED_TITLE" = "Não Preparado"; +"SHARE_EXTENSION_NOT_YET_MIGRATED_TITLE" = "Não preparado"; /* Alert title */ -"SHARE_EXTENSION_SENDING_FAILURE_TITLE" = "Não foi Possível Enviar Anexo"; +"SHARE_EXTENSION_SENDING_FAILURE_TITLE" = "Não foi possível enviar anexo"; /* Alert title */ -"SHARE_EXTENSION_SENDING_IN_PROGRESS_TITLE" = "A enviar..."; +"SHARE_EXTENSION_SENDING_IN_PROGRESS_TITLE" = "A carregar..."; /* Shown when trying to share content to a Signal user for the share extension. Followed by failure details. */ -"SHARE_EXTENSION_UNABLE_TO_BUILD_ATTACHMENT_ALERT_TITLE" = "Incapaz de Preparar Anexo"; +"SHARE_EXTENSION_UNABLE_TO_BUILD_ATTACHMENT_ALERT_TITLE" = "Não foi possível preparar anexo"; /* Title for the 'share extension' view. */ "SHARE_EXTENSION_VIEW_TITLE" = "Partilhar pelo Signal"; /* Action sheet item */ -"SHOW_SAFETY_NUMBER_ACTION" = "Mostrar Número de Segurança "; +"SHOW_SAFETY_NUMBER_ACTION" = "Mostrar número de segurança "; /* notification action */ -"SHOW_THREAD_BUTTON_TITLE" = "Mostrar Conversa"; +"SHOW_THREAD_BUTTON_TITLE" = "Mostrar conversa"; /* body sent to contacts when inviting to Install Signal */ -"SMS_INVITE_BODY" = "Estou a convidar-te para instalar o Signal! Aqui está o link: "; +"SMS_INVITE_BODY" = "Estou a convidá-lo(a) para instalar o Signal! Aqui está a hiperligação: "; /* Label for the 'no sound' option that allows users to disable sounds for notifications, etc. */ "SOUNDS_NONE" = "Nenhum"; /* Alert body after verifying privacy with {{other user's name}} */ -"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "O número de segurança corresponde com %@. Pode marca o contacto como verificado."; +"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "O número de segurança corresponde com %@. Você pode marcar o contacto como verificado."; /* No comment provided by engineer. */ -"SUCCESSFUL_VERIFICATION_TITLE" = "Número de segurança é valido!"; +"SUCCESSFUL_VERIFICATION_TITLE" = "O número de segurança corresponde!"; /* Label for button to verify a user's safety number. */ -"SYSTEM_MESSAGE_ACTION_VERIFY_SAFETY_NUMBER" = "Verificar Número de Segurança"; +"SYSTEM_MESSAGE_ACTION_VERIFY_SAFETY_NUMBER" = "Verificar número de segurança"; /* {{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 days}}'. See other *_TIME_AMOUNT strings */ "TIME_AMOUNT_DAYS" = "%@ dias"; @@ -2307,7 +2307,7 @@ "TXT_CANCEL_TITLE" = "Cancelar"; /* No comment provided by engineer. */ -"TXT_DELETE_TITLE" = "Apagar"; +"TXT_DELETE_TITLE" = "Eliminar"; /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Desarquivar"; @@ -2319,7 +2319,7 @@ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Este utilizador não está nos seus contactos. Deseja bloquear este utilizador?"; /* Displayed if for some reason we can't determine a contacts phone number *or* name */ -"UNKNOWN_CONTACT_NAME" = "Contacto Desconhecido"; +"UNKNOWN_CONTACT_NAME" = "Contacto desconhecido"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconhecido"; @@ -2328,13 +2328,13 @@ "UNLINK_ACTION" = "Desassociar"; /* Alert message to confirm unlinking a device */ -"UNLINK_CONFIRMATION_ALERT_BODY" = "Ao desassociar este dispositivo, não será capaz de receber ou enviar mensagens."; +"UNLINK_CONFIRMATION_ALERT_BODY" = "Ao desassociar este dispositivo, deixará de ser capaz de receber ou enviar mensagens."; /* Alert title for confirming device deletion */ "UNLINK_CONFIRMATION_ALERT_TITLE" = "Desassociar \"%@\"?"; /* Alert title when unlinking device fails */ -"UNLINKING_FAILED_ALERT_TITLE" = "Signal foi incapaz de desassociar o dispositivo."; +"UNLINKING_FAILED_ALERT_TITLE" = "O Signal foi incapaz de desassociar o dispositivo."; /* Label text in device manager for a device with no name */ "UNNAMED_DEVICE" = "Dispositivo sem nome"; @@ -2343,7 +2343,7 @@ "UNREGISTER_SIGNAL_FAIL" = "Falha a desregistar-se "; /* No comment provided by engineer. */ -"UNSUPPORTED_ATTACHMENT" = "Recebeu um ficheiro de tipo não suportado."; +"UNSUPPORTED_ATTACHMENT" = "Recebeu um ficheiro de um tipo não suportado."; /* No comment provided by engineer. */ "UNSUPPORTED_FEATURE_ERROR" = "O seu dispositivo não suporta esta característica."; @@ -2352,82 +2352,82 @@ "UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_MESSAGE" = "Não pode remover membros do grupo. Eles terão de sair, ou poderá criar um novo grupo sem este membro."; /* Title for alert indicating that group members can't be removed. */ -"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE" = "Não Suportado"; +"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE" = "Não suportado"; /* Description of CallKit to upgrading (existing) users */ -"UPGRADE_EXPERIENCE_CALLKIT_DESCRIPTION" = "Atender chamadas a partir do seu lock screen é simples com a integração de chamadas do iOS. Os contactos são anonimizados por defeito."; +"UPGRADE_EXPERIENCE_CALLKIT_DESCRIPTION" = "Atender chamadas a partir do seu ecrã de bloqueio é simples com a integração de chamadas do iOS. Os contactos são anónimos por defeito."; /* button label shown once when when user upgrades app, in context of call kit */ -"UPGRADE_EXPERIENCE_CALLKIT_PRIVACY_SETTINGS_BUTTON" = "Saiba mais nas definições de privacidade."; +"UPGRADE_EXPERIENCE_CALLKIT_PRIVACY_SETTINGS_BUTTON" = "Saiba mais nas suas definições de privacidade."; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_CALLKIT_TITLE" = "Arrastar para Atender"; +"UPGRADE_EXPERIENCE_CALLKIT_TITLE" = "Arrastar para atender"; /* button label shown one time, after upgrade */ -"UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Activar Indicadores de Escrita"; +"UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Ativar indicadores de escrita"; /* Body text for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Agora são suportadas pré-visualizações de hiperligações para os sites mais populares da Internet."; /* Subtitle for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Pode desativar ou desativar esta funcionalidade a qualquer altura nas configurações do Signal (Ptivacidade > Enviar pré-visualização de hiperligações)."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Pode desativar ou ativar esta funcionalidade a qualquer altura nas definições do Signal (Privacidade > Enviar pré-visualização de hiperligações)."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Pré-visualizações de hiperligações"; /* Description for notification audio customization */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Pode escolher notificações personalizadas por conversa. Chamadas irão ter o mesmo toque que o contacto no sistema."; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Pode escolher notificações personalizadas por conversa. As chamadas irão ter o mesmo toque que o escolhido para o contacto no sistema."; /* button label shown one time, after upgrade */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Rever Definições de Notificações"; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Rever definições de notificações"; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE" = "Actualizar Sons de Chamada e Mensagem"; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE" = "Sons de chamada e mensagem atualizados"; /* button label shown one time, after user upgrades app */ -"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Prepare o Seu Perfil"; +"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Prepare o seu perfil"; /* Description of new profile feature for upgrading (existing) users */ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "A partir de agora pode partilhar uma foto de perfil e nome com os seus amigos no Signal."; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Perfis"; +"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Preparado para o seu grande plano?"; /* Description of new profile feature for upgrading (existing) users */ -"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_DESCRIPTION" = "Agora tem a opção de ver e partilhar quando as mensagens sao lidas."; +"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_DESCRIPTION" = "Agora tem a opção de ver e partilhar quando as mensagens são lidas."; /* button label shown one time, after upgrade */ -"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_PRIVACY_SETTINGS" = "Active as Notificações de Leitura nas definições de privacidade."; +"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_PRIVACY_SETTINGS" = "Active as notificações de leitura nas definições de privacidade."; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE" = "Apresentando Notificações de Leitura"; +"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE" = "Apresentando as notificações de leitura"; /* Body text for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Agora pode opcionalmente ver e partilhar quando as mensagens estão a ser escritas."; /* Header for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "Apresentando os Indicadores de Escrita"; +"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "Introdução aos indicadores de escrita"; /* Description of video calling to upgrading (existing) users */ "UPGRADE_EXPERIENCE_VIDEO_DESCRIPTION" = "O Signal agora suporta videochamadas seguras. Simplesmente comece uma chamada, como sempre, e toque no botão da câmara."; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá Videochamadas seguras!"; +"UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá videochamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "O Signal requer iOS 9 ou superior. Por favor actualize Actualização de Software nas configurações do iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "O Signal requer iOS 9 ou superior. Por favor utilize o recurso 'Atualização de software' nas definições da aplicação do iOS."; /* Title for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; +"UPGRADE_IOS_ALERT_TITLE" = "Atualizar iOS"; /* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Atrás"; +"VERIFICATION_BACK_BUTTON" = "Voltar"; /* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de Verificação"; +"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificação"; /* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Telefone-me "; +"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Alternativamente, ligue-me"; /* button text during registration to request another SMS code be sent */ "VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Reenviar código via SMS"; @@ -2439,28 +2439,28 @@ "VERIFICATION_PHONE_NUMBER_FORMAT" = "Introduza o código de verificação que enviamos para %@."; /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ -"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@: marcou este contacto como não verificado."; +"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Você marcou %@ como não verificado."; /* Format for info message indicating that the verification state was unverified on another device. Embeds {{user's name or phone number}}. */ -"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_OTHER_DEVICE" = "%@: marcou este contacto como não verificado desde outro dispositivo."; +"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_OTHER_DEVICE" = "Você marcou %@ como não verificado a partir de outro dispositivo."; /* Format for info message indicating that the verification state was verified on this device. Embeds {{user's name or phone number}}. */ -"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_LOCAL" = "%@: marcou este contacto como verificado."; +"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_LOCAL" = "Você marcou %@ como verificado."; /* Format for info message indicating that the verification state was verified on another device. Embeds {{user's name or phone number}}. */ -"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_OTHER_DEVICE" = "%@: marcou este contacto como verificado desde outro dispositivo."; +"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_OTHER_DEVICE" = "Você marcou %@ como verificado a partir de outro dispositivo."; /* Generic message indicating that verification state changed for a given user. */ "VERIFICATION_STATE_CHANGE_GENERIC" = "Estado de verificação alterado."; /* Label for button or row which allows users to verify the safety number of another user. */ -"VERIFY_PRIVACY" = "Ver Número de Segurança"; +"VERIFY_PRIVACY" = "Ver número de segurança"; /* Label for button or row which allows users to verify the safety numbers of multiple users. */ -"VERIFY_PRIVACY_MULTIPLE" = "Rever Número de Segurança"; +"VERIFY_PRIVACY_MULTIPLE" = "Rever número de segurança"; /* Indicates how to cancel a voice message. */ -"VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Deslizar pra Cancelar"; +"VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Deslizar para cancelar"; /* Filename for voice messages. */ "VOICE_MESSAGE_FILE_NAME" = "Mensagem de voz"; @@ -2475,7 +2475,7 @@ "WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Complete a instalação no Signal Desktop."; /* Info Message when you disable disappearing messages */ -"YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Desactivou a destruição de mensagens."; +"YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Você desactivou a destruição de mensagens."; /* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */ -"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Definiu o tempo para a destruição de mensagens para %@."; +"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Você definiu o tempo para a destruição de mensagens para %@."; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index a40601a00..f97a88d47 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -321,16 +321,16 @@ "CALL_AUDIO_PERMISSION_TITLE" = "Accesul la microfon este necesar"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Apel de intrare"; /* Accessibility label for placing call button */ "CALL_LABEL" = "Sună"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Apel ratat deoarece numărul de siguranță al apelantului s-a schimbat."; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Apel pierdut"; /* Call setup status label after outgoing call times out */ "CALL_SCREEN_STATUS_NO_ANSWER" = "Nici un răspuns"; @@ -1440,7 +1440,7 @@ "NEW_GROUP_MEMBER_LABEL" = "Membru"; /* notification title. Embeds {{author name}} and {{group name}} */ -"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ to %@"; +"NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ către %@"; /* Placeholder text for group name field */ "NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Denumește această conversație de grup"; @@ -1914,7 +1914,7 @@ "SEND_BUTTON_TITLE" = "Trimite"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send."; +"SEND_FAILED_NOTIFICATION_BODY" = "Mesajul tău nu a putut fi transmis."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Invitația trimisă a eșuat, te rog încearcă din nou mai târziu."; From 91e83da44094a8ede0ad01d20a286ddd112cc8f4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 15:18:53 -0700 Subject: [PATCH 139/493] reflect new build params in plist --- Signal/Signal-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index d1138dfe8..b0410e881 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -7,7 +7,7 @@ CarthageVersion 0.31.2 OSXVersion - 10.14.2 + 10.14.3 WebRTCCommit 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 From 4022ba1a162e9c94bae4cd98506b0e12d8a87f95 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 13:27:55 -0500 Subject: [PATCH 140/493] Fix translation in crop editor's pan gesture. --- .../ImageEditorCropViewController.swift | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 26653ddca..9fb07cf5e 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -516,16 +516,20 @@ class ImageEditorCropViewController: OWSViewController { owsFailDebug("Missing pinchTransform.") return } - guard let locationStart = gestureRecognizer.locationStart else { + guard let oldLocationView = gestureRecognizer.locationStart else { owsFailDebug("Missing locationStart.") return } - let locationNow = gestureRecognizer.location(in: self.clipView) - let locationUnitStart = self.locationUnit(forLocationInView: locationStart, transform: gestureStartTransform) - let locationUnitNow = self.locationUnit(forLocationInView: locationNow, transform: gestureStartTransform) - let locationUnitDelta = CGPointSubtract(locationUnitNow, locationUnitStart) - let newUnitTranslation = CGPointAdd(gestureStartTransform.unitTranslation, locationUnitDelta) + // The beauty of using an SRT (scale-rotate-translation) tranform ordering + // is that the translation is applied last, so it's trivial to convert + // translations from view coordinates to transform translation. + let viewBounds = clipView.bounds + let newLocationView = gestureRecognizer.location(in: self.clipView) + // Our (view bounds == canvas bounds) so no need to convert. + let translation = newLocationView.minus(oldLocationView) + let translationUnit = translation.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false) + let newUnitTranslation = gestureStartTransform.unitTranslation.plus(translationUnit) updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, @@ -600,17 +604,19 @@ class ImageEditorCropViewController: OWSViewController { } @objc public func rotate90ButtonPressed() { - rotateButtonPressed(angleRadians: CGFloat.pi * 0.5) + rotateButtonPressed(angleRadians: CGFloat.pi * 0.5, rotateCanvas: true) } @objc public func rotate45ButtonPressed() { - rotateButtonPressed(angleRadians: CGFloat.pi * 0.25) + rotateButtonPressed(angleRadians: CGFloat.pi * 0.25, rotateCanvas: false) } - private func rotateButtonPressed(angleRadians: CGFloat) { - // Invert width and height. - let outputSizePixels = CGSize(width: transform.outputSizePixels.height, - height: transform.outputSizePixels.width) + private func rotateButtonPressed(angleRadians: CGFloat, rotateCanvas: Bool) { + let outputSizePixels = (rotateCanvas + // Invert width and height. + ? CGSize(width: transform.outputSizePixels.height, + height: transform.outputSizePixels.width) + : transform.outputSizePixels) let unitTranslation = transform.unitTranslation let rotationRadians = transform.rotationRadians + angleRadians let scaling = transform.scaling From 7aa826748a2bd71738b210bedc6007a503af8cdc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 15:38:25 -0500 Subject: [PATCH 141/493] Fix translation in crop editor's pinch gesture. --- .../ImageEditorCropViewController.swift | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 9fb07cf5e..e012b6035 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -296,6 +296,23 @@ class ImageEditorCropViewController: OWSViewController { return true } + // MARK: - Gestures + + private class func unitTranslation(oldLocationView: CGPoint, + newLocationView: CGPoint, + viewBounds: CGRect, + oldTransform: ImageEditorTransform) -> CGPoint { + + // The beauty of using an SRT (scale-rotate-translation) tranform ordering + // is that the translation is applied last, so it's trivial to convert + // translations from view coordinates to transform translation. + // Our (view bounds == canvas bounds) so no need to convert. + let translation = newLocationView.minus(oldLocationView) + let translationUnit = translation.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false) + let newUnitTranslation = oldTransform.unitTranslation.plus(translationUnit) + return newUnitTranslation + } + // MARK: - Pinch Gesture @objc @@ -315,12 +332,10 @@ class ImageEditorCropViewController: OWSViewController { return } - let locationUnitStart = self.locationUnit(forLocationInView: gestureRecognizer.pinchStateStart.centroid, - transform: gestureStartTransform) - let locationUnitLast = self.locationUnit(forLocationInView: gestureRecognizer.pinchStateLast.centroid, - transform: gestureStartTransform) - let locationUnitDelta = CGPointSubtract(locationUnitLast, locationUnitStart) - let newUnitTranslation = CGPointAdd(gestureStartTransform.unitTranslation, locationUnitDelta) + let newUnitTranslation = ImageEditorCropViewController.unitTranslation(oldLocationView: gestureRecognizer.pinchStateStart.centroid, + newLocationView: gestureRecognizer.pinchStateLast.centroid, + viewBounds: clipView.bounds, + oldTransform: gestureStartTransform) let newRotationRadians = gestureStartTransform.rotationRadians + gestureRecognizer.pinchStateLast.angleRadians - gestureRecognizer.pinchStateStart.angleRadians @@ -521,15 +536,11 @@ class ImageEditorCropViewController: OWSViewController { return } - // The beauty of using an SRT (scale-rotate-translation) tranform ordering - // is that the translation is applied last, so it's trivial to convert - // translations from view coordinates to transform translation. - let viewBounds = clipView.bounds let newLocationView = gestureRecognizer.location(in: self.clipView) - // Our (view bounds == canvas bounds) so no need to convert. - let translation = newLocationView.minus(oldLocationView) - let translationUnit = translation.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false) - let newUnitTranslation = gestureStartTransform.unitTranslation.plus(translationUnit) + let newUnitTranslation = ImageEditorCropViewController.unitTranslation(oldLocationView: oldLocationView, + newLocationView: newLocationView, + viewBounds: clipView.bounds, + oldTransform: gestureStartTransform) updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, From 674cf2e01f3c11fa21447b3070a2a8af7fb37d51 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 16:40:42 -0500 Subject: [PATCH 142/493] Render stroke and text items in image coordinates, not canvas coordinates. --- .../ImageEditor/ImageEditorCanvasView.swift | 39 ++++++++++++------- SignalMessaging/categories/UIView+OWS.swift | 8 +++- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index ce696a272..a8c1c2759 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -173,6 +173,7 @@ public class ImageEditorCanvasView: UIView { contentLayerMap.removeAll() let viewSize = clipView.bounds.size + let transform = model.currentTransform() if viewSize.width > 0, viewSize.height > 0 { @@ -183,6 +184,7 @@ public class ImageEditorCanvasView: UIView { for item in model.items() { guard let layer = ImageEditorCanvasView.layerForItem(item: item, model: model, + transform: transform, viewSize: viewSize) else { continue } @@ -217,6 +219,7 @@ public class ImageEditorCanvasView: UIView { } let viewSize = clipView.bounds.size + let transform = model.currentTransform() if viewSize.width > 0, viewSize.height > 0 { @@ -234,6 +237,7 @@ public class ImageEditorCanvasView: UIView { // Item was inserted or updated. guard let layer = ImageEditorCanvasView.layerForItem(item: item, model: model, + transform: transform, viewSize: viewSize) else { continue } @@ -320,6 +324,7 @@ public class ImageEditorCanvasView: UIView { private class func layerForItem(item: ImageEditorItem, model: ImageEditorModel, + transform: ImageEditorTransform, viewSize: CGSize) -> CALayer? { AssertIsOnMainThread() @@ -332,7 +337,10 @@ public class ImageEditorCanvasView: UIView { owsFailDebug("Item has unexpected type: \(type(of: item)).") return nil } - return strokeLayerForItem(item: strokeItem, viewSize: viewSize) + return strokeLayerForItem(item: strokeItem, + model: model, + transform: transform, + viewSize: viewSize) case .text: guard let textItem = item as? ImageEditorTextItem else { owsFailDebug("Item has unexpected type: \(type(of: item)).") @@ -340,11 +348,14 @@ public class ImageEditorCanvasView: UIView { } return textLayerForItem(item: textItem, model: model, + transform: transform, viewSize: viewSize) } } private class func strokeLayerForItem(item: ImageEditorStrokeItem, + model: ImageEditorModel, + transform: ImageEditorTransform, viewSize: CGSize) -> CALayer? { AssertIsOnMainThread() @@ -361,9 +372,9 @@ public class ImageEditorCanvasView: UIView { shapeLayer.strokeColor = item.color.cgColor shapeLayer.frame = CGRect(origin: .zero, size: viewSize) + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) let transformSampleToPoint = { (unitSample: CGPoint) -> CGPoint in - return CGPoint(x: viewSize.width * unitSample.x, - y: viewSize.height * unitSample.y) + return unitSample.fromUnitCoordinates(viewBounds: imageFrame) } // Use bezier curves to smooth stroke. @@ -436,11 +447,11 @@ public class ImageEditorCanvasView: UIView { private class func textLayerForItem(item: ImageEditorTextItem, model: ImageEditorModel, + transform: ImageEditorTransform, viewSize: CGSize) -> CALayer? { AssertIsOnMainThread() - let imageFrame = self.imageFrame(forViewSize: viewSize, imageSize: model.srcImageSizePixels, - transform: model.currentTransform()) + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) // We need to adjust the font size to reflect the current output scale, // using the image width as reference. @@ -476,8 +487,7 @@ public class ImageEditorCanvasView: UIView { .font: item.font.withSize(fontSize) ], context: nil) - let center = CGPoint(x: viewSize.width * item.unitCenter.x, - y: viewSize.height * item.unitCenter.y) + let center = item.unitCenter.fromUnitCoordinates(viewBounds: imageFrame) let layerSize = CGSizeCeil(textBounds.size) layer.frame = CGRect(origin: CGPoint(x: center.x - layerSize.width * 0.5, y: center.y - layerSize.height * 0.5), @@ -535,24 +545,24 @@ public class ImageEditorCanvasView: UIView { transform: ImageEditorTransform) -> CGPoint { let locationInView = gestureRecognizer.location(in: view) return locationUnit(forLocationInView: locationInView, - viewSize: view.bounds.size, + viewBounds: view.bounds, transform: transform) } public func locationUnit(forLocationInView locationInView: CGPoint, transform: ImageEditorTransform) -> CGPoint { - let viewSize = self.clipView.bounds.size + let viewBounds = self.clipView.bounds return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, - viewSize: viewSize, + viewBounds: viewBounds, transform: transform) } public class func locationUnit(forLocationInView locationInView: CGPoint, - viewSize: CGSize, + viewBounds: CGRect, transform: ImageEditorTransform) -> CGPoint { - let affineTransformStart = transform.affineTransform(viewSize: viewSize) - let locationInContent = locationInView.applyingInverse(affineTransformStart) - let locationUnit = locationInContent.toUnitCoordinates(viewSize: viewSize, shouldClamp: false) + let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size) + let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center) + let locationUnit = locationInContent.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false) return locationUnit } @@ -608,6 +618,7 @@ public class ImageEditorCanvasView: UIView { for item in model.items() { guard let layer = layerForItem(item: item, model: model, + transform: transform, viewSize: viewSize) else { owsFailDebug("Couldn't create layer for item.") continue diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 5082dea68..3a7fa6ca9 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -149,9 +149,13 @@ public extension CGPoint { return toUnitCoordinates(viewBounds: CGRect(origin: .zero, size: viewSize), shouldClamp: shouldClamp) } + public func fromUnitCoordinates(viewBounds: CGRect) -> CGPoint { + return CGPoint(x: viewBounds.origin.x + x.lerp(0, viewBounds.size.width), + y: viewBounds.origin.y + y.lerp(0, viewBounds.size.height)) + } + public func fromUnitCoordinates(viewSize: CGSize) -> CGPoint { - return CGPoint(x: x.lerp(0, viewSize.width), - y: y.lerp(0, viewSize.height)) + return fromUnitCoordinates(viewBounds: CGRect(origin: .zero, size: viewSize)) } public func inverse() -> CGPoint { From 7130895e3f5b3f1bcaf085aede975fff82ce81c7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 17:26:51 -0500 Subject: [PATCH 143/493] Fix translation in all of editor view's gestures. --- .../ImageEditor/ImageEditorCanvasView.swift | 35 --------- .../ImageEditorCropViewController.swift | 12 --- .../Views/ImageEditor/ImageEditorView.swift | 78 +++++++++++++------ 3 files changed, 53 insertions(+), 72 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index a8c1c2759..af715189c 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -531,41 +531,6 @@ public class ImageEditorCanvasView: UIView { return result } - // MARK: - Coordinates - - public func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, - transform: ImageEditorTransform) -> CGPoint { - return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer, - view: self.clipView, - transform: transform) - } - - public class func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, - view: UIView, - transform: ImageEditorTransform) -> CGPoint { - let locationInView = gestureRecognizer.location(in: view) - return locationUnit(forLocationInView: locationInView, - viewBounds: view.bounds, - transform: transform) - } - - public func locationUnit(forLocationInView locationInView: CGPoint, - transform: ImageEditorTransform) -> CGPoint { - let viewBounds = self.clipView.bounds - return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, - viewBounds: viewBounds, - transform: transform) - } - - public class func locationUnit(forLocationInView locationInView: CGPoint, - viewBounds: CGRect, - transform: ImageEditorTransform) -> CGPoint { - let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size) - let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center) - let locationUnit = locationInContent.toUnitCoordinates(viewSize: viewBounds.size, shouldClamp: false) - return locationUnit - } - // MARK: - Actions // Returns nil on error. diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index e012b6035..b379ae892 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -588,18 +588,6 @@ class ImageEditorCropViewController: OWSViewController { } } - // MARK: - Coordinates - - private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, - transform: ImageEditorTransform) -> CGPoint { - return ImageEditorCanvasView.locationUnit(forGestureRecognizer: gestureRecognizer, view: clipView, transform: transform) - } - - private func locationUnit(forLocationInView locationInView: CGPoint, - transform: ImageEditorTransform) -> CGPoint { - return ImageEditorCanvasView.locationUnit(forLocationInView: locationInView, viewSize: clipView.bounds.size, transform: transform) - } - // MARK: - Events @objc public func didTapBackButton() { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 2bf841fd0..187a55c3b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -299,7 +299,7 @@ public class ImageEditorView: UIView { } let location = gestureRecognizer.location(in: canvasView.gestureReferenceView) - guard let textLayer = canvasView.textLayer(forLocation: location) else { + guard let textLayer = self.textLayer(forLocation: location) else { return } @@ -326,7 +326,7 @@ public class ImageEditorView: UIView { switch gestureRecognizer.state { case .began: let pinchState = gestureRecognizer.pinchStateStart - guard let textLayer = canvasView.textLayer(forLocation: pinchState.centroid) else { + guard let textLayer = self.textLayer(forLocation: pinchState.centroid) else { // The pinch needs to start centered on a text item. return } @@ -341,14 +341,20 @@ public class ImageEditorView: UIView { return } + let view = self.canvasView.gestureReferenceView + let viewBounds = view.bounds let locationStart = gestureRecognizer.pinchStateStart.centroid - let locationUnitStart = locationUnit(forLocationInView: locationStart, transform: model.currentTransform()) let locationNow = gestureRecognizer.pinchStateLast.centroid - let locationUnitNow = locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) - - let unitLocationDelta = CGPointSubtract(locationUnitNow, - locationUnitStart) - let unitCenter = CGPointClamp01(CGPointAdd(textItem.unitCenter, unitLocationDelta)) + let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationNow, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + let gestureDeltaImageUnit = gestureNowImageUnit.minus(gestureStartImageUnit) + let unitCenter = CGPointClamp01(textItem.unitCenter.plus(gestureDeltaImageUnit)) // NOTE: We use max(1, ...) to avoid divide-by-zero. let newScaling = CGFloatClamp(textItem.scaling * gestureRecognizer.pinchStateLast.distance / max(1.0, gestureRecognizer.pinchStateStart.distance), @@ -383,6 +389,13 @@ public class ImageEditorView: UIView { private var movingTextStartUnitCenter: CGPoint? private var movingTextHasMoved = false + private func textLayer(forLocation locationInView: CGPoint) -> EditorTextLayer? { + let viewBounds = self.canvasView.gestureReferenceView.bounds + let affineTransform = self.model.currentTransform().affineTransform(viewSize: viewBounds.size) + let locationInCanvas = locationInView.minus(viewBounds.center).applyingInverse(affineTransform).plus(viewBounds.center) + return canvasView.textLayer(forLocation: locationInCanvas) + } + @objc public func handleMoveTextGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { AssertIsOnMainThread() @@ -395,7 +408,7 @@ public class ImageEditorView: UIView { owsFailDebug("Missing locationStart.") return } - guard let textLayer = canvasView.textLayer(forLocation: locationStart) else { + guard let textLayer = self.textLayer(forLocation: locationStart) else { owsFailDebug("No text layer") return } @@ -420,12 +433,19 @@ public class ImageEditorView: UIView { return } - let locationUnitStart = canvasView.locationUnit(forLocationInView: locationStart, transform: model.currentTransform()) - let locationNow = gestureRecognizer.location(in: canvasView.gestureReferenceView) - let locationUnitNow = canvasView.locationUnit(forLocationInView: locationNow, transform: model.currentTransform()) - - let unitLocationDelta = CGPointSubtract(locationUnitNow, locationUnitStart) - let unitCenter = CGPointClamp01(CGPointAdd(movingTextStartUnitCenter, unitLocationDelta)) + let view = self.canvasView.gestureReferenceView + let viewBounds = view.bounds + let locationInView = gestureRecognizer.location(in: view) + let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationInView, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + let gestureDeltaImageUnit = gestureNowImageUnit.minus(gestureStartImageUnit) + let unitCenter = CGPointClamp01(movingTextStartUnitCenter.plus(gestureDeltaImageUnit)) let newItem = textItem.copy(withUnitCenter: unitCenter) if movingTextHasMoved { @@ -461,7 +481,14 @@ public class ImageEditorView: UIView { self.currentStrokeSamples.removeAll() } let tryToAppendStrokeSample = { - let newSample = self.locationUnit(forGestureRecognizer: gestureRecognizer, transform: self.model.currentTransform()) + let view = self.canvasView.gestureReferenceView + let viewBounds = view.bounds + let locationInView = gestureRecognizer.location(in: view) + let newSample = ImageEditorView.locationImageUnit(forLocationInView: locationInView, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + if let prevSample = self.currentStrokeSamples.last, prevSample == newSample { // Ignore duplicate samples. @@ -511,14 +538,15 @@ public class ImageEditorView: UIView { // MARK: - Coordinates - private func locationUnit(forGestureRecognizer gestureRecognizer: UIGestureRecognizer, - transform: ImageEditorTransform) -> CGPoint { - return canvasView.locationUnit(forGestureRecognizer: gestureRecognizer, transform: transform) - } - - private func locationUnit(forLocationInView locationInView: CGPoint, - transform: ImageEditorTransform) -> CGPoint { - return canvasView.locationUnit(forLocationInView: locationInView, transform: transform) + private class func locationImageUnit(forLocationInView locationInView: CGPoint, + viewBounds: CGRect, + model: ImageEditorModel, + transform: ImageEditorTransform) -> CGPoint { + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: model.srcImageSizePixels, transform: transform) + let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size) + let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center) + let locationImageUnit = locationInContent.toUnitCoordinates(viewBounds: imageFrame, shouldClamp: false) + return locationImageUnit } // MARK: - Edit Text Tool @@ -586,7 +614,7 @@ extension ImageEditorView: UIGestureRecognizerDelegate { } let location = touch.location(in: canvasView.gestureReferenceView) - let isInTextArea = canvasView.textLayer(forLocation: location) != nil + let isInTextArea = self.textLayer(forLocation: location) != nil return isInTextArea } } From 2bc5ac14ca8f94ff7d38e831ce32b35121cbf77d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 10:51:16 -0500 Subject: [PATCH 144/493] Respond to CR. --- .../ImageEditor/ImageEditorCanvasView.swift | 14 +++-- .../Views/ImageEditor/ImageEditorModel.swift | 52 +++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index af715189c..754c3ee41 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -372,6 +372,10 @@ public class ImageEditorCanvasView: UIView { shapeLayer.strokeColor = item.color.cgColor shapeLayer.frame = CGRect(origin: .zero, size: viewSize) + // Stroke samples are specified in "image unit" coordinates, but + // need to be rendered in "canvas" coordinates. The imageFrame + // is the bounds of the image specified in "canvas" coordinates, + // so to transform we can simply convert from image frame units. let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) let transformSampleToPoint = { (unitSample: CGPoint) -> CGPoint in return unitSample.fromUnitCoordinates(viewBounds: imageFrame) @@ -487,10 +491,14 @@ public class ImageEditorCanvasView: UIView { .font: item.font.withSize(fontSize) ], context: nil) - let center = item.unitCenter.fromUnitCoordinates(viewBounds: imageFrame) + // The text item's center is specified in "image unit" coordinates, but + // needs to be rendered in "canvas" coordinates. The imageFrame + // is the bounds of the image specified in "canvas" coordinates, + // so to transform we can simply convert from image frame units. + let centerInCanvas = item.unitCenter.fromUnitCoordinates(viewBounds: imageFrame) let layerSize = CGSizeCeil(textBounds.size) - layer.frame = CGRect(origin: CGPoint(x: center.x - layerSize.width * 0.5, - y: center.y - layerSize.height * 0.5), + layer.frame = CGRect(origin: CGPoint(x: centerInCanvas.x - layerSize.width * 0.5, + y: centerInCanvas.y - layerSize.height * 0.5), size: layerSize) let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index e73c9f033..c544d26ba 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -4,11 +4,63 @@ import UIKit +// The image editor uses multiple coordinate systems. +// +// * Image unit coordinates. Brush stroke and text content should be pegged to +// image content, so they are specified relative to the bounds of the image. +// * Canvas coordinates. We render the image, strokes and text into the "canvas", +// a viewport that has the aspect ratio of the view. Rendering is transformed, so +// this is pre-tranform. +// * View coordinates. The coordinates of the actual view (or rendered output). +// Bounded by the view's bounds / viewport. +// +// Sometimes we use unit coordinates. This facilitates a number of operations such +// as clamping to 0-1, etc. So in practice almost all values will be in one of six +// coordinate systems: +// +// * unit image coordinates +// * image coordinates +// * unit canvas coordinates +// * canvas coordinates +// * unit view coordinates +// * view coordinates +// +// For simplicity, the canvas bounds are always identical to view bounds. +// If we wanted to manipulate output quality, we would use the layer's "scale". +// But canvas values are pre-transform and view values are post-transform so they +// are only identical if the transform has no scaling, rotation or translation. +// +// The "ImageEditorTransform" can be used to generate an CGAffineTransform +// for the layers used to render the content. In practice, the affine transform +// is applied to a superlayer of the sublayers used to render content. +// +// CALayers apply their transform relative to the layer's anchorPoint, which +// by default is the center of the layer's bounds. E.g. rotation occurs +// around the center of the layer. Therefore when projecting absolute +// (but not relative) coordinates between the "view" and "canvas" coordinate +// systems, it's necessary to project them relative to the center of the +// view/canvas. +// +// To simplify our representation & operations, the default size of the image +// content is "exactly large enough to fill the canvas if rotation +// but not scaling or translation were applied". This might seem unusual, +// but we have a key invariant: we always want the image to fill the canvas. +// It's far easier to ensure this if the transform is always (just barely) +// valid when scaling = 1 and translation = .zero. The image size that +// fulfills this criteria is calculated using +// ImageEditorCanvasView.imageFrame(forViewSize:...). Transforming between +// the "image" and "canvas" coordinate systems is done with that image frame. @objc public class ImageEditorTransform: NSObject { + // The outputSizePixels is used to specify the aspect ratio and size of the + // output. public let outputSizePixels: CGSize + // The unit translation of the content, relative to the + // canvas viewport. public let unitTranslation: CGPoint + // Rotation about the center of the content. public let rotationRadians: CGFloat + // x >= 1.0. public let scaling: CGFloat public init(outputSizePixels: CGSize, From 5eaeeff83878924ca98e5513621d92e1cae094c1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 14:19:29 -0500 Subject: [PATCH 145/493] Use content proxy to configure all proxied content requests. --- Signal/src/network/GiphyAPI.swift | 6 ++ .../Interactions/OWSLinkPreview.swift | 14 +-- .../src/Network/ContentProxy.swift | 100 +++++++++++++++++- .../Network/ProxiedContentDownloader.swift | 80 +++----------- 4 files changed, 128 insertions(+), 72 deletions(-) diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift index 03e082949..462fc59e1 100644 --- a/Signal/src/network/GiphyAPI.swift +++ b/Signal/src/network/GiphyAPI.swift @@ -310,6 +310,12 @@ extension GiphyError: LocalizedError { } let urlString = "/v1/gifs/search?api_key=\(kGiphyApiKey)&offset=\(kGiphyPageOffset)&limit=\(kGiphyPageSize)&q=\(queryEncoded)" + guard ContentProxy.configureSessionManager(sessionManager: sessionManager, forUrl: urlString) else { + owsFailDebug("Could not configure query: \(query).") + failure(nil) + return + } + sessionManager.get(urlString, parameters: [String: AnyObject](), progress: nil, diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 01d416d77..556505ccc 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -589,10 +589,10 @@ public class OWSLinkPreview: MTLModel { } } - class func downloadLink(url: String, + class func downloadLink(url urlString: String, remainingRetries: UInt = 3) -> Promise { - Logger.verbose("url: \(url)") + Logger.verbose("url: \(urlString)") let sessionConfiguration = ContentProxy.sessionConfiguration() @@ -605,13 +605,13 @@ public class OWSLinkPreview: MTLModel { sessionManager.requestSerializer = AFHTTPRequestSerializer() sessionManager.responseSerializer = AFHTTPResponseSerializer() - // Remove all headers from the request. - for headerField in sessionManager.requestSerializer.httpRequestHeaders.keys { - sessionManager.requestSerializer.setValue(nil, forHTTPHeaderField: headerField) + guard ContentProxy.configureSessionManager(sessionManager: sessionManager, forUrl: urlString) else { + owsFailDebug("Could not configure url: \(urlString).") + return Promise(error: LinkPreviewError.assertionFailure) } let (promise, resolver) = Promise.pending() - sessionManager.get(url, + sessionManager.get(urlString, parameters: [String: AnyObject](), progress: nil, success: { task, value in @@ -654,7 +654,7 @@ public class OWSLinkPreview: MTLModel { resolver.reject(LinkPreviewError.couldNotDownload) return } - OWSLinkPreview.downloadLink(url: url, remainingRetries: remainingRetries - 1) + OWSLinkPreview.downloadLink(url: urlString, remainingRetries: remainingRetries - 1) .done(on: DispatchQueue.global()) { (data) in resolver.fulfill(data) }.catch(on: DispatchQueue.global()) { (error) in diff --git a/SignalServiceKit/src/Network/ContentProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift index 098a9e557..d76b37213 100644 --- a/SignalServiceKit/src/Network/ContentProxy.swift +++ b/SignalServiceKit/src/Network/ContentProxy.swift @@ -51,4 +51,102 @@ public class ContentProxy: NSObject { sessionManager.responseSerializer = AFJSONResponseSerializer() return sessionManager } -} + + static let userAgent = "Signal iOS (+https://signal.org/download)" + + public class func configureProxiedRequest(request: inout URLRequest) -> Bool { + request.addValue(userAgent, forHTTPHeaderField: "User-Agent") + + padRequestSize(request: &request) + + guard let url = request.url, + let scheme = url.scheme, + scheme.lowercased() == "https" else { + return false + } + return true + } + + @objc + public class func configureSessionManager(sessionManager: AFHTTPSessionManager, + forUrl urlString: String) -> Bool { + + guard let url = URL(string: urlString, relativeTo: sessionManager.baseURL) else { + owsFailDebug("Invalid URL query: \(urlString).") + return false + } + + var request = URLRequest(url: url) + + guard configureProxiedRequest(request: &request) else { + owsFailDebug("Invalid URL query: \(urlString).") + return false + } + + // Remove all headers from the request. + for headerField in sessionManager.requestSerializer.httpRequestHeaders.keys { + sessionManager.requestSerializer.setValue(nil, forHTTPHeaderField: headerField) + } + // Honor the request's headers. + if let allHTTPHeaderFields = request.allHTTPHeaderFields { + for (headerField, headerValue) in allHTTPHeaderFields { + sessionManager.requestSerializer.setValue(headerValue, forHTTPHeaderField: headerField) + } + } + return true + } + + public class func padRequestSize(request: inout URLRequest) { + guard let sizeEstimate: UInt = estimateRequestSize(request: request) else { + owsFailDebug("Could not estimate request size.") + return + } + // We pad the estimated size to an even multiple of paddingQuantum (plus the + // extra ": " and "\r\n"). The exact size doesn't matter so long as the + // padding is consistent. + let paddingQuantum: UInt = 1024 + let paddingSize = paddingQuantum - (sizeEstimate % paddingQuantum) + let padding = String(repeating: ".", count: Int(paddingSize)) + request.addValue(padding, forHTTPHeaderField: "X-SignalPadding") + } + + private class func estimateRequestSize(request: URLRequest) -> UInt? { + // iOS doesn't offer an exact way to measure request sizes on the wire, + // but we can reliably estimate request sizes using the "knowns", e.g. + // HTTP method, path, querystring, headers. The "unknowns" should be + // consistent between requests. + + guard let url = request.url?.absoluteString else { + owsFailDebug("Request missing URL.") + return nil + } + guard let components = URLComponents(string: url) else { + owsFailDebug("Request has invalid URL.") + return nil + } + + var result: Int = 0 + + if let httpMethod = request.httpMethod { + result += httpMethod.count + } + result += components.percentEncodedPath.count + if let percentEncodedQuery = components.percentEncodedQuery { + result += percentEncodedQuery.count + } + if let allHTTPHeaderFields = request.allHTTPHeaderFields { + for (key, value) in allHTTPHeaderFields { + // Each header has 4 extra bytes: + // + // * Two for the key/value separator ": " + // * Two for "\r\n", the line break in the HTTP protocol spec. + result += key.count + value.count + 4 + } + } else { + owsFailDebug("Request has no headers.") + } + if let httpBody = request.httpBody { + result += httpBody.count + } + return UInt(result) + }} diff --git a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift index 3d13e3830..5b6d2f23e 100644 --- a/SignalServiceKit/src/Network/ProxiedContentDownloader.swift +++ b/SignalServiceKit/src/Network/ProxiedContentDownloader.swift @@ -657,8 +657,6 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio return } - let userAgent = "Signal iOS (+https://signal.org/download)" - if assetRequest.state == .waiting { // If asset request hasn't yet determined the resource size, // try to do so now, by requesting a small initial segment. @@ -671,8 +669,14 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(segmentStart)-\(segmentStart + segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") - request.addValue(userAgent, forHTTPHeaderField: "User-Agent") - padRequestSize(request: &request) + + guard ContentProxy.configureProxiedRequest(request: &request) else { + assetRequest.state = .failed + assetRequestDidFail(assetRequest: assetRequest) + processRequestQueueSync() + return + } + let task = downloadSession.dataTask(with: request, completionHandler: { data, response, error -> Void in self.handleAssetSizeResponse(assetRequest: assetRequest, data: data, response: response, error: error) }) @@ -692,8 +696,14 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio request.httpShouldUsePipelining = true let rangeHeaderValue = "bytes=\(assetSegment.segmentStart)-\(assetSegment.segmentStart + assetSegment.segmentLength - 1)" request.addValue(rangeHeaderValue, forHTTPHeaderField: "Range") - request.addValue(userAgent, forHTTPHeaderField: "User-Agent") - padRequestSize(request: &request) + + guard ContentProxy.configureProxiedRequest(request: &request) else { + assetRequest.state = .failed + assetRequestDidFail(assetRequest: assetRequest) + processRequestQueueSync() + return + } + let task: URLSessionDataTask = downloadSession.dataTask(with: request) task.assetRequest = assetRequest task.assetSegment = assetSegment @@ -705,64 +715,6 @@ open class ProxiedContentDownloader: NSObject, URLSessionTaskDelegate, URLSessio processRequestQueueSync() } - private func padRequestSize(request: inout URLRequest) { - guard let sizeEstimate: UInt = estimateRequestSize(request: request) else { - owsFailDebug("Could not estimate request size.") - return - } - // We pad the estimated size to an even multiple of paddingQuantum (plus the - // extra ": " and "\r\n"). The exact size doesn't matter so long as the - // padding is consistent. - let paddingQuantum: UInt = 1024 - let paddingSize = paddingQuantum - (sizeEstimate % paddingQuantum) - let padding = String(repeating: ".", count: Int(paddingSize)) - request.addValue(padding, forHTTPHeaderField: "X-SignalPadding") - } - - private func estimateRequestSize(request: URLRequest) -> UInt? { - // iOS doesn't offer an exact way to measure request sizes on the wire, - // but we can reliably estimate request sizes using the "knowns", e.g. - // HTTP method, path, querystring, headers. The "unknowns" should be - // consistent between requests. - - guard let url = request.url?.absoluteString else { - owsFailDebug("Request missing URL.") - return nil - } - guard let components = URLComponents(string: url) else { - owsFailDebug("Request has invalid URL.") - return nil - } - - var result: Int = 0 - - if let httpMethod = request.httpMethod { - result += httpMethod.count - } - result += components.percentEncodedPath.count - if let percentEncodedQuery = components.percentEncodedQuery { - result += percentEncodedQuery.count - } - if let allHTTPHeaderFields = request.allHTTPHeaderFields { - if allHTTPHeaderFields.count != 2 { - owsFailDebug("Request has unexpected number of headers.") - } - for (key, value) in allHTTPHeaderFields { - // Each header has 4 extra bytes: - // - // * Two for the key/value separator ": " - // * Two for "\r\n", the line break in the HTTP protocol spec. - result += key.count + value.count + 4 - } - } else { - owsFailDebug("Request has no headers.") - } - if let httpBody = request.httpBody { - result += httpBody.count - } - return UInt(result) - } - private func handleAssetSizeResponse(assetRequest: ProxiedContentAssetRequest, data: Data?, response: URLResponse?, error: Error?) { guard error == nil else { assetRequest.state = .failed From ad90a8e0c483bcad0864dbfebbed534c049f400e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 14:19:51 -0500 Subject: [PATCH 146/493] Use content proxy to configure all proxied content requests. --- SignalServiceKit/src/Network/ContentProxy.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/ContentProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift index d76b37213..576fd876c 100644 --- a/SignalServiceKit/src/Network/ContentProxy.swift +++ b/SignalServiceKit/src/Network/ContentProxy.swift @@ -17,7 +17,7 @@ public class ContentProxy: NSObject { let proxyHost = "contentproxy.signal.org" let proxyPort = 443 configuration.connectionProxyDictionary = [ - "HTTPEnable": 1, + "HTTPEnable": 0, "HTTPProxy": proxyHost, "HTTPPort": proxyPort, "HTTPSEnable": 1, From fff93f8bb2661c37035e15973d96fd94fb0a6f8e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 15:08:19 -0500 Subject: [PATCH 147/493] Use content proxy to configure all proxied content requests. --- SignalServiceKit/src/Network/ContentProxy.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/ContentProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift index 576fd876c..6dd135b79 100644 --- a/SignalServiceKit/src/Network/ContentProxy.swift +++ b/SignalServiceKit/src/Network/ContentProxy.swift @@ -17,7 +17,7 @@ public class ContentProxy: NSObject { let proxyHost = "contentproxy.signal.org" let proxyPort = 443 configuration.connectionProxyDictionary = [ - "HTTPEnable": 0, + "HTTPEnable": 1, "HTTPProxy": proxyHost, "HTTPPort": proxyPort, "HTTPSEnable": 1, @@ -67,6 +67,11 @@ public class ContentProxy: NSObject { return true } + // This mutates the session manager state, so its the caller's obligation to avoid conflicts by: + // + // * Using a new session manager for each request. + // * Pooling session managers. + // * Using a single session manager on a single queue. @objc public class func configureSessionManager(sessionManager: AFHTTPSessionManager, forUrl urlString: String) -> Bool { From 586b362b890d7561949bc5cd19e418d429fda450 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 17:20:07 -0500 Subject: [PATCH 148/493] Introduce ConversationSnapshot. --- .../ConversationViewController.m | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 788a68e65..26828fa18 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,6 +108,25 @@ typedef enum : NSUInteger { #pragma mark - +// We use snapshots to ensure that the view has a consistent +// representation of view model state which is not updated +// when the view is not observing view model changes. +@interface ConversationSnapshot : NSObject + +@property (nonatomic) NSArray> *viewItems; +@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; +@property (nonatomic) BOOL canLoadMoreItems; + +@end + +#pragma mark - + +@implementation ConversationSnapshot + +@end + +#pragma mark - + @interface ConversationViewController () > *)viewItems { - return self.conversationViewModel.viewItems; + return self.conversationSnapshot.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationViewModel.dynamicInteractions; + return self.conversationSnapshot.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -1697,7 +1719,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -4138,6 +4160,7 @@ typedef enum : NSUInteger { if (self.shouldObserveVMUpdates) { OWSLogVerbose(@"resume observation of view model."); + [self updateConversationSnapshot]; [self resetContentAndLayout]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4612,6 +4635,7 @@ typedef enum : NSUInteger { return; } + [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4909,6 +4933,17 @@ typedef enum : NSUInteger { [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; } +#pragma mark - Conversation Snapshot + +- (void)updateConversationSnapshot +{ + ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; + conversationSnapshot.viewItems = self.conversationViewModel.viewItems; + conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; + conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; + _conversationSnapshot = conversationSnapshot; +} + @end NS_ASSUME_NONNULL_END From 56e5feca46f1299bb838ddd13097e4d2743f576d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 17:49:40 -0500 Subject: [PATCH 149/493] Introduce ConversationSnapshot. --- .../ConversationViewController.m | 26 +++++++++---- .../ConversationView/ConversationViewModel.h | 2 +- .../ConversationView/ConversationViewModel.m | 39 ++++++++++++------- SignalMessaging/utils/ThreadUtil.m | 15 +++++++ 4 files changed, 59 insertions(+), 23 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 26828fa18..8c2f534f7 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -451,11 +451,11 @@ typedef enum : NSUInteger { NSString *_Nullable recipientId = notification.userInfo[kNSNotificationKey_ProfileRecipientId]; NSData *_Nullable groupId = notification.userInfo[kNSNotificationKey_ProfileGroupId]; if (recipientId.length > 0 && [self.thread.recipientIdentifiers containsObject:recipientId]) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } else if (groupId.length > 0 && self.thread.isGroupThread) { TSGroupThread *groupThread = (TSGroupThread *)self.thread; if ([groupThread.groupModel.groupId isEqualToData:groupId]) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; [self ensureBannerState]; } } @@ -869,6 +869,7 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; + [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -2446,7 +2447,7 @@ typedef enum : NSUInteger { - (void)contactsViewHelperDidUpdateContacts { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)createConversationScrollButtons @@ -2484,7 +2485,7 @@ typedef enum : NSUInteger { _hasUnreadMessages = hasUnreadMessages; self.scrollDownButton.hasUnreadMessages = hasUnreadMessages; - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)scrollDownButtonTapped @@ -2629,7 +2630,7 @@ typedef enum : NSUInteger { [self showApprovalDialogForAttachment:attachment]; [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)messageWasSent:(TSOutgoingMessage *)message @@ -2989,7 +2990,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } }]; } @@ -3641,7 +3642,7 @@ typedef enum : NSUInteger { [self messageWasSent:message]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } }); } @@ -4031,7 +4032,7 @@ typedef enum : NSUInteger { [self clearDraft]; if (didAddToProfileWhitelist) { - [self.conversationViewModel ensureDynamicInteractions]; + [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } } @@ -4935,6 +4936,15 @@ typedef enum : NSUInteger { #pragma mark - Conversation Snapshot +- (void)tryToUpdateConversationSnapshot +{ + if (!self.isObservingVMUpdates) { + return; + } + + [self updateConversationSnapshot]; +} + - (void)updateConversationSnapshot { ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index a855c6f4c..d13a38c36 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -96,7 +96,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { focusMessageIdOnOpen:(nullable NSString *)focusMessageIdOnOpen delegate:(id)delegate NS_DESIGNATED_INITIALIZER; -- (void)ensureDynamicInteractions; +- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary; - (void)clearUnreadMessagesIndicator; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 602a4fc0d..75428952d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -273,7 +273,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; { OWSAssertIsOnMainThread(); - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } - (void)profileWhitelistDidChange:(NSNotification *)notification @@ -308,7 +308,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.typingIndicatorsSender = [self.typingIndicators typingRecipientIdForThread:self.thread]; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; [self.primaryStorage updateUIDatabaseConnectionToLatest]; [self createNewMessageMapping]; @@ -464,21 +464,32 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; } -- (void)ensureDynamicInteractions +- (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary { OWSAssertIsOnMainThread(); const int currentMaxRangeSize = (int)self.messageMapping.desiredLength; const int maxRangeSize = MAX(kConversationInitialMaxRangeSize, currentMaxRangeSize); - self.dynamicInteractions = [ThreadUtil ensureDynamicInteractionsForThread:self.thread - contactsManager:self.contactsManager - blockingManager:self.blockingManager - dbConnection:self.editingDatabaseConnection - hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator - lastUnreadIndicator:self.dynamicInteractions.unreadIndicator - focusMessageId:self.focusMessageIdOnOpen - maxRangeSize:maxRangeSize]; + ThreadDynamicInteractions *dynamicInteractions = + [ThreadUtil ensureDynamicInteractionsForThread:self.thread + contactsManager:self.contactsManager + blockingManager:self.blockingManager + dbConnection:self.editingDatabaseConnection + hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator + lastUnreadIndicator:self.dynamicInteractions.unreadIndicator + focusMessageId:self.focusMessageIdOnOpen + maxRangeSize:maxRangeSize]; + BOOL didChange = ![NSObject isNullableObject:self.dynamicInteractions equalTo:dynamicInteractions]; + self.dynamicInteractions = dynamicInteractions; + + if (didChange && updateIfNecessary) { + if (![self reloadViewItems]) { + OWSFailDebug(@"Failed to reload view items."); + } + + [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; + } } - (nullable id)viewItemForUnreadMessagesIndicator @@ -519,7 +530,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; if (self.dynamicInteractions.unreadIndicator) { // If we've just cleared the "unread messages" indicator, // update the dynamic interactions. - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } } @@ -968,7 +979,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); @@ -1590,7 +1601,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; self.collapseCutoffDate = [NSDate new]; - [self ensureDynamicInteractions]; + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; if (![self reloadViewItems]) { OWSFailDebug(@"failed to reload view items in resetMapping."); diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 099e56448..c7c0dcf24 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -46,6 +46,21 @@ NS_ASSUME_NONNULL_BEGIN self.unreadIndicator = nil; } +- (BOOL)isEqual:(id)object +{ + if (self == object) { + return YES; + } + + if (![object isKindOfClass:[ThreadDynamicInteractions class]]) { + return NO; + } + + ThreadDynamicInteractions *other = (ThreadDynamicInteractions *)object; + return ([NSObject isNullableObject:self.focusMessagePosition equalTo:other.focusMessagePosition] && + [NSObject isNullableObject:self.unreadIndicator equalTo:other.unreadIndicator]); +} + @end #pragma mark - From 6ed4045fbe664a061f2a25f69029556aa61388a0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 13:01:57 -0500 Subject: [PATCH 150/493] Conversation view always observes view model. --- .../ConversationViewController.m | 203 +----------------- .../ConversationView/ConversationViewModel.h | 2 - .../ConversationView/ConversationViewModel.m | 14 -- 3 files changed, 6 insertions(+), 213 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 8c2f534f7..053870d6d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,25 +108,6 @@ typedef enum : NSUInteger { #pragma mark - -// We use snapshots to ensure that the view has a consistent -// representation of view model state which is not updated -// when the view is not observing view model changes. -@interface ConversationSnapshot : NSObject - -@property (nonatomic) NSArray> *viewItems; -@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; -@property (nonatomic) BOOL canLoadMoreItems; - -@end - -#pragma mark - - -@implementation ConversationSnapshot - -@end - -#pragma mark - - @interface ConversationViewController () > *)viewItems { - return self.conversationSnapshot.viewItems; + return self.conversationViewModel.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationSnapshot.dynamicInteractions; + return self.conversationViewModel.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -869,7 +840,6 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; - [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -1720,7 +1690,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -1961,8 +1931,6 @@ typedef enum : NSUInteger { - (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController { [[OWSWindowManager sharedManager] hideMenuActionsWindow]; - - [self updateShouldObserveVMUpdates]; } - (void)menuActions:(MenuActionsViewController *)menuActionsViewController @@ -2069,8 +2037,6 @@ typedef enum : NSUInteger { self.conversationViewModel.mostRecentMenuActionsViewItem = cell.viewItem; [[OWSWindowManager sharedManager] showMenuActionsWindow:menuActionsViewController]; - - [self updateShouldObserveVMUpdates]; } - (NSAttributedString *)attributedContactOrProfileNameForPhoneIdentifier:(NSString *)recipientId @@ -4117,7 +4083,6 @@ typedef enum : NSUInteger { { _isViewVisible = isViewVisible; - [self updateShouldObserveVMUpdates]; [self updateCellsVisible]; } @@ -4130,134 +4095,8 @@ typedef enum : NSUInteger { } } -- (void)updateShouldObserveVMUpdates -{ - if (!CurrentAppContext().isAppForegroundAndActive) { - self.shouldObserveVMUpdates = NO; - return; - } - - if (!self.isViewVisible) { - self.shouldObserveVMUpdates = NO; - return; - } - - if (OWSWindowManager.sharedManager.isPresentingMenuActions) { - self.shouldObserveVMUpdates = NO; - return; - } - - self.shouldObserveVMUpdates = YES; -} - -- (void)setShouldObserveVMUpdates:(BOOL)shouldObserveVMUpdates -{ - if (_shouldObserveVMUpdates == shouldObserveVMUpdates) { - return; - } - - _shouldObserveVMUpdates = shouldObserveVMUpdates; - - if (self.shouldObserveVMUpdates) { - OWSLogVerbose(@"resume observation of view model."); - - [self updateConversationSnapshot]; - [self resetContentAndLayout]; - [self updateBackButtonUnreadCount]; - [self updateNavigationBarSubtitleLabel]; - [self updateDisappearingMessagesConfiguration]; - - // Detect changes in the mapping's "window" size. - if (self.previousViewTopToContentBottom && self.previousViewItemCount - && self.previousViewItemCount.unsignedIntegerValue != self.viewItems.count) { - CGFloat newContentHeight = self.safeContentHeight; - CGPoint newContentOffset - = CGPointMake(0, MAX(0, newContentHeight - self.previousViewTopToContentBottom.floatValue)); - [self.collectionView setContentOffset:newContentOffset animated:NO]; - } - - // When we resume observing database changes, we want to scroll to show the user - // any new items inserted while we were not observing. We therefore find the - // first item at or after the "view horizon". See the comments below which explain - // the "view horizon". - id _Nullable lastViewItem = self.viewItems.lastObject; - BOOL hasAddedNewItems = (lastViewItem && self.previousLastTimestamp - && lastViewItem.interaction.timestamp > self.previousLastTimestamp.unsignedLongLongValue); - - OWSLogInfo(@"hasAddedNewItems: %d", hasAddedNewItems); - if (hasAddedNewItems) { - NSIndexPath *_Nullable indexPathToShow = [self firstIndexPathAtViewHorizonTimestamp]; - if (indexPathToShow) { - // The goal is to show _both_ the last item before the "view horizon" and the - // first item after the "view horizon". We can't do "top on first item after" - // or "bottom on last item before" or we won't see the other. Unfortunately, - // this gets tricky if either is huge. The largest cells are oversize text, - // which should be rare. Other cells are considerably smaller than a screenful. - [self.collectionView scrollToItemAtIndexPath:indexPathToShow - atScrollPosition:UICollectionViewScrollPositionCenteredVertically - animated:NO]; - } - } - self.viewHorizonTimestamp = nil; - OWSLogVerbose(@"resumed observation of view model."); - } else { - OWSLogVerbose(@"pausing observation of view model."); - // When stopping observation, try to record the timestamp of the "view horizon". - // The "view horizon" is where we'll want to focus the users when we resume - // observation if any changes have happened while we weren't observing. - // Ideally, we'll focus on those changes. But we can't skip over unread - // interactions, so we prioritize those, if any. - // - // We'll use this later to update the view to reflect any changes made while - // we were not observing the database. See extendRangeToIncludeUnobservedItems - // and the logic above. - id _Nullable lastViewItem = self.viewItems.lastObject; - if (lastViewItem) { - self.previousLastTimestamp = @(lastViewItem.interaction.timestamp); - self.previousViewItemCount = @(self.viewItems.count); - } else { - self.previousLastTimestamp = nil; - self.previousViewItemCount = nil; - } - - __block TSInteraction *_Nullable firstUnseenInteraction = nil; - [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { - firstUnseenInteraction = - [[TSDatabaseView unseenDatabaseViewExtension:transaction] firstObjectInGroup:self.thread.uniqueId]; - }]; - if (firstUnseenInteraction) { - // If there are any unread interactions, focus on the first one. - self.viewHorizonTimestamp = @(firstUnseenInteraction.timestamp); - } else if (lastViewItem) { - // Otherwise, focus _just after_ the last interaction. - self.viewHorizonTimestamp = @(lastViewItem.interaction.timestamp + 1); - } else { - self.viewHorizonTimestamp = nil; - } - - // Snapshot the scroll state by measuring the "distance from top of view to - // bottom of content"; if the mapping's "window" size grows, it will grow - // _upward_. - OWSAssertDebug([self.collectionView.collectionViewLayout isKindOfClass:[ConversationViewLayout class]]); - ConversationViewLayout *conversationViewLayout - = (ConversationViewLayout *)self.collectionView.collectionViewLayout; - // To avoid laying out the collection view during initial view - // presentation, don't trigger layout here (via safeContentHeight) - // until layout has been done at least once. - if (conversationViewLayout.hasEverHadLayout) { - self.previousViewTopToContentBottom = @(self.safeContentHeight - self.collectionView.contentOffset.y); - } else { - self.previousViewTopToContentBottom = nil; - } - - OWSLogVerbose(@"paused observation of view model."); - } -} - - (nullable NSIndexPath *)firstIndexPathAtViewHorizonTimestamp { - OWSAssertDebug(self.shouldObserveVMUpdates); - if (!self.viewHorizonTimestamp) { return nil; } @@ -4604,11 +4443,6 @@ typedef enum : NSUInteger { #pragma mark - ConversationViewModelDelegate -- (BOOL)isObservingVMUpdates -{ - return self.shouldObserveVMUpdates; -} - - (void)conversationViewModelWillUpdate { OWSAssertIsOnMainThread(); @@ -4632,11 +4466,6 @@ typedef enum : NSUInteger { OWSAssertDebug(conversationUpdate); OWSAssertDebug(self.conversationViewModel); - if (!self.shouldObserveVMUpdates) { - return; - } - - [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4934,26 +4763,6 @@ typedef enum : NSUInteger { [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; } -#pragma mark - Conversation Snapshot - -- (void)tryToUpdateConversationSnapshot -{ - if (!self.isObservingVMUpdates) { - return; - } - - [self updateConversationSnapshot]; -} - -- (void)updateConversationSnapshot -{ - ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; - conversationSnapshot.viewItems = self.conversationViewModel.viewItems; - conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; - conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; - _conversationSnapshot = conversationSnapshot; -} - @end NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index d13a38c36..fd708309b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -76,8 +76,6 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { - (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem; -- (BOOL)isObservingVMUpdates; - - (ConversationStyle *)conversationStyle; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 75428952d..ea386b597 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -542,19 +542,12 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSLogVerbose(@""); - if (!self.delegate.isObservingVMUpdates) { - return; - } - // External database modifications (e.g. changes from another process such as the SAE) // are "flushed" using touchDbAsync when the app re-enters the foreground. } - (void)uiDatabaseWillUpdate:(NSNotification *)notification { - if (!self.delegate.isObservingVMUpdates) { - return; - } [self.delegate conversationViewModelWillUpdate]; } @@ -705,13 +698,6 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSAssertDebug(oldItemIdList); OWSAssertDebug(updatedItemSetParam); - if (!self.delegate.isObservingVMUpdates) { - OWSLogVerbose(@"Skipping VM update."); - // We fire this event, but it will be ignored. - [self.delegate conversationViewModelDidUpdate:ConversationUpdate.minorUpdate]; - return; - } - if (oldItemIdList.count != [NSSet setWithArray:oldItemIdList].count) { OWSFailDebug(@"Old view item list has duplicates."); [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; From 7711ee92a7d5491ba70c35175a0049fc6aa23594 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 13:03:00 -0500 Subject: [PATCH 151/493] Revert "Conversation view always observes view model." This reverts commit 9d39e829a44f28f324f79e0b74a6c8692678d788. --- .../ConversationViewController.m | 203 +++++++++++++++++- .../ConversationView/ConversationViewModel.h | 2 + .../ConversationView/ConversationViewModel.m | 14 ++ 3 files changed, 213 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 053870d6d..8c2f534f7 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,6 +108,25 @@ typedef enum : NSUInteger { #pragma mark - +// We use snapshots to ensure that the view has a consistent +// representation of view model state which is not updated +// when the view is not observing view model changes. +@interface ConversationSnapshot : NSObject + +@property (nonatomic) NSArray> *viewItems; +@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; +@property (nonatomic) BOOL canLoadMoreItems; + +@end + +#pragma mark - + +@implementation ConversationSnapshot + +@end + +#pragma mark - + @interface ConversationViewController () > *)viewItems { - return self.conversationViewModel.viewItems; + return self.conversationSnapshot.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationViewModel.dynamicInteractions; + return self.conversationSnapshot.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -840,6 +869,7 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; + [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -1690,7 +1720,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -1931,6 +1961,8 @@ typedef enum : NSUInteger { - (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController { [[OWSWindowManager sharedManager] hideMenuActionsWindow]; + + [self updateShouldObserveVMUpdates]; } - (void)menuActions:(MenuActionsViewController *)menuActionsViewController @@ -2037,6 +2069,8 @@ typedef enum : NSUInteger { self.conversationViewModel.mostRecentMenuActionsViewItem = cell.viewItem; [[OWSWindowManager sharedManager] showMenuActionsWindow:menuActionsViewController]; + + [self updateShouldObserveVMUpdates]; } - (NSAttributedString *)attributedContactOrProfileNameForPhoneIdentifier:(NSString *)recipientId @@ -4083,6 +4117,7 @@ typedef enum : NSUInteger { { _isViewVisible = isViewVisible; + [self updateShouldObserveVMUpdates]; [self updateCellsVisible]; } @@ -4095,8 +4130,134 @@ typedef enum : NSUInteger { } } +- (void)updateShouldObserveVMUpdates +{ + if (!CurrentAppContext().isAppForegroundAndActive) { + self.shouldObserveVMUpdates = NO; + return; + } + + if (!self.isViewVisible) { + self.shouldObserveVMUpdates = NO; + return; + } + + if (OWSWindowManager.sharedManager.isPresentingMenuActions) { + self.shouldObserveVMUpdates = NO; + return; + } + + self.shouldObserveVMUpdates = YES; +} + +- (void)setShouldObserveVMUpdates:(BOOL)shouldObserveVMUpdates +{ + if (_shouldObserveVMUpdates == shouldObserveVMUpdates) { + return; + } + + _shouldObserveVMUpdates = shouldObserveVMUpdates; + + if (self.shouldObserveVMUpdates) { + OWSLogVerbose(@"resume observation of view model."); + + [self updateConversationSnapshot]; + [self resetContentAndLayout]; + [self updateBackButtonUnreadCount]; + [self updateNavigationBarSubtitleLabel]; + [self updateDisappearingMessagesConfiguration]; + + // Detect changes in the mapping's "window" size. + if (self.previousViewTopToContentBottom && self.previousViewItemCount + && self.previousViewItemCount.unsignedIntegerValue != self.viewItems.count) { + CGFloat newContentHeight = self.safeContentHeight; + CGPoint newContentOffset + = CGPointMake(0, MAX(0, newContentHeight - self.previousViewTopToContentBottom.floatValue)); + [self.collectionView setContentOffset:newContentOffset animated:NO]; + } + + // When we resume observing database changes, we want to scroll to show the user + // any new items inserted while we were not observing. We therefore find the + // first item at or after the "view horizon". See the comments below which explain + // the "view horizon". + id _Nullable lastViewItem = self.viewItems.lastObject; + BOOL hasAddedNewItems = (lastViewItem && self.previousLastTimestamp + && lastViewItem.interaction.timestamp > self.previousLastTimestamp.unsignedLongLongValue); + + OWSLogInfo(@"hasAddedNewItems: %d", hasAddedNewItems); + if (hasAddedNewItems) { + NSIndexPath *_Nullable indexPathToShow = [self firstIndexPathAtViewHorizonTimestamp]; + if (indexPathToShow) { + // The goal is to show _both_ the last item before the "view horizon" and the + // first item after the "view horizon". We can't do "top on first item after" + // or "bottom on last item before" or we won't see the other. Unfortunately, + // this gets tricky if either is huge. The largest cells are oversize text, + // which should be rare. Other cells are considerably smaller than a screenful. + [self.collectionView scrollToItemAtIndexPath:indexPathToShow + atScrollPosition:UICollectionViewScrollPositionCenteredVertically + animated:NO]; + } + } + self.viewHorizonTimestamp = nil; + OWSLogVerbose(@"resumed observation of view model."); + } else { + OWSLogVerbose(@"pausing observation of view model."); + // When stopping observation, try to record the timestamp of the "view horizon". + // The "view horizon" is where we'll want to focus the users when we resume + // observation if any changes have happened while we weren't observing. + // Ideally, we'll focus on those changes. But we can't skip over unread + // interactions, so we prioritize those, if any. + // + // We'll use this later to update the view to reflect any changes made while + // we were not observing the database. See extendRangeToIncludeUnobservedItems + // and the logic above. + id _Nullable lastViewItem = self.viewItems.lastObject; + if (lastViewItem) { + self.previousLastTimestamp = @(lastViewItem.interaction.timestamp); + self.previousViewItemCount = @(self.viewItems.count); + } else { + self.previousLastTimestamp = nil; + self.previousViewItemCount = nil; + } + + __block TSInteraction *_Nullable firstUnseenInteraction = nil; + [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { + firstUnseenInteraction = + [[TSDatabaseView unseenDatabaseViewExtension:transaction] firstObjectInGroup:self.thread.uniqueId]; + }]; + if (firstUnseenInteraction) { + // If there are any unread interactions, focus on the first one. + self.viewHorizonTimestamp = @(firstUnseenInteraction.timestamp); + } else if (lastViewItem) { + // Otherwise, focus _just after_ the last interaction. + self.viewHorizonTimestamp = @(lastViewItem.interaction.timestamp + 1); + } else { + self.viewHorizonTimestamp = nil; + } + + // Snapshot the scroll state by measuring the "distance from top of view to + // bottom of content"; if the mapping's "window" size grows, it will grow + // _upward_. + OWSAssertDebug([self.collectionView.collectionViewLayout isKindOfClass:[ConversationViewLayout class]]); + ConversationViewLayout *conversationViewLayout + = (ConversationViewLayout *)self.collectionView.collectionViewLayout; + // To avoid laying out the collection view during initial view + // presentation, don't trigger layout here (via safeContentHeight) + // until layout has been done at least once. + if (conversationViewLayout.hasEverHadLayout) { + self.previousViewTopToContentBottom = @(self.safeContentHeight - self.collectionView.contentOffset.y); + } else { + self.previousViewTopToContentBottom = nil; + } + + OWSLogVerbose(@"paused observation of view model."); + } +} + - (nullable NSIndexPath *)firstIndexPathAtViewHorizonTimestamp { + OWSAssertDebug(self.shouldObserveVMUpdates); + if (!self.viewHorizonTimestamp) { return nil; } @@ -4443,6 +4604,11 @@ typedef enum : NSUInteger { #pragma mark - ConversationViewModelDelegate +- (BOOL)isObservingVMUpdates +{ + return self.shouldObserveVMUpdates; +} + - (void)conversationViewModelWillUpdate { OWSAssertIsOnMainThread(); @@ -4466,6 +4632,11 @@ typedef enum : NSUInteger { OWSAssertDebug(conversationUpdate); OWSAssertDebug(self.conversationViewModel); + if (!self.shouldObserveVMUpdates) { + return; + } + + [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -4763,6 +4934,26 @@ typedef enum : NSUInteger { [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; } +#pragma mark - Conversation Snapshot + +- (void)tryToUpdateConversationSnapshot +{ + if (!self.isObservingVMUpdates) { + return; + } + + [self updateConversationSnapshot]; +} + +- (void)updateConversationSnapshot +{ + ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; + conversationSnapshot.viewItems = self.conversationViewModel.viewItems; + conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; + conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; + _conversationSnapshot = conversationSnapshot; +} + @end NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index fd708309b..d13a38c36 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -76,6 +76,8 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { - (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem; +- (BOOL)isObservingVMUpdates; + - (ConversationStyle *)conversationStyle; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index ea386b597..75428952d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -542,12 +542,19 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSLogVerbose(@""); + if (!self.delegate.isObservingVMUpdates) { + return; + } + // External database modifications (e.g. changes from another process such as the SAE) // are "flushed" using touchDbAsync when the app re-enters the foreground. } - (void)uiDatabaseWillUpdate:(NSNotification *)notification { + if (!self.delegate.isObservingVMUpdates) { + return; + } [self.delegate conversationViewModelWillUpdate]; } @@ -698,6 +705,13 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSAssertDebug(oldItemIdList); OWSAssertDebug(updatedItemSetParam); + if (!self.delegate.isObservingVMUpdates) { + OWSLogVerbose(@"Skipping VM update."); + // We fire this event, but it will be ignored. + [self.delegate conversationViewModelDidUpdate:ConversationUpdate.minorUpdate]; + return; + } + if (oldItemIdList.count != [NSSet setWithArray:oldItemIdList].count) { OWSFailDebug(@"Old view item list has duplicates."); [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; From 13154fb828b8da9af19b7ac21dc4e56ce84f6767 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 16:08:51 -0700 Subject: [PATCH 152/493] allow long text with non-durable sends (SAE) --- .../Notifications/AppNotifications.swift | 18 +- .../SharingThreadPickerViewController.m | 77 +++--- SignalMessaging/utils/ThreadUtil.h | 19 +- SignalMessaging/utils/ThreadUtil.m | 236 ++++++++++-------- 4 files changed, 195 insertions(+), 155 deletions(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 1f5673ccf..60f255f91 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -660,14 +660,20 @@ class NotificationActionHandler { } extension ThreadUtil { + static var dbReadConnection: YapDatabaseConnection { + return OWSPrimaryStorage.shared().dbReadConnection + } + class func sendMessageNonDurably(text: String, thread: TSThread, quotedReplyModel: OWSQuotedReplyModel?, messageSender: MessageSender) -> Promise { return Promise { resolver in - self.sendMessageNonDurably(withText: text, - in: thread, - quotedReplyModel: quotedReplyModel, - messageSender: messageSender, - success: resolver.fulfill, - failure: resolver.reject) + self.dbReadConnection.read { transaction in + _ = self.sendMessageNonDurably(withText: text, + in: thread, + quotedReplyModel: quotedReplyModel, + transaction: transaction, + messageSender: messageSender, + completion: resolver.resolve) + } } } } diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index b14ddc605..08770ec82 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -30,7 +30,6 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); @property (nonatomic) TSThread *thread; @property (nonatomic, readonly, weak) id shareViewDelegate; @property (nonatomic, readonly) UIProgressView *progressView; -@property (nonatomic, readonly) YapDatabaseConnection *editingDBConnection; @property (atomic, nullable) TSOutgoingMessage *outgoingMessage; @end @@ -46,13 +45,26 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); return self; } - _editingDBConnection = [OWSPrimaryStorage.sharedManager newDatabaseConnection]; _shareViewDelegate = shareViewDelegate; self.selectThreadViewDelegate = self; return self; } +#pragma mark - Dependencies + +- (YapDatabaseConnection *)dbReadWriteConnection +{ + return OWSPrimaryStorage.sharedManager.dbReadWriteConnection; +} + +- (YapDatabaseConnection *)dbReadConnection +{ + return OWSPrimaryStorage.sharedManager.dbReadConnection; +} + +#pragma mark - UIViewController overrides + - (void)loadView { [super loadView]; @@ -274,14 +286,18 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); // the sending operation. Alternatively, we could use a durable send, but do more to make sure the // SAE runs as long as it needs. // TODO ALBUMS - send album via SAE - outgoingMessage = [ThreadUtil sendMessageNonDurablyWithAttachments:attachments - inThread:self.thread - messageBody:messageText - quotedReplyModel:nil - messageSender:self.messageSender - completion:^(NSError *_Nullable error) { - sendCompletion(error, outgoingMessage); - }]; + + [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + outgoingMessage = [ThreadUtil sendMessageNonDurablyWithText:messageText + mediaAttachments:attachments + inThread:self.thread + quotedReplyModel:nil + transaction:transaction + messageSender:self.messageSender + completion:^(NSError *_Nullable error) { + sendCompletion(error, outgoingMessage); + }]; + }]; // This is necessary to show progress. self.outgoingMessage = outgoingMessage; @@ -310,19 +326,22 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); // DURABLE CLEANUP - SAE uses non-durable sending to make sure the app is running long enough to complete // the sending operation. Alternatively, we could use a durable send, but do more to make sure the // SAE runs as long as it needs. - outgoingMessage = [ThreadUtil sendMessageNonDurablyWithText:messageText - inThread:self.thread - quotedReplyModel:nil - messageSender:self.messageSender - success:^{ - sendCompletion(nil, outgoingMessage); - } - failure:^(NSError *_Nonnull error) { - sendCompletion(error, outgoingMessage); - }]; - - // This is necessary to show progress. - self.outgoingMessage = outgoingMessage; + [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { + outgoingMessage = [ThreadUtil sendMessageNonDurablyWithText:messageText + inThread:self.thread + quotedReplyModel:nil + transaction:transaction + messageSender:self.messageSender + completion:^(NSError *_Nullable error) { + if (error) { + sendCompletion(error, outgoingMessage); + } else { + sendCompletion(nil, outgoingMessage); + } + }]; + // This is necessary to show progress. + self.outgoingMessage = outgoingMessage; + }]; } fromViewController:approvalViewController]; } @@ -344,11 +363,12 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); OWSAssertIsOnMainThread(); // TODO - in line with QuotedReply and other message attachments, saving should happen as part of sending // preparation rather than duplicated here and in the SAE - [self.editingDBConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { - if (contactShare.avatarImage) { - [contactShare.dbRecord saveAvatarImage:contactShare.avatarImage transaction:transaction]; + [self.dbReadWriteConnection + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { + if (contactShare.avatarImage) { + [contactShare.dbRecord saveAvatarImage:contactShare.avatarImage transaction:transaction]; + } } - } completionBlock:^{ __block TSOutgoingMessage *outgoingMessage = nil; outgoingMessage = [ThreadUtil sendMessageNonDurablyWithContactShare:contactShare.dbRecord @@ -521,8 +541,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); OWSLogDebug(@"Confirming identity for recipient: %@", recipientId); - [OWSPrimaryStorage.sharedManager.newDatabaseConnection asyncReadWriteWithBlock:^( - YapDatabaseReadWriteTransaction *transaction) { + [self.dbReadWriteConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { OWSVerificationState verificationState = [[OWSIdentityManager sharedManager] verificationStateForRecipientId:recipientId transaction:transaction]; switch (verificationState) { diff --git a/SignalMessaging/utils/ThreadUtil.h b/SignalMessaging/utils/ThreadUtil.h index aa1923d3b..bf10adacd 100644 --- a/SignalMessaging/utils/ThreadUtil.h +++ b/SignalMessaging/utils/ThreadUtil.h @@ -63,20 +63,21 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Non-Durable Sending // Used by SAE and "reply from lockscreen", otherwise we should use the durable `enqueue` counterpart -+ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)text ++ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)fullMessageText inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler; + completion:(void (^_Nullable)(NSError *_Nullable error))completion; // Used by SAE, otherwise we should use the durable `enqueue` counterpart -+ (TSOutgoingMessage *)sendMessageNonDurablyWithAttachments:(NSArray *)attachments - inThread:(TSThread *)thread - messageBody:(nullable NSString *)messageBody - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel - messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion; ++ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)fullMessageText + mediaAttachments:(NSArray *)attachments + inThread:(TSThread *)thread + quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + transaction:(YapDatabaseReadTransaction *)transaction + messageSender:(OWSMessageSender *)messageSender + completion:(void (^_Nullable)(NSError *_Nullable error))completion; // Used by SAE, otherwise we should use the durable `enqueue` counterpart + (TSOutgoingMessage *)sendMessageNonDurablyWithContactShare:(OWSContact *)contactShare diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index c7c0dcf24..eb2bbdf8d 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -65,6 +65,10 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - +typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMessage, + NSMutableArray *attachmentInfos, + YapDatabaseReadWriteTransaction *writeTransaction); + @implementation ThreadUtil #pragma mark - Dependencies @@ -95,26 +99,8 @@ NS_ASSUME_NONNULL_BEGIN transaction:transaction]; } -+ (nullable OWSLinkPreview *)linkPreviewForLinkPreviewDraft:(nullable OWSLinkPreviewDraft *)linkPreviewDraft - transaction:(YapDatabaseReadWriteTransaction *)transaction -{ - OWSAssertDebug(transaction); - - if (!linkPreviewDraft) { - return nil; - } - NSError *linkPreviewError; - OWSLinkPreview *_Nullable linkPreview = [OWSLinkPreview buildValidatedLinkPreviewFromInfo:linkPreviewDraft - transaction:transaction - error:&linkPreviewError]; - if (linkPreviewError && ![OWSLinkPreview isNoPreviewError:linkPreviewError]) { - OWSLogError(@"linkPreviewError: %@", linkPreviewError); - } - return linkPreview; -} - + (TSOutgoingMessage *)enqueueMessageWithText:(nullable NSString *)fullMessageText - mediaAttachments:(NSArray *)attachmentsParam + mediaAttachments:(NSArray *)mediaAttachments inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel linkPreviewDraft:(nullable nullable OWSLinkPreviewDraft *)linkPreviewDraft @@ -123,8 +109,36 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertIsOnMainThread(); OWSAssertDebug(thread); + return [self + buildOutgoingMessageWithText:fullMessageText + mediaAttachments:mediaAttachments + thread:thread + quotedReplyModel:quotedReplyModel + linkPreviewDraft:linkPreviewDraft + transaction:transaction + completion:^(TSOutgoingMessage *savedMessage, + NSMutableArray *attachmentInfos, + YapDatabaseReadWriteTransaction *writeTransaction) { + if (attachmentInfos.count == 0) { + [self.messageSenderJobQueue addMessage:savedMessage transaction:writeTransaction]; + } else { + [self.messageSenderJobQueue addMediaMessage:savedMessage + attachmentInfos:attachmentInfos + isTemporaryAttachment:NO]; + } + }]; +} + ++ (TSOutgoingMessage *)buildOutgoingMessageWithText:(nullable NSString *)fullMessageText + mediaAttachments:(NSArray *)mediaAttachments + thread:(TSThread *)thread + quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + linkPreviewDraft:(nullable OWSLinkPreviewDraft *)linkPreviewDraft + transaction:(YapDatabaseReadTransaction *)transaction + completion:(BuildOutgoingMessageCompletionBlock)completionBlock; +{ NSString *_Nullable truncatedText; - NSArray *attachments = attachmentsParam; + NSArray *attachments = mediaAttachments; if ([fullMessageText lengthOfBytesUsingEncoding:NSUTF8StringEncoding] <= kOversizeTextMessageSizeThreshold) { truncatedText = fullMessageText; } else { @@ -141,7 +155,7 @@ NS_ASSUME_NONNULL_BEGIN if (dataSource) { SignalAttachment *oversizeTextAttachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:kOversizeTextAttachmentUTI]; - attachments = [attachmentsParam arrayByAddingObject:oversizeTextAttachment]; + attachments = [mediaAttachments arrayByAddingObject:oversizeTextAttachment]; } else { OWSFailDebug(@"dataSource was unexpectedly nil"); } @@ -188,21 +202,13 @@ NS_ASSUME_NONNULL_BEGIN [message updateWithLinkPreview:linkPreview transaction:writeTransaction]; } - if (attachments.count == 0) { - [self.messageSenderJobQueue addMessage:message transaction:writeTransaction]; - } else { - NSMutableArray *attachmentInfos = - [NSMutableArray new]; - for (SignalAttachment *attachment in attachments) { - OWSOutgoingAttachmentInfo *attachmentInfo = - [attachment buildOutgoingAttachmentInfoWithMessage:message]; - [attachmentInfos addObject:attachmentInfo]; - } - - [self.messageSenderJobQueue addMediaMessage:message - attachmentInfos:attachmentInfos - isTemporaryAttachment:NO]; + NSMutableArray *attachmentInfos = [NSMutableArray new]; + for (SignalAttachment *attachment in attachments) { + OWSOutgoingAttachmentInfo *attachmentInfo = + [attachment buildOutgoingAttachmentInfoWithMessage:message]; + [attachmentInfos addObject:attachmentInfo]; } + completionBlock(message, attachmentInfos, writeTransaction); } completionBlock:benchmarkCompletion]; }]; @@ -257,92 +263,82 @@ NS_ASSUME_NONNULL_BEGIN // MARK: Non-Durable Sending // We might want to generate a link preview here. -+ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)text ++ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)fullMessageText inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler + completion:(void (^_Nullable)(NSError *_Nullable error))completion { - OWSAssertIsOnMainThread(); - OWSAssertDebug(text.length > 0); - OWSAssertDebug(thread); - OWSAssertDebug(messageSender); - - OWSDisappearingMessagesConfiguration *configuration = - [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId]; - uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); - TSOutgoingMessage *message = - [TSOutgoingMessage outgoingMessageInThread:thread - messageBody:text - attachmentId:nil - expiresInSeconds:expiresInSeconds - quotedMessage:[quotedReplyModel buildQuotedMessageForSending] - linkPreview:nil]; - - [messageSender sendMessage:message success:successHandler failure:failureHandler]; - - return message; + return [self sendMessageNonDurablyWithText:fullMessageText + mediaAttachments:@[] + inThread:thread + quotedReplyModel:quotedReplyModel + transaction:transaction + messageSender:messageSender + completion:completion]; } -+ (TSOutgoingMessage *)sendMessageNonDurablyWithAttachments:(NSArray *)attachments - inThread:(TSThread *)thread - messageBody:(nullable NSString *)messageBody - quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel - messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion ++ (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)fullMessageText + mediaAttachments:(NSArray *)mediaAttachments + inThread:(TSThread *)thread + quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel + transaction:(YapDatabaseReadTransaction *)transaction + messageSender:(OWSMessageSender *)messageSender + completion:(void (^_Nullable)(NSError *_Nullable error))completion { OWSAssertIsOnMainThread(); - OWSAssertDebug(attachments.count > 0); OWSAssertDebug(thread); - OWSAssertDebug(messageSender); - OWSDisappearingMessagesConfiguration *configuration = - [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId]; - - uint32_t expiresInSeconds = (configuration.isEnabled ? configuration.durationSeconds : 0); - BOOL isVoiceMessage = (attachments.count == 1 && attachments.firstObject.isVoiceMessage); - // MJK TODO - remove senderTimestamp - TSOutgoingMessage *message = - [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp] - inThread:thread - messageBody:messageBody - attachmentIds:[NSMutableArray new] - expiresInSeconds:expiresInSeconds - expireStartedAt:0 - isVoiceMessage:isVoiceMessage - groupMetaMessage:TSGroupMetaMessageUnspecified - quotedMessage:[quotedReplyModel buildQuotedMessageForSending] - contactShare:nil - linkPreview:nil]; - - NSMutableArray *attachmentInfos = [NSMutableArray new]; - for (SignalAttachment *attachment in attachments) { - OWSAssertDebug([attachment mimeType].length > 0); - - [attachmentInfos addObject:[attachment buildOutgoingAttachmentInfoWithMessage:message]]; - } - - [messageSender sendAttachments:attachmentInfos - inMessage:message - success:^{ - OWSLogDebug(@"Successfully sent message attachment."); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(nil); - }); - } - } - failure:^(NSError *error) { - OWSLogError(@"Failed to send message attachment with error: %@", error); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(error); - }); - } - }]; - - return message; + return + [self buildOutgoingMessageWithText:fullMessageText + mediaAttachments:mediaAttachments + thread:thread + quotedReplyModel:quotedReplyModel + linkPreviewDraft:nil + transaction:transaction + completion:^(TSOutgoingMessage *_Nonnull savedMessage, + NSMutableArray *_Nonnull attachmentInfos, + YapDatabaseReadWriteTransaction *_Nonnull writeTransaction) { + if (attachmentInfos.count == 0) { + [messageSender sendMessage:savedMessage + success:^{ + OWSLogDebug(@"Successfully sent message attachment."); + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(nil); + }); + } + } + failure:^(NSError *error) { + OWSLogError(@"Failed to send message attachment with error: %@", error); + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(error); + }); + } + }]; + } else { + [messageSender sendAttachments:attachmentInfos + inMessage:savedMessage + success:^{ + OWSLogDebug(@"Successfully sent message attachment."); + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(nil); + }); + } + } + failure:^(NSError *error) { + OWSLogError(@"Failed to send message attachment with error: %@", error); + if (completion) { + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(error); + }); + } + }]; + } + }]; } + (TSOutgoingMessage *)sendMessageNonDurablyWithContactShare:(OWSContact *)contactShare @@ -395,6 +391,24 @@ NS_ASSUME_NONNULL_BEGIN return message; } ++ (nullable OWSLinkPreview *)linkPreviewForLinkPreviewDraft:(nullable OWSLinkPreviewDraft *)linkPreviewDraft + transaction:(YapDatabaseReadWriteTransaction *)transaction +{ + OWSAssertDebug(transaction); + + if (!linkPreviewDraft) { + return nil; + } + NSError *linkPreviewError; + OWSLinkPreview *_Nullable linkPreview = [OWSLinkPreview buildValidatedLinkPreviewFromInfo:linkPreviewDraft + transaction:transaction + error:&linkPreviewError]; + if (linkPreviewError && ![OWSLinkPreview isNoPreviewError:linkPreviewError]) { + OWSLogError(@"linkPreviewError: %@", linkPreviewError); + } + return linkPreview; +} + #pragma mark - Dynamic Interactions + (ThreadDynamicInteractions *)ensureDynamicInteractionsForThread:(TSThread *)thread From 870caaa84ad96ddc0e6ef59ba50a72227eb51288 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Feb 2019 09:47:43 -0700 Subject: [PATCH 153/493] simplify completion checking - make nonnull --- SignalMessaging/utils/ThreadUtil.h | 6 +- SignalMessaging/utils/ThreadUtil.m | 62 ++++++++----------- .../src/Messages/OWSMessageSender.m | 2 +- 3 files changed, 29 insertions(+), 41 deletions(-) diff --git a/SignalMessaging/utils/ThreadUtil.h b/SignalMessaging/utils/ThreadUtil.h index bf10adacd..2ad741c1d 100644 --- a/SignalMessaging/utils/ThreadUtil.h +++ b/SignalMessaging/utils/ThreadUtil.h @@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion; + completion:(void (^)(NSError *_Nullable error))completion; // Used by SAE, otherwise we should use the durable `enqueue` counterpart + (TSOutgoingMessage *)sendMessageNonDurablyWithText:(NSString *)fullMessageText @@ -77,13 +77,13 @@ NS_ASSUME_NONNULL_BEGIN quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion; + completion:(void (^)(NSError *_Nullable error))completion; // Used by SAE, otherwise we should use the durable `enqueue` counterpart + (TSOutgoingMessage *)sendMessageNonDurablyWithContactShare:(OWSContact *)contactShare inThread:(TSThread *)thread messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion; + completion:(void (^)(NSError *_Nullable error))completion; #pragma mark - dynamic interactions diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index eb2bbdf8d..d21e5a708 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -268,8 +268,10 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion + completion:(void (^)(NSError *_Nullable error))completion { + OWSAssertDebug(completion); + return [self sendMessageNonDurablyWithText:fullMessageText mediaAttachments:@[] inThread:thread @@ -285,10 +287,11 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel transaction:(YapDatabaseReadTransaction *)transaction messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion + completion:(void (^)(NSError *_Nullable error))completion { OWSAssertIsOnMainThread(); OWSAssertDebug(thread); + OWSAssertDebug(completion); return [self buildOutgoingMessageWithText:fullMessageText @@ -303,39 +306,27 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess if (attachmentInfos.count == 0) { [messageSender sendMessage:savedMessage success:^{ - OWSLogDebug(@"Successfully sent message attachment."); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(nil); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(nil); + }); } failure:^(NSError *error) { - OWSLogError(@"Failed to send message attachment with error: %@", error); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(error); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(error); + }); }]; } else { [messageSender sendAttachments:attachmentInfos inMessage:savedMessage success:^{ - OWSLogDebug(@"Successfully sent message attachment."); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(nil); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(nil); + }); } failure:^(NSError *error) { - OWSLogError(@"Failed to send message attachment with error: %@", error); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(error); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(error); + }); }]; } }]; @@ -344,13 +335,14 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess + (TSOutgoingMessage *)sendMessageNonDurablyWithContactShare:(OWSContact *)contactShare inThread:(TSThread *)thread messageSender:(OWSMessageSender *)messageSender - completion:(void (^_Nullable)(NSError *_Nullable error))completion + completion:(void (^)(NSError *_Nullable error))completion { OWSAssertIsOnMainThread(); OWSAssertDebug(contactShare); OWSAssertDebug(contactShare.ows_isValid); OWSAssertDebug(thread); OWSAssertDebug(messageSender); + OWSAssertDebug(completion); OWSDisappearingMessagesConfiguration *configuration = [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId]; @@ -373,19 +365,15 @@ typedef void (^BuildOutgoingMessageCompletionBlock)(TSOutgoingMessage *savedMess [messageSender sendMessage:message success:^{ OWSLogDebug(@"Successfully sent contact share."); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(nil); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(nil); + }); } failure:^(NSError *error) { OWSLogError(@"Failed to send contact share with error: %@", error); - if (completion) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - completion(error); - }); - } + dispatch_async(dispatch_get_main_queue(), ^(void) { + completion(error); + }); }]; return message; diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 87e14a868..ad3703552 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -234,7 +234,7 @@ void AssertIsOnSendingQueue() - (void)didFailWithError:(NSError *)error { - OWSLogDebug(@"failed with error: %@", error); + OWSLogError(@"failed with error: %@", error); self.failureHandler(error); } From 5361720b1939d61b121125150d713166f03f3256 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 25 Feb 2019 13:19:41 -0700 Subject: [PATCH 154/493] log token in debug --- Signal/src/AppDelegate.m | 2 +- Signal/src/Jobs/SyncPushTokensJob.swift | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 5b7b757e2..31d0cf177 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -528,7 +528,7 @@ static NSTimeInterval launchStartedAt; return; } - OWSLogInfo(@"registered vanilla push token: %@", deviceToken); + OWSLogInfo(@"registered vanilla push token"); [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken]; } diff --git a/Signal/src/Jobs/SyncPushTokensJob.swift b/Signal/src/Jobs/SyncPushTokensJob.swift index 4f6ce8e27..08132ec80 100644 --- a/Signal/src/Jobs/SyncPushTokensJob.swift +++ b/Signal/src/Jobs/SyncPushTokensJob.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import PromiseKit @@ -53,11 +53,11 @@ class SyncPushTokensJob: NSObject { } guard shouldUploadTokens else { - Logger.info("No reason to upload pushToken: \(pushToken), voipToken: \(voipToken)") + Logger.info("No reason to upload pushToken: \(redact(pushToken)), voipToken: \(redact(voipToken))") return Promise.value(()) } - Logger.warn("uploading tokens to account servers. pushToken: \(pushToken), voipToken: \(voipToken)") + Logger.warn("uploading tokens to account servers. pushToken: \(redact(pushToken)), voipToken: \(redact(voipToken))") return firstly { self.accountManager.updatePushTokens(pushToken: pushToken, voipToken: voipToken) }.done { _ in @@ -89,7 +89,7 @@ class SyncPushTokensJob: NSObject { // MARK: private func recordPushTokensLocally(pushToken: String, voipToken: String) { - Logger.warn("Recording push tokens locally. pushToken: \(pushToken), voipToken: \(voipToken)") + Logger.warn("Recording push tokens locally. pushToken: \(redact(pushToken)), voipToken: \(redact(voipToken))") var didTokensChange = false @@ -110,3 +110,7 @@ class SyncPushTokensJob: NSObject { } } } + +private func redact(_ string: String) -> String { + return OWSIsDebugBuild() ? string : "[ READACTED \(string.prefix(2))...\(string.suffix(2)) ]" +} From f01fe8e563470c93004cba2de7a58b539c6cc061 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 17:18:49 -0500 Subject: [PATCH 155/493] Normalize translation in image editor. --- .../ImageEditorCropViewController.swift | 26 ++++-- .../Views/ImageEditor/ImageEditorModel.swift | 87 +++++++++++++++++-- SignalMessaging/categories/UIView+OWS.swift | 24 +++++ 3 files changed, 126 insertions(+), 11 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index b379ae892..3f420ac34 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -284,11 +284,13 @@ class ImageEditorCropViewController: OWSViewController { let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) pinchGestureRecognizer.referenceView = self.clipView + pinchGestureRecognizer.delegate = self view.addGestureRecognizer(pinchGestureRecognizer) let panGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:))) panGestureRecognizer.maximumNumberOfTouches = 1 panGestureRecognizer.referenceView = self.clipView + panGestureRecognizer.delegate = self view.addGestureRecognizer(panGestureRecognizer) } @@ -349,7 +351,7 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, rotationRadians: newRotationRadians, - scaling: newScaling).normalize()) + scaling: newScaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) default: break } @@ -521,7 +523,7 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: croppedOutputSizePixels, unitTranslation: unitTranslation, rotationRadians: transform.rotationRadians, - scaling: scaling).normalize()) + scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) } private func handleNormalPanGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { @@ -545,7 +547,7 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, rotationRadians: gestureStartTransform.rotationRadians, - scaling: gestureStartTransform.scaling).normalize()) + scaling: gestureStartTransform.scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) } private func cropRegion(forGestureRecognizer gestureRecognizer: ImageEditorPanGestureRecognizer) -> CropRegion? { @@ -622,7 +624,7 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, - scaling: scaling).normalize()) + scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) } @objc public func zoom2xButtonPressed() { @@ -633,10 +635,24 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, - scaling: scaling).normalize()) + scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) } @objc public func resetButtonPressed() { updateTransform(ImageEditorTransform.defaultTransform(srcImageSizePixels: model.srcImageSizePixels)) } } + +// MARK: - + +extension ImageEditorCropViewController: UIGestureRecognizerDelegate { + + @objc public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + // Until the GR recognizes, it should only see touches that start within the content. + guard gestureRecognizer.state == .possible else { + return true + } + let location = touch.location(in: clipView) + return clipView.bounds.contains(location) + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index c544d26ba..29b545400 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -78,7 +78,7 @@ public class ImageEditorTransform: NSObject { return ImageEditorTransform(outputSizePixels: srcImageSizePixels, unitTranslation: .zero, rotationRadians: 0.0, - scaling: 1.0).normalize() + scaling: 1.0).normalize(srcImageSizePixels: srcImageSizePixels) } public func affineTransform(viewSize: CGSize) -> CGAffineTransform { @@ -92,16 +92,91 @@ public class ImageEditorTransform: NSObject { return transform } - public func normalize() -> ImageEditorTransform { - // TODO: Normalize translation. -// public let unitTranslation: CGPoint - - // We need to ensure that + public func normalize(srcImageSizePixels: CGSize) -> ImageEditorTransform { + // Normalize scaling. + // The "src/background" image is rendered at a size that will fill + // the canvas bounds if scaling = 1.0 and translation = .zero. + // Therefore, any scaling >= 1.0 is valid. let minScaling: CGFloat = 1.0 let scaling = max(minScaling, self.scaling) // We don't need to normalize rotation. + // Normalize translation. + // + // This is decidedly non-trivial because of the way that + // scaling, rotation and translation combine. We need to + // guarantee that the image _always_ fills the canvas + // bounds. So want to clamp the translation such that the + // image can be moved _exactly_ to the edge of the canvas + // and no further in a way that reflects the current + // crop, scaling and rotation. + + // Normalize translation, Step 1: + // + // We project the viewport onto the canvas to determine + // its bounding box. + let viewBounds = CGRect(origin: .zero, size: self.outputSizePixels) + // This "naive" transform represents the proposed transform + // with no translation. + let naiveTransform = ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: .zero, + rotationRadians: rotationRadians, + scaling: scaling) + let naiveAffineTransform = naiveTransform.affineTransform(viewSize: viewBounds.size) + var naiveViewportMinCanvas = CGPoint.zero + var naiveViewportMaxCanvas = CGPoint.zero + // Find the "naive" bounding box of the viewport on the canvas + // by projects its corners from view coordinates to canvas + // coordinates. + // + // Due to symmetry, it should be sufficient to project 2 corners + // but we do all four corners for safety. + for viewCorner in [ + viewBounds.topLeft, + viewBounds.topRight, + viewBounds.bottomLeft, + viewBounds.bottomRight + ] { + let naiveViewCornerInCanvas = viewCorner.minus(viewBounds.center).applyingInverse(naiveAffineTransform).plus(viewBounds.center) + naiveViewportMinCanvas = naiveViewportMinCanvas.min(naiveViewCornerInCanvas) + naiveViewportMaxCanvas = naiveViewportMaxCanvas.max(naiveViewCornerInCanvas) + } + let naiveViewportSizeCanvas: CGPoint = naiveViewportMaxCanvas.minus(naiveViewportMinCanvas) + + // Normalize translation, Step 2: + // + // Now determine the "naive" image frame on the canvas. + let naiveImageFrameCanvas = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: srcImageSizePixels, transform: naiveTransform) + let naiveImageSizeCanvas = CGPoint(x: naiveImageFrameCanvas.width, y: naiveImageFrameCanvas.height) + + // Normalize translation, Step 3: + // + // The min/max translation can now by computed by diffing + // the size of the bounding box of the naive viewport and + // the size of the image on canvas. + let maxTranslationCanvas = naiveImageSizeCanvas.minus(naiveViewportSizeCanvas).times(0.5).max(.zero) + + // Normalize translation, Step 4: + // + // Clamp the proposed translation to the "max translation" + // from the last step. + // + // This is subtle. We want to clamp in canvas coordinates + // since the translation is specified in "unit canvas" + // coordinates. However, because the translation is + // applied in SRT order (scale-rotate-transform), it + // effectively operates in view coordinates since it is + // applied last. So we project it from view coordinates + // to canvas coordinates, clamp it, then project it back + // into unit view coordinates. + let translationInView = self.unitTranslation.fromUnitCoordinates(viewBounds: viewBounds) + let translationInCanvas = translationInView.applyingInverse(naiveAffineTransform) + // Clamp the translation to +/- maxTranslationCanvasUnit. + let clampedTranslationInCanvas = translationInCanvas.min(maxTranslationCanvas).max(maxTranslationCanvas.inverse()) + let clampedTranslationInView = clampedTranslationInCanvas.applying(naiveAffineTransform) + let unitTranslation = clampedTranslationInView.toUnitCoordinates(viewBounds: viewBounds, shouldClamp: false) + return ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 3a7fa6ca9..47f6bbfbb 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -170,6 +170,22 @@ public extension CGPoint { return CGPointSubtract(self, value) } + public func times(_ value: CGFloat) -> CGPoint { + return CGPoint(x: x * value, y: y * value) + } + + public func min(_ value: CGPoint) -> CGPoint { + // We use "Swift" to disambiguate the global function min() from this method. + return CGPoint(x: Swift.min(x, value.x), + y: Swift.min(y, value.y)) + } + + public func max(_ value: CGPoint) -> CGPoint { + // We use "Swift" to disambiguate the global function max() from this method. + return CGPoint(x: Swift.max(x, value.x), + y: Swift.max(y, value.y)) + } + public static let unit: CGPoint = CGPoint(x: 1.0, y: 1.0) public static let unitMidpoint: CGPoint = CGPoint(x: 0.5, y: 0.5) @@ -188,6 +204,14 @@ public extension CGRect { return origin } + public var topRight: CGPoint { + return CGPoint(x: maxX, y: 0) + } + + public var bottomLeft: CGPoint { + return CGPoint(x: 0, y: maxY) + } + public var bottomRight: CGPoint { return CGPoint(x: maxX, y: maxY) } From 0d26caced7528d60e5911e0628b945d8cd6b2dc4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Feb 2019 17:24:05 -0500 Subject: [PATCH 156/493] Normalize translation in image editor. --- .../Views/ImageEditor/ImageEditorModel.swift | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 29b545400..a1a1868a6 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -92,6 +92,8 @@ public class ImageEditorTransform: NSObject { return transform } + // This method normalizes a "proposed" transform (self) into + // one that is guaranteed to be valid. public func normalize(srcImageSizePixels: CGSize) -> ImageEditorTransform { // Normalize scaling. // The "src/background" image is rendered at a size that will fill @@ -127,7 +129,7 @@ public class ImageEditorTransform: NSObject { var naiveViewportMinCanvas = CGPoint.zero var naiveViewportMaxCanvas = CGPoint.zero // Find the "naive" bounding box of the viewport on the canvas - // by projects its corners from view coordinates to canvas + // by projecting its corners from view coordinates to canvas // coordinates. // // Due to symmetry, it should be sufficient to project 2 corners @@ -163,13 +165,14 @@ public class ImageEditorTransform: NSObject { // from the last step. // // This is subtle. We want to clamp in canvas coordinates - // since the translation is specified in "unit canvas" - // coordinates. However, because the translation is - // applied in SRT order (scale-rotate-transform), it - // effectively operates in view coordinates since it is + // since the min/max translation is specified by a bounding + // box in "unit canvas" coordinates. However, because the + // translation is applied in SRT order (scale-rotate-transform), + // it effectively operates in view coordinates since it is // applied last. So we project it from view coordinates // to canvas coordinates, clamp it, then project it back - // into unit view coordinates. + // into unit view coordinates using the "naive" (no translation) + // transform. let translationInView = self.unitTranslation.fromUnitCoordinates(viewBounds: viewBounds) let translationInCanvas = translationInView.applyingInverse(naiveAffineTransform) // Clamp the translation to +/- maxTranslationCanvasUnit. From cc20182ec046dd50b06787daadf6f544f4f59f94 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 12:17:10 -0500 Subject: [PATCH 157/493] Normalize translation in image editor. --- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index a1a1868a6..e4bee2cdd 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -113,6 +113,15 @@ public class ImageEditorTransform: NSObject { // image can be moved _exactly_ to the edge of the canvas // and no further in a way that reflects the current // crop, scaling and rotation. + // + // We need to clamp the translation to the valid "translation + // region" which is a rectangle centered on the origin. + // However, this rectangle is axis-aligned in canvas + // coordinates, not view coordinates. e.g. if you have + // a long image and a square output size, you could "slide" + // the crop region along the image's contents. That + // movement would appear diagonal to the user in the view + // but would be vertical on the canvas. // Normalize translation, Step 1: // From ac1e89ce1d9099002f1da2d31fe1930fe56b8a9f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 13:27:54 -0500 Subject: [PATCH 158/493] Respond to CR. --- SignalMessaging/categories/UIView+OWS.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 47f6bbfbb..cce4638a1 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -205,11 +205,11 @@ public extension CGRect { } public var topRight: CGPoint { - return CGPoint(x: maxX, y: 0) + return CGPoint(x: maxX, y: minY) } public var bottomLeft: CGPoint { - return CGPoint(x: 0, y: maxY) + return CGPoint(x: minX, y: maxY) } public var bottomRight: CGPoint { From c07a74d029aa2b875306408836de914cc4a0fd06 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 12:54:29 -0500 Subject: [PATCH 159/493] Update crop view to reflect design. --- .../ImageEditorCropViewController.swift | 79 +++++++++++++++++-- SignalMessaging/categories/UIView+OWS.swift | 14 ++++ 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 3f420ac34..e78a43d92 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -36,12 +36,12 @@ class ImageEditorCropViewController: OWSViewController { case topLeft, topRight, bottomLeft, bottomRight } - private class CropCornerView: UIView { + private class CropCornerView: OWSLayerView { let cropRegion: CropRegion init(cropRegion: CropRegion) { self.cropRegion = cropRegion - super.init(frame: .zero) + super.init() } @available(*, unavailable, message: "use other init() instead.") @@ -196,12 +196,14 @@ class ImageEditorCropViewController: OWSViewController { footer.isOpaque = false stackView.addArrangedSubview(footer) + setCropViewAppearance() + updateClipViewLayout() configureGestures() } - private static let desiredCornerSize: CGFloat = 30 + private static let desiredCornerSize: CGFloat = 24 private static let minCropSize: CGFloat = desiredCornerSize * 2 private var cornerSize = CGSize.zero @@ -219,6 +221,72 @@ class ImageEditorCropViewController: OWSViewController { private var cropViewConstraints = [NSLayoutConstraint]() + private func setCropViewAppearance() { + + // TODO: Tune the size. + let cornerSize = CGSize(width: min(clipView.width() * 0.5, ImageEditorCropViewController.desiredCornerSize), + height: min(clipView.height() * 0.5, ImageEditorCropViewController.desiredCornerSize)) + self.cornerSize = cornerSize + for cropCornerView in cropCornerViews { + let cornerThickness: CGFloat = 2 + + let shapeLayer = CAShapeLayer() + cropCornerView.layer.addSublayer(shapeLayer) + shapeLayer.fillColor = UIColor.white.cgColor + shapeLayer.strokeColor = nil + cropCornerView.layoutCallback = { (view) in + let shapeFrame = view.bounds.insetBy(dx: -cornerThickness, dy: -cornerThickness) + shapeLayer.frame = shapeFrame + + let bezierPath = UIBezierPath() + + switch cropCornerView.cropRegion { + case .topLeft: + bezierPath.addRegion(withPoints: [ + CGPoint.zero, + CGPoint(x: shapeFrame.width - cornerThickness, y: 0), + CGPoint(x: shapeFrame.width - cornerThickness, y: cornerThickness), + CGPoint(x: cornerThickness, y: cornerThickness), + CGPoint(x: cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: 0, y: shapeFrame.height - cornerThickness) + ]) + case .topRight: + bezierPath.addRegion(withPoints: [ + CGPoint(x: shapeFrame.width, y: 0), + CGPoint(x: shapeFrame.width, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: cornerThickness), + CGPoint(x: cornerThickness, y: cornerThickness), + CGPoint(x: cornerThickness, y: 0) + ]) + case .bottomLeft: + bezierPath.addRegion(withPoints: [ + CGPoint(x: 0, y: shapeFrame.height), + CGPoint(x: 0, y: cornerThickness), + CGPoint(x: cornerThickness, y: cornerThickness), + CGPoint(x: cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: shapeFrame.height) + ]) + case .bottomRight: + bezierPath.addRegion(withPoints: [ + CGPoint(x: shapeFrame.width, y: shapeFrame.height), + CGPoint(x: cornerThickness, y: shapeFrame.height), + CGPoint(x: cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: shapeFrame.height - cornerThickness), + CGPoint(x: shapeFrame.width - cornerThickness, y: cornerThickness), + CGPoint(x: shapeFrame.width, y: cornerThickness) + ]) + default: + owsFailDebug("Invalid crop region: \(cropCornerView.cropRegion)") + } + + shapeLayer.path = bezierPath.cgPath + } + } + cropView.addBorder(with: .white) + } + private func updateCropViewLayout() { NSLayoutConstraint.deactivate(cropViewConstraints) cropViewConstraints.removeAll() @@ -229,9 +297,6 @@ class ImageEditorCropViewController: OWSViewController { self.cornerSize = cornerSize for cropCornerView in cropCornerViews { cropViewConstraints.append(contentsOf: cropCornerView.autoSetDimensions(to: cornerSize)) - - cropCornerView.addRedBorder() - cropView.addRedBorder() } if !isCropGestureActive { @@ -268,8 +333,6 @@ class ImageEditorCropViewController: OWSViewController { } private func applyTransform() { - Logger.verbose("") - let viewSize = contentView.bounds.size contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) } diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index cce4638a1..bb774a851 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -238,3 +238,17 @@ public extension CGAffineTransform { return rotated(by: angleRadians) } } + +public extension UIBezierPath { + public func addRegion(withPoints points: [CGPoint]) { + guard let first = points.first else { + owsFailDebug("No points.") + return + } + move(to: first) + for point in points.dropFirst() { + addLine(to: point) + } + addLine(to: first) + } +} From 4db09b45b6c66ea7cba641e94d626a7ed8f1c8b2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 12:55:55 -0500 Subject: [PATCH 160/493] Update crop view to reflect design. --- .../ImageEditor/ImageEditorCropViewController.swift | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index e78a43d92..59a2d998e 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -81,17 +81,7 @@ class ImageEditorCropViewController: OWSViewController { override func loadView() { self.view = UIView() - if (UIAccessibilityIsReduceTransparencyEnabled()) { - self.view.backgroundColor = UIColor(white: 0.5, alpha: 0.5) - } else { - let alpha = OWSNavigationBar.backgroundBlurMutingFactor - self.view.backgroundColor = UIColor(white: 0.5, alpha: alpha) - - let blurEffectView = UIVisualEffectView(effect: Theme.barBlurEffect) - blurEffectView.layer.zPosition = -1 - self.view.addSubview(blurEffectView) - blurEffectView.autoPinEdgesToSuperviewEdges() - } + self.view.backgroundColor = .black let stackView = UIStackView() stackView.axis = .vertical From 69635fafacd2ae30083fd04f6028ab04016b2faf Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 13:18:52 -0500 Subject: [PATCH 161/493] Update crop view to reflect design. --- .../AttachmentApprovalViewController.swift | 17 ++- .../ImageEditorCropViewController.swift | 104 ++++++++++-------- .../Views/ImageEditor/ImageEditorView.swift | 9 +- SignalMessaging/Views/OWSButton.swift | 14 ++- 4 files changed, 89 insertions(+), 55 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index cb179cc56..398c3e2c3 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1324,12 +1324,19 @@ extension AttachmentPrepViewController: UIScrollViewDelegate { // MARK: - extension AttachmentPrepViewController: ImageEditorViewDelegate { - public func imageEditor(presentFullScreenOverlay viewController: UIViewController) { + public func imageEditor(presentFullScreenOverlay viewController: UIViewController, + withNavigation: Bool) { - let navigationController = OWSNavigationController(rootViewController: viewController) - navigationController.modalPresentationStyle = .overFullScreen - self.present(navigationController, animated: true) { - // Do nothing. + if withNavigation { + let navigationController = OWSNavigationController(rootViewController: viewController) + navigationController.modalPresentationStyle = .overFullScreen + self.present(navigationController, animated: true) { + // Do nothing. + } + } else { + self.present(viewController, animated: true) { + // Do nothing. + } } } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 59a2d998e..014981652 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -83,23 +83,42 @@ class ImageEditorCropViewController: OWSViewController { self.view.backgroundColor = .black - let stackView = UIStackView() - stackView.axis = .vertical - stackView.alignment = .fill - stackView.spacing = 16 - stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) - stackView.isLayoutMarginsRelativeArrangement = true - self.view.addSubview(stackView) - stackView.ows_autoPinToSuperviewEdges() + // MARK: - Buttons - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, - target: self, - action: #selector(didTapBackButton)) + // TODO: Apply icons. + let doneButton = OWSButton(title: "Done") { [weak self] in + self?.didTapBackButton() + } + let rotate90Button = OWSButton(title: "Rotate 90°") { [weak self] in + self?.rotate90ButtonPressed() + } + let rotate45Button = OWSButton(title: "Rotate 45°") { [weak self] in + self?.rotate45ButtonPressed() + } + let resetButton = OWSButton(title: "Reset") { [weak self] in + self?.resetButtonPressed() + } + let zoom2xButton = OWSButton(title: "Zoom 2x") { [weak self] in + self?.zoom2xButtonPressed() + } + + // MARK: - Header + + let header = UIStackView(arrangedSubviews: [ + UIView.hStretchingSpacer(), + resetButton, + doneButton + ]) + header.axis = .horizontal + header.spacing = 16 + header.backgroundColor = .clear + header.isOpaque = false + + // MARK: - Canvas & Wrapper let wrapperView = UIView.container() wrapperView.backgroundColor = .clear wrapperView.isOpaque = false - stackView.addArrangedSubview(wrapperView) // TODO: We could mask the clipped region with a semi-transparent overlay like WA. clipView.clipsToBounds = true @@ -127,33 +146,35 @@ class ImageEditorCropViewController: OWSViewController { clipView.addSubview(contentView) contentView.ows_autoPinToSuperviewEdges() - let rotate90Button = OWSButton() - rotate90Button.setTitle(NSLocalizedString("IMAGE_EDITOR_ROTATE_90_BUTTON", comment: "Label for button that rotates image 90 degrees."), - for: .normal) - rotate90Button.block = { [weak self] in - self?.rotate90ButtonPressed() - } + // MARK: - Footer - let rotate45Button = OWSButton() - rotate45Button.setTitle(NSLocalizedString("IMAGE_EDITOR_ROTATE_45_BUTTON", comment: "Label for button that rotates image 45 degrees."), - for: .normal) - rotate45Button.block = { [weak self] in - self?.rotate45ButtonPressed() - } + let footer = UIStackView(arrangedSubviews: [ + rotate90Button, + rotate45Button, + UIView.hStretchingSpacer(), + zoom2xButton + ]) + footer.axis = .horizontal + footer.spacing = 16 + footer.backgroundColor = .clear + footer.isOpaque = false - let resetButton = OWSButton() - resetButton.setTitle(NSLocalizedString("IMAGE_EDITOR_RESET_BUTTON", comment: "Label for button that resets crop & rotation state."), - for: .normal) - resetButton.block = { [weak self] in - self?.resetButtonPressed() - } + let stackView = UIStackView(arrangedSubviews: [ + header, + wrapperView, + footer + ]) + stackView.axis = .vertical + stackView.alignment = .fill + stackView.spacing = 24 + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + stackView.isLayoutMarginsRelativeArrangement = true + self.view.addSubview(stackView) + stackView.ows_autoPinToSuperviewEdges() - let zoom2xButton = OWSButton() - zoom2xButton.setTitle("Zoom 2x", - for: .normal) - zoom2xButton.block = { [weak self] in - self?.zoom2xButtonPressed() - } + // MARK: - Crop View + + // Add crop view last so that it appears in front of the content. cropView.setContentHuggingLow() cropView.setCompressionResistanceLow() @@ -166,8 +187,8 @@ class ImageEditorCropViewController: OWSViewController { cropCornerView.autoPinEdge(toSuperviewEdge: .left) case .topRight, .bottomRight: cropCornerView.autoPinEdge(toSuperviewEdge: .right) - default: - owsFailDebug("Invalid crop region: \(cropRegion)") + default: + owsFailDebug("Invalid crop region: \(cropRegion)") } switch cropCornerView.cropRegion { case .topLeft, .topRight: @@ -179,13 +200,6 @@ class ImageEditorCropViewController: OWSViewController { } } - let footer = UIStackView(arrangedSubviews: [rotate90Button, rotate45Button, resetButton, zoom2xButton]) - footer.axis = .horizontal - footer.spacing = 16 - footer.backgroundColor = .clear - footer.isOpaque = false - stackView.addArrangedSubview(footer) - setCropViewAppearance() updateClipViewLayout() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 187a55c3b..a91427d4e 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -6,7 +6,8 @@ import UIKit @objc public protocol ImageEditorViewDelegate: class { - func imageEditor(presentFullScreenOverlay viewController: UIViewController) + func imageEditor(presentFullScreenOverlay viewController: UIViewController, + withNavigation: Bool) } // MARK: - @@ -571,7 +572,8 @@ public class ImageEditorView: UIView { // let maxTextWidthPoints = canvasView.imageView.width() * ImageEditorTextItem.kDefaultUnitWidth let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) - self.delegate?.imageEditor(presentFullScreenOverlay: textEditor) + self.delegate?.imageEditor(presentFullScreenOverlay: textEditor, + withNavigation: true) } // MARK: - Crop Tool @@ -596,7 +598,8 @@ public class ImageEditorView: UIView { } let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage) - self.delegate?.imageEditor(presentFullScreenOverlay: cropTool) + self.delegate?.imageEditor(presentFullScreenOverlay: cropTool, + withNavigation: false) }} // MARK: - diff --git a/SignalMessaging/Views/OWSButton.swift b/SignalMessaging/Views/OWSButton.swift index 9d51bf99d..03ffdf0a0 100644 --- a/SignalMessaging/Views/OWSButton.swift +++ b/SignalMessaging/Views/OWSButton.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit @@ -15,8 +15,18 @@ public class OWSButton: UIButton { @objc init(block: @escaping () -> Void = { }) { super.init(frame: .zero) + self.block = block - self.addTarget(self, action: #selector(didTap), for: .touchUpInside) + addTarget(self, action: #selector(didTap), for: .touchUpInside) + } + + @objc + init(title: String, block: @escaping () -> Void = { }) { + super.init(frame: .zero) + + self.block = block + addTarget(self, action: #selector(didTap), for: .touchUpInside) + setTitle(title, for: .normal) } public required init?(coder aDecoder: NSCoder) { From 0ce84b7929be3b5837cc5f64f123d07545bd1112 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 17:42:27 -0500 Subject: [PATCH 162/493] Respond to CR. --- SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift | 2 +- .../Views/ImageEditor/ImageEditorCropViewController.swift | 4 ++-- SignalMessaging/Views/ImageEditor/ImageEditorView.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 754c3ee41..033b0ffec 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -91,7 +91,7 @@ public class ImageEditorCanvasView: UIView { strongSelf.updateAllContent() } clipView.addSubview(contentView) - contentView.ows_autoPinToSuperviewEdges() + contentView.autoPinEdgesToSuperviewEdges() updateLayout() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 014981652..3ee502fcb 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -144,7 +144,7 @@ class ImageEditorCropViewController: OWSViewController { strongSelf.updateContent() } clipView.addSubview(contentView) - contentView.ows_autoPinToSuperviewEdges() + contentView.autoPinEdgesToSuperviewEdges() // MARK: - Footer @@ -170,7 +170,7 @@ class ImageEditorCropViewController: OWSViewController { stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) stackView.isLayoutMarginsRelativeArrangement = true self.view.addSubview(stackView) - stackView.ows_autoPinToSuperviewEdges() + stackView.autoPinEdgesToSuperviewEdges() // MARK: - Crop View diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index a91427d4e..b0c858dff 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -69,7 +69,7 @@ public class ImageEditorView: UIView { return false } self.addSubview(canvasView) - canvasView.ows_autoPinToSuperviewEdges() + canvasView.autoPinEdgesToSuperviewEdges() self.isUserInteractionEnabled = true From dd2b47bd76b1a51f6a75a12e7b377d2a1c3a97c1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Feb 2019 13:48:25 -0500 Subject: [PATCH 163/493] Add "flip horizontal" feature. --- .../ImageEditor/ImageEditorCanvasView.swift | 9 +++++ .../ImageEditorCropViewController.swift | 34 ++++++++++++++----- .../Views/ImageEditor/ImageEditorModel.swift | 23 +++++++++---- 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 033b0ffec..0bf3a2703 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -265,6 +265,15 @@ public class ImageEditorCanvasView: UIView { public class func updateImageLayer(imageLayer: CALayer, viewSize: CGSize, imageSize: CGSize, transform: ImageEditorTransform) { imageLayer.frame = imageFrame(forViewSize: viewSize, imageSize: imageSize, transform: transform) + + // This is the only place the isFlipped flag is consulted. + // We deliberately do _not_ use it in the affine transforms, etc. + // so that: + // + // * It doesn't affect text content & brush strokes. + // * To not complicate the other "coordinate system math". + let transform = CGAffineTransform.identity.scaledBy(x: transform.isFlipped ? -1 : +1, y: 1) + imageLayer.setAffineTransform(transform) } public class func imageFrame(forViewSize viewSize: CGSize, imageSize: CGSize, transform: ImageEditorTransform) -> CGRect { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 3ee502fcb..51ee588c1 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -101,6 +101,9 @@ class ImageEditorCropViewController: OWSViewController { let zoom2xButton = OWSButton(title: "Zoom 2x") { [weak self] in self?.zoom2xButtonPressed() } + let flipButton = OWSButton(title: "Flip") { [weak self] in + self?.flipButtonPressed() + } // MARK: - Header @@ -149,6 +152,7 @@ class ImageEditorCropViewController: OWSViewController { // MARK: - Footer let footer = UIStackView(arrangedSubviews: [ + flipButton, rotate90Button, rotate45Button, UIView.hStretchingSpacer(), @@ -418,7 +422,8 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, rotationRadians: newRotationRadians, - scaling: newScaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) + scaling: newScaling, + isFlipped: gestureStartTransform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) default: break } @@ -552,7 +557,8 @@ class ImageEditorCropViewController: OWSViewController { let naiveTransform = ImageEditorTransform(outputSizePixels: croppedOutputSizePixels, unitTranslation: transform.unitTranslation, rotationRadians: transform.rotationRadians, - scaling: transform.scaling) + scaling: transform.scaling, + isFlipped: transform.isFlipped) let naiveImageFrameOld = ImageEditorCanvasView.imageFrame(forViewSize: transform.outputSizePixels, imageSize: model.srcImageSizePixels, transform: naiveTransform) let naiveImageFrameNew = ImageEditorCanvasView.imageFrame(forViewSize: croppedOutputSizePixels, imageSize: model.srcImageSizePixels, transform: naiveTransform) let scalingDeltaX = naiveImageFrameNew.width / naiveImageFrameOld.width @@ -590,7 +596,8 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: croppedOutputSizePixels, unitTranslation: unitTranslation, rotationRadians: transform.rotationRadians, - scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) + scaling: scaling, + isFlipped: transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } private func handleNormalPanGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { @@ -614,7 +621,8 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: gestureStartTransform.outputSizePixels, unitTranslation: newUnitTranslation, rotationRadians: gestureStartTransform.rotationRadians, - scaling: gestureStartTransform.scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) + scaling: gestureStartTransform.scaling, + isFlipped: gestureStartTransform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } private func cropRegion(forGestureRecognizer gestureRecognizer: ImageEditorPanGestureRecognizer) -> CropRegion? { @@ -691,7 +699,8 @@ class ImageEditorCropViewController: OWSViewController { updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, - scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) + scaling: scaling, + isFlipped: transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } @objc public func zoom2xButtonPressed() { @@ -700,9 +709,18 @@ class ImageEditorCropViewController: OWSViewController { let rotationRadians = transform.rotationRadians let scaling = transform.scaling * 2.0 updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, - unitTranslation: unitTranslation, - rotationRadians: rotationRadians, - scaling: scaling).normalize(srcImageSizePixels: model.srcImageSizePixels)) + unitTranslation: unitTranslation, + rotationRadians: rotationRadians, + scaling: scaling, + isFlipped: transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) + } + + @objc public func flipButtonPressed() { + updateTransform(ImageEditorTransform(outputSizePixels: transform.outputSizePixels, + unitTranslation: transform.unitTranslation, + rotationRadians: transform.rotationRadians, + scaling: transform.scaling, + isFlipped: !transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } @objc public func resetButtonPressed() { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index e4bee2cdd..4711c010b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -62,15 +62,19 @@ public class ImageEditorTransform: NSObject { public let rotationRadians: CGFloat // x >= 1.0. public let scaling: CGFloat + // Flipping is horizontal. + public let isFlipped: Bool public init(outputSizePixels: CGSize, unitTranslation: CGPoint, rotationRadians: CGFloat, - scaling: CGFloat) { + scaling: CGFloat, + isFlipped: Bool) { self.outputSizePixels = outputSizePixels self.unitTranslation = unitTranslation self.rotationRadians = rotationRadians self.scaling = scaling + self.isFlipped = isFlipped } public class func defaultTransform(srcImageSizePixels: CGSize) -> ImageEditorTransform { @@ -78,7 +82,8 @@ public class ImageEditorTransform: NSObject { return ImageEditorTransform(outputSizePixels: srcImageSizePixels, unitTranslation: .zero, rotationRadians: 0.0, - scaling: 1.0).normalize(srcImageSizePixels: srcImageSizePixels) + scaling: 1.0, + isFlipped: false).normalize(srcImageSizePixels: srcImageSizePixels) } public func affineTransform(viewSize: CGSize) -> CGAffineTransform { @@ -133,7 +138,8 @@ public class ImageEditorTransform: NSObject { let naiveTransform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: .zero, rotationRadians: rotationRadians, - scaling: scaling) + scaling: scaling, + isFlipped: self.isFlipped) let naiveAffineTransform = naiveTransform.affineTransform(viewSize: viewBounds.size) var naiveViewportMinCanvas = CGPoint.zero var naiveViewportMaxCanvas = CGPoint.zero @@ -192,7 +198,8 @@ public class ImageEditorTransform: NSObject { return ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, - scaling: scaling) + scaling: scaling, + isFlipped: self.isFlipped) } public override func isEqual(_ object: Any?) -> Bool { @@ -202,7 +209,8 @@ public class ImageEditorTransform: NSObject { return (outputSizePixels == other.outputSizePixels && unitTranslation == other.unitTranslation && rotationRadians == other.rotationRadians && - scaling == other.scaling) + scaling == other.scaling && + isFlipped == other.isFlipped) } public override var hash: Int { @@ -211,11 +219,12 @@ public class ImageEditorTransform: NSObject { unitTranslation.x.hashValue ^ unitTranslation.y.hashValue ^ rotationRadians.hashValue ^ - scaling.hashValue) + scaling.hashValue ^ + isFlipped.hashValue) } open override var description: String { - return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling)]" + return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling), isFlipped: \(isFlipped)]" } } From b11308b2f8a74e8105d9b960a0f6ddc3d9362dcb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Feb 2019 17:19:18 -0700 Subject: [PATCH 164/493] Return to conversation after deleting long text --- .../ConversationViewController.m | 14 +++- .../LongTextViewController.swift | 67 ++++++++++++++++++- .../MessageDetailViewController.swift | 13 +++- 3 files changed, 87 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 8c2f534f7..fbfc11240 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -141,6 +141,7 @@ typedef enum : NSUInteger { ConversationViewLayoutDelegate, ConversationViewCellDelegate, ConversationInputTextViewDelegate, + LongTextViewDelegate, MessageActionsDelegate, MessageDetailViewDelegate, MenuActionsViewControllerDelegate, @@ -1956,6 +1957,14 @@ typedef enum : NSUInteger { [self.navigationController popToViewController:self animated:YES]; } +#pragma mark - LongTextViewDelegate + +- (void)longTextViewMessageWasDeleted:(LongTextViewController *)longTextViewController +{ + OWSLogInfo(@""); + [self.navigationController popToViewController:self animated:YES]; +} + #pragma mark - MenuActionsViewControllerDelegate - (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController @@ -2256,8 +2265,9 @@ typedef enum : NSUInteger { OWSAssertDebug(conversationItem); OWSAssertDebug([conversationItem.interaction isKindOfClass:[TSMessage class]]); - LongTextViewController *view = [[LongTextViewController alloc] initWithViewItem:conversationItem]; - [self.navigationController pushViewController:view animated:YES]; + LongTextViewController *viewController = [[LongTextViewController alloc] initWithViewItem:conversationItem]; + viewController.delegate = self; + [self.navigationController pushViewController:viewController animated:YES]; } - (void)didTapContactShareViewItem:(id)conversationItem diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index a200bf9fd..27b7391aa 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -1,15 +1,30 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation import SignalServiceKit import SignalMessaging +@objc +public protocol LongTextViewDelegate { + @objc + func longTextViewMessageWasDeleted(_ longTextViewController: LongTextViewController) +} + @objc public class LongTextViewController: OWSViewController { - // MARK: Properties + // MARK: - Dependencies + + var uiDatabaseConnection: YapDatabaseConnection { + return OWSPrimaryStorage.shared().uiDatabaseConnection + } + + // MARK: - Properties + + @objc + weak var delegate: LongTextViewDelegate? let viewItem: ConversationViewItem @@ -55,6 +70,54 @@ public class LongTextViewController: OWSViewController { createViews() self.messageTextView.contentOffset = CGPoint(x: 0, y: self.messageTextView.contentInset.top) + + NotificationCenter.default.addObserver(self, + selector: #selector(uiDatabaseDidUpdate), + name: .OWSUIDatabaseConnectionDidUpdate, + object: OWSPrimaryStorage.shared().dbNotificationObject) + } + + // MARK: - DB + + @objc internal func uiDatabaseDidUpdate(notification: NSNotification) { + AssertIsOnMainThread() + + guard let notifications = notification.userInfo?[OWSUIDatabaseConnectionNotificationsKey] as? [Notification] else { + owsFailDebug("notifications was unexpectedly nil") + return + } + + guard let uniqueId = self.viewItem.interaction.uniqueId else { + Logger.error("Message is missing uniqueId.") + return + } + + guard self.uiDatabaseConnection.hasChange(forKey: uniqueId, + inCollection: TSInteraction.collection(), + in: notifications) else { + Logger.debug("No relevant changes.") + return + } + + do { + try uiDatabaseConnection.read { transaction in + guard TSInteraction.fetch(uniqueId: uniqueId, transaction: transaction) != nil else { + Logger.error("Message was deleted") + throw LongTextViewError.messageWasDeleted + } + } + } catch LongTextViewError.messageWasDeleted { + DispatchQueue.main.async { + self.delegate?.longTextViewMessageWasDeleted(self) + } + } catch { + owsFailDebug("unexpected error: \(error)") + + } + } + + enum LongTextViewError: Error { + case messageWasDeleted } // MARK: - Create Views diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 9618576e2..98867df98 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -90,7 +90,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele contactShareViewHelper.delegate = self do { - try updateDBConnectionAndMessageToLatest() + try updateMessageToLatest() } catch DetailViewError.messageWasDeleted { self.delegate?.detailViewMessageWasDeleted(self) } catch { @@ -543,7 +543,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele } // This method should be called after self.databaseConnection.beginLongLivedReadTransaction(). - private func updateDBConnectionAndMessageToLatest() throws { + private func updateMessageToLatest() throws { AssertIsOnMainThread() @@ -589,7 +589,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele } do { - try updateDBConnectionAndMessageToLatest() + try updateMessageToLatest() } catch DetailViewError.messageWasDeleted { DispatchQueue.main.async { self.delegate?.detailViewMessageWasDeleted(self) @@ -723,6 +723,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele } let viewController = LongTextViewController(viewItem: viewItem) + viewController.delegate = self navigationController.pushViewController(viewController, animated: true) } @@ -789,3 +790,9 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele self.dismiss(animated: true) } } + +extension MessageDetailViewController: LongTextViewDelegate { + func longTextViewMessageWasDeleted(_ longTextViewController: LongTextViewController) { + self.delegate?.detailViewMessageWasDeleted(self) + } +} From c48679abfd9f38df6d35e78e7f5a2087ec5138a6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Feb 2019 17:40:49 -0700 Subject: [PATCH 165/493] "Bump build to 2.37.0.5." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index ca8b9c8a8..ffc174007 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.4 + 2.37.0.5 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 97d4709d9..66cbb39dc 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.4 + 2.37.0.5 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 117411009b7d14866e809c41493683a941b388e3 Mon Sep 17 00:00:00 2001 From: Carola Nitz Date: Thu, 21 Feb 2019 12:38:01 +0100 Subject: [PATCH 166/493] Add public keyword to fix compilation for framework integration --- .../OWSContactDiscoveryOperation.swift | 10 +++++----- .../src/Network/SSKWebSocket.swift | 2 +- .../src/TestUtils/FakeContactsManager.swift | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift index e3dd4c81e..30b3440d7 100644 --- a/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift +++ b/SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift @@ -5,10 +5,10 @@ import Foundation @objc(OWSLegacyContactDiscoveryOperation) -class LegacyContactDiscoveryBatchOperation: OWSOperation { +public class LegacyContactDiscoveryBatchOperation: OWSOperation { @objc - var registeredRecipientIds: Set + public var registeredRecipientIds: Set private let recipientIdsToLookup: [String] private var networkManager: TSNetworkManager { @@ -18,7 +18,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { // MARK: Initializers @objc - required init(recipientIdsToLookup: [String]) { + public required init(recipientIdsToLookup: [String]) { self.recipientIdsToLookup = recipientIdsToLookup self.registeredRecipientIds = Set() @@ -30,7 +30,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { // MARK: OWSOperation Overrides // Called every retry, this is where the bulk of the operation's work should go. - override func run() { + override public func run() { Logger.debug("") guard !isCancelled else { @@ -82,7 +82,7 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation { } // Called at most one time. - override func didSucceed() { + override public func didSucceed() { // Compare against new CDS service let modernCDSOperation = CDSOperation(recipientIdsToLookup: self.recipientIdsToLookup) let cdsFeedbackOperation = CDSFeedbackOperation(legacyRegisteredRecipientIds: self.registeredRecipientIds) diff --git a/SignalServiceKit/src/Network/SSKWebSocket.swift b/SignalServiceKit/src/Network/SSKWebSocket.swift index 339fc75c2..c2a887a4a 100644 --- a/SignalServiceKit/src/Network/SSKWebSocket.swift +++ b/SignalServiceKit/src/Network/SSKWebSocket.swift @@ -32,7 +32,7 @@ public class SSKWebSocketError: NSObject, CustomNSError { // MARK: - @objc - static let kStatusCodeKey = "SSKWebSocketErrorStatusCode" + public static let kStatusCodeKey = "SSKWebSocketErrorStatusCode" let underlyingError: Starscream.WSError } diff --git a/SignalServiceKit/src/TestUtils/FakeContactsManager.swift b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift index 8cd52a61f..94c3eb437 100644 --- a/SignalServiceKit/src/TestUtils/FakeContactsManager.swift +++ b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift @@ -3,42 +3,42 @@ // @objc(OWSFakeContactsManager) -class FakeContactsManager: NSObject, ContactsManagerProtocol { - func displayName(forPhoneIdentifier recipientId: String?) -> String { +public class FakeContactsManager: NSObject, ContactsManagerProtocol { + public func displayName(forPhoneIdentifier recipientId: String?) -> String { return "Fake name" } - func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String { + public func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String { return self.displayName(forPhoneIdentifier: recipientId) } - func signalAccounts() -> [SignalAccount] { + public func signalAccounts() -> [SignalAccount] { return [] } - func isSystemContact(_ recipientId: String) -> Bool { + public func isSystemContact(_ recipientId: String) -> Bool { return true } - func isSystemContact(withSignalAccount recipientId: String) -> Bool { + public func isSystemContact(withSignalAccount recipientId: String) -> Bool { return true } - func compare(signalAccount left: SignalAccount, with right: SignalAccount) -> ComparisonResult { + public func compare(signalAccount left: SignalAccount, with right: SignalAccount) -> ComparisonResult { // If this method ends up being used by the tests, we should provide a better implementation. assertionFailure("TODO") return ComparisonResult.orderedAscending } - func cnContact(withId contactId: String?) -> CNContact? { + public func cnContact(withId contactId: String?) -> CNContact? { return nil } - func avatarData(forCNContactId contactId: String?) -> Data? { + public func avatarData(forCNContactId contactId: String?) -> Data? { return nil } - func avatarImage(forCNContactId contactId: String?) -> UIImage? { + public func avatarImage(forCNContactId contactId: String?) -> UIImage? { return nil } } From 530a07f8ca3f94f028384c6aa1448ce0daa92bda Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Feb 2019 17:43:30 -0700 Subject: [PATCH 167/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/az.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/bg.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/bs.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/ca.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/cs.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/da.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/de.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/el.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/es.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/et.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/fa.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/fi.lproj/Localizable.strings | 129 +++++++++++++++--- .../fil.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/fr.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/gl.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/he.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/hr.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/hu.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/id.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/it.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/ja.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/km.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/ko.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/lt.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/lv.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/mk.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/my.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/nb.lproj/Localizable.strings | 129 +++++++++++++++--- .../nb_NO.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/nl.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/pl.lproj/Localizable.strings | 129 +++++++++++++++--- .../pt_BR.lproj/Localizable.strings | 129 +++++++++++++++--- .../pt_PT.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/ro.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/ru.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/sl.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/sn.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/sq.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/sv.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/th.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/tr.lproj/Localizable.strings | 129 +++++++++++++++--- .../translations/uk.lproj/Localizable.strings | 129 +++++++++++++++--- .../zh_CN.lproj/Localizable.strings | 129 +++++++++++++++--- .../zh_TW.lproj/Localizable.strings | 129 +++++++++++++++--- 45 files changed, 4995 insertions(+), 810 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index 1bfa5d076..ae62338de 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "تم"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "التالي\n"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "لنستخدم Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "تنظيف قائمة محادثاتك"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "لا أحد من جهات اتصالك لديه Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "لمَ لا تدعُ أحدهم؟"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "انقر زر الإنشاء"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "بدء أول محادثة باستخدام تطبيق Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "بحث"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "إعادة ضبط"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "ابدأ محادثة مع أصدقائك."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "على ما يرام"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "يوجد رقم تعريفي شخصي لحماية التسجيل مصاحب لهذا الرقم. رجاء إدخاله."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "الرقم التعريفي الشخصي لحماية التسجيل"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "ليس الآن"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "رقم خاطئ "; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "الرقم خاطئ ؟"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "اتصل بي بدلا من ذلك"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "إعدادات"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "جهة اتصال مجهولة"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "مجهول"; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 80a779a3c..99c320858 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Done"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Let's switch to Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "None of your contacts have Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Why don't you invite someone?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Quraşdırmalar"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Bilinməyən əlaqə"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unknown"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index 06626e9fe..de06d681b 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Готово"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Следващ"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Нека преминем на Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Никой от контактите ви не ползва Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Защо не поканите някой?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Започнете първия си разговор със Сигнал!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Потвърдете своя ПИН."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Търсене"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Рестартирай"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Хайде да добавим нещо в пощенската кутия. Започнете като изпратите съобщение на приятел."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "ОК"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Този телефонен номер има активирано регистрационно заключване. Моля, въведете ПИН-а за регистрационно заключване."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Регистрационно заключване"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Не Сега"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Невалиден номер"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Грешен номер?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Обади ми се"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Настройки"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Непознат Контакт"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Непознат"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index be605cc9a..0d8794835 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Uredu"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Pređimo na Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Niko od vaših kontakata ne koristi Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Zašto nekome ne pošaljete pozivnicu?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Započnite vaš prvi razgovor na Signalu!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Traži"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne sada"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Podešavanja"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Nepoznat kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nepoznato"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index ba7562ce1..5d9ede10c 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Fet"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Següent"; + /* Label for redo button. */ "BUTTON_REDO" = "Refés"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Canviem-nos al Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Poder arxivar les converses inactives de la safata."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Netegeu la llista de converses"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Cap dels vostres contactes té Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Per què no convideu algú?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Toqueu el botó de missatge nou"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Comenceu la vostra primera conversa al Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Res. Nada. Rien. None."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Totalment buit"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirmeu el vostre PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No s'ha trobat cap resultat per a «%@»"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Retalla"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Restableix"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No podeu compartir més de %@ elements."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Aquestes converses estan arxivades i només apareixeran a la bústia d'entrada si es reben missatges nous."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Proporcioneu alguna cosa a la safata d'entrada perquè us escriguin. Comenceu enviant un missatge a alguna amistat."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Podeu activar l'accés als contactes a la Configuració de l'iOS per veure els noms dels contactes a la llista de converses del Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "D'acord"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Aquest número de telèfon té el bloqueig de registre habilitat. Si us plau, escriviu el PIN de bloqueig del registre."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Pany de Registre"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ara no"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "El número no és vàlid"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Condicions de servei i política de privadesa"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "El número no és correcte?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Alternativament, anomena'm"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Configuració"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contacte desconegut"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconegut"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index fe3f85752..a7f3a28fe 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Hotovo"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Další"; + /* Label for redo button. */ "BUTTON_REDO" = "Znovu"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Přejděme na Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Konverzace můžete archivovat z vaší schránky."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Vyčistit váš seznam konverzací."; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Žádný z vašich kontaktů nemá Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Proč někoho nepozvete?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Klepněte na tlačítko vytvořit."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Začněte vaši první konverzaci na Signalu!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nula nula nic."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Schránka prázdná, velký kulový."; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Potvrďte Váš PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hledat"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nebyly nalezeny žádné výsledky pro „%@“"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Oříznout"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nemůžete sdílet více než %@ položek."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Tyto konverzace jsou archivované a zobrazí se mezi doručenými zprávami, pokud budou přijaty nové zprávy."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Přidejte něco do schránky. Začněte psát přítelům."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Pokud chcete vidět jména kontaktů v seznamu konverzací, povolte Signalu přístup ke kontaktům v nastavení iOS."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Toto telefonní číslo má registraci zabezpečenou PINnem. Prosím vložte PIN zámku registrace."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Zámek registrace"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nyní ne"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neplatné číslo"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Smluvní podmínky a zásady ochrany osobních údajů"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Špatné číslo?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Zavolej mi místo toho"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Nastavení"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Neznámý kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Neznámý"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 0a031a30e..1522bae53 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Udført"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Næste"; + /* Label for redo button. */ "BUTTON_REDO" = "Gentag"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Lad os skifte til Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Du kan arkivere inaktive samtaler fra din indbakke."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Ryd op i dine samtaler"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ingen af dine kontakter har Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Hvorfor ikke invitere nogle af dem?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tryk på Skriv knappen"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start din første Signalsamtale!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Intet at se her."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Indbakken er tom"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bekræft din PIN"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søg"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ingen resultater fundet for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Beskær"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan ikke dele mere end %@ ting."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Disse samtaler arkiveres og vises kun i indbakken, hvis der modtages nye meddelelser."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Giv din indbakke noget at skrive hjem om. Kom i gang - skriv til en ven"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Du kan aktivere kontaktadgang i Indstillinger-appen for at se kontaktnavne i din Signal-samtale-liste."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Dette telefonnummer har registreringslås slået til. Indtast venligst registreringskoden"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registreringslås"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nu"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldigt nummer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår og privatlivspolitik"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Forkert nummer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring til mig i stedet "; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Indstillingér"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Ukendt kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ukendt"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 1a8d74c16..e73c8e9e7 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Fertig"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Weiter"; + /* Label for redo button. */ "BUTTON_REDO" = "Wiederherstellen"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Lass uns zu Signal wechseln"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Du kannst inaktive Unterhaltungen aus dem Eingang archivieren."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Räume deine Unterhaltungsliste auf"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Keiner deiner Kontakte verwendet Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Warum lädst du nicht jemanden ein?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tippe zum Verfassen einer Nachricht auf die Bleistift-Schaltfläche"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Starte deine erste Signal-Unterhaltung!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nichts. Null. Nada. Niente."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Leerer Eingang"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bestätige deine PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Suchen"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Keine Ergebnisse für »%@« gefunden"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Zuschneiden"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Neu starten"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kannst nicht mehr als %@ Elemente teilen."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Diese Unterhaltungen sind archiviert und werden nur dann im Eingang erscheinen, falls neue Nachrichten empfangen werden."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Erwecke deinen Posteingang zum Leben. Leg los und schreib einem Freund."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Du kannst den Zugriff auf deine Kontakte in der iOS-App »Einstellungen« aktivieren, um Kontaktnamen in Signals Unterhaltungsliste zu sehen."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "O. K."; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Für diese Rufnummer ist eine Registrierungssperre aktiviert. Bitte gib die PIN für die Registrierungssperre ein."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registrierungssperre"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nicht jetzt"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ungültige Rufnummer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Bedingungen & Datenschutzerklärung"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Falsche Rufnummer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Mich anrufen"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Einstellungen"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Unbekannter Kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unbekannt"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index 79932fe5b..bf5326901 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Τέλος"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Επόμενο"; + /* Label for redo button. */ "BUTTON_REDO" = "Επαναφορά"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Ας χρησιμοποιήσουμε το Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Μπορείτε να αρχειοθετήσετε τις ανενεργές συνομιλίες από τα εισερχόμενα σας."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Εκκαθάριση λίστας συνομιλιών"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Καμία απο τις επαφές σας δεν χρησιμοποιεί το Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Γιατί δεν προσκαλείτε κάποιον;"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Πατήστε το κουμπί σύνταξης."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Αρχίστε την πρώτη συνομιλία σας στο Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Κανένα. Τίποτα. Μηδέν."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Κανένα Εισερχόμενο"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Επιβεβαιώστε το PIN σας."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Αναζήτηση"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Δεν βρέθηκαν αποτελέσματα για '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Περικοπή"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Επαναφορά"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Αυτές οι συνομιλίες είναι αρχειοθετημένες και θα εμφανιστούν στα εισερχόμενα μόνο αν ληφθούν νέα μηνύματα."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Δώσε ζωή στα εισερχόμενά σου! Ξεκίνα στέλνοντας μήνυμα σε κάποιον/α φίλο/η σου."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Μπορείτε να ενεργοποιήσετε την πρόσβαση στις επαφές στην εφαρμογή Ρυθμίσεις του iOS για να βλέπετε τα ονόματα των επαφών στη λίστα συνομιλιών του Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "ΟΚ"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Αυτός ο αριθμός τηλεφώνου έχει ενεργοποιημένο το κλείδωμα εγγραφής. Παρακαλώ γράψε το PIN κλειδώματος εγγραφής"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Κλείδωμα εγγραφής"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Όχι τώρα"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Μη έγκυρος αριθμός"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Όροι & Πολιτική Απορρήτου"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Λάθος αριθμός;"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Καλύτερα τηλεφώνησέ μου"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ρυθμίσεις"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Άγνωστη επαφή"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Άγνωστο"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index aa484c7a6..b2fb753bd 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Hecho"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Siguiente"; + /* Label for redo button. */ "BUTTON_REDO" = "Rehacer"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "¿Usamos Signal para chatear de forma segura?"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Puedes archivar chats inactivos del buzón de entrada."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Organiza tus chats."; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ninguno de tus contactos usa Signal"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "¿Por qué no invitas a alguien?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Toca en el botón del lápiz para escribir un mensaje"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "¡Comienza tu primer chat con Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Cero patatero."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Limpio como una patena."; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirma el número PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No se encontraron resultados para «%@»"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Recortar"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No se pueden compartir más de %@ objetos."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estos chats están archivados y sólo aparecerán en el buzón de entrada si recibes nuevos mensajes."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dale a tu buzón de entrada algo para escribir respuestas. Comienza un chat con un amigo."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Al activar el acceso a contactos en «Ajustes» de iOS puedes ver los nombres de tus contactos en la lista de chats en Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Este número de teléfono tiene el bloqueo de registro activado. Por favor, introduce el PIN de bloqueo de registro."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Bloqueo de registro"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ahora no"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número incorrecto"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Términos y política de privacidad"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "¿Número erróneo?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Recibir llamada con código"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ajustes"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contacto desconocido"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconocido"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index b1c46b3ee..96dbed7c4 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Tehtud"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Edasi"; + /* Label for redo button. */ "BUTTON_REDO" = "Tee uuesti"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Lülitume Signalile"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Sul on võimalik mitteaktiivsed vestlused sisendkastist arhiveerida."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Korista vestluste nimekirja puhtamaks"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ükski sinu kontaktidest ei kasuta Signalit."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Miks mitte kutsuda keegi?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Klõpsa koostamisnupul"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Alusta esimest Signali-vestlust!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Mitte ühtegi. Zero. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Sõnumeid pole"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Kinnita enda PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Otsi"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Otsingule '%@' ei leitud vasteid"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Kärbi"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Lähtesta"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Sa ei saa jagada rohkem kui %@ üksust."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Need vestlused on arhiveeritud ja ilmuvad sisendkausta, kui saabub uusi sõnumeid."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Lisa oma postkasti midagi, näiteks alusta sõbraga sõnumite vahetamist."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Sul on võimalik iOSi sätetes lubada juurdepääs kontaktidele, et näha Signal-i vestluste nimekirjas kontaktide nimesid."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Sellel telefoninumbril on registreerimislukk peal. Palun sisesta registreerimisluku PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registreerimislukk"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Mitte praegu"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Vigane number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Tingimused ja privaatsuspoliitika"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Vale number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Helista mulle parem"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Sätted"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Tundmatu kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Tundmatu"; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index 1506b32ea..d5b7606ae 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "انجام شد"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "بعدی"; + /* Label for redo button. */ "BUTTON_REDO" = "انجام دوباره"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "به نرم افزار پیام رسان Signal بپیوندید"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "شما میتوانید مکالمات غیر فعال را بایگانی کنید."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "لیست گفتگوهای خود را پاک کنید"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "هیچ کدام از مخاطبین شما Signal را نصب نکرده‌اند."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "چرا از کسی دعوت نمی‌کنید؟"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "بر روی دکمه نوشتن کلیک کنید"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "اولین مکالمه Signal خود را آغاز کنید!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "صندوق ورودی صفر است"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "تایید PIN"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "جستجو"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "هیچ نتیجه ای برای '%@' یافت نشد"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "تنظیم مجدد"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "این مکالمه ها بایگانی شده اند و اگر پیام های جدید دریافت شوند فقط در صندوق به نمایش در می آیند."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "باشه"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "قفل ثبت نام"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "الان نه"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "شماره نامعتبر"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "شرایط و سیاست های حفظ حریم خصوصی"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "تنظیمات"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "مخاطب ناشناس"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "ناشناخته"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index a53ef464f..08af5234d 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Valmis"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Seuraava"; + /* Label for redo button. */ "BUTTON_REDO" = "Tee uudelleen"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Vaihdetaan Signaliin"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Voit arkistoida ei-aktiivisia keskusteluja postilaatikostasi."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Siisti keskustelulistasi"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Kellään yhteystiedollasi ei ole Signalia."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Kutsupa joku?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Napauta uuden viestin kirjoitus -painiketta."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Aloita ensimmäinen Signal-keskustelusi!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Postilaatikkosi on tyhjä. Hyvää päivänjatkoa!"; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Postilaatikko tyhjä"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Vahvista PIN-koodisi."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hae"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ei hakutuloksia haulle \"%@\""; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Rajaa"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Alusta"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Et voi jakaa useampaa kuin %@ kappaletta."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Nämä keskustelut ovat arkistoituja. Ne siirtyvät takaisin postilaatikkoon, jos niihin tulee uusia viestejä"; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Anna postilaatikollesi jotain, mistä se voisi olla ylpeä. Aloita lähettämällä viesti ystävälle."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Voit sallia yhteystietojen käytön Asetukset-ohjelmasta nähdäksesi yhteystietojesi nimet Signalin keskustelunäkymässä. "; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Tällä puhelinnumerolla on rekisteröinnin lukituksen PIN-koodi käytössä. Syötä rekisteröinnin lukituksen PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Rekisteröinnin lukitus"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ei nyt"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Virheellinen numero"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Käyttöehdot ja tietosuoja"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Väärä numero?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Soita minulle"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Asetukset"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Tuntematon yhteystieto"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Tuntematon"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 54c050d0c..5edadc43b 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Done"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Let's switch to Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "None of your contacts have Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Why don't you invite someone?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hanapin"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Mga Setting"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Unknown Contact"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unknown"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index d590d4452..ee073f362 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Terminé"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Suivant"; + /* Label for redo button. */ "BUTTON_REDO" = "Rétablir"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Passons à Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Vous pouvez archiver les conversations inactives à partir de votre boîte de réception."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Nettoyer votre liste de conversations"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Aucun de vos contacts n’utilise Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Pourquoi ne pas inviter quelqu’un ?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Touchez le bouton de rédaction"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Lancez votre première conversation avec Signal !"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Votre boîte de réception ne contient aucun message."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Boîte de réception vide"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirmez votre NIP"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Rechercher"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Aucun résultat n’a été trouvé pour « %@ »."; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Rogner"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Réinitialiser"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Vous ne pouvez pas partager plus de %@ éléments."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Ces conversations sont archivées et n’apparaîtront dans la boîte de réception que si de nouveaux messages sont reçus."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Donnez à votre boîte de réception quelque chose à raconter. Commencez en envoyant un message à un ami."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Vous pouvez accorder l’accès aux contacts dans l’appli Réglages d’iOS pour voir le nom des contacts dans votre liste de conversations de Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Valider"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Un NIP de blocage de l’inscription est activé pour ce numéro de téléphone. Veuillez saisir le NIP de blocage de l’inscription."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Blocage de l’inscription"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Pas maintenant"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Le numéro est invalide"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Conditions générales d’utilisation et politique de confidentialité"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Mauvais numéro ?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Appelez-moi plutôt"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Paramètres"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contact inconnu"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Inconnue"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 9b714968b..e6969dfa7 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Feito"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Seguinte"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Imos pasarnos a Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ningún dos teus contactos usa Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Por que non convidas a alguén?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Inicia a túa primeira conversa en Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirma o teu PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Restablecer"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dálle á túa caixa de entrada algo para escribir. Comeza enviándolle unha mensaxe a un amigo ou amiga."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Aceptar"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Este número de teléfono ten o bloqueo de rexistro activado. Insire o PIN de bloqueo do rexistro."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Bloqueo de rexistro"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Agora non"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número non válido"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Número incorrecto?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Chamarme en cambio"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Axustes"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contacto descoñecido"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Descoñecido"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index abe573716..0d9053c51 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "סיים"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "הבא"; + /* Label for redo button. */ "BUTTON_REDO" = "עשה מחדש"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "בוא נחליף אל Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "אתה יכול לארכב שיחות בלתי־פעילות מהתיבה הנכנסת שלך."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "נקה את רשימת השיחות שלך"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "לאף אחד מאנשי הקשר שלך אין Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "למה אינך מזמין מישהו?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "הקש על הכפתור חַבֵּר"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "התחל את שיחת Signal הראשונה שלך!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "כלום. אפס. שום דבר."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "תיבה נכנסת אפס"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "אמת את ה־PIN שלך."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "חיפוש"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "לא נמצאו תוצאות עבור '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "חתוך"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "אפס"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "אינך יכול לשתף יותר מן %@ פריטים."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "שיחות אלו מאורכבות ויופיעו בתיבה הנכנסת רק אם מתקבלות הודעות חדשות."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "תן לתיבת הדואר הנכנס שלך משהו לכתוב עליו בית. התחל ע\"י שליחת הודעה לחבר."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "אתה יכול לאפשר גישה אל אנשי קשר ביישום הגדרות של iOS כדי לראות שמות אנשי קשר ברשימת שיחות Signal שלך."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "אישור"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "למספר טלפון זה יש נעילת הרשמה מאופשרת. אנא הכנס את PIN נעילת ההרשמה."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "נעילת הרשמה"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "לא עכשיו"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "מספר בלתי תקף"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "תנאים ומדיניות פרטיות"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "מספר שגוי?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "חייג אליי במקום"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "הגדרות"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "איש קשר בלתי ידוע"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "בלתי ידוע"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 9e44c6d88..f675292dd 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Uredu"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Sljedeće"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Prebacimo se na Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nitko od vaših kontakata ne koristi Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Zašto ne pošaljete pozivnicu nekome?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Započnite vaš prvi razgovor na Signalu!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Potvrdite svoj PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Traži"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nisu pronađeni rezultati za '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Resetiraj"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Zaključavanje registracije"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne sada"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neispravni broj"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Uvjeti i pravila o privatnosti"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Postavke"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Nepoznat kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nepoznato"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index dbed66afb..38c529454 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Kész"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Tovább"; + /* Label for redo button. */ "BUTTON_REDO" = "Újra"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Kapcsoljunk át Signal-ra"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nincs partnerei közt Signal használó"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Miért nem hív meg egy párat?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Indítsd el első Signal beszélgetésed!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Keresés"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Alaphelyzetbe állítás"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dobj a postaládádba valamit, hogy ne legyen olyan magányos! Láss hozzá, és üzenj egy barátodnak!"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Ehhez a telefonszámhoz bekapcsolták a regisztrációs zárat. Kérlek add meg a regisztrációs zár PIN kódot!"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Regisztrációs zár"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne most"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Érvénytelen telefonszám"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Adatvédelmi és Általános Szerződési Feltételek"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Helytelen telefonszám?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Inkább telefonhívást kérek"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Beállítások"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Ismeretlen kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ismeretlen"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index c583890fc..dbb6ba4ac 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Selesai"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Berikutnya"; + /* Label for redo button. */ "BUTTON_REDO" = "mengulang"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Pindah ke Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Tak satupun kontak Anda memiliki Signal"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Mengapa Anda tidak mengundang seseorang?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Ketuk pada tombol menyusun"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Mulai percakapan Signal pertama Anda!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Konfirmasi PIN Anda."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Pencarian"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Tidak ada hasil ditemukan untuk '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Atur kembali"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Tuliskan pesan melalui kotak pesan Anda. Mulailah dengan menulis kepada seorang kawan."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Nomor telepon ini dilengkapi dengan Kunci Pendaftaran. Silakan masukkan PIN Kunci Pendaftaran."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Kunci Pendaftaran"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Tidak Sekarang"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Nomor salah"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Syarat & Kebijakan Privasi"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Salah nomor?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Panggil saya saja"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Pengaturan"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Panggilan Tak Dikenal"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Tidak diketahui"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 8105500e1..58bf11bf8 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Fatto"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Avanti"; + /* Label for redo button. */ "BUTTON_REDO" = "Ripeti"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Passiamo a Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Puoi archiviare le conversazioni inattive dalla lista chat."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Pulisci le tue conversazioni"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nessuno dei tuoi contatti ha Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Perché non inviti qualcuno?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tocca il tasto \"composizione\""; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Inizia la tua prima conversazione su Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nessun messaggio. Niente. Zero. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Nessun messaggio"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Conferma il tuo PIN"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nessun risultato trovato per '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Ritaglia"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Resetta"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Non puoi condividere più di %@ elementi."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Queste conversazioni sono archiviate e compariranno nella lista di chat solo se verranno ricevuti nuovi messaggi."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dai alla tua inbox qualcosa di cui parlare. Inizia inviando un messaggio ad un amico."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Puoi abilitare l'accesso ai contatti tramite le impostazioni iOS per vedere i nomi dei contatti nell'elenco delle chat."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Questo numero di telefono ha il blocco registrazione attivo. Per favore inserisci il PIN di blocco registrazione."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Blocco registrazione"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Non ora"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Numero non valido"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Politica e termini sulla privacy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Numero errato?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Chiamami"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Impostazioni"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contatto sconosciuto"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Sconosciuto"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index 5eae96cf9..1cc632ba8 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "完了"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "進む"; + /* Label for redo button. */ "BUTTON_REDO" = "やり直す"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "チャットアプリをSignalに変更しましょう。"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "受信箱の会話を保存できます。"; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "会話リストを消去"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "連絡先にSignalユーザーはいないようです"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "誰かを招待しませんか？"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "作成ボタンを押して下さい"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "最初のSignal会話を始めましょう！"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "受信箱が空っぽです。"; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "受信箱が空っぽ"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "暗証番号を確認してください"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "検索"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "「%@」について何も見つかりませんでした"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "切り取り"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "リセット"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "画像の共有は%@点までです。"; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "この会話は保存されます。新しいメッセージが届いた場合だけ受信箱に表示されます。"; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "友達にメッセージを送って始めましょう！"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Signalの会話リストに通話相手の名前を表示するように、iOSの設定で連絡先リストのアクセスを設定できます。"; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "この電話番号は登録ロックが設定されています。登録ロックPINを入力してください。"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "登録鍵"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "あとで"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "不正な番号です"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "利用規約と個人情報保護"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "番号違いですか？"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "音声通話で受信する"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "設定"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "不明な連絡先"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "不明"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 9d335f7f0..51ce98d7f 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "បញ្ចប់"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "បន្ទាប់"; + /* Label for redo button. */ "BUTTON_REDO" = "ធ្វើឡើងវិញ"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "តោះប្តូរទៅប្រើ Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "គ្មានលេខទំនាក់ទំនងណាមួយ ប្រើSignalទេ។"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "ហេតុអី អ្នកមិនអញ្ជើញនរណាម្នាក់?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "ចុចលើប៊ូតុង បង្កើតសារ"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "ចាប់ផ្តើមការសន្ទនាលើ Signal លើកដំបូង!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "ផ្ទៀងផ្ទាត់លេខ PIN របស់អ្នក។"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ស្វែងរក"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "គ្មានលទ្ធផលក្នងការស្វែងរកសំរាប់ %@"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "កំណត់ឡើងវិញ"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "រៀបរាប់ប្រអប់សំបុត្ររបស់អ្នក។ ចាប់ផ្តើមពីការផ្ញើសារទៅកាន់មិត្តភក្តិណាម្នាក់។"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "យល់ព្រម"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "លេខទូរស័ព្ទនេះ បានបើកការចាក់សោរចុះឈ្មោះ។ សូមមេត្តាបញ្ចូលលេខPIN សម្រាប់ចាក់សោរការចុះឈ្មោះ។"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "ចាក់សោរការចុះឈ្មោះ"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "លើកក្រោយ"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "លេខទូរសព្ទមិនត្រឹមត្រូវ"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "លក្ខខណ្ឌនិងគោលការណ៍ឯកជន"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "ខុសលេខ?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "ហៅមកខ្ញុំជំនួសវិញ"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "ការកំណត់"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "លេខទំនាក់ទំនងមិនស្គាល់"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "មិនស្គាល់"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index 60151687f..dc6fdc51b 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "확인"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "시그널로 이전합시다."; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "당신의 연락처 지인중 아무도 시그널을 사용하지 않고있습니다."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "왜 다른사람을 초청하지 않습니까?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "검색"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "초기화"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "나중에"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "전화번호가 잘못됨"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "설정"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Unknown Contact"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "알 수 없음"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index fd31735bd..95475372e 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Atlikta"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Kitas"; + /* Label for redo button. */ "BUTTON_REDO" = "Grąžinti"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Persijunkime į Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Galite archyvuoti pasyvius pokalbius savo Gautųjų aplanke."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Išvalyti savo pokalbių sąrašą"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nei vienas iš jūsų kontaktų neturi Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Kodėl gi jums ko nors nepakvietus?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Bakstelėkite ant rašymo mygtuko"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Pradėkite savo pirmąjį Signal pokalbį!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nieko nėra. Tuščia."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Gautųjų aplankas tuščias"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Patvirtinkite savo PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ieškoti"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Užklausai \"%@\" nerasta jokių rezultatų"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Apkirpti"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Atstatyti"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Negalite dalintis daugiau nei %@ elementais."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Šie pokalbiai yra archyvuoti ir atsiras skyrelyje Gauta tik tuomet, jei bus gautos naujos žinutės."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Pradėkite, bendraudami su draugais."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Norėdami savo Signal pokalbių sąraše matyti kontaktų vardus, iOS nustatymų programėlėje galite įjungti prieigą prie kontaktų."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Gerai"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Šiam telefono numeriui yra įjungtas Registracijos užraktas. Įveskite Registracijos užrakto PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registracijos užraktas"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne dabar"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neteisingas numeris"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Sąlygos ir Privatumo politika"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Neteisingas numeris?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Vietoj to man skambinti"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Nustatymai"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Nežinomas kontaktas"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nežinoma"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 47d03a398..0f9fdb23a 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Done"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Let's switch to Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "None of your contacts have Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Why don't you invite someone?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Sāciet savu pirmo Signal saziņu!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Meklēt"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Atiestatīt"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Not Now"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Uzstādījumi"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Unknown Contact"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unknown"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index d8ec68040..39b938223 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Готово"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Next"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Ајде да се префрлиме на Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Никој од вашите контакти нема Signal"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Зошто не поканите некого?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Започни го својот прв Сигнал разговор!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirm your PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Барај"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Во ред"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Не Сега"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Погрешен број"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Поставки"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "непознат контакт"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "непознато"; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index 17fec07a1..a838882b1 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "ပြီးပြီ "; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "နောက်ထက်"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Signal ကိုပြောင်းသုံးကြပါစို့ "; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "သင့်မိတ်ဆွေတစ်ယောက်မှ Signal တွင်မရှိပါ "; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "သူများတွေကို ဖိတ်ရအောင်နော် "; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "သင်၏ပထမဆုံး Signal စကားဝိုင်းကို စတင်လိုက်ပါ!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "သင်၏ PIN ကိုအတည်ပြုပါ"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ရှာရန်"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = " '%@' ကို ရှာမတွေ့ပါ"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "မူလအတိုင်းပြန်လုပ်မည် "; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "သင့်စာတိုက်ထဲတွင် ရေးစရာတစ်ခုခုထည့်ပါ။ သူငယ်ချင်းတစ်ယောက်စီ စာတိုပေးပို့ခြင်းဖြင့် စသုံးပါ။"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "အိုကေ"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "ဤဖုန်းနံပါတ်သည် မှတ်ပုံတင်မှု ပိတ်ထားခြင်း ရှိပါသည်။ ကျေးဇူးပြု၍ မှတ်ပုံတင်မှု ပိတ်ထားသည့် PIN ကို ထည့်ပါ။"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "မှတ်ပုံတင်မှု ပိတ်ထားခြင်း"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "မအားသေးပါ"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "နံပါတ် မှားနေသည်"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "လိုက်နာဆောင်ရွက်ရမည့် အချက်များ"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "ဖုန်းနံပါတ်မှားနေပါသလား?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "အဲ့ဒီအစား ကျွနု်ပ်ကို ဖုန်းခေါ်ပါ"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "အပြင်အဆင်များ"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "မသိသော လိပ်စာစာရင်း"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "ဘာမှမသိရသော"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index c279c0a8d..0aa2ff4b9 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Ferdig"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Neste"; + /* Label for redo button. */ "BUTTON_REDO" = "Gjenopprett"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "La oss bytte til Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Du kan arkivere inaktive samtaler fra din innboks."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Rydd i samtalelisten din"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ingen av kontaktene dine har Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Hva med å invitere noen?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Trykk på opprett knappen"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start din første Signal-samtale!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Ingenting. Tomt. Null. Niks."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Tom innboks"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bekreft din PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søk"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ingen resultater funnet for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Beskjær"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Tilbakestill"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan ikke dele mer enn %@ gjenstander."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Disse samtalene er arkiverte og vil dukke opp igjen i innboksen om de får nye meldinger."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Kom i gang ved å sende en melding til en venn."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Du kan slå på tilgang til kontakter i iOS-innstillingene for å få opp navn i samtalelisten i Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Dette telefonnummeret er låst i Signal med registreringslås. Skriv inn registrerings-PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registreringslås"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nå"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldig nummer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Feil nummer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring meg i stedet"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Innstillinger"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Ukjent kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ukjent"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index e37ce840f..cdbaf6602 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Ferdig"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Neste"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "La oss bytte til Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Du kan arkivere inaktive samtaler fra din innboks."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Rydd i samtalelisten din"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ingen av kontaktene dine har Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Hva med å invitere noen?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Trykk på opprett knappen"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start din første Signal-samtale!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Ingenting. Tomt. Null. Niks."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Tom innboks"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bekreft din PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søk"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ingen resultater funnet for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Disse samtalene er arkiverte og vil dukke opp igjen i innboksen om de får nye meldinger."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Du kan slå på tilgang til kontakter i iOS-innstillingene for å få opp navn i samtalelisten i Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registreringslås"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nå"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Innstillinger"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Ukjent kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ukjent"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index e0e9b3f16..507bae7b5 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Klaar"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Volgende"; + /* Label for redo button. */ "BUTTON_REDO" = "Opnieuw doen"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Laten we Signal gebruiken"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Je kan inactieve gesprekken archiveren vanuit het startscherm."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Gesprekkenlijst opschonen"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Geen van je contacten heeft Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Waarom nodig je niet iemand uit?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tik op de opstelknop."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Begin je eerste Signalgesprek!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Niets. Noppes. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Postvak IN is leeg"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bevestig je pincode."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Zoeken"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Geen resultaten voor ‘%@’ gevonden"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Bijsnijden"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Opnieuw instellen"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Je kunt niet meer dan %@ items delen."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Deze gesprekken worden gearchiveerd en zullen alleen in Postvak IN verschijnen als je nieuwe berichten ontvangt."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Geef je postvak iets om over naar huis te schrijven. Begin door een vriend of kennis een bericht te zenden."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Je kan toegang geven tot je contacten in de iOS-instellingenapp om contactnamen in je Signal-gesprekkenlijst te zien."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Begrepen"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Registratievergrendeling is ingeschakeld voor dit telefoonnummer. Voer de pincode voor registratievergrendeling in."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registratievergrendeling"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Niet nu"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ongeldig nummer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Voorwaarden en privacybeleid"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Verkeerd nummer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Bel me"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Instellingen"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Onbekend contact"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Onbekend"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index dba6296ca..3c36b0f40 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Gotowe"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Dalej"; + /* Label for redo button. */ "BUTTON_REDO" = "Przywróć"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Zacznij używać Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Możesz archiwizować stare rozmowy ze skrzynki odbiorczej."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Wyczyść swoje rozmowy"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Żaden z twoich kontaktów nie posiada Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Czemu kogoś nie zaprosisz?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Dotknij przycisku tworzenia wiadomości"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Rozpocznij swoją pierwszą rozmowę w Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nic. Zero. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Pusta skrzynka odbiorcza"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Potwierdź swój PIN"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Szukaj"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nie znaleziono wyników dla '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Przytnij"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nie można udostępnić więcej niż %@ multimediów."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Te rozmowy są zarchiwizowane i pojawią się w Odebranych tylko po otrzymaniu nowych wiadomości."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Daj coś swojej skrzynce na początek. Zacznij od wysłania wiadomości do znajomego."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Aby wyświetlać nazwy kontaktów na liście Signal, musisz zezwolić na dostęp do kontaktów w Ustawieniach iOS."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Ten numer telefonu ma włączoną blokadę rejestracji. Wprowadź kod PIN blokady rejestracji."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Blokada rejestracji"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nie teraz"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Nieprawidłowy numer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Regulamin i Polityka Prywatności"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Błędny numer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Zadzwoń do mnie"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ustawienia"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Nieznany kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nieznany"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index c1e36f4d8..93d5e7a0f 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Pronto"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Próximo"; + /* Label for redo button. */ "BUTTON_REDO" = "Refazer"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Vamos trocar para o Signal!"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Você pode arquivar conversas inativas da sua Caixa de Entrada."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Limpar Sua Lista de Conversas."; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nenhum dos seus contatos possui Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Por que você não convida alguém?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Clique no botão de escrever"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Comece a conversar no Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nada por aqui. Aproveite para respirar."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Caixa de entrada vazia"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirme seu PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nenhum resultado encontrado para '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Cortar"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Você não pode compartilhar mais de %@ itens."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estas conversas estão arquivadas. Elas aparecerão na caixa de entrada somente se novas mensagens forem recebidas."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Que tal movimentar as coisas por aqui? Comece mandando uma mensagem para alguém."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Você pode permitir o acesso aos contatos nos Ajustes do iOS para vê-los na sua lista de conversas no Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Este número de telefone está com o Bloqueio de Cadastro ativo. Por favor, insira o PIN de Desbloqueio de Cadastro."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Bloqueio de Cadastro"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Agora Não"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número inválido"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos & Política de Privacidade"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ligue para mim"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Configurações"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contato Desconhecido"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconhecida/o"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index ba84bc080..51bb8bc7c 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Concluído"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Seguinte"; + /* Label for redo button. */ "BUTTON_REDO" = "Refazer"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Vamos mudar para o Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Pode arquivar conversas inativas a partir da sua caixa de entrada."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Limpe a sua lista de conversas"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nenhum dos seus contactos têm o Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Por que não convidar alguém?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Toque no botão para criar."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Inicie a sua primeira conversa!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Esta caixa está vazia."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Não existem mensagens."; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirme o seu PIN"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Procurar"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Não se encontraram resultados para '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Recortar"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Não pode partilhar mais do que %@ itens."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estas conversas estão arquivadas e ião aparecer na caixa de entrada caso receba novas mensagens."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dê à sua caixa de entrada alguma escrita. Comece por enviar uma mensagem para um amigo."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Pode ativar o acesso aos contactos nas definições do iOS para ver os nomes na lista de conversas do Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Este número de telefone tem o bloqueio de registo ativo. Por favor, introduza o PIN de bloqueio do registo."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Bloqueio de registo"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Agora não"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número inválido"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos e política de privacidade"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Alternativamente, ligue-me"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Definições"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contacto desconhecido"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconhecido"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index f97a88d47..8f7b5031c 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Gata"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Următorul"; + /* Label for redo button. */ "BUTTON_REDO" = "Refă"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Hai să folosim Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Poți arhiva conversațiile inactive din Inbox-ul tău."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Șterge conversațiile tale"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Nici un contact de al tău nu are Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "De ce nu inviți pe cineva?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Apasă pe butonul de compunere"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Începe prima ta conversație în Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Nimic. Zero. Nul. Gol."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox gol"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Confirmați PIN-ul dvs."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Caută"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nu s-au găsit rezultate pentru '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Decupare"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Resetare"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nu puteți partaja mai mult de %@ elemente."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Conversațiile sunt arhivate și vor apărea doar în Inbox dacă sunt primite mesaje noi."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Dă-i inbox-ului ceva de scris. Începeți prin a trimite unui prieten un mesaj."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Poți activa accesul la contacte din aplicația iOS Setări pentru a putea vedea numele contactelor în lista de conversații Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Acest număr de telefon are Blocarea Înregistrării activă. Vă rugăm să introduceți Codul PIN de Blocare a Înregistrării."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Blocare înregistrare"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nu acum"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Număr invalid"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termeni și politica de confidențialitate"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Număr greșit?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Sună-mă mai bine"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Setări"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Contact necunoscut"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Necunoscut"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index d83eccb1a..f35bb90bf 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Готово"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Далее"; + /* Label for redo button. */ "BUTTON_REDO" = "Вернуть"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Переходи на Signal!"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Вы можете архивировать неактивные разговоры в ваших Входящих."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Очистить ваш список разговоров"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Ни у кого из ваших контактов не установлен Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Почему бы вам не пригласить кого-нибудь?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Нажмите на кнопку создания"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Начните свой первый разговор в Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Пусто. Ноль. Нетуньки."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Сообщений нет"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Подтвердите PIN-код."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Поиск"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Результаты не найдены для '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Обрезка"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Сбросить"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Невозможно поделиться более чем %@ элементами."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Эти разговоры архивированы и будут появляться во Входящих только когда получены новые сообщения."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Начните свое общение с друзьями."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Вы можете разрешить доступ к контактам в настройках iOS, чтобы видеть имена контактов в списке переписок Signal."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Ок"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Для этого номера телефона включена блокировка регистрации. Пожалуйста, введите PIN-код блокировки регистрации."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Блокировка регистрации"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Не сейчас"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Неверный номер"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Условия и политика конфиденциальности"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Неправильный номер?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Позвонить мне вместо этого"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Настройки"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Неизвестный контакт"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Неизвестно"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 5b68433ff..3845aefa4 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Opravljeno"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Naprej"; + /* Label for redo button. */ "BUTTON_REDO" = "Ponovno uveljavi"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Preklopite na Signal!"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Noben izmed vaših stikov ne uporablja aplikacije Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Zakaj ne bi koga povabili?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tapnite na gumb za pisanje sporočil"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Začnite s svojim prvim pogovorom Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Potrdite svoj PIN."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Iskanje"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ni rezultatov za '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Ponastavi"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Vaš poštni nabiralnik je lačen nove pošte. ;-) Začnite s sporočilom prijatelju!"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Telefonska številka ima vklopljen PIN za prijavo v omrežje. Prosimo, vnesite kodo PIN za prijavo."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "PIN za prijavo v omrežje"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne zdaj"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neveljavna številka"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Pogoji uporabe in Pravilnik o zasebnosti"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Napačna številka?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Raje me pokličite"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Nastavitve"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Neznana oseba"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Neznano"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 0c0861abe..db82fc561 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Zvaita"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Zvinoteera"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Ngati tame kuenda kuSignal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Hapana kontakt yako inoshandisa Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Wadii wakoka mumwe munhu?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Bata pabhatani rekunyora"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Tanga nhaurwa yeSignal yekutanga!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Hakuna.Zip.Zilch.Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Zero muInbox "; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Tsinhira PIN yako."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Tsvaga"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Hapana mhinduro ye '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Tangisa"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Nhaurwa idzi dzaka pfimbikwa uye dzino onekwa chete wagamuchira tsamba itsva."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Give your inbox something to write home about. Get started by messaging a friend."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Ndizvo"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registration Lock"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Kwete izvezvi"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Nhamba isina basa"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Call me instead"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Maseting"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Zita risingazivikanwe"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Hazvi zivikanwe"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index ba9e81fa7..91ac8926c 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "U bë"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Pasuesi"; + /* Label for redo button. */ "BUTTON_REDO" = "Ribëje"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Le të kalojmë në Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Bisedat joaktive nga Të marrët tuaj mund t’i arkivoni."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Pastroni Listën e Bisedave Tuaja "; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Asnjë prej kontakteve tuaj s’ka Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Pse s’ftoni ndonjë?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Prekni butonin e hartimeve"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Filloni bisedën tuaj të parë në Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Asnjë. Hiç. Asgjë Fare."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Zero Te të Marrë"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Ripohoni PIN-in tuaj."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Kërko"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "S’u gjetën përfundime kërkimi për '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Qethe"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Riktheje"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "S’mund të ndani me të tjerët më tepër se %@ objekte."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Këto biseda janë të arkivuara dhe do të shfaqen te Të marrë vetëm nëse merren mesazhe të rinj."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Sajoni diçka për shkrim në shtëpi. Fillojani duke shkruar një mesazh për një shok."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Për të parë te lista e bisedave Signal emra kontaktesh, mund të aktivizoni që nga aplikacioni Rregullime iOS-i hyrjen te kontaktet."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Ky numër telefoni ka të aktivizuar Kyçje Regjistrimi. Ju lutemi, jepni PIN Kyçjeje Regjistrimi."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Kyçje Regjistrimi"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Jo Tani"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Numër i pavlefshëm"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Kushte & Rregulla Privatësie"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Numër i gabuar?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Më mirë më thirr"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Rregullime"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Kontakt i Panjohur"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "E panjohur"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index 88e89571c..4bffc38fe 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Klar"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Nästa"; + /* Label for redo button. */ "BUTTON_REDO" = "Gör om"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Låt oss byta till Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Du kan arkivera inaktiva konversationer från din inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Rensa bland konversationerna"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Inga av dina kontakter har Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Varför inte bjuda in någon?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tryck på knappen för nytt meddelande."; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Starta din första konversation i Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Ingenting. Noll. Tomt. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inkorgen är tom"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Bekräfta din PIN-kod."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Sök"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Inga träffar för '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Beskära"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Starta om"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan inte dela mer än %@ objekt."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Konversationerna här är arkiverade och kommer bara visas i inkorgen ifall nya meddelanden tas emot."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Ge din inkorg något att visa upp. Kom igång genom att skriva till en vän."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Du kan aktivera kontaktåtkomst i appen Inställningar för att se kontaktnamn i din Signal konversationslista."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Detta mobilnummer har registreringslåset påslaget. Ange PIN-koden för registreringslåset."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Registreringslås"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Inte nu"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Felaktigt nummer"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Villkor & Dataskyddspolicy"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Fel nummer?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring mig istället"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Inställningar"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Okänd kontakt"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Okänt"; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index 1676d11b6..2fa28b553 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "เสร็จสิ้น"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "ต่อไป"; + /* Label for redo button. */ "BUTTON_REDO" = "ทำซ้ำ"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "เปลี่ยนมาใช้ Signal กันเถอะ"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations from your Inbox."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversation List"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "ไม่มีใครในผู้ติดต่อของคุณที่ใช้ Signal"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "ทำไมคุณไม่เชิญใครสักคนล่ะ"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "None. Zip. Zilch. Nada."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Inbox Zero"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "ยืนยัน PIN ของคุณ"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ค้นหา"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No results found for '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "รีเซ็ต"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "ลองเขียนอะไรสักอย่าง เริ่มต้นด้วยการส่งข้อความหาเพื่อนสักคน"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "ตกลง"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "เปิดใช้งานล็อกการลงทะเบียนสำหรับหมายเลขโทรศัพท์นี้แล้ว โปรดป้อนรหัส PIN ล็อกการลงทะเบียน"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "ล็อกการลงทะเบียน "; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "ไม่ใช่ตอนนี้"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "หมายเลขไม่ถูกต้อง"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "เงื่อนไขและนโยบายความเป็นส่วนตัว"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "หมายเลขไม่ถูกต้องหรือ"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "โทรหาฉันแทน"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "การตั้งค่า"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "ผู้ติดต่อที่ไม่รู้จัก"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "ไม่ทราบ"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 8e5dd53ce..d91fbceb8 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Tamam"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "İleri"; + /* Label for redo button. */ "BUTTON_REDO" = "Yinele"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Haydi Signal'e geçelim"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Eski sohbetlerinizi gelen kutunuzdan arşivleyebilirsiniz."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Sohbet Listenizi Temizleyin."; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Kişilerinizin hiçbirinde Signal yok."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Neden birisini davet etmiyorsunuz?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Oluştur tuşuna basın"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "İlk Signal sohbetinize başlayın!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Yok. Bitti. Kalmadı.Çok boş hissediyorum be!"; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Gelen Kutusu Bomboş"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "PIN kodunuzu doğrulayın."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ara"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "'%@' ile eşleşen sonuç bulunamadı"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Kırpma"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Sıfırla"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "%@ öğeden daha fazlasını paylaşamazsınız."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Bu sohbetler arşivlendi ve sadece yeni mesajlar alınırsa gelen kutusunda görünecekler."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Gelen kutunuza bir şeyler gelmesini sağlayın. Bir arkadaşınıza mesaj göndererek başlayın."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Signal sohbet listesinde kişilerinizin adını görmek için iOS Ayarlar uygulamasından kişiler erişimini etkinleştirebilirsiniz."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Tamam"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Bu telefon numarası Kaydolma Kilidini etkinleştirmiş. Lütfen Kaydolma Kilidi PIN'ini giriniz."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Kaydolma Kilidi"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Şimdi Değil"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Geçersiz numara"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Şartlar ve Gizlilik İlkesi"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Yanlış numara?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Bunun yerine beni ara"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ayarlar"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Bilinmeyen Kişi"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Bilinmeyen"; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index 0a559dba5..d76580168 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "Готово"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "Далі"; + /* Label for redo button. */ "BUTTON_REDO" = "Redo"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Перейдімо на Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "Ви можете заархівувати неактивні розмови."; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "Очистіть ваш список розмов"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "Жоден з ваших контактів не користується Signal"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "Чому би вам не запросити когось?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "Натисніть на кнопку \"Написати\""; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "Розпочніть свою першу розмову в Signal!"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "Нічого. Нічогісінько. Дірка від бублика."; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "Все чисто"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "Підтвердьте ваш ПІН."; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Пошук"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Нічого не знайдено за запитом '%@'"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "Crop"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "Скинути"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Ці розмови — архівовані. Вони з’являтимуться у вхідних лише тоді, коли приходитимуть нові повідомлення."; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "Надішліть до своєї поштової скриньки щось, щоб написати додому. Почніть листування з другом."; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Щоб побачити імена контактів у списку розмов у Signal, надайте програмі доступ до контактів у налаштуваннях iOS."; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "Гаразд"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "Цей номер телефону має дозволення блокування доступу. Будь ласка, введіть ПІН блокування доступу."; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "Блокування входу"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Не зараз"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Невірний номер"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Умови використання та політика конфіденційності"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "Невірний номер?"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Зателефонувати замість цього"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Налаштування"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "Невідомий контакт"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Невідомо"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index ac4d9da46..364040631 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "完成"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "下一步"; + /* Label for redo button. */ "BUTTON_REDO" = "重做"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "切换到 Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "您可以将收件箱中不活跃的会话移至存档。"; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "清理您的对话列表"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "暂时没有联系人使用 Signal."; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "为什么不邀请你的朋友?"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "请点击书写按钮"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "开始您的第一个 Signal 对话吧！"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "空空如也。"; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "收件箱空空如也"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "确认您的PIN码。"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜索"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "没有找到“%@”的相关结果。"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "剪裁"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "复位"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "您最多分享%@项。"; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "这些对话已被归档，仅当有新消息到达时，它们才会重新出现在收件箱中。"; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "收件箱闲得发慌。快开始找您的朋友聊天吧。"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "在“iOS - 设置”中开启联系人访问权限后，您就可以在 Signal 对话列表中看到对应联系人的名字。"; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "好"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "该电话号码已经开启注册锁。请输入注册锁PIN码。"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "注册锁"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "以后再说"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "无效的号码"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "协议与隐私政策"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "错误的号码？"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "改成给我打电话"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "设置"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "未知的联系人"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "无法识别"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index 951cd2394..c7ce3b570 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -302,6 +302,9 @@ /* Label for generic done button. */ "BUTTON_DONE" = "完成"; +/* Label for the 'next' button. */ +"BUTTON_NEXT" = "下一步"; + /* Label for redo button. */ "BUTTON_REDO" = "重做"; @@ -816,30 +819,12 @@ /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "讓我們改用 Signal"; -/* Body text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TEXT" = "您可以從收件箱中歸檔不再活動的對話。"; - -/* Header text an existing user sees when viewing an empty archive */ -"EMPTY_ARCHIVE_TITLE" = "清除你的對話清單"; - /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE1" = "你的聯絡資訊中沒有人使用 Signal。"; /* Full width label displayed when attempting to compose message */ "EMPTY_CONTACTS_LABEL_LINE2" = "為什麼不邀請朋友呢？"; -/* Body text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TEXT" = "點擊撰寫按鈕"; - -/* Header text a new user sees when viewing an empty inbox */ -"EMPTY_INBOX_NEW_USER_TITLE" = "開始你的第一個Signal 對話！"; - -/* Body text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TEXT" = "所有訊息已清除。"; - -/* Header text an existing user sees when viewing an empty inbox */ -"EMPTY_INBOX_TITLE" = "沒有任何訊息！"; - /* Indicates that user should confirm their 'two factor auth pin'. */ "ENABLE_2FA_VIEW_CONFIRM_PIN_INSTRUCTIONS" = "確認你的 PIN 碼。"; @@ -1071,6 +1056,18 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜尋"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; + +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; + +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; + +/* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; + /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "找不到有關 '%@' 的結果"; @@ -1086,6 +1083,15 @@ /* Label for crop button in image editor. */ "IMAGE_EDITOR_CROP_BUTTON" = "裁剪"; +/* Label for button that resets crop & rotation state. */ +"IMAGE_EDITOR_RESET_BUTTON" = "重設"; + +/* Label for button that rotates image 45 degrees. */ +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; + +/* Label for button that rotates image 90 degrees. */ +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; + /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "你無法分享超過%@個項目。"; @@ -1110,6 +1116,9 @@ /* Label reminding the user that they are in archive mode. */ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "這些對話已經封存，並只有在收到新訊息時才會顯示在收件箱中。"; +/* Message shown in the home view when the inbox is empty. */ +"INBOX_VIEW_EMPTY_INBOX" = "何不給你的收件夾寫些東西呢？從發個訊息給好友開始吧！"; + /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "你可以在 iOS設定中允許取用聯絡資訊，以在你的 Signal 對話清單中見到聯絡人名稱。"; @@ -1496,6 +1505,87 @@ /* No comment provided by engineer. */ "OK" = "OK"; +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_1" = "此電話號碼已啟用註冊鎖定。請輸入註冊鎖定 PIN 碼。"; + +/* The first explanation in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; + +/* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; + +/* Title of the 'onboarding 2FA' view. */ +"ONBOARDING_2FA_TITLE" = "註冊鎖定"; + +/* Title of the 'onboarding Captcha' view. */ +"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; + +/* Label for the 'give access' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; + +/* Explanation in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; + +/* Label for the 'not now' button in the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "稍後"; + +/* Title of the 'onboarding permissions' view. */ +"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; + +/* Title of the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; + +/* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "無效號碼"; + +/* Explanation in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; + +/* Placeholder text for the profile name in the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; + +/* Title of the 'onboarding profile' view. */ +"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; + +/* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "服務條款與隱私政策"; + +/* Title of the 'onboarding splash' view. */ +"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; + +/* Label for the link that lets users change their phone number in the onboarding views. */ +"ONBOARDING_VERIFICATION_BACK_LINK" = "錯誤的號碼？"; + +/* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; + +/* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; + +/* Label for link that can be used when the original code did not arrive. */ +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; + +/* Message for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; + +/* Title for the 'resend code' alert in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; + +/* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; + +/* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "改為撥電話給我"; + +/* Label for link that can be used when the resent code did not arrive. */ +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; + +/* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; + +/* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; + /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "設定"; @@ -2321,6 +2411,9 @@ /* Displayed if for some reason we can't determine a contacts phone number *or* name */ "UNKNOWN_CONTACT_NAME" = "未知的聯絡人"; +/* Label for unknown countries. */ +"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; + /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "未知"; From 3be41e8c25a6f794a91b61bcfc1c81d8b117efea Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Feb 2019 19:21:29 -0700 Subject: [PATCH 168/493] Unless you're on a call, all windows respect the orientation mask of the primary app visible VC. Fixes: - Avoid flicker when forgrounding onboarding while in landscape - Fix status bar in landscape while fingerprint is portrait, same with device linker --- Signal/src/AppDelegate.m | 13 +++++++++++-- .../ViewControllers/OWSNavigationController.m | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 31d0cf177..da68d29ec 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -967,13 +967,22 @@ static NSTimeInterval launchStartedAt; - (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window { - if (self.windowManager.hasCall) { + if (self.hasCall) { OWSLogInfo(@"has call"); // The call-banner window is only suitable for portrait display return UIInterfaceOrientationMaskPortrait; } - return UIInterfaceOrientationMaskAllButUpsideDown; + UIViewController *_Nullable rootViewController = self.window.rootViewController; + if (!rootViewController) { + return UIInterfaceOrientationMaskAllButUpsideDown; + } + return rootViewController.supportedInterfaceOrientations; +} + +- (BOOL)hasCall +{ + return self.windowManager.hasCall; } #pragma mark Push Notifications Delegate Methods diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m index 901cb1517..64fa3604b 100644 --- a/SignalMessaging/ViewControllers/OWSNavigationController.m +++ b/SignalMessaging/ViewControllers/OWSNavigationController.m @@ -199,8 +199,8 @@ NS_ASSUME_NONNULL_BEGIN - (UIInterfaceOrientationMask)supportedInterfaceOrientations { - if (self.topViewController) { - return self.topViewController.supportedInterfaceOrientations; + if (self.visibleViewController) { + return self.visibleViewController.supportedInterfaceOrientations; } else { return UIInterfaceOrientationMaskAllButUpsideDown; } From de27ed87287e8e3d86ac26928bbf11cb690e6642 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Feb 2019 10:29:30 -0500 Subject: [PATCH 169/493] Add color palette to image editor. --- Signal.xcodeproj/project.pbxproj | 4 + .../Contents.json | 21 ++ .../Screen Shot 2019-02-26 at 1.57.23 PM.png | Bin 0 -> 15805 bytes .../ImageEditor/ImageEditorPaletteView.swift | 258 ++++++++++++++++++ .../Views/ImageEditor/ImageEditorView.swift | 47 ++-- SignalMessaging/categories/UIView+OWS.swift | 16 ++ 6 files changed, 322 insertions(+), 24 deletions(-) create mode 100644 Signal/Images.xcassets/image_editor_palette.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index aadd52a2a..69f3722b8 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 3403B95D20EA9527001A1F44 /* OWSContactShareButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403B95B20EA9526001A1F44 /* OWSContactShareButtonsView.m */; }; 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; }; 34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -635,6 +636,7 @@ 3403B95C20EA9527001A1F44 /* OWSContactShareButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactShareButtonsView.h; sourceTree = ""; }; 34074F5F203D0CBD004596AE /* OWSSounds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSSounds.m; sourceTree = ""; }; 34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = ""; }; + 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPaletteView.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1913,6 +1915,7 @@ 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */, 34BBC852220C7AD900857249 /* ImageEditorItem.swift */, 34BEDB0D21C405B0007B0EAE /* ImageEditorModel.swift */, + 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */, 34BBC85C220D19D600857249 /* ImageEditorPanGestureRecognizer.swift */, 34BBC84C220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift */, 34BBC854220C7ADA00857249 /* ImageEditorStrokeItem.swift */, @@ -3333,6 +3336,7 @@ 34AC09DF211B39B100997B47 /* OWSNavigationController.m in Sources */, 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */, 34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */, + 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */, 34B6A909218B8824007C4606 /* OWS112TypingIndicatorsMigration.swift in Sources */, 4C3E245D21F2B395000AE092 /* DirectionalPanGestureRecognizer.swift in Sources */, 346129B51FD1F7E800532771 /* OWSProfileManager.m in Sources */, diff --git a/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json b/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json new file mode 100644 index 000000000..bf932ac9b --- /dev/null +++ b/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Screen Shot 2019-02-26 at 1.57.23 PM.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png b/Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png new file mode 100644 index 0000000000000000000000000000000000000000..4b8e2e2bccdb87b8a80d807098152ff6afec8d40 GIT binary patch literal 15805 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 IHU9Ab0UT6sFaQ7m literal 0 HcmV?d00001 diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift new file mode 100644 index 000000000..c648fc2c7 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -0,0 +1,258 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +public protocol ImageEditorPaletteViewDelegate: class { + func selectedColorDidChange() +} + +// MARK: - + +public class ImageEditorPaletteView: UIView { + + public weak var delegate: ImageEditorPaletteViewDelegate? + + public required init() { + super.init(frame: .zero) + + createContents() + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - Views + + // The actual default is selected later. + public var selectedColor = UIColor.white + + private let imageView = UIImageView() + private let selectionView = UIView() + private let selectionWrapper = OWSLayerView() + private var selectionConstraint: NSLayoutConstraint? + + private func createContents() { + self.backgroundColor = .clear + self.isOpaque = false + + if let image = UIImage(named: "image_editor_palette") { + imageView.image = image + } else { + owsFailDebug("Missing image.") + } + addSubview(imageView) + // We use an invisible margin to expand the hot area of + // this control. + let margin: CGFloat = 8 + // TODO: Review sizing when there's an asset. + imageView.autoSetDimensions(to: CGSize(width: 8, height: 200)) + imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) + + selectionWrapper.layoutCallback = { [weak self] (view) in + guard let strongSelf = self else { + return + } + strongSelf.updateState(fireEvent: false) + } + imageView.addSubview(selectionWrapper) + selectionWrapper.autoPinEdgesToSuperviewEdges() + + selectionView.addBorder(with: .white) + selectionView.layer.cornerRadius = selectionSize / 2 + selectionView.autoSetDimensions(to: CGSize(width: selectionSize, height: selectionSize)) + selectionWrapper.addSubview(selectionView) + selectionView.autoHCenterInSuperview() + + isUserInteractionEnabled = true + addGestureRecognizer(PaletteGestureRecognizer(target: self, action: #selector(didTouch))) + + updateState(fireEvent: false) + } + + // 0 = the color at the top of the image is selected. + // 1 = the color at the bottom of the image is selected. + private let selectionSize: CGFloat = 20 + private var selectionAlpha: CGFloat = 0 + + private func selectColor(atLocationY y: CGFloat) { + selectionAlpha = y.inverseLerp(0, imageView.height(), shouldClamp: true) + + updateState(fireEvent: true) + } + + private func updateState(fireEvent: Bool) { + var selectedColor = UIColor.white + if let image = imageView.image, + let cgImage = image.cgImage { + if let imageColor = image.color(atLocation: CGPoint(x: CGFloat(cgImage.width) * 0.5, y: CGFloat(cgImage.height) * selectionAlpha)) { + selectedColor = imageColor + } else { + owsFailDebug("Couldn't determine image color.") + } + } else { + owsFailDebug("Missing image.") + } + self.selectedColor = selectedColor + + selectionView.backgroundColor = selectedColor + + // There must be a better way to pin the selection view's location, + // but I can't find it. + self.selectionConstraint?.autoRemove() + let selectionY = selectionWrapper.height() * selectionAlpha + let selectionConstraint = NSLayoutConstraint(item: selectionView, + attribute: .centerY, relatedBy: .equal, toItem: selectionWrapper, attribute: .top, multiplier: 1, constant: selectionY) + selectionConstraint.autoInstall() + self.selectionConstraint = selectionConstraint + + if fireEvent { + self.delegate?.selectedColorDidChange() + } + } + + // MARK: Events + + @objc + func didTouch(gesture: UIGestureRecognizer) { + Logger.verbose("gesture: \(NSStringForUIGestureRecognizerState(gesture.state))") + switch gesture.state { + case .began, .changed, .ended: + break + default: + return + } + + let location = gesture.location(in: imageView) + selectColor(atLocationY: location.y) + } +} + +// MARK: - + +extension UIImage { + func color(atLocation locationPoints: CGPoint) -> UIColor? { + guard let cgImage = cgImage else { + owsFailDebug("Missing cgImage.") + return nil + } + guard let dataProvider = cgImage.dataProvider else { + owsFailDebug("Could not create dataProvider.") + return nil + } + guard let pixelData = dataProvider.data else { + owsFailDebug("dataProvider has no data.") + return nil + } + let bytesPerPixel: Int = cgImage.bitsPerPixel / 8 + guard bytesPerPixel == 4 else { + owsFailDebug("Invalid bytesPerPixel: \(bytesPerPixel).") + return nil + } + let imageWidth: Int = cgImage.width + let imageHeight: Int = cgImage.height + guard imageWidth > 0, + imageHeight > 0 else { + owsFailDebug("Invalid image size.") + return nil + } + // Convert the location from points to pixels and clamp to the image bounds. + let xPixels: Int = Int(round(locationPoints.x * self.scale)).clamp(0, imageWidth - 1) + let yPixels: Int = Int(round(locationPoints.y * self.scale)).clamp(0, imageHeight - 1) + let dataLength = (pixelData as Data).count + let data: UnsafePointer = CFDataGetBytePtr(pixelData) + let index: Int = (imageWidth * yPixels + xPixels) * bytesPerPixel + guard index >= 0, index < dataLength else { + owsFailDebug("Invalid index.") + return nil + } + + let red = CGFloat(data[index]) / CGFloat(255.0) + let green = CGFloat(data[index+1]) / CGFloat(255.0) + let blue = CGFloat(data[index+2]) / CGFloat(255.0) + let alpha = CGFloat(data[index+3]) / CGFloat(255.0) + + return UIColor(red: red, green: green, blue: blue, alpha: alpha) + } +} + +// MARK: - + +// The most permissive GR possible. Accepts any number of touches in any locations. +private class PaletteGestureRecognizer: UIGestureRecognizer { + + @objc + public override func canPrevent(_ preventedGestureRecognizer: UIGestureRecognizer) -> Bool { + return false + } + + @objc + public override func canBePrevented(by preventingGestureRecognizer: UIGestureRecognizer) -> Bool { + return false + } + + @objc + public override func shouldRequireFailure(of otherGestureRecognizer: UIGestureRecognizer) -> Bool { + return false + } + + @objc + public override func shouldBeRequiredToFail(by otherGestureRecognizer: UIGestureRecognizer) -> Bool { + return false + } + + @objc + public override func touchesBegan(_ touches: Set, with event: UIEvent) { + handle(event: event) + } + + @objc + public override func touchesMoved(_ touches: Set, with event: UIEvent) { + handle(event: event) + } + + @objc + public override func touchesEnded(_ touches: Set, with event: UIEvent) { + handle(event: event) + } + + @objc + public override func touchesCancelled(_ touches: Set, with event: UIEvent) { + handle(event: event) + } + + private func handle(event: UIEvent) { + var hasValidTouch = false + if let allTouches = event.allTouches { + for touch in allTouches { + switch touch.phase { + case .began, .moved, .stationary: + hasValidTouch = true + default: + break + } + } + } + + if hasValidTouch { + switch self.state { + case .possible: + self.state = .began + case .began, .changed: + self.state = .changed + default: + self.state = .failed + } + } else { + switch self.state { + case .began, .changed: + self.state = .ended + default: + self.state = .failed + } + } + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index b0c858dff..d75b5ddb2 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -23,6 +23,8 @@ public class ImageEditorView: UIView { private let canvasView: ImageEditorCanvasView + private let paletteView = ImageEditorPaletteView() + enum EditorMode: String { // This is the default mode. It is used for interacting with text items. case none @@ -37,8 +39,11 @@ public class ImageEditorView: UIView { } } - private static let defaultColor = UIColor.white - private var currentColor = ImageEditorView.defaultColor + private var currentColor: UIColor { + get { + return paletteView.selectedColor + } + } @objc public required init(model: ImageEditorModel, delegate: ImageEditorViewDelegate) { @@ -71,6 +76,8 @@ public class ImageEditorView: UIView { self.addSubview(canvasView) canvasView.autoPinEdgesToSuperviewEdges() + paletteView.delegate = self + self.isUserInteractionEnabled = true let moveTextGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleMoveTextGesture(_:))) @@ -129,6 +136,7 @@ public class ImageEditorView: UIView { private let newTextButton = UIButton(type: .custom) private var allButtons = [UIButton]() + // TODO: Should this method be private? @objc public func addControls(to containerView: UIView) { configure(button: undoButton, @@ -151,11 +159,7 @@ public class ImageEditorView: UIView { label: "Text", selector: #selector(didTapNewText(sender:))) - let redButton = colorButton(color: UIColor.red) - let whiteButton = colorButton(color: UIColor.white) - let blackButton = colorButton(color: UIColor.black) - - allButtons = [brushButton, cropButton, undoButton, redoButton, newTextButton, redButton, whiteButton, blackButton] + allButtons = [brushButton, cropButton, undoButton, redoButton, newTextButton] let stackView = UIStackView(arrangedSubviews: allButtons) stackView.axis = .vertical @@ -166,6 +170,10 @@ public class ImageEditorView: UIView { stackView.autoAlignAxis(toSuperviewAxis: .horizontal) stackView.autoPinTrailingToSuperviewMargin(withInset: 10) + containerView.addSubview(paletteView) + paletteView.autoVCenterInSuperview() + paletteView.autoPinLeadingToSuperviewMargin(withInset: 10) + updateButtons() } @@ -180,17 +188,6 @@ public class ImageEditorView: UIView { button.addTarget(self, action: selector, for: .touchUpInside) } - private func colorButton(color: UIColor) -> UIButton { - let button = OWSButton { [weak self] in - self?.didSelectColor(color) - } - let size: CGFloat = 20 - let swatch = UIImage(color: color, size: CGSize(width: size, height: size)) - button.setImage(swatch, for: .normal) - button.addBorder(with: UIColor.white) - return button - } - private func updateButtons() { undoButton.isEnabled = model.canUndo() redoButton.isEnabled = model.canRedo() @@ -262,12 +259,6 @@ public class ImageEditorView: UIView { updateButtons() } - @objc func didSelectColor(_ color: UIColor) { - Logger.verbose("") - - currentColor = color - } - // MARK: - Gestures private func updateGestureState() { @@ -679,3 +670,11 @@ extension ImageEditorView: ImageEditorCropViewControllerDelegate { // TODO: } } + +// MARK: - + +extension ImageEditorView: ImageEditorPaletteViewDelegate { + public func selectedColorDidChange() { + // TODO: + } +} diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index bb774a851..b29b58f16 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -125,6 +125,14 @@ extension UIView { } public extension CGFloat { + public func clamp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + return CGFloatClamp(self, minValue, maxValue) + } + + public func clamp01(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + return CGFloatClamp01(self) + } + // Linear interpolation public func lerp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { return CGFloatLerp(minValue, maxValue, self) @@ -139,6 +147,14 @@ public extension CGFloat { public static let halfPi: CGFloat = CGFloat.pi * 0.5 } +public extension Int { + public func clamp(_ minValue: Int, _ maxValue: Int) -> Int { + assert(minValue <= maxValue) + + return Swift.max(minValue, Swift.min(maxValue, self)) + } +} + public extension CGPoint { public func toUnitCoordinates(viewBounds: CGRect, shouldClamp: Bool) -> CGPoint { return CGPoint(x: (x - viewBounds.origin.x).inverseLerp(0, viewBounds.width, shouldClamp: shouldClamp), From d419709ebdee5f888d6bce43c7ab14558867f349 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 16:19:54 -0500 Subject: [PATCH 170/493] Respond to CR. --- .../ImageEditor/ImageEditorPaletteView.swift | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index c648fc2c7..73d3d442e 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -56,7 +56,7 @@ public class ImageEditorPaletteView: UIView { guard let strongSelf = self else { return } - strongSelf.updateState(fireEvent: false) + strongSelf.updateState() } imageView.addSubview(selectionWrapper) selectionWrapper.autoPinEdgesToSuperviewEdges() @@ -67,10 +67,17 @@ public class ImageEditorPaletteView: UIView { selectionWrapper.addSubview(selectionView) selectionView.autoHCenterInSuperview() + // There must be a better way to pin the selection view's location, + // but I can't find it. + let selectionConstraint = NSLayoutConstraint(item: selectionView, + attribute: .centerY, relatedBy: .equal, toItem: selectionWrapper, attribute: .top, multiplier: 1, constant: 0) + selectionConstraint.autoInstall() + self.selectionConstraint = selectionConstraint + isUserInteractionEnabled = true addGestureRecognizer(PaletteGestureRecognizer(target: self, action: #selector(didTouch))) - updateState(fireEvent: false) + updateState() } // 0 = the color at the top of the image is selected. @@ -81,10 +88,12 @@ public class ImageEditorPaletteView: UIView { private func selectColor(atLocationY y: CGFloat) { selectionAlpha = y.inverseLerp(0, imageView.height(), shouldClamp: true) - updateState(fireEvent: true) + updateState() + + delegate?.selectedColorDidChange() } - private func updateState(fireEvent: Bool) { + private func updateState() { var selectedColor = UIColor.white if let image = imageView.image, let cgImage = image.cgImage { @@ -100,18 +109,12 @@ public class ImageEditorPaletteView: UIView { selectionView.backgroundColor = selectedColor - // There must be a better way to pin the selection view's location, - // but I can't find it. - self.selectionConstraint?.autoRemove() - let selectionY = selectionWrapper.height() * selectionAlpha - let selectionConstraint = NSLayoutConstraint(item: selectionView, - attribute: .centerY, relatedBy: .equal, toItem: selectionWrapper, attribute: .top, multiplier: 1, constant: selectionY) - selectionConstraint.autoInstall() - self.selectionConstraint = selectionConstraint - - if fireEvent { - self.delegate?.selectedColorDidChange() + guard let selectionConstraint = selectionConstraint else { + owsFailDebug("Missing selectionConstraint.") + return } + let selectionY = selectionWrapper.height() * selectionAlpha + selectionConstraint.constant = selectionY } // MARK: Events From e01f39e8e1083af25ec187e9ec7fd9b7bc11868a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Feb 2019 14:14:33 -0500 Subject: [PATCH 171/493] Apply image editor design. --- .../image_editor_brush.imageset/Contents.json | 23 +++++++++++ .../marker-32@1x.png | Bin 0 -> 355 bytes .../marker-32@2x.png | Bin 0 -> 640 bytes .../marker-32@3x.png | Bin 0 -> 960 bytes .../Contents.json | 23 +++++++++++ .../add-caption-32@1x.png | Bin 0 -> 326 bytes .../add-caption-32@2x.png | Bin 0 -> 559 bytes .../add-caption-32@3x.png | Bin 0 -> 866 bytes .../Contents.json | 23 +++++++++++ .../checkmark-circle-outline-32@1x.png | Bin 0 -> 503 bytes .../checkmark-circle-outline-32@2x.png | Bin 0 -> 966 bytes .../checkmark-circle-outline-32@3x.png | Bin 0 -> 1681 bytes .../Contents.json | 23 +++++++++++ .../checkmark-circle-filled-32@1x.png | Bin 0 -> 383 bytes .../checkmark-circle-filled-32@2x.png | Bin 0 -> 724 bytes .../checkmark-circle-filled-32@3x.png | Bin 0 -> 1267 bytes .../image_editor_crop.imageset/Contents.json | 23 +++++++++++ .../image_editor_crop.imageset/crop-32@1x.png | Bin 0 -> 286 bytes .../image_editor_crop.imageset/crop-32@2x.png | Bin 0 -> 531 bytes .../image_editor_crop.imageset/crop-32@3x.png | Bin 0 -> 731 bytes .../Contents.json | 23 +++++++++++ .../crop-lock-32@1x.png | Bin 0 -> 400 bytes .../crop-lock-32@2x.png | Bin 0 -> 681 bytes .../crop-lock-32@3x.png | Bin 0 -> 981 bytes .../Contents.json | 23 +++++++++++ .../crop-unlock-32@1x.png | Bin 0 -> 409 bytes .../crop-unlock-32@2x.png | Bin 0 -> 689 bytes .../crop-unlock-32@3x.png | Bin 0 -> 989 bytes .../image_editor_flip.imageset/Contents.json | 23 +++++++++++ .../image_editor_flip.imageset/flip-32@1x.png | Bin 0 -> 458 bytes .../image_editor_flip.imageset/flip-32@2x.png | Bin 0 -> 893 bytes .../image_editor_flip.imageset/flip-32@3x.png | Bin 0 -> 1148 bytes .../Contents.json | 23 +++++++++++ .../rotate-32@1x.png | Bin 0 -> 431 bytes .../rotate-32@2x.png | Bin 0 -> 868 bytes .../rotate-32@3x.png | Bin 0 -> 1266 bytes .../image_editor_text.imageset/Contents.json | 23 +++++++++++ .../image_editor_text.imageset/text-32@1x.png | Bin 0 -> 491 bytes .../image_editor_text.imageset/text-32@2x.png | Bin 0 -> 989 bytes .../image_editor_text.imageset/text-32@3x.png | Bin 0 -> 1550 bytes .../image_editor_undo.imageset/Contents.json | 23 +++++++++++ .../image_editor_undo.imageset/undo-32@1x.png | Bin 0 -> 446 bytes .../image_editor_undo.imageset/undo-32@2x.png | Bin 0 -> 808 bytes .../image_editor_undo.imageset/undo-32@3x.png | Bin 0 -> 1237 bytes .../ImageEditorCropViewController.swift | 16 +++++--- .../Views/ImageEditor/ImageEditorView.swift | 38 ++++++++---------- SignalMessaging/Views/OWSButton.swift | 17 ++++++++ 47 files changed, 297 insertions(+), 27 deletions(-) create mode 100644 Signal/Images.xcassets/image_editor_brush.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_brush.imageset/marker-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_brush.imageset/marker-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_brush.imageset/marker-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_empty.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_full.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_checkmark_full.imageset/checkmark-circle-filled-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_full.imageset/checkmark-circle-filled-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_checkmark_full.imageset/checkmark-circle-filled-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_crop.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_crop.imageset/crop-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_crop.imageset/crop-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_crop.imageset/crop-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_lock.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_unlock.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_flip.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_flip.imageset/flip-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_flip.imageset/flip-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_flip.imageset/flip-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_rotate.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_rotate.imageset/rotate-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_rotate.imageset/rotate-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_rotate.imageset/rotate-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_text.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_text.imageset/text-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_text.imageset/text-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_text.imageset/text-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_undo.imageset/Contents.json create mode 100644 Signal/Images.xcassets/image_editor_undo.imageset/undo-32@1x.png create mode 100644 Signal/Images.xcassets/image_editor_undo.imageset/undo-32@2x.png create mode 100644 Signal/Images.xcassets/image_editor_undo.imageset/undo-32@3x.png diff --git a/Signal/Images.xcassets/image_editor_brush.imageset/Contents.json b/Signal/Images.xcassets/image_editor_brush.imageset/Contents.json new file mode 100644 index 000000000..1a496d37d --- /dev/null +++ b/Signal/Images.xcassets/image_editor_brush.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "marker-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "marker-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "marker-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_brush.imageset/marker-32@1x.png b/Signal/Images.xcassets/image_editor_brush.imageset/marker-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..33e6dbc8edc50fc097f5f8299141ae95ac0cba3c GIT binary patch literal 355 zcmV-p0i6DcP)1EDTw-P{snw$NpEn>{N0~wqQ3F5%%scqmVk%^?f`56+%&z59t>n+Ab<}#o~F|B2W9UyI1zpF{Zujo-ju*C z474S1t4%oQ^%UI!24?P}tgn=-j0$Y$&fIDVir_^CEa0;ZSixr*u!LtDu!d(Dr~#jB zpcZ_Rftv7-25Q5n7^n&#H6W+lhyhdhI|EM3-_?XmL`|tSkp~TVh@unBP^shi?2Q}k za_cE5{j1RCt{2o9$7;KoExCb^I?Sqy#(A66nCtfp$O%c3|j0JD>zg zfDW*Nb)m+|}mWOK&%(>bCcpSpz4OlAyahSs2^|Bg?)`%%!Rc zox|)N5CQxzd>cB4ch1mYE%0UpL;y#JHz6Pbm<3*4Km;%wys7~Cj1EHNg4Y(X3_;|C z*B0=q4X-Vrk-y^9;8g_(^h^_8U4S;cg%zL*uPVR-yqW+j@G1f4L+*?i}2Y5 zScT6bz%u;k0<6Q2Dxd`T(FBwNKZ<~o;IA&AH2A9uC=vc@0!oFyihz>gFBVWb{6zw8 z0p8Um{~m9>k$4u&+(l;16mD>e5zCVR` zc_E@=-sxD9D?pa`_GsycQpRQ%N#6>1O~8Kxcq-r=&XJj?;ex@0000y95KI&fq}Wm z)5S5QV$R#S4=3I-5OCXn_DQ|Q!yv~O3R4`|6=hXKTS^=_FE|D{>d8*v)03USWwzKk zhDXTlQ{wvYTlsFq%_-++eBYq^WU@k9o2y=a&)yuLh64O(m6(Hzx6&=(8KwstOWn9%=s-7Y|5X~@uKABPXUvA>g;LrQsu*WncN!w z%cLz^@X4*~J?q_udWH|iD`X8_xjh>8Cp=Sah`lgtzVrOKU7`~>>fgubH|c)*y!d+D zM(g5-d*^Pht9A?DygI@>L|~ux=^GnE)EzkfX_e_*<-EYLUxG2}p}3-ham`nzEr-K( z7qI-e#hRnk5OVOko&sB_Xw6n8n~1L;VlP^WU5VLaCw*IS(N1~xD)Bcnr=LHwNA}Cy zBWpA)x#yYGe~Rxj4_oPSAjrDr+CPs=yq3nr%(>I&hILh_tQ58Ls!&)gX}5*@0-yXW z)+r3~QLIy#c$3c3CmY8$*PkDxZFr3g($1NVpA^%Orv=__-3j!t=$ zUP5)?{$8KD?x`2mj`$XBN?c>a{O=c2#=4eO5BGZ=n0oWoN+GG{dY!%dI|MKOJJr>q zXPp+ebzAJu%Du++2dmDWd6)n7rRo9QuY3=pFI-SODCEDb;mks|$py-_yB5ywS=i?P zR&SN6&oxO07jB0AO>M7#KE8fs%j>^WpUh)?z2I5ZKI6}K9+W@NP0!Z;clp0z2FK^y zy&c=GrEV)xdCs$=)VQ=;tv2;p>p_42PqqjCW(6ESTmIbs>v~DfwMLfd4m|sq|KBS$ z<*nPVa-aE+>M_qBujhZiwf&~`l3DT}XJ)-w&eNLA)PfDEFh7vL!Fu;_-QW49z%0q& M>FVdQ&MBb@0PFmrPXGV_ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json new file mode 100644 index 000000000..22defce50 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "add-caption-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "add-caption-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "add-caption-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..2d1325e014eecf410f1d981026df1a85d07607f9 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1FMR zi(^Pc>)UA$d7B(~TK7x+Kg^M{K-pqe-T{uj2OND3(guet9eI~YJZRCdv=FNB{J+Kh z_qy*pR-H4!?nAY%;sK`+^w|cR!ECpp6guM%u8S1 z@14pf$XVsOYE{KKMWzEsKl?PqF|DflHb*#NH>bV3f>NZh!ETPwts^$?fdBV}+)3w=0nR-&rsm)XTV>ZcE-YXesK)4@61>=R4 WEb`8ktgnG#z~JfX=d#Wzp$P!D(}NrU literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ba403c8b3fc8b64806371d50524e5d886ef121b3 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km-ofr0U% zr;B4q#hka%7jq982-L3o6>pZ|c7mhl0Ec8_phTmf5tFh3Q;vgrL8{;t<@DJuSuZD+ z`)^9Io%`T!x3K(2!K9vqW74JH@*1QcuzTuvO>4AKm`4QvO} zEq|@FV76eiV0w|<(|$63p4UV7WDm32jGBoPx0p>XIz6$R@%rl8%7stzl{52-El&pi zH575mXiNR7_(GqddgBwF2W8%6l50=41P3Oc6D|CD{Is3wzEek|Bs^~~2+Xp(vPIKL zWxt&I{BGl{BR5(~_4ImgneC9&UAnewL-*SSmeWtmX0dHanz!zstE@f qy95KI&fq_}X z)5S5QV$R#S7YlDW2(*1Ss^phFBHI!oF#Um00lTK+%LB44LP1Tjjvnk~>;VVU^e%bl zeZS!4@yGFdy|KBRpHS1^lBk~!-a(;?7WWLlMQAYaur@4YFc4vAV>%GPAi>4p%$R^8 zxMzO$cg>}1J8U{U{_Qr@E~%aG^Zx(Id_haA^*Y~WU7jpoC3ohM=9BZxdYMX_gePAA z6Vki&&%AQ+yjz&eslNM2-L0Ev-tdCp)KY* zS#Nzdoo&2-Wm|Og>-8_b`N{lKd+u6vVCLt4N5h%6-+I>3`Ete9Qy2HIUweN7OTJ2r zyQ2ns$hp5i=hQD>b*=SsSC(5mLGjQ zIkI_*p=RPNo&8d!`GW`x_OQNu zQF!OK5|hXdM@G%17xtLVJhp%#wAOU4ip&4G3pW>7RXHl%pZ%!BL_#eQdwi{)+cz(J zS4E};G%AJ9GA@5)7xA9&z_sOzPtVvh(^O`Wd6xZjQI|Z`ld;^-m7chUzHcu(A1nZg z_eD%+(r4E)@(1;|cFuGUX($hWa_-BPZgFn?G`4B0cTQM6W%bMXEB35AYh7ccz5V!P z;Xm68429QsO}-wn>5Q4+&sRs1XHH6u(vLp2sP_N1=Iy>~H|9L$n5GfEv+dB@;~9lZ z1Y_0~WS3^l$xi>o=q=vgyY#x`lmn0M#_q2B_|A#t^!4})X}@g~|1}&o`O$nX!9tn~ hdq5$l)Xt7SjO@lPMcrQ|#DSTH!PC{xWt~$(69E1JZeIWZ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/Contents.json b/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/Contents.json new file mode 100644 index 000000000..7ad664647 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "checkmark-circle-outline-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "checkmark-circle-outline-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "checkmark-circle-outline-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@1x.png b/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..102b6d7e8c6abec42255544ed0facca47961d946 GIT binary patch literal 503 zcmV+!GflK%$2#cM>}7$7J`ht{c&}Ji})3nYK~gv|^8lO-X!?hU+Nv{ z^9_+-#n;tjp_BCql^`g*A*X*qt}wU2g#?7385lU^D1$4K3vON$pYDNVpjx7#a0ep# zkt1BSkF0>4(IF?|9rF9AECEby>0NHx64*`Xks%^NYseP(^0`e|JcfX94|(wz_OIHo z5wVGUd2Yu&5>VBO1vkme;xcwgE4H9^A0wdh^Pl6T^@T(kwY!o55ud-5nsT(cmYZnW t{4oJSdO81=EQ*>0Q(dlq{_mKGegRCG$rET`I<^1+002ovPDHLkV1kGj*{J{k literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@2x.png b/Signal/Images.xcassets/image_editor_checkmark_empty.imageset/checkmark-circle-outline-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..19a221ccd15b1e280b97cc184082ae741c72a77b GIT binary patch literal 966 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 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_crop.imageset/crop-32@2x.png b/Signal/Images.xcassets/image_editor_crop.imageset/crop-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..804fafee5d7671c41a5b56ef100d0efed1532062 GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km-ofr0U; zr;B4q#hkaZ|K=Vt5IA~2^zZ(=3+^uHVUR9iacl5A#UZu3>Uq zn-065x$AGGSru`l?#7X8u{|m_#m}q0BsxemR0sAYr2V$%opkMf)t?>n850{c&T%li z6uL<$bQwR9Quq-q3 zJ$7`7q(Q@Uzx8P<*LT{AGG`q;BgSxV(z`rQyXR&5Z!KpyDcX>#WIOX_jFg;WHQS7v zb+ab!`Bh}N*>{tSo##HU#d2Oe5?2d%Y!)d~kzX3fzkP$?EtTv1pI!>ydCzi~A#jc$ zTgRgw0|$}x7RE&u$~*!`C7XE+Hm_+uKJy08&sz(P6O>N1D*m*7(zlTX>ik2?9c(_F5`n4B9E0lIU)~MszCK|Q*+w}F*CQmuBWvZla;-M`n zuC<=KOnJ>ep1Uw%QSS}TE`)mz?`8b>ZUZQ2-7d7hW_-Y}yut6`t>uUOfU(Tr>FVdQ I&MBb@0DDp4+W-In literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_crop.imageset/crop-32@3x.png b/Signal/Images.xcassets/image_editor_crop.imageset/crop-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c780199d2e0afdf6350f77ec1a5b7ad80e63d007 GIT binary patch literal 731 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJ<{->y95KI&fq|*l z)5S5QV$Rz;7k#B2Mcf`%FW%EGr4-88rT^~p1Fm$#X0{@qbA^U*z_1$l{S*Y`RXaIM;H zu=)AD@X|=e*^w?s-pk4V$lmt+uJg9%1#@c)&gCJ7LOQ!}@85y1a_GZOX%@;XaYR~6=v^>il|Fv>kIzN-ll8znvch*nNIp4>zL7K@Y z=a0pQ#aEZBt)psHeR28fa}JY?DhOUpx{9c1yl{-u!>@pGiI-uJ#Ew4#7kG!U;Ho07C+_Qv!6Hjh}>Io-DPti>pQzW zhQBSX6Ut`ZE9`4ZTfV@=I&q?`!R+0?&*$j>%d}dPd{#?hSzpXXp(5XUevj1;)T}?$ zzdM&J_3R+?=Ptd+S$F>G@$UWY(apXs73l4&YPqGe#kaV&EEW)q+cp2Lp6e3E@}-vr zmvJP#KmBgYr#CNN+?=9(`jYXI$X|=^PTpcV+iKJMtmO)6$8r^X&;Q+Ab^4ZhNpwt~ n7_P|QA*ON+DQT!0S2LTfUuJKx(Ow6bS{XcD{an^LB{Ts5>uomm literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_crop_lock.imageset/Contents.json b/Signal/Images.xcassets/image_editor_crop_lock.imageset/Contents.json new file mode 100644 index 000000000..eb76b325a --- /dev/null +++ b/Signal/Images.xcassets/image_editor_crop_lock.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "crop-lock-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "crop-lock-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "crop-lock-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@1x.png b/Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d7bf30c25c14a3a5a2a57ce17d0bb9e24e639a73 GIT binary patch literal 400 zcmV;B0dM|^P)QFc5vO%73y!86hKdgl^D|!U!E9-Jm06gpR-n zWP(?jUJ%OJ29y{ol_x#Pvd{M8e0MgKgf;QB>h3uKBt^1z14{{53Y!3gEU-*a0iFO< z*F9qF(~#uZsk;vqfM);~07pqpbhVhON6|dcc_Ou@>$o|RIyN?k0Gi+LjL%yl2;;6d zY-zZ2JS#AJpQ7a-~6ItM6r1SAikw%Da6Yag6pEHwscn9ScXn%hI8HHP-t?UPz4 zHDQK;>*hye8>;?yLrnic#8}dV*~|sSbo^l%#h_oI>--M#cVokKd0*o0Pq7$o=AvQlzedj0000F%1ClvuTh-z4!EC zegk9q*G zQjQI1Jp%yzOf!;KUoHR&Z#nEpJ}ajhbP-@u$KhZp97)cUQw{z@AXIqIcdE1j<|Dx@ zfMSdx3!oTdFfTyzaX?>~p8;6_#Uug%a{wCvWwk7wm5#gkRG8!*0AS(LV&_8NqstT( zswAwdj{qWaPqI`_Bf^btQPX)}gaygHD)G>F2`m&dKGs3!cU3mX+0NtdoNqm1d9peS za&f&9lAV&6BBl5H+erD=D=%Yp_?FZr2w)bB{)ck<%{3m6lYR}JNrE&7#hCpwM>~ z`5fNKV)b{K0bB3+(S4dq7co^X7?pi60xvPY0cXKzGoaJ`0C$PvGoTOdAkr!pKNHV~ zzcy95KI&fq}W* z)5S5QV$Rz+Z$obzh_t=it+}=#O9J_1INvb28<=lHxzsrlqYcJ^}ooS z{OT}^^3T%A-!0wkCx}{q6ZU-e%K5AhN1uMpw+Iae9@d713QMd>@mNgZp9zHiWoy`6sI=+p3>n_^eqI;=BR>+_bs{JnEOdK`){fJ0%%ET(yj z_Is~Bd(td+;iZ0+{<(jI=gC(7sC>4t#bQZ}c5CtZqU-nkOtT$?#DBhNDAf)redXN0 zlW|6r%+G+-bdP<@8e+Z_%zM()e6Brc=DF;vA`_zht#7uAe%4*7cHq0;4qv_wozSn* zlf3V(_$xK*wx`OL*6NMrF5IiQK12n~GAwvIyRv6fvRhznt;3B#uTcM*%e!ZEe&?>= zRBS!5W=hQS`8CT`id9S^7YKd}``kWf@&@1D`fFvD$1_+>xLtp+mG6Ak!K3J47W#k7 zhq96nCgKl-;`W%a2;O&nvV8mB!Z$AzBy%Rt+pnn0Z5<%1!{gozPUz4Ckm3LQ-^zBa z1t*V5vwFQgchACuF-?pmrc7tYYDbIjOXF8_n7?N`Y=e*&<)yA)D1d9x-|5d=A_@J_ zD>fPKOwauh6EUf<>JE@Rna&BS9f61(;@zT;8nt~ehMqJgGEC}sjvDsZ=#;U2G5e$z zN=>-IfnoEbvh(hP+A4S_`5778X0);l-*VYMpqdIu7FARKryfWoQR|K6I8C?&JAIyK zlkg+H=OU85NE|!^*xT+Ad$sA2%YmSVFCy}kdDX^5D?Rrgm1A|H>`k)lCTJmZV&))xVa0PYhkG^{sxkZvm3;BJxvF z-vDflV+VRi0D#XhBYF4X0-#dE;Xv|-acaR30T#6!j)uaS0%V^DjD`CMC;}KJ699Muumeyx!!lSMxSLmnSs%gZ{TjTo3EDaFX=Ek9 zEfa3vN!fiO)cc6cy)kv};XVS20ETgfB7kAKaaJDxBozkms#biR7X9|(pH7QY>0z5i zsbAr}GO3^UO^%0EX9;|xUr!#G0`U;%ZwA4KF2 XU`(vfd4!aX00000NkvXXu0mjf<#;NO literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@3x.png b/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdca3444c4c143d836ba73461f00b968c199d0f GIT binary patch literal 989 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJ<{->y95KI&fq}W- z)5S5QV$Rz+ZwsXi1=`Auf988_&@QlQ5W3U&md}IrplAzU1J|1p2H6K(KAZsu)1Kro zE$;vPGvcmL#eB)X4(jh-J6>9NwbQkwK|a3VeQhH{y21fTjsiBOIflXq&Im2_4B}8( zz-GbBc+R20Sl|H<3nueuM})+6PowkG!sRbF;aaH&3 zXNKg2&d?T_QT|d`A>q99!ke6z1=*F1E{WuQ3J!X8zTE!4NNZ=LnC2TTFYnd0-zRot z%-z}M`SOO9v!34mb5nD@(u^M)UA`IqP<*n8O`y^9{g>mb1=H>w+v?`BBgBq<)`HsK z@|*pNf^JR8WMMkBMe=V81Gh`c?Lza|{onb)(d+1t=Km)rUX@9VnX&8Z?)Y3s;U`G3 z+q1Oc`itV1xy1zyOB)vdpZ498L%HqZ8J`1tOO+PMf7Fz(DZi~25*d16Bjf8RgU=q$ z{W}?YM8l<4<;YChE;8Zwa|^#Bzvg4JlYAa;)M0&cZ@KKe!_uEk4TTqEtLseSbqP-U zH|Vf`b#1!0DrY5VIb=I#9y{P8{@LPW-%ak%7cUsBI&tRut{1Uq0)Dsd zzqxa&hn@Gj&;I8$Pud8s;&E@^di9Iia}}ASkLhdA+WCb!Y+c9^`#|ryOrsskg?+E? zi_GiOoA-(-9d((v<@;r0Rra>3eC5oHifDY5bg*CxO0o`^f9z|peyD@~ zWxlDGs?*=cEMXAjWRjDP+p$^U&F{eeP?qj;>t;J>9zn`3jST)BFU+m}eSMa$kQNNg OuMD29elF{r5}E*}e4?NL literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_flip.imageset/Contents.json b/Signal/Images.xcassets/image_editor_flip.imageset/Contents.json new file mode 100644 index 000000000..92ead99d3 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_flip.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "flip-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "flip-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "flip-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@1x.png b/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc8a1a6556454252772cb6fb08e525345af269c GIT binary patch literal 458 zcmV;*0X6=KP)R9J=Wm(gtkF${+7s_$h37@-?9BQQcoxDn_EjL>d!-GC8b z12%A#;^U(DPp}ac57d$+F6TJEzl0cAMChLObl24%Ucl7?nE92NSH<&|ncq#I$MPYJ zI1%NA=*y!g`pVugt$&Ch05Yav$AnEfSDlhz{a|aXPA)wVCQRSBiR1}Uq z3Oxc@`HLBiQTWgtZ3;+LedV^iM*vWSS9FU&yr}>ak-Ye}n-i#ZRqr7HzDb4xA`ogO zP6|`?Hg}~qp-NlsApmaE)FXiR={ANNRiO|zoSsJrv>Fvc^p^rmqk5+K$42IK zXA2M7sM2raD%9;zl|8QrM0_{R{r_+H-~x!~2Sk)IO%rFWCIA2c07*qoM6N<$f&kgX AhyVZp literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@2x.png b/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b4c0dc15e073d3aca9d1c9a5dac35f7c6bc0e6 GIT binary patch literal 893 zcmV-@1A_dCP)V%a7KD5ObB0dJ+%v6BBi=Ob6 zLf?EE+8z+)u1UZBE9?OyFEDA<$6t;RE3Hvl{Za*l{KZlQBGE}eD%os+zBvL?Qm<(4 z#R>2hHn&(5pg$xaw0$LGoX|TgO+az=GmF&P{IPnsP{EK*u*2{aA)Np5(yi$#e01-A1Wb0X>GN z74c=L-zXtgDyo0is;mVVuSfyl#JTsVphp2C3{NY@870I@K?RDhytx2l7ApX#p!tg2 zs(@Mk#&!Z@j1po+ixJgFRo2>aF~TT`M1%B}B%s?UiG&ulhDQtWA`Jw%0Y*tAv=~)= zv`DQ@3ve7)sX!!hK}2V?kfjL-eLs`&&*(W6#b&6*@Mx$tLmGOFQqeIum*Htemr+8p zNaWRQc(efXG=Boo7}Z9pL;*_}o>tTwCB#Zn{bs|X1(>T_0pO&XG)hwnSkmycqRuEG zRvf-%y@UdQ3Y>OD7Kvz(^q&1n1RRq2F6g-|0oK(=i`3d0NhmT(B9W2MD-uv-lw@L{ z;n4!jJCp!dXp~SV^Xj8TYHb|^Od6%M!%)Mcg?JGI0y1klYXr%e5I@(LRN-KC^?ecr__ZD4dAI*JC^9RyI=vodT1Ji$9G2O|0hE?iy` Tjm67e00000NkvXXu0mjfUhat$ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@3x.png b/Signal/Images.xcassets/image_editor_flip.imageset/flip-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9d82e6a1e214959705ca412abb38ac54fe3256e5 GIT binary patch literal 1148 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJ<{->y95KI&fq_NO z)5S5QV$R#S{{wG32(;#3W+-8J*}$hDyM$TepsWMu66Q;eml#VN*c=CDmgi2suYcL@OwumKLQ77?Ill7gX{Xrs_fNlf zM%#EgQ*-h*Mwb$0-+fJ+x9Crvk;5Q()b!s@kpqX=T;iNL#LxVhmdlvDm2vl_C)$?Y zzfIbAvMt&C-*v}=f6f;hPS~{+6t9L{8&Mwk5Yu+uv;C%R8Lq zE&+k;oCY>?fgN`dqnVa(Y|E%39 z-NAOip26_5^Dph2Qyv~SGifMki%pj{@R(d{yNh+Pbb?#cQZbuUX*T)C8yKv(wo5G$ z;}I=YmR8sssd45{M8?4l$+AKR6do>f-K8w0_R7uF;n#;`rnEY@u3hgKdBpOfmZ+w8 ztavSTAmiaOR?Syc<_wB=wm7)NZf6KMUo3cQIaaTt6vr(Yi>6W398r zUiPh6xgz@}!%OEgt0Wa)&0^Ug1XLMSG^=yhD~4-IceZ>HE7g_Sp!RUt(%CCkb0y>+ z^7Zx)48PrA%4Mz_>oV7>VJnca*Cp1Mx$oPd=tb=-f>{ex4*7PQ+{_AGo_pX`>+EUQ z7UdN(xPx4!8_;Rx%e+MVzKE{t-9-$2Av-cBzUvU{-nEo>f?ZF}q_9PKWeo0mK$YI- zlmgAQ8?c}}DRB$;+^_3lOf;P|vYgf#^+@Q;8uA3EDZqTq6$S_^>E`g!$ z;oSbPE27Ldb`)Gz+WKI@3T?IxsSlU6&U|cM{8wyV+#GL12JyVmI~?Lq7OfE8zb)v; za?WKDAGS^noMD^B{9AeMfk*a}HCQLuXK*|%cRxI_FFK}aPT>@$2{GG)+ijK?a?bj< zMBk=2TRr;E#6C;e?I$1m7FTM?Zm!@h_~1R^F=Gxh&g|>S@lfB^_sETZdkSX&ixUP< LS3j3^P6IEX=g1`CUhfiM#+zoj2>z+yWp-tfTmE60w&t8gU{!2Z40Z(Y6f0LFKyvU+>I#=55RpzmvXF002ovPDHLkV1m9cx9k7_ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_rotate.imageset/rotate-32@2x.png b/Signal/Images.xcassets/image_editor_rotate.imageset/rotate-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6db61ae4a8322c314fbf70583ecb50488ab31f2e GIT binary patch literal 868 zcmV-q1DpJbP)GRc~XV|?>xgdM0^vwCYd;aO9n=nmh`;_`aed#`#10oB2uMI3fPk)9 zPxt`#U6v`Wf;9f{z*Y2sqT39R|QH07v3#Jmqe|^TC@w?yHrUcjP~(%(j4`%Y zdZe#cMBE7_4cgGq8*=J_0wi|xnmbV5KBrZhny}aTHbduUmAk!nhep$xTn8x0#o|nL zc}wR)qNecLGgk%*je1Hr7-MYg|74=Cqt|Jy3{+c3O)pZl*e`ddzBpCA>kgV8Z>~|` zz<+r}Otz9kw$203G69rx0(cfZiL>#+ZBEPRH}KFLtqNTP@Yx!79K`{* zS$SCC3oWD9xd`CNFLc720&df%=HQ+)dYy}aO`s4UBA=wxT0YY+ntMaM5Rt=SaOr@_Av3?YlfFv6eJP~U%l}f;tPzVr`jiC@ABpX8^ zKu9)*LV%F`!-XA>PA^9Qw|R+W#6y95KI&fq`X- zr;B4q#hkZu-{#&n5NPXn{eNBhiu9Ga3tqClV>!uIYW9KS9osuL$%8i!%vAWq_Kig+ zVvb;=jn@*5mwn%C85$cFseFq2_}atxSQIyx{QN85_JpW67^b~|f?X!CMFR^+U{4?AU zB$>pzgZ*)H2;;k>KNJER_#W@SJL{w4EC$(Q|BJhiv3nj4NIt{IP{%HQ$&%6GG8a38 zMO60r;_0gFo=g_ae>wD~d~Qp6qk3&YwZMYj)vEdo8zvjo?=a7Q5uWqx-rNVrX0$6D zJ>#*8Q9DO#U&VC2A6K{SztLLkSn)FK$X?AoOb4z-RZHv-;j~~}!eX-MwaHrXm^*5! z^YgZ_Fr4$=<$m!``q3uu{R`$vCFzkCXs zxLvL3`yJblXCBBFUu{!(bj@{x{MJSO9gk&{SOmW-IeB+5e|%FmdCQ`Ad$}2(2{7LO zc;#cCrz?k&mhi!&x+|;M_9WlD80fF&BoH`}W3e>rbMcM)9@@Ch7jOwtI<)1iQ%uW6 z>u0aZjy>#=TvoQGbjPv(eLH2{wyTw0P&}lc{nlH+`iZQTgG}-nruLQh_qd3^`O|$} zsw6*yJ>!9?)SlkrUvD3kFI&v?rQtQ3w9?hb67Ok=iy-IBh%XfaOWO`hY`$?qr_z0?Y%GIG-I>HtXN@w|gw3y}Z(Vq4 zS<4zb1tXyskDll*^FJt5ZoMSPuE_A2htIiv{6+mK+kRdNf2XE>d!@J@Tg}qj9o)C4 zed832=E-Vn>WJtl*|AyYwy1>Gv&ZsxQf^eF*DSfzr^MiQe5HQ;nvcz=9Y3koIA&e{hvbS)a;|Zu-dTI)@s>3&9 zcI(Gkw^rK+#;v?~*Qn#AYB8fJdH&IuxCZ=1vUus(?OL;C*Z3avGNY^L`$ zxg}=sF0fK~`J-~)E#G-9W{zi8FrS1hYn-ocmj!szU|3xN}oo87BA z**<&7?r@o!SvIL(%ix&Fk$`u<=J&e%i`n}4%=XD!!(4=CU1ks1zqOP#yT>rv^X;0` z-KT}$#eM7LpSWp*!p9ALZ8Nr(8U9X`O`fFfu*U0p(+)M`Y>6((`UC%W2T89N`n~#1 zWrH?D*u(Tk)7ym#D{IOsr&&boxa$1-oP_zSg|)#8j)xg7-iI0-u%Pi{cp!f^^;W$7 TsvXyWg&2dUtDnm{r-UW|^#d#P literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_text.imageset/Contents.json b/Signal/Images.xcassets/image_editor_text.imageset/Contents.json new file mode 100644 index 000000000..c0ff55700 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_text.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "text-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "text-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "text-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_text.imageset/text-32@1x.png b/Signal/Images.xcassets/image_editor_text.imageset/text-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..a28f50dd79943a4421cc2a080163f2f7d21e6338 GIT binary patch literal 491 zcmVJNR9J=WSJ7>RFbuV;`!5@m5!j%NzzB@M2p!=@V1$go24w`g z0i7UKs+T+CIB?PlQK?w60?u>%;yAv8z4vsayc`<+-xD|q{0Rb=!~$XFl89Pq^WJ|X zz-J}&0ZWM}1Pc!n#-OEzeMZ-gpuy;f=u6r5%|O_x*mXrjS3D0Eevb^)7{9&uV+f4* zcV;dU^bQ$t*l{mxF(a+zBXFU1Mu8u2bQPW#S+o`?tYCta%LFb|V6E{O{T6{nI2OX* z!Zv3JIN{etU#ur@(k6l4DmYb`jhd^htf}nGj}nN$&X|iSzAAgn&S+&v^_2yI#Vugw zu#;E34wOo?>3&dR921YbSnDONShn6zW=hyU7<553FrUsl<0}{|#0Arz65G{==?>Bsw*IR&wwMO$mqmun&LeS002ovPDHLkV1jC{)b9WQ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_text.imageset/text-32@2x.png b/Signal/Images.xcassets/image_editor_text.imageset/text-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..26ea5757ac6ed831f132f248c674158018640d75 GIT binary patch literal 989 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km-ofq}W- z)5S5QV$R#>w-coddA1t;C^y;D|DQm};CYXOTDhw22r9bB7UHk2GF-4OENjM}Z) zu2r9oKRc0guFm*hJGk`DvNcW-Jiuqm@iG7S-tXei@A!Yb`{uC1cNUNKxSJmtjd<*A z7(d-OeZJpiOVH{w9P@*H6W!&U`KsSXEA6s+F4nZAIm&=prYd@0{SsdLImO5CiS6rQ zkKV34xBL4)j`BD45}uNK7RdMVolOopR;9jV`i|#ahfk^Z*oj=X$=Cf7y`|2+$jL#j zUh+M2iiC~u#h^^r13!=5wEQk|t;V_DvfliYh;)bO2bF0LICG3k%ssA4J>Wcb@smaK zd#i$|v%(8lGCo|MF1>bw-fQo}eIES0Y8#k;mv)p~yU%>LT=jv5n2qw@iTjK=UM^(( zCN*z|=Z_ax6dv7cW!U*a?q%;6=>(VNl7ma9=h)21pDS0~`$F}^`UR~5?5}Iz*UB@k zciI!$CH0AEx7s=BZ*S+`U#ZXJQOWJWyzWf`Pw*zEsTrL<#$0vxy+8Rb5m4x!|KKwJ z3tN?x)=d?&ZbcsQv&t-`S?+NAqSJGSmAKDl)gQeh?*5wPV6P_kb7GC__O@rlK=;`yTLdBFG#I>mj zd%FbZddy32V=(w~`^e(k`)}>*v(v9S{_9@jr9Z*9`<-))Kl)CXW3%##K|pV6XvxHo zUkNYXIs|TZ*>%kz$2>Su^?@s2aJQt1!{jGPFBV2AY@f8J!E_Vngl?aAuPW~N8g(l# zmTFOVJCogTH@_uX-IKdOb@{6gK1>0VQ_^3ob2!1H`cdkIzT=ApZYO6RPL@=5(0i7= zwL*#WlE&uc2_^~0zB^eiSuX%g>Q6$dlVJ*7I#iNex%1)>_$R{1s@jM?yW zqN77u#z&dcf+a_!A98cGN;BpC(`WegvM>MPnpt<41m7MFUptZiPJ{3w-XF0KPO;2g yv(Nr~?hJva{(ld*OcH7HYQRTq;w(7#muXkik{fkBa}EOYD}$%2pUXO@geCyBrnmzD literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_text.imageset/text-32@3x.png b/Signal/Images.xcassets/image_editor_text.imageset/text-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc8902f1e888845a413021068f31162a497e748 GIT binary patch literal 1550 zcmbW1`#;kQ7{|XGleypGh^hC83f0f45(Pk~ImOJe{4(uq25?-^Chd&tXGJ1mzv!`&gny#xG(6JFHy zR=(IM=^gv1$TIw{mZgfZCKEC{B^LW*&2C~%+(aubZcUc3UfgCBpq0QJwXd#)SXBNTC=%v&yDRtdL5gL2 z`M1=iBjEin1^6Hc)c}CX)t1&qh=v|}dC0AAo@GE4wL{=W-&~{Dy8ik2)R07fk(EDX{TLP7>_s znD(^D+rAHh4pJrx6QRfIeXwpmue1cQLw5Q%J+CXxPOJ}XWt&IsxO;H4D-Kz53I;NU zW>7~mR1^DEUf=E?E`QcouSvldr0TIA5de~rIPnlEMyD#$d&RS&A!2Y_H}hOIomb#M ze)8xnFh{o4fvGUo)^K?yjI#j$RwRB`8#)~Qk49bZ&gh&XEGBx1t0GTgBkrXpKlB(1 z;;>3l$UZd+A>!i|gx3h0VEx{5Bd=2*qnH8kou~ana&B&6g%Xy!|TXIfuZ6n*o_DQfK9r+{^ zwiEuDQK8-zfap*jGg%LRWY(5#PS}%@sehq77BYVlaRW=KoHo91+YTwK?B%B!S6_{p z(boSmb-lB5-*+_cM5c&- zAH(d%i$N{c`y`0_ZFOOxW*Ju9V0S(i>9BA&xdEei)vFG@+>7)|Xqr@Fq7&x6RL`cZ zSy$PEV@og{QXZVQ9y$Oij&i?2QN|AwFOJm}pLLkcESEPwHP^aVMMFVmPqPwOyIsIc)-)lbZk^YL#!iN zd2#Y%j`QJxXQG;QeG#Airxshg?)+WyHYW^5e>}75IdZyfbbJUB;MIZSlMd?ZZQpg^ zE*)5^@iEWmf69MpP<%wInmKx}qU-S!0!rYTAr{}2K6uG5BJCQq@6+tyxbM@nT@=0h z6!Wjk8)^ggucEh8gx5>k)y%@^?*fvTlb5v2RyBvu&=y-Y^qmwUzG9m?SB9;W;KNMf z2Yj%42(%WbA<^$oUUt3$5VtM6Yz0m+Ii4MShRmPS{hlHpm=!D2+AT`1_xCSMGbP;l zBr2Gq6o(F-@X4pjaSvnc6y#S$*p0((HAWY8!Oc-bZeBKnAlu}sP`Ec?JDwgqF3;Qj zOpZ1|qFv2+#arX8iyJKTO!=>PLD4~7M(IXBS0 jXRiq;ANGrw39Bp{ottHyz6pCFeDDCu(e-!}(*O4VcLwEb literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_undo.imageset/Contents.json b/Signal/Images.xcassets/image_editor_undo.imageset/Contents.json new file mode 100644 index 000000000..d32e57835 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_undo.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "undo-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "undo-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "undo-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_undo.imageset/undo-32@1x.png b/Signal/Images.xcassets/image_editor_undo.imageset/undo-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ec13abd676e9fd7520dc560fd6b12da86e4cb6 GIT binary patch literal 446 zcmV;v0YUzWP)8eUWu8}(r%i5{VxEx%_3q%0@Swq~9Kmis0EgS`8X4FD#IulXdoJ8Rt37fDD&zTpXgpOLS^oiv^OOeLK6pa9Iq zIy)9pP7b8`dXbVpA&sf&I}zR1-j8zth3%IEcJ1kY}z9 zD%=CT(iWMX$T}p#;$(Fyc^zi~)%mE9_g2oD|5%X7AmeXKvWvTbhzh($07*qoM6N<$g8L}Im;e9( literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_undo.imageset/undo-32@2x.png b/Signal/Images.xcassets/image_editor_undo.imageset/undo-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..13a8413098012e6c1257813dc6677ea0f3d5ce7e GIT binary patch literal 808 zcmV+@1K0eCP)eJOLk-rUQt$ zy;%@Z6Ssc<82lMT#J>fI2$g}hUju+6Z6oB9GW>@N0K5W#Bex-N001}I=LDS&iF@|iYS&mv76OQPCZ%T zR@MoCh&v7o`O^I{xIT-Om>A5*WLB@>7qB0SgF_uh5f%^h{7pl)) z)8*VYMEp_ry+R=?0yyS>2~}AHFyut&3vb8-ks|^AXLqYC1hON5UwRjzDvJO{E3S(R z0q_Wj?JQ+WK<}O8;txhD0ZNl0Vsn8a2#Bo;YX~S!9tgU8DFkf9^+nwkD1m@r{5xbv z0B?xO*a7eB=jAU8o?VxK^VtO(!<&o`m!JSEC~Pp}*Uc=Y9t@Kc`zih3}j zGGGXvFnQHlYbZ~16?wv3P^j>navXT>rp z>N+(~XJi|8M&}2&Ln(SzzBiI0?lMJ2DJGK8WS=C}gM_@(*q|y|I mN`TT7hDw0a6o#@10D#{s@HSv0TIy;50000jD9kfdI-t0A(P6 zG7vx+2%roEPzC}h^SRXNiD=u&T3c(^-iB$%o)}|Xni^wny$$~7XpGq#V-D8ZgZJym zC?hv$fV9y$v;SV?ia7J5(pFLXXRL^}-nQ zC>*DBdgOE6N@Z!CR0UwOvSzbUyW*wf&OMdN)+(tuVQ15c$X)y&W6ZrV=EmEo4es2} z&VLcnOrroLeZU}W-&e+%pAoygoZ0Y`gYDzws82p5L|o@*eiPA#TW&k&UC{(Rbbg;l zn3|KFo=E44EZ5}Bzl5CMZL^e)RU=gwfbYf-=en=$9M7EnRycn*ZCf~MFQcFUOEv*} z;kWbTE_5axv+9MvmTfJRr`sB;I%zMXpa83ZChvr4UhzV?rvWWuA?-VM0WPJcHa4RC z%YhrFiU?jtWdZgj9BV}pCIcq3xCmZGMFG}h>3s%VOP_BjDniSSn7g|UL}YuCN@u8x zwbnf;{qTNxvD zpr;jliCuMp7LWk9f}ODE+{+mN0;D4?I*S$nCMXde3pxn>f+#bD7LW*6vb6dy>TwhT zk00hX# zGeH4w@w@>6lz{-sKmcVRfHDw383>>Z1W*P7ySeByCT&VmfEKO{O z^iqbjOr;l?paifuS08C9`X(hF9a=ynJ$FA|&}hViaGG7}+no>~0)8)83Zp5#ycYya zP$0ElQ-uJ5)Ot}HCMW<7vDvMBQzF7*6#-l~-Q6)nlx!Qv0ue1ZzGxTccqNA%hZIC8 zGuY8>C+bwScxw#;H!XyKO{cJHMS@Rx8HFqVEr6f2{X4CETQZWOmyucMnNZlbkY&<7 zBdz>qA%XtSx{IixsUBF;^((bp&pe5?|awxFB^Qt}b-(r4$jo zdyC-Rb%hwRvFGW-gs*Qp7Q_?T4;Oltml*nh!?CkGFy#XdC*JP|91`xz79Z>hO==GW zUWS4YANnIcqZp26(=_Mw-P@onPu%(*$M8+D(ai^x{E!JPcSiwT)){*)nR#FW8| zm@*JR83>>Z1W*P7C<6hMfdI-t0A(P6CdQb5gw$v=9+Arq00000NkvXXu0mjf<$E1_ literal 0 HcmV?d00001 diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 51ee588c1..1980d8c09 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -82,26 +82,32 @@ class ImageEditorCropViewController: OWSViewController { self.view = UIView() self.view.backgroundColor = .black + self.view.layoutMargins = .zero // MARK: - Buttons // TODO: Apply icons. - let doneButton = OWSButton(title: "Done") { [weak self] in + let doneButton = OWSButton(imageName: "image_editor_checkmark_full", + tintColor: UIColor.white) { [weak self] in self?.didTapBackButton() } - let rotate90Button = OWSButton(title: "Rotate 90°") { [weak self] in + let rotate90Button = OWSButton(imageName: "image_editor_rotate", + tintColor: UIColor.white) { [weak self] in self?.rotate90ButtonPressed() } let rotate45Button = OWSButton(title: "Rotate 45°") { [weak self] in self?.rotate45ButtonPressed() } - let resetButton = OWSButton(title: "Reset") { [weak self] in + // TODO: Myles may change this asset. + let resetButton = OWSButton(imageName: "image_editor_undo", + tintColor: UIColor.white) { [weak self] in self?.resetButtonPressed() } let zoom2xButton = OWSButton(title: "Zoom 2x") { [weak self] in self?.zoom2xButtonPressed() } - let flipButton = OWSButton(title: "Flip") { [weak self] in + let flipButton = OWSButton(imageName: "image_editor_flip", + tintColor: UIColor.white) { [weak self] in self?.flipButtonPressed() } @@ -171,7 +177,7 @@ class ImageEditorCropViewController: OWSViewController { stackView.axis = .vertical stackView.alignment = .fill stackView.spacing = 24 - stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + stackView.layoutMargins = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) stackView.isLayoutMarginsRelativeArrangement = true self.view.addSubview(stackView) stackView.autoPinEdgesToSuperviewEdges() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index d75b5ddb2..b026f5540 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -129,8 +129,8 @@ public class ImageEditorView: UIView { } } + // The model supports redo if we ever want to add it. private let undoButton = UIButton(type: .custom) - private let redoButton = UIButton(type: .custom) private let brushButton = UIButton(type: .custom) private let cropButton = UIButton(type: .custom) private let newTextButton = UIButton(type: .custom) @@ -140,26 +140,22 @@ public class ImageEditorView: UIView { @objc public func addControls(to containerView: UIView) { configure(button: undoButton, - label: NSLocalizedString("BUTTON_UNDO", comment: "Label for undo button."), + imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) - configure(button: redoButton, - label: NSLocalizedString("BUTTON_REDO", comment: "Label for redo button."), - selector: #selector(didTapRedo(sender:))) - configure(button: brushButton, - label: NSLocalizedString("IMAGE_EDITOR_BRUSH_BUTTON", comment: "Label for brush button in image editor."), + imageName: "image_editor_brush", selector: #selector(didTapBrush(sender:))) configure(button: cropButton, - label: NSLocalizedString("IMAGE_EDITOR_CROP_BUTTON", comment: "Label for crop button in image editor."), + imageName: "image_editor_crop", selector: #selector(didTapCrop(sender:))) configure(button: newTextButton, - label: "Text", + imageName: "image_editor_text", selector: #selector(didTapNewText(sender:))) - allButtons = [brushButton, cropButton, undoButton, redoButton, newTextButton] + allButtons = [brushButton, cropButton, undoButton, newTextButton] let stackView = UIStackView(arrangedSubviews: allButtons) stackView.axis = .vertical @@ -178,19 +174,26 @@ public class ImageEditorView: UIView { } private func configure(button: UIButton, - label: String, + imageName: String, selector: Selector) { - button.setTitle(label, for: .normal) + if let image = UIImage(named: imageName) { + button.setImage(image.withRenderingMode(.alwaysTemplate), for: .normal) + } else { + owsFailDebug("Missing asset: \(imageName)") + } + button.tintColor = .white button.setTitleColor(.white, for: .normal) button.setTitleColor(.gray, for: .disabled) button.setTitleColor(UIColor.ows_materialBlue, for: .selected) button.titleLabel?.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight() button.addTarget(self, action: selector, for: .touchUpInside) + button.layer.shadowColor = UIColor.black.cgColor + button.layer.shadowRadius = 4 + button.layer.shadowOpacity = 0.66 } private func updateButtons() { undoButton.isEnabled = model.canUndo() - redoButton.isEnabled = model.canRedo() brushButton.isSelected = editorMode == .brush cropButton.isSelected = false newTextButton.isSelected = false @@ -211,15 +214,6 @@ public class ImageEditorView: UIView { model.undo() } - @objc func didTapRedo(sender: UIButton) { - Logger.verbose("") - guard model.canRedo() else { - owsFailDebug("Can't redo.") - return - } - model.redo() - } - @objc func didTapBrush(sender: UIButton) { Logger.verbose("") diff --git a/SignalMessaging/Views/OWSButton.swift b/SignalMessaging/Views/OWSButton.swift index 03ffdf0a0..f9726b583 100644 --- a/SignalMessaging/Views/OWSButton.swift +++ b/SignalMessaging/Views/OWSButton.swift @@ -29,6 +29,23 @@ public class OWSButton: UIButton { setTitle(title, for: .normal) } + @objc + init(imageName: String, + tintColor: UIColor, + block: @escaping () -> Void = { }) { + super.init(frame: .zero) + + self.block = block + addTarget(self, action: #selector(didTap), for: .touchUpInside) + + if let image = UIImage(named: imageName) { + setImage(image.withRenderingMode(.alwaysTemplate), for: .normal) + } else { + owsFailDebug("Missing asset: \(imageName)") + } + self.tintColor = tintColor + } + public required init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } From fac123eeb2b9f74cc7c1e16a28b3aa8197ab7779 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Feb 2019 14:40:12 -0500 Subject: [PATCH 172/493] Add "crop lock" button and feature. --- .../ImageEditorCropViewController.swift | 103 +++++++++++++----- SignalMessaging/Views/OWSButton.swift | 7 +- 2 files changed, 81 insertions(+), 29 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 1980d8c09..b40b231c8 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -78,6 +78,9 @@ class ImageEditorCropViewController: OWSViewController { // MARK: - View Lifecycle + private var isCropLocked = false + private var cropLockButton: OWSButton? + override func loadView() { self.view = UIView() @@ -95,21 +98,20 @@ class ImageEditorCropViewController: OWSViewController { tintColor: UIColor.white) { [weak self] in self?.rotate90ButtonPressed() } - let rotate45Button = OWSButton(title: "Rotate 45°") { [weak self] in - self?.rotate45ButtonPressed() - } // TODO: Myles may change this asset. let resetButton = OWSButton(imageName: "image_editor_undo", tintColor: UIColor.white) { [weak self] in self?.resetButtonPressed() } - let zoom2xButton = OWSButton(title: "Zoom 2x") { [weak self] in - self?.zoom2xButtonPressed() - } let flipButton = OWSButton(imageName: "image_editor_flip", tintColor: UIColor.white) { [weak self] in - self?.flipButtonPressed() + self?.flipButtonPressed() } + let cropLockButton = OWSButton(imageName: "image_editor_crop_unlock", + tintColor: UIColor.white) { [weak self] in + self?.cropLockButtonPressed() + } + self.cropLockButton = cropLockButton // MARK: - Header @@ -158,17 +160,17 @@ class ImageEditorCropViewController: OWSViewController { // MARK: - Footer let footer = UIStackView(arrangedSubviews: [ - flipButton, rotate90Button, - rotate45Button, + flipButton, UIView.hStretchingSpacer(), - zoom2xButton + cropLockButton ]) footer.axis = .horizontal footer.spacing = 16 footer.backgroundColor = .clear footer.isOpaque = false + let imageMargin: CGFloat = 20 let stackView = UIStackView(arrangedSubviews: [ header, wrapperView, @@ -176,8 +178,8 @@ class ImageEditorCropViewController: OWSViewController { ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.spacing = 24 - stackView.layoutMargins = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) + stackView.spacing = imageMargin + stackView.layoutMargins = UIEdgeInsets(top: 8, left: imageMargin, bottom: 8, right: imageMargin) stackView.isLayoutMarginsRelativeArrangement = true self.view.addSubview(stackView) stackView.autoPinEdgesToSuperviewEdges() @@ -217,6 +219,16 @@ class ImageEditorCropViewController: OWSViewController { configureGestures() } + private func updateCropLockButton() { + guard let cropLockButton = cropLockButton else { + owsFailDebug("Missing cropLockButton") + return + } + cropLockButton.setImage(imageName: (isCropLocked + ? "image_editor_crop_lock" + : "image_editor_crop_unlock")) + } + private static let desiredCornerSize: CGFloat = 24 private static let minCropSize: CGFloat = desiredCornerSize * 2 private var cornerSize = CGSize.zero @@ -506,6 +518,14 @@ class ImageEditorCropViewController: OWSViewController { let cropRectangleStart = clipView.bounds var cropRectangleNow = cropRectangleStart + // Derive the new crop rectangle. + + // We limit the crop rectangle's minimum size for two reasons. + // + // * To ensure that the crop rectangles "corner handles" + // can always be safely drawn. + // * To avoid awkward interactions when the crop rectangle + // is very small. Users can always crop multiple times. let maxDeltaX = cropRectangleNow.size.width - cornerSize.width * 2 let maxDeltaY = cropRectangleNow.size.height - cornerSize.height * 2 @@ -533,6 +553,44 @@ class ImageEditorCropViewController: OWSViewController { break } + // If crop is locked, update the crop rectangle + // to retain the original aspect ratio. + if (isCropLocked) { + let scaleX = cropRectangleNow.width / cropRectangleStart.width + let scaleY = cropRectangleNow.height / cropRectangleStart.height + var cropRectangleLocked = cropRectangleStart + // Find a new crop rectangle size with the correct aspect + // ratio which is always larger than the "naive" crop rectangle. + // We always expand and never shrink the crop rectangle to + // fix its aspect ratio, to ensure the "max deltas" enforced + // above still are honored. + if scaleX > scaleY { + cropRectangleLocked.size.width = cropRectangleNow.width + cropRectangleLocked.size.height = cropRectangleNow.width * cropRectangleStart.height / cropRectangleStart.width + } else { + cropRectangleLocked.size.height = cropRectangleNow.height + cropRectangleLocked.size.width = cropRectangleNow.height * cropRectangleStart.width / cropRectangleStart.height + } + + // Pin the crop rectangle to the sides that aren't being manipulated. + switch panCropRegion { + case .left, .topLeft, .bottomLeft: + cropRectangleLocked.origin.x = cropRectangleStart.maxX - cropRectangleLocked.width + default: + // Bias towards aligning left. + cropRectangleLocked.origin.x = cropRectangleStart.minX + } + switch panCropRegion { + case .top, .topLeft, .topRight: + cropRectangleLocked.origin.y = cropRectangleStart.maxY - cropRectangleLocked.height + default: + // Bias towards aligning top. + cropRectangleLocked.origin.y = cropRectangleStart.minY + } + + cropRectangleNow = cropRectangleLocked + } + cropView.frame = view.convert(cropRectangleNow, from: clipView) switch gestureRecognizer.state { @@ -689,10 +747,6 @@ class ImageEditorCropViewController: OWSViewController { rotateButtonPressed(angleRadians: CGFloat.pi * 0.5, rotateCanvas: true) } - @objc public func rotate45ButtonPressed() { - rotateButtonPressed(angleRadians: CGFloat.pi * 0.25, rotateCanvas: false) - } - private func rotateButtonPressed(angleRadians: CGFloat, rotateCanvas: Bool) { let outputSizePixels = (rotateCanvas // Invert width and height. @@ -709,18 +763,6 @@ class ImageEditorCropViewController: OWSViewController { isFlipped: transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } - @objc public func zoom2xButtonPressed() { - let outputSizePixels = transform.outputSizePixels - let unitTranslation = transform.unitTranslation - let rotationRadians = transform.rotationRadians - let scaling = transform.scaling * 2.0 - updateTransform(ImageEditorTransform(outputSizePixels: outputSizePixels, - unitTranslation: unitTranslation, - rotationRadians: rotationRadians, - scaling: scaling, - isFlipped: transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) - } - @objc public func flipButtonPressed() { updateTransform(ImageEditorTransform(outputSizePixels: transform.outputSizePixels, unitTranslation: transform.unitTranslation, @@ -732,6 +774,11 @@ class ImageEditorCropViewController: OWSViewController { @objc public func resetButtonPressed() { updateTransform(ImageEditorTransform.defaultTransform(srcImageSizePixels: model.srcImageSizePixels)) } + + @objc public func cropLockButtonPressed() { + isCropLocked = !isCropLocked + updateCropLockButton() + } } // MARK: - diff --git a/SignalMessaging/Views/OWSButton.swift b/SignalMessaging/Views/OWSButton.swift index f9726b583..7985be1dd 100644 --- a/SignalMessaging/Views/OWSButton.swift +++ b/SignalMessaging/Views/OWSButton.swift @@ -38,12 +38,17 @@ public class OWSButton: UIButton { self.block = block addTarget(self, action: #selector(didTap), for: .touchUpInside) + setImage(imageName: imageName) + self.tintColor = tintColor + } + + @objc + public func setImage(imageName: String) { if let image = UIImage(named: imageName) { setImage(image.withRenderingMode(.alwaysTemplate), for: .normal) } else { owsFailDebug("Missing asset: \(imageName)") } - self.tintColor = tintColor } public required init?(coder aDecoder: NSCoder) { From d08445969d8a2d0d251c77659722a22a2827eb16 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Feb 2019 14:58:26 -0500 Subject: [PATCH 173/493] Generate gradient for color picker. --- .../Contents.json | 21 --------- .../Screen Shot 2019-02-26 at 1.57.23 PM.png | Bin 15805 -> 0 bytes .../ImageEditor/ImageEditorPaletteView.swift | 43 ++++++++++++++---- 3 files changed, 35 insertions(+), 29 deletions(-) delete mode 100644 Signal/Images.xcassets/image_editor_palette.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png diff --git a/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json b/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json deleted file mode 100644 index bf932ac9b..000000000 --- a/Signal/Images.xcassets/image_editor_palette.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "Screen Shot 2019-02-26 at 1.57.23 PM.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png b/Signal/Images.xcassets/image_editor_palette.imageset/Screen Shot 2019-02-26 at 1.57.23 PM.png deleted file mode 100644 index 4b8e2e2bccdb87b8a80d807098152ff6afec8d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15805 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 IHU9Ab0UT6sFaQ7m diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 73d3d442e..1d4889198 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -39,8 +39,10 @@ public class ImageEditorPaletteView: UIView { self.backgroundColor = .clear self.isOpaque = false - if let image = UIImage(named: "image_editor_palette") { + if let image = ImageEditorPaletteView.buildPaletteGradientImage() { imageView.image = image + imageView.layer.cornerRadius = image.size.width * 0.5 + imageView.clipsToBounds = true } else { owsFailDebug("Missing image.") } @@ -48,8 +50,6 @@ public class ImageEditorPaletteView: UIView { // We use an invisible margin to expand the hot area of // this control. let margin: CGFloat = 8 - // TODO: Review sizing when there's an asset. - imageView.autoSetDimensions(to: CGSize(width: 8, height: 200)) imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) selectionWrapper.layoutCallback = { [weak self] (view) in @@ -58,8 +58,8 @@ public class ImageEditorPaletteView: UIView { } strongSelf.updateState() } - imageView.addSubview(selectionWrapper) - selectionWrapper.autoPinEdgesToSuperviewEdges() + self.addSubview(selectionWrapper) + selectionWrapper.autoPin(toEdgesOf: imageView) selectionView.addBorder(with: .white) selectionView.layer.cornerRadius = selectionSize / 2 @@ -95,9 +95,8 @@ public class ImageEditorPaletteView: UIView { private func updateState() { var selectedColor = UIColor.white - if let image = imageView.image, - let cgImage = image.cgImage { - if let imageColor = image.color(atLocation: CGPoint(x: CGFloat(cgImage.width) * 0.5, y: CGFloat(cgImage.height) * selectionAlpha)) { + if let image = imageView.image { + if let imageColor = image.color(atLocation: CGPoint(x: CGFloat(image.size.width) * 0.5, y: CGFloat(image.size.height) * selectionAlpha)) { selectedColor = imageColor } else { owsFailDebug("Couldn't determine image color.") @@ -132,6 +131,31 @@ public class ImageEditorPaletteView: UIView { let location = gesture.location(in: imageView) selectColor(atLocationY: location.y) } + + private static func buildPaletteGradientImage() -> UIImage? { + let gradientSize = CGSize(width: 8, height: 200) + let gradientBounds = CGRect(origin: .zero, size: gradientSize) + let gradientView = UIView() + gradientView.frame = gradientBounds + let gradientLayer = CAGradientLayer() + gradientView.layer.addSublayer(gradientLayer) + gradientLayer.frame = gradientBounds + gradientLayer.colors = [ + UIColor(rgbHex: 0xffffff).cgColor, + UIColor(rgbHex: 0xff0000).cgColor, + UIColor(rgbHex: 0xff00ff).cgColor, + UIColor(rgbHex: 0x0000ff).cgColor, + UIColor(rgbHex: 0x00ffff).cgColor, + UIColor(rgbHex: 0x00ff00).cgColor, + UIColor(rgbHex: 0xffff00).cgColor, + UIColor(rgbHex: 0xff5500).cgColor, + UIColor(rgbHex: 0x000000).cgColor + ] + gradientLayer.startPoint = CGPoint.zero + gradientLayer.endPoint = CGPoint(x: 0, y: gradientSize.height) + gradientLayer.endPoint = CGPoint(x: 0, y: 1.0) + return gradientView.renderAsImage(opaque: true, scale: UIScreen.main.scale) + } } // MARK: - @@ -162,6 +186,9 @@ extension UIImage { owsFailDebug("Invalid image size.") return nil } + + Logger.verbose("scale: \(self.scale)") + // Convert the location from points to pixels and clamp to the image bounds. let xPixels: Int = Int(round(locationPoints.x * self.scale)).clamp(0, imageWidth - 1) let yPixels: Int = Int(round(locationPoints.y * self.scale)).clamp(0, imageHeight - 1) From be26c135e1c33111d4a43dd4dd9540e5d5d58d5c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Feb 2019 15:32:09 -0500 Subject: [PATCH 174/493] Rework image editor buttons, modes, etc. --- .../AttachmentApprovalViewController.swift | 3 +- .../ImageEditor/ImageEditorPaletteView.swift | 1 + .../Views/ImageEditor/ImageEditorView.swift | 121 +++++++++++------- 3 files changed, 78 insertions(+), 47 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 398c3e2c3..53b149cc9 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -953,7 +953,8 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD autoPinView(toBottomOfViewControllerOrKeyboard: imageEditorView, avoidNotch: true) imageEditorView.autoPinWidthToSuperview() - imageEditorView.addControls(to: imageEditorView) + imageEditorView.addControls(to: imageEditorView, + viewController: self) } } #endif diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 1d4889198..1f35fe06d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -140,6 +140,7 @@ public class ImageEditorPaletteView: UIView { let gradientLayer = CAGradientLayer() gradientView.layer.addSublayer(gradientLayer) gradientLayer.frame = gradientBounds + // See: https://github.com/signalapp/Signal-Android/blob/master/res/values/arrays.xml#L267 gradientLayer.colors = [ UIColor(rgbHex: 0xffffff).cgColor, UIColor(rgbHex: 0xff0000).cgColor, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index b026f5540..4f6234503 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -29,12 +29,14 @@ public class ImageEditorView: UIView { // This is the default mode. It is used for interacting with text items. case none case brush + case text } private var editorMode = EditorMode.none { didSet { AssertIsOnMainThread() + updateButtons() updateGestureState() } } @@ -130,15 +132,18 @@ public class ImageEditorView: UIView { } // The model supports redo if we ever want to add it. - private let undoButton = UIButton(type: .custom) - private let brushButton = UIButton(type: .custom) - private let cropButton = UIButton(type: .custom) - private let newTextButton = UIButton(type: .custom) - private var allButtons = [UIButton]() + private let undoButton = OWSButton() + private let brushButton = OWSButton() + private let cropButton = OWSButton() + private let newTextButton = OWSButton() + private let captionButton = OWSButton() + private let doneButton = OWSButton() + private let buttonStackView = UIStackView() // TODO: Should this method be private? @objc - public func addControls(to containerView: UIView) { + public func addControls(to containerView: UIView, + viewController: UIViewController) { configure(button: undoButton, imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) @@ -155,16 +160,21 @@ public class ImageEditorView: UIView { imageName: "image_editor_text", selector: #selector(didTapNewText(sender:))) - allButtons = [brushButton, cropButton, undoButton, newTextButton] + configure(button: captionButton, + imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) - let stackView = UIStackView(arrangedSubviews: allButtons) - stackView.axis = .vertical - stackView.alignment = .center - stackView.spacing = 10 + configure(button: doneButton, + imageName: "image_editor_checkmark_full", + selector: #selector(didTapDone(sender:))) - containerView.addSubview(stackView) - stackView.autoAlignAxis(toSuperviewAxis: .horizontal) - stackView.autoPinTrailingToSuperviewMargin(withInset: 10) + buttonStackView.axis = .horizontal + buttonStackView.alignment = .center + buttonStackView.spacing = 20 + + containerView.addSubview(buttonStackView) + buttonStackView.autoPin(toTopLayoutGuideOf: viewController, withInset: 0) + buttonStackView.autoPinTrailingToSuperviewMargin(withInset: 18) containerView.addSubview(paletteView) paletteView.autoVCenterInSuperview() @@ -182,10 +192,6 @@ public class ImageEditorView: UIView { owsFailDebug("Missing asset: \(imageName)") } button.tintColor = .white - button.setTitleColor(.white, for: .normal) - button.setTitleColor(.gray, for: .disabled) - button.setTitleColor(UIColor.ows_materialBlue, for: .selected) - button.titleLabel?.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight() button.addTarget(self, action: selector, for: .touchUpInside) button.layer.shadowColor = UIColor.black.cgColor button.layer.shadowRadius = 4 @@ -193,14 +199,39 @@ public class ImageEditorView: UIView { } private func updateButtons() { - undoButton.isEnabled = model.canUndo() - brushButton.isSelected = editorMode == .brush - cropButton.isSelected = false - newTextButton.isSelected = false + var buttons = [OWSButton]() - for button in allButtons { - button.isHidden = isEditingTextItem + var hasPalette = false + switch editorMode { + case .text: + // TODO: + hasPalette = true + break + case .brush: + hasPalette = true + + if model.canUndo() { + buttons = [undoButton, doneButton] + } else { + buttons = [doneButton] + } + case .none: + if model.canUndo() { + buttons = [undoButton, newTextButton, brushButton, cropButton, captionButton] + } else { + buttons = [newTextButton, brushButton, cropButton, captionButton] + } } + + for subview in buttonStackView.subviews { + subview.removeFromSuperview() + } + buttonStackView.addArrangedSubview(UIView.hStretchingSpacer()) + for button in buttons { + buttonStackView.addArrangedSubview(button) + } + + paletteView.isHidden = !hasPalette } // MARK: - Actions @@ -217,7 +248,7 @@ public class ImageEditorView: UIView { @objc func didTapBrush(sender: UIButton) { Logger.verbose("") - toggle(editorMode: .brush) + self.editorMode = .brush } @objc func didTapCrop(sender: UIButton) { @@ -244,13 +275,16 @@ public class ImageEditorView: UIView { edit(textItem: textItem) } - func toggle(editorMode: EditorMode) { - if self.editorMode == editorMode { - self.editorMode = .none - } else { - self.editorMode = editorMode - } - updateButtons() + @objc func didTapCaption(sender: UIButton) { + Logger.verbose("") + + // TODO: + } + + @objc func didTapDone(sender: UIButton) { + Logger.verbose("") + + self.editorMode = .none } // MARK: - Gestures @@ -270,6 +304,11 @@ public class ImageEditorView: UIView { brushGestureRecognizer?.isEnabled = true tapGestureRecognizer?.isEnabled = false pinchGestureRecognizer?.isEnabled = false + case .text: + moveTextGestureRecognizer?.isEnabled = false + brushGestureRecognizer?.isEnabled = false + tapGestureRecognizer?.isEnabled = false + pinchGestureRecognizer?.isEnabled = false } } @@ -537,20 +576,10 @@ public class ImageEditorView: UIView { // MARK: - Edit Text Tool - private var isEditingTextItem = false { - didSet { - AssertIsOnMainThread() - - updateButtons() - } - } - private func edit(textItem: ImageEditorTextItem) { Logger.verbose("") - toggle(editorMode: .none) - - isEditingTextItem = true + self.editorMode = .text // TODO: let maxTextWidthPoints = model.srcImageSizePixels.width * ImageEditorTextItem.kDefaultUnitWidth @@ -566,7 +595,7 @@ public class ImageEditorView: UIView { private func presentCropTool() { Logger.verbose("") - toggle(editorMode: .none) + self.editorMode = .none guard let srcImage = canvasView.loadSrcImage() else { owsFailDebug("Couldn't load src image.") @@ -628,7 +657,7 @@ extension ImageEditorView: ImageEditorTextViewControllerDelegate { public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) { AssertIsOnMainThread() - isEditingTextItem = false + self.editorMode = .none guard let text = text?.ows_stripped(), text.count > 0 else { @@ -648,7 +677,7 @@ extension ImageEditorView: ImageEditorTextViewControllerDelegate { } public func textEditDidCancel() { - isEditingTextItem = false + self.editorMode = .none } } From 71dd4eb151c7d355d8fa2a54bf4def365b749aef Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Feb 2019 09:49:26 -0700 Subject: [PATCH 175/493] in-conversation search - use MediaTime for computing benchmarks --- Signal.xcodeproj/project.pbxproj | 12 +- .../ic_chevron_down.imageset/Contents.json | 23 ++ .../chevron-down-24@1x.png | Bin 0 -> 234 bytes .../chevron-down-24@2x.png | Bin 0 -> 359 bytes .../chevron-down-24@3x.png | Bin 0 -> 521 bytes .../ic_chevron_up.imageset/Contents.json | 23 ++ .../chevron-up-24@1x.png | Bin 0 -> 235 bytes .../chevron-up-24@2x.png | Bin 0 -> 351 bytes .../chevron-up-24@3x.png | Bin 0 -> 516 bytes Signal/src/ConversationSearch.swift | 289 ++++++++++++++++++ .../Cells/OWSMessageBubbleView.h | 2 + .../Cells/OWSMessageBubbleView.m | 26 +- .../ConversationMessageMapping.swift | 2 +- .../ConversationViewController.m | 125 +++++++- .../ConversationView/ConversationViewModel.h | 1 + .../ConversationView/ConversationViewModel.m | 28 +- .../ConversationSearchViewController.swift | 4 +- .../MessageDetailViewController.swift | 4 + .../NewContactThreadViewController.m | 12 +- .../ViewControllers/NewGroupViewController.h | 5 +- .../OWSConversationSettingsViewController.m | 34 ++- .../OWSConversationSettingsViewDelegate.h | 6 +- .../UpdateGroupViewController.m | 5 +- Signal/test/util/SearcherTest.swift | 10 +- .../translations/en.lproj/Localizable.strings | 12 + .../SelectThreadViewController.m | 6 +- SignalMessaging/Views/ContactsViewHelper.m | 7 +- SignalMessaging/Views/OWSSearchBar.h | 4 +- SignalMessaging/Views/OWSSearchBar.m | 23 +- SignalMessaging/categories/UIView+OWS.swift | 4 +- SignalMessaging/utils/Bench.swift | 13 +- ...nSearcher.swift => FullTextSearcher.swift} | 87 +++++- 32 files changed, 697 insertions(+), 70 deletions(-) create mode 100644 Signal/Images.xcassets/ic_chevron_down.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@1x.png create mode 100644 Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@2x.png create mode 100644 Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@3x.png create mode 100644 Signal/Images.xcassets/ic_chevron_up.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@1x.png create mode 100644 Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@2x.png create mode 100644 Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@3x.png create mode 100644 Signal/src/ConversationSearch.swift rename SignalMessaging/utils/{ConversationSearcher.swift => FullTextSearcher.swift} (84%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 69f3722b8..3add7cb25 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -338,7 +338,7 @@ 45194F941FD7216000333B2C /* TSUnreadIndicatorInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C42D641F4734ED0072EC04 /* TSUnreadIndicatorInteraction.h */; settings = {ATTRIBUTES = (Public, ); }; }; 45194F951FD7216600333B2C /* TSUnreadIndicatorInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C42D651F4734ED0072EC04 /* TSUnreadIndicatorInteraction.m */; }; 451A13B11E13DED2000A50FD /* AppNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451A13B01E13DED2000A50FD /* AppNotifications.swift */; }; - 451F8A341FD710C3005CB9DA /* ConversationSearcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451777C71FD61554001225FF /* ConversationSearcher.swift */; }; + 451F8A341FD710C3005CB9DA /* FullTextSearcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 451777C71FD61554001225FF /* FullTextSearcher.swift */; }; 451F8A351FD710DE005CB9DA /* Searcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45360B8C1F9521F800FA666C /* Searcher.swift */; }; 451F8A3B1FD71297005CB9DA /* UIUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B97940261832BD2400BD66CB /* UIUtil.m */; }; 451F8A3C1FD71392005CB9DA /* UIUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B97940251832BD2400BD66CB /* UIUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -490,6 +490,7 @@ 4CC0B59C20EC5F2E00CF6EE0 /* ConversationConfigurationSyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC0B59B20EC5F2E00CF6EE0 /* ConversationConfigurationSyncOperation.swift */; }; 4CC1ECF9211A47CE00CC13BE /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CC1ECF8211A47CD00CC13BE /* StoreKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */; }; + 4CC613362227A00400E21A3A /* ConversationSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC613352227A00400E21A3A /* ConversationSearch.swift */; }; 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */; }; 4CFE6B6C21F92BA700006701 /* LegacyNotificationsAdaptee.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */; }; 70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70377AAA1918450100CAF501 /* MobileCoreServices.framework */; }; @@ -1055,7 +1056,7 @@ 450DF2081E0DD2C6003D14BE /* UserNotificationsAdaptee.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = UserNotificationsAdaptee.swift; path = UserInterface/Notifications/UserNotificationsAdaptee.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 451166BF1FD86B98000739BA /* AccountManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountManager.swift; sourceTree = ""; }; 451764291DE939FD00EDB8B9 /* ContactCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactCell.swift; sourceTree = ""; }; - 451777C71FD61554001225FF /* ConversationSearcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationSearcher.swift; sourceTree = ""; }; + 451777C71FD61554001225FF /* FullTextSearcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FullTextSearcher.swift; sourceTree = ""; }; 451A13B01E13DED2000A50FD /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = AppNotifications.swift; path = UserInterface/Notifications/AppNotifications.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 452037CF1EE84975004E4CDF /* DebugUISessionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugUISessionState.h; sourceTree = ""; }; 452037D01EE84975004E4CDF /* DebugUISessionState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugUISessionState.m; sourceTree = ""; }; @@ -1223,6 +1224,7 @@ 4CC0B59B20EC5F2E00CF6EE0 /* ConversationConfigurationSyncOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationConfigurationSyncOperation.swift; sourceTree = ""; }; 4CC1ECF8211A47CD00CC13BE /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateNag.swift; sourceTree = ""; }; + 4CC613352227A00400E21A3A /* ConversationSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearch.swift; sourceTree = ""; }; 4CEB78C72178EBAB00F315D2 /* OWSSessionResetJobRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OWSSessionResetJobRecord.h; sourceTree = ""; }; 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OWSSessionResetJobRecord.m; sourceTree = ""; }; 4CFB4E9B220BC56D00ECB4DE /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = translations/nb.lproj/Localizable.strings; sourceTree = ""; }; @@ -1577,7 +1579,7 @@ 4C948FF62146EB4800349F0D /* BlockListCache.swift */, 343D3D991E9283F100165CA4 /* BlockListUIUtils.h */, 343D3D9A1E9283F100165CA4 /* BlockListUIUtils.m */, - 451777C71FD61554001225FF /* ConversationSearcher.swift */, + 451777C71FD61554001225FF /* FullTextSearcher.swift */, 3466087120E550F300AFFE73 /* ConversationStyle.swift */, 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */, 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */, @@ -2074,6 +2076,7 @@ 4C090A1A210FD9C7001FD7F9 /* HapticFeedback.swift */, 34B3F8331E8DF1700035BE1A /* ViewControllers */, 76EB052B18170B33006006FC /* Views */, + 4CC613352227A00400E21A3A /* ConversationSearch.swift */, ); name = UserInterface; sourceTree = ""; @@ -3382,7 +3385,7 @@ 452C7CA72037628B003D51A5 /* Weak.swift in Sources */, 34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */, 34AC09F8211B39B100997B47 /* CountryCodeViewController.m in Sources */, - 451F8A341FD710C3005CB9DA /* ConversationSearcher.swift in Sources */, + 451F8A341FD710C3005CB9DA /* FullTextSearcher.swift in Sources */, 346129FE1FD5F31400532771 /* OWS106EnsureProfileComplete.swift in Sources */, 34AC0A10211B39EA00997B47 /* TappableView.swift in Sources */, 346129F91FD5F31400532771 /* OWS104CreateRecipientIdentities.m in Sources */, @@ -3541,6 +3544,7 @@ 340FC8BC204DAC8D007AEB0F /* FingerprintViewController.m in Sources */, 450DF2051E0D74AC003D14BE /* Platform.swift in Sources */, 34A4C61E221613D00042EF2E /* OnboardingVerificationViewController.swift in Sources */, + 4CC613362227A00400E21A3A /* ConversationSearch.swift in Sources */, 340FC8B2204DAC8D007AEB0F /* AdvancedSettingsTableViewController.m in Sources */, 452B999020A34B6B006F2F9E /* AddContactShareToExistingContactViewController.swift in Sources */, 346129991FD1E4DA00532771 /* SignalApp.m in Sources */, diff --git a/Signal/Images.xcassets/ic_chevron_down.imageset/Contents.json b/Signal/Images.xcassets/ic_chevron_down.imageset/Contents.json new file mode 100644 index 000000000..fd6b5101b --- /dev/null +++ b/Signal/Images.xcassets/ic_chevron_down.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "chevron-down-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "chevron-down-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "chevron-down-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@1x.png b/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..b2c436a05464e527237f8ed49ae538401879ecfc GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px_)& z7sn8f&bOhrc^edXbo>set$UKucZj3!5u2%ssolB+??e5!mdML}XJ`?aF|+F0g{y!0 ze?&NNC_ZCr+kC+NogbP0l+XkKlQdd! literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@2x.png b/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1762a629cbf0b58eecbb0346505505252d550e62 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v^Pz`!W! z>EalY(fD>|EnkxX&rxgt1HK>r)mO6gJ>pH9cBbXSF3k(uyIy+Fda!uSUthbnWpg&i zL~i#kmuIkF!0;iAp+cKsk0`@EE{6QS>JDC+T8!3nuDoVv$a=Kc<@JJzzi#+fF05?t zn9{QJhUuwqTh2*J-v7dU|A1TZ$YU*iqN98H!mG?j|eB_=Ni~3_FZ8) z%>5`s*FYhW;mAy>gp7kN7S?7GYZDwIdN|$mbrjbeV@f`;Cep7Z%}9EKo#?>?r+{_J zXHy(Dyh}+iP*|}&@$8nC7jKPMuAO;IU{?Bfk?TIm9Ivdnc$8Su1y{^u;kacq=bL(b zt?HiZ{odz(a(arDMldWE*?*=I?w43;2bZ|yE$ymOwsRAKA;;k9>gTe~DWM4fTjh;# literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@3x.png b/Signal/Images.xcassets/ic_chevron_down.imageset/chevron-down-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c52639771fd85ec6134624afd68d1a8ff6d8bd GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fq`+i zr;B4q#hkaZALbr15NOq(+u$3~7-$vc{*ohA*sLIRmb}ONN9-mi@4CL9taG7Q;kmyd z<0GH7royLdbiQ?13%N{CXkrmm=}>TF;Z*VvaBSirAf%NsYgusqg}^!K$4x~{_8%ua3?951c={prw|*7vnroF-H< zCtE;x2+W6wD zqf5{ZneJaaO-ldlChvP@9I@Q{XV0|cNS0JL?+=7Rky9!$ZGYO;U2}cf!tMa$mci52 K&t;ucLK6UdWXR?K literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_chevron_up.imageset/Contents.json b/Signal/Images.xcassets/ic_chevron_up.imageset/Contents.json new file mode 100644 index 000000000..216f26cee --- /dev/null +++ b/Signal/Images.xcassets/ic_chevron_up.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "chevron-up-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "chevron-up-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "chevron-up-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@1x.png b/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..c5e0e86f5080e4dd8c881a6f951c5348430f0c2a GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px|6j z7sn8f&bL$Vavo6NY0;m1V4}><#W#F+Id&}&sh^z1U27mPA^X$ZfW=47{4m<)|MK*M zP-Z0~mo4oku8!J&G$#o)uv^8;U0UC}YP*^mtLB~5?2AhTSaz(;+!}Xr0sE_3ZHv%A z#tXBi9GZML)69tL`Zu40q5reR^kzPpT*I*8OpV#IO_B?bvmL8tKJs0m?>~nPW7?dr h4|JOMOEc_Xu)TF{P4Sv|cA!HUJYD@<);T3K0RRmnTHgQw literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@2x.png b/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b93b64ec3e69bf61dbed17723270463e48baa7 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v^Pz`!Wz z>EalY(fD>oBj+Il5tsTSj8UP^W17@M)e8x9aZTLg(fxcbu>gi*cvYkIQV{U zZ>vBZ|KXPpwr~2gYeoIcn;yI8!$25Uhc=SLKx}|F!R!ko9tpU=Cr4#-#rTqF$PapKbLh*2~7Y;kd1u+ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@3x.png b/Signal/Images.xcassets/ic_chevron_up.imageset/chevron-up-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..167c4a238fbc81a063d23e128e9bcee9b00a3def GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fq`+G zr;B4q#hkadANn3P5IFi#{0PI{7Evp%#fDz)8Rjq9+}6f4R&9)D?tHITRj(PZ7nuBC zLt&!P)Sv~o_L`nwQO%^p*`cB^slfv~v6;Jz!J1se<#S5 zUb!Fi{B~}7U$L$KddXeSc0N=ykJ|9j!z1lMuQ2aP9;F8^PDafd7J(DaC3m6D+iuct%01PkfSOO2m%~)n|DZ*N3{_yUb(spl8o^$&`bVTiJ|Hv=}GprcK~Y ze{DL`(QS_I^)$A<%0}nHJkl;$89m5pOkpc_SDUkS;+X?669m%FZk>HFuHf3OX3004 z>Aibr9K2WXZ};-0=Z`ws=>PXFJ$w9E@%FOfEZ&dHiawPGmB-)pFaJ};)wSmRoSoC& ztmbZ+FYf%_)#%%+eP8%XRccxK@q`~1sReNi`xx)f*m%$?tUd}Dtqh*7elF{r5}E)! CYtAMB literal 0 HcmV?d00001 diff --git a/Signal/src/ConversationSearch.swift b/Signal/src/ConversationSearch.swift new file mode 100644 index 000000000..c98d21237 --- /dev/null +++ b/Signal/src/ConversationSearch.swift @@ -0,0 +1,289 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +@objc +public protocol ConversationSearchControllerDelegate: UISearchControllerDelegate { + + @objc + func conversationSearchController(_ conversationSearchController: ConversationSearchController, + didUpdateSearchResults resultSet: ConversationScreenSearchResultSet?) + + @objc + func conversationSearchController(_ conversationSearchController: ConversationSearchController, + didSelectMessageId: String) +} + +@objc +public class ConversationSearchController: NSObject { + + @objc + public static let kMinimumSearchTextLength: UInt = 2 + + @objc + public let uiSearchController = UISearchController(searchResultsController: nil) + + @objc + public weak var delegate: ConversationSearchControllerDelegate? + + let thread: TSThread + + let resultsBar: SearchResultsBar = SearchResultsBar(frame: .zero) + + // MARK: Initializer + + @objc + required public init(thread: TSThread) { + self.thread = thread + super.init() + + resultsBar.resultsBarDelegate = self + uiSearchController.delegate = self + uiSearchController.searchResultsUpdater = self + + uiSearchController.hidesNavigationBarDuringPresentation = false + uiSearchController.dimsBackgroundDuringPresentation = false + uiSearchController.searchBar.inputAccessoryView = resultsBar + + applyTheme() + } + + func applyTheme() { + OWSSearchBar.applyTheme(to: uiSearchController.searchBar) + } + + // MARK: Dependencies + + var dbReadConnection: YapDatabaseConnection { + return OWSPrimaryStorage.shared().dbReadConnection + } +} + +extension ConversationSearchController: UISearchControllerDelegate { + public func didPresentSearchController(_ searchController: UISearchController) { + Logger.verbose("") + delegate?.didPresentSearchController?(searchController) + } + + public func didDismissSearchController(_ searchController: UISearchController) { + Logger.verbose("") + delegate?.didDismissSearchController?(searchController) + } +} + +extension ConversationSearchController: UISearchResultsUpdating { + var dbSearcher: FullTextSearcher { + return FullTextSearcher.shared + } + + public func updateSearchResults(for searchController: UISearchController) { + Logger.verbose("searchBar.text: \( searchController.searchBar.text ?? "")") + + guard let searchText = searchController.searchBar.text?.stripped else { + self.resultsBar.updateResults(resultSet: nil) + self.delegate?.conversationSearchController(self, didUpdateSearchResults: nil) + return + } + BenchManager.startEvent(title: "Conversation Search", eventId: searchText) + + guard searchText.count >= ConversationSearchController.kMinimumSearchTextLength else { + self.resultsBar.updateResults(resultSet: nil) + self.delegate?.conversationSearchController(self, didUpdateSearchResults: nil) + return + } + + var resultSet: ConversationScreenSearchResultSet? + self.dbReadConnection.asyncRead({ [weak self] transaction in + guard let self = self else { + return + } + resultSet = self.dbSearcher.searchWithinConversation(thread: self.thread, searchText: searchText, transaction: transaction) + }, completionBlock: { [weak self] in + guard let self = self else { + return + } + self.resultsBar.updateResults(resultSet: resultSet) + self.delegate?.conversationSearchController(self, didUpdateSearchResults: resultSet) + }) + } +} + +extension ConversationSearchController: SearchResultsBarDelegate { + func searchResultsBar(_ searchResultsBar: SearchResultsBar, + setCurrentIndex currentIndex: Int, + resultSet: ConversationScreenSearchResultSet) { + guard let searchResult = resultSet.messages[safe: currentIndex] else { + owsFailDebug("messageId was unexpectedly nil") + return + } + + BenchEventStart(title: "Conversation Search Nav", eventId: "Conversation Search Nav: \(searchResult.messageId)") + self.delegate?.conversationSearchController(self, didSelectMessageId: searchResult.messageId) + } +} + +protocol SearchResultsBarDelegate: AnyObject { + func searchResultsBar(_ searchResultsBar: SearchResultsBar, + setCurrentIndex currentIndex: Int, + resultSet: ConversationScreenSearchResultSet) +} + +class SearchResultsBar: UIToolbar { + + weak var resultsBarDelegate: SearchResultsBarDelegate? + + var showLessRecentButton: UIBarButtonItem! + var showMoreRecentButton: UIBarButtonItem! + let labelItem: UIBarButtonItem + + var resultSet: ConversationScreenSearchResultSet? + + override init(frame: CGRect) { + + labelItem = UIBarButtonItem(title: nil, style: .plain, target: nil, action: nil) + + super.init(frame: frame) + + let leftExteriorChevronMargin: CGFloat + let leftInteriorChevronMargin: CGFloat + if CurrentAppContext().isRTL { + leftExteriorChevronMargin = 8 + leftInteriorChevronMargin = 0 + } else { + leftExteriorChevronMargin = 0 + leftInteriorChevronMargin = 8 + } + + let upChevron = #imageLiteral(resourceName: "ic_chevron_up").withRenderingMode(.alwaysTemplate) + showLessRecentButton = UIBarButtonItem(image: upChevron, style: .plain, target: self, action: #selector(didTapShowLessRecent)) + showLessRecentButton.imageInsets = UIEdgeInsets(top: 2, left: leftExteriorChevronMargin, bottom: 2, right: leftInteriorChevronMargin) + showLessRecentButton.tintColor = UIColor.ows_systemPrimaryButton + + let downChevron = #imageLiteral(resourceName: "ic_chevron_down").withRenderingMode(.alwaysTemplate) + showMoreRecentButton = UIBarButtonItem(image: downChevron, style: .plain, target: self, action: #selector(didTapShowMoreRecent)) + showMoreRecentButton.imageInsets = UIEdgeInsets(top: 2, left: leftInteriorChevronMargin, bottom: 2, right: leftExteriorChevronMargin) + showMoreRecentButton.tintColor = UIColor.ows_systemPrimaryButton + + let spacer1 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) + let spacer2 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) + + self.items = [showLessRecentButton, showMoreRecentButton, spacer1, labelItem, spacer2] + + self.isTranslucent = false + self.isOpaque = true + self.barTintColor = Theme.toolbarBackgroundColor + + self.autoresizingMask = .flexibleHeight + self.translatesAutoresizingMaskIntoConstraints = false + } + + required init?(coder aDecoder: NSCoder) { + notImplemented() + } + + @objc + public func didTapShowLessRecent() { + Logger.debug("") + guard let resultSet = resultSet else { + owsFailDebug("resultSet was unexpectedly nil") + return + } + + guard let currentIndex = currentIndex else { + owsFailDebug("currentIndex was unexpectedly nil") + return + } + + guard currentIndex + 1 < resultSet.messages.count else { + owsFailDebug("showLessRecent button should be disabled") + return + } + + let newIndex = currentIndex + 1 + self.currentIndex = newIndex + updateBarItems() + resultsBarDelegate?.searchResultsBar(self, setCurrentIndex: newIndex, resultSet: resultSet) + } + + @objc + public func didTapShowMoreRecent() { + Logger.debug("") + guard let resultSet = resultSet else { + owsFailDebug("resultSet was unexpectedly nil") + return + } + + guard let currentIndex = currentIndex else { + owsFailDebug("currentIndex was unexpectedly nil") + return + } + + guard currentIndex > 0 else { + owsFailDebug("showMoreRecent button should be disabled") + return + } + + let newIndex = currentIndex - 1 + self.currentIndex = newIndex + updateBarItems() + resultsBarDelegate?.searchResultsBar(self, setCurrentIndex: newIndex, resultSet: resultSet) + } + + var currentIndex: Int? + + // MARK: + + func updateResults(resultSet: ConversationScreenSearchResultSet?) { + if let resultSet = resultSet { + if resultSet.messages.count > 0 { + currentIndex = min(currentIndex ?? 0, resultSet.messages.count - 1) + } else { + currentIndex = nil + } + } else { + currentIndex = nil + } + + self.resultSet = resultSet + + updateBarItems() + if let currentIndex = currentIndex, let resultSet = resultSet { + resultsBarDelegate?.searchResultsBar(self, setCurrentIndex: currentIndex, resultSet: resultSet) + } + } + + func updateBarItems() { + guard let resultSet = resultSet else { + labelItem.title = nil + showMoreRecentButton.isEnabled = false + showLessRecentButton.isEnabled = false + return + } + + switch resultSet.messages.count { + case 0: + labelItem.title = NSLocalizedString("CONVERSATION_SEARCH_NO_RESULTS", comment: "keyboard toolbar label when no messages match the search string") + case 1: + labelItem.title = NSLocalizedString("CONVERSATION_SEARCH_ONE_RESULT", comment: "keyboard toolbar label when exactly 1 message matches the search string") + default: + let format = NSLocalizedString("CONVERSATION_SEARCH_RESULTS_FORMAT", + comment: "keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}}") + + guard let currentIndex = currentIndex else { + owsFailDebug("currentIndex was unexpectedly nil") + return + } + labelItem.title = String(format: format, currentIndex + 1, resultSet.messages.count) + } + + if let currentIndex = currentIndex { + showMoreRecentButton.isEnabled = currentIndex > 0 + showLessRecentButton.isEnabled = currentIndex + 1 < resultSet.messages.count + } else { + showMoreRecentButton.isEnabled = false + showLessRecentButton.isEnabled = false + } + } +} diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h index d1b3fd1ed..b9b1e7723 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h @@ -59,6 +59,8 @@ extern const UIDataDetectorTypes kOWSAllowedDataDetectorTypes; - (void)didTapShowAddToContactUIForContactShare:(ContactShareViewModel *)contactShare NS_SWIFT_NAME(didTapShowAddToContactUI(forContactShare:)); +@property (nonatomic, readonly, nullable) NSString *lastSearchedText; + @end #pragma mark - diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 72ce21c1b..0f2f3ef01 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -691,6 +691,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } [self.class loadForTextDisplay:self.bodyTextView text:self.displayableBodyText.displayText + searchText:self.delegate.lastSearchedText textColor:self.bodyTextColor font:self.textMessageFont shouldIgnoreEvents:shouldIgnoreEvents]; @@ -698,6 +699,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes + (void)loadForTextDisplay:(OWSMessageTextView *)textView text:(NSString *)text + searchText:(nullable NSString *)searchText textColor:(UIColor *)textColor font:(UIFont *)font shouldIgnoreEvents:(BOOL)shouldIgnoreEvents @@ -713,8 +715,29 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes }; textView.shouldIgnoreEvents = shouldIgnoreEvents; + NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] + initWithString:text + attributes:@{ NSFontAttributeName : font, NSForegroundColorAttributeName : textColor }]; + if (searchText.length >= ConversationSearchController.kMinimumSearchTextLength) { + NSError *error; + NSRegularExpression *regex = [[NSRegularExpression alloc] initWithPattern:searchText + options:NSRegularExpressionCaseInsensitive + error:&error]; + OWSAssertDebug(error == nil); + for (NSTextCheckingResult *match in + [regex matchesInString:text options:NSMatchingWithoutAnchoringBounds range:NSMakeRange(0, text.length)]) { + + OWSAssertDebug(match.range.length >= ConversationSearchController.kMinimumSearchTextLength); + [attributedText addAttribute:NSBackgroundColorAttributeName value:UIColor.yellowColor range:match.range]; + [attributedText addAttribute:NSForegroundColorAttributeName value:UIColor.ows_blackColor range:match.range]; + } + } + // For perf, set text last. Otherwise changing font/color is more expensive. - textView.text = text; + + // We use attributedText even when we're not highlighting searched text to esnure any lingering + // attributes are reset. + textView.attributedText = attributedText; } - (BOOL)shouldShowSenderName @@ -1259,6 +1282,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes [self.bodyTextView removeFromSuperview]; self.bodyTextView.text = nil; + self.bodyTextView.attributedText = nil; self.bodyTextView.hidden = YES; self.bubbleView.bubbleColor = nil; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift b/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift index 7a94592fd..f48503948 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationMessageMapping.swift @@ -211,7 +211,7 @@ public class ConversationMessageMapping: NSObject { // Tries to ensure that the load window includes a given item. // On success, returns the index path of that item. // On failure, returns nil. - @objc + @objc(ensureLoadWindowContainsUniqueId:transaction:) public func ensureLoadWindowContains(uniqueId: String, transaction: YapDatabaseReadTransaction) -> IndexPath? { if let oldIndex = loadedUniqueIds().firstIndex(of: uniqueId) { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index fbfc11240..022f6af4e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -141,6 +141,7 @@ typedef enum : NSUInteger { ConversationViewLayoutDelegate, ConversationViewCellDelegate, ConversationInputTextViewDelegate, + ConversationSearchControllerDelegate, LongTextViewDelegate, MessageActionsDelegate, MessageDetailViewDelegate, @@ -195,6 +196,8 @@ typedef enum : NSUInteger { @property (nonatomic) BOOL userHasScrolled; @property (nonatomic, nullable) NSDate *lastMessageSentDate; +@property (nonatomic, nullable) UIBarButtonItem *customBackButton; + @property (nonatomic) BOOL showLoadMoreHeader; @property (nonatomic) UILabel *loadMoreHeader; @property (nonatomic) uint64_t lastVisibleSortId; @@ -227,6 +230,10 @@ typedef enum : NSUInteger { @property (nonatomic) ScrollContinuity scrollContinuity; @property (nonatomic, nullable) NSTimer *autoLoadMoreTimer; +@property (nonatomic, readonly) ConversationSearchController *searchController; +@property (nonatomic, nullable) NSString *lastSearchedText; +@property (nonatomic) BOOL isShowingSearchUI; + @end #pragma mark - @@ -509,6 +516,9 @@ typedef enum : NSUInteger { [self updateConversationSnapshot]; + _searchController = [[ConversationSearchController alloc] initWithThread:thread]; + _searchController.delegate = self; + [self updateShouldObserveVMUpdates]; self.reloadTimer = [NSTimer weakScheduledTimerWithTimeInterval:1.f @@ -1391,6 +1401,7 @@ typedef enum : NSUInteger { - (void)createBackButton { UIBarButtonItem *backItem = [self createOWSBackButton]; + self.customBackButton = backItem; if (backItem.customView) { // This method gets called multiple times, so it's important we re-layout the unread badge // with respect to the new backItem. @@ -1425,11 +1436,23 @@ typedef enum : NSUInteger { - (void)updateBarButtonItems { + self.navigationItem.hidesBackButton = NO; + if (self.customBackButton) { + self.navigationItem.leftBarButtonItem = self.customBackButton; + } + if (self.userLeftGroup) { self.navigationItem.rightBarButtonItems = @[]; return; } + if (self.isShowingSearchUI) { + self.navigationItem.rightBarButtonItems = @[]; + self.navigationItem.leftBarButtonItem = nil; + self.navigationItem.hidesBackButton = YES; + return; + } + const CGFloat kBarButtonSize = 44; NSMutableArray *barButtons = [NSMutableArray new]; if ([self canCall]) { @@ -3944,19 +3967,107 @@ typedef enum : NSUInteger { [self updateGroupModelTo:groupModel successCompletion:nil]; } -- (void)popAllConversationSettingsViews +- (void)popAllConversationSettingsViewsWithCompletion:(void (^_Nullable)(void))completionBlock { if (self.presentedViewController) { - [self.presentedViewController - dismissViewControllerAnimated:YES - completion:^{ - [self.navigationController popToViewController:self animated:YES]; - }]; + [self.presentedViewController dismissViewControllerAnimated:YES + completion:^{ + [self.navigationController + popToViewController:self + animated:YES + completion:completionBlock]; + }]; } else { - [self.navigationController popToViewController:self animated:YES]; + [self.navigationController popToViewController:self animated:YES completion:completionBlock]; } } +#pragma mark - Conversation Search + +- (void)conversationSettingsDidRequestConversationSearch:(OWSConversationSettingsViewController *)conversationSettingsViewController +{ + [self showSearchUI]; + [self popAllConversationSettingsViewsWithCompletion:^{ + // This delay is unfortunate, but without it, self.searchController.uiSearchController.searchBar + // isn't yet ready to become first responder. Presumably we're still mid transition. + // A hardcorded constant like this isn't great because it's either too slow, making our users + // wait, or too fast, and fails to wait long enough to be ready to become first responder. + // Luckily in this case the stakes aren't catastrophic. In the case that we're too aggressive + // the user will just have to manually tap into the search field before typing. + + // Leaving this assert in as proof that we're not ready to become first responder yet. + // If this assert fails, *great* maybe we can get rid of this delay. + OWSAssertDebug(![self.searchController.uiSearchController.searchBar canBecomeFirstResponder]); + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self.searchController.uiSearchController.searchBar becomeFirstResponder]; + }); + }]; +} + +- (void)showSearchUI +{ + self.isShowingSearchUI = YES; + self.navigationItem.titleView = self.searchController.uiSearchController.searchBar; + [self updateBarButtonItems]; +} + +- (void)hideSearchUI +{ + self.isShowingSearchUI = NO; + + self.navigationItem.titleView = self.headerView; + [self updateBarButtonItems]; + + // restore first responder to VC + [self becomeFirstResponder]; +} + +#pragma mark ConversationSearchControllerDelegate + +- (void)didDismissSearchController:(UISearchController *)searchController +{ + OWSLogVerbose(@""); + OWSAssertIsOnMainThread(); + [self hideSearchUI]; +} + +- (void)conversationSearchController:(ConversationSearchController *)conversationSearchController + didUpdateSearchResults:(nullable ConversationScreenSearchResultSet *)conversationScreenSearchResultSet +{ + OWSAssertIsOnMainThread(); + + OWSLogInfo(@"conversationScreenSearchResultSet: %@", conversationScreenSearchResultSet.debugDescription); + self.lastSearchedText = conversationScreenSearchResultSet.searchText; + [UIView performWithoutAnimation:^{ + [self.collectionView reloadItemsAtIndexPaths:self.collectionView.indexPathsForVisibleItems]; + }]; + if (conversationScreenSearchResultSet) { + [BenchManager completeEventWithEventId:self.lastSearchedText]; + } +} + +- (void)conversationSearchController:(ConversationSearchController *)conversationSearchController + didSelectMessageId:(NSString *)messageId +{ + OWSLogDebug(@"messageId: %@", messageId); + [self scrollToInteractionId:messageId]; + [BenchManager completeEventWithEventId:[NSString stringWithFormat:@"Conversation Search Nav: %@", messageId]]; +} + +- (void)scrollToInteractionId:(NSString *)interactionId +{ + NSIndexPath *_Nullable indexPath = [self.conversationViewModel ensureLoadWindowContainsInteractionId:interactionId]; + if (!indexPath) { + OWSFailDebug(@"unable to find indexPath"); + return; + } + + [self.collectionView scrollToItemAtIndexPath:indexPath + atScrollPosition:UICollectionViewScrollPositionCenteredVertically + animated:YES]; +} + #pragma mark - ConversationViewLayoutDelegate - (NSArray> *)layoutItems diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index d13a38c36..8b218d541 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -109,6 +109,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { - (BOOL)canLoadMoreItems; - (nullable NSIndexPath *)ensureLoadWindowContainsQuotedReply:(OWSQuotedReplyModel *)quotedReply; +- (nullable NSIndexPath *)ensureLoadWindowContainsInteractionId:(NSString *)interactionId; - (void)appendUnsavedOutgoingTextMessage:(TSOutgoingMessage *)outgoingMessage; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 75428952d..99c928218 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -1595,8 +1595,32 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } - indexPath = [self.messageMapping ensureLoadWindowContainsWithUniqueId:quotedInteraction.uniqueId - transaction:transaction]; + indexPath = + [self.messageMapping ensureLoadWindowContainsUniqueId:quotedInteraction.uniqueId transaction:transaction]; + }]; + + self.collapseCutoffDate = [NSDate new]; + + [self ensureDynamicInteractionsAndUpdateIfNecessary:NO]; + + if (![self reloadViewItems]) { + OWSFailDebug(@"failed to reload view items in resetMapping."); + } + + [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; + [self.delegate conversationViewModelRangeDidChange]; + + return indexPath; +} + +- (nullable NSIndexPath *)ensureLoadWindowContainsInteractionId:(NSString *)interactionId +{ + OWSAssertIsOnMainThread(); + OWSAssertDebug(interactionId); + + __block NSIndexPath *_Nullable indexPath = nil; + [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { + indexPath = [self.messageMapping ensureLoadWindowContainsUniqueId:interactionId transaction:transaction]; }]; self.collapseCutoffDate = [NSDate new]; diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift index 95f3c10cc..fd34cb02c 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift +++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift @@ -37,8 +37,8 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel return OWSPrimaryStorage.shared().uiDatabaseConnection } - var searcher: ConversationSearcher { - return ConversationSearcher.shared + var searcher: FullTextSearcher { + return FullTextSearcher.shared } private var contactsManager: OWSContactsManager { diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 98867df98..822214764 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -763,6 +763,10 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele UIPasteboard.general.string = messageTimestamp } + var lastSearchedText: String? { + return nil + } + // MediaGalleryDataSourceDelegate func mediaGalleryDataSource(_ mediaGalleryDataSource: MediaGalleryDataSource, willDelete items: [MediaGalleryItem], initiatedBy: AnyObject) { diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index 912a52be8..ae7eea43a 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN MFMessageComposeViewControllerDelegate> @property (nonatomic, readonly) ContactsViewHelper *contactsViewHelper; -@property (nonatomic, readonly) ConversationSearcher *conversationSearcher; +@property (nonatomic, readonly) FullTextSearcher *fullTextSearcher; @property (nonatomic, readonly) UIView *noSignalContactsView; @@ -75,9 +75,9 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Dependencies -- (ConversationSearcher *)conversationSearcher +- (FullTextSearcher *)fullTextSearcher { - return ConversationSearcher.shared; + return FullTextSearcher.shared; } - (YapDatabaseConnection *)uiDatabaseConnection @@ -903,9 +903,9 @@ NS_ASSUME_NONNULL_BEGIN [self.uiDatabaseConnection asyncReadWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - self.searchResults = [self.conversationSearcher searchForComposeScreenWithSearchText:searchText - transaction:transaction - contactsManager:self.contactsManager]; + self.searchResults = [self.fullTextSearcher searchForComposeScreenWithSearchText:searchText + transaction:transaction + contactsManager:self.contactsManager]; } completionBlock:^{ __typeof(self) strongSelf = weakSelf; diff --git a/Signal/src/ViewControllers/NewGroupViewController.h b/Signal/src/ViewControllers/NewGroupViewController.h index b8a147dc5..a5dfa1b19 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.h +++ b/Signal/src/ViewControllers/NewGroupViewController.h @@ -1,16 +1,13 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import "OWSConversationSettingsViewDelegate.h" #import NS_ASSUME_NONNULL_BEGIN @interface NewGroupViewController : OWSViewController -@property (nonatomic, weak) id delegate; - @end NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index d2ace848a..80f613f93 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -321,13 +321,6 @@ const CGFloat kIconViewLength = 24; mainSection.customHeaderView = [self mainSectionHeader]; mainSection.customHeaderHeight = @(100.f); - [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ - return [weakSelf disclosureCellWithName:MediaStrings.allMedia iconName:@"actionsheet_camera_roll_black"]; - } - actionBlock:^{ - [weakSelf showMediaGallery]; - }]]; - if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing && !self.hasExistingContact) { [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ @@ -354,6 +347,28 @@ const CGFloat kIconViewLength = 24; }]]; } + [mainSection addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + return [weakSelf disclosureCellWithName:MediaStrings.allMedia + iconName:@"actionsheet_camera_roll_black"]; + } + actionBlock:^{ + [weakSelf showMediaGallery]; + }]]; + + // TODO icon + [mainSection addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH", + @"Table cell label in conversation settings which returns the user to the " + @"conversation with 'search mode' activated"); + return + [weakSelf disclosureCellWithName:title iconName:@"actionsheet_camera_roll_black"]; + } + actionBlock:^{ + [weakSelf tappedConversationSearch]; + }]]; + if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) { [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ return [weakSelf @@ -1331,6 +1346,11 @@ const CGFloat kIconViewLength = 24; [mediaGallery pushTileViewFromNavController:(OWSNavigationController *)self.navigationController]; } +- (void)tappedConversationSearch +{ + [self.conversationSettingsViewDelegate conversationSettingsDidRequestConversationSearch:self]; +} + #pragma mark - Notifications - (void)identityStateDidChange:(NSNotification *)notification diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewDelegate.h b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewDelegate.h index 167ef038f..06b8e515c 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewDelegate.h +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewDelegate.h @@ -1,17 +1,19 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN +@class OWSConversationSettingsViewController; @class TSGroupModel; @protocol OWSConversationSettingsViewDelegate - (void)conversationColorWasUpdated; - (void)groupWasUpdated:(TSGroupModel *)groupModel; +- (void)conversationSettingsDidRequestConversationSearch:(OWSConversationSettingsViewController *)conversationSettingsViewController; -- (void)popAllConversationSettingsViews; +- (void)popAllConversationSettingsViewsWithCompletion:(void (^_Nullable)(void))completionBlock; @end diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index 1baa19bec..2355971d7 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -431,7 +431,8 @@ NS_ASSUME_NONNULL_BEGIN [self updateGroup]; - [self.conversationSettingsViewDelegate popAllConversationSettingsViews]; + [self.conversationSettingsViewDelegate + popAllConversationSettingsViewsWithCompletion:nil]; }]]; [controller addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DONT_SAVE", @"The label for the 'don't save' button in action sheets.") @@ -448,7 +449,7 @@ NS_ASSUME_NONNULL_BEGIN [self updateGroup]; - [self.conversationSettingsViewDelegate popAllConversationSettingsViews]; + [self.conversationSettingsViewDelegate popAllConversationSettingsViewsWithCompletion:nil]; } - (void)groupNameDidChange:(id)sender diff --git a/Signal/test/util/SearcherTest.swift b/Signal/test/util/SearcherTest.swift index 6a2a6523a..b50dc646e 100644 --- a/Signal/test/util/SearcherTest.swift +++ b/Signal/test/util/SearcherTest.swift @@ -8,7 +8,7 @@ import XCTest // TODO: We might be able to merge this with OWSFakeContactsManager. @objc -class ConversationSearcherContactsManager: NSObject, ContactsManagerProtocol { +class FullTextSearcherContactsManager: NSObject, ContactsManagerProtocol { func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String { return self.displayName(forPhoneIdentifier: recipientId) } @@ -57,11 +57,11 @@ class ConversationSearcherContactsManager: NSObject, ContactsManagerProtocol { private let bobRecipientId = "+49030183000" private let aliceRecipientId = "+12345678900" -class ConversationSearcherTest: SignalBaseTest { +class FullTextSearcherTest: SignalBaseTest { // MARK: - Dependencies - var searcher: ConversationSearcher { - return ConversationSearcher.shared + var searcher: FullTextSearcher { + return FullTextSearcher.shared } var dbConnection: YapDatabaseConnection { @@ -80,7 +80,7 @@ class ConversationSearcherTest: SignalBaseTest { FullTextSearchFinder.ensureDatabaseExtensionRegistered(storage: OWSPrimaryStorage.shared()) // Replace this singleton. - SSKEnvironment.shared.contactsManager = ConversationSearcherContactsManager() + SSKEnvironment.shared.contactsManager = FullTextSearcherContactsManager() self.dbConnection.readWrite { transaction in let bookModel = TSGroupModel(title: "Book Club", memberIds: [aliceRecipientId, bobRecipientId], image: nil, groupId: Randomness.generateRandomBytes(kGroupIdLength)) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 799bd1eba..c884c1abc 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -569,6 +569,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Conversation Settings"; @@ -620,6 +629,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; diff --git a/SignalMessaging/ViewControllers/SelectThreadViewController.m b/SignalMessaging/ViewControllers/SelectThreadViewController.m index cbf67ae66..41d8da3e0 100644 --- a/SignalMessaging/ViewControllers/SelectThreadViewController.m +++ b/SignalMessaging/ViewControllers/SelectThreadViewController.m @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN NewNonContactConversationViewControllerDelegate> @property (nonatomic, readonly) ContactsViewHelper *contactsViewHelper; -@property (nonatomic, readonly) ConversationSearcher *conversationSearcher; +@property (nonatomic, readonly) FullTextSearcher *fullTextSearcher; @property (nonatomic, readonly) ThreadViewHelper *threadViewHelper; @property (nonatomic, readonly) YapDatabaseConnection *uiDatabaseConnection; @@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN self.view.backgroundColor = Theme.backgroundColor; _contactsViewHelper = [[ContactsViewHelper alloc] initWithDelegate:self]; - _conversationSearcher = ConversationSearcher.shared; + _fullTextSearcher = FullTextSearcher.shared; _threadViewHelper = [ThreadViewHelper new]; _threadViewHelper.delegate = self; @@ -341,7 +341,7 @@ NS_ASSUME_NONNULL_BEGIN { NSString *searchTerm = [[self.searchBar text] ows_stripped]; - return [self.conversationSearcher filterThreads:self.threadViewHelper.threads withSearchText:searchTerm]; + return [self.fullTextSearcher filterThreads:self.threadViewHelper.threads withSearchText:searchTerm]; } - (NSArray *)filteredSignalAccountsWithSearchText diff --git a/SignalMessaging/Views/ContactsViewHelper.m b/SignalMessaging/Views/ContactsViewHelper.m index 229eb690e..4373047bf 100644 --- a/SignalMessaging/Views/ContactsViewHelper.m +++ b/SignalMessaging/Views/ContactsViewHelper.m @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) BOOL shouldNotifyDelegateOfUpdatedContacts; @property (nonatomic) BOOL hasUpdatedContactsAtLeastOnce; @property (nonatomic) OWSProfileManager *profileManager; -@property (nonatomic, readonly) ConversationSearcher *conversationSearcher; +@property (nonatomic, readonly) FullTextSearcher *fullTextSearcher; @end @@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN _blockListCache = [OWSBlockListCache new]; [_blockListCache startObservingAndSyncStateWithDelegate:self]; - _conversationSearcher = ConversationSearcher.shared; + _fullTextSearcher = FullTextSearcher.shared; _contactsManager = Environment.shared.contactsManager; _profileManager = [OWSProfileManager sharedManager]; @@ -210,8 +210,7 @@ NS_ASSUME_NONNULL_BEGIN NSMutableArray *signalAccountsToSearch = [self.signalAccounts mutableCopy]; SignalAccount *selfAccount = [[SignalAccount alloc] initWithRecipientId:self.localNumber]; [signalAccountsToSearch addObject:selfAccount]; - return [self.conversationSearcher filterSignalAccounts:signalAccountsToSearch - withSearchText:searchText]; + return [self.fullTextSearcher filterSignalAccounts:signalAccountsToSearch withSearchText:searchText]; } - (BOOL)doesContact:(Contact *)contact matchSearchTerm:(NSString *)searchTerm diff --git a/SignalMessaging/Views/OWSSearchBar.h b/SignalMessaging/Views/OWSSearchBar.h index 4e6586f96..bbac537f4 100644 --- a/SignalMessaging/Views/OWSSearchBar.h +++ b/SignalMessaging/Views/OWSSearchBar.h @@ -1,11 +1,13 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @interface OWSSearchBar : UISearchBar ++ (void)applyThemeToSearchBar:(UISearchBar *)searchBar; + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/Views/OWSSearchBar.m b/SignalMessaging/Views/OWSSearchBar.m index e3813290a..2d00089af 100644 --- a/SignalMessaging/Views/OWSSearchBar.m +++ b/SignalMessaging/Views/OWSSearchBar.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSSearchBar.h" @@ -54,36 +54,41 @@ NS_ASSUME_NONNULL_BEGIN } - (void)ows_applyTheme +{ + [self.class applyThemeToSearchBar:self]; +} + ++ (void)applyThemeToSearchBar:(UISearchBar *)searchBar { OWSAssertIsOnMainThread(); UIColor *foregroundColor = Theme.placeholderColor; - self.barTintColor = Theme.backgroundColor; - self.barStyle = Theme.barStyle; + searchBar.barTintColor = Theme.backgroundColor; + searchBar.barStyle = Theme.barStyle; // Hide searchBar border. // Alternatively we could hide the border by using `UISearchBarStyleMinimal`, but that causes an issue when toggling // from light -> dark -> light theme wherein the textField background color appears darker than it should // (regardless of our re-setting textfield.backgroundColor below). - self.backgroundImage = [UIImage new]; + searchBar.backgroundImage = [UIImage new]; if (Theme.isDarkThemeEnabled) { UIImage *clearImage = [UIImage imageNamed:@"searchbar_clear"]; - [self setImage:[clearImage asTintedImageWithColor:foregroundColor] + [searchBar setImage:[clearImage asTintedImageWithColor:foregroundColor] forSearchBarIcon:UISearchBarIconClear state:UIControlStateNormal]; UIImage *searchImage = [UIImage imageNamed:@"searchbar_search"]; - [self setImage:[searchImage asTintedImageWithColor:foregroundColor] + [searchBar setImage:[searchImage asTintedImageWithColor:foregroundColor] forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal]; } else { - [self setImage:nil forSearchBarIcon:UISearchBarIconClear state:UIControlStateNormal]; + [searchBar setImage:nil forSearchBarIcon:UISearchBarIconClear state:UIControlStateNormal]; - [self setImage:nil forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal]; + [searchBar setImage:nil forSearchBarIcon:UISearchBarIconSearch state:UIControlStateNormal]; } - [self traverseViewHierarchyWithVisitor:^(UIView *view) { + [searchBar traverseViewHierarchyWithVisitor:^(UIView *view) { if ([view isKindOfClass:[UITextField class]]) { UITextField *textField = (UITextField *)view; textField.backgroundColor = Theme.searchFieldBackgroundColor; diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index b29b58f16..789f6b056 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -16,7 +16,7 @@ public extension UIEdgeInsets { @objc public extension UINavigationController { @objc - public func pushViewController(viewController: UIViewController, + public func pushViewController(_ viewController: UIViewController, animated: Bool, completion: (() -> Void)?) { CATransaction.begin() @@ -35,7 +35,7 @@ public extension UINavigationController { } @objc - public func popToViewController(viewController: UIViewController, + public func popToViewController(_ viewController: UIViewController, animated: Bool, completion: (() -> Void)?) { CATransaction.begin() diff --git a/SignalMessaging/utils/Bench.swift b/SignalMessaging/utils/Bench.swift index 34afa6385..298ab6b01 100644 --- a/SignalMessaging/utils/Bench.swift +++ b/SignalMessaging/utils/Bench.swift @@ -17,10 +17,10 @@ import Foundation /// } /// } public func BenchAsync(title: String, block: (@escaping () -> Void) -> Void) { - let startTime = CFAbsoluteTimeGetCurrent() + let startTime = CACurrentMediaTime() block { - let timeElapsed = CFAbsoluteTimeGetCurrent() - startTime + let timeElapsed = CACurrentMediaTime() - startTime let formattedTime = String(format: "%0.2fms", timeElapsed * 1000) Logger.debug("[Bench] title: \(title), duration: \(formattedTime)") } @@ -52,19 +52,20 @@ public func Bench(title: String, block: () throws -> Void) throws { /// crosses multiple classes, you can use the BenchEvent tools /// /// // in one class -/// let message = getMessage() /// BenchEventStart(title: "message sending", eventId: message.id) +/// beginTheWork() /// -/// ... +/// ... /// /// // in another class -/// BenchEventComplete(title: "message sending", eventId: message.id) +/// doTheLastThing() +/// BenchEventComplete(eventId: message.id) /// /// Or in objc /// /// [BenchManager startEventWithTitle:"message sending" eventId:message.id] /// ... -/// [BenchManager startEventWithTitle:"message sending" eventId:message.id] +/// [BenchManager completeEventWithEventId:eventId:message.id] public func BenchEventStart(title: String, eventId: BenchmarkEventId) { BenchAsync(title: title) { finish in runningEvents[eventId] = Event(title: title, eventId: eventId, completion: finish) diff --git a/SignalMessaging/utils/ConversationSearcher.swift b/SignalMessaging/utils/FullTextSearcher.swift similarity index 84% rename from SignalMessaging/utils/ConversationSearcher.swift rename to SignalMessaging/utils/FullTextSearcher.swift index 2cc7e1062..0b3146a20 100644 --- a/SignalMessaging/utils/ConversationSearcher.swift +++ b/SignalMessaging/utils/FullTextSearcher.swift @@ -162,7 +162,57 @@ public class ComposeScreenSearchResultSet: NSObject { } @objc -public class ConversationSearcher: NSObject { +public class MessageSearchResult: NSObject, Comparable { + + public let messageId: String + public let sortId: UInt64 + + init(messageId: String, sortId: UInt64) { + self.messageId = messageId + self.sortId = sortId + } + + // MARK: - Comparable + + public static func < (lhs: MessageSearchResult, rhs: MessageSearchResult) -> Bool { + return lhs.sortId < rhs.sortId + } +} + +@objc +public class ConversationScreenSearchResultSet: NSObject { + + @objc + public let searchText: String + + @objc + public let messages: [MessageSearchResult] + + @objc + public lazy var messageSortIds: [UInt64] = { + return messages.map { $0.sortId } + }() + + // MARK: Static members + + public static let empty: ConversationScreenSearchResultSet = ConversationScreenSearchResultSet(searchText: "", messages: []) + + // MARK: Init + + public init(searchText: String, messages: [MessageSearchResult]) { + self.searchText = searchText + self.messages = messages + } + + // MARK: - CustomDebugStringConvertible + + override public var debugDescription: String { + return "ConversationScreenSearchResultSet(searchText: \(searchText), messages: [\(messages.count) matches])" + } +} + +@objc +public class FullTextSearcher: NSObject { // MARK: - Dependencies @@ -175,7 +225,7 @@ public class ConversationSearcher: NSObject { private let finder: FullTextSearchFinder @objc - public static let shared: ConversationSearcher = ConversationSearcher() + public static let shared: FullTextSearcher = FullTextSearcher() override private init() { finder = FullTextSearchFinder() super.init() @@ -279,6 +329,39 @@ public class ConversationSearcher: NSObject { return HomeScreenSearchResultSet(searchText: searchText, conversations: conversations, contacts: otherContacts, messages: messages) } + public func searchWithinConversation(thread: TSThread, + searchText: String, + transaction: YapDatabaseReadTransaction) -> ConversationScreenSearchResultSet { + + var messages: [MessageSearchResult] = [] + + guard let threadId = thread.uniqueId else { + owsFailDebug("threadId was unexpectedly nil") + return ConversationScreenSearchResultSet.empty + } + + self.finder.enumerateObjects(searchText: searchText, transaction: transaction) { (match: Any, snippet: String?) in + if let message = match as? TSMessage { + guard message.uniqueThreadId == threadId else { + return + } + + guard let messageId = message.uniqueId else { + owsFailDebug("messageId was unexpectedly nil") + return + } + + let searchResult = MessageSearchResult(messageId: messageId, sortId: message.sortId) + messages.append(searchResult) + } + } + + // We want most recent first + messages.sort(by: >) + + return ConversationScreenSearchResultSet(searchText: searchText, messages: messages) + } + @objc(filterThreads:withSearchText:) public func filterThreads(_ threads: [TSThread], searchText: String) -> [TSThread] { guard searchText.trimmingCharacters(in: .whitespacesAndNewlines).count > 0 else { From 72e0d2c20a7ce0d5bf1a2be4c6b30813d0ecdc5e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 27 Feb 2019 09:03:35 -0700 Subject: [PATCH 176/493] Only render visual media as album This check was enforced for AttachmentStreams, but not AttachmentPointers --- .../ConversationView/ConversationViewItem.m | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 33424a478..8decd7c26 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -603,7 +603,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } NSArray *mediaAttachments = [message mediaAttachmentsWithTransaction:transaction]; - NSArray *mediaAlbumItems = [self mediaAlbumItemsForAttachments:mediaAttachments]; + NSArray *mediaAlbumItems = [self albumItemsForMediaAttachments:mediaAttachments]; if (mediaAlbumItems.count > 0) { if (mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = mediaAlbumItems.firstObject; @@ -686,12 +686,19 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } } -- (NSArray *)mediaAlbumItemsForAttachments:(NSArray *)attachments +- (NSArray *)albumItemsForMediaAttachments:(NSArray *)attachments { OWSAssertIsOnMainThread(); NSMutableArray *mediaAlbumItems = [NSMutableArray new]; for (TSAttachment *attachment in attachments) { + if (!attachment.isVisualMedia) { + // Well behaving clients should not send a mix of visual media (like JPG) and non-visual media (like PDF's) + // Since we're not coped to handle a mix of media, return @[] + OWSAssertDebug(mediaAlbumItems.count == 0); + return @[]; + } + NSString *_Nullable caption = (attachment.caption ? [self displayableCaptionForText:attachment.caption attachmentId:attachment.uniqueId].displayText : nil); From d44a824a36dcccb55c2a8d66f3ea16b8ce861f7d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Feb 2019 17:50:50 -0700 Subject: [PATCH 177/493] sync translations --- .../translations/ca.lproj/Localizable.strings | 54 ++++++++--------- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/de.lproj/Localizable.strings | 54 ++++++++--------- .../translations/es.lproj/Localizable.strings | 58 +++++++++---------- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/it.lproj/Localizable.strings | 54 ++++++++--------- .../translations/ja.lproj/Localizable.strings | 54 ++++++++--------- .../translations/km.lproj/Localizable.strings | 4 +- .../translations/lt.lproj/Localizable.strings | 54 ++++++++--------- .../translations/nl.lproj/Localizable.strings | 56 +++++++++--------- .../translations/pl.lproj/Localizable.strings | 44 +++++++------- .../pt_PT.lproj/Localizable.strings | 54 ++++++++--------- .../translations/ru.lproj/Localizable.strings | 52 ++++++++--------- .../translations/sq.lproj/Localizable.strings | 54 ++++++++--------- .../translations/tr.lproj/Localizable.strings | 58 +++++++++---------- .../zh_CN.lproj/Localizable.strings | 54 ++++++++--------- .../zh_TW.lproj/Localizable.strings | 54 ++++++++--------- 17 files changed, 381 insertions(+), 381 deletions(-) diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 5d9ede10c..0beb5d313 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclòs %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclosos %@i %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclosos %@, %@i %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Comenceu la primera conversa aquí."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No s'ha trobat cap resultat per a «%@»"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Restableix"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Gira 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Gira 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No podeu compartir més de %@ elements."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Aquest número de telèfon té el bloqueig de registre habilitat. Si us plau, escriviu el PIN de bloqueig del registre."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "El PIN de bloqueig de registre és independent del codi de verificació automatitzat que s'ha enviat al telèfon durant el darrer pas."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "He oblidat el PIN."; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Pany de Registre"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Afegiu una espurna d'humanitat als missatges."; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Habilita els permisos"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "La informació del contacte sempre es transmet amb seguretat."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ara no"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "El Signal us pot permetre saber quan us arriba un missatge (i de qui és)."; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Per començar, introduïu el número de telèfon."; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "El número no és vàlid"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Els perfils del Signal estan encriptats d'extrem a extrem i el servei del Signal no té mai accés a aquesta informació."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "El nom"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Establiu el perfil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Condicions de servei i política de privadesa"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "El Signal és la missatgeria privada per a tothom."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "El número no és correcte?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "No tinc cap codi (disponible d'aquí a %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Aquest codi no és correcte"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "No tinc cap codi."; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Si us plau, assegureu-vos que tingueu un servei de línia i que pugueu rebre missatges d'SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No teniu cap codi?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Torna a enviar el codi"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Alternativament, anomena'm"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Encara no teniu cap codi?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Introduïu el codi que hem enviat a %@."; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Acabem de tornar a enviar un codi a %@."; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Configuració"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contacte desconegut"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "País desconegut"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconegut"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index a7f3a28fe..aec219b32 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -1057,7 +1057,7 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hledat"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Některý z vašich kontaktů už je na Signalu, včetně 1 %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index e73c8e9e7..257f79dc8 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Suchen"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@ und %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@, %@ und %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Beginne hier deine erste Unterhaltung."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Keine Ergebnisse für »%@« gefunden"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Neu starten"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45° rotieren"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90° rotieren"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kannst nicht mehr als %@ Elemente teilen."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Für diese Rufnummer ist eine Registrierungssperre aktiviert. Bitte gib die PIN für die Registrierungssperre ein."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Deine PIN für die Registrierungssperre ist unabhängig vom automatisierten Verifikationscode, der während des letzten Schritts an dein Telefon gesendet wurde."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Ich habe meine PIN vergessen"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registrierungssperre"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Verleihe deinen Nachrichten einen Hauch von Menschlichkeit"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Berechtigungen gewähren"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Deine Kontaktinformationen werden immer sicher übertragen."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nicht jetzt"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal kann dich informieren, wenn du eine Nachricht erhälst (und von wem sie ist)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Gib deine Rufnummer ein, um zu beginnen"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ungültige Rufnummer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal-Profile sind Ende-zu-Ende-verschlüsselt und der Signal-Dienst hat niemals Zugriff auf diese Informationen."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Dein Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Dein Profil einrichten"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Bedingungen & Datenschutzerklärung"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal ist ein vertraulicher Messenger für alle"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Falsche Rufnummer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Ich habe keinen Code erhalten (verfügbar in %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Diese Code ist falsch"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Ich habe keinen Code erhalten"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Stelle sicher, dass du Mobilfunkempfang hast und SMS empfangen kannst."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Kein Code?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Code erneut senden"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Mich anrufen"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Immer noch kein Code?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Gib den Code ein, den wir an %@ gesendet haben"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Wir haben gerade erneut einen Code an %@ gesendet"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Einstellungen"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Unbekannter Kontakt"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Unbekanntes Land"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Unbekannt"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index b2fb753bd..a55f50b58 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Algunos de tus contactos, como p.ej. %@ ya utilizan Signal."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Algunos de tus contactos ya utilizan Signal, p.ej. %@ y %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Algunos de tus contactos ya utilizan Signal, p.ej. %@, %@ y %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Comienza aquí con tu primer chat de Signal."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "No se encontraron resultados para «%@»"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotar 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotar 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No se pueden compartir más de %@ objetos."; @@ -1117,7 +1117,7 @@ "INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Estos chats están archivados y sólo aparecerán en el buzón de entrada si recibes nuevos mensajes."; /* Message shown in the home view when the inbox is empty. */ -"INBOX_VIEW_EMPTY_INBOX" = "Dale a tu buzón de entrada algo para escribir respuestas. Comienza un chat con un amigo."; +"INBOX_VIEW_EMPTY_INBOX" = "Dale a tu buzón de entrada una razón de ser. Comienza a chatear con un amigo."; /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Al activar el acceso a contactos en «Ajustes» de iOS puedes ver los nombres de tus contactos en la lista de chats en Signal."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Este número de teléfono tiene el bloqueo de registro activado. Por favor, introduce el PIN de bloqueo de registro."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "El PIN de bloqueo de registro es distinto al código automático de verificación que acabas de recibir por SMS durante el paso previo."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Olvidé mi PIN"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Bloqueo de registro"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Añade un toque de personalidad a tus mensajes"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Habilitar permisos"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Tu información personal siempre se transfiere de manera segura."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ahora no"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal te avisará cuando recibas un mensaje (y de quien es)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Introduce tu número de teléfono para comenzar"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número incorrecto"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Los perfiles de Signal están cifrados de punto a punto por lo que el servidor de Signal no tiene acceso a los datos."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Tu nombre"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Completa tu perfil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Términos y política de privacidad"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal es la aplicación de mensajería para todo el mundo"; /* Label for the link that lets users change their phone number in the onboarding views. */ -"ONBOARDING_VERIFICATION_BACK_LINK" = "¿Número erróneo?"; +"ONBOARDING_VERIFICATION_BACK_LINK" = "¿Número correcto?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "No he recibido el código (disponible de nuevo en %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "El código introducido no es correcto"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "No he recibido ningún código"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Asegúrate que tu iPhone tiene cobertura y que puedes recibir SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "¿Ningún código?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Enviar código de nuevo"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Recibir llamada con código"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "¿Todavía no has recibido el código?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Introduce el código que hemos enviado a %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Acabamos de enviar un código a %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ajustes"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contacto desconocido"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "País desconocido"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconocido"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index ee073f362..2aae5ff74 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -330,7 +330,7 @@ "CALL_LABEL" = "Appeller"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Appel manqué, car le numéro de sécurité de l'appelant a changé."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Appel manqué, car le numéro de sécurité de l’appelant a changé."; /* notification body */ "CALL_MISSED_NOTIFICATION_BODY" = "☎️ Appel manqué"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 58bf11bf8..d9e4a6922 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, incluso %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, inclusi %@ e %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, inclusi %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Inizia qui la tua prima conversazione."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nessun risultato trovato per '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Resetta"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Ruota di 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Ruota di 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Non puoi condividere più di %@ elementi."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Questo numero di telefono ha il blocco registrazione attivo. Per favore inserisci il PIN di blocco registrazione."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Il tuo PIN di Blocco Registrazione è separato dal codice di verifica automatico che è stato inviato al tuo telefono durante l'ultimo passo."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Ho dimenticato il PIN"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Blocco registrazione"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Aggiungi un tocco di umanità ai tuoi messaggi"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Attiva le autorizzazioni"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Le tue informazioni di contatto sono sempre trasmesse in modo sicuro."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Non ora"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal può farti sapere quando ricevi un messaggio (e da chi proviene)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Inserisci il tuo numero di telefono per iniziare"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Numero non valido"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "I profili di Signal sono criptati end-to-end ed il servizio di Signal non ha mai accesso a queste informazioni."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Il tuo nome"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Imposta il tuo profilo"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Politica e termini sulla privacy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal è il messenger privato per tutti"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numero errato?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Non ho ricevuto un codice (disponibile in %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Questo codice è sbagliato"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Non ho ricevuto un codice"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Assicurati di avere un servizio mobile e che puoi ricevere messaggi SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Nessun codice?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Reinvia codice"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Chiamami"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Ancora nessun codice?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Inserisci il codice che abbiamo inviato a %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Abbiamo appena reinviato un codice a %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Impostazioni"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contatto sconosciuto"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Stato sconosciuto"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Sconosciuto"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index 1cc632ba8..b75d42b11 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "検索"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます: %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます:%@ と %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます: %@, %@, %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "会話を始めてみましょう"; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "「%@」について何も見つかりませんでした"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "リセット"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45°回転"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90°回転"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "画像の共有は%@点までです。"; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "この電話番号は登録ロックが設定されています。登録ロックPINを入力してください。"; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "PINは、あなたの電話から送信された自動認証コードとは別の暗証番号です。"; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "PINを忘れました"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "登録鍵"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "メッセージに「人間っぽさ」を加える"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "パーミッションを有効化する"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "情報は常に安全に送信されます"; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "あとで"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signalがメッセージの受信時間（相手）を知らせる"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "あなたの電話番号を入力してください"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "不正な番号です"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signalのプロフィールは暗号化され、Signalのサービスさえアクセスできません。"; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "あなたの名前"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "プロフィールの設定"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "利用規約と個人情報保護"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signalは誰でも使えるメッセンジャーアプリです。"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "番号違いですか？"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "（%@にある）コードを得られませんでした"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "コードが不正です"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "コードが得られませんでした"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "SMSショートメッセージが受信できるようになっているか確認してください。"; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "コードがない？"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "コードの再送信"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "音声通話で受信する"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "コードがまだ届かない？"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "%@に送信したコードを入力してください"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "%@にコードを再送しました"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "設定"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "不明な連絡先"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "国名が不明"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "不明"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 51ce98d7f..61c62a9fe 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -1476,7 +1476,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "ស្វែងរកបញ្ជីទំនាក់ទំនងតាមលេខទូរសព្ទ"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "កំណត់ចំណាំ"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "អ្នកប្រហែលបានទទួលសារ នៅពេល %@ របស់អ្នក កំពុងបើកឡើងវិញ។"; @@ -2460,7 +2460,7 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Turn On Typing Indicators"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optional link previews are now supported for some of the most popular sites on the Internet."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "ការមើលតំណភ្ជាប់ ជាជម្រើសរើស ឥឡូវត្រូវបានគាំទ្រសម្រាប់គេហទំព័រពេញនិយមបំផុតមួយចំនួន​នៅលើអ៊ីនធឺណិត។"; /* Subtitle for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 95475372e..df587de5b 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ieškoti"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@, jau yra Signal."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@ ir %@, jau yra Signal"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@, %@ ir %@, jau yra Signal"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Pradėkite savo pirmąjį pokalbį čia."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Užklausai \"%@\" nerasta jokių rezultatų"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Atstatyti"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Pasukti 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Pasukti 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Negalite dalintis daugiau nei %@ elementais."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Šiam telefono numeriui yra įjungtas Registracijos užraktas. Įveskite Registracijos užrakto PIN."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Jūsų registracijos užrakto PIN yra atskirai nuo automatizuoto patvirtinimo kodo, kuris paskutinio žingsnio metu buvo išsiųstas į jūsų telefoną."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Aš pamiršau savo PIN"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registracijos užraktas"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Pridėkite į savo žinutes lašelį žmogiškumo"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Įjungti leidimus"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Jūsų kontaktinė informacija yra visada persiunčiama saugiai."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ne dabar"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal gali jums pranešti, kai gaunate žinutę (ir nuo ko jinai yra)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Norėdami pradėti, įveskite savo telefono numerį"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neteisingas numeris"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiliai yra užšifruoti ištisiniu būdu, o Signal paslauga niekada neturi prieigos prie šios informacijos."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Jūsų vardas"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Nusistatykite savo profilį"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Sąlygos ir Privatumo politika"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal yra privati pokalbių programa visiems"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Neteisingas numeris?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Aš negavau kodo (prieinama po %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Šis kodas yra neteisingas"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Aš negavau kodo"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Įsitikinkite, kad jūsų mobiliojo ryšio paslauga veikia ir, kad galite gauti SMS žinutes."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Nėra kodo?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Siųsti kodą iš naujo"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Vietoj to man skambinti"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Vis dar nėra kodo?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Įveskite kodą, kurį išsiuntėme į %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Ką tik iš naujo išsiuntėme kodą į %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Nustatymai"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Nežinomas kontaktas"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Nežinoma šalis"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nežinoma"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 507bae7b5..5d31651ac 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Zoeken"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@ en %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@, %@ en %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Begin je eerste gesprek hier."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Geen resultaten voor ‘%@’ gevonden"; @@ -1084,13 +1084,13 @@ "IMAGE_EDITOR_CROP_BUTTON" = "Bijsnijden"; /* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Opnieuw instellen"; +"IMAGE_EDITOR_RESET_BUTTON" = "Opnieuw beginnen"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Roteer 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Roteer 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Je kunt niet meer dan %@ items delen."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Registratievergrendeling is ingeschakeld voor dit telefoonnummer. Voer de pincode voor registratievergrendeling in."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Je registratievergrendelingspincode is iets anders dan de automatische verificatiecode die in de vorige stap naar je telefoon is gestuurd."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Ik ben mijn pincode vergeten"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registratievergrendeling"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Voeg iets menselijks toe aan je berichten"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Geef toestemmingen"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Je contactinformatie wordt altijd beveiligd uitgewisseld."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Niet nu"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal kan je laten weten wanneer je een bericht ontvangt (en van wie)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Voer je telefoonnummer in om te beginnen"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ongeldig nummer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal-profielen zijn eind-tot-eind-versleuteld en de Signal-dienst heeft nooit toegang tot deze informatie."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Je naam"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Stel je profiel op"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Voorwaarden en privacybeleid"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal is de privéberichtenapp voor iedereen"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Verkeerd nummer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Ik heb geen code ontvangen (beschikbaar na %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Deze code is onjuist"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Ik heb geen code ontvangen"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Ga na dat je mobiel bereik hebt en dat je sms-berichten kunt ontvangen."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Geen code?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Stuur code opnieuw"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Bel me"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Nog steeds geen code?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Voer de code in die we hebben verzonden naar %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We hebben zojuist opnieuw een code verzonden naar %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Instellingen"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Onbekend contact"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Onbekend land"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Onbekend"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 3c36b0f40..78337c285 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -1066,7 +1066,7 @@ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Rozpocznij tutaj swoją pierwszą rozmowę."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nie znaleziono wyników dla '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Reset"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Obróć o 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Obróć o 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nie można udostępnić więcej niż %@ multimediów."; @@ -1509,49 +1509,49 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Ten numer telefonu ma włączoną blokadę rejestracji. Wprowadź kod PIN blokady rejestracji."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Twój kod PIN blokady rejestracji jest oddzielony od automatycznego kodu weryfikacyjnego, który został wysłany na Twój telefon w ostatnim kroku."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Nie pamiętam PIN-u"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Blokada rejestracji"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Dodaj odrobinę człowieczeństwa do swoich wiadomości"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Włącz uprawnienia"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Twoje dane kontaktowe są zawsze przekazywane w bezpieczny sposób."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nie teraz"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal poinformuje Cię, kiedy otrzymasz wiadomość (i od kogo pochodzi)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Aby rozpocząć, wprowadź swój numer telefonu."; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Nieprawidłowy numer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Profile Signal są szyfrowane end-to-end, a Signal nigdy nie ma dostępu do tych informacji."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Twoje imię"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Skonfiguruj swój profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Regulamin i Polityka Prywatności"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal to prywatny komunikator dla każdego"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Błędny numer?"; @@ -1560,31 +1560,31 @@ "ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Kod jest nieprawidłowy"; /* Label for link that can be used when the original code did not arrive. */ "ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Upewnij się, że posiadasz włączoną usługę komórkową i możesz odbierać wiadomości SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Brak kodu?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Wyślij kod ponownie"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Zadzwoń do mnie"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Nadal nie ma kodu?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Wprowadź kod, który wysłaliśmy na %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Ponownie wysłaliśmy kod na %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ustawienia"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Nieznany kontakt"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Nieznany kraj"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Nieznany"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 51bb8bc7c..b3d40f118 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Procurar"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@ e %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Inicie a sua primeira conversa aqui."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Não se encontraram resultados para '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rodar 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rodar 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Não pode partilhar mais do que %@ itens."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Este número de telefone tem o bloqueio de registo ativo. Por favor, introduza o PIN de bloqueio do registo."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "O seu PIN de bloqueio é separado do código de verificação automático que foi enviado para o seu telefone no último passo."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Esqueci-me do PIN"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Bloqueio de registo"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Adicione um toque de humanidade às suas mensagens"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Ativar permissões"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "A sua informação de contacto é transmitida sempre de forma segura."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Agora não"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "O Signal pode informá-lo quando recebe uma mensagem (e quem a enviou)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Introduza o seu número de telefone para começar"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número inválido"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Os perfis do Signal são encriptados de extremo-a-extremo e o serviço do Signal nunca tem acesso a esta informação."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "O seu nome"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Configurar o seu perfil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos e política de privacidade"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "O SIgnal é o mensageiro privado para todos"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Não obtive um código (disponível em %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "O código está incorreto"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Não obtive um código"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Por favor certifique-se que tem o serviço celular disponível e que pode receber mensagens SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Sem código?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Reenviar código"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Alternativamente, ligue-me"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Continua sem código?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Introduza o código que enviamos para %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Acabámos de enviar um código para %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Definições"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contacto desconhecido"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "País desconhecido"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconhecido"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index f35bb90bf..5e21ad176 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Поиск"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@ и %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@, %@ и %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Начните ваш первый разговор здесь."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Результаты не найдены для '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Сбросить"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Повернуть на 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Повернуть на 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Невозможно поделиться более чем %@ элементами."; @@ -1509,10 +1509,10 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Для этого номера телефона включена блокировка регистрации. Пожалуйста, введите PIN-код блокировки регистрации."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Ваш PIN-код блокировки регистрации не совпадает с автоматическим кодом подтверждения, который был отправлен на ваш телефон в предыдущем шаге."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Я забыл свой PIN-код"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Блокировка регистрации"; @@ -1521,70 +1521,70 @@ "ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Включить разрешения"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Информация о ваших контактах всегда передаётся в защищённом виде."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Не сейчас"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal может дать вам знать, когда вы получаете сообщение (и от кого оно)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Введите ваш номер телефона, чтобы начать"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Неверный номер"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Профили Signal всегда защищены сквозным шифрованием, и сервис Signal никогда не имеет доступ к этой информации."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Ваше имя"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Настройте ваш профиль"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Условия и политика конфиденциальности"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal - это приватный мессенджер для всех"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Неправильный номер?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Я не получил код (доступно через %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Этот код неверен"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Я не получил код"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Пожалуйста, убедитесь, что вы в зоне доступа мобильной сети и можете принимать SMS-сообщения."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Нет кода?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Отправить код ещё раз"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Позвонить мне вместо этого"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Всё ещё нет кода?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Введите код, который мы отправили на %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Мы только что отправили код ещё раз на %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Настройки"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Неизвестный контакт"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Неизвестная страна"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Неизвестно"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 91ac8926c..86f3569f8 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Kërko"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Disa nga kontaktet tuaja kanë tashmë Signal, përfshi %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Disa nga kontaktet tuaj kanë tashmë Signal, përfshi %@ dhe %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Disa nga kontaktet tuaja kanë tashmë Signal, përfshi %@, %@ dhe %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Filloni këtu bisedën tuaj të parë."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "S’u gjetën përfundime kërkimi për '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Riktheje"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rrotulloje me 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rrotulloje me 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "S’mund të ndani me të tjerët më tepër se %@ objekte."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Ky numër telefoni ka të aktivizuar Kyçje Regjistrimi. Ju lutemi, jepni PIN Kyçjeje Regjistrimi."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "PIN-i juaj për Kyçje Regjistrimesh është tjetër gjë nga kodi i verifikimit të automatizuar që u dërgua për telefonin tuaj gjatë hapit të fundit."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Harrova PIN-in tim"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Kyçje Regjistrimi"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Shtojini një grimë dore njerëzore mesazheve tuaj"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Aktivizoni Leje"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Të dhënat tuaja të kontaktit transmetohen përherë në mënyrë të sigurt."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Jo Tani"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal-i mund t’ju lejojë të mësoni se kur merrni një mesazh (dhe se prej kujt është)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Që t’ia filloni, jepni numrin tuaj të telefonit"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Numër i pavlefshëm"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Profilet Signal janë të fshehtëzuara skaj-më-skaj dhe shërbimi Signal nuk ka hyn dot kurrë në këto të dhëna."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Emri Juaj"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Ujdisni profilin tuaj"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Kushte & Rregulla Privatësie"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal-i është i sjell mesazhet private për këdo"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numër i gabuar?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "S’mora kod (i passhëm te %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Ky kod është i pasaktë"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "S’mora kod"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Ju lutemi, sigurohuni se keni shërbim celular dhe mund të merrni mesazhe SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Pa kod?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Ridërgomëni kod"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Më mirë më thirr"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Prapë s’ka kod?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Jepni kodin që dërguam te %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Sapo ridërguam një kod te %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Rregullime"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Kontakt i Panjohur"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Vend i Panjohur"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "E panjohur"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index d91fbceb8..ed0b4570f 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ara"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@ ve %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@, %@ ve %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "İlk sohbetinizi buradan başlatın."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "'%@' ile eşleşen sonuç bulunamadı"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Sıfırla"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45 derece döndür"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90 derece döndür"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "%@ öğeden daha fazlasını paylaşamazsınız."; @@ -1506,85 +1506,85 @@ "OK" = "Tamam"; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_1" = "Bu telefon numarası Kaydolma Kilidini etkinleştirmiş. Lütfen Kaydolma Kilidi PIN'ini giriniz."; +"ONBOARDING_2FA_EXPLANATION_1" = "Bu telefon numarası Kayıt Kilidini etkinleştirmiş. Lütfen Kaydolma Kilidi PIN'ini giriniz."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Kayıt Kilidi PIN'iniz son adımda size gönderilen doğrulama kodundan farklıdır."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "PIN'imi unuttum"; /* Title of the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_TITLE" = "Kaydolma Kilidi"; +"ONBOARDING_2FA_TITLE" = "Kayıt Kilidi"; /* Title of the 'onboarding Captcha' view. */ "ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "İzinleri Etkinleştir"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Kişi bilgileriniz her zaman güvenle aktarılır."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Şimdi Değil"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal mesaj geldiğinde (kimden olduğu ile birlikte) size bildirir"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Başlamak için telefon numaranızı giriniz"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Geçersiz numara"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profilleri uçtan uca şifrelidir ve Signal hizmeti asla bu bilgiye erişime sahip olmaz."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "İsminiz"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Profilinizi ayarlayın"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Şartlar ve Gizlilik İlkesi"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal herkesin kullanabileceği gizli mesajlaşma uygulamasıdır"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Yanlış numara?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Kod gelmedi (kullanımına %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Bu kod doğru değil"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Kod gelmedi"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Lütfen hücresel hizmete bağlı olduğunuzu ve SMS mesajları alabildiğinizi doğrulayın."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Kod gelmedi mi?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Kodu tekrar gönder"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Bunun yerine beni ara"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Hala kod gelmedi mi?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "%@ numarasına gönderdiğimiz kodu girin"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Az önce %@ numarasına tekrar kod gönderdik"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Ayarlar"; @@ -1794,7 +1794,7 @@ "QUOTED_REPLY_TYPE_VIDEO" = "Video"; /* Label for 'I forgot my PIN' link in the 2FA registration view. */ -"REGISTER_2FA_FORGOT_PIN" = "PIN kodumu unuttum."; +"REGISTER_2FA_FORGOT_PIN" = "PIN'imi unuttum."; /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Bu telefon numarasının kaydı, numaranın en son Signal üzerinde aktif olmasının üzerinden 7 gün geçtikten sonra Kayıt Kilidi PIN'iniz olmadan mümkün olabilecektir."; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Bilinmeyen Kişi"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Bilinmeyen Ülke"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Bilinmeyen"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 364040631..eafe9155a 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜索"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@。"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@和%@。"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@，%@，以及%@。"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "从这里开始新的会话。"; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "没有找到“%@”的相关结果。"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "复位"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "旋转45度"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "旋转90度"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "您最多分享%@项。"; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "该电话号码已经开启注册锁。请输入注册锁PIN码。"; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "您的注册锁 PIN 码与最后一步时发送给您的验证码是不同的。"; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "我忘记了PIN码"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "注册锁"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "给您的消息添加一点人情味"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "开启权限"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "您的联系人信息一直是加密传送的。"; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "以后再说"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal会及时提醒您收到了谁的信息"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "输入您的手机号以开始使用"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "无效的号码"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal的个人资料都是端到端加密的。Signal服务器永远不会有权访问此数据。"; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "你的名字"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "设置您的资料"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "协议与隐私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal是适合所有人的私密即时通讯工具"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "错误的号码？"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "我没有收到验证码（%@后可用）"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "验证码不正确"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "我没有收到验证码"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "请确保您可以联网并接收短信。"; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "没收到验证码？"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "重新发送验证码"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "改成给我打电话"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "仍然没收到验证码？"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "请输入我们发送到%@的验证码"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "我们刚刚向%@发送了验证码"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "设置"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "未知的联系人"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "未知国家"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "无法识别"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index c7ce3b570..ad4ea0e70 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜尋"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "有些你的聯絡人已經在使用 Signal了，包括%@。"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "有些你的聯絡人已經在使用Signal 了，包括 %@ 及%@。"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "有些你的聯絡人已經在使用 Signal 了，包括 %@、%@及%@。"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "從這裡開始使用你的第一個對話。"; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "找不到有關 '%@' 的結果"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "重設"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "旋轉 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "旋轉 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "你無法分享超過%@個項目。"; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "此電話號碼已啟用註冊鎖定。請輸入註冊鎖定 PIN 碼。"; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "你的註冊鎖定PIN碼與你上一步驟傳到你手機的驗證碼是不同的。"; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "我忘記自己的 PIN碼。"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "註冊鎖定"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "為你的訊息增加一點人性。"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "開啟權限"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "你的聯絡人資訊間的傳輸永遠是安全的。"; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "稍後"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal 可以讓你知道你甚麼時候收到訊息(及誰傳訊息給你)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "輸入你的電話號碼即可開始使用。"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "無效號碼"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal 資訊是點對點加密，及Signal 的服務絕不會觸及到這些資訊。"; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "你的名稱"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "設定你的資訊"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "服務條款與隱私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Signal 是給所有人私密的訊息傳輸服務。"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "錯誤的號碼？"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "我沒有收到驗證碼(由%@提供)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "這個驗證碼是不正確的。"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "我沒有收到驗證碼。"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "請確認你的手機網路服務可以收到 SMS訊息。"; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "沒有收到驗證碼？"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "重新傳送驗證碼"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "改為撥電話給我"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "還是沒有收到驗證碼？"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "請輸入我們傳送給 %@ 的驗證碼。"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "我們剛重傳一個驗證碼給 %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "設定"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "未知的聯絡人"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "未知的國家"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "未知"; From 77b1a2a728d32cb2b5b4d039e3dd7a8ad02c6464 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Feb 2019 17:51:06 -0700 Subject: [PATCH 178/493] "Bump build to 2.37.0.6." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index ffc174007..deb40db6a 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.5 + 2.37.0.6 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 66cbb39dc..4b319dcf4 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.5 + 2.37.0.6 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 87646b1798ad188717923f7a066e68046da0e5ca Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 11:15:46 -0500 Subject: [PATCH 179/493] Replace old caption view with new caption view. --- Signal.xcodeproj/project.pbxproj | 4 + .../AttachmentApprovalViewController.swift | 533 +----------------- .../AttachmentCaptionViewController.swift | 309 ++++++++++ .../ImageEditor/ImageEditorPaletteView.swift | 2 - .../Views/ImageEditor/ImageEditorView.swift | 11 + 5 files changed, 343 insertions(+), 516 deletions(-) create mode 100644 SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 3add7cb25..ce1384943 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; }; 34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */; }; + 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -638,6 +639,7 @@ 34074F5F203D0CBD004596AE /* OWSSounds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSSounds.m; sourceTree = ""; }; 34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = ""; }; 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPaletteView.swift; sourceTree = ""; }; + 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -2106,6 +2108,7 @@ isa = PBXGroup; children = ( 34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */, + 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */, 34AC09CF211B39B000997B47 /* ContactFieldView.swift */, 34AC09CD211B39B000997B47 /* ContactShareApprovalViewController.swift */, 34AC09DB211B39B100997B47 /* CountryCodeViewController.h */, @@ -3328,6 +3331,7 @@ 34AC09E1211B39B100997B47 /* SelectThreadViewController.m in Sources */, 34AC09EF211B39B100997B47 /* ViewControllerUtils.m in Sources */, 346941A2215D2EE400B5BFAD /* OWSConversationColor.m in Sources */, + 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */, 34AC0A17211B39EA00997B47 /* VideoPlayerView.swift in Sources */, 34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */, 34AC09EE211B39B100997B47 /* EditContactShareNameViewController.swift in Sources */, diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 53b149cc9..3b9dbc744 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -226,49 +226,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // layout immediately to avoid animating the layout process during the transition self.currentPageViewController.view.layoutIfNeeded() - - // As a refresher, the _Information Architecture_ here is: - // - // You are approving an "Album", which has multiple "Attachments" - // - // The "media message text" and the "media rail" belong to the Album as a whole, whereas - // each caption belongs to the individual Attachment. - // - // The _UI Architecture_ reflects this hierarchy by putting the MediaRail and - // MediaMessageText input into the bottomToolView which is then the AttachmentApprovalView's - // inputAccessoryView. - // - // Whereas a CaptionView lives in each page of the PageViewController, per Attachment. - // - // So as you page, the CaptionViews move out of view with its page, whereas the input - // accessory view (rail/media message text) will remain fixed in the viewport. - // - // However (and here's the kicker), at rest, the media's CaptionView rests just above the - // input accessory view. So when things are static, they appear as a single piece of - // interface. - // - // I'm not totally sure if this is what Myles had in mind, but the screenshots left a lot of - // behavior ambiguous, and this was my best interpretation. - // - // Because of this complexity, it is insufficient to observe only the - // KeyboardWillChangeFrame, since the keyboard could be changing frame when the CaptionView - // became/resigned first responder, when AttachmentApprovalViewController became/resigned - // first responder, or when the AttachmentApprovalView's inputAccessoryView.textView - // became/resigned first responder, and because these things can happen in immediatre - // sequence, getting a single smooth animation requires handling each notification slightly - // differently. - NotificationCenter.default.addObserver(self, - selector: #selector(keyboardWillShow(notification:)), - name: .UIKeyboardWillShow, - object: nil) - NotificationCenter.default.addObserver(self, - selector: #selector(keyboardDidShow(notification:)), - name: .UIKeyboardDidShow, - object: nil) - NotificationCenter.default.addObserver(self, - selector: #selector(keyboardWillHide(notification:)), - name: .UIKeyboardWillHide, - object: nil) } override public func viewWillAppear(_ animated: Bool) { @@ -282,8 +239,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return } navigationBar.overrideTheme(type: .clear) - - updateCaptionVisibility() } override public func viewDidAppear(_ animated: Bool) { @@ -310,66 +265,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return true } - var lastObservedKeyboardTop: CGFloat = 0 - var inputAccessorySnapshotView: UIView? - - @objc - func keyboardDidShow(notification: Notification) { - // If this is a result of the vc becoming first responder, the keyboard isn't actually - // showing, rather the inputAccessoryView is now showing, so we want to remove any - // previously added toolbar snapshot. - if isFirstResponder, inputAccessorySnapshotView != nil { - removeToolbarSnapshot() - } - } - - @objc - func keyboardWillShow(notification: Notification) { - guard let userInfo = notification.userInfo else { - owsFailDebug("userInfo was unexpectedly nil") - return - } - - guard let keyboardStartFrame = userInfo[UIKeyboardFrameBeginUserInfoKey] as? CGRect else { - owsFailDebug("keyboardEndFrame was unexpectedly nil") - return - } - - guard let keyboardEndFrame = userInfo[UIKeyboardFrameEndUserInfoKey] as? CGRect else { - owsFailDebug("keyboardEndFrame was unexpectedly nil") - return - } - - Logger.debug("\(keyboardStartFrame) -> \(keyboardEndFrame)") - lastObservedKeyboardTop = keyboardEndFrame.size.height - - let keyboardScenario: KeyboardScenario = bottomToolView.isEditingMediaMessage ? .editingMessage : .editingCaption - currentPageViewController.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario) - } - - @objc - func keyboardWillHide(notification: Notification) { - guard let userInfo = notification.userInfo else { - owsFailDebug("userInfo was unexpectedly nil") - return - } - - guard let keyboardStartFrame = userInfo[UIKeyboardFrameBeginUserInfoKey] as? CGRect else { - owsFailDebug("keyboardEndFrame was unexpectedly nil") - return - } - - guard let keyboardEndFrame = userInfo[UIKeyboardFrameEndUserInfoKey] as? CGRect else { - owsFailDebug("keyboardEndFrame was unexpectedly nil") - return - } - - Logger.debug("\(keyboardStartFrame) -> \(keyboardEndFrame)") - - lastObservedKeyboardTop = UIScreen.main.bounds.height - keyboardEndFrame.size.height - currentPageViewController.updateCaptionViewBottomInset(keyboardScenario: .hidden) - } - // MARK: - View Helpers func remove(attachmentItem: SignalAttachmentItem) { @@ -412,12 +307,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return pagerScrollView }() - func updateCaptionVisibility() { - for pageViewController in pageViewControllers { - pageViewController.updateCaptionVisibility(attachmentCount: attachments.count) - } - } - // MARK: - UIPageViewControllerDelegate public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) { @@ -433,9 +322,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // use compact scale when keyboard is popped. let scale: AttachmentPrepViewController.AttachmentViewScale = self.isFirstResponder ? .fullsize : .compact pendingPage.setAttachmentViewScale(scale, animated: false) - - let keyboardScenario: KeyboardScenario = bottomToolView.isEditingMediaMessage ? .editingMessage : .hidden - pendingPage.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario) } } @@ -524,7 +410,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC Logger.debug("cache miss.") let viewController = AttachmentPrepViewController(attachmentItem: item) viewController.prepDelegate = self - viewController.updateCaptionVisibility(attachmentCount: attachments.count) cachedPages[item] = viewController return viewController @@ -537,8 +422,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } page.loadViewIfNeeded() - let keyboardScenario: KeyboardScenario = bottomToolView.isEditingMediaMessage ? .editingMessage : .hidden - page.updateCaptionViewBottomInset(keyboardScenario: keyboardScenario) self.setViewControllers([page], direction: direction, animated: isAnimated, completion: nil) updateMediaRail() @@ -699,74 +582,6 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) } - - func prepViewController(_ prepViewController: AttachmentPrepViewController, willBeginEditingCaptionView captionView: CaptionView) { - // When the CaptionView becomes first responder, the AttachmentApprovalViewController will - // consequently resignFirstResponder, which means the bottomToolView would disappear from - // the screen, so before that happens, we add a snapshot to holds it's place. - addInputAccessorySnapshot() - } - - func prepViewController(_ prepViewController: AttachmentPrepViewController, didBeginEditingCaptionView captionView: CaptionView) { - // Disable paging while captions are being edited to avoid a clunky animation. - // - // Loading the next page causes the CaptionView to resign first responder, which in turn - // dismisses the keyboard, which in turn affects the vertical offset of both the CaptionView - // from the page we're leaving as well as the page we're entering. Instead we require the - // user to dismiss *then* swipe. - disablePaging() - } - - func addInputAccessorySnapshot() { - assert(inputAccessorySnapshotView == nil) - // To fix a layout glitch where the snapshot view is 1/2 the width of the screen, it's key - // that we use `bottomToolView` and not `inputAccessoryView` which can trigger a layout of - // the `bottomToolView`. - // Presumably the frame of the inputAccessoryView has just changed because we're in the - // middle of switching first responders. We want a snapshot as it *was*, not reflecting any - // just-applied superview layout changes. - inputAccessorySnapshotView = bottomToolView.snapshotView(afterScreenUpdates: true) - guard let inputAccessorySnapshotView = inputAccessorySnapshotView else { - owsFailDebug("inputAccessorySnapshotView was unexpectedly nil") - return - } - - view.addSubview(inputAccessorySnapshotView) - inputAccessorySnapshotView.autoSetDimension(.height, toSize: bottomToolView.bounds.height) - inputAccessorySnapshotView.autoPinEdgesToSuperviewEdges(with: .zero, excludingEdge: .top) - } - - func removeToolbarSnapshot() { - guard let inputAccessorySnapshotView = self.inputAccessorySnapshotView else { - owsFailDebug("inputAccessorySnapshotView was unexpectedly nil") - return - } - inputAccessorySnapshotView.removeFromSuperview() - self.inputAccessorySnapshotView = nil - } - - func prepViewController(_ prepViewController: AttachmentPrepViewController, didEndEditingCaptionView captionView: CaptionView) { - enablePaging() - } - - func desiredCaptionViewBottomInset(keyboardScenario: KeyboardScenario) -> CGFloat { - switch keyboardScenario { - case .hidden, .editingMessage: - return bottomToolView.bounds.height - case .editingCaption: - return lastObservedKeyboardTop - } - } - - // MARK: Helpers - - func disablePaging() { - pagerScrollView?.panGestureRecognizer.isEnabled = false - } - - func enablePaging() { - pagerScrollView?.panGestureRecognizer.isEnabled = true - } } // MARK: GalleryRail @@ -818,12 +633,6 @@ enum KeyboardScenario { protocol AttachmentPrepViewControllerDelegate: class { func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) - - func prepViewController(_ prepViewController: AttachmentPrepViewController, willBeginEditingCaptionView captionView: CaptionView) - func prepViewController(_ prepViewController: AttachmentPrepViewController, didBeginEditingCaptionView captionView: CaptionView) - func prepViewController(_ prepViewController: AttachmentPrepViewController, didEndEditingCaptionView captionView: CaptionView) - - func desiredCaptionViewBottomInset(keyboardScenario: KeyboardScenario) -> CGFloat } public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate { @@ -861,30 +670,9 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD fatalError("init(coder:) has not been implemented") } - func updateCaptionVisibility(attachmentCount: Int) { - if attachmentCount > 1 { - captionView.isHidden = false - return - } - - // If we previously had multiple attachments, we'd have shown the caption fields. - // - // Subsequently, if the user had added caption text, then removed the other attachments - // we will continue to show this caption field, so as not to hide any already-entered text. - if let captionText = captionView.captionText, captionText.count > 0 { - captionView.isHidden = false - return - } - - captionView.isHidden = true - } - // MARK: - Subviews - lazy var captionView: CaptionView = { - return CaptionView(attachmentItem: attachmentItem) - }() - + // TODO: Do we still need this? lazy var touchInterceptorView: UIView = { let touchInterceptorView = UIView() let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:))) @@ -1023,12 +811,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD view.addSubview(touchInterceptorView) touchInterceptorView.autoPinEdgesToSuperviewEdges() touchInterceptorView.isHidden = true - - view.addSubview(captionView) - captionView.delegate = self - - captionView.autoPinWidthToSuperview() - captionViewBottomConstraint = captionView.autoPinEdge(toSuperviewEdge: .bottom) } override public func viewWillLayoutSubviews() { @@ -1041,40 +823,11 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD ensureAttachmentViewScale(animated: false) } - // MARK: CaptionView lifts with keyboard - - var hasLaidOutCaptionView: Bool = false - var captionViewBottomConstraint: NSLayoutConstraint! - func updateCaptionViewBottomInset(keyboardScenario: KeyboardScenario) { - guard let prepDelegate = self.prepDelegate else { - owsFailDebug("prepDelegate was unexpectedly nil") - return - } - - let changeBlock = { - let offset: CGFloat = -1 * prepDelegate.desiredCaptionViewBottomInset(keyboardScenario: keyboardScenario) - self.captionViewBottomConstraint.constant = offset - self.captionView.superview?.layoutIfNeeded() - } - - // To avoid an animation glitch, we apply this update without animation before initial - // appearance. But after that, we want to apply the constraint change within the existing - // animation context, since we call this while handling a UIKeyboard notification, which - // allows us to slide up the CaptionView in lockstep with the keyboard. - if hasLaidOutCaptionView { - changeBlock() - } else { - hasLaidOutCaptionView = true - UIView.performWithoutAnimation { changeBlock() } - } - } - // MARK: - Event Handlers @objc func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) { Logger.info("") - captionView.endEditing() touchInterceptorView.isHidden = true } @@ -1228,30 +981,12 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD } } -extension AttachmentPrepViewController: CaptionViewDelegate { - func captionViewWillBeginEditing(_ captionView: CaptionView) { - prepDelegate?.prepViewController(self, willBeginEditingCaptionView: captionView) - } - - func captionView(_ captionView: CaptionView, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) { +extension AttachmentPrepViewController: AttachmentCaptionDelegate { + func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) { let attachment = attachmentItem.attachment attachment.captionText = captionText prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem) } - - func captionViewDidBeginEditing(_ captionView: CaptionView) { - // Don't allow user to pan until they've dismissed the keyboard. - // This avoids a really ugly animation from simultaneously dismissing the keyboard - // while loading a new PrepViewController, and it's CaptionView, whose layout depends - // on the keyboard's position. - touchInterceptorView.isHidden = false - prepDelegate?.prepViewController(self, didBeginEditingCaptionView: captionView) - } - - func captionViewDidEndEditing(_ captionView: CaptionView) { - touchInterceptorView.isHidden = true - prepDelegate?.prepViewController(self, didEndEditingCaptionView: captionView) - } } extension AttachmentPrepViewController: UIScrollViewDelegate { @@ -1331,15 +1066,27 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { if withNavigation { let navigationController = OWSNavigationController(rootViewController: viewController) navigationController.modalPresentationStyle = .overFullScreen - self.present(navigationController, animated: true) { + + if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { + navigationBar.overrideTheme(type: .clear) + } else { + owsFailDebug("navigationBar was nil or unexpected class") + } + + self.present(navigationController, animated: false) { // Do nothing. } } else { - self.present(viewController, animated: true) { + self.present(viewController, animated: false) { // Do nothing. } } } + + public func imageEditorPresentCaptionView() { + let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) + self.imageEditor(presentFullScreenOverlay: view, withNavigation: true) + } } // MARK: - @@ -1393,251 +1140,9 @@ class BottomToolView: UIView { } } -protocol CaptionViewDelegate: class { - func captionView(_ captionView: CaptionView, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) - func captionViewWillBeginEditing(_ captionView: CaptionView) - func captionViewDidBeginEditing(_ captionView: CaptionView) - func captionViewDidEndEditing(_ captionView: CaptionView) -} - -class CaptionView: UIView { - - var captionText: String? { - get { return textView.text } - set { - textView.text = newValue - updatePlaceholderTextViewVisibility() - } - } - - let attachmentItem: SignalAttachmentItem - var attachment: SignalAttachment { - return attachmentItem.attachment - } - - weak var delegate: CaptionViewDelegate? - - private let kMinTextViewHeight: CGFloat = 38 - private var textViewHeightConstraint: NSLayoutConstraint! - - private lazy var lengthLimitLabel: UILabel = { - let lengthLimitLabel = UILabel() - - // Length Limit Label shown when the user inputs too long of a message - lengthLimitLabel.textColor = .white - lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the attachment caption.") - lengthLimitLabel.textAlignment = .center - - // Add shadow in case overlayed on white content - lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) - lengthLimitLabel.layer.shadowOpacity = 0.8 - lengthLimitLabel.isHidden = true - - return lengthLimitLabel - }() - - // MARK: Initializers - - init(attachmentItem: SignalAttachmentItem) { - self.attachmentItem = attachmentItem - - super.init(frame: .zero) - - backgroundColor = UIColor.black.withAlphaComponent(0.6) - - self.captionText = attachmentItem.captionText - textView.delegate = self - - let textContainer = UIView() - textContainer.addSubview(placeholderTextView) - placeholderTextView.autoPinEdgesToSuperviewEdges() - - textContainer.addSubview(textView) - textView.autoPinEdgesToSuperviewEdges() - textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) - - let hStack = UIStackView(arrangedSubviews: [addCaptionButton, textContainer, doneButton]) - doneButton.isHidden = true - - addSubview(hStack) - hStack.autoPinEdgesToSuperviewMargins() - - addSubview(lengthLimitLabel) - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left) - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right) - lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textView, withOffset: -9) - lengthLimitLabel.setContentHuggingHigh() - lengthLimitLabel.setCompressionResistanceHigh() - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - // MARK: - - func endEditing() { - textView.resignFirstResponder() - } - - override var inputAccessoryView: UIView? { - // Don't inherit the vc's inputAccessoryView - return nil - } - - // MARK: Subviews - - func updatePlaceholderTextViewVisibility() { - let isHidden: Bool = { - guard !self.textView.isFirstResponder else { - return true - } - - guard let captionText = self.textView.text else { - return false - } - - guard captionText.count > 0 else { - return false - } - - return true - }() - - placeholderTextView.isHidden = isHidden - } - - private lazy var placeholderTextView: UITextView = { - let placeholderTextView = UITextView() - placeholderTextView.text = NSLocalizedString("ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER", comment: "placeholder text for an empty captioning field") - placeholderTextView.isEditable = false - - placeholderTextView.backgroundColor = .clear - placeholderTextView.font = UIFont.ows_dynamicTypeBody - - placeholderTextView.textColor = Theme.darkThemePrimaryColor - placeholderTextView.tintColor = Theme.darkThemePrimaryColor - placeholderTextView.returnKeyType = .done - - return placeholderTextView - }() - - private lazy var textView: UITextView = { - let textView = UITextView() - textView.backgroundColor = .clear - textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance - textView.font = UIFont.ows_dynamicTypeBody - textView.textColor = Theme.darkThemePrimaryColor - textView.tintColor = Theme.darkThemePrimaryColor - - return textView - }() - - lazy var addCaptionButton: UIButton = { - let addCaptionButton = OWSButton { [weak self] in - self?.textView.becomeFirstResponder() - } - - let icon = #imageLiteral(resourceName: "ic_add_caption").withRenderingMode(.alwaysTemplate) - addCaptionButton.setImage(icon, for: .normal) - addCaptionButton.tintColor = Theme.darkThemePrimaryColor - - return addCaptionButton - }() - - lazy var doneButton: UIButton = { - let doneButton = OWSButton { [weak self] in - self?.textView.resignFirstResponder() - } - doneButton.setTitle(CommonStrings.doneButton, for: .normal) - doneButton.tintColor = Theme.darkThemePrimaryColor - - return doneButton - }() -} - -let kMaxCaptionCharacterCount = 240 - // Coincides with Android's max text message length let kMaxMessageBodyCharacterCount = 2000 -extension CaptionView: UITextViewDelegate { - - public func textViewShouldBeginEditing(_ textView: UITextView) -> Bool { - delegate?.captionViewWillBeginEditing(self) - return true - } - - public func textViewDidBeginEditing(_ textView: UITextView) { - updatePlaceholderTextViewVisibility() - doneButton.isHidden = false - addCaptionButton.isHidden = true - - delegate?.captionViewDidBeginEditing(self) - } - - public func textViewDidEndEditing(_ textView: UITextView) { - updatePlaceholderTextViewVisibility() - doneButton.isHidden = true - addCaptionButton.isHidden = false - - delegate?.captionViewDidEndEditing(self) - } - - public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { - let existingText: String = textView.text ?? "" - let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) - - let kMaxCaptionByteCount = kOversizeTextMessageSizeThreshold / 4 - guard proposedText.utf8.count <= kMaxCaptionByteCount else { - Logger.debug("hit caption byte count limit") - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be - // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is - // to just measure the utf8 encoded bytes of the replaced substring. - let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count - - // Accept as much of the input as we can - let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete - if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - - // After verifying the byte-length is sufficiently small, verify the character count is within bounds. - // Normally this character count should entail *much* less byte count. - guard proposedText.count <= kMaxCaptionCharacterCount else { - Logger.debug("hit caption character count limit") - - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count - - // Accept as much of the input as we can - let charBudget: Int = Int(kMaxCaptionCharacterCount) - charsAfterDelete - if charBudget >= 0 { - let acceptableNewText = String(text.prefix(charBudget)) - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - - self.lengthLimitLabel.isHidden = true - return true - } - - public func textViewDidChange(_ textView: UITextView) { - self.delegate?.captionView(self, didChangeCaptionText: textView.text, attachmentItem: attachmentItem) - } -} - protocol MediaMessageTextToolbarDelegate: class { func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) @@ -1942,11 +1447,11 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { return true } - guard let captionText = self.textView.text else { + guard let text = self.textView.text else { return false } - guard captionText.count > 0 else { + guard text.count > 0 else { return false } diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift new file mode 100644 index 000000000..be541dba2 --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -0,0 +1,309 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +protocol AttachmentCaptionDelegate: class { + func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) +} + +class AttachmentCaptionViewController: OWSViewController { + + weak var delegate: AttachmentCaptionDelegate? + + private let attachmentItem: SignalAttachmentItem + + private let originalCaptionText: String? + + private let textView = UITextView() + + private var textViewHeightConstraint: NSLayoutConstraint? + + private let kMaxCaptionCharacterCount = 240 + + init(delegate: AttachmentCaptionDelegate, + attachmentItem: SignalAttachmentItem) { + self.delegate = delegate + self.attachmentItem = attachmentItem + self.originalCaptionText = attachmentItem.captionText + + super.init(nibName: nil, bundle: nil) + + self.addObserver(textView, forKeyPath: "contentSize", options: .new, context: nil) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + deinit { + self.removeObserver(textView, forKeyPath: "contentSize") + } + + open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) { + updateTextView() + } + + // MARK: - View Lifecycle + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + textView.becomeFirstResponder() + + updateTextView() + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + textView.becomeFirstResponder() + + updateTextView() + } + + public override func loadView() { + self.view = UIView() + self.view.backgroundColor = UIColor(white: 0, alpha: 0.25) + self.view.isOpaque = false + + self.view.isUserInteractionEnabled = true + self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(backgroundTapped))) + + configureTextView() + + let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, + target: self, + action: #selector(didTapCancel)) + cancelButton.tintColor = .white + navigationItem.leftBarButtonItem = cancelButton + let doneIcon = UIImage(named: "image_editor_checkmark_full")?.withRenderingMode(.alwaysTemplate) + let doneButton = UIBarButtonItem(image: doneIcon, style: .plain, + target: self, + action: #selector(didTapDone)) + doneButton.tintColor = .white + navigationItem.rightBarButtonItem = doneButton + + self.view.layoutMargins = .zero + + lengthLimitLabel.setContentHuggingHigh() + lengthLimitLabel.setCompressionResistanceHigh() + + let stackView = UIStackView(arrangedSubviews: [lengthLimitLabel, textView]) + stackView.axis = .vertical + stackView.spacing = 20 + stackView.alignment = .fill + stackView.addBackgroundView(withBackgroundColor: UIColor(white: 0, alpha: 0.5)) + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + stackView.isLayoutMarginsRelativeArrangement = true + self.view.addSubview(stackView) + stackView.autoPinEdge(toSuperviewEdge: .leading) + stackView.autoPinEdge(toSuperviewEdge: .trailing) + self.autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + + let minTextHeight: CGFloat = textView.font?.lineHeight ?? 0 + textViewHeightConstraint = textView.autoSetDimension(.height, toSize: minTextHeight) + + view.addSubview(placeholderTextView) + placeholderTextView.autoAlignAxis(.horizontal, toSameAxisOf: textView) + placeholderTextView.autoPinEdge(.leading, to: .leading, of: textView) + placeholderTextView.autoPinEdge(.trailing, to: .trailing, of: textView) + } + + private func configureTextView() { + textView.delegate = self + + textView.text = attachmentItem.captionText + textView.font = UIFont.ows_dynamicTypeBody + textView.textColor = .white + + textView.isEditable = true + textView.backgroundColor = .clear + textView.isOpaque = false + // We use a white cursor since we use a dark background. + textView.tintColor = .white + textView.isScrollEnabled = true + textView.scrollsToTop = false + textView.isUserInteractionEnabled = true + textView.textAlignment = .left + textView.textContainerInset = .zero + textView.textContainer.lineFragmentPadding = 0 + textView.contentInset = .zero + } + + // MARK: - Events + + @objc func backgroundTapped(sender: UIGestureRecognizer) { + AssertIsOnMainThread() + + completeAndDismiss(didCancel: false) + } + + @objc public func didTapCancel() { + completeAndDismiss(didCancel: true) + } + + @objc public func didTapDone() { + completeAndDismiss(didCancel: false) + } + + private func completeAndDismiss(didCancel: Bool) { + if didCancel { + self.delegate?.captionView(self, didChangeCaptionText: originalCaptionText, attachmentItem: attachmentItem) + } else { + self.delegate?.captionView(self, didChangeCaptionText: self.textView.text, attachmentItem: attachmentItem) + } + + self.dismiss(animated: true) { + // Do nothing. + } + } + + // MARK: - Length Limit + + private lazy var lengthLimitLabel: UILabel = { + let lengthLimitLabel = UILabel() + + // Length Limit Label shown when the user inputs too long of a message + lengthLimitLabel.textColor = UIColor.ows_destructiveRed + lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the attachment caption.") + lengthLimitLabel.textAlignment = .center + + // Add shadow in case overlayed on white content + lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor + lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + lengthLimitLabel.layer.shadowOpacity = 0.8 + lengthLimitLabel.isHidden = true + + return lengthLimitLabel + }() + + // MARK: - Text Height + + // TODO: We need to revisit this with Myles. + func updatePlaceholderTextViewVisibility() { + let isHidden: Bool = { + guard !self.textView.isFirstResponder else { + return true + } + + guard let captionText = self.textView.text else { + return false + } + + guard captionText.count > 0 else { + return false + } + + return true + }() + + placeholderTextView.isHidden = isHidden + } + + private lazy var placeholderTextView: UIView = { + let placeholderTextView = UITextView() + placeholderTextView.text = NSLocalizedString("ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER", comment: "placeholder text for an empty captioning field") + placeholderTextView.isEditable = false + + placeholderTextView.backgroundColor = .clear + placeholderTextView.font = UIFont.ows_dynamicTypeBody + + placeholderTextView.textColor = Theme.darkThemePrimaryColor + placeholderTextView.tintColor = Theme.darkThemePrimaryColor + placeholderTextView.returnKeyType = .done + + return placeholderTextView + }() + + // MARK: - Text Height + + private func updateTextView() { + guard let textViewHeightConstraint = textViewHeightConstraint else { + owsFailDebug("Missing textViewHeightConstraint.") + return + } + + let contentSize = textView.sizeThatFits(CGSize(width: textView.width(), height: CGFloat.greatestFiniteMagnitude)) + + // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here. + textView.contentSize = contentSize + + let minHeight: CGFloat = textView.font?.lineHeight ?? 0 + let maxHeight = minHeight * 4 + let newHeight = contentSize.height.clamp(minHeight, maxHeight) + + textViewHeightConstraint.constant = newHeight + textView.invalidateIntrinsicContentSize() + textView.superview?.invalidateIntrinsicContentSize() + + textView.isScrollEnabled = contentSize.height > maxHeight + + updatePlaceholderTextViewVisibility() + } +} + +extension AttachmentCaptionViewController: UITextViewDelegate { + + public func textViewDidChange(_ textView: UITextView) { + updateTextView() + } + + public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + let existingText: String = textView.text ?? "" + let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) + + let kMaxCaptionByteCount = kOversizeTextMessageSizeThreshold / 4 + guard proposedText.utf8.count <= kMaxCaptionByteCount else { + Logger.debug("hit caption byte count limit") + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be + // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is + // to just measure the utf8 encoded bytes of the replaced substring. + let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count + + // Accept as much of the input as we can + let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete + if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + + // After verifying the byte-length is sufficiently small, verify the character count is within bounds. + // Normally this character count should entail *much* less byte count. + guard proposedText.count <= kMaxCaptionCharacterCount else { + Logger.debug("hit caption character count limit") + + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count + + // Accept as much of the input as we can + let charBudget: Int = Int(kMaxCaptionCharacterCount) - charsAfterDelete + if charBudget >= 0 { + let acceptableNewText = String(text.prefix(charBudget)) + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + + self.lengthLimitLabel.isHidden = true + return true + } + + public func textViewDidBeginEditing(_ textView: UITextView) { + updatePlaceholderTextViewVisibility() + } + + public func textViewDidEndEditing(_ textView: UITextView) { + updatePlaceholderTextViewVisibility() + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 1f35fe06d..8f222cfe8 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -188,8 +188,6 @@ extension UIImage { return nil } - Logger.verbose("scale: \(self.scale)") - // Convert the location from points to pixels and clamp to the image bounds. let xPixels: Int = Int(round(locationPoints.x * self.scale)).clamp(0, imageWidth - 1) let yPixels: Int = Int(round(locationPoints.y * self.scale)).clamp(0, imageHeight - 1) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 4f6234503..45b120347 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -8,6 +8,7 @@ import UIKit public protocol ImageEditorViewDelegate: class { func imageEditor(presentFullScreenOverlay viewController: UIViewController, withNavigation: Bool) + func imageEditorPresentCaptionView() } // MARK: - @@ -278,6 +279,16 @@ public class ImageEditorView: UIView { @objc func didTapCaption(sender: UIButton) { Logger.verbose("") + delegate?.imageEditorPresentCaptionView() + +// // TODO: +// let maxTextWidthPoints = model.srcImageSizePixels.width * ImageEditorTextItem.kDefaultUnitWidth +// // let maxTextWidthPoints = canvasView.imageView.width() * ImageEditorTextItem.kDefaultUnitWidth +// +// let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) +// self.delegate?.imageEditor(presentFullScreenOverlay: textEditor, +// withNavigation: true) + // TODO: } From a630974e761c2da1889f82bc25bc02e7acc606bf Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 11:45:47 -0500 Subject: [PATCH 180/493] Use navigation bar for image editor buttons. --- .../ConversationViewController.m | 28 +++++++++ .../HomeView/HomeViewController.m | 6 ++ .../AttachmentApprovalViewController.swift | 58 +++++++++++++++++++ .../Views/ImageEditor/ImageEditorView.swift | 37 ++++++++++++ 4 files changed, 129 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 022f6af4e..ce8f355a7 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1269,6 +1269,34 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; + + dispatch_async(dispatch_get_main_queue(), ^{ + ConversationMediaAlbumItem *_Nullable firstMediaAlbumItem; + for (id item in self.viewItems) { + if (item.mediaAlbumItems.count < 1) { + continue; + } + ConversationMediaAlbumItem *mediaAlbumItem = item.mediaAlbumItems[0]; + if (mediaAlbumItem.attachmentStream && mediaAlbumItem.attachmentStream.isImage) { + firstMediaAlbumItem = mediaAlbumItem; + break; + } + } + if (!firstMediaAlbumItem) { + return; + } + DataSource *_Nullable dataSource = + [DataSourcePath dataSourceWithURL:firstMediaAlbumItem.attachmentStream.originalMediaURL + shouldDeleteOnDeallocation:NO]; + if (!dataSource) { + OWSFailDebug(@"attachment data was unexpectedly empty for picked document"); + return; + } + NSString *utiType = [MIMETypeUtil utiTypeForMIMEType:firstMediaAlbumItem.attachmentStream.contentType]; + SignalAttachment *attachment = + [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType imageQuality:TSImageQualityOriginal]; + [self showApprovalDialogForAttachment:attachment]; + }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 96125433d..f6b3f2ed7 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -672,6 +672,12 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + dispatch_async(dispatch_get_main_queue(), ^{ + TSThread *thread = + [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; + [self presentThread:thread action:ConversationViewActionNone animated:YES]; + }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 3b9dbc744..d6337e6ca 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -239,12 +239,16 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return } navigationBar.overrideTheme(type: .clear) + + updateNavigationBar() } override public func viewDidAppear(_ animated: Bool) { Logger.debug("") super.viewDidAppear(animated) + + updateNavigationBar() } override public func viewWillDisappear(_ animated: Bool) { @@ -265,6 +269,20 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return true } + // MARK: - Navigation Bar + + public func updateNavigationBar() { + var navigationBarItems = [UIBarButtonItem]() + + if let viewControllers = viewControllers, + viewControllers.count == 1, + let firstViewController = viewControllers.first as? AttachmentPrepViewController { + navigationBarItems = firstViewController.navigationBarItems() + } + + self.navigationItem.rightBarButtonItems = navigationBarItems + } + // MARK: - View Helpers func remove(attachmentItem: SignalAttachmentItem) { @@ -340,6 +358,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC updateMediaRail() } } + + updateNavigationBar() } // MARK: - UIPageViewControllerDataSource @@ -582,6 +602,10 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) } + + func prepViewControllerUpdateNavigationBar() { + self.updateNavigationBar() + } } // MARK: GalleryRail @@ -633,6 +657,8 @@ enum KeyboardScenario { protocol AttachmentPrepViewControllerDelegate: class { func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) + + func prepViewControllerUpdateNavigationBar() } public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate { @@ -657,6 +683,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD private(set) var scrollView: UIScrollView! private(set) var contentContainer: UIView! private(set) var playVideoButton: UIView? + private var imageEditorView: ImageEditorView? // MARK: - Initializers @@ -731,6 +758,8 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) if imageEditorView.configureSubviews() { + self.imageEditorView = imageEditorView + mediaMessageView.isHidden = true // TODO: Is this necessary? @@ -813,6 +842,22 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD touchInterceptorView.isHidden = true } + override public func viewWillAppear(_ animated: Bool) { + Logger.debug("") + + super.viewWillAppear(animated) + + prepDelegate?.prepViewControllerUpdateNavigationBar() + } + + override public func viewDidAppear(_ animated: Bool) { + Logger.debug("") + + super.viewDidAppear(animated) + + prepDelegate?.prepViewControllerUpdateNavigationBar() + } + override public func viewWillLayoutSubviews() { Logger.debug("") super.viewWillLayoutSubviews() @@ -823,6 +868,15 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD ensureAttachmentViewScale(animated: false) } + // MARK: - Navigation Bar + + public func navigationBarItems() -> [UIBarButtonItem] { + guard let imageEditorView = imageEditorView else { + return [] + } + return imageEditorView.navigationBarItems() + } + // MARK: - Event Handlers @objc @@ -1087,6 +1141,10 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) self.imageEditor(presentFullScreenOverlay: view, withNavigation: true) } + + public func imageEditorUpdateNavigationBar() { + prepDelegate?.prepViewControllerUpdateNavigationBar() + } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 45b120347..12d12a892 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -9,6 +9,7 @@ public protocol ImageEditorViewDelegate: class { func imageEditor(presentFullScreenOverlay viewController: UIViewController, withNavigation: Bool) func imageEditorPresentCaptionView() + func imageEditorUpdateNavigationBar() } // MARK: - @@ -182,6 +183,8 @@ public class ImageEditorView: UIView { paletteView.autoPinLeadingToSuperviewMargin(withInset: 10) updateButtons() + + delegate?.imageEditorUpdateNavigationBar() } private func configure(button: UIButton, @@ -235,6 +238,36 @@ public class ImageEditorView: UIView { paletteView.isHidden = !hasPalette } + // MARK: - Navigation Bar + + private func navigationBarButton(imageName: String, + selector: Selector) -> UIBarButtonItem { + let button = UIBarButtonItem(image: UIImage(named: imageName), style: .plain, target: self, action: selector) + button.tintColor = .white + return button + } + + public func navigationBarItems() -> [UIBarButtonItem] { + let undoButton = navigationBarButton(imageName: "image_editor_undo", + selector: #selector(didTapUndo(sender:))) + let brushButton = navigationBarButton(imageName: "image_editor_brush", + selector: #selector(didTapBrush(sender:))) + let cropButton = navigationBarButton(imageName: "image_editor_crop", + selector: #selector(didTapCrop(sender:))) + let newTextButton = navigationBarButton(imageName: "image_editor_checkmark_full", + selector: #selector(didTapNewText(sender:))) +// let doneButton = navigationBarButton(imageName:"image_editor_brush", +// selector: #selector(didTapDone(sender:))) + let captionButton = navigationBarButton(imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) + + if model.canUndo() { + return [undoButton, newTextButton, brushButton, cropButton, captionButton].reversed() + } else { + return [newTextButton, brushButton, cropButton, captionButton].reversed() + } + } + // MARK: - Actions @objc func didTapUndo(sender: UIButton) { @@ -654,10 +687,14 @@ extension ImageEditorView: ImageEditorModelObserver { public func imageEditorModelDidChange(before: ImageEditorContents, after: ImageEditorContents) { updateButtons() + + delegate?.imageEditorUpdateNavigationBar() } public func imageEditorModelDidChange(changedItemIds: [String]) { updateButtons() + + delegate?.imageEditorUpdateNavigationBar() } } From e47ceab41ca5c8cd6008228d2fd21ba7c11ce245 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 12:03:26 -0500 Subject: [PATCH 181/493] Use navigation bar for image editor buttons. --- .../AttachmentApprovalViewController.swift | 27 ++++++++++--------- .../Views/ImageEditor/ImageEditorView.swift | 19 +++++++------ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index d6337e6ca..e46c5788f 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -272,15 +272,24 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // MARK: - Navigation Bar public func updateNavigationBar() { - var navigationBarItems = [UIBarButtonItem]() + var navigationBarItems = [UIView]() if let viewControllers = viewControllers, viewControllers.count == 1, let firstViewController = viewControllers.first as? AttachmentPrepViewController { navigationBarItems = firstViewController.navigationBarItems() } + guard navigationBarItems.count > 0 else { + self.navigationItem.rightBarButtonItems = [] + return + } - self.navigationItem.rightBarButtonItems = navigationBarItems + let stackView = UIStackView(arrangedSubviews: navigationBarItems) + stackView.axis = .horizontal + stackView.spacing = 8 + stackView.alignment = .center + + self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: stackView) } // MARK: - View Helpers @@ -753,8 +762,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD mediaMessageView.autoPinEdgesToSuperviewEdges() #if DEBUG - if let imageEditorModel = attachmentItem.imageEditorModel, - let imageMediaView = mediaMessageView.contentView { + if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) if imageEditorView.configureSubviews() { @@ -762,13 +770,8 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD mediaMessageView.isHidden = true - // TODO: Is this necessary? - imageMediaView.isUserInteractionEnabled = true - - contentContainer.addSubview(imageEditorView) - imageEditorView.autoPin(toTopLayoutGuideOf: self, withInset: 0) - autoPinView(toBottomOfViewControllerOrKeyboard: imageEditorView, avoidNotch: true) - imageEditorView.autoPinWidthToSuperview() + view.addSubview(imageEditorView) + imageEditorView.autoPinEdgesToSuperviewEdges() imageEditorView.addControls(to: imageEditorView, viewController: self) @@ -870,7 +873,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD // MARK: - Navigation Bar - public func navigationBarItems() -> [UIBarButtonItem] { + public func navigationBarItems() -> [UIView] { guard let imageEditorView = imageEditorView else { return [] } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 12d12a892..5792edc16 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -241,30 +241,33 @@ public class ImageEditorView: UIView { // MARK: - Navigation Bar private func navigationBarButton(imageName: String, - selector: Selector) -> UIBarButtonItem { - let button = UIBarButtonItem(image: UIImage(named: imageName), style: .plain, target: self, action: selector) + selector: Selector) -> UIView { + let button = OWSButton() + button.setImage(imageName: imageName) button.tintColor = .white + button.addTarget(self, action: selector, for: .touchUpInside) +// button.layer.shadowColor = UIColor.black.cgColor +// button.layer.shadowRadius = 4 +// button.layer.shadowOpacity = 0.66 return button } - public func navigationBarItems() -> [UIBarButtonItem] { + public func navigationBarItems() -> [UIView] { let undoButton = navigationBarButton(imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) let brushButton = navigationBarButton(imageName: "image_editor_brush", selector: #selector(didTapBrush(sender:))) let cropButton = navigationBarButton(imageName: "image_editor_crop", selector: #selector(didTapCrop(sender:))) - let newTextButton = navigationBarButton(imageName: "image_editor_checkmark_full", + let newTextButton = navigationBarButton(imageName: "image_editor_text", selector: #selector(didTapNewText(sender:))) -// let doneButton = navigationBarButton(imageName:"image_editor_brush", -// selector: #selector(didTapDone(sender:))) let captionButton = navigationBarButton(imageName: "image_editor_caption", selector: #selector(didTapCaption(sender:))) if model.canUndo() { - return [undoButton, newTextButton, brushButton, cropButton, captionButton].reversed() + return [undoButton, newTextButton, brushButton, cropButton, captionButton] } else { - return [newTextButton, brushButton, cropButton, captionButton].reversed() + return [newTextButton, brushButton, cropButton, captionButton] } } From 00aa5be55dada3036095f57ee9d6eb818bf31cab Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 12:37:07 -0500 Subject: [PATCH 182/493] Use navigation bar for image editor buttons. --- .../Views/ImageEditor/ImageEditorView.swift | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 5792edc16..31bd3779b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -40,6 +40,7 @@ public class ImageEditorView: UIView { updateButtons() updateGestureState() + delegate?.imageEditorUpdateNavigationBar() } } @@ -264,10 +265,17 @@ public class ImageEditorView: UIView { let captionButton = navigationBarButton(imageName: "image_editor_caption", selector: #selector(didTapCaption(sender:))) - if model.canUndo() { - return [undoButton, newTextButton, brushButton, cropButton, captionButton] - } else { - return [newTextButton, brushButton, cropButton, captionButton] + switch editorMode { + case .text: + return [] + case .brush: + return [] + case .none: + if model.canUndo() { + return [undoButton, newTextButton, brushButton, cropButton, captionButton] + } else { + return [newTextButton, brushButton, cropButton, captionButton] + } } } From bc31c8fcf488725efb779b08ed8650f3e57389a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 13:13:20 -0500 Subject: [PATCH 183/493] Add brush view controller. --- Signal.xcodeproj/project.pbxproj | 8 + .../AttachmentApprovalViewController.swift | 12 +- .../ImageEditorBrushViewController.swift | 231 ++++++++++++++++++ .../ImageEditor/ImageEditorCanvasView.swift | 17 +- .../ImageEditorCropViewController.swift | 2 +- .../ImageEditor/ImageEditorPaletteView.swift | 1 + .../ImageEditorTextViewController.swift | 2 +- .../Views/ImageEditor/ImageEditorView.swift | 51 ++-- .../OWSViewController+ImageEditor.swift | 39 +++ 9 files changed, 314 insertions(+), 49 deletions(-) create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift create mode 100644 SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index ce1384943..416e1822a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ 34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */; }; 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */; }; + 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */; }; + 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -640,6 +642,8 @@ 34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = ""; }; 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPaletteView.swift; sourceTree = ""; }; 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; + 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorBrushViewController.swift; sourceTree = ""; }; + 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OWSViewController+ImageEditor.swift"; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1914,6 +1918,7 @@ 34BEDB0C21C405B0007B0EAE /* ImageEditor */ = { isa = PBXGroup; children = ( + 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */, 34BBC850220B8EEF00857249 /* ImageEditorCanvasView.swift */, 34BBC853220C7ADA00857249 /* ImageEditorContents.swift */, 34BBC84E220B8A0100857249 /* ImageEditorCropViewController.swift */, @@ -1927,6 +1932,7 @@ 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */, 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */, 34BBC856220C7ADA00857249 /* OrderedDictionary.swift */, + 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */, ); path = ImageEditor; sourceTree = ""; @@ -3390,6 +3396,7 @@ 34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */, 34AC09F8211B39B100997B47 /* CountryCodeViewController.m in Sources */, 451F8A341FD710C3005CB9DA /* FullTextSearcher.swift in Sources */, + 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */, 346129FE1FD5F31400532771 /* OWS106EnsureProfileComplete.swift in Sources */, 34AC0A10211B39EA00997B47 /* TappableView.swift in Sources */, 346129F91FD5F31400532771 /* OWS104CreateRecipientIdentities.m in Sources */, @@ -3409,6 +3416,7 @@ 346941A3215D2EE400B5BFAD /* Theme.m in Sources */, 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */, 34BBC84D220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift in Sources */, + 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */, 34AC0A14211B39EA00997B47 /* ContactCellView.m in Sources */, 34AC0A15211B39EA00997B47 /* ContactsViewHelper.m in Sources */, 346129FF1FD5F31400532771 /* OWS103EnableVideoCalling.m in Sources */, diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index e46c5788f..4117c7783 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -279,17 +279,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC let firstViewController = viewControllers.first as? AttachmentPrepViewController { navigationBarItems = firstViewController.navigationBarItems() } - guard navigationBarItems.count > 0 else { - self.navigationItem.rightBarButtonItems = [] - return - } - - let stackView = UIStackView(arrangedSubviews: navigationBarItems) - stackView.axis = .horizontal - stackView.spacing = 8 - stackView.alignment = .center - - self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: stackView) + updateNavigationBar(navigationBarItems: navigationBarItems) } // MARK: - View Helpers diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift new file mode 100644 index 000000000..ffcc24fe3 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -0,0 +1,231 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +//@objc +//public protocol ImageEditorViewDelegate: class { +// func imageEditor(presentFullScreenOverlay viewController: UIViewController, +// withNavigation: Bool) +// func imageEditorPresentCaptionView() +// func imageEditorUpdateNavigationBar() +//} + +// MARK: - + +@objc +public protocol ImageEditorBrushViewControllerDelegate: class { + func brushDidComplete() +} + +// MARK: - + +// A view for editing text item in image editor. +public class ImageEditorBrushViewController: OWSViewController { + + private weak var delegate: ImageEditorBrushViewControllerDelegate? + + private let model: ImageEditorModel + + private let canvasView: ImageEditorCanvasView + + private let paletteView = ImageEditorPaletteView() + + private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? + + init(delegate: ImageEditorBrushViewControllerDelegate, + model: ImageEditorModel) { + self.delegate = delegate + self.model = model + self.canvasView = ImageEditorCanvasView(model: model) + + super.init(nibName: nil, bundle: nil) + + model.add(observer: self) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - View Lifecycle + + public override func loadView() { + self.view = UIView() + self.view.backgroundColor = .black + + canvasView.configureSubviews() + self.view.addSubview(canvasView) + canvasView.autoPinEdgesToSuperviewEdges() + + paletteView.delegate = self + self.view.addSubview(paletteView) + paletteView.autoVCenterInSuperview() + paletteView.autoPinEdge(toSuperviewEdge: .leading, withInset: 20) + + self.view.isUserInteractionEnabled = true + + let brushGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleBrushGesture(_:))) + brushGestureRecognizer.maximumNumberOfTouches = 1 + brushGestureRecognizer.referenceView = canvasView.gestureReferenceView + self.view.addGestureRecognizer(brushGestureRecognizer) + self.brushGestureRecognizer = brushGestureRecognizer + + updateNavigationBar() + } + + public override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + self.view.layoutSubviews() + } + + public override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + self.view.layoutSubviews() + } + + public func updateNavigationBar() { + let undoButton = navigationBarButton(imageName: "image_editor_undo", + selector: #selector(didTapUndo(sender:))) + let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", + selector: #selector(didTapDone(sender:))) + + var navigationBarItems = [UIView]() + if model.canUndo() { + navigationBarItems = [undoButton, doneButton] + } else { + navigationBarItems = [doneButton] + } + updateNavigationBar(navigationBarItems: navigationBarItems) + } + + private var currentColor: UIColor { + get { + return paletteView.selectedColor + } + } + + // MARK: - Actions + + @objc func didTapUndo(sender: UIButton) { + Logger.verbose("") + guard model.canUndo() else { + owsFailDebug("Can't undo.") + return + } + model.undo() + } + + @objc func didTapDone(sender: UIButton) { + Logger.verbose("") + + completeAndDismiss() + } + + private func completeAndDismiss() { + self.delegate?.brushDidComplete() + + self.dismiss(animated: false) { + // Do nothing. + } + } + + // MARK: - Brush + + // These properties are non-empty while drawing a stroke. + private var currentStroke: ImageEditorStrokeItem? + private var currentStrokeSamples = [ImageEditorStrokeItem.StrokeSample]() + + @objc + public func handleBrushGesture(_ gestureRecognizer: UIGestureRecognizer) { + AssertIsOnMainThread() + + let removeCurrentStroke = { + if let stroke = self.currentStroke { + self.model.remove(item: stroke) + } + self.currentStroke = nil + self.currentStrokeSamples.removeAll() + } + let tryToAppendStrokeSample = { + let view = self.canvasView.gestureReferenceView + let viewBounds = view.bounds + let locationInView = gestureRecognizer.location(in: view) + let newSample = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) + + if let prevSample = self.currentStrokeSamples.last, + prevSample == newSample { + // Ignore duplicate samples. + return + } + self.currentStrokeSamples.append(newSample) + } + + let strokeColor = currentColor + // TODO: Tune stroke width. + let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() + + switch gestureRecognizer.state { + case .began: + removeCurrentStroke() + + tryToAppendStrokeSample() + + let stroke = ImageEditorStrokeItem(color: strokeColor, unitSamples: currentStrokeSamples, unitStrokeWidth: unitStrokeWidth) + model.append(item: stroke) + currentStroke = stroke + + case .changed, .ended: + tryToAppendStrokeSample() + + guard let lastStroke = self.currentStroke else { + owsFailDebug("Missing last stroke.") + removeCurrentStroke() + return + } + + // Model items are immutable; we _replace_ the + // stroke item rather than modify it. + let stroke = ImageEditorStrokeItem(itemId: lastStroke.itemId, color: strokeColor, unitSamples: currentStrokeSamples, unitStrokeWidth: unitStrokeWidth) + model.replace(item: stroke, suppressUndo: true) + + if gestureRecognizer.state == .ended { + currentStroke = nil + currentStrokeSamples.removeAll() + } else { + currentStroke = stroke + } + default: + removeCurrentStroke() + } + } +} + +// MARK: - + +extension ImageEditorBrushViewController: ImageEditorModelObserver { + + public func imageEditorModelDidChange(before: ImageEditorContents, + after: ImageEditorContents) { + updateNavigationBar() + } + + public func imageEditorModelDidChange(changedItemIds: [String]) { + updateNavigationBar() + } +} + +// MARK: - + +extension ImageEditorBrushViewController: ImageEditorPaletteViewDelegate { + public func selectedColorDidChange() { + // TODO: + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 0bf3a2703..a755ae9b9 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -59,7 +59,7 @@ public class ImageEditorCanvasView: UIView { private var imageLayer = CALayer() @objc - public func configureSubviews() -> Bool { + public func configureSubviews() { self.backgroundColor = .clear self.isOpaque = false @@ -94,8 +94,6 @@ public class ImageEditorCanvasView: UIView { contentView.autoPinEdgesToSuperviewEdges() updateLayout() - - return true } public var gestureReferenceView: UIView { @@ -631,6 +629,19 @@ public class ImageEditorCanvasView: UIView { } return nil } + + // MARK: - Coordinates + + public class func locationImageUnit(forLocationInView locationInView: CGPoint, + viewBounds: CGRect, + model: ImageEditorModel, + transform: ImageEditorTransform) -> CGPoint { + let imageFrame = self.imageFrame(forViewSize: viewBounds.size, imageSize: model.srcImageSizePixels, transform: transform) + let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size) + let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center) + let locationImageUnit = locationInContent.toUnitCoordinates(viewBounds: imageFrame, shouldClamp: false) + return locationImageUnit + } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index b40b231c8..163b1efdf 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -738,7 +738,7 @@ class ImageEditorCropViewController: OWSViewController { private func completeAndDismiss() { self.delegate?.cropDidComplete(transform: transform) - self.dismiss(animated: true) { + self.dismiss(animated: false) { // Do nothing. } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 8f222cfe8..6153b842b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -38,6 +38,7 @@ public class ImageEditorPaletteView: UIView { private func createContents() { self.backgroundColor = .clear self.isOpaque = false + self.layoutMargins = .zero if let image = ImageEditorPaletteView.buildPaletteGradientImage() { imageView.image = image diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 4fd987b19..a54613579 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -204,7 +204,7 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel self.delegate?.textEditDidComplete(textItem: textItem, text: textView.text) - self.dismiss(animated: true) { + self.dismiss(animated: false) { // Do nothing. } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 31bd3779b..aac60ebfc 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -75,9 +75,7 @@ public class ImageEditorView: UIView { @objc public func configureSubviews() -> Bool { - guard canvasView.configureSubviews() else { - return false - } + canvasView.configureSubviews() self.addSubview(canvasView) canvasView.autoPinEdgesToSuperviewEdges() @@ -241,18 +239,6 @@ public class ImageEditorView: UIView { // MARK: - Navigation Bar - private func navigationBarButton(imageName: String, - selector: Selector) -> UIView { - let button = OWSButton() - button.setImage(imageName: imageName) - button.tintColor = .white - button.addTarget(self, action: selector, for: .touchUpInside) -// button.layer.shadowColor = UIColor.black.cgColor -// button.layer.shadowRadius = 4 -// button.layer.shadowOpacity = 0.66 - return button - } - public func navigationBarItems() -> [UIView] { let undoButton = navigationBarButton(imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) @@ -294,6 +280,10 @@ public class ImageEditorView: UIView { Logger.verbose("") self.editorMode = .brush + + let brushView = ImageEditorBrushViewController(delegate: self, model: model) + self.delegate?.imageEditor(presentFullScreenOverlay: brushView, + withNavigation: true) } @objc func didTapCrop(sender: UIButton) { @@ -425,11 +415,11 @@ public class ImageEditorView: UIView { let viewBounds = view.bounds let locationStart = gestureRecognizer.pinchStateStart.centroid let locationNow = gestureRecognizer.pinchStateLast.centroid - let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart, + let gestureStartImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationStart, viewBounds: viewBounds, model: self.model, transform: self.model.currentTransform()) - let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationNow, + let gestureNowImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationNow, viewBounds: viewBounds, model: self.model, transform: self.model.currentTransform()) @@ -516,11 +506,11 @@ public class ImageEditorView: UIView { let view = self.canvasView.gestureReferenceView let viewBounds = view.bounds let locationInView = gestureRecognizer.location(in: view) - let gestureStartImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationStart, + let gestureStartImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationStart, viewBounds: viewBounds, model: self.model, transform: self.model.currentTransform()) - let gestureNowImageUnit = ImageEditorView.locationImageUnit(forLocationInView: locationInView, + let gestureNowImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, viewBounds: viewBounds, model: self.model, transform: self.model.currentTransform()) @@ -564,7 +554,7 @@ public class ImageEditorView: UIView { let view = self.canvasView.gestureReferenceView let viewBounds = view.bounds let locationInView = gestureRecognizer.location(in: view) - let newSample = ImageEditorView.locationImageUnit(forLocationInView: locationInView, + let newSample = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, viewBounds: viewBounds, model: self.model, transform: self.model.currentTransform()) @@ -616,19 +606,6 @@ public class ImageEditorView: UIView { } } - // MARK: - Coordinates - - private class func locationImageUnit(forLocationInView locationInView: CGPoint, - viewBounds: CGRect, - model: ImageEditorModel, - transform: ImageEditorTransform) -> CGPoint { - let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: model.srcImageSizePixels, transform: transform) - let affineTransformStart = transform.affineTransform(viewSize: viewBounds.size) - let locationInContent = locationInView.minus(viewBounds.center).applyingInverse(affineTransformStart).plus(viewBounds.center) - let locationImageUnit = locationInContent.toUnitCoordinates(viewBounds: imageFrame, shouldClamp: false) - return locationImageUnit - } - // MARK: - Edit Text Tool private func edit(textItem: ImageEditorTextItem) { @@ -760,3 +737,11 @@ extension ImageEditorView: ImageEditorPaletteViewDelegate { // TODO: } } + +// MARK: - + +extension ImageEditorView: ImageEditorBrushViewControllerDelegate { + public func brushDidComplete() { + self.editorMode = .none + } +} diff --git a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift new file mode 100644 index 000000000..1df368d28 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift @@ -0,0 +1,39 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +public extension NSObject { + + public func navigationBarButton(imageName: String, + selector: Selector) -> UIView { + let button = OWSButton() + button.setImage(imageName: imageName) + button.tintColor = .white + button.addTarget(self, action: selector, for: .touchUpInside) + // button.layer.shadowColor = UIColor.black.cgColor + // button.layer.shadowRadius = 4 + // button.layer.shadowOpacity = 0.66 + return button + } +} + +// MARK: - + +public extension UIViewController { + + public func updateNavigationBar(navigationBarItems: [UIView]) { + guard navigationBarItems.count > 0 else { + self.navigationItem.rightBarButtonItems = [] + return + } + + let stackView = UIStackView(arrangedSubviews: navigationBarItems) + stackView.axis = .horizontal + stackView.spacing = 8 + stackView.alignment = .center + + self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: stackView) + } +} From 97660e0a11e21cf7cbebb2ad40972ef469ac0534 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 13:15:56 -0500 Subject: [PATCH 184/493] Clean up image editor. --- .../Views/ImageEditor/ImageEditorView.swift | 88 +------------------ 1 file changed, 2 insertions(+), 86 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index aac60ebfc..b65483340 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -69,7 +69,6 @@ public class ImageEditorView: UIView { // MARK: - Views private var moveTextGestureRecognizer: ImageEditorPanGestureRecognizer? - private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? private var tapGestureRecognizer: UITapGestureRecognizer? private var pinchGestureRecognizer: ImageEditorPinchGestureRecognizer? @@ -90,12 +89,6 @@ public class ImageEditorView: UIView { self.addGestureRecognizer(moveTextGestureRecognizer) self.moveTextGestureRecognizer = moveTextGestureRecognizer - let brushGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleBrushGesture(_:))) - brushGestureRecognizer.maximumNumberOfTouches = 1 - brushGestureRecognizer.referenceView = canvasView.gestureReferenceView - self.addGestureRecognizer(brushGestureRecognizer) - self.brushGestureRecognizer = brushGestureRecognizer - let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))) self.addGestureRecognizer(tapGestureRecognizer) self.tapGestureRecognizer = tapGestureRecognizer @@ -132,50 +125,10 @@ public class ImageEditorView: UIView { } } - // The model supports redo if we ever want to add it. - private let undoButton = OWSButton() - private let brushButton = OWSButton() - private let cropButton = OWSButton() - private let newTextButton = OWSButton() - private let captionButton = OWSButton() - private let doneButton = OWSButton() - private let buttonStackView = UIStackView() - // TODO: Should this method be private? @objc public func addControls(to containerView: UIView, viewController: UIViewController) { - configure(button: undoButton, - imageName: "image_editor_undo", - selector: #selector(didTapUndo(sender:))) - - configure(button: brushButton, - imageName: "image_editor_brush", - selector: #selector(didTapBrush(sender:))) - - configure(button: cropButton, - imageName: "image_editor_crop", - selector: #selector(didTapCrop(sender:))) - - configure(button: newTextButton, - imageName: "image_editor_text", - selector: #selector(didTapNewText(sender:))) - - configure(button: captionButton, - imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) - - configure(button: doneButton, - imageName: "image_editor_checkmark_full", - selector: #selector(didTapDone(sender:))) - - buttonStackView.axis = .horizontal - buttonStackView.alignment = .center - buttonStackView.spacing = 20 - - containerView.addSubview(buttonStackView) - buttonStackView.autoPin(toTopLayoutGuideOf: viewController, withInset: 0) - buttonStackView.autoPinTrailingToSuperviewMargin(withInset: 18) containerView.addSubview(paletteView) paletteView.autoVCenterInSuperview() @@ -186,24 +139,7 @@ public class ImageEditorView: UIView { delegate?.imageEditorUpdateNavigationBar() } - private func configure(button: UIButton, - imageName: String, - selector: Selector) { - if let image = UIImage(named: imageName) { - button.setImage(image.withRenderingMode(.alwaysTemplate), for: .normal) - } else { - owsFailDebug("Missing asset: \(imageName)") - } - button.tintColor = .white - button.addTarget(self, action: selector, for: .touchUpInside) - button.layer.shadowColor = UIColor.black.cgColor - button.layer.shadowRadius = 4 - button.layer.shadowOpacity = 0.66 - } - private func updateButtons() { - var buttons = [OWSButton]() - var hasPalette = false switch editorMode { case .text: @@ -212,26 +148,9 @@ public class ImageEditorView: UIView { break case .brush: hasPalette = true - - if model.canUndo() { - buttons = [undoButton, doneButton] - } else { - buttons = [doneButton] - } case .none: - if model.canUndo() { - buttons = [undoButton, newTextButton, brushButton, cropButton, captionButton] - } else { - buttons = [newTextButton, brushButton, cropButton, captionButton] - } - } - - for subview in buttonStackView.subviews { - subview.removeFromSuperview() - } - buttonStackView.addArrangedSubview(UIView.hStretchingSpacer()) - for button in buttons { - buttonStackView.addArrangedSubview(button) + hasPalette = false + break } paletteView.isHidden = !hasPalette @@ -340,18 +259,15 @@ public class ImageEditorView: UIView { switch editorMode { case .none: moveTextGestureRecognizer?.isEnabled = true - brushGestureRecognizer?.isEnabled = false tapGestureRecognizer?.isEnabled = true pinchGestureRecognizer?.isEnabled = true case .brush: // Brush strokes can start and end (and return from) outside the view. moveTextGestureRecognizer?.isEnabled = false - brushGestureRecognizer?.isEnabled = true tapGestureRecognizer?.isEnabled = false pinchGestureRecognizer?.isEnabled = false case .text: moveTextGestureRecognizer?.isEnabled = false - brushGestureRecognizer?.isEnabled = false tapGestureRecognizer?.isEnabled = false pinchGestureRecognizer?.isEnabled = false } From b64be3aa73f872338fefb7146696273c677fef28 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 14:23:11 -0500 Subject: [PATCH 185/493] Clean up image editor. --- .../ImageEditorBrushViewController.swift | 27 +-- .../ImageEditor/ImageEditorPaletteView.swift | 94 ++++++---- .../ImageEditor/ImageEditorTextItem.swift | 12 +- .../ImageEditorTextViewController.swift | 106 +++++++++--- .../Views/ImageEditor/ImageEditorView.swift | 160 ++---------------- SignalMessaging/categories/UIView+OWS.swift | 2 +- 6 files changed, 172 insertions(+), 229 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index ffcc24fe3..e759ce00b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -4,16 +4,6 @@ import UIKit -//@objc -//public protocol ImageEditorViewDelegate: class { -// func imageEditor(presentFullScreenOverlay viewController: UIViewController, -// withNavigation: Bool) -// func imageEditorPresentCaptionView() -// func imageEditorUpdateNavigationBar() -//} - -// MARK: - - @objc public protocol ImageEditorBrushViewControllerDelegate: class { func brushDidComplete() @@ -30,15 +20,17 @@ public class ImageEditorBrushViewController: OWSViewController { private let canvasView: ImageEditorCanvasView - private let paletteView = ImageEditorPaletteView() + private let paletteView: ImageEditorPaletteView private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? init(delegate: ImageEditorBrushViewControllerDelegate, - model: ImageEditorModel) { + model: ImageEditorModel, + currentColor: ImageEditorColor) { self.delegate = delegate self.model = model self.canvasView = ImageEditorCanvasView(model: model) + self.paletteView = ImageEditorPaletteView(currentColor: currentColor) super.init(nibName: nil, bundle: nil) @@ -55,6 +47,7 @@ public class ImageEditorBrushViewController: OWSViewController { public override func loadView() { self.view = UIView() self.view.backgroundColor = .black + self.view.isOpaque = true canvasView.configureSubviews() self.view.addSubview(canvasView) @@ -63,7 +56,7 @@ public class ImageEditorBrushViewController: OWSViewController { paletteView.delegate = self self.view.addSubview(paletteView) paletteView.autoVCenterInSuperview() - paletteView.autoPinEdge(toSuperviewEdge: .leading, withInset: 20) + paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 20) self.view.isUserInteractionEnabled = true @@ -103,12 +96,6 @@ public class ImageEditorBrushViewController: OWSViewController { updateNavigationBar(navigationBarItems: navigationBarItems) } - private var currentColor: UIColor { - get { - return paletteView.selectedColor - } - } - // MARK: - Actions @objc func didTapUndo(sender: UIButton) { @@ -168,7 +155,7 @@ public class ImageEditorBrushViewController: OWSViewController { self.currentStrokeSamples.append(newSample) } - let strokeColor = currentColor + let strokeColor = paletteView.selectedValue.color // TODO: Tune stroke width. let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 6153b842b..68363fcd5 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -10,11 +10,60 @@ public protocol ImageEditorPaletteViewDelegate: class { // MARK: - +@objc +public class ImageEditorColor: NSObject { + public let color: UIColor + + // Colors are chosen from a spectrum of colors. + // This unit value represents the location of the + // color within that spectrum. + public let palettePhase: CGFloat + + public var cgColor: CGColor { + return color.cgColor + } + + public required init(color: UIColor, palettePhase: CGFloat) { + self.color = color + self.palettePhase = palettePhase + } + + public class func defaultColor() -> ImageEditorColor { + return ImageEditorColor(color: UIColor(rgbHex: 0xffffff), palettePhase: 0) + } + + public static var gradientUIColors: [UIColor] { + return [ + UIColor(rgbHex: 0xffffff), + UIColor(rgbHex: 0xff0000), + UIColor(rgbHex: 0xff00ff), + UIColor(rgbHex: 0x0000ff), + UIColor(rgbHex: 0x00ffff), + UIColor(rgbHex: 0x00ff00), + UIColor(rgbHex: 0xffff00), + UIColor(rgbHex: 0xff5500), + UIColor(rgbHex: 0x000000) + ] + } + + public static var gradientCGColors: [CGColor] { + return gradientUIColors.map({ (color) in + return color.cgColor + }) + } +} + +// MARK: - + public class ImageEditorPaletteView: UIView { public weak var delegate: ImageEditorPaletteViewDelegate? - public required init() { + public var selectedValue: ImageEditorColor + + public required init(currentColor: ImageEditorColor) { + self.selectedValue = currentColor + super.init(frame: .zero) createContents() @@ -27,9 +76,6 @@ public class ImageEditorPaletteView: UIView { // MARK: - Views - // The actual default is selected later. - public var selectedColor = UIColor.white - private let imageView = UIImageView() private let selectionView = UIView() private let selectionWrapper = OWSLayerView() @@ -84,36 +130,36 @@ public class ImageEditorPaletteView: UIView { // 0 = the color at the top of the image is selected. // 1 = the color at the bottom of the image is selected. private let selectionSize: CGFloat = 20 - private var selectionAlpha: CGFloat = 0 private func selectColor(atLocationY y: CGFloat) { - selectionAlpha = y.inverseLerp(0, imageView.height(), shouldClamp: true) + let palettePhase = y.inverseLerp(0, imageView.height(), shouldClamp: true) + self.selectedValue = value(for: palettePhase) updateState() delegate?.selectedColorDidChange() } - private func updateState() { - var selectedColor = UIColor.white - if let image = imageView.image { - if let imageColor = image.color(atLocation: CGPoint(x: CGFloat(image.size.width) * 0.5, y: CGFloat(image.size.height) * selectionAlpha)) { - selectedColor = imageColor - } else { - owsFailDebug("Couldn't determine image color.") - } - } else { + private func value(for palettePhase: CGFloat) -> ImageEditorColor { + guard let image = imageView.image else { owsFailDebug("Missing image.") + return ImageEditorColor.defaultColor() } - self.selectedColor = selectedColor + guard let color = image.color(atLocation: CGPoint(x: CGFloat(image.size.width) * 0.5, y: CGFloat(image.size.height) * palettePhase)) else { + owsFailDebug("Missing color.") + return ImageEditorColor.defaultColor() + } + return ImageEditorColor(color: color, palettePhase: palettePhase) + } - selectionView.backgroundColor = selectedColor + private func updateState() { + selectionView.backgroundColor = selectedValue.color guard let selectionConstraint = selectionConstraint else { owsFailDebug("Missing selectionConstraint.") return } - let selectionY = selectionWrapper.height() * selectionAlpha + let selectionY = selectionWrapper.height() * selectedValue.palettePhase selectionConstraint.constant = selectionY } @@ -142,17 +188,7 @@ public class ImageEditorPaletteView: UIView { gradientView.layer.addSublayer(gradientLayer) gradientLayer.frame = gradientBounds // See: https://github.com/signalapp/Signal-Android/blob/master/res/values/arrays.xml#L267 - gradientLayer.colors = [ - UIColor(rgbHex: 0xffffff).cgColor, - UIColor(rgbHex: 0xff0000).cgColor, - UIColor(rgbHex: 0xff00ff).cgColor, - UIColor(rgbHex: 0x0000ff).cgColor, - UIColor(rgbHex: 0x00ffff).cgColor, - UIColor(rgbHex: 0x00ff00).cgColor, - UIColor(rgbHex: 0xffff00).cgColor, - UIColor(rgbHex: 0xff5500).cgColor, - UIColor(rgbHex: 0x000000).cgColor - ] + gradientLayer.colors = ImageEditorColor.gradientCGColors gradientLayer.startPoint = CGPoint.zero gradientLayer.endPoint = CGPoint(x: 0, y: gradientSize.height) gradientLayer.endPoint = CGPoint(x: 0, y: 1.0) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift index 5c0b84828..1056c2bcb 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift @@ -11,7 +11,7 @@ public class ImageEditorTextItem: ImageEditorItem { public let text: String @objc - public let color: UIColor + public let color: ImageEditorColor @objc public let font: UIFont @@ -60,7 +60,7 @@ public class ImageEditorTextItem: ImageEditorItem { @objc public init(text: String, - color: UIColor, + color: ImageEditorColor, font: UIFont, fontReferenceImageWidth: CGFloat, unitCenter: ImageEditorSample = ImageEditorSample(x: 0.5, y: 0.5), @@ -81,7 +81,7 @@ public class ImageEditorTextItem: ImageEditorItem { private init(itemId: String, text: String, - color: UIColor, + color: ImageEditorColor, font: UIFont, fontReferenceImageWidth: CGFloat, unitCenter: ImageEditorSample, @@ -101,17 +101,17 @@ public class ImageEditorTextItem: ImageEditorItem { } @objc - public class func empty(withColor color: UIColor, unitWidth: CGFloat, fontReferenceImageWidth: CGFloat) -> ImageEditorTextItem { + public class func empty(withColor color: ImageEditorColor, unitWidth: CGFloat, fontReferenceImageWidth: CGFloat) -> ImageEditorTextItem { // TODO: Tune the default font size. let font = UIFont.boldSystemFont(ofSize: 30.0) return ImageEditorTextItem(text: "", color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, unitWidth: unitWidth) } @objc - public func copy(withText newText: String) -> ImageEditorTextItem { + public func copy(withText newText: String, color newColor: ImageEditorColor) -> ImageEditorTextItem { return ImageEditorTextItem(itemId: itemId, text: newText, - color: color, + color: newColor, font: font, fontReferenceImageWidth: fontReferenceImageWidth, unitCenter: unitCenter, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index a54613579..0b6be3c4d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -92,7 +92,7 @@ private class VAlignTextView: UITextView { @objc public protocol ImageEditorTextViewControllerDelegate: class { - func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) + func textEditDidComplete(textItem: ImageEditorTextItem, text: String?, color: ImageEditorColor) func textEditDidCancel() } @@ -106,14 +106,24 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel private let maxTextWidthPoints: CGFloat - private let textView = VAlignTextView(alignment: .bottom) + private let textView = VAlignTextView(alignment: .center) + + private let model: ImageEditorModel + + private let canvasView: ImageEditorCanvasView + + private let paletteView: ImageEditorPaletteView init(delegate: ImageEditorTextViewControllerDelegate, + model: ImageEditorModel, textItem: ImageEditorTextItem, maxTextWidthPoints: CGFloat) { self.delegate = delegate + self.model = model self.textItem = textItem self.maxTextWidthPoints = maxTextWidthPoints + self.canvasView = ImageEditorCanvasView(model: model) + self.paletteView = ImageEditorPaletteView(currentColor: textItem.color) super.init(nibName: nil, bundle: nil) @@ -131,43 +141,63 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel super.viewWillAppear(animated) textView.becomeFirstResponder() + + self.view.layoutSubviews() } public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) textView.becomeFirstResponder() + + self.view.layoutSubviews() } public override func loadView() { self.view = UIView() - self.view.backgroundColor = UIColor(white: 0.5, alpha: 0.5) + self.view.backgroundColor = .black + self.view.isOpaque = true + + canvasView.configureSubviews() + self.view.addSubview(canvasView) + canvasView.autoPinEdgesToSuperviewEdges() + + let tintView = UIView() + tintView.backgroundColor = UIColor(white: 0, alpha: 0.33) + tintView.isOpaque = false + self.view.addSubview(tintView) + tintView.autoPinEdgesToSuperviewEdges() + tintView.layer.opacity = 0 + UIView.animate(withDuration: 0.25, animations: { + tintView.layer.opacity = 1 + }, completion: { (_) in + tintView.layer.opacity = 1 + }) configureTextView() - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, - target: self, - action: #selector(didTapBackButton)) - self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) + self.view.addSubview(textView) textView.autoPinTopToSuperviewMargin() textView.autoHCenterInSuperview() - // In order to have text wrapping be as WYSIWYG as possible, we limit the text view - // to the max text width on the image. -// let maxTextWidthPoints = max(textItem.widthPoints, 200) -// textView.autoSetDimension(.width, toSize: maxTextWidthPoints, relation: .lessThanOrEqual) -// textView.autoPinEdge(toSuperviewMargin: .leading, relation: .greaterThanOrEqual) -// textView.autoPinEdge(toSuperviewMargin: .trailing, relation: .greaterThanOrEqual) - textView.autoPinEdge(toSuperviewMargin: .leading) - textView.autoPinEdge(toSuperviewMargin: .trailing) self.autoPinView(toBottomOfViewControllerOrKeyboard: textView, avoidNotch: true) + + // TODO: Honor old color state. + paletteView.delegate = self + self.view.addSubview(paletteView) + paletteView.autoVCenterInSuperview() + paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 20) + // This will determine the text view's size. + paletteView.autoPinEdge(.leading, to: .trailing, of: textView, withOffset: 8) + + updateNavigationBar() } private func configureTextView() { textView.text = textItem.text textView.font = textItem.font - textView.textColor = textItem.color + textView.textColor = textItem.color.color textView.isEditable = true textView.backgroundColor = .clear @@ -186,23 +216,37 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel textView.contentInset = .zero } + private func updateNavigationBar() { + let undoButton = navigationBarButton(imageName: "image_editor_undo", + selector: #selector(didTapUndo(sender:))) + let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", + selector: #selector(didTapDone(sender:))) + + let navigationBarItems = [undoButton, doneButton] + updateNavigationBar(navigationBarItems: navigationBarItems) + } + // MARK: - Events - @objc public func didTapBackButton() { + @objc func didTapUndo(sender: UIButton) { + Logger.verbose("") + + // TODO: Honor color state. + self.delegate?.textEditDidCancel() + + self.dismiss(animated: false) { + // Do nothing. + } + } + + @objc func didTapDone(sender: UIButton) { + Logger.verbose("") + completeAndDismiss() } private func completeAndDismiss() { - - // Before we take a screenshot, make sure selection state - // auto-complete suggestions, cursor don't affect screenshot. - textView.resignFirstResponder() - if textView.isFirstResponder { - owsFailDebug("Text view is still first responder.") - } - textView.selectedTextRange = nil - - self.delegate?.textEditDidComplete(textItem: textItem, text: textView.text) + self.delegate?.textEditDidComplete(textItem: textItem, text: textView.text, color: paletteView.selectedValue) self.dismiss(animated: false) { // Do nothing. @@ -215,3 +259,11 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel completeAndDismiss() } } + +// MARK: - + +extension ImageEditorTextViewController: ImageEditorPaletteViewDelegate { + public func selectedColorDidChange() { + self.textView.textColor = self.paletteView.selectedValue.color + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index b65483340..24cb50d02 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -25,30 +25,8 @@ public class ImageEditorView: UIView { private let canvasView: ImageEditorCanvasView - private let paletteView = ImageEditorPaletteView() - - enum EditorMode: String { - // This is the default mode. It is used for interacting with text items. - case none - case brush - case text - } - - private var editorMode = EditorMode.none { - didSet { - AssertIsOnMainThread() - - updateButtons() - updateGestureState() - delegate?.imageEditorUpdateNavigationBar() - } - } - - private var currentColor: UIColor { - get { - return paletteView.selectedColor - } - } + // TODO: We could hang this on the model or make this static. + private var currentColor = ImageEditorColor.defaultColor() @objc public required init(model: ImageEditorModel, delegate: ImageEditorViewDelegate) { @@ -78,8 +56,6 @@ public class ImageEditorView: UIView { self.addSubview(canvasView) canvasView.autoPinEdgesToSuperviewEdges() - paletteView.delegate = self - self.isUserInteractionEnabled = true let moveTextGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleMoveTextGesture(_:))) @@ -102,60 +78,16 @@ public class ImageEditorView: UIView { // editorGestureRecognizer.require(toFail: tapGestureRecognizer) // editorGestureRecognizer.require(toFail: pinchGestureRecognizer) - updateGestureState() - return true } - private func commitTextEditingChanges(textItem: ImageEditorTextItem, textView: UITextView) { - AssertIsOnMainThread() - - guard let text = textView.text?.ows_stripped(), - text.count > 0 else { - model.remove(item: textItem) - return - } - - // Model items are immutable; we _replace_ the item rather than modify it. - let newItem = textItem.copy(withText: text) - if model.has(itemForId: textItem.itemId) { - model.replace(item: newItem, suppressUndo: false) - } else { - model.append(item: newItem) - } - } - // TODO: Should this method be private? @objc public func addControls(to containerView: UIView, viewController: UIViewController) { - - containerView.addSubview(paletteView) - paletteView.autoVCenterInSuperview() - paletteView.autoPinLeadingToSuperviewMargin(withInset: 10) - - updateButtons() - delegate?.imageEditorUpdateNavigationBar() } - private func updateButtons() { - var hasPalette = false - switch editorMode { - case .text: - // TODO: - hasPalette = true - break - case .brush: - hasPalette = true - case .none: - hasPalette = false - break - } - - paletteView.isHidden = !hasPalette - } - // MARK: - Navigation Bar public func navigationBarItems() -> [UIView] { @@ -170,17 +102,10 @@ public class ImageEditorView: UIView { let captionButton = navigationBarButton(imageName: "image_editor_caption", selector: #selector(didTapCaption(sender:))) - switch editorMode { - case .text: - return [] - case .brush: - return [] - case .none: - if model.canUndo() { - return [undoButton, newTextButton, brushButton, cropButton, captionButton] - } else { - return [newTextButton, brushButton, cropButton, captionButton] - } + if model.canUndo() { + return [undoButton, newTextButton, brushButton, cropButton, captionButton] + } else { + return [newTextButton, brushButton, cropButton, captionButton] } } @@ -198,9 +123,7 @@ public class ImageEditorView: UIView { @objc func didTapBrush(sender: UIButton) { Logger.verbose("") - self.editorMode = .brush - - let brushView = ImageEditorBrushViewController(delegate: self, model: model) + let brushView = ImageEditorBrushViewController(delegate: self, model: model, currentColor: currentColor) self.delegate?.imageEditor(presentFullScreenOverlay: brushView, withNavigation: true) } @@ -233,44 +156,10 @@ public class ImageEditorView: UIView { Logger.verbose("") delegate?.imageEditorPresentCaptionView() - -// // TODO: -// let maxTextWidthPoints = model.srcImageSizePixels.width * ImageEditorTextItem.kDefaultUnitWidth -// // let maxTextWidthPoints = canvasView.imageView.width() * ImageEditorTextItem.kDefaultUnitWidth -// -// let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) -// self.delegate?.imageEditor(presentFullScreenOverlay: textEditor, -// withNavigation: true) - - // TODO: } @objc func didTapDone(sender: UIButton) { Logger.verbose("") - - self.editorMode = .none - } - - // MARK: - Gestures - - private func updateGestureState() { - AssertIsOnMainThread() - - switch editorMode { - case .none: - moveTextGestureRecognizer?.isEnabled = true - tapGestureRecognizer?.isEnabled = true - pinchGestureRecognizer?.isEnabled = true - case .brush: - // Brush strokes can start and end (and return from) outside the view. - moveTextGestureRecognizer?.isEnabled = false - tapGestureRecognizer?.isEnabled = false - pinchGestureRecognizer?.isEnabled = false - case .text: - moveTextGestureRecognizer?.isEnabled = false - tapGestureRecognizer?.isEnabled = false - pinchGestureRecognizer?.isEnabled = false - } } // MARK: - Tap Gesture @@ -483,7 +372,7 @@ public class ImageEditorView: UIView { self.currentStrokeSamples.append(newSample) } - let strokeColor = currentColor + let strokeColor = currentColor.color // TODO: Tune stroke width. let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() @@ -527,13 +416,14 @@ public class ImageEditorView: UIView { private func edit(textItem: ImageEditorTextItem) { Logger.verbose("") - self.editorMode = .text - // TODO: let maxTextWidthPoints = model.srcImageSizePixels.width * ImageEditorTextItem.kDefaultUnitWidth // let maxTextWidthPoints = canvasView.imageView.width() * ImageEditorTextItem.kDefaultUnitWidth - let textEditor = ImageEditorTextViewController(delegate: self, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) + let textEditor = ImageEditorTextViewController(delegate: self, + model: model, + textItem: textItem, + maxTextWidthPoints: maxTextWidthPoints) self.delegate?.imageEditor(presentFullScreenOverlay: textEditor, withNavigation: true) } @@ -543,8 +433,6 @@ public class ImageEditorView: UIView { private func presentCropTool() { Logger.verbose("") - self.editorMode = .none - guard let srcImage = canvasView.loadSrcImage() else { owsFailDebug("Couldn't load src image.") return @@ -573,10 +461,6 @@ extension ImageEditorView: UIGestureRecognizerDelegate { owsFailDebug("Unexpected gesture.") return false } - guard editorMode == .none else { - // We only filter touches when in default mode. - return true - } let location = touch.location(in: canvasView.gestureReferenceView) let isInTextArea = self.textLayer(forLocation: location) != nil @@ -590,14 +474,10 @@ extension ImageEditorView: ImageEditorModelObserver { public func imageEditorModelDidChange(before: ImageEditorContents, after: ImageEditorContents) { - updateButtons() - delegate?.imageEditorUpdateNavigationBar() } public func imageEditorModelDidChange(changedItemIds: [String]) { - updateButtons() - delegate?.imageEditorUpdateNavigationBar() } } @@ -606,11 +486,9 @@ extension ImageEditorView: ImageEditorModelObserver { extension ImageEditorView: ImageEditorTextViewControllerDelegate { - public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?) { + public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?, color: ImageEditorColor) { AssertIsOnMainThread() - self.editorMode = .none - guard let text = text?.ows_stripped(), text.count > 0 else { if model.has(itemForId: textItem.itemId) { @@ -620,7 +498,7 @@ extension ImageEditorView: ImageEditorTextViewControllerDelegate { } // Model items are immutable; we _replace_ the item rather than modify it. - let newItem = textItem.copy(withText: text) + let newItem = textItem.copy(withText: text, color: color) if model.has(itemForId: textItem.itemId) { model.replace(item: newItem, suppressUndo: false) } else { @@ -629,7 +507,6 @@ extension ImageEditorView: ImageEditorTextViewControllerDelegate { } public func textEditDidCancel() { - self.editorMode = .none } } @@ -648,16 +525,7 @@ extension ImageEditorView: ImageEditorCropViewControllerDelegate { // MARK: - -extension ImageEditorView: ImageEditorPaletteViewDelegate { - public func selectedColorDidChange() { - // TODO: - } -} - -// MARK: - - extension ImageEditorView: ImageEditorBrushViewControllerDelegate { public func brushDidComplete() { - self.editorMode = .none } } diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 789f6b056..c50db8c35 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -129,7 +129,7 @@ public extension CGFloat { return CGFloatClamp(self, minValue, maxValue) } - public func clamp01(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + public func clamp01() -> CGFloat { return CGFloatClamp01(self) } From fa08b18fd737b65ea2656320d004e1ec98d38f78 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 15:08:50 -0500 Subject: [PATCH 186/493] Clean up image editor. --- .../ImageEditorCropViewController.swift | 47 +++++++++---------- .../Views/ImageEditor/ImageEditorModel.swift | 4 ++ .../ImageEditor/ImageEditorPaletteView.swift | 3 ++ .../Views/ImageEditor/ImageEditorView.swift | 2 +- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 163b1efdf..814a403ac 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -89,20 +89,10 @@ class ImageEditorCropViewController: OWSViewController { // MARK: - Buttons - // TODO: Apply icons. - let doneButton = OWSButton(imageName: "image_editor_checkmark_full", - tintColor: UIColor.white) { [weak self] in - self?.didTapBackButton() - } let rotate90Button = OWSButton(imageName: "image_editor_rotate", tintColor: UIColor.white) { [weak self] in self?.rotate90ButtonPressed() } - // TODO: Myles may change this asset. - let resetButton = OWSButton(imageName: "image_editor_undo", - tintColor: UIColor.white) { [weak self] in - self?.resetButtonPressed() - } let flipButton = OWSButton(imageName: "image_editor_flip", tintColor: UIColor.white) { [weak self] in self?.flipButtonPressed() @@ -113,18 +103,6 @@ class ImageEditorCropViewController: OWSViewController { } self.cropLockButton = cropLockButton - // MARK: - Header - - let header = UIStackView(arrangedSubviews: [ - UIView.hStretchingSpacer(), - resetButton, - doneButton - ]) - header.axis = .horizontal - header.spacing = 16 - header.backgroundColor = .clear - header.isOpaque = false - // MARK: - Canvas & Wrapper let wrapperView = UIView.container() @@ -172,7 +150,6 @@ class ImageEditorCropViewController: OWSViewController { let imageMargin: CGFloat = 20 let stackView = UIStackView(arrangedSubviews: [ - header, wrapperView, footer ]) @@ -217,6 +194,23 @@ class ImageEditorCropViewController: OWSViewController { updateClipViewLayout() configureGestures() + + updateNavigationBar() + } + + public func updateNavigationBar() { + // TODO: Change this asset. + let resetButton = navigationBarButton(imageName: "image_editor_undo", + selector: #selector(didTapReset(sender:))) + let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", + selector: #selector(didTapDone(sender:))) + var navigationBarItems = [UIView]() + if transform.isNonDefault { + navigationBarItems = [resetButton, doneButton] + } else { + navigationBarItems = [doneButton] + } + updateNavigationBar(navigationBarItems: navigationBarItems) } private func updateCropLockButton() { @@ -354,6 +348,7 @@ class ImageEditorCropViewController: OWSViewController { applyTransform() updateClipViewLayout() updateImageLayer() + updateNavigationBar() CATransaction.commit() } @@ -731,7 +726,7 @@ class ImageEditorCropViewController: OWSViewController { // MARK: - Events - @objc public func didTapBackButton() { + @objc func didTapDone(sender: UIButton) { completeAndDismiss() } @@ -771,7 +766,9 @@ class ImageEditorCropViewController: OWSViewController { isFlipped: !transform.isFlipped).normalize(srcImageSizePixels: model.srcImageSizePixels)) } - @objc public func resetButtonPressed() { + @objc func didTapReset(sender: UIButton) { + Logger.verbose("") + updateTransform(ImageEditorTransform.defaultTransform(srcImageSizePixels: model.srcImageSizePixels)) } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 4711c010b..ab6daed7a 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -86,6 +86,10 @@ public class ImageEditorTransform: NSObject { isFlipped: false).normalize(srcImageSizePixels: srcImageSizePixels) } + public var isNonDefault: Bool { + return !isEqual(ImageEditorTransform.defaultTransform(srcImageSizePixels: outputSizePixels)) + } + public func affineTransform(viewSize: CGSize) -> CGAffineTransform { let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize) // Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 68363fcd5..a4040e774 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -10,6 +10,9 @@ public protocol ImageEditorPaletteViewDelegate: class { // MARK: - +// We represent image editor colors using this (color, phase) +// tuple so that we can consistently restore palette view +// state. @objc public class ImageEditorColor: NSObject { public let color: UIColor diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 24cb50d02..0e9286845 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -449,7 +449,7 @@ public class ImageEditorView: UIView { let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage) self.delegate?.imageEditor(presentFullScreenOverlay: cropTool, - withNavigation: false) + withNavigation: true) }} // MARK: - From 7c486d90935e09b2fbbeb5fbcb5919e11e1b08c1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 15:21:04 -0500 Subject: [PATCH 187/493] Clean up image editor. --- .../AttachmentApprovalViewController.swift | 41 +++++++++++++++---- .../AttachmentCaptionViewController.swift | 3 +- .../ImageEditorTextViewController.swift | 6 +-- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 4117c7783..776aa4295 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -210,13 +210,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC self.navigationItem.title = nil - if mode != .sharedNavigation { - let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, - target: self, action: #selector(cancelPressed)) - cancelButton.tintColor = .white - self.navigationItem.leftBarButtonItem = cancelButton - } - guard let firstItem = attachmentItems.first else { owsFailDebug("firstItem was unexpectedly nil") return @@ -273,13 +266,33 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC public func updateNavigationBar() { var navigationBarItems = [UIView]() + var isShowingCaptionView = false if let viewControllers = viewControllers, viewControllers.count == 1, let firstViewController = viewControllers.first as? AttachmentPrepViewController { navigationBarItems = firstViewController.navigationBarItems() + isShowingCaptionView = firstViewController.isShowingCaptionView } + + guard !isShowingCaptionView else { + // Hide all navigation bar items while the caption view is open. + self.navigationItem.leftBarButtonItem = nil + self.navigationItem.rightBarButtonItem = nil + return + } + updateNavigationBar(navigationBarItems: navigationBarItems) + + let hasCancel = (mode != .sharedNavigation) + if hasCancel { + let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, + target: self, action: #selector(cancelPressed)) + cancelButton.tintColor = .white + self.navigationItem.leftBarButtonItem = cancelButton + } else { + self.navigationItem.leftBarButtonItem = nil + } } // MARK: - View Helpers @@ -684,6 +697,12 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD private(set) var playVideoButton: UIView? private var imageEditorView: ImageEditorView? + fileprivate var isShowingCaptionView = false { + didSet { + prepDelegate?.prepViewControllerUpdateNavigationBar() + } + } + // MARK: - Initializers init(attachmentItem: SignalAttachmentItem) { @@ -1033,6 +1052,12 @@ extension AttachmentPrepViewController: AttachmentCaptionDelegate { let attachment = attachmentItem.attachment attachment.captionText = captionText prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem) + + isShowingCaptionView = false + } + + func captionViewDidCancel() { + isShowingCaptionView = false } } @@ -1133,6 +1158,8 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { public func imageEditorPresentCaptionView() { let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) self.imageEditor(presentFullScreenOverlay: view, withNavigation: true) + + isShowingCaptionView = true } public func imageEditorUpdateNavigationBar() { diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index be541dba2..6c691dd88 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -6,6 +6,7 @@ import UIKit protocol AttachmentCaptionDelegate: class { func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) + func captionViewDidCancel() } class AttachmentCaptionViewController: OWSViewController { @@ -151,7 +152,7 @@ class AttachmentCaptionViewController: OWSViewController { private func completeAndDismiss(didCancel: Bool) { if didCancel { - self.delegate?.captionView(self, didChangeCaptionText: originalCaptionText, attachmentItem: attachmentItem) + self.delegate?.captionViewDidCancel() } else { self.delegate?.captionView(self, didChangeCaptionText: self.textView.text, attachmentItem: attachmentItem) } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 0b6be3c4d..680f26823 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -183,10 +183,9 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel textView.autoHCenterInSuperview() self.autoPinView(toBottomOfViewControllerOrKeyboard: textView, avoidNotch: true) - // TODO: Honor old color state. paletteView.delegate = self self.view.addSubview(paletteView) - paletteView.autoVCenterInSuperview() + paletteView.autoAlignAxis(.horizontal, toSameAxisOf: textView) paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 20) // This will determine the text view's size. paletteView.autoPinEdge(.leading, to: .trailing, of: textView, withOffset: 8) @@ -205,7 +204,7 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel // We use a white cursor since we use a dark background. textView.tintColor = .white textView.returnKeyType = .done - // TODO: Limit the size of the text. + // TODO: Limit the size of the text? // textView.delegate = self textView.isScrollEnabled = true textView.scrollsToTop = false @@ -231,7 +230,6 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel @objc func didTapUndo(sender: UIButton) { Logger.verbose("") - // TODO: Honor color state. self.delegate?.textEditDidCancel() self.dismiss(animated: false) { From dc4e174e867b6e056a731de9071ff1e3795fe55d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 15:31:35 -0500 Subject: [PATCH 188/493] Clean up ahead of PR. --- .../Cells/ConversationMediaView.swift | 4 +-- .../ConversationViewController.m | 28 ------------------- .../HomeView/HomeViewController.m | 6 ---- .../OWSViewController+ImageEditor.swift | 6 ++-- 4 files changed, 5 insertions(+), 39 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 05ad14a1e..458517b48 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -135,7 +135,7 @@ public class ConversationMediaView: UIView { } else if attachmentStream.isVideo { configureForVideo(attachmentStream: attachmentStream) } else { - owsFailDebug("Attachment has unexpected type.") +// owsFailDebug("Attachment has unexpected type.") configure(forError: .invalid) } } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ce8f355a7..022f6af4e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1269,34 +1269,6 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; - - dispatch_async(dispatch_get_main_queue(), ^{ - ConversationMediaAlbumItem *_Nullable firstMediaAlbumItem; - for (id item in self.viewItems) { - if (item.mediaAlbumItems.count < 1) { - continue; - } - ConversationMediaAlbumItem *mediaAlbumItem = item.mediaAlbumItems[0]; - if (mediaAlbumItem.attachmentStream && mediaAlbumItem.attachmentStream.isImage) { - firstMediaAlbumItem = mediaAlbumItem; - break; - } - } - if (!firstMediaAlbumItem) { - return; - } - DataSource *_Nullable dataSource = - [DataSourcePath dataSourceWithURL:firstMediaAlbumItem.attachmentStream.originalMediaURL - shouldDeleteOnDeallocation:NO]; - if (!dataSource) { - OWSFailDebug(@"attachment data was unexpectedly empty for picked document"); - return; - } - NSString *utiType = [MIMETypeUtil utiTypeForMIMEType:firstMediaAlbumItem.attachmentStream.contentType]; - SignalAttachment *attachment = - [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType imageQuality:TSImageQualityOriginal]; - [self showApprovalDialogForAttachment:attachment]; - }); } // `viewWillDisappear` is called whenever the view *starts* to disappear, diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index f6b3f2ed7..96125433d 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -672,12 +672,6 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - dispatch_async(dispatch_get_main_queue(), ^{ - TSThread *thread = - [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations]]; - [self presentThread:thread action:ConversationViewActionNone animated:YES]; - }); } - (void)viewDidDisappear:(BOOL)animated diff --git a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift index 1df368d28..7c2e46b11 100644 --- a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift +++ b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift @@ -12,9 +12,9 @@ public extension NSObject { button.setImage(imageName: imageName) button.tintColor = .white button.addTarget(self, action: selector, for: .touchUpInside) - // button.layer.shadowColor = UIColor.black.cgColor - // button.layer.shadowRadius = 4 - // button.layer.shadowOpacity = 0.66 + button.layer.shadowColor = UIColor.black.cgColor + button.layer.shadowRadius = 2 + button.layer.shadowOpacity = 0.66 return button } } From 63637af240cee624af5864729c07b576f419d35f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 15:49:51 -0500 Subject: [PATCH 189/493] Clean up ahead of PR. --- .../ConversationView/Cells/ConversationMediaView.swift | 2 +- .../ViewControllers/AttachmentCaptionViewController.swift | 4 ++-- .../Views/ImageEditor/ImageEditorBrushViewController.swift | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 458517b48..39c31fe4e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -135,7 +135,7 @@ public class ConversationMediaView: UIView { } else if attachmentStream.isVideo { configureForVideo(attachmentStream: attachmentStream) } else { -// owsFailDebug("Attachment has unexpected type.") + owsFailDebug("Attachment has unexpected type.") configure(forError: .invalid) } } diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index 6c691dd88..4f3bcd9a0 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -229,8 +229,8 @@ class AttachmentCaptionViewController: OWSViewController { let contentSize = textView.sizeThatFits(CGSize(width: textView.width(), height: CGFloat.greatestFiniteMagnitude)) - // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here. - textView.contentSize = contentSize + // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here. + textView.contentSize = contentSize let minHeight: CGFloat = textView.font?.lineHeight ?? 0 let maxHeight = minHeight * 4 diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index e759ce00b..6c79fde1b 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -11,7 +11,6 @@ public protocol ImageEditorBrushViewControllerDelegate: class { // MARK: - -// A view for editing text item in image editor. public class ImageEditorBrushViewController: OWSViewController { private weak var delegate: ImageEditorBrushViewControllerDelegate? From 82f18d8e4e63bc469b7a258f745d9c8f29e366a8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 09:28:40 -0500 Subject: [PATCH 190/493] Respond to CR. --- .../ViewControllers/AttachmentCaptionViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index 4f3bcd9a0..c54a8e31c 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -233,7 +233,7 @@ class AttachmentCaptionViewController: OWSViewController { textView.contentSize = contentSize let minHeight: CGFloat = textView.font?.lineHeight ?? 0 - let maxHeight = minHeight * 4 + let maxHeight: CGFloat = 300 let newHeight = contentSize.height.clamp(minHeight, maxHeight) textViewHeightConstraint.constant = newHeight From 7ee38f808d358598a0555eff3d558424b0960996 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 16:42:08 -0500 Subject: [PATCH 191/493] Show "add attachment caption" button for non-media attachments; only show if more than one attachment. --- .../AttachmentApprovalViewController.swift | 32 +++++++++++++++++++ .../Views/ImageEditor/ImageEditorView.swift | 14 ++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 776aa4295..4221b49f3 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -48,6 +48,10 @@ class AttachmentItemCollection { func remove(item: SignalAttachmentItem) { attachmentItems = attachmentItems.filter { $0 != item } } + + func count() -> Int { + return attachmentItems.count + } } // MARK: - @@ -618,6 +622,10 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate func prepViewControllerUpdateNavigationBar() { self.updateNavigationBar() } + + func prepViewControllerAttachmentCount() -> Int { + return attachmentItemCollection.count() + } } // MARK: GalleryRail @@ -671,6 +679,8 @@ protocol AttachmentPrepViewControllerDelegate: class { func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) func prepViewControllerUpdateNavigationBar() + + func prepViewControllerAttachmentCount() -> Int } public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate { @@ -884,11 +894,25 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD public func navigationBarItems() -> [UIView] { guard let imageEditorView = imageEditorView else { + // Show the "add caption" button for non-image attachments if + // there is more than one attachment. + if let prepDelegate = prepDelegate, + prepDelegate.prepViewControllerAttachmentCount() > 1 { + let captionButton = navigationBarButton(imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) + return [captionButton] + } return [] } return imageEditorView.navigationBarItems() } + @objc func didTapCaption(sender: UIButton) { + Logger.verbose("") + + imageEditorPresentCaptionView() + } + // MARK: - Event Handlers @objc @@ -1165,6 +1189,14 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { public func imageEditorUpdateNavigationBar() { prepDelegate?.prepViewControllerUpdateNavigationBar() } + + public func imageEditorAttachmentCount() -> Int { + guard let prepDelegate = prepDelegate else { + owsFailDebug("Missing prepDelegate.") + return 0 + } + return prepDelegate.prepViewControllerAttachmentCount() + } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 0e9286845..3638d5d96 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -10,6 +10,7 @@ public protocol ImageEditorViewDelegate: class { withNavigation: Bool) func imageEditorPresentCaptionView() func imageEditorUpdateNavigationBar() + func imageEditorAttachmentCount() -> Int } // MARK: - @@ -102,11 +103,20 @@ public class ImageEditorView: UIView { let captionButton = navigationBarButton(imageName: "image_editor_caption", selector: #selector(didTapCaption(sender:))) + var buttons: [UIView] if model.canUndo() { - return [undoButton, newTextButton, brushButton, cropButton, captionButton] + buttons = [undoButton, newTextButton, brushButton, cropButton] } else { - return [newTextButton, brushButton, cropButton, captionButton] + buttons = [newTextButton, brushButton, cropButton] } + + // Show the "add caption" button for non-image attachments if + // there is more than one attachment. + if let delegate = delegate, + delegate.imageEditorAttachmentCount() > 1 { + buttons.append(captionButton) + } + return buttons } // MARK: - Actions From d15f5b581f2b946faeb508330ffc50446aab186d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 17:09:32 -0500 Subject: [PATCH 192/493] Tweak how image editor overlays are presented. --- .../AttachmentApprovalViewController.swift | 32 ++++++++----------- .../Views/ImageEditor/ImageEditorView.swift | 16 +++++----- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 4221b49f3..7909d9421 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1156,32 +1156,28 @@ extension AttachmentPrepViewController: UIScrollViewDelegate { // MARK: - extension AttachmentPrepViewController: ImageEditorViewDelegate { - public func imageEditor(presentFullScreenOverlay viewController: UIViewController, - withNavigation: Bool) { + public func imageEditor(presentFullScreenView viewController: UIViewController, + isTransparent: Bool) { - if withNavigation { - let navigationController = OWSNavigationController(rootViewController: viewController) - navigationController.modalPresentationStyle = .overFullScreen + let navigationController = OWSNavigationController(rootViewController: viewController) + navigationController.modalPresentationStyle = (isTransparent + ? .overFullScreen + : .fullScreen) - if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { - navigationBar.overrideTheme(type: .clear) - } else { - owsFailDebug("navigationBar was nil or unexpected class") - } - - self.present(navigationController, animated: false) { - // Do nothing. - } + if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { + navigationBar.overrideTheme(type: .clear) } else { - self.present(viewController, animated: false) { - // Do nothing. - } + owsFailDebug("navigationBar was nil or unexpected class") + } + + self.present(navigationController, animated: false) { + // Do nothing. } } public func imageEditorPresentCaptionView() { let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) - self.imageEditor(presentFullScreenOverlay: view, withNavigation: true) + self.imageEditor(presentFullScreenView: view, isTransparent: true) isShowingCaptionView = true } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 3638d5d96..d72d507a4 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -6,8 +6,8 @@ import UIKit @objc public protocol ImageEditorViewDelegate: class { - func imageEditor(presentFullScreenOverlay viewController: UIViewController, - withNavigation: Bool) + func imageEditor(presentFullScreenView viewController: UIViewController, + isTransparent: Bool) func imageEditorPresentCaptionView() func imageEditorUpdateNavigationBar() func imageEditorAttachmentCount() -> Int @@ -134,8 +134,8 @@ public class ImageEditorView: UIView { Logger.verbose("") let brushView = ImageEditorBrushViewController(delegate: self, model: model, currentColor: currentColor) - self.delegate?.imageEditor(presentFullScreenOverlay: brushView, - withNavigation: true) + self.delegate?.imageEditor(presentFullScreenView: brushView, + isTransparent: false) } @objc func didTapCrop(sender: UIButton) { @@ -434,8 +434,8 @@ public class ImageEditorView: UIView { model: model, textItem: textItem, maxTextWidthPoints: maxTextWidthPoints) - self.delegate?.imageEditor(presentFullScreenOverlay: textEditor, - withNavigation: true) + self.delegate?.imageEditor(presentFullScreenView: textEditor, + isTransparent: false) } // MARK: - Crop Tool @@ -458,8 +458,8 @@ public class ImageEditorView: UIView { } let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage) - self.delegate?.imageEditor(presentFullScreenOverlay: cropTool, - withNavigation: true) + self.delegate?.imageEditor(presentFullScreenView: cropTool, + isTransparent: false) }} // MARK: - From 65ee1dbd754bfce7388fca66c3f290f72dcc40a5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 17:18:50 -0500 Subject: [PATCH 193/493] Hide the current text item while the text item editor is open. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 11 ++++++++++- .../ImageEditor/ImageEditorTextViewController.swift | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index a755ae9b9..79a1ae986 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -27,9 +27,13 @@ public class ImageEditorCanvasView: UIView { private let model: ImageEditorModel + private let itemIdsToIgnore: [String] + @objc - public required init(model: ImageEditorModel) { + public required init(model: ImageEditorModel, + itemIdsToIgnore: [String] = []) { self.model = model + self.itemIdsToIgnore = itemIdsToIgnore super.init(frame: .zero) @@ -180,6 +184,11 @@ public class ImageEditorCanvasView: UIView { updateImageLayer() for item in model.items() { + guard !itemIdsToIgnore.contains(item.itemId) else { + // Ignore this item. + continue + } + guard let layer = ImageEditorCanvasView.layerForItem(item: item, model: model, transform: transform, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 680f26823..a865aa5e3 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -122,7 +122,8 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel self.model = model self.textItem = textItem self.maxTextWidthPoints = maxTextWidthPoints - self.canvasView = ImageEditorCanvasView(model: model) + self.canvasView = ImageEditorCanvasView(model: model, + itemIdsToIgnore: [textItem.itemId]) self.paletteView = ImageEditorPaletteView(currentColor: textItem.color) super.init(nibName: nil, bundle: nil) From 919e886eb72ae8870fa30bec13df5083d9b29954 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 17:27:26 -0500 Subject: [PATCH 194/493] Ensure brush strokes include the entire gesture. --- .../ImageEditorBrushViewController.swift | 17 +++++++++----- .../ImageEditorPanGestureRecognizer.swift | 22 ++++++++++++++++--- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 6c79fde1b..4f9e5ccfd 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -127,7 +127,7 @@ public class ImageEditorBrushViewController: OWSViewController { private var currentStrokeSamples = [ImageEditorStrokeItem.StrokeSample]() @objc - public func handleBrushGesture(_ gestureRecognizer: UIGestureRecognizer) { + public func handleBrushGesture(_ gestureRecognizer: ImageEditorPanGestureRecognizer) { AssertIsOnMainThread() let removeCurrentStroke = { @@ -137,10 +137,9 @@ public class ImageEditorBrushViewController: OWSViewController { self.currentStroke = nil self.currentStrokeSamples.removeAll() } - let tryToAppendStrokeSample = { + let tryToAppendStrokeSample = { (locationInView: CGPoint) in let view = self.canvasView.gestureReferenceView let viewBounds = view.bounds - let locationInView = gestureRecognizer.location(in: view) let newSample = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, viewBounds: viewBounds, model: self.model, @@ -162,14 +161,22 @@ public class ImageEditorBrushViewController: OWSViewController { case .began: removeCurrentStroke() - tryToAppendStrokeSample() + // Apply the location history of the gesture so that the stroke reflects + // the touch's movement before the gesture recognized. + for location in gestureRecognizer.locations { + tryToAppendStrokeSample(location) + } + + let locationInView = gestureRecognizer.location(in: canvasView.gestureReferenceView) + tryToAppendStrokeSample(locationInView) let stroke = ImageEditorStrokeItem(color: strokeColor, unitSamples: currentStrokeSamples, unitStrokeWidth: unitStrokeWidth) model.append(item: stroke) currentStroke = stroke case .changed, .ended: - tryToAppendStrokeSample() + let locationInView = gestureRecognizer.location(in: canvasView.gestureReferenceView) + tryToAppendStrokeSample(locationInView) guard let lastStroke = self.currentStroke else { owsFailDebug("Missing last stroke.") diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift index 3f5cc39ee..835df3b93 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift @@ -13,7 +13,12 @@ public class ImageEditorPanGestureRecognizer: UIPanGestureRecognizer { public weak var referenceView: UIView? - public var locationStart: CGPoint? + // Capture the location history of this gesture. + public var locations = [CGPoint]() + + public var locationStart: CGPoint? { + return locations.first + } // MARK: - Touch Handling @@ -25,12 +30,23 @@ public class ImageEditorPanGestureRecognizer: UIPanGestureRecognizer { owsFailDebug("Missing view") return } - locationStart = self.location(in: referenceView) + locations.append(location(in: referenceView)) + } + + @objc + public override func touchesMoved(_ touches: Set, with event: UIEvent) { + super.touchesMoved(touches, with: event) + + guard let referenceView = referenceView else { + owsFailDebug("Missing view") + return + } + locations.append(location(in: referenceView)) } public override func reset() { super.reset() - locationStart = nil + locations.removeAll() } } From 9be84fc9125340fceb4fcb3ed6a63b7d87c96e42 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 09:44:52 -0500 Subject: [PATCH 195/493] Respond to CR. --- .../AttachmentApprovalViewController.swift | 55 ++++++++++++------- .../Views/ImageEditor/ImageEditorView.swift | 16 ------ 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 7909d9421..6cebb6f58 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -49,7 +49,7 @@ class AttachmentItemCollection { attachmentItems = attachmentItems.filter { $0 != item } } - func count() -> Int { + var count: Int { return attachmentItems.count } } @@ -624,7 +624,7 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate } func prepViewControllerAttachmentCount() -> Int { - return attachmentItemCollection.count() + return attachmentItemCollection.count } } @@ -893,24 +893,52 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD // MARK: - Navigation Bar public func navigationBarItems() -> [UIView] { + let captionButton = navigationBarButton(imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) + guard let imageEditorView = imageEditorView else { // Show the "add caption" button for non-image attachments if // there is more than one attachment. if let prepDelegate = prepDelegate, prepDelegate.prepViewControllerAttachmentCount() > 1 { - let captionButton = navigationBarButton(imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) return [captionButton] } return [] } - return imageEditorView.navigationBarItems() + var navigationBarItems = imageEditorView.navigationBarItems() + + // Show the caption UI if there's more than one attachment + // OR if the attachment already has a caption. + var shouldShowCaptionUI = attachmentCount() > 0 + if let captionText = attachmentItem.captionText, captionText.count > 0 { + shouldShowCaptionUI = true + } + if shouldShowCaptionUI { + navigationBarItems.append(captionButton) + } + + return navigationBarItems + } + + private func attachmentCount() -> Int { + guard let prepDelegate = prepDelegate else { + owsFailDebug("Missing prepDelegate.") + return 0 + } + return prepDelegate.prepViewControllerAttachmentCount() } @objc func didTapCaption(sender: UIButton) { Logger.verbose("") - imageEditorPresentCaptionView() + presentCaptionView() + } + + private func presentCaptionView() { + let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) + self.imageEditor(presentFullScreenView: view, isTransparent: true) + + isShowingCaptionView = true } // MARK: - Event Handlers @@ -1175,24 +1203,9 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { } } - public func imageEditorPresentCaptionView() { - let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) - self.imageEditor(presentFullScreenView: view, isTransparent: true) - - isShowingCaptionView = true - } - public func imageEditorUpdateNavigationBar() { prepDelegate?.prepViewControllerUpdateNavigationBar() } - - public func imageEditorAttachmentCount() -> Int { - guard let prepDelegate = prepDelegate else { - owsFailDebug("Missing prepDelegate.") - return 0 - } - return prepDelegate.prepViewControllerAttachmentCount() - } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index d72d507a4..146c0a2de 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -8,9 +8,7 @@ import UIKit public protocol ImageEditorViewDelegate: class { func imageEditor(presentFullScreenView viewController: UIViewController, isTransparent: Bool) - func imageEditorPresentCaptionView() func imageEditorUpdateNavigationBar() - func imageEditorAttachmentCount() -> Int } // MARK: - @@ -100,8 +98,6 @@ public class ImageEditorView: UIView { selector: #selector(didTapCrop(sender:))) let newTextButton = navigationBarButton(imageName: "image_editor_text", selector: #selector(didTapNewText(sender:))) - let captionButton = navigationBarButton(imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) var buttons: [UIView] if model.canUndo() { @@ -110,12 +106,6 @@ public class ImageEditorView: UIView { buttons = [newTextButton, brushButton, cropButton] } - // Show the "add caption" button for non-image attachments if - // there is more than one attachment. - if let delegate = delegate, - delegate.imageEditorAttachmentCount() > 1 { - buttons.append(captionButton) - } return buttons } @@ -162,12 +152,6 @@ public class ImageEditorView: UIView { edit(textItem: textItem) } - @objc func didTapCaption(sender: UIButton) { - Logger.verbose("") - - delegate?.imageEditorPresentCaptionView() - } - @objc func didTapDone(sender: UIButton) { Logger.verbose("") } From 65ead451c083fc98d53f0377d41d6240a71e682a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Feb 2019 18:02:57 -0500 Subject: [PATCH 196/493] Don't enable undo in stroke view for items created before stroke view. --- .../ImageEditor/ImageEditorBrushViewController.swift | 10 +++++++++- .../Views/ImageEditor/ImageEditorModel.swift | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 4f9e5ccfd..9e677b2e7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -23,6 +23,11 @@ public class ImageEditorBrushViewController: OWSViewController { private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? + // We only want to let users undo changes made in this view. + // So we snapshot any older "operation id" and prevent + // users from undoing it. + private let firstUndoOperationId: String? + init(delegate: ImageEditorBrushViewControllerDelegate, model: ImageEditorModel, currentColor: ImageEditorColor) { @@ -30,6 +35,7 @@ public class ImageEditorBrushViewController: OWSViewController { self.model = model self.canvasView = ImageEditorCanvasView(model: model) self.paletteView = ImageEditorPaletteView(currentColor: currentColor) + self.firstUndoOperationId = model.currentUndoOperationId() super.init(nibName: nil, bundle: nil) @@ -86,8 +92,10 @@ public class ImageEditorBrushViewController: OWSViewController { let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", selector: #selector(didTapDone(sender:))) + // Prevent users from undo any changes made before entering the view. + let canUndo = model.canUndo() && firstUndoOperationId != model.currentUndoOperationId() var navigationBarItems = [UIView]() - if model.canUndo() { + if canUndo { navigationBarItems = [undoButton, doneButton] } else { navigationBarItems = [doneButton] diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index ab6daed7a..cd7272096 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -242,9 +242,12 @@ public class ImageEditorTransform: NSObject { // (multiple times) to preserve/restore editor state. private class ImageEditorOperation: NSObject { + let operationId: String + let contents: ImageEditorContents required init(contents: ImageEditorContents) { + self.operationId = UUID().uuidString self.contents = contents } } @@ -361,6 +364,14 @@ public class ImageEditorModel: NSObject { return !redoStack.isEmpty } + @objc + public func currentUndoOperationId() -> String? { + guard let operation = undoStack.last else { + return nil + } + return operation.operationId + } + // MARK: - Observers private var observers = [Weak]() From 93cb0e3a102e84f43d290391d3837658a09aab18 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 09:53:56 -0500 Subject: [PATCH 197/493] Fix bar button layout on iOS 9. --- .../OWSViewController+ImageEditor.swift | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift index 7c2e46b11..a7f50cf3e 100644 --- a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift +++ b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift @@ -29,11 +29,24 @@ public extension UIViewController { return } + let spacing: CGFloat = 8 let stackView = UIStackView(arrangedSubviews: navigationBarItems) stackView.axis = .horizontal - stackView.spacing = 8 + stackView.spacing = spacing stackView.alignment = .center + // Ensure layout works on older versions of iOS. + var stackSize = CGSize.zero + for item in navigationBarItems { + let itemSize = item.sizeThatFits(.zero) + stackSize.width += itemSize.width + spacing + stackSize.height = max(stackSize.height, itemSize.height) + } + if navigationBarItems.count > 0 { + stackSize.width -= spacing + } + stackView.frame = CGRect(origin: .zero, size: stackSize) + self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: stackView) } } From 3d96cd488e0d6208e38dc1008d7bc1224b83a96e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 10:37:22 -0500 Subject: [PATCH 198/493] Improve color continuity in the image editor. --- .../ImageEditor/ImageEditorBrushViewController.swift | 4 ++-- .../Views/ImageEditor/ImageEditorView.swift | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 9e677b2e7..0ba64c3c2 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -6,7 +6,7 @@ import UIKit @objc public protocol ImageEditorBrushViewControllerDelegate: class { - func brushDidComplete() + func brushDidComplete(currentColor: ImageEditorColor) } // MARK: - @@ -121,7 +121,7 @@ public class ImageEditorBrushViewController: OWSViewController { } private func completeAndDismiss() { - self.delegate?.brushDidComplete() + self.delegate?.brushDidComplete(currentColor: paletteView.selectedValue) self.dismiss(animated: false) { // Do nothing. diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 146c0a2de..ba38915eb 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -24,7 +24,8 @@ public class ImageEditorView: UIView { private let canvasView: ImageEditorCanvasView - // TODO: We could hang this on the model or make this static. + // TODO: We could hang this on the model or make this static + // if we wanted more color continuity. private var currentColor = ImageEditorColor.defaultColor() @objc @@ -444,7 +445,8 @@ public class ImageEditorView: UIView { let cropTool = ImageEditorCropViewController(delegate: self, model: model, srcImage: srcImage, previewImage: previewImage) self.delegate?.imageEditor(presentFullScreenView: cropTool, isTransparent: false) - }} + } +} // MARK: - @@ -498,6 +500,8 @@ extension ImageEditorView: ImageEditorTextViewControllerDelegate { } else { model.append(item: newItem) } + + self.currentColor = color } public func textEditDidCancel() { @@ -520,6 +524,7 @@ extension ImageEditorView: ImageEditorCropViewControllerDelegate { // MARK: - extension ImageEditorView: ImageEditorBrushViewControllerDelegate { - public func brushDidComplete() { + public func brushDidComplete(currentColor: ImageEditorColor) { + self.currentColor = currentColor } } From 1a159d4d70916c668600b051e8e187214918d84d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 10:37:36 -0500 Subject: [PATCH 199/493] Clean up brush stroke gesture usage. --- .../ImageEditorBrushViewController.swift | 16 +++++-- .../ImageEditorCropViewController.swift | 6 +-- .../ImageEditorPanGestureRecognizer.swift | 42 +++++++++++++------ .../Views/ImageEditor/ImageEditorView.swift | 4 +- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 0ba64c3c2..afa220829 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -21,8 +21,6 @@ public class ImageEditorBrushViewController: OWSViewController { private let paletteView: ImageEditorPaletteView - private var brushGestureRecognizer: ImageEditorPanGestureRecognizer? - // We only want to let users undo changes made in this view. // So we snapshot any older "operation id" and prevent // users from undoing it. @@ -68,8 +66,8 @@ public class ImageEditorBrushViewController: OWSViewController { let brushGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handleBrushGesture(_:))) brushGestureRecognizer.maximumNumberOfTouches = 1 brushGestureRecognizer.referenceView = canvasView.gestureReferenceView + brushGestureRecognizer.delegate = self self.view.addGestureRecognizer(brushGestureRecognizer) - self.brushGestureRecognizer = brushGestureRecognizer updateNavigationBar() } @@ -171,7 +169,7 @@ public class ImageEditorBrushViewController: OWSViewController { // Apply the location history of the gesture so that the stroke reflects // the touch's movement before the gesture recognized. - for location in gestureRecognizer.locations { + for location in gestureRecognizer.locationHistory { tryToAppendStrokeSample(location) } @@ -230,3 +228,13 @@ extension ImageEditorBrushViewController: ImageEditorPaletteViewDelegate { // TODO: } } + +// MARK: - + +extension ImageEditorBrushViewController: UIGestureRecognizerDelegate { + @objc public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { + // Ignore touches that begin inside the palette. + let location = touch.location(in: paletteView) + return !paletteView.bounds.contains(location) + } +} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 814a403ac..e3e2b0b0d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -501,7 +501,7 @@ class ImageEditorCropViewController: OWSViewController { Logger.verbose("") - guard let locationStart = gestureRecognizer.locationStart else { + guard let locationStart = gestureRecognizer.locationFirst else { owsFailDebug("Missing locationStart.") return } @@ -666,7 +666,7 @@ class ImageEditorCropViewController: OWSViewController { owsFailDebug("Missing pinchTransform.") return } - guard let oldLocationView = gestureRecognizer.locationStart else { + guard let oldLocationView = gestureRecognizer.locationFirst else { owsFailDebug("Missing locationStart.") return } @@ -685,7 +685,7 @@ class ImageEditorCropViewController: OWSViewController { } private func cropRegion(forGestureRecognizer gestureRecognizer: ImageEditorPanGestureRecognizer) -> CropRegion? { - guard let location = gestureRecognizer.locationStart else { + guard let location = gestureRecognizer.locationFirst else { owsFailDebug("Missing locationStart.") return nil } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift index 835df3b93..699a2c832 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPanGestureRecognizer.swift @@ -14,39 +14,57 @@ public class ImageEditorPanGestureRecognizer: UIPanGestureRecognizer { public weak var referenceView: UIView? // Capture the location history of this gesture. - public var locations = [CGPoint]() + public var locationHistory = [CGPoint]() - public var locationStart: CGPoint? { - return locations.first + public var locationFirst: CGPoint? { + return locationHistory.first } // MARK: - Touch Handling @objc public override func touchesBegan(_ touches: Set, with event: UIEvent) { - super.touchesBegan(touches, with: event) + updateLocationHistory(event: event) - guard let referenceView = referenceView else { - owsFailDebug("Missing view") - return - } - locations.append(location(in: referenceView)) + super.touchesBegan(touches, with: event) } @objc public override func touchesMoved(_ touches: Set, with event: UIEvent) { - super.touchesMoved(touches, with: event) + updateLocationHistory(event: event) + super.touchesMoved(touches, with: event) + } + + @objc + public override func touchesEnded(_ touches: Set, with event: UIEvent) { + updateLocationHistory(event: event) + + super.touchesEnded(touches, with: event) + } + + private func updateLocationHistory(event: UIEvent) { + guard let touches = event.allTouches, + touches.count > 0 else { + owsFailDebug("no touches.") + return + } guard let referenceView = referenceView else { owsFailDebug("Missing view") return } - locations.append(location(in: referenceView)) + // Find the centroid. + var location = CGPoint.zero + for touch in touches { + location = location.plus(touch.location(in: referenceView)) + } + location = location.times(CGFloat(1) / CGFloat(touches.count)) + locationHistory.append(location) } public override func reset() { super.reset() - locations.removeAll() + locationHistory.removeAll() } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index ba38915eb..8c31e1907 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -274,7 +274,7 @@ public class ImageEditorView: UIView { switch gestureRecognizer.state { case .began: - guard let locationStart = gestureRecognizer.locationStart else { + guard let locationStart = gestureRecognizer.locationFirst else { owsFailDebug("Missing locationStart.") return } @@ -294,7 +294,7 @@ public class ImageEditorView: UIView { guard let textItem = movingTextItem else { return } - guard let locationStart = gestureRecognizer.locationStart else { + guard let locationStart = gestureRecognizer.locationFirst else { owsFailDebug("Missing locationStart.") return } From 871dceac3a6b84c39999bfcc7aac5675e30f656a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 11:21:19 -0500 Subject: [PATCH 200/493] Improve palette interactions. --- .../ImageEditorBrushViewController.swift | 2 +- .../ImageEditor/ImageEditorPaletteView.swift | 98 ++++++++----------- .../ImageEditorTextViewController.swift | 4 +- 3 files changed, 44 insertions(+), 60 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index afa220829..63a7590a7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -59,7 +59,7 @@ public class ImageEditorBrushViewController: OWSViewController { paletteView.delegate = self self.view.addSubview(paletteView) paletteView.autoVCenterInSuperview() - paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 20) + paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 0) self.view.isUserInteractionEnabled = true diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index a4040e774..2e7689604 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -97,9 +97,8 @@ public class ImageEditorPaletteView: UIView { owsFailDebug("Missing image.") } addSubview(imageView) - // We use an invisible margin to expand the hot area of - // this control. - let margin: CGFloat = 8 + // We use an invisible margin to expand the hot area of this control. + let margin: CGFloat = 20 imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) selectionWrapper.layoutCallback = { [weak self] (view) in @@ -144,14 +143,49 @@ public class ImageEditorPaletteView: UIView { } private func value(for palettePhase: CGFloat) -> ImageEditorColor { - guard let image = imageView.image else { - owsFailDebug("Missing image.") + // We find the color in the palette's gradient that corresponds + // to the "phase". + // + // 0 = top of gradient, first color. + // 1 = bottom of gradient, last color. + struct GradientSegment { + let color0: UIColor + let color1: UIColor + let palettePhase0: CGFloat + let palettePhase1: CGFloat + } + var segments = [GradientSegment]() + let segmentCount = ImageEditorColor.gradientUIColors.count - 1 + var prevColor: UIColor? + for color in ImageEditorColor.gradientUIColors { + if let color0 = prevColor { + let index = CGFloat(segments.count) + let color1 = color + let palettePhase0: CGFloat = index / CGFloat(segmentCount) + let palettePhase1: CGFloat = (index + 1) / CGFloat(segmentCount) + segments.append(GradientSegment(color0: color0, color1: color1, palettePhase0: palettePhase0, palettePhase1: palettePhase1)) + } + prevColor = color + } + var bestSegment = segments.first + for segment in segments { + if palettePhase >= segment.palettePhase0 { + bestSegment = segment + } + } + guard let segment = bestSegment else { + owsFailDebug("Couldn't find matching segment.") return ImageEditorColor.defaultColor() } - guard let color = image.color(atLocation: CGPoint(x: CGFloat(image.size.width) * 0.5, y: CGFloat(image.size.height) * palettePhase)) else { - owsFailDebug("Missing color.") + guard palettePhase >= segment.palettePhase0, + palettePhase <= segment.palettePhase1 else { + owsFailDebug("Invalid segment.") return ImageEditorColor.defaultColor() } + let segmentPhase = palettePhase.inverseLerp(segment.palettePhase0, segment.palettePhase1).clamp01() + // If CAGradientLayer doesn't do naive RGB color interpolation, + // this won't be WYSIWYG. + let color = segment.color0.blend(with: segment.color1, alpha: segmentPhase) return ImageEditorColor(color: color, palettePhase: palettePhase) } @@ -170,7 +204,6 @@ public class ImageEditorPaletteView: UIView { @objc func didTouch(gesture: UIGestureRecognizer) { - Logger.verbose("gesture: \(NSStringForUIGestureRecognizerState(gesture.state))") switch gesture.state { case .began, .changed, .ended: break @@ -201,55 +234,6 @@ public class ImageEditorPaletteView: UIView { // MARK: - -extension UIImage { - func color(atLocation locationPoints: CGPoint) -> UIColor? { - guard let cgImage = cgImage else { - owsFailDebug("Missing cgImage.") - return nil - } - guard let dataProvider = cgImage.dataProvider else { - owsFailDebug("Could not create dataProvider.") - return nil - } - guard let pixelData = dataProvider.data else { - owsFailDebug("dataProvider has no data.") - return nil - } - let bytesPerPixel: Int = cgImage.bitsPerPixel / 8 - guard bytesPerPixel == 4 else { - owsFailDebug("Invalid bytesPerPixel: \(bytesPerPixel).") - return nil - } - let imageWidth: Int = cgImage.width - let imageHeight: Int = cgImage.height - guard imageWidth > 0, - imageHeight > 0 else { - owsFailDebug("Invalid image size.") - return nil - } - - // Convert the location from points to pixels and clamp to the image bounds. - let xPixels: Int = Int(round(locationPoints.x * self.scale)).clamp(0, imageWidth - 1) - let yPixels: Int = Int(round(locationPoints.y * self.scale)).clamp(0, imageHeight - 1) - let dataLength = (pixelData as Data).count - let data: UnsafePointer = CFDataGetBytePtr(pixelData) - let index: Int = (imageWidth * yPixels + xPixels) * bytesPerPixel - guard index >= 0, index < dataLength else { - owsFailDebug("Invalid index.") - return nil - } - - let red = CGFloat(data[index]) / CGFloat(255.0) - let green = CGFloat(data[index+1]) / CGFloat(255.0) - let blue = CGFloat(data[index+2]) / CGFloat(255.0) - let alpha = CGFloat(data[index+3]) / CGFloat(255.0) - - return UIColor(red: red, green: green, blue: blue, alpha: alpha) - } -} - -// MARK: - - // The most permissive GR possible. Accepts any number of touches in any locations. private class PaletteGestureRecognizer: UIGestureRecognizer { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index a865aa5e3..f243a6f90 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -187,9 +187,9 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel paletteView.delegate = self self.view.addSubview(paletteView) paletteView.autoAlignAxis(.horizontal, toSameAxisOf: textView) - paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 20) + paletteView.autoPinEdge(toSuperviewEdge: .trailing, withInset: 0) // This will determine the text view's size. - paletteView.autoPinEdge(.leading, to: .trailing, of: textView, withOffset: 8) + paletteView.autoPinEdge(.leading, to: .trailing, of: textView, withOffset: 0) updateNavigationBar() } From 80d297c10a403d6fb065d68b7236ca8c59a1abfa Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 11:35:16 -0500 Subject: [PATCH 201/493] Render strokes behind text. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 79a1ae986..7df5344eb 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -53,7 +53,7 @@ public class ImageEditorCanvasView: UIView { public let contentView = OWSLayerView() // clipView is used to clip the content. It reflects the actual - // visible bounds of the content. + // visible bounds of the "canvas" content. private let clipView = OWSLayerView() private var contentViewConstraints = [NSLayoutConstraint]() @@ -461,6 +461,8 @@ public class ImageEditorCanvasView: UIView { shapeLayer.fillColor = nil shapeLayer.lineCap = kCALineCapRound shapeLayer.lineJoin = kCALineJoinRound + // We want strokes to be rendered above the image and behind text. + shapeLayer.zPosition = 1 return shapeLayer } @@ -520,6 +522,9 @@ public class ImageEditorCanvasView: UIView { let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) layer.setAffineTransform(transform) + // We want text to be rendered above the image and strokes. + layer.zPosition = 2 + return layer } From 371c12bd4043ecd78909e65c361fe327c13ae0ac Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 12:13:41 -0500 Subject: [PATCH 202/493] Show caption indicators in attachment approval media rail. --- .../AttachmentApprovalViewController.swift | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 6cebb6f58..10fc300cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -617,6 +617,8 @@ extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate { extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate { func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) + + updateMediaRail() } func prepViewControllerUpdateNavigationBar() { @@ -1636,6 +1638,16 @@ public class ApprovalRailCellView: GalleryRailCellView { return button }() + lazy var captionIndicator: UIView = { + let image = UIImage(named: "image_editor_caption")?.withRenderingMode(.alwaysTemplate) + let imageView = UIImageView(image: image) + imageView.tintColor = .white + imageView.layer.shadowColor = UIColor.black.cgColor + imageView.layer.shadowRadius = 2 + imageView.layer.shadowOpacity = 0.66 + return imageView + }() + override func setIsSelected(_ isSelected: Bool) { super.setIsSelected(isSelected) @@ -1648,4 +1660,26 @@ public class ApprovalRailCellView: GalleryRailCellView { deleteButton.removeFromSuperview() } } + + override func configure(item: GalleryRailItem, delegate: GalleryRailCellViewDelegate) { + super.configure(item: item, delegate: delegate) + + var hasCaption = false + if let attachmentItem = item as? SignalAttachmentItem { + if let captionText = attachmentItem.captionText { + hasCaption = captionText.count > 0 + } + } else { + owsFailDebug("Invalid item.") + } + + if hasCaption { + addSubview(captionIndicator) + + captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 0) + captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 4) + } else { + captionIndicator.removeFromSuperview() + } + } } From c31d4696512a994383be5d91b84fc2a1530a2d02 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 13:36:09 -0500 Subject: [PATCH 203/493] Improve new text item continuity. --- .../ImageEditor/ImageEditorCanvasView.swift | 10 +++--- .../ImageEditor/ImageEditorTextItem.swift | 27 +++++++++++++-- .../ImageEditorTextViewController.swift | 33 ++++++++++++++++++- .../Views/ImageEditor/ImageEditorView.swift | 17 +++++++--- SignalMessaging/categories/UIView+OWS.swift | 4 +++ 5 files changed, 80 insertions(+), 11 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 7df5344eb..7a4e7b637 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -489,13 +489,15 @@ public class ImageEditorCanvasView: UIView { // I don't think we need to enable allowsFontSubpixelQuantization // or set truncationMode. - // This text needs to be rendered at a scale that reflects the sceen scaling - // AND the item's scaling. - layer.contentsScale = UIScreen.main.scale * item.scaling + // This text needs to be rendered at a scale that reflects: + // + // * The screen scaling (so that text looks sharp on Retina devices. + // * The item's scaling (so that text doesn't become blurry as you make it larger). + // * Model transform (so that text doesn't become blurry as you zoom the content). + layer.contentsScale = UIScreen.main.scale * item.scaling * transform.scaling // TODO: Min with measured width. let maxWidth = imageFrame.size.width * item.unitWidth -// let maxWidth = viewSize.width * item.unitWidth let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude) // TODO: Is there a more accurate way to measure text in a CATextLayer? diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift index 1056c2bcb..fe08e1adc 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift @@ -101,10 +101,20 @@ public class ImageEditorTextItem: ImageEditorItem { } @objc - public class func empty(withColor color: ImageEditorColor, unitWidth: CGFloat, fontReferenceImageWidth: CGFloat) -> ImageEditorTextItem { + public class func empty(withColor color: ImageEditorColor, + unitWidth: CGFloat, + fontReferenceImageWidth: CGFloat, + scaling: CGFloat, + rotationRadians: CGFloat) -> ImageEditorTextItem { // TODO: Tune the default font size. let font = UIFont.boldSystemFont(ofSize: 30.0) - return ImageEditorTextItem(text: "", color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, unitWidth: unitWidth) + return ImageEditorTextItem(text: "", + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling) } @objc @@ -148,6 +158,19 @@ public class ImageEditorTextItem: ImageEditorItem { scaling: newScaling) } + @objc + public func copy(withUnitCenter newUnitCenter: CGPoint, unitWidth newUnitWidth: CGFloat) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + text: text, + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitCenter: newUnitCenter, + unitWidth: newUnitWidth, + rotationRadians: rotationRadians, + scaling: scaling) + } + public override func outputScale() -> CGFloat { return scaling } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index f243a6f90..3a04ac443 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -104,6 +104,8 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel private let textItem: ImageEditorTextItem + private let isNewItem: Bool + private let maxTextWidthPoints: CGFloat private let textView = VAlignTextView(alignment: .center) @@ -117,10 +119,12 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel init(delegate: ImageEditorTextViewControllerDelegate, model: ImageEditorModel, textItem: ImageEditorTextItem, + isNewItem: Bool, maxTextWidthPoints: CGFloat) { self.delegate = delegate self.model = model self.textItem = textItem + self.isNewItem = isNewItem self.maxTextWidthPoints = maxTextWidthPoints self.canvasView = ImageEditorCanvasView(model: model, itemIdsToIgnore: [textItem.itemId]) @@ -176,6 +180,7 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel }) configureTextView() + textView.addRedBorder() self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) @@ -245,7 +250,33 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel } private func completeAndDismiss() { - self.delegate?.textEditDidComplete(textItem: textItem, text: textView.text, color: paletteView.selectedValue) + var newTextItem = textItem + + if isNewItem { + let view = self.canvasView.gestureReferenceView + let viewBounds = view.bounds + + // Ensure continuity of the new text item's location + // with its apparent location in this text editor. + let locationInView = view.convert(textView.bounds.center, from: textView) + let textCenterImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, + viewBounds: viewBounds, + model: model, + transform: model.currentTransform()) + + // Same, but for size. + let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, + imageSize: model.srcImageSizePixels, + transform: model.currentTransform()) + let unitWidth = textView.width() / imageFrame.width + + newTextItem = textItem.copy(withUnitCenter: textCenterImageUnit, unitWidth: unitWidth) + } + + // Hide the text view immediately to avoid animation glitches in the dismiss transition. + textView.isHidden = true + + self.delegate?.textEditDidComplete(textItem: newTextItem, text: textView.text, color: paletteView.selectedValue) self.dismiss(animated: false) { // Do nothing. diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 8c31e1907..c0e490931 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -146,11 +146,19 @@ public class ImageEditorView: UIView { let textWidthPoints = viewSize.width * ImageEditorTextItem.kDefaultUnitWidth let textWidthUnit = textWidthPoints / imageFrame.size.width + // New items should be aligned "upright", so they should have the _opposite_ + // of the current transform rotation. + let rotationRadians = -model.currentTransform().rotationRadians + // Similarly, the size of the text item shuo + let scaling = 1 / model.currentTransform().scaling + let textItem = ImageEditorTextItem.empty(withColor: currentColor, unitWidth: textWidthUnit, - fontReferenceImageWidth: imageFrame.size.width) + fontReferenceImageWidth: imageFrame.size.width, + scaling: scaling, + rotationRadians: rotationRadians) - edit(textItem: textItem) + edit(textItem: textItem, isNewItem: true) } @objc func didTapDone(sender: UIButton) { @@ -178,7 +186,7 @@ public class ImageEditorView: UIView { return } - edit(textItem: textItem) + edit(textItem: textItem, isNewItem: false) } // MARK: - Pinch Gesture @@ -408,7 +416,7 @@ public class ImageEditorView: UIView { // MARK: - Edit Text Tool - private func edit(textItem: ImageEditorTextItem) { + private func edit(textItem: ImageEditorTextItem, isNewItem: Bool) { Logger.verbose("") // TODO: @@ -418,6 +426,7 @@ public class ImageEditorView: UIView { let textEditor = ImageEditorTextViewController(delegate: self, model: model, textItem: textItem, + isNewItem: isNewItem, maxTextWidthPoints: maxTextWidthPoints) self.delegate?.imageEditor(presentFullScreenView: textEditor, isTransparent: false) diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index c50db8c35..fb171452c 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -202,6 +202,10 @@ public extension CGPoint { y: Swift.max(y, value.y)) } + public var length: CGFloat { + return sqrt(x * x + y * y) + } + public static let unit: CGPoint = CGPoint(x: 1.0, y: 1.0) public static let unitMidpoint: CGPoint = CGPoint(x: 0.5, y: 0.5) From ddbef4e3111b2ba921fad8fe2f2dea28aef12cf9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:56:52 -0500 Subject: [PATCH 204/493] Respond to CR. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 11 +++++++---- .../ImageEditor/ImageEditorTextViewController.swift | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 7a4e7b637..886adf2c7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -29,6 +29,11 @@ public class ImageEditorCanvasView: UIView { private let itemIdsToIgnore: [String] + // We want strokes to be rendered above the image and behind text. + private static let brushLayerZ: CGFloat = +1 + // We want text to be rendered above the image and strokes. + private static let textLayerZ: CGFloat = +2 + @objc public required init(model: ImageEditorModel, itemIdsToIgnore: [String] = []) { @@ -461,8 +466,7 @@ public class ImageEditorCanvasView: UIView { shapeLayer.fillColor = nil shapeLayer.lineCap = kCALineCapRound shapeLayer.lineJoin = kCALineJoinRound - // We want strokes to be rendered above the image and behind text. - shapeLayer.zPosition = 1 + shapeLayer.zPosition = brushLayerZ return shapeLayer } @@ -524,8 +528,7 @@ public class ImageEditorCanvasView: UIView { let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) layer.setAffineTransform(transform) - // We want text to be rendered above the image and strokes. - layer.zPosition = 2 + layer.zPosition = textLayerZ return layer } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 3a04ac443..8292582de 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -180,7 +180,6 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel }) configureTextView() - textView.addRedBorder() self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) From 66c0419131a1198d376905f06362fb2c6b412c27 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:59:28 -0500 Subject: [PATCH 205/493] Temporarily enable image editor. --- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index cd7272096..f99ccde46 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return _isDebugAssertConfiguration() + return true } @objc From 3b56b2fb4c24b479ee3be1deae62cd0df0d485e2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:59:49 -0500 Subject: [PATCH 206/493] "Bump build to 2.38.0.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index ffc174007..a04a8c669 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.37.0 + 2.38.0 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.5 + 2.38.0.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 66cbb39dc..b1345a6aa 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.37.0 + 2.38.0 CFBundleVersion - 2.37.0.5 + 2.38.0.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 6052ce477a6b2f42094958357273defd01f27995 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:00:07 -0500 Subject: [PATCH 207/493] Revert "Temporarily enable image editor." This reverts commit 66c0419131a1198d376905f06362fb2c6b412c27. --- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f99ccde46..cd7272096 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return true + return _isDebugAssertConfiguration() } @objc From 7912c338ab0227aae88d6cf61469273e87d75688 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 13:47:50 -0500 Subject: [PATCH 208/493] Update onboarding splash copy. Update onboarding splash copy. --- Signal/translations/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 799bd1eba..2e181fddc 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; From 14c5c21180d4131b2e05a9a8cbab6f48a8fa0ef1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 14:02:43 -0500 Subject: [PATCH 209/493] Fix size of "empty home view" image. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 96125433d..e57947ac7 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -378,7 +378,10 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { emptyInboxImageView.layer.minificationFilter = kCAFilterTrilinear; emptyInboxImageView.layer.magnificationFilter = kCAFilterTrilinear; [emptyInboxImageView autoPinToAspectRatioWithSize:emptyInboxImageView.image.size]; - + CGSize screenSize = UIScreen.mainScreen.bounds.size; + CGFloat emptyInboxImageSize = MIN(screenSize.width, screenSize.height) * 0.65f; + [emptyInboxImageView autoSetDimension:ALDimensionWidth toSize:emptyInboxImageSize]; + UILabel *emptyInboxLabel = [UILabel new]; emptyInboxLabel.text = NSLocalizedString(@"INBOX_VIEW_EMPTY_INBOX", @"Message shown in the home view when the inbox is empty."); From 2112f04abb4acb35ea87e4ce08ad14f7e29f50dc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 14:42:21 -0500 Subject: [PATCH 210/493] Fix layout of "first conversation" prompt. --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index e57947ac7..48ac417d3 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -447,7 +447,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { }; [layerView addSubview:label]; - [label ows_autoPinToSuperviewMargins]; + [label autoPinEdgesToSuperviewMargins]; layerView.userInteractionEnabled = YES; [layerView From e992ff3bcfd2d612ad3d211707998bbf3e266662 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:28:29 -0500 Subject: [PATCH 211/493] Fix glitch in presentation animations for onboarding views. --- .../Registration/OnboardingBaseViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index ee9f380b0..08abd7391 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -86,6 +86,8 @@ public class OnboardingBaseViewController: OWSViewController { } else { owsFailDebug("Missing or invalid navigationController") } + + view.layoutSubviews() } public override func viewDidAppear(_ animated: Bool) { From 4fac50be6c90ae2d5763fbdbccc7e6462e94588b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:28:48 -0500 Subject: [PATCH 212/493] Remove spurious error in onboarding verification process. --- .../OnboardingVerificationViewController.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index e43d9f2e3..3c16921f2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -437,6 +437,8 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController } } + // MARK: - View Lifecycle + public override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) @@ -491,7 +493,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController Logger.info("") guard onboardingCodeView.isComplete else { - self.setHasInvalidCode(true) + self.setHasInvalidCode(false) return } @@ -499,7 +501,12 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController onboardingController.update(verificationCode: onboardingCodeView.verificationCode) + // Temporarily hide the "resend link" button during the verification attempt. + codeStateLink?.layer.opacity = 0.05 + onboardingController.tryToVerify(fromViewController: self, completion: { (outcome) in + self.codeStateLink?.layer.opacity = 1 + if outcome == .invalidVerificationCode { self.setHasInvalidCode(true) } From d006f4a298e117b06f85c1254efe1bb79bdcf961 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 15:34:36 -0500 Subject: [PATCH 213/493] Improve cramped layouts in onboarding views. --- .../Registration/Onboarding2FAViewController.swift | 3 +-- .../Registration/OnboardingVerificationViewController.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift index 0918bd78e..3f6bd3672 100644 --- a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift +++ b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift @@ -73,7 +73,6 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { explanationLabel1, UIView.spacer(withHeight: 10), explanationLabel2, - topSpacer, pinTextField, UIView.spacer(withHeight: 10), @@ -85,7 +84,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets(top: 20, left: 32, bottom: 20, right: 32) + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperview() diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 3c16921f2..4388cfea4 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -318,7 +318,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController ]) stackView.axis = .vertical stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) + stackView.layoutMargins = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16) stackView.isLayoutMarginsRelativeArrangement = true view.addSubview(stackView) stackView.autoPinWidthToSuperview() From 70a163f3fa00ba28716617d75c0f3b7b690874f6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:17:26 -0500 Subject: [PATCH 214/493] Respond to CR. --- .../Registration/OnboardingBaseViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index 08abd7391..a1594d3ec 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -87,7 +87,7 @@ public class OnboardingBaseViewController: OWSViewController { owsFailDebug("Missing or invalid navigationController") } - view.layoutSubviews() + view.layoutIfNeeded() } public override func viewDidAppear(_ animated: Bool) { From 1078756bc60da4afb146a38e560a7d34234aafdb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:10 -0500 Subject: [PATCH 215/493] Temporarily enable image editor. --- .../ViewControllers/AttachmentApprovalViewController.swift | 2 -- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 10fc300cb..a069db499 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -782,7 +782,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() - #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -798,7 +797,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD viewController: self) } } - #endif if isZoomable { // Add top and bottom gradients to ensure toolbar controls are legible diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index cd7272096..f99ccde46 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return _isDebugAssertConfiguration() + return true } @objc From 9a6c362294cbc5907cc85cc000191984a3bc3dad Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:21 -0500 Subject: [PATCH 216/493] "Bump build to 2.38.0.1." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index a04a8c669..1476243d1 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.0 + 2.38.0.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index b1345a6aa..d9b73ac16 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.0 + 2.38.0.1 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 22626bdffd7e363610bdf92577dfeeef56341192 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:35 -0500 Subject: [PATCH 217/493] Revert "Temporarily enable image editor." This reverts commit 1078756bc60da4afb146a38e560a7d34234aafdb. --- .../ViewControllers/AttachmentApprovalViewController.swift | 2 ++ SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index a069db499..10fc300cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -782,6 +782,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() + #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -797,6 +798,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD viewController: self) } } + #endif if isZoomable { // Add top and bottom gradients to ensure toolbar controls are legible diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f99ccde46..cd7272096 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return true + return _isDebugAssertConfiguration() } @objc From 3209ce6cd991f8b35e49426b79422dbee0c72e6e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Sat, 2 Mar 2019 15:30:32 -0500 Subject: [PATCH 218/493] Normalize images in the image editor. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 886adf2c7..dbe3448a3 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -160,7 +160,11 @@ public class ImageEditorCanvasView: UIView { owsFailDebug("Couldn't load background image.") return nil } - return srcImage + // We normalize the image orientation here for the sake + // of code simplicity. We could modify the image layer's + // transform to handle the normalization, which would + // have perf benefits. + return srcImage.normalized() } // MARK: - Content From 49685c52bba7a1bd46265b85d3d4b1e984102352 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:10 -0500 Subject: [PATCH 219/493] Temporarily enable image editor. --- .../ViewControllers/AttachmentApprovalViewController.swift | 2 -- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 10fc300cb..a069db499 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -782,7 +782,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() - #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -798,7 +797,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD viewController: self) } } - #endif if isZoomable { // Add top and bottom gradients to ensure toolbar controls are legible diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index cd7272096..f99ccde46 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return _isDebugAssertConfiguration() + return true } @objc From aba6eb329dc59533683cf2bd0c7f5bac4a140abb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Sat, 2 Mar 2019 15:40:28 -0500 Subject: [PATCH 220/493] "Bump build to 2.38.0.2." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 1476243d1..073de9f9e 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.1 + 2.38.0.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index d9b73ac16..bcc9a58bf 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.1 + 2.38.0.2 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 6cae61bf18f55c679a2956d27dd6739fe8fd49a1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:35 -0500 Subject: [PATCH 221/493] Revert "Temporarily enable image editor." This reverts commit 1078756bc60da4afb146a38e560a7d34234aafdb. --- .../ViewControllers/AttachmentApprovalViewController.swift | 2 ++ SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index a069db499..10fc300cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -782,6 +782,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() + #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -797,6 +798,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD viewController: self) } } + #endif if isZoomable { // Add top and bottom gradients to ensure toolbar controls are legible diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index f99ccde46..cd7272096 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -273,7 +273,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return true + return _isDebugAssertConfiguration() } @objc From 2850266d0b0ba329d3ec0dfbdd1cc87a466c30ee Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 2 Mar 2019 15:49:12 -0700 Subject: [PATCH 222/493] Only show "missed call" notification for incoming calls Show outgoing missed and busy calls as "incomplete outgoing call - [call back]" --- Signal/src/call/CallService.swift | 59 ++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index 197561c7c..d2eead0ab 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -609,12 +609,7 @@ private class SignalCallData: NSObject { public func handleMissedCall(_ call: SignalCall) { AssertIsOnMainThread() - // Insert missed call record - if let callRecord = call.callRecord { - if callRecord.callType == RPRecentCallTypeIncoming { - callRecord.updateCallType(RPRecentCallTypeIncomingMissed) - } - } else { + if call.callRecord == nil { // MJK TODO remove this timestamp param call.callRecord = TSCall(timestamp: NSDate.ows_millisecondTimeStamp(), withCallNumber: call.thread.contactIdentifier(), @@ -622,10 +617,27 @@ private class SignalCallData: NSObject { in: call.thread) } - assert(call.callRecord != nil) - call.callRecord?.save() + guard let callRecord = call.callRecord else { + handleFailedCall(failedCall: call, error: .assertionError(description: "callRecord was unexpectedly nil")) + return + } - self.callUIAdapter.reportMissedCall(call) + switch callRecord.callType { + case RPRecentCallTypeIncomingMissed: + callRecord.save() + callUIAdapter.reportMissedCall(call) + case RPRecentCallTypeIncomingIncomplete, RPRecentCallTypeIncoming: + callRecord.updateCallType(RPRecentCallTypeIncomingMissed) + callUIAdapter.reportMissedCall(call) + case RPRecentCallTypeOutgoingIncomplete: + callRecord.updateCallType(RPRecentCallTypeOutgoingMissed) + case RPRecentCallTypeIncomingMissedBecauseOfChangedIdentity, RPRecentCallTypeIncomingDeclined, RPRecentCallTypeOutgoingMissed, RPRecentCallTypeOutgoing: + owsFailDebug("unexpected RPRecentCallType: \(callRecord.callType)") + callRecord.save() + default: + callRecord.save() + owsFailDebug("unknown RPRecentCallType: \(callRecord.callType)") + } } /** @@ -670,6 +682,9 @@ private class SignalCallData: NSObject { } call.state = .remoteBusy + assert(call.callRecord != nil) + call.callRecord?.updateCallType(RPRecentCallTypeOutgoingMissed) + callUIAdapter.remoteBusy(call) terminateCall() } @@ -1921,3 +1936,29 @@ private class SignalCallData: NSObject { handleFailedCall(failedCall: call, error: CallError.messageSendFailure(underlyingError: error)) } } + +extension RPRecentCallType: CustomStringConvertible { + public var description: String { + switch self { + case RPRecentCallTypeIncoming: + return "RPRecentCallTypeIncoming" + case RPRecentCallTypeOutgoing: + return "RPRecentCallTypeOutgoing" + case RPRecentCallTypeIncomingMissed: + return "RPRecentCallTypeIncomingMissed" + case RPRecentCallTypeOutgoingIncomplete: + return "RPRecentCallTypeOutgoingIncomplete" + case RPRecentCallTypeIncomingIncomplete: + return "RPRecentCallTypeIncomingIncomplete" + case RPRecentCallTypeIncomingMissedBecauseOfChangedIdentity: + return "RPRecentCallTypeIncomingMissedBecauseOfChangedIdentity" + case RPRecentCallTypeIncomingDeclined: + return "RPRecentCallTypeIncomingDeclined" + case RPRecentCallTypeOutgoingMissed: + return "RPRecentCallTypeOutgoingMissed" + default: + owsFailDebug("unexpected RPRecentCallType: \(self)") + return "RPRecentCallTypeUnknown" + } + } +} From 42e6b76a9ff6a670dc1f5c52d9ec69cb6ea7fcf7 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 2 Mar 2019 16:25:33 -0700 Subject: [PATCH 223/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 2 +- .../translations/az.lproj/Localizable.strings | 2 +- .../translations/bg.lproj/Localizable.strings | 2 +- .../translations/bs.lproj/Localizable.strings | 2 +- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 2 +- .../translations/de.lproj/Localizable.strings | 2 +- .../translations/el.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 2 +- .../translations/et.lproj/Localizable.strings | 2 +- .../translations/fa.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 54 +++---- .../fil.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 48 +++--- .../translations/gl.lproj/Localizable.strings | 2 +- .../translations/he.lproj/Localizable.strings | 54 +++---- .../translations/hr.lproj/Localizable.strings | 2 +- .../translations/hu.lproj/Localizable.strings | 6 +- .../translations/id.lproj/Localizable.strings | 2 +- .../translations/it.lproj/Localizable.strings | 2 +- .../translations/ja.lproj/Localizable.strings | 4 +- .../translations/km.lproj/Localizable.strings | 2 +- .../translations/ko.lproj/Localizable.strings | 2 +- .../translations/lt.lproj/Localizable.strings | 2 +- .../translations/lv.lproj/Localizable.strings | 2 +- .../translations/mk.lproj/Localizable.strings | 2 +- .../translations/my.lproj/Localizable.strings | 2 +- .../translations/nb.lproj/Localizable.strings | 2 +- .../nb_NO.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 16 +- .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 2 +- .../pt_PT.lproj/Localizable.strings | 8 +- .../translations/ro.lproj/Localizable.strings | 54 +++---- .../translations/ru.lproj/Localizable.strings | 2 +- .../translations/sl.lproj/Localizable.strings | 6 +- .../translations/sn.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 2 +- .../translations/sv.lproj/Localizable.strings | 142 +++++++++--------- .../translations/th.lproj/Localizable.strings | 2 +- .../translations/tr.lproj/Localizable.strings | 2 +- .../translations/uk.lproj/Localizable.strings | 2 +- .../zh_CN.lproj/Localizable.strings | 2 +- .../zh_TW.lproj/Localizable.strings | 8 +- 45 files changed, 234 insertions(+), 234 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index ae62338de..f6ca15563 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "الرقم خاطئ ؟"; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 99c320858..5a3bc0744 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index de06d681b..99ba76faa 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Грешен номер?"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 0d8794835..1e0f395a1 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 0beb5d313..a0460098a 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Condicions de servei i política de privadesa"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "El Signal és la missatgeria privada per a tothom."; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "El número no és correcte?"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index aec219b32..853224313 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Smluvní podmínky a zásady ochrany osobních údajů"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Špatné číslo?"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 1522bae53..6a7a17895 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår og privatlivspolitik"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Forkert nummer?"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 257f79dc8..29c2f6ddd 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Bedingungen & Datenschutzerklärung"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal ist ein vertraulicher Messenger für alle"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Falsche Rufnummer?"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index bf5326901..d399f9420 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Όροι & Πολιτική Απορρήτου"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Λάθος αριθμός;"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index a55f50b58..7b49b1c81 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Términos y política de privacidad"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal es la aplicación de mensajería para todo el mundo"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "¿Número correcto?"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index 96dbed7c4..013abca4a 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Tingimused ja privaatsuspoliitika"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Vale number?"; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index d5b7606ae..1df6ffe82 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "شرایط و سیاست های حفظ حریم خصوصی"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 08af5234d..eda52e1e6 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hae"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@ ja %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@, %@ ja %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Aloita ensimmäinen keskustelu."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ei hakutuloksia haulle \"%@\""; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Alusta"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Kierrä 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Kierrä 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Et voi jakaa useampaa kuin %@ kappaletta."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Tällä puhelinnumerolla on rekisteröinnin lukituksen PIN-koodi käytössä. Syötä rekisteröinnin lukituksen PIN."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Rekisteröinnin lukituksen PIN-koodi on eri kuin se automaattinen vahvistuskoodi, jonka sait tekstiviestinä puhelimeesi edellisessä vaiheessa."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Unohdin PIN-koodini"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Rekisteröinnin lukitus"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Lisää ripaus ihmisyyttä viesteihisi"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Myönnä käyttöoikeudet"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Yhteystietosi lähetetään aina turvallisesti."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ei nyt"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal voi ilmoittaa, kun saat viestin (ja keneltä se on peräisin)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Syötä puhelinnumerosi, jotta pääset alkuun"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Virheellinen numero"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal-profiilit ovat päästä päähän salattuja eikä Signal-palvelulla ole pääsyä näihin tietoihin."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Sinun nimi"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Aseta profiilisi"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Käyttöehdot ja tietosuoja"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Väärä numero?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "En saanut koodia (saatavilla ajassa %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Tämä koodi on virheellinen"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "En saanut koodia"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Varmista, että sinulla on yhteys matkapuhelinverkkoon ja voit vastaanottaa tekstiviestejä."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Ei koodia?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Lähetä koodi uudelleen"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Soita minulle"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Ei vieläkään koodia?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Syötä koodi, jonka lähetimme numeroon %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Lähetimme koodin uudelleen numeroon %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Asetukset"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Tuntematon yhteystieto"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Tuntematon maa"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Tuntematon"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 5edadc43b..58f321756 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 2aae5ff74..7357710ba 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Rechercher"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@ et %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@, %@ et %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Lancez votre première conversation ici."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Aucun résultat n’a été trouvé pour « %@ »."; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Réinitialiser"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Faire pivoter de 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Faire pivoter de 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Vous ne pouvez pas partager plus de %@ éléments."; @@ -1521,70 +1521,70 @@ "ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Accorder les autorisations"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Les informations de vos contacts sont toujours transmises de façon sécurisée."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Pas maintenant"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal peut vous prévenir de la réception d’un message (et vous indiquer son expéditeur)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Saisissez votre numéro de téléphone pour commencer"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Le numéro est invalide"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Les profils de Signal sont chiffrés de bout en bout et le service Signal n’a jamais accès à ces renseignements."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Votre nom"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Configurez votre profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Conditions générales d’utilisation et politique de confidentialité"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Mauvais numéro ?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Je n’ai pas reçu de code (disponible dans %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Ce code est erroné"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Je n’ai pas reçu de code"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Assurez-vous que le service de téléphonie mobile est actif et que vous pouvez recevoir des textos."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Aucun code reçu ?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Renvoyer le code"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Appelez-moi plutôt"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Toujours pas de code ?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Saisir le code envoyé au %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Nous venons de renvoyer un code au %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Paramètres"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contact inconnu"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Pays inconnu"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Inconnue"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index e6969dfa7..919fa5a0b 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número incorrecto?"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 0d9053c51..05be5ed3e 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "חיפוש"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@ ו%@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@, %@ ו%@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "התחל את השיחה הראשונה שלך כאן."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "לא נמצאו תוצאות עבור '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "אפס"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "סובב 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "סובב 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "אינך יכול לשתף יותר מן %@ פריטים."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "למספר טלפון זה יש נעילת הרשמה מאופשרת. אנא הכנס את PIN נעילת ההרשמה."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "PIN נעילת ההרשמה שלך מופרד מקוד הוידוא האוטומטי שנשלח לטלפון שלך במהלך הצעד האחרון."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "שכחתי את ה־PIN שלי"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "נעילת הרשמה"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "הוסף מגע של אנושיות אל ההודעות שלך"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "אפשר הרשאות"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "מידע הקשר שלך משודר תמיד באופן מאובטח."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "לא עכשיו"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal יכול ליידע אותך כאשר תקבל הודעה (וממי היא)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "הכנס את מספר הטלפון שלך כדי להתחיל"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "מספר בלתי תקף"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "פרופילי Signal מוצפנים מקצה לקצה ולשירות Signal אין אף פעם גישה אל מידע זה."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "שמך"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "הגדר את הפרופיל שלך"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "תנאים ומדיניות פרטיות"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "מספר שגוי?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "לא קיבלתי קוד (זמין עוד %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "קוד זה אינו נכון"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "לא קיבלתי קוד"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "אנא וודא שיש לך שירות סלולרי ושאתה יכול לקבל מסרונים."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "אין קוד?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "שלח מחדש קוד"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "חייג אליי במקום"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "עדין אין קוד?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "הכנס את הקוד ששלחנו אל %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "שלחנו מחדש קוד הרגע אל %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "הגדרות"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "איש קשר בלתי ידוע"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "מדינה לא ידועה"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "בלתי ידוע"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index f675292dd..278c311db 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Uvjeti i pravila o privatnosti"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 38c529454..18488bcf0 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Add meg a telefonszámodat a kezdéshez"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Érvénytelen telefonszám"; @@ -1545,13 +1545,13 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Profil beállítása"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Adatvédelmi és Általános Szerződési Feltételek"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Helytelen telefonszám?"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index dbb6ba4ac..74739a9ed 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Syarat & Kebijakan Privasi"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Salah nomor?"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index d9e4a6922..302d49210 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Politica e termini sulla privacy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal è il messenger privato per tutti"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numero errato?"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index b75d42b11..b4a6c59d5 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -1539,7 +1539,7 @@ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "不正な番号です"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signalのプロフィールは暗号化され、Signalのサービスさえアクセスできません。"; +"ONBOARDING_PROFILE_EXPLANATION" = "プロフィールは暗号化され、Signalのサービスさえアクセスできません。"; /* Placeholder text for the profile name in the 'onboarding profile' view. */ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "あなたの名前"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "利用規約と個人情報保護"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signalは誰でも使えるメッセンジャーアプリです。"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "番号違いですか？"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 61c62a9fe..db0bf5d50 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "លក្ខខណ្ឌនិងគោលការណ៍ឯកជន"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "ខុសលេខ?"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index dc6fdc51b..73c1d27b7 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index df587de5b..0b8dec29a 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Sąlygos ir Privatumo politika"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal yra privati pokalbių programa visiems"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Neteisingas numeris?"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 0f9fdb23a..b82ab07ac 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 39b938223..05919d228 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index a838882b1..2f946ab18 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "လိုက်နာဆောင်ရွက်ရမည့် အချက်များ"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "ဖုန်းနံပါတ်မှားနေပါသလား?"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index 0aa2ff4b9..b0200b43e 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Feil nummer?"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index cdbaf6602..37add6833 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 5d31651ac..d289181af 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -24,7 +24,7 @@ "ADD_GROUP_MEMBER_VIEW_BUTTON" = "Toevoegen"; /* Title for the 'add contact' section of the 'add group member' view. */ -"ADD_GROUP_MEMBER_VIEW_CONTACT_TITLE" = "Contact toevoegen"; +"ADD_GROUP_MEMBER_VIEW_CONTACT_TITLE" = "Contactpersoon toevoegen"; /* Title for the 'add by phone number' section of the 'add group member' view. */ "ADD_GROUP_MEMBER_VIEW_PHONE_NUMBER_TITLE" = "Telefoonnummer toevoegen"; @@ -339,7 +339,7 @@ "CALL_SCREEN_STATUS_NO_ANSWER" = "Niet beantwoord"; /* embeds {{Call Status}} in call screen label. For ongoing calls, {{Call Status}} is a seconds timer like 01:23, otherwise {{Call Status}} is a short text like 'Ringing', 'Busy', or 'Failed Call' */ -"CALL_STATUS_FORMAT" = "Signal %@"; +"CALL_STATUS_FORMAT" = "Signal-oproep %@"; /* Label for call button for alert offering to call a user. */ "CALL_USER_ALERT_CALL_BUTTON" = "Bellen"; @@ -1108,7 +1108,7 @@ "IN_CALL_RINGING" = "Bellen…"; /* Call setup status label */ -"IN_CALL_SECURING" = "Beantwoord. Beveiligen…"; +"IN_CALL_SECURING" = "Beantwoord. Aan het beveiligen…"; /* Call setup status label */ "IN_CALL_TERMINATED" = "Oproep beëindigd."; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Voorwaarden en privacybeleid"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is de privéberichtenapp voor iedereen"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Verkeerd nummer?"; @@ -1695,7 +1695,7 @@ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "De gescande code lijkt niet op een veiligheidsnummer. Gebruiken jullie allebei de laatste versie van Signal?"; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eindversleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contact.\n\nJe kan ook de code op hun telefoon scannen, of hen vragen jouw code te scannen."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eindversleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contactpersoon.\n\nJe kan ook de code op zijn/haar telefoon scannen, of hem/haar vragen jouw code te scannen."; /* Navbar title */ "PRIVACY_VERIFICATION_TITLE" = "Veiligheidsnummer verifiëren"; @@ -1935,7 +1935,7 @@ "SAFETY_NUMBER_SHARE_FORMAT" = "Ons Signal-veiligheidsnummer:\n%@"; /* Action sheet heading */ -"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Je veiligheidsnummer met %@ is veranderd. Het wordt aanbevolen het nieuwe nummer te verifiëren."; +"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Je veiligheidsnummer met %@ is veranderd. Het wordt aanbevolen het nieuwe veiligheidsnummer te verifiëren."; /* label presented once scanning (camera) view is visible. */ "SCAN_CODE_INSTRUCTIONS" = "Scan de QR-code op het apparaat van je contact."; @@ -2343,7 +2343,7 @@ "SOUNDS_NONE" = "Geen"; /* Alert body after verifying privacy with {{other user's name}} */ -"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Je veiligheidsnummer met %@ komt overeen. Je kan dit contact markeren als geverifieerd."; +"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Je veiligheidsnummer met %@ komt overeen. Je kan deze contactpersoon markeren als geverifieerd."; /* No comment provided by engineer. */ "SUCCESSFUL_VERIFICATION_TITLE" = "Veiligheidsnummer komt overeen!"; @@ -2358,7 +2358,7 @@ "TIME_AMOUNT_DAYS_SHORT_FORMAT" = "%@d"; /* {{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings */ -"TIME_AMOUNT_HOURS" = "%@ uur"; +"TIME_AMOUNT_HOURS" = "%@ uren"; /* Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 characters, The space is intentionally omitted between the text and the embedded duration so that we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings */ "TIME_AMOUNT_HOURS_SHORT_FORMAT" = "%@u"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 78337c285..f41b93ab2 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Regulamin i Polityka Prywatności"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal to prywatny komunikator dla każdego"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Błędny numer?"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 93d5e7a0f..58d1e5450 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos & Política de Privacidade"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index b3d40f118..05c9f60b4 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1066,7 +1066,7 @@ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Inicie a sua primeira conversa aqui."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Inicie aqui a sua primeira conversa."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Não se encontraram resultados para '%@'"; @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "O Signal pode informá-lo quando recebe uma mensagem (e quem a enviou)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Introduza o seu número de telefone para começar"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Para começar introduza o seu número de telefone"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número inválido"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos e política de privacidade"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "O SIgnal é o mensageiro privado para todos"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; @@ -1566,7 +1566,7 @@ "ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Não obtive um código"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Por favor certifique-se que tem o serviço celular disponível e que pode receber mensagens SMS."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Por favor certifique-se que tem o rede e o serviço celular disponível e que pode receber mensagens SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Sem código?"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 8f7b5031c..aec18ce47 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Caută"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, inclusiv %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, printre care %@ și %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, printre care %@, %@ și %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Începe prima ta conversație aici."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nu s-au găsit rezultate pentru '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Resetare"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotiți la 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotiți la 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nu puteți partaja mai mult de %@ elemente."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Acest număr de telefon are Blocarea Înregistrării activă. Vă rugăm să introduceți Codul PIN de Blocare a Înregistrării."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Codul dvs. PIN pentru înregistrare este separat de codul de verificare automat care a fost trimis telefonului în timpul ultimului pas."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Mi-am uitat PIN-ul"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Blocare înregistrare"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Adăugați o notă de umanitate mesajelor dvs."; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Activează permisiunile"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Informațiile dvs. de contact sunt transmise întotdeauna în siguranță."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Nu acum"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal vă poate anunța când primiți un mesaj (și de la cine este acesta)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Introduceși numărul dvs. de telefon pentru a putea începe"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Număr invalid"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Profilurile Signal sunt criptate integral, iar serviciul Signal nu are acces la aceste informații."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Numele dumneavoastră"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Configurează-ți profilul"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termeni și politica de confidențialitate"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Număr greșit?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Nu am primit codul (disponibil în %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Acest cod este incorect"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Nu am primit nici un cod"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Asigurați-vă că aveți servicii celulare și puteți primi mesaje SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Nici un cod?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Trimite din nou codul"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Sună-mă mai bine"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Încă nu ați primit codul?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Introduceți codul trimis la %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Tocmai am trimis din nou un cod la %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Setări"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contact necunoscut"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Țară necunoscută"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Necunoscut"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 5e21ad176..7eadd0076 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Условия и политика конфиденциальности"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal - это приватный мессенджер для всех"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Неправильный номер?"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 3845aefa4..e18b724a9 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Za začetek vpišite svojo telefonsko številko."; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neveljavna številka"; @@ -1545,13 +1545,13 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Nastavite svoj profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Pogoji uporabe in Pravilnik o zasebnosti"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Napačna številka?"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index db82fc561..8ef0e04d0 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Wrong number?"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 86f3569f8..9c9612cd4 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Kushte & Rregulla Privatësie"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal-i është i sjell mesazhet private për këdo"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numër i gabuar?"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index 4bffc38fe..704626eee 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -90,7 +90,7 @@ "ATTACHMENT" = "Bifogad fil"; /* One-line label indicating the user can add no more text to the attachment caption. */ -"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Bildtext gräns uppnådd."; +"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Gräns för bildtext nådd."; /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Lägg till en bildtext..."; @@ -114,7 +114,7 @@ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Nedladdning misslyckad. Tryck för att försöka igen."; /* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Hämtar hem..."; +"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Laddar ner …"; /* Status label when an attachment is enqueued, but hasn't yet started downloading */ "ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Köad"; @@ -150,7 +150,7 @@ "ATTACHMENT_ERROR_MISSING_DATA" = "Den bifogade filen är tom."; /* Accessibility hint describing what you can do with the attachment button */ -"ATTACHMENT_HINT" = "Välj eller ta ny bild och för att skicka"; +"ATTACHMENT_HINT" = "Välj en bild eller ta en ny och skicka sedan den"; /* Accessibility label for attaching photos */ "ATTACHMENT_LABEL" = "Bifogad fil"; @@ -240,7 +240,7 @@ "BLOCK_LIST_BLOCK_BUTTON" = "Blockera"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ -"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Blockera och lämna \"%@\" gruppen?"; +"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Blockera och lämna gruppen \"%@\"?"; /* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */ "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "Blockera %@?"; @@ -282,7 +282,7 @@ "BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_TITLE" = "Fel"; /* Alert title after unblocking a group or 1:1 chat. Embeds the {{conversation title}}. */ -"BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@har blivit avblockerad "; +"BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@har blivit avblockerad."; /* Alert body after unblocking a group. */ "BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Befintliga medlemmar kan nu lägga dig till gruppen igen."; @@ -294,7 +294,7 @@ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "Blockera %@?"; /* An explanation of the consequences of blocking another user. */ -"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Blockerade användare kommer inte kunna ringa eller skicka meddelanden till dig."; +"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Blockerade användare kommer inte att kunna ringa eller skicka meddelanden till dig."; /* Label for 'continue' button. */ "BUTTON_CONTINUE" = "Fortsätt"; @@ -318,7 +318,7 @@ "CALL_AGAIN_BUTTON_TITLE" = "Ring igen"; /* Alert message when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_MESSAGE" = "Du kan aktivera mikrofonåtkomst i appen Inställningar för att ringa och spela in röstmeddelanden i Signal."; +"CALL_AUDIO_PERMISSION_MESSAGE" = "Du kan aktivera mikrofonåtkomst i Inställningar för att ringa och spela in röstmeddelanden i Signal."; /* Alert title when calling and permissions for microphone are missing */ "CALL_AUDIO_PERMISSION_TITLE" = "Åtkomst till mikrofon krävs"; @@ -330,7 +330,7 @@ "CALL_LABEL" = "Ring"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missade samtalet, för den andra personens säkerhetsnummer har ändrats."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missade samtalet för att den andra personens säkerhetsnummer har ändrats."; /* notification body */ "CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missat samtal"; @@ -366,10 +366,10 @@ "CALL_VIEW_MUTE_LABEL" = "Mikrofon av"; /* Reminder to the user of the benefits of enabling CallKit and disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Du kan aktivera iOS Call Integration i dina Signal integritetsskydd inställningar för att svara inkommande samtal från din låsskärm."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Du kan aktivera iOS Call Integration i avsnittet Integritetsskydd under Inställningar för att svara på inkommande samtal från din låsskärm."; /* Reminder to the user of the benefits of disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Du kan aktivera iOS Call Integration i dina Signal integritetsskydd inställningar för att se namn och telefonnummer för inkommande samtal."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Du kan aktivera iOS Call Integration i avsnittet Integritetsskydd under Inställningar för att se namn och telefonnummer för inkommande samtal."; /* Label for button that dismiss the call view's settings nag. */ "CALL_VIEW_SETTINGS_NAG_NOT_NOW_BUTTON" = "Inte nu"; @@ -417,19 +417,19 @@ "CHECK_FOR_BACKUP_RESTORE" = "Återställ"; /* Error indicating that the app could not determine that user's iCloud account status */ -"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "Signal kunde inte bestämma statusen för ditt iCloud-konto. Logga in på ditt iCloud-konto i iOS-inställningsappen för att säkerhetskopiera din Signal-data."; +"CLOUDKIT_STATUS_COULD_NOT_DETERMINE" = "Signal kunde inte bestämma statusen för ditt iCloud-konto. Logga in på ditt iCloud-konto i appen Inställningar i iOS för att säkerhetskopiera dina Signal-data."; /* Error indicating that user does not have an iCloud account. */ -"CLOUDKIT_STATUS_NO_ACCOUNT" = "Inget iCloud-konto. Logga in på ditt iCloud-konto i iOS-inställningsappen för att säkerhetskopiera din Signal-data."; +"CLOUDKIT_STATUS_NO_ACCOUNT" = "Inget iCloud-konto. Logga in på ditt iCloud-konto i appen Inställningar i iOS för att säkerhetskopiera dina Signal-data."; /* Error indicating that the app was prevented from accessing the user's iCloud account. */ -"CLOUDKIT_STATUS_RESTRICTED" = "Signal nekades åtkomst till ditt iCloud-konto för säkerhetskopiering. Bevilja åtkomst till ditt iCloud-konto i iOS-inställningsappen för att säkerhetskopiera din Signal-data."; +"CLOUDKIT_STATUS_RESTRICTED" = "Signal nekades åtkomst till ditt iCloud-konto för säkerhetskopiering. Bevilja åtkomst till ditt iCloud-konto i appen Inställningar i iOS för att säkerhetskopiera dina Signal-data."; /* The first of two messages demonstrating the chosen conversation color, by rendering this message in an outgoing message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_1" = "Välj färgen för utgående meddelanden för denna konversation."; +"COLOR_PICKER_DEMO_MESSAGE_1" = "Välj färg för utgående meddelanden för denna konversation."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_2" = "Bara du kommer se färgen du väljer."; +"COLOR_PICKER_DEMO_MESSAGE_2" = "Bara du kommer att kunna se färgen du väljer."; /* Modal Sheet title when picking a conversation color. */ "COLOR_PICKER_SHEET_TITLE" = "Konversationsfärg"; @@ -450,7 +450,7 @@ "COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Du kan aktivera kontaktåtkomst i appen Inställningar för att se vilka av dina kontakter som är Signalanvändare."; /* No comment provided by engineer. */ -"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Det här kommer återställa appen, radera dina meddelanden och avregistrera dig från servern. Appen kommer stängas när allt är klart."; +"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Det här kommer att återställa appen, radera dina meddelanden och avregistrera dig från servern. Appen kommer att stängas när allt är klart."; /* No comment provided by engineer. */ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Är du säker på att du vill radera ditt konto?"; @@ -552,7 +552,7 @@ "CONTACT_SHARE_INVALID_CONTACT" = "Ogiltig kontakt."; /* Error indicating that at least one contact field must be selected before sharing a contact. */ -"CONTACT_SHARE_NO_FIELDS_SELECTED" = "Inga kontaktfält valda"; +"CONTACT_SHARE_NO_FIELDS_SELECTED" = "Inga kontaktfält valda."; /* Label for 'open address in maps app' button in contact view. */ "CONTACT_VIEW_OPEN_ADDRESS_IN_MAPS_APP" = "Öppna i Kartor"; @@ -564,7 +564,7 @@ "CONTACT_WITHOUT_NAME" = "Okänd kontakt"; /* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Detta kan inte göras ogjort."; +"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Denna åtgärd kan inte ångras."; /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Radera konversation?"; @@ -651,7 +651,7 @@ "CONVERSATION_VIEW_CONTACTS_OFFER_TITLE" = "Användaren finns inte bland dina kontakter."; /* Indicates that the app is loading more messages in this conversation. */ -"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Hämtar fler meddelanden..."; +"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Hämtar fler meddelanden …"; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ "CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Tryck för mer"; @@ -678,10 +678,10 @@ "DATABASE_VIEW_OVERLAY_TITLE" = "Optimerar databas"; /* Format string for a relative time, expressed as a certain number of hours in the past. Embeds {{The number of hours}}. */ -"DATE_HOURS_AGO_FORMAT" = "%@ Timmar sen"; +"DATE_HOURS_AGO_FORMAT" = "%@ timmar sen"; /* Format string for a relative time, expressed as a certain number of minutes in the past. Embeds {{The number of minutes}}. */ -"DATE_MINUTES_AGO_FORMAT" = "%@ Minuter sen"; +"DATE_MINUTES_AGO_FORMAT" = "%@ minuter sen"; /* The present; the current time. */ "DATE_NOW" = "Nu"; @@ -730,10 +730,10 @@ "DEBUG_LOG_ALERT_TITLE" = "Ett steg till"; /* Error indicating that the app could not launch the Email app. */ -"DEBUG_LOG_COULD_NOT_EMAIL" = "Kunde inte öppna Mail appen."; +"DEBUG_LOG_COULD_NOT_EMAIL" = "Kunde inte öppna appen Mail."; /* Message of the alert before redirecting to GitHub Issues. */ -"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "Gist-länken kopierades till urklipp. Du kommer bli skickad vidare till listan över problem på GitHub."; +"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "Gist-länken kopierades till urklipp. Du kommer att bli skickad vidare till listan på problem på GitHub."; /* Title of the alert before redirecting to GitHub Issues. */ "DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "Går vidare till GitHub"; @@ -742,7 +742,7 @@ "DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Registrera det här telefonnumret igen"; /* Label warning the user that they have been de-registered. */ -"DEREGISTRATION_WARNING" = "Enheten inte registrerad längre. Ditt telefonnummer kan vara registrerat med Signal på en annan enhet. Tryck för att registrera igen."; +"DEREGISTRATION_WARNING" = "Enheten är inte längre inte registrerad. Ditt telefonnummer kan vara registrerat med Signal på en annan enhet. Tryck för att registrera igen."; /* {{Short Date}} when device last communicated with Signal Server. */ "DEVICE_LAST_ACTIVE_AT_LABEL" = "Senast aktiv: %@"; @@ -751,16 +751,16 @@ "DEVICE_LINKED_AT_LABEL" = "Länkad: %@"; /* Alert title that can occur when viewing device manager. */ -"DEVICE_LIST_UPDATE_FAILED_TITLE" = "Misslyckades uppdatera enhetslistan."; +"DEVICE_LIST_UPDATE_FAILED_TITLE" = "Misslyckades med uppdatera enhetslistan."; /* table cell label in conversation settings */ "DISAPPEARING_MESSAGES" = "Meddelanden som försvinner"; /* Info Message when added to a group which has enabled disappearing messages. Embeds {{time amount}} before messages disappear, see the *_TIME_AMOUNT strings for context. */ -"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Meddelanden i denna konversation kommer försvinna efter %@."; +"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Meddelanden i denna konversation kommer att försvinna efter %@."; /* subheading in conversation settings */ -"DISAPPEARING_MESSAGES_DESCRIPTION" = "Gör att meddelanden som skickats och tagits emot i denna konversation kommer försvinna efter att de setts."; +"DISAPPEARING_MESSAGES_DESCRIPTION" = "Gör att meddelanden som skickats och tagits emot i denna konversation kommer att försvinna efter att de setts."; /* Accessibility hint that contains current timeout information */ "DISAPPEARING_MESSAGES_HINT" = "Just nu försvinner meddelanden efter %@"; @@ -775,7 +775,7 @@ "DOMAIN_FRONTING_COUNTRY_VIEW_SECTION_HEADER" = "Kringgå censur för platsen"; /* Alert body for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Du kan ge åtkomst i appen för iOS-inställningar."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Du kan ge åtkomst i appen Inställningar i iOS."; /* Alert title for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ "EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Signal behöver åtkomst för att ändra kontaktinformation"; @@ -790,7 +790,7 @@ "EDIT_GROUP_DEFAULT_TITLE" = "Ändra grupp"; /* Label for the cell that lets you add a new member to a group. */ -"EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Lägg till..."; +"EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Lägg till …"; /* a title for the members section of the 'new/update group' view. */ "EDIT_GROUP_MEMBERS_SECTION_TITLE" = "Medlemmar"; @@ -802,10 +802,10 @@ "EDIT_GROUP_UPDATE_BUTTON" = "Uppdatera"; /* The alert message if user tries to exit update group view without saving changes. */ -"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Vill du spara ändringarna som du gjort för denna grupp?"; +"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Vill du spara ändringarna som du har gjort för denna grupp?"; /* The alert title if user tries to exit update group view without saving changes. */ -"EDIT_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "Osparade förändringar"; +"EDIT_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "Osparade ändringar"; /* Short name for edit menu item to copy contents of media message. */ "EDIT_ITEM_COPY_ACTION" = "Kopiera"; @@ -814,7 +814,7 @@ "EDIT_TXT" = "Ändra"; /* body of email sent to contacts when inviting to install Signal. Embeds {{link to install Signal}} and {{link to the Signal home page}} */ -"EMAIL_INVITE_BODY" = "Hej,\n\nDen senaste tiden har jag använt Signal för att hålla mina konversationer på min iPhone privata. Jag vill att du installerar det också, så att vi kan vara säkra på att endast du och jag kan läsa våra meddelanden eller höra våra samtal.\n\nSignal finns tillgänglig för iPhone och för Android. Hämta den här: %@\n\nSignal fungerar som din redan befintliga meddelandeapp. Vi kan skicka bilder och video, ringa samtal, och starta gruppkonversationer. Den bästa delen med det är att ingen annan kan se något av det, inte ens de som gör Signal!\n\nDu kan läsa mer om Open Whisper Systems, och de som ligger bakom här: %@"; +"EMAIL_INVITE_BODY" = "Hej,\n\nDen senaste tiden har jag använt Signal för att hålla mina konversationer på min iPhone privata. Jag vill att du installerar det också, så att vi kan vara säkra på att endast du och jag kan läsa våra meddelanden eller höra våra samtal.\n\nSignal finns tillgänglig för iPhone och för Android. Hämta den här: %@\n\nSignal fungerar som din befintliga meddelandeapp. Vi kan skicka bilder och videor, ringa samtal och starta gruppkonversationer. Det bästa är att ingen annan kan se något av det, inte ens de som gör Signal!\n\nDu kan läsa mer om Open Whisper Systems, de som ligger bakom Signal, här: %@"; /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Låt oss byta till Signal"; @@ -844,7 +844,7 @@ "ENABLE_2FA_VIEW_NEXT_BUTTON" = "Nästa"; /* Error indicating that the entered 'two-factor auth PINs' do not match. */ -"ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "PIN-koderna är inte samma."; +"ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "PIN-koderna matchar inte."; /* Indicates that user should select a 'two factor auth pin'. */ "ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Ange en registreringslås-PIN. Du kommer att behöva ange denna PIN nästa gång du registrerar detta telefonnummer med Signal."; @@ -865,16 +865,16 @@ "END_CALL_UNCATEGORIZED_FAILURE" = "Samtalsfel."; /* Error indicating that the phone's contacts could not be retrieved. */ -"ERROR_COULD_NOT_FETCH_CONTACTS" = "Kom inte åt kontakter."; +"ERROR_COULD_NOT_FETCH_CONTACTS" = "Kunde inte komma åt kontakter."; /* Generic notice when message failed to send. */ "ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "Kunde inte skicka meddelande."; /* Error message indicating that message send is disabled due to prekey update failures */ -"ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunde inte skicka på grund av unken prekey-data."; +"ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunde inte skicka på grund av gamla prekey-data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du blockerat användaren"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du har blockerat användaren."; /* Error message indicating that message send failed due to failed attachment write */ "ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Kunde inte skriva och skicka bifogad fil."; @@ -883,7 +883,7 @@ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kunde inte ansluta till internet. Var god försök igen."; /* Error indicating that an outgoing message had no valid recipients. */ -"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Kunde inte skicka meddelandet, det saknas giltig mottagare."; +"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Kunde inte skicka meddelandet då det saknas giltiga mottagare."; /* Error indicating that a socket request failed. */ "ERROR_DESCRIPTION_REQUEST_FAILED" = "Nätverksförfrågan misslyckades."; @@ -907,16 +907,16 @@ "ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Kontakten är inte en Signal-användare."; /* Error message when unable to receive an attachment because the sending client is too old. */ -"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Bilag misslyckades: Be den här kontakten om att skicka sitt meddelande igen efter uppdatering till den senaste versionen av Signal."; +"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Misslyckades att ta emot bilaga: Be den här kontakten att skicka sitt meddelande igen efter att ha uppdaterat till den senaste versionen av Signal."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Fick ett duplicerat meddelande."; +"ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Mottog ett duplicerat meddelande."; /* No comment provided by engineer. */ "ERROR_MESSAGE_INVALID_KEY_EXCEPTION" = "Mottagarens nyckel är ogiltig."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_INVALID_MESSAGE" = "Mottaget meddelande var ur sync."; +"ERROR_MESSAGE_INVALID_MESSAGE" = "Mottaget meddelande var inte i synk."; /* No comment provided by engineer. */ "ERROR_MESSAGE_INVALID_VERSION" = "Fick ett meddelande som inte är kompatibelt med den här versionen."; @@ -934,7 +934,7 @@ "ERROR_MESSAGE_UNKNOWN_ERROR" = "Ett okänt fel inträffade."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Säkerhetsnumret har ändrats"; +"ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Säkerhetsnumret har ändrats."; /* Format string for 'unregistered user' error. Embeds {{the unregistered user's name or signal id}}. */ "ERROR_UNREGISTERED_USER_FORMAT" = "Oregistrerad kontakt: %@"; @@ -958,16 +958,16 @@ "FINGERPRINT_SHRED_KEYMATERIAL_BUTTON" = "Återställ session"; /* Accessibility label for finishing new group */ -"FINISH_GROUP_CREATION_LABEL" = "Slutför skapa grupp"; +"FINISH_GROUP_CREATION_LABEL" = "Slutför skapandet av grupp"; /* Label indicating media gallery is empty */ "GALLERY_TILES_EMPTY_GALLERY" = "Du har inga medier i denna konversation."; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "Hämtar nyare media..."; +"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "Hämtar nyare medier …"; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_OLDER_LABEL" = "Hämtar äldre media..."; +"GALLERY_TILES_LOADING_OLDER_LABEL" = "Hämtar äldre medier …"; /* A label for generic attachments. */ "GENERIC_ATTACHMENT_LABEL" = "Bilaga"; @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Sök"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@ och %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@, %@ och %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Starta ditt första samtal här."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Inga träffar för '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Starta om"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotera 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotera 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan inte dela mer än %@ objekt."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Detta mobilnummer har registreringslåset påslaget. Ange PIN-koden för registreringslåset."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Din registrerings lås-PIN-kod skiljer sig från den automatiserade verifieringskoden som skickades till telefonen under det sista steget."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Jag glömde min PIN-kod"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registreringslås"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Lägg till en känsla av mänsklighet till dina meddelanden"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Aktivera behörigheter"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Dina kontaktuppgifter överförs alltid säkert."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Inte nu"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal kan låta dig veta när du får ett meddelande (och vem det är från)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Ange ditt telefonnummer för att komma igång"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Felaktigt nummer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal-profiler är end-to-end krypterade och Signal-tjänsten har aldrig tillgång till denna information."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Ditt namn"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Ställ in din profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Villkor & Dataskyddspolicy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Fel nummer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Jag fick inte en kod (tillgänglig om %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Denna kod är felaktig"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Jag fick ingen kod."; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Se till att du har mobiltjänst och kan ta emot SMS-meddelanden."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Ingen kod?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = " Skicka koden pånytt"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring mig istället"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Fortfarande ingen kod?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Ange koden vi skickade till %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Vi skickade just koden till %@ pånytt"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Inställningar"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Okänd kontakt"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Okänt land"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Okänt"; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index 2fa28b553..97585489f 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "เงื่อนไขและนโยบายความเป็นส่วนตัว"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "หมายเลขไม่ถูกต้องหรือ"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index ed0b4570f..2c02633bf 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Şartlar ve Gizlilik İlkesi"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal herkesin kullanabileceği gizli mesajlaşma uygulamasıdır"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Yanlış numara?"; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index d76580168..46ff90964 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Умови використання та політика конфіденційності"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal is the private messenger for everybody"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Невірний номер?"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index eafe9155a..c9df27a76 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "协议与隐私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal是适合所有人的私密即时通讯工具"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "错误的号码？"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index ad4ea0e70..0081b220d 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -330,7 +330,7 @@ "CALL_LABEL" = "撥出"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "未接來電因為來電者的安全碼改變。"; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "未接來電，因為來電者的安全碼改變。"; /* notification body */ "CALL_MISSED_NOTIFICATION_BODY" = "未接來電"; @@ -1132,7 +1132,7 @@ "INCOMING_INCOMPLETE_CALL" = "來電"; /* info message text shown in conversation view */ -"INFO_MESSAGE_MISSED_CALL_DUE_TO_CHANGED_IDENITY" = "未接來電，因他們的安全碼已改變。"; +"INFO_MESSAGE_MISSED_CALL_DUE_TO_CHANGED_IDENITY" = "未接來電，因聯絡人的安全碼改變。"; /* Message for the alert indicating that an audio file is invalid. */ "INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE" = "無效的音訊檔。"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "服務條款與隱私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Signal 是給所有人私密的訊息傳輸服務。"; +"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "錯誤的號碼？"; @@ -1689,7 +1689,7 @@ "PRIVACY_VERIFICATION_FAILED_WITH_OLD_LOCAL_VERSION" = "你使用的 Signal 版本太舊。你必須更新後再驗證。"; /* alert body */ -"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "你朋友使用的 Signal版本太舊。他們必須升級後才能驗證。"; +"PRIVACY_VERIFICATION_FAILED_WITH_OLD_REMOTE_VERSION" = "你朋友使用的Signal版本太舊，必須升級後才能驗證。"; /* alert body */ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "你所掃描的碼似乎不是安全碼。請確認雙方都使用最新的版本。"; From 8527283d646723e971fac315363b46b40257edaa Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 2 Mar 2019 16:25:53 -0700 Subject: [PATCH 224/493] "Bump build to 2.37.0.7." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index deb40db6a..c773fbaf6 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.6 + 2.37.0.7 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 4b319dcf4..be295370f 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.6 + 2.37.0.7 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 22c78f9177720fbcfe20af1976e756a89a313556 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 2 Mar 2019 16:48:06 -0700 Subject: [PATCH 225/493] Bump build to 2.37.0.8. Thanks to teor at The Tor Project for suggesting the improvements reflected in these commits: daa58c2ac862c37ee1c7cb67fc95116bdeae6851 63235ec1f18461a271f0e5b5dec8de13ded0dc00 aaac445c51ec4e388555057f276f03ac251f8d02 --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index c773fbaf6..dd6e113e4 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.7 + 2.37.0.8 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index be295370f..1b672ed3a 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.7 + 2.37.0.8 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From e8dffb4a083a9cae2b849427b6d9e980d878cd3b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 11:37:24 -0800 Subject: [PATCH 226/493] update translations --- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 4 +- .../translations/de.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 4 +- .../translations/fi.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 8 +-- .../translations/he.lproj/Localizable.strings | 2 +- .../translations/km.lproj/Localizable.strings | 70 +++++++++---------- .../translations/lt.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 46 ++++++------ .../pt_PT.lproj/Localizable.strings | 2 +- .../translations/ru.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 2 +- .../translations/sv.lproj/Localizable.strings | 6 +- .../translations/tr.lproj/Localizable.strings | 4 +- .../zh_CN.lproj/Localizable.strings | 2 +- .../zh_TW.lproj/Localizable.strings | 2 +- 17 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index a0460098a..26c44a305 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Condicions de servei i política de privadesa"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Porteu a sobre la privadesa.\n\nSigueu vosaltres mateixos a cada missatge."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "El número no és correcte?"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 6a7a17895..03649f8cd 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Indtast dit telefonnummer for at komme i gang"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldigt nummer"; @@ -1545,7 +1545,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Konfigurer din profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår og privatlivspolitik"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 29c2f6ddd..98366cabc 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Bedingungen & Datenschutzerklärung"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Nimm Privatsphäre mit dir.\nSei du selbst in jeder Nachricht."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Falsche Rufnummer?"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 7b49b1c81..6516ddfcf 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1476,7 +1476,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Encontrar por núm. de teléfono"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Mensajes a ti mism@"; +"NOTE_TO_SELF" = "Notas personales"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Has recibido mensajes mientras tu %@ estaba reiniciándose."; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Términos y política de privacidad"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Lleva la privacidad contigo.\nAñade tu personalidad en todos tus mensajes."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "¿Número correcto?"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index eda52e1e6..cbee05a87 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Käyttöehdot ja tietosuoja"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Ota yksityisyys mukaasi.\nOle itsesi jokaisessa viestissä."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Väärä numero?"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 7357710ba..8a668bdd3 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -1509,16 +1509,16 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Un NIP de blocage de l’inscription est activé pour ce numéro de téléphone. Veuillez saisir le NIP de blocage de l’inscription."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Votre NIP de blocage de l’inscription est différent du code automatisé de vérification qui a été envoyé à votre téléphone dans la dernière étape."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "J’ai oubli mon NIP"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Blocage de l’inscription"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Ajoutez une touche d’humanité à vos messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Accorder les autorisations"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Conditions générales d’utilisation et politique de confidentialité"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "La confidentialité dans votre poche.\nPour que chaque message reflète qui vous êtes."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Mauvais numéro ?"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 05be5ed3e..c6ff99b2d 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "תנאים ומדיניות פרטיות"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "קח פרטיות איתך.\nהייה עצמך בכל הודעה."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "מספר שגוי?"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index db0bf5d50..0a0e925d9 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -60,7 +60,7 @@ "APN_Message" = "សារថ្មី!"; /* Message for the 'app launch failed' alert. */ -"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal can't launch. Please send a debug log to support@signal.org so that we can troubleshoot this issue."; +"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal មិនអាចដំណើរការ។ សូមបញ្ជូនកំណត់ត្រាបញ្ហា ទៅកាន់ support@signal.org ដូចនេះ យើងអាចដោះស្រាយបញ្ហានេះ។"; /* Title for the 'app launch failed' alert. */ "APP_LAUNCH_FAILURE_ALERT_TITLE" = "បញ្ហា"; @@ -75,7 +75,7 @@ "APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "ជំនាន់ %@ ឥឡូវមាននៅលើ App Store។"; /* Title for the 'new app version available' alert. */ -"APP_UPDATE_NAG_ALERT_TITLE" = "A New Version of Signal Is Available"; +"APP_UPDATE_NAG_ALERT_TITLE" = "មាន Signal ជំនាន់ថ្មី"; /* Label for the 'update' button in the 'new app version available' alert. */ "APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "បច្ចុប្បន្នភាព"; @@ -90,10 +90,10 @@ "ATTACHMENT" = "ឯកសារភ្ជាប់"; /* One-line label indicating the user can add no more text to the attachment caption. */ -"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Caption limit reached."; +"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "ចំណងជើងបានឈានដល់ការកំណត់។"; /* placeholder text for an empty captioning field */ -"ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +"ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "ដាក់ចំណងជើងមួយ..."; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ប្រភេទឯកសារ៖ %@"; @@ -111,7 +111,7 @@ "ATTACHMENT_DEFAULT_FILENAME" = "ឯកសារភ្ជាប់"; /* Status label when an attachment download has failed. */ -"ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; +"ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "ទាញយកបរាជ័យ។ ចុច ដើម្បីព្យាយាមម្តងទៀត។"; /* Status label when an attachment is currently downloading */ "ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "កំពុងទាញយក..."; @@ -123,28 +123,28 @@ "ATTACHMENT_ERROR_ALERT_TITLE" = "បញ្ហាការផ្ញើឯកសារភ្ជាប់"; /* Attachment error message for image attachments which could not be converted to JPEG */ -"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Unable to convert image."; +"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "មិនអាចបម្លែងរូបភាព។"; /* Attachment error message for video attachments which could not be converted to MP4 */ "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "មិនអាចដំណើការវីដេអូ។"; /* Attachment error message for image attachments which cannot be parsed */ -"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "Unable to parse image."; +"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "មិនអាចញែករូបភាព។"; /* Attachment error message for image attachments in which metadata could not be removed */ "ATTACHMENT_ERROR_COULD_NOT_REMOVE_METADATA" = "មិនអាចលុបឯកសារបន្ថែមចេញពីរូបភាព។"; /* Attachment error message for image attachments which could not be resized */ -"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Unable to resize image."; +"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "មិនអាចប្ដូរទំហំរូបភាព។"; /* Attachment error message for attachments whose data exceed file size limits */ "ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE" = "ឯកសារភ្ជាប់មានទំហំធំពេក។"; /* Attachment error message for attachments with invalid data */ -"ATTACHMENT_ERROR_INVALID_DATA" = "Attachment includes invalid content."; +"ATTACHMENT_ERROR_INVALID_DATA" = "ឯកសារភ្ជាប់មានមាតិកាមិនត្រឹមត្រូវ។"; /* Attachment error message for attachments with an invalid file format */ -"ATTACHMENT_ERROR_INVALID_FILE_FORMAT" = "Attachment has an invalid file format."; +"ATTACHMENT_ERROR_INVALID_FILE_FORMAT" = "ឯកសារភ្ជាប់មានទ្រង់ទ្រាយឯកសារមិនត្រឹមត្រូវ។"; /* Attachment error message for attachments without any data */ "ATTACHMENT_ERROR_MISSING_DATA" = "ឯកសារភ្ជាប់គឺទទេរ។"; @@ -162,7 +162,7 @@ "ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE" = "បរាជ័យក្នុងការជ្រើសរើសឯកសារ។"; /* Alert body when picking a document fails because user picked a directory/bundle */ -"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY" = "Please create a compressed archive of this file or directory and try sending that instead."; +"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY" = "សូមបង្កើតបណ្ណសារដែលបានពង្រួមនៃឯកសារឬថតនេះ ហើយព្យាយាមផ្ញើរជំនួសវិញ។"; /* Alert title when picking a document fails because user picked a directory/bundle */ "ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE" = "មិនស្គាល់ឯកសារ"; @@ -219,10 +219,10 @@ "BACKUP_IMPORT_PHASE_RESTORING_FILES" = "កំពុងស្តារឯកសារ"; /* Label for the backup restore decision section. */ -"BACKUP_RESTORE_DECISION_TITLE" = "Backup Available"; +"BACKUP_RESTORE_DECISION_TITLE" = "មានឯកសារបម្រុងទុក"; /* Label for the backup restore description. */ -"BACKUP_RESTORE_DESCRIPTION" = "Restoring Backup"; +"BACKUP_RESTORE_DESCRIPTION" = "កំពុងស្តារឡើងវិញការបម្រុងទុក"; /* Label for the backup restore progress. */ "BACKUP_RESTORE_PROGRESS" = "ដំណើរការ"; @@ -231,7 +231,7 @@ "BACKUP_RESTORE_STATUS" = "ស្ថានភាព"; /* Error shown when backup fails due to an unexpected error. */ -"BACKUP_UNEXPECTED_ERROR" = "Unexpected Backup Error"; +"BACKUP_UNEXPECTED_ERROR" = "បញ្ហាបម្រុងទុកមិនរំពឹងទុក"; /* An explanation of the consequences of blocking a group. */ "BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "អ្នកនឹងលែងទទួលសារឬការព័ត៌មានពីក្រុមនេះ"; @@ -240,16 +240,16 @@ "BLOCK_LIST_BLOCK_BUTTON" = "ហាមឃាត់"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ -"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Block and Leave the \"%@\" Group?"; +"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "ហាមឃាត់ និងចាកចេញពីក្រុម \"%@\" ?"; /* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */ "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "ហាមឃាត់ %@?"; /* Section header for groups that have been blocked */ -"BLOCK_LIST_BLOCKED_GROUPS_SECTION" = "Blocked Groups"; +"BLOCK_LIST_BLOCKED_GROUPS_SECTION" = "ក្រុមបានហាមឃាត់"; /* Section header for users that have been blocked */ -"BLOCK_LIST_BLOCKED_USERS_SECTION" = "Blocked Users"; +"BLOCK_LIST_BLOCKED_USERS_SECTION" = "អ្នកប្រើប្រាស់បានហាមឃាត់"; /* Button label for the 'unblock' button */ "BLOCK_LIST_UNBLOCK_BUTTON" = "លែងហាមឃាត់"; @@ -258,7 +258,7 @@ "BLOCK_LIST_UNBLOCK_GROUP_BODY" = "សមាជិកដែលមានស្រាប់នឹងអាចបន្ថែមអ្នកទៅក្រុមម្តងទៀត។"; /* Action sheet title when confirming you want to unblock a group. */ -"BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "Unblock This Group?"; +"BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "លែងហាមឃាត់ក្រុមនេះ?"; /* A format for the 'unblock conversation' action sheet title. Embeds the {{conversation title}}. */ "BLOCK_LIST_UNBLOCK_TITLE_FORMAT" = "លែងហាមឃាត់ %@?"; @@ -267,13 +267,13 @@ "BLOCK_LIST_VIEW_BLOCK_BUTTON" = "ហាមឃាត់"; /* The message format of the 'conversation blocked' alert. Embeds the {{conversation title}}. */ -"BLOCK_LIST_VIEW_BLOCKED_ALERT_MESSAGE_FORMAT" = "%@ has been blocked."; +"BLOCK_LIST_VIEW_BLOCKED_ALERT_MESSAGE_FORMAT" = "%@ ត្រូវបានហាមឃាត់។"; /* The title of the 'user blocked' alert. */ "BLOCK_LIST_VIEW_BLOCKED_ALERT_TITLE" = "អ្នកប្រើប្រាស់បានហាមឃាត់"; /* The title of the 'group blocked' alert. */ -"BLOCK_LIST_VIEW_BLOCKED_GROUP_ALERT_TITLE" = "Group Blocked"; +"BLOCK_LIST_VIEW_BLOCKED_GROUP_ALERT_TITLE" = "ក្រុមបានហាមឃាត់"; /* The message of the 'You can't block yourself' alert. */ "BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE" = "អ្នកមិនអាចហាមឃាត់ខ្លួនអ្នកទេ។"; @@ -324,19 +324,19 @@ "CALL_AUDIO_PERMISSION_TITLE" = "ទាមទារចូលប្រើប្រាស់ម៉ៃក្រូហ្វូន"; /* notification body */ -"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Incoming Call"; +"CALL_INCOMING_NOTIFICATION_BODY" = "☎️ កំពុងហៅចូល"; /* Accessibility label for placing call button */ "CALL_LABEL" = "ហៅ"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Missed call because the caller's safety number changed."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ ខកការហៅ ព្រោះលេខសុវត្ថិភាពរបស់អ្នកហៅបានផ្លាស់ប្តូរ។"; /* notification body */ -"CALL_MISSED_NOTIFICATION_BODY" = "☎️ Missed Call"; +"CALL_MISSED_NOTIFICATION_BODY" = "☎️ ខកការហៅ"; /* Call setup status label after outgoing call times out */ -"CALL_SCREEN_STATUS_NO_ANSWER" = "No Answer"; +"CALL_SCREEN_STATUS_NO_ANSWER" = "មិនលើក"; /* embeds {{Call Status}} in call screen label. For ongoing calls, {{Call Status}} is a seconds timer like 01:23, otherwise {{Call Status}} is a short text like 'Ringing', 'Busy', or 'Failed Call' */ "CALL_STATUS_FORMAT" = "Signal %@"; @@ -405,7 +405,7 @@ "CENSORSHIP_CIRCUMVENTION_COUNTRY_VIEW_TITLE" = "ជ្រើសរើសប្រទេស"; /* The label for the 'do not restore backup' button. */ -"CHECK_FOR_BACKUP_DO_NOT_RESTORE" = "Do Not Restore"; +"CHECK_FOR_BACKUP_DO_NOT_RESTORE" = "មិនស្តារឡើងវិញទេ"; /* Message for alert shown when the app failed to check for an existing backup. */ "CHECK_FOR_BACKUP_FAILED_MESSAGE" = "Could not determine whether there is a backup that can be restored."; @@ -432,7 +432,7 @@ "COLOR_PICKER_DEMO_MESSAGE_2" = "Only you will see the color you choose."; /* Modal Sheet title when picking a conversation color. */ -"COLOR_PICKER_SHEET_TITLE" = "Conversation Color"; +"COLOR_PICKER_SHEET_TITLE" = "ពណ៌ការសន្ទនា"; /* Activity Sheet label */ "COMPARE_SAFETY_NUMBER_ACTION" = "ប្រៀបធៀបជាមួយ ក្តាចុច"; @@ -567,7 +567,7 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "This cannot be undone."; /* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "លុបការសន្ទនា?"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "ការកំណត់ការសន្ទនា"; @@ -576,7 +576,7 @@ "CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "បន្ថែមទៅបញ្ជីទំនាក់ទំនងដែលមានស្រាប់"; /* table cell label in conversation settings */ -"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Block This Group"; +"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "ហាមឃាត់ក្រុមនេះ"; /* table cell label in conversation settings */ "CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "ហាមឃាត់អ្នកប្រើនេះ"; @@ -585,7 +585,7 @@ "CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "ព័ត៌មានលេខទំនាក់ទំនង"; /* Label for table cell which leads to picking a new conversation color */ -"CONVERSATION_SETTINGS_CONVERSATION_COLOR" = "Conversation Color"; +"CONVERSATION_SETTINGS_CONVERSATION_COLOR" = "ពណ៌ការសន្ទនា"; /* Navbar title when viewing settings for a group thread */ "CONVERSATION_SETTINGS_GROUP_INFO_TITLE" = "ព័ត៌មានក្រុម"; @@ -654,7 +654,7 @@ "CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Loading More Messages…"; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ -"CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Tap for More"; +"CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "ចុច សម្រាប់បន្ថែម"; /* Message shown in conversation view that offers to block an unknown user. */ "CONVERSATION_VIEW_UNKNOWN_CONTACT_BLOCK_OFFER" = "ហាមឃាត់អ្នកប្រើនេះ"; @@ -730,7 +730,7 @@ "DEBUG_LOG_ALERT_TITLE" = "មួយជំហានទៀត"; /* Error indicating that the app could not launch the Email app. */ -"DEBUG_LOG_COULD_NOT_EMAIL" = "Could not open Email app."; +"DEBUG_LOG_COULD_NOT_EMAIL" = "មិនអាចបើកកម្មវិធី អ៊ីម៉ែល។"; /* Message of the alert before redirecting to GitHub Issues. */ "DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "តំណភ្ជាប់សំខាន់ត្រូវបានថតចម្លងនៅក្នុងក្តាចុចរបស់អ្នក។ អ្នកនឹងត្រូវផ្លាស់ប្តូរទៅកាន់បញ្ជីបញ្ហា GitHub ។"; @@ -775,7 +775,7 @@ "DOMAIN_FRONTING_COUNTRY_VIEW_SECTION_HEADER" = "ចៀងវាងការឃ្លាំមើលទីតាំង"; /* Alert body for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "You can enable access in the iOS Settings app."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "អ្នកអាចបើកការប្រើប្រាស់ក្នុងកម្មវិធី ការកំណត់ iOS."; /* Alert title for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ "EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Signalត្រូវការចូលប្រើប្រាស់លេខទំនាក់ទំនង ដើម្បីកែប្រែព័ត៌មានទំនាក់ទំនង"; @@ -802,7 +802,7 @@ "EDIT_GROUP_UPDATE_BUTTON" = "បច្ចុប្បន្នភាព"; /* The alert message if user tries to exit update group view without saving changes. */ -"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Would you like to save the changes that you made to this group?"; +"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "តើអ្នកចង់រក្សាទុកការផ្លាស់ប្តូរដែលអ្នកបានកំណត់ក្នុងក្រុមនេះទេ?"; /* The alert title if user tries to exit update group view without saving changes. */ "EDIT_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "ការកែប្រែមិនបានរក្សាទុក"; @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "បញ្ចូលលេខទូរស័ព្ទរបស់អ្នកដើម្បីចាប់ផ្ដើម"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "លេខទូរសព្ទមិនត្រឹមត្រូវ"; @@ -1545,7 +1545,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "បង្កើតប្រវត្តិរូបរបស់អ្នក"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "លក្ខខណ្ឌនិងគោលការណ៍ឯកជន"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 0b8dec29a..061d27681 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Sąlygos ir Privatumo politika"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Pasiimkite privatumą kartu su savimi.\nBūkite savimi kiekvienoje žinutėje."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Neteisingas numeris?"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index d289181af..2546c62a3 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -8,14 +8,14 @@ "ACTION_AUDIO_CALL" = "Signal-oproep"; /* Label for 'invite' button in contact view. */ -"ACTION_INVITE" = "Nodig uit voor Signal"; +"ACTION_INVITE" = "Uitnodigen voor Signal"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ "ACTION_SEND_MESSAGE" = "Stuur bericht"; /* Label for 'share contact' button. */ -"ACTION_SHARE_CONTACT" = "Deel contact"; +"ACTION_SHARE_CONTACT" = "Deel contactinformatie"; /* Label for 'video call' button in contact view. */ "ACTION_VIDEO_CALL" = "Video-oproep"; @@ -123,7 +123,7 @@ "ATTACHMENT_ERROR_ALERT_TITLE" = "Fout bij verzenden van bijlage"; /* Attachment error message for image attachments which could not be converted to JPEG */ -"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Converteren van afbeelding mislukt."; +"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Kan afbeelding niet converteren naar JPEG."; /* Attachment error message for video attachments which could not be converted to MP4 */ "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "Kan video niet verwerken."; @@ -294,7 +294,7 @@ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "%@ blokkeren?"; /* An explanation of the consequences of blocking another user. */ -"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Geblokkeerde gebruikers zullen je niet kunnen bellen of berichten sturen."; +"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Wanneer een geblokkeerde gebruiker jou belt gaat jouw telefoon niet over. Wanneer een geblokkeerde gebruiker jou een bericht stuurt komt die nooit aan."; /* Label for 'continue' button. */ "BUTTON_CONTINUE" = "Doorgaan"; @@ -850,10 +850,10 @@ "ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Voer een pincode in voor de registratievergrendeling. De volgende keer dat je dit telefoonnummer probeert te registreren bij Signal, zal je gevraagd worden deze pincode in te voeren."; /* Indicates that user has 'two factor auth pin' disabled. */ -"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Schakel voor verhoogde veiligheid een pincode voor registratievergrendeling in, die vereist zal worden om dit telefoonnummer opnieuw bij Signal te registreren."; +"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "Schakel voor verhoogde veiligheid een registratievergrendeling in. Door dit in te schakelen kan niemand Signal met jouw telefoonnummer registreren zonder eerst een pincode in te voeren."; /* Indicates that user has 'two factor auth pin' enabled. */ -"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "Registratievergrendeling is ingeschakeld. Wanneer je je telefoonnummer opnieuw bij Signal registreert, zal je gevraagd worden deze pincode in te voeren."; +"ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "Registratievergrendeling is ingeschakeld. Je zult je registratievergrendelingspincode moeten invoeren als je je nummer opnieuw registreert bij Signal. Dit voorkomt dat een ander jouw nummer kan registreren."; /* Title for the 'enable two factor auth PIN' views. */ "ENABLE_2FA_VIEW_TITLE" = "Registratievergrendeling"; @@ -904,7 +904,7 @@ "ERROR_DESCRIPTION_UNKNOWN_ERROR" = "Er is een onbekende fout opgetreden."; /* Error message when attempting to send message */ -"ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Contact is geen Signal-gebruiker."; +"ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Contactpersoon is geen Signal-gebruiker."; /* Error message when unable to receive an attachment because the sending client is too old. */ "ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Fout met bijlage: vraag je contact om Signal bij te werken naar de laatste versie en het bericht opnieuw te verzenden."; @@ -1138,19 +1138,19 @@ "INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE" = "Ongeldig audiobestand."; /* Alert body when contacts disabled while trying to invite contacts to signal */ -"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Je kan toegang geven tot je contacten in de iOS-instellingenapp om je vrienden uit te nodigen voor Signal."; +"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Je kan toegang geven tot je contacten in de iOS-instellingenapp om je vrienden en kennissen uit te nodigen voor Signal."; /* Alert title when contacts disabled while trying to invite contacts to signal */ "INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "Toegang tot contacten toestaan"; /* Label for the cell that presents the 'invite contacts' workflow. */ -"INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Vrienden uitnodigen voor Signal"; +"INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Kennissen uitnodigen voor Signal"; /* Search */ "INVITE_FRIENDS_PICKER_SEARCHBAR_PLACEHOLDER" = "Zoeken"; /* Navbar title */ -"INVITE_FRIENDS_PICKER_TITLE" = "Vrienden uitnodigen"; +"INVITE_FRIENDS_PICKER_TITLE" = "Kennissen uitnodigen"; /* Alert warning that sending an invite to multiple users will create a group message whose recipients will be able to see each other. */ "INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "Door meerdere mensen tegelijkertijd uit te nodigen maak je een groepsbericht. De ontvangers kunnen elkaar zien."; @@ -1255,7 +1255,7 @@ "MESSAGE_ACTION_DETAILS" = "Meer informatie"; /* Action sheet button title */ -"MESSAGE_ACTION_REPLY" = "Dit bericht beantwoorden"; +"MESSAGE_ACTION_REPLY" = "Op dit bericht reageren"; /* Action sheet button title */ "MESSAGE_ACTION_SAVE_MEDIA" = "Media opslaan"; @@ -1348,7 +1348,7 @@ "MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet langer gemarkeerd als geverifieerd. Tik voor opties."; /* Indicates that this 1:1 conversation has been blocked. */ -"MESSAGES_VIEW_CONTACT_BLOCKED" = "Je hebt deze gebruiker geblokkeerd"; +"MESSAGES_VIEW_CONTACT_BLOCKED" = "Je hebt deze persoon geblokkeerd"; /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */ "MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is niet langer gemarkeerd als geverifieerd. Tik voor opties."; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Voorwaarden en privacybeleid"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Neem privacy met je mee.\nWees jezelf in elk bericht."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Verkeerd nummer?"; @@ -1695,7 +1695,7 @@ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "De gescande code lijkt niet op een veiligheidsnummer. Gebruiken jullie allebei de laatste versie van Signal?"; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eindversleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contactpersoon.\n\nJe kan ook de code op zijn/haar telefoon scannen, of hem/haar vragen jouw code te scannen."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eindversleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contactpersoon.\n\nJe kan ook de code op zijn/haar telefoon scannen, of hem/haar vragen om jouw code te scannen."; /* Navbar title */ "PRIVACY_VERIFICATION_TITLE" = "Veiligheidsnummer verifiëren"; @@ -1749,7 +1749,7 @@ "PUSH_MANAGER_MARKREAD" = "Markeren als gelezen"; /* Notification action button title */ -"PUSH_MANAGER_REPLY" = "Antwoord"; +"PUSH_MANAGER_REPLY" = "Reageer"; /* Title of alert shown when push tokens sync job succeeds. */ "PUSH_REGISTER_SUCCESS" = "Opnieuw registreren voor pushmeldingen geslaagd."; @@ -1761,13 +1761,13 @@ "QUESTIONMARK_PUNCTUATION" = "?"; /* Indicates the author of a quoted message. Embeds {{the author's name or phone number}}. */ -"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "Reageren op %@"; +"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "In reactie op %@"; /* message header label when someone else is quoting you */ -"QUOTED_REPLY_AUTHOR_INDICATOR_YOU" = "Reageren op jou"; +"QUOTED_REPLY_AUTHOR_INDICATOR_YOU" = "In reactie op jou"; /* message header label when quoting yourself */ -"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "Reageren op jezelf"; +"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "In reactie op jezelf"; /* Footer label that appears below quoted messages when the quoted content was not derived locally. When the local user doesn't have a copy of the message being quoted, e.g. if it had since been deleted, we instead show the content specified by the sender. */ "QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "Oorspronkelijk bericht niet gevonden."; @@ -2010,13 +2010,13 @@ "SEND_INVITE_FAILURE" = "Uitnodiging sturen mislukt, probeer het later opnieuw."; /* Alert body after invite succeeded */ -"SEND_INVITE_SUCCESS" = "Je hebt een vriend uitgenodigd om Signal te gebruiken!"; +"SEND_INVITE_SUCCESS" = "Je hebt een kennis uitgenodigd om Signal te gebruiken!"; /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Uitnodigen via sms: %@"; /* No comment provided by engineer. */ -"SEND_SMS_CONFIRM_TITLE" = "Vriend uitnodigen via onbeveiligde sms?"; +"SEND_SMS_CONFIRM_TITLE" = "Kennis uitnodigen via onbeveiligde sms?"; /* No comment provided by engineer. */ "SEND_SMS_INVITE_TITLE" = "Wil je het volgende nummer uitnodigen voor Signal:"; @@ -2358,7 +2358,7 @@ "TIME_AMOUNT_DAYS_SHORT_FORMAT" = "%@d"; /* {{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings */ -"TIME_AMOUNT_HOURS" = "%@ uren"; +"TIME_AMOUNT_HOURS" = "%@ uur"; /* Label text below navbar button, embeds {{number of hours}}. Must be very short, like 1 or 2 characters, The space is intentionally omitted between the text and the embedded duration so that we get, e.g. '5h' not '5 h'. See other *_TIME_AMOUNT strings */ "TIME_AMOUNT_HOURS_SHORT_FORMAT" = "%@u"; @@ -2400,7 +2400,7 @@ "TXT_DELETE_TITLE" = "Wissen"; /* Pressing this button moves an archived thread from the archive back to the inbox */ -"UNARCHIVE_ACTION" = "De-archiveer"; +"UNARCHIVE_ACTION" = "Dearchiveren"; /* In Inbox view, last message label for thread with corrupted attachment. */ "UNKNOWN_ATTACHMENT_LABEL" = "Onbekende bijlage"; @@ -2481,7 +2481,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Je profiel instellen"; /* Description of new profile feature for upgrading (existing) users */ -"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Je kan nu een profielfoto en naam delen met je vrienden op Signal."; +"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Je kan nu een profielfoto en naam delen met je gesprekspartners op Signal."; /* Header for upgrade experience */ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Klaar voor je close-up?"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 05c9f60b4..92d03acc5 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos e política de privacidade"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Leve a privacidade consigo.\nSeja você mesmo em todas as mensagens."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 7eadd0076..99fa5ff01 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Условия и политика конфиденциальности"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Возьмите конфиденциальность с собой.\nБудьте собой в каждом сообщении."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Неправильный номер?"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 9c9612cd4..8d88ad936 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Kushte & Rregulla Privatësie"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Merreni privatësinë me vete.\nJini ju vetë, në çdo mesazh."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numër i gabuar?"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index 704626eee..772718926 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -1452,7 +1452,7 @@ "NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ till %@"; /* Placeholder text for group name field */ -"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Namnge gruppchatten"; +"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Namnge gruppkonversationen"; /* a title for the non-contacts section of the 'new group' view. */ "NEW_GROUP_NON_CONTACTS_SECTION_TITLE" = "Andra användare"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Villkor & Dataskyddspolicy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Ta sekretess med dig.\nVar dig själv i varje meddelande."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Fel nummer?"; @@ -1995,7 +1995,7 @@ "SELECT_THREAD_TABLE_OTHER_CHATS_TITLE" = "Andra kontakter"; /* Table section header for recently active conversations */ -"SELECT_THREAD_TABLE_RECENT_CHATS_TITLE" = "Senaste chattar"; +"SELECT_THREAD_TABLE_RECENT_CHATS_TITLE" = "Senaste konversationer"; /* No comment provided by engineer. */ "SEND_AGAIN_BUTTON" = "Skicka igen"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 2c02633bf..7cbacda75 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -1518,7 +1518,7 @@ "ONBOARDING_2FA_TITLE" = "Kayıt Kilidi"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Mesajlarınıza insan eli değsin"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "İzinleri Etkinleştir"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Şartlar ve Gizlilik İlkesi"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Gizliliğinizi koruyun.\nHer mesajda kendiniz olun."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Yanlış numara?"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index c9df27a76..f9f0bb264 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "协议与隐私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "让隐私与您形影不离。\n在每一条消息中展现真正的自己。"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "错误的号码？"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index 0081b220d..1ed7e9a7a 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "服務條款與隱私政策"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "保護你的隱私。\n在每個訊息中做你自己。"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "錯誤的號碼？"; From 932d02b9370ef9c7d402c5732a51bf3117d0628a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 12:11:01 -0800 Subject: [PATCH 227/493] fixup tests --- Signal/test/views/ImageEditor/ImageEditorModelTest.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift index 161aa4efc..b1e97ec10 100644 --- a/Signal/test/views/ImageEditor/ImageEditorModelTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorModelTest.swift @@ -14,7 +14,7 @@ class ImageEditorModelTest: SignalBaseTest { let unitTranslation = CGPoint.zero let rotationRadians: CGFloat = 0 let scaling: CGFloat = 1 - let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling) + let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling, isFlipped: false) let viewSize = outputSizePixels let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSizePixels, transform: transform) @@ -34,7 +34,7 @@ class ImageEditorModelTest: SignalBaseTest { let unitTranslation = CGPoint(x: +0.5, y: -0.5) let rotationRadians: CGFloat = 0 let scaling: CGFloat = 2 - let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling) + let transform = ImageEditorTransform(outputSizePixels: outputSizePixels, unitTranslation: unitTranslation, rotationRadians: rotationRadians, scaling: scaling, isFlipped: false) let viewSize = CGSize(width: 335, height: 595) let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSizePixels, transform: transform) From 9fa0308d958c0684b0930adee1cb69bc98de07f0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 12:13:56 -0800 Subject: [PATCH 228/493] exclude self from "suggested contacts" --- .../HomeView/HomeViewController.m | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 48ac417d3..fa7265bde 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -467,9 +467,32 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self updateViewState]; } +- (NSArray *)suggestedAccountsForFirstContact +{ + NSMutableArray *accounts = [NSMutableArray new]; + NSString *_Nullable localNumber = [TSAccountManager localNumber]; + if (localNumber == nil) { + OWSFailDebug(@"localNumber was unexepectedly nil"); + return @[]; + } + + for (SignalAccount *account in self.contactsManager.signalAccounts) { + if ([localNumber isEqual:account.recipientId]) { + continue; + } + [accounts addObject:account]; + if (accounts.count >= 3) { + return accounts; + } + } + + return [accounts copy]; +} + - (void)updateFirstConversationLabel { - NSArray *signalAccounts = self.contactsManager.signalAccounts; + + NSArray *signalAccounts = self.suggestedAccountsForFirstContact; NSString *formatString = @""; NSMutableArray *contactNames = [NSMutableArray new]; From 913ae2b801e2372e0c116236f4415b533b97ec1f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 12:36:48 -0800 Subject: [PATCH 229/493] Show suggested contacts upon first entry into HomeView. --- .../Registration/OnboardingController.swift | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index fc5676d6a..99a27d873 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -70,6 +70,10 @@ public class OnboardingController: NSObject { return AppEnvironment.shared.accountManager } + private var contactsManager: OWSContactsManager { + return Environment.shared.contactsManager + } + private var backup: OWSBackup { return AppEnvironment.shared.backup } @@ -162,6 +166,13 @@ public class OnboardingController: NSObject { Logger.info("") + // At this point, the user has been prompted for contact access + // and has valid service credentials. + // We start the contact fetch/intersection now so that by the time + // they get to HomeView we can show meaningful contact in the suggested + // contact bubble. + contactsManager.requestSystemContactsOnce() + if tsAccountManager.isReregistering() { showProfileView(fromView: view) } else { From 32150fa7fb039313d2d5210d234c4d4849a84daa Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sun, 10 Mar 2019 11:32:47 -0700 Subject: [PATCH 230/493] pull translations --- .../translations/it.lproj/Localizable.strings | 2 +- .../translations/nb.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 6 +- .../translations/pl.lproj/Localizable.strings | 24 +-- .../translations/ro.lproj/Localizable.strings | 2 +- .../translations/ru.lproj/Localizable.strings | 4 +- .../translations/tr.lproj/Localizable.strings | 158 +++++++++--------- 7 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 302d49210..7e8ba2953 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Politica e termini sulla privacy"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Porta la privacy con te.\nSii te stesso in ogni messaggio."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Numero errato?"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index b0200b43e..b1fa644f7 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -1545,7 +1545,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Sett opp din profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 2546c62a3..8112e02a3 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -240,7 +240,7 @@ "BLOCK_LIST_BLOCK_BUTTON" = "Blokkeren"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ -"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "De groep \"%@\" blokkeren en verlaten?"; +"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "De groep “%@” blokkeren en verlaten?"; /* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */ "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "%@ blokkeren?"; @@ -1039,7 +1039,7 @@ "GROUP_MEMBERS_VIEW_CONTACT_INFO" = "Contactinformatie"; /* No comment provided by engineer. */ -"GROUP_TITLE_CHANGED" = "De titel is nu \"%@\"."; +"GROUP_TITLE_CHANGED" = "De titel is nu “%@”."; /* No comment provided by engineer. */ "GROUP_UPDATED" = "Groep bijgewerkt."; @@ -2424,7 +2424,7 @@ "UNLINK_CONFIRMATION_ALERT_BODY" = "Dit apparaat zal niet langer in staat zijn berichten te sturen en te ontvangen als het is ontkoppeld."; /* Alert title for confirming device deletion */ -"UNLINK_CONFIRMATION_ALERT_TITLE" = "\"%@\" ontkoppelen?"; +"UNLINK_CONFIRMATION_ALERT_TITLE" = "“%@” ontkoppelen?"; /* Alert title when unlinking device fails */ "UNLINKING_FAILED_ALERT_TITLE" = "Signal kon je apparaat niet ontkoppelen."; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index f41b93ab2..2884d0f18 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -8,7 +8,7 @@ "ACTION_AUDIO_CALL" = "Połączenie Signal"; /* Label for 'invite' button in contact view. */ -"ACTION_INVITE" = "Zaproś do Signala"; +"ACTION_INVITE" = "Zaproś do Signal"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ @@ -1057,13 +1057,13 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Szukaj"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@ oraz %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@, %@ oraz %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Rozpocznij tutaj swoją pierwszą rozmowę."; @@ -1548,22 +1548,22 @@ "ONBOARDING_PROFILE_TITLE" = "Skonfiguruj swój profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Regulamin i Polityka Prywatności"; +"ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Regulamin & Polityka Prywatności"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Weź prywatność w swoje ręce.\nBądź sobą w każdej wiadomości."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Błędny numer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Nie otrzymano kodu (dostępne za %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_INVALID_CODE" = "Kod jest nieprawidłowy"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Nie otrzymano kodu"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Upewnij się, że posiadasz włączoną usługę komórkową i możesz odbierać wiadomości SMS."; @@ -1848,7 +1848,7 @@ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Masz już konto Signal?"; /* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Regulamin i Polityka Prywatności"; +"REGISTRATION_LEGAL_TERMS_LINK" = "Regulamin & Polityka Prywatności"; /* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ "REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Rejestrując to urządzenie wyrażasz zgodę na %@ z usług Signal"; @@ -2169,7 +2169,7 @@ "SETTINGS_ITEM_NOTIFICATION_SOUND" = "Dźwięk wiadomości"; /* table cell label */ -"SETTINGS_LEGAL_TERMS_CELL" = "Regulamin i Polityka Prywatności"; +"SETTINGS_LEGAL_TERMS_CELL" = "Regulamin & Polityka Prywatności"; /* Setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS" = "Podgląd linków"; @@ -2523,7 +2523,7 @@ "VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Zadzwoń do mnie"; /* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Wyślij ponownie kod przez SMS"; +"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Wyślij ponownie kod SMS"; /* button text during registration to submit your SMS verification code. */ "VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Wyślij"; @@ -2553,7 +2553,7 @@ "VERIFY_PRIVACY_MULTIPLE" = "Sprawdź kod zabezpieczenia"; /* Indicates how to cancel a voice message. */ -"VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Przesuń aby Anulować"; +"VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Przesuń, aby anulować"; /* Filename for voice messages. */ "VOICE_MESSAGE_FILE_NAME" = "Wiadomość głosowa"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index aec18ce47..cb9ea4ee5 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termeni și politica de confidențialitate"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Ia-ți intimitatea cu tine.\nFii tu însuți în fiecare mesaj."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Număr greșit?"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 99fa5ff01..d828e2722 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1476,7 +1476,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Поиск по номеру телефона"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Примечание для себя"; +"NOTE_TO_SELF" = "Заметка для себя"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Возможно, вы получили сообщения во время перезапуска вашего %@."; @@ -1518,7 +1518,7 @@ "ONBOARDING_2FA_TITLE" = "Блокировка регистрации"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Добавьте немного человечности в ваши сообщения"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Включить разрешения"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 7cbacda75..02243e36a 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -12,7 +12,7 @@ /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ -"ACTION_SEND_MESSAGE" = "Mesaj Gönder"; +"ACTION_SEND_MESSAGE" = "İleti Gönder"; /* Label for 'share contact' button. */ "ACTION_SHARE_CONTACT" = "Kişi Paylaş"; @@ -57,7 +57,7 @@ "ANSWER_CALL_BUTTON_TITLE" = "Yanıtla"; /* notification body */ -"APN_Message" = "Yeni Mesaj!"; +"APN_Message" = "Yeni İleti!"; /* Message for the 'app launch failed' alert. */ "APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal başlatılamıyor. Lütfen bu sorunu çözmemiz için hata ayıklama günlüğünüzü support@signal.org adresine gönderin."; @@ -102,7 +102,7 @@ "ATTACHMENT_APPROVAL_FILE_SIZE_FORMAT" = "Boyut: %@"; /* One-line label indicating the user can add no more text to the media message field. */ -"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "Mesaj sınırına ulaşıldı."; +"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "İleti sınırına ulaşıldı."; /* Label for 'send' button in the 'attachment approval' dialog. */ "ATTACHMENT_APPROVAL_SEND_BUTTON" = "Gönder"; @@ -168,7 +168,7 @@ "ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE" = "Desteklenmeyen dosya"; /* Short text label for a voice message attachment, used for thread preview and on the lock screen */ -"ATTACHMENT_TYPE_VOICE_MESSAGE" = "Sesli Mesaj"; +"ATTACHMENT_TYPE_VOICE_MESSAGE" = "Sesli İleti"; /* action sheet button title to enable built in speaker during a call */ "AUDIO_ROUTE_BUILT_IN_SPEAKER" = "Hoparlör"; @@ -234,7 +234,7 @@ "BACKUP_UNEXPECTED_ERROR" = "Beklenmedik Yedek Hatası"; /* An explanation of the consequences of blocking a group. */ -"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Bu grubun mesajlarını veya güncellemelerini almayacaksınız."; +"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Bu grubun iletilerini veya güncellemelerini almayacaksınız."; /* Button label for the 'block' button */ "BLOCK_LIST_BLOCK_BUTTON" = "Engelle"; @@ -294,7 +294,7 @@ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "%@ engellensin mi?"; /* An explanation of the consequences of blocking another user. */ -"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Engellenen kullanıcılar sizi arayamaz veya size mesaj gönderemez."; +"BLOCK_USER_BEHAVIOR_EXPLANATION" = "Engellenen kullanıcılar sizi arayamaz veya size ileti gönderemez."; /* Label for 'continue' button. */ "BUTTON_CONTINUE" = "Devam et"; @@ -318,7 +318,7 @@ "CALL_AGAIN_BUTTON_TITLE" = "Tekrar Ara"; /* Alert message when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_MESSAGE" = "Signal'de sesli mesajlar kaydetmek ve aramalar yapmak için iOS Ayarlar uygulamasından mikrofon erişimini etkinleştirebilirsiniz."; +"CALL_AUDIO_PERMISSION_MESSAGE" = "Signal'de sesli iletiler kaydetmek ve aramalar yapmak için iOS Ayarlar uygulamasından mikrofon erişimini etkinleştirebilirsiniz."; /* Alert title when calling and permissions for microphone are missing */ "CALL_AUDIO_PERMISSION_TITLE" = "Mikrofon Erişimi Gerekiyor"; @@ -396,7 +396,7 @@ "CALLKIT_ANONYMOUS_CONTACT_NAME" = "Signal Kullanıcısı"; /* Message for alert explaining that a user cannot be verified. */ -"CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Bu kullanıcı ile mesajlaşılmadan doğrulanamaz."; +"CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Bu kullanıcı ile iletişim kurulmadan doğrulanamaz."; /* Title for alert explaining that a user cannot be verified. */ "CANT_VERIFY_IDENTITY_ALERT_TITLE" = "Hata"; @@ -426,7 +426,7 @@ "CLOUDKIT_STATUS_RESTRICTED" = "Signal'in iCloud erişimi engellenmiş. Signal verilerinizi yedeklemek için iOS ayarlar uygulamasından Signal'in iCloud hesabınıza erişimine izni verin."; /* The first of two messages demonstrating the chosen conversation color, by rendering this message in an outgoing message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_1" = "Bu sohbete gönderilen mesajların rengini seçin."; +"COLOR_PICKER_DEMO_MESSAGE_1" = "Bu sohbete gönderilen iletilerin rengini seçin."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ "COLOR_PICKER_DEMO_MESSAGE_2" = "Seçtiğiniz rengi sadece siz göreceksiniz."; @@ -450,13 +450,13 @@ "COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Hangi kişilerinizin Signal kullandığını görmek için iOS Ayarlar uygulamasından kişiler erişimini etkinleştirebilirsiniz."; /* No comment provided by engineer. */ -"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Bu işlem mesajlarınızı silerek ve sunucu kaydınızı silerek uygulamayı sıfırlayacaktır. İşlem tamamlandıktan sonra uygulama kapanacaktır."; +"CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Bu işlem iletilerinizi silerek ve sunucu kaydınızı silerek uygulamayı sıfırlayacaktır. İşlem tamamlandıktan sonra uygulama kapanacaktır."; /* No comment provided by engineer. */ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Hesabınızı silmek istediğinizden emin misiniz?"; /* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Bu gruptan artık mesaj almayacak ve gönderemeyeceksiniz."; +"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Bu gruptan artık ileti almayacak ve gönderemeyeceksiniz."; /* Alert title */ "CONFIRM_LEAVE_GROUP_TITLE" = "Gerçekten ayrılmak istiyor musunuz?"; @@ -651,7 +651,7 @@ "CONVERSATION_VIEW_CONTACTS_OFFER_TITLE" = "Bu kullanıcı rehberinizde değil."; /* Indicates that the app is loading more messages in this conversation. */ -"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Daha Fazla Mesaj Yükleniyor…"; +"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Daha Fazla İleti Yükleniyor…"; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ "CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Dahası için Dokunun"; @@ -660,7 +660,7 @@ "CONVERSATION_VIEW_UNKNOWN_CONTACT_BLOCK_OFFER" = "Bu Kullanıcıyı Engelle"; /* ActionSheet title */ -"CORRUPTED_SESSION_DESCRIPTION" = "Oturumunuzu sıfırlamak %@ tarafından mesajlarınızı almanızı sağlayacak, fakat bozuk mesajlarınızı kurtarmayacaktır."; +"CORRUPTED_SESSION_DESCRIPTION" = "Oturumunuzu sıfırlamak %@ tarafından iletiler almanızı sağlayacak, fakat bozuk iletilerinizi kurtarmayacaktır."; /* No comment provided by engineer. */ "COUNTRYCODE_SELECT_TITLE" = "Ülke Kodu Seç"; @@ -754,19 +754,19 @@ "DEVICE_LIST_UPDATE_FAILED_TITLE" = "Cihaz listesi güncellenemedi."; /* table cell label in conversation settings */ -"DISAPPEARING_MESSAGES" = "Kaybolan Mesajlar "; +"DISAPPEARING_MESSAGES" = "Kaybolan İletiler "; /* Info Message when added to a group which has enabled disappearing messages. Embeds {{time amount}} before messages disappear, see the *_TIME_AMOUNT strings for context. */ -"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Bu sohbetteki mesajlar %@ geçtikten sonra kaybolacaktır."; +"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Bu sohbetteki iletiler %@ geçtikten sonra kaybolacaktır."; /* subheading in conversation settings */ -"DISAPPEARING_MESSAGES_DESCRIPTION" = "Etkinleştirildiğinde, bu sohbetteki gönderilen ve alınan mesajlar görüldükten sonra kaybolur."; +"DISAPPEARING_MESSAGES_DESCRIPTION" = "Etkinleştirildiğinde, bu sohbetteki gönderilen ve alınan iletiler görüldükten sonra kaybolur."; /* Accessibility hint that contains current timeout information */ -"DISAPPEARING_MESSAGES_HINT" = "Şu anda mesajlar %@ sonra kayboluyor"; +"DISAPPEARING_MESSAGES_HINT" = "Şu anda iletiler %@ sonra kayboluyor"; /* Accessibility label for disappearing messages */ -"DISAPPEARING_MESSAGES_LABEL" = "Kaybolan mesaj ayarları"; +"DISAPPEARING_MESSAGES_LABEL" = "Kaybolan ileti ayarları"; /* Short text to dismiss current modal / actionsheet / screen */ "DISMISS_BUTTON_TEXT" = "Kapat"; @@ -814,7 +814,7 @@ "EDIT_TXT" = "Düzenle"; /* body of email sent to contacts when inviting to install Signal. Embeds {{link to install Signal}} and {{link to the Signal home page}} */ -"EMAIL_INVITE_BODY" = "Merhaba,\n\nSon zamanlarda iPhone'umdaki konuşmalarımı gizli tutmak için Signal kullanıyorum. Size de kurmanızı öneririm, böylelikle mesajlarımızın ve aramalarımızın aramızda kaldığından emin olabiliriz.\n\nSignal, iPhone ve Android için kullanılabilir. Şu adresten edinebilirsiniz: %@ \n\nSignal mevcut mesajlaşma uygulamanız gibi çalışır. Resim ve video gönderebilir, arama yapabilir ve grup sohbetlerine başlayabiliriz. En iyi yanı ise yapımcıları dahil hiçkimsenin göremeyecek olması!\n\nSignal'i yapan Open Whisper Systems hakkında daha fazla bilgi için şu adresi ziyaret edebilirsin: %@"; +"EMAIL_INVITE_BODY" = "Merhaba,\n\nSon zamanlarda iPhone'umdaki konuşmalarımı gizli tutmak için Signal kullanıyorum. Size de kurmanızı öneririm, böylelikle iletilerimizin ve aramalarımızın aramızda kaldığından emin olabiliriz.\n\nSignal, iPhone ve Android için kullanılabilir. Şu adresten edinebilirsiniz: %@ \n\nSignal mevcut ileti uygulamanız gibi çalışır. Resim ve video gönderebilir, arama yapabilir ve grup sohbetlerine başlayabiliriz. En iyi yanı ise yapımcıları dahil hiçkimsenin göremeyecek olması!\n\nSignal'i yapan Open Whisper Systems hakkında daha fazla bilgi için şu adresi ziyaret edebilirsin: %@"; /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Haydi Signal'e geçelim"; @@ -868,13 +868,13 @@ "ERROR_COULD_NOT_FETCH_CONTACTS" = "Kişilere erişilemedi."; /* Generic notice when message failed to send. */ -"ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "Mesaj gönderilemedi."; +"ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "İleti gönderilemedi."; /* Error message indicating that message send is disabled due to prekey update failures */ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Eski anahtar verilerinden dolayı gönderilemedi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya mesaj gönderilemedi."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya ileti gönderilemedi."; /* Error message indicating that message send failed due to failed attachment write */ "ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eklenti yazımı ve gönderimi başarısız oldu."; @@ -883,7 +883,7 @@ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal internete bağlanamadı. Lütfen tekrar deneyin."; /* Error indicating that an outgoing message had no valid recipients. */ -"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "Mesaj gönderimi geçerli alıcı olmadığından başarısız oldu."; +"ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "İleti gönderimi geçerli alıcı olmadığından başarısız oldu."; /* Error indicating that a socket request failed. */ "ERROR_DESCRIPTION_REQUEST_FAILED" = "Ağ isteği başarısız oldu."; @@ -907,7 +907,7 @@ "ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "Kişi bir Signal kullanıcısı değil."; /* Error message when unable to receive an attachment because the sending client is too old. */ -"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Eklenti hatası: Bu kullanıcıdan Signal'in en son sürümüne güncelledikten sonra mesajı tekrar göndermelerini isteyin."; +"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Eklenti hatası: Bu kullanıcıdan Signal'in en son sürümüne güncelledikten sonra iletiyi tekrar göndermelerini isteyin."; /* No comment provided by engineer. */ "ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Tekrarlanan bir ileti alındı."; @@ -916,7 +916,7 @@ "ERROR_MESSAGE_INVALID_KEY_EXCEPTION" = "Alıcının anahtarı geçerli değil."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_INVALID_MESSAGE" = "Alınan mesaj senkronize edilemedi."; +"ERROR_MESSAGE_INVALID_MESSAGE" = "Alınan ileti senkronize edilemedi."; /* No comment provided by engineer. */ "ERROR_MESSAGE_INVALID_VERSION" = "Bu sürümle uyumsuz bir ileti alındı."; @@ -946,7 +946,7 @@ "FAILED_SENDING_BECAUSE_RATE_LIMIT" = "Bu kullanıcıya çok fazla hatalı deneme yaptınız. Lütfen daha sonra tekrar deneyin."; /* action sheet header when re-sending message which failed because of untrusted identity keys */ -"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "%@ ile olan güvenlik numaranız yakın zamanda değişti. Bu mesajı tekrar göndermeden önce doğrulamak isteyebilirsiniz."; +"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "%@ ile olan güvenlik numaranız yakın zamanda değişti. Bu iletiyi tekrar göndermeden önce doğrulamak isteyebilirsiniz."; /* alert title */ "FAILED_VERIFICATION_TITLE" = "Güvenlik Numarası Doğrulanamadı!"; @@ -1033,7 +1033,7 @@ "GROUP_MEMBERS_SECTION_TITLE_NO_LONGER_VERIFIED" = "Artık Doğrulanmış Değil"; /* Button label for the 'send message to group member' button */ -"GROUP_MEMBERS_SEND_MESSAGE" = "Mesaj Gönder"; +"GROUP_MEMBERS_SEND_MESSAGE" = "İleti Gönder"; /* Button label for the 'show contact info' button */ "GROUP_MEMBERS_VIEW_CONTACT_INFO" = "Kişi Bilgileri"; @@ -1114,10 +1114,10 @@ "IN_CALL_TERMINATED" = "Çağrı Sonlandı."; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Bu sohbetler arşivlendi ve sadece yeni mesajlar alınırsa gelen kutusunda görünecekler."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Bu sohbetler arşivlendi ve sadece yeni iletiler alınırsa gelen kutusunda görünecekler."; /* Message shown in the home view when the inbox is empty. */ -"INBOX_VIEW_EMPTY_INBOX" = "Gelen kutunuza bir şeyler gelmesini sağlayın. Bir arkadaşınıza mesaj göndererek başlayın."; +"INBOX_VIEW_EMPTY_INBOX" = "Gelen kutunuza bir şeyler gelmesini sağlayın. Bir arkadaşınıza ileti göndererek başlayın."; /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Signal sohbet listesinde kişilerinizin adını görmek için iOS Ayarlar uygulamasından kişiler erişimini etkinleştirebilirsiniz."; @@ -1153,13 +1153,13 @@ "INVITE_FRIENDS_PICKER_TITLE" = "Arkadaş Davet Et"; /* Alert warning that sending an invite to multiple users will create a group message whose recipients will be able to see each other. */ -"INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "Aynı anda birden fazla kullanıcıyı davet etmek bir grup mesajı gönderir ve alıcılar birbirini görebilir."; +"INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "Aynı anda birden fazla kullanıcıyı davet etmek bir grup iletisi gönderecektir ve alıcılar birbirini görebilecektir."; /* Slider label embeds {{TIME_AMOUNT}}, e.g. '2 hours'. See *_TIME_AMOUNT strings for examples. */ -"KEEP_MESSAGES_DURATION" = "Mesajlar %@ geçtikten sonra kayboluyor."; +"KEEP_MESSAGES_DURATION" = "İletiler %@ geçtikten sonra kayboluyor."; /* Slider label when disappearing messages is off */ -"KEEP_MESSAGES_FOREVER" = "Mesajlar kaybolmuyor."; +"KEEP_MESSAGES_FOREVER" = "İletiler kaybolmuyor."; /* Confirmation button within contextual alert */ "LEAVE_BUTTON_TITLE" = "Ayrıl"; @@ -1174,7 +1174,7 @@ "LINK_DEVICE_INVALID_CODE_TITLE" = "Cihaz Bağlanması Başarısız Oldu"; /* confirm the users intent to link a new device */ -"LINK_DEVICE_PERMISSION_ALERT_BODY" = "Bu cihaz, gruplarınızı ve kişilerinizi görebilecek, tüm iletilerinize erişebilecek ve adınıza mesaj gönderebilecektir."; +"LINK_DEVICE_PERMISSION_ALERT_BODY" = "Bu cihaz, gruplarınızı ve kişilerinizi görebilecek, tüm iletilerinize erişebilecek ve adınıza ileti gönderebilecektir."; /* confirm the users intent to link a new device */ "LINK_DEVICE_PERMISSION_ALERT_TITLE" = "Bu cihazı bağla?"; @@ -1207,7 +1207,7 @@ "LOGGING_SECTION" = "Günlük"; /* Title for the 'long text message' view. */ -"LONG_TEXT_VIEW_TITLE" = "Mesaj"; +"LONG_TEXT_VIEW_TITLE" = "İleti"; /* nav bar button item */ "MEDIA_DETAIL_VIEW_ALL_MEDIA_BUTTON" = "Tüm Medyalar"; @@ -1222,10 +1222,10 @@ "MEDIA_FROM_LIBRARY_BUTTON" = "Fotoğraflar"; /* Confirmation button text to delete selected media from the gallery, embeds {{number of messages}} */ -"MEDIA_GALLERY_DELETE_MULTIPLE_MESSAGES_FORMAT" = "%d Mesajı Sil"; +"MEDIA_GALLERY_DELETE_MULTIPLE_MESSAGES_FORMAT" = "%d İletiyi Sil"; /* Confirmation button text to delete selected media message from the gallery */ -"MEDIA_GALLERY_DELETE_SINGLE_MESSAGE" = "Mesajı Sil"; +"MEDIA_GALLERY_DELETE_SINGLE_MESSAGE" = "İletiyi Sil"; /* embeds {{sender name}} and {{sent datetime}}, e.g. 'Sarah on 10/30/18, 3:29' */ "MEDIA_GALLERY_LANDSCAPE_TITLE_FORMAT" = "%@, %@ civarında"; @@ -1243,10 +1243,10 @@ "MESSAGE_ACTION_COPY_MEDIA" = "Medyayı Kopyala"; /* Action sheet button title */ -"MESSAGE_ACTION_COPY_TEXT" = "Mesaj Metnini kopyala"; +"MESSAGE_ACTION_COPY_TEXT" = "İleti Metnini kopyala"; /* Action sheet button title */ -"MESSAGE_ACTION_DELETE_MESSAGE" = "Bu Mesajı Sil"; +"MESSAGE_ACTION_DELETE_MESSAGE" = "Bu İletiyi Sil"; /* Action sheet button subtitle */ "MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "Yalnızca bu cihazdan silinecektir."; @@ -1255,19 +1255,19 @@ "MESSAGE_ACTION_DETAILS" = "Daha Fazla Bilgi"; /* Action sheet button title */ -"MESSAGE_ACTION_REPLY" = "Bu Mesajı Yanıtla"; +"MESSAGE_ACTION_REPLY" = "Bu İletiyi Yanıtla"; /* Action sheet button title */ "MESSAGE_ACTION_SAVE_MEDIA" = "Medyayı Kaydet"; /* Title for the 'message approval' dialog. */ -"MESSAGE_APPROVAL_DIALOG_TITLE" = "Mesaj"; +"MESSAGE_APPROVAL_DIALOG_TITLE" = "İleti"; /* Label for the recipient name in the 'message approval' dialog. */ "MESSAGE_APPROVAL_RECIPIENT_LABEL" = "Kime:"; /* No comment provided by engineer. */ -"MESSAGE_COMPOSEVIEW_TITLE" = "Yeni Mesaj"; +"MESSAGE_COMPOSEVIEW_TITLE" = "Yeni İleti"; /* Label for file size of attachments in the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE" = "Dosya Boyutu"; @@ -1297,7 +1297,7 @@ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_UPLOADING" = "Yükleniyor"; /* Label for messages without a body or attachment in the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "Mesajın içeriği veya eki yok"; +"MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "İletinin içeriği veya eki yok"; /* Label for the 'received date & time' field of the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME" = "Alındı"; @@ -1312,7 +1312,7 @@ "MESSAGE_METADATA_VIEW_SOURCE_FILENAME" = "Dosya adı"; /* Title for the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_TITLE" = "Mesaj"; +"MESSAGE_METADATA_VIEW_TITLE" = "İleti"; /* message status for message delivered to their recipient. */ "MESSAGE_STATUS_DELIVERED" = "İletildi"; @@ -1342,7 +1342,7 @@ "MESSAGE_STATUS_UPLOADING" = "Yükleniyor…"; /* placeholder text for the editable message field */ -"MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Yeni Mesaj"; +"MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Yeni İleti"; /* Indicates that one member of this group conversation is no longer verified. Embeds {{user's name or phone number}}. */ "MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ artık doğrulanmış olarak işaretlenmiyor. Seçenekler için dokunun. "; @@ -1372,13 +1372,13 @@ "MESSAGES_VIEW_TITLE_SUBTITLE" = "Ayarlar için buraya tıkla."; /* Indicator that separates read from unread messages. */ -"MESSAGES_VIEW_UNREAD_INDICATOR" = "Yeni Mesajlar"; +"MESSAGES_VIEW_UNREAD_INDICATOR" = "Yeni İletiler"; /* Messages that indicates that there are more unseen messages. */ -"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES" = "Daha fazla okunmamış mesaj var."; +"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES" = "Daha fazla okunmamış ileti var."; /* Messages that indicates that there are more unseen messages including safety number changes. */ -"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "Daha fazla okunmamış mesaj var (güvenlik numarası değişimleriyle birlikte)."; +"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "Daha fazla okunmamış ileti var (güvenlik numarası değişimleriyle birlikte)."; /* info message text in conversation view */ "MISSED_CALL" = "Cevapsız arama"; @@ -1464,7 +1464,7 @@ "NEW_GROUP_VIEW_UNSAVED_CHANGES_TITLE" = "Kaydedilmemiş Değişiklikler"; /* No comment provided by engineer. */ -"new_message" = "Yeni Mesaj"; +"new_message" = "Yeni İleti"; /* A label for the 'add by phone number' button in the 'new non-contact conversation' view */ "NEW_NONCONTACT_CONVERSATION_VIEW_BUTTON" = "Ara"; @@ -1479,10 +1479,10 @@ "NOTE_TO_SELF" = "Kendime Not"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ -"NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "%@ cihazınız yeniden başlarken mesaj almış olabilirsiniz."; +"NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "%@ cihazınız yeniden başlarken ileti almış olabilirsiniz."; /* No comment provided by engineer. */ -"NOTIFICATIONS_FOOTER_WARNING" = "Apple'ın bildirim altyapısındaki bilinen hatalardan dolayı, mesaj önizlemeleri yalnızca mesaj gönderildikten sonraki 30 saniye içinde alınırsa gösterilir. Bunun sonucunda uygulama rozeti düzgün olmayabilir."; +"NOTIFICATIONS_FOOTER_WARNING" = "Apple'ın bildirim altyapısındaki bilinen hatalardan dolayı, ileti önizlemeleri yalnızca ileti gönderildikten sonraki 30 saniye içinde alınırsa gösterilir. Bunun sonucunda uygulama rozeti düzgün olmayabilir."; /* No comment provided by engineer. */ "NOTIFICATIONS_NONE" = "İsim veya İçerik Yok"; @@ -1518,7 +1518,7 @@ "ONBOARDING_2FA_TITLE" = "Kayıt Kilidi"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Mesajlarınıza insan eli değsin"; +"ONBOARDING_CAPTCHA_TITLE" = "İnsan olduğunuzu doğrulayın"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "İzinleri Etkinleştir"; @@ -1530,7 +1530,7 @@ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Şimdi Değil"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal mesaj geldiğinde (kimden olduğu ile birlikte) size bildirir"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal ileti geldiğinde (kimden olduğu ile birlikte) size bildirir"; /* Title of the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_TITLE" = "Başlamak için telefon numaranızı giriniz"; @@ -1551,7 +1551,7 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Şartlar ve Gizlilik İlkesi"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Gizliliğinizi koruyun.\nHer mesajda kendiniz olun."; +"ONBOARDING_SPLASH_TITLE" = "Gizliliğinizi koruyun.\nHer iletide kendiniz olun."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Yanlış numara?"; @@ -1566,7 +1566,7 @@ "ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Kod gelmedi"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Lütfen hücresel hizmete bağlı olduğunuzu ve SMS mesajları alabildiğinizi doğrulayın."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Lütfen hücresel hizmete bağlı olduğunuzu ve SMS iletileri alabildiğinizi doğrulayın."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Kod gelmedi mi?"; @@ -1590,10 +1590,10 @@ "OPEN_SETTINGS_BUTTON" = "Ayarlar"; /* Info Message when {{other user}} disables or doesn't support disappearing messages */ -"OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ kaybolan mesajları devre dışı bıraktı."; +"OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ kaybolan iletileri devre dışı bıraktı."; /* Info Message when {{other user}} updates message expiration to {{time amount}}, see the *_TIME_AMOUNT strings for context. */ -"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ kaybolan mesaj süresini %@ olarak ayarladı."; +"OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "%@ kaybolan ileti süresini %@ olarak ayarladı."; /* Label warning the user that the Signal service may be down. */ "OUTAGE_WARNING" = "Signal teknik sorunlar yaşıyor. Hizmeti olabildiğince çabuk düzeltmek için sıkı çalışıyoruz."; @@ -1770,13 +1770,13 @@ "QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "Kendinize Cevaben"; /* Footer label that appears below quoted messages when the quoted content was not derived locally. When the local user doesn't have a copy of the message being quoted, e.g. if it had since been deleted, we instead show the content specified by the sender. */ -"QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "Mesajın aslı bulunamadı."; +"QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "İletinin aslı bulunamadı."; /* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message was since deleted. */ -"QUOTED_REPLY_ORIGINAL_MESSAGE_DELETED" = "Mesajın aslı artık mevcut değil."; +"QUOTED_REPLY_ORIGINAL_MESSAGE_DELETED" = "İletinin aslı artık mevcut değil."; /* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message didn't exist when the quote was received. */ -"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED" = "Mesajın aslı bulunamadı."; +"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED" = "İletinin aslı bulunamadı."; /* Indicates this message is a quoted reply to an attachment of unknown type. */ "QUOTED_REPLY_TYPE_ATTACHMENT" = "Eklenti"; @@ -1863,7 +1863,7 @@ "REGISTRATION_PHONENUMBER_BUTTON" = "Telefon Numarası"; /* No comment provided by engineer. */ -"REGISTRATION_RESTRICTED_MESSAGE" = "Mesaj göndermeden önce kaydolmanız gerekiyor."; +"REGISTRATION_RESTRICTED_MESSAGE" = "İleti göndermeden önce kaydolmanız gerekiyor."; /* No comment provided by engineer. */ "REGISTRATION_TITLE_LABEL" = "Telefon Numaranız"; @@ -1983,7 +1983,7 @@ "SEARCH_SECTION_CONVERSATIONS" = "Sohbetler"; /* section header for search results that match a message in a conversation */ -"SEARCH_SECTION_MESSAGES" = "Mesajlar"; +"SEARCH_SECTION_MESSAGES" = "İletiler"; /* No comment provided by engineer. */ "SECURE_SESSION_RESET" = "Güvenli oturum sıfırlandı."; @@ -1995,7 +1995,7 @@ "SELECT_THREAD_TABLE_OTHER_CHATS_TITLE" = "Diğer Kişiler"; /* Table section header for recently active conversations */ -"SELECT_THREAD_TABLE_RECENT_CHATS_TITLE" = "Son Mesajlar"; +"SELECT_THREAD_TABLE_RECENT_CHATS_TITLE" = "Son İletiler"; /* No comment provided by engineer. */ "SEND_AGAIN_BUTTON" = "Tekrar Gönder"; @@ -2004,7 +2004,7 @@ "SEND_BUTTON_TITLE" = "Gönder"; /* notification body */ -"SEND_FAILED_NOTIFICATION_BODY" = "Mesajınız gönderilemedi."; +"SEND_FAILED_NOTIFICATION_BODY" = "İletiniz gönderilemedi."; /* Alert body after invite failed */ "SEND_INVITE_FAILURE" = "Davetiye gönderilemedi, lütfen daha sonra tekrar deneyin."; @@ -2136,7 +2136,7 @@ "SETTINGS_CLEAR_HISTORY" = "Sohbet Geçmişini Temizle"; /* No comment provided by engineer. */ -"SETTINGS_COPYRIGHT" = "Signal Mesajlaşma Uygulaması Telif Hakkı\nGPLv3'e göre lisanslıdır"; +"SETTINGS_COPYRIGHT" = "Signal İletişim Uygulaması Telif Hakkı\nGPLv3'e göre lisanslıdır"; /* No comment provided by engineer. */ "SETTINGS_DELETE_ACCOUNT_BUTTON" = "Hesabı Sil"; @@ -2145,7 +2145,7 @@ "SETTINGS_DELETE_DATA_BUTTON" = "Tüm Verileri Sil"; /* Alert message before user confirms clearing history */ -"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Tüm geçmişi silmek istediğinizden emin misiniz (mesajlar, eklentiler, aramalar, vb.)? Bu eylem geri alınamaz."; +"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Tüm geçmişi silmek istediğinizden emin misiniz (iletiler, eklentiler, aramalar, vb.)? Bu eylem geri alınamaz."; /* Confirmation text for button which deletes all message, calling, attachments, etc. */ "SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Her Şeyi Sil"; @@ -2166,7 +2166,7 @@ "SETTINGS_INVITE_TWITTER_TEXT" = "@signalapp kullanarak bana ulaşabilirsiniz. Hemen edinin: https://signal.org/download/"; /* Label for settings view that allows user to change the notification sound. */ -"SETTINGS_ITEM_NOTIFICATION_SOUND" = "Mesaj Sesi"; +"SETTINGS_ITEM_NOTIFICATION_SOUND" = "İleti Sesi"; /* table cell label */ "SETTINGS_LEGAL_TERMS_CELL" = "Şartlar ve Gizlilik İlkesi"; @@ -2184,7 +2184,7 @@ "SETTINGS_NAV_BAR_TITLE" = "Ayarlar"; /* table section footer */ -"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Telefonunuz kilitliyken Arama ve Mesaj bildirimleri görünebilir. Bu bildirimlerde neyin gösterildiğini sınırlamak isteyebilirsiniz."; +"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Telefonunuz kilitliyken Arama ve İleti bildirimleri görünebilir. Bu bildirimlerde neyin gösterildiğini sınırlamak isteyebilirsiniz."; /* table section header */ "SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Bildirim İçeriği"; @@ -2220,7 +2220,7 @@ "SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT" = "Ekran Kilidi Zaman Aşımı"; /* Footer for the 'screen lock' section of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Touch ID, Face ID, veya iOS cihaz şifrenizi kullanarak Signal'ın kilidini açın. Ekran Kilidi etkinken gelen aramaları cevaplayabilir ve mesaj bildirimleri alabilirsiniz. Signal'ın bildirim ayarları, görüntülenen bilgileri özelleştirmenizi sağlar."; +"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Touch ID, Face ID, veya iOS cihaz şifrenizi kullanarak Signal'in kilidini açın. Ekran Kilidi etkinken gelen aramaları cevaplayabilir ve ileti bildirimleri alabilirsiniz. Signal'in bildirim ayarları, görüntülenen bilgileri özelleştirmenizi sağlar."; /* Title for the 'screen lock' section of the privacy settings. */ "SETTINGS_SCREEN_LOCK_SECTION_TITLE" = "Ekran Kilidi"; @@ -2280,13 +2280,13 @@ "SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Göstergeleri Görüntüle"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Göndereninin gizli olduğu mesajlarda \"Daha Fazla Bilgi\" seçildiğinde durum ikonu göster."; +"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Göndereninin gizli olduğu iletilerde \"Daha Fazla Bilgi\" seçildiğinde durum ikonu göster."; /* switch label */ "SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS" = "Herkesden Al"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Kişileriniz arasında bulunmayan ve profilinizi paylaşmadığınız kişilerden göndereninin gizli olduğu mesajların alınmasını etkinleştir."; +"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Kişileriniz arasında bulunmayan ve profilinizi paylaşmadığınız kişilerden göndereninin gizli olduğu iletilerin alınmasını etkinleştir."; /* No comment provided by engineer. */ "SETTINGS_VERSION" = "Sürüm"; @@ -2295,7 +2295,7 @@ "SHARE_ACTION_MAIL" = "Posta"; /* action sheet item to open native messages app */ -"SHARE_ACTION_MESSAGE" = "Mesaj"; +"SHARE_ACTION_MESSAGE" = "İleti"; /* action sheet item */ "SHARE_ACTION_TWEET" = "Twitter"; @@ -2421,7 +2421,7 @@ "UNLINK_ACTION" = "Bağlantısını kaldır"; /* Alert message to confirm unlinking a device */ -"UNLINK_CONFIRMATION_ALERT_BODY" = "Bu cihazın bağlantısı kesildiğinde artık mesaj gönderemeyecek ve alamayacak."; +"UNLINK_CONFIRMATION_ALERT_BODY" = "Bu cihazın bağlantısı kesildiğinde artık ileti gönderemeyecek ve alamayacak."; /* Alert title for confirming device deletion */ "UNLINK_CONFIRMATION_ALERT_TITLE" = "\"%@\" bağlantısını kaldır?"; @@ -2475,7 +2475,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Bildirim Ayarlarını Gözden Geçirin"; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE" = "Güncellenmiş Çağrı ve Mesaj Sesleri"; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE" = "Güncellenmiş Çağrı ve İleti Sesleri"; /* button label shown one time, after user upgrades app */ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Profilinizi Ayarlayın"; @@ -2487,7 +2487,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Yakın Çekime Hazır Mısınız?"; /* Description of new profile feature for upgrading (existing) users */ -"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_DESCRIPTION" = "Artık mesajların okunduğunu görme ve paylaşma seçeneğine sahipsiniz."; +"UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_DESCRIPTION" = "Artık iletilerin okunduğunu görme ve paylaşma seçeneğine sahipsiniz."; /* button label shown one time, after upgrade */ "UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_PRIVACY_SETTINGS" = "Gizlilik ayarlarınızdan okundu iletilerini etkinleştirin."; @@ -2496,7 +2496,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE" = "Okundu İletileriyle Tanışın"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Artık mesajların yazıldığını görme ve paylaşma seçeneğine sahipsiniz."; +"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Artık iletilerin yazıldığını görme ve paylaşma seçeneğine sahipsiniz."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "'Yazıyor' Göstergeleriyle Tanışın"; @@ -2556,19 +2556,19 @@ "VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "İptal Etmek için Kaydır"; /* Filename for voice messages. */ -"VOICE_MESSAGE_FILE_NAME" = "Sesli Mesaj"; +"VOICE_MESSAGE_FILE_NAME" = "Sesli İleti"; /* Message for the alert indicating the 'voice message' needs to be held to be held down to record. */ -"VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE" = "Sesli mesaj kaydetmek için dokunun ve basılı tutun."; +"VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE" = "Sesli ileti kaydetmek için dokunun ve basılı tutun."; /* Title for the alert indicating the 'voice message' needs to be held to be held down to record. */ -"VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE" = "Sesli Mesaj"; +"VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE" = "Sesli İleti"; /* Activity indicator title, shown upon returning to the device manager, until you complete the provisioning process on desktop */ "WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Kurulumu Signal'in Masaüstü uygulamasından bitirin."; /* Info Message when you disable disappearing messages */ -"YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Kaybolan mesajları devre dışı bıraktınız."; +"YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Kaybolan iletileri devre dışı bıraktınız."; /* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */ -"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Kaybolan mesaj süresini %@ olarak ayarladınız."; +"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "Kaybolan ileti süresini %@ olarak ayarladınız."; From c5da7c67d591c51fb870c83c0a0e6193ce97ac64 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sun, 10 Mar 2019 11:33:14 -0700 Subject: [PATCH 231/493] "Bump build to 2.37.0.9." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index dd6e113e4..cbdba62f0 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.8 + 2.37.0.9 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 1b672ed3a..426269f8c 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.37.0 CFBundleVersion - 2.37.0.8 + 2.37.0.9 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From e2fd2c91732bd87bf4e559dfad789c27f7e2be36 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Mar 2019 09:47:49 -0700 Subject: [PATCH 232/493] CR: return immutable array --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index fa7265bde..4ebfde9c9 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -480,10 +480,10 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { if ([localNumber isEqual:account.recipientId]) { continue; } - [accounts addObject:account]; if (accounts.count >= 3) { - return accounts; + break; } + [accounts addObject:account]; } return [accounts copy]; From 60bfa7e85796af75e181abc90c1fd1b11e139697 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Mar 2019 11:24:51 -0700 Subject: [PATCH 233/493] Only fetch contacts if already authorized --- .../src/ViewControllers/Registration/OnboardingController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index 99a27d873..f844bcb3e 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -171,7 +171,7 @@ public class OnboardingController: NSObject { // We start the contact fetch/intersection now so that by the time // they get to HomeView we can show meaningful contact in the suggested // contact bubble. - contactsManager.requestSystemContactsOnce() + contactsManager.fetchSystemContactsOnceIfAlreadyAuthorized() if tsAccountManager.isReregistering() { showProfileView(fromView: view) From 1c78350f9ae859279eeaa662ed62eab7c265696e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 4 Mar 2019 15:07:51 -0700 Subject: [PATCH 234/493] Clear input bar UI earlier in send process for snappier send animation. --- .../ConversationViewController.m | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 022f6af4e..2cdb2cf1d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3528,14 +3528,6 @@ typedef enum : NSUInteger { } } -- (void)clearDraft -{ - __block TSThread *thread = _thread; - [self.editingDatabaseConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [thread setDraft:@"" transaction:transaction]; - }]; -} - #pragma mark Unread Badge - (void)updateBackButtonUnreadCount @@ -4084,7 +4076,12 @@ typedef enum : NSUInteger { - (void)sendButtonPressed { - [BenchManager startEventWithTitle:@"Send message" eventId:@"message-send"]; + [BenchManager startEventWithTitle:@"Send Message" eventId:@"message-send"]; + [BenchManager startEventWithTitle:@"Send Message milestone: clearTextMessageAnimated completed" + eventId:@"fromSendUntil_clearTextMessageAnimated"]; + [BenchManager startEventWithTitle:@"Send Message milestone: toggleDefaultKeyboard completed" + eventId:@"fromSendUntil_toggleDefaultKeyboard"]; + [self tryToSendTextMessage:self.inputToolbar.messageText updateKeyboardState:YES]; } @@ -4137,21 +4134,30 @@ typedef enum : NSUInteger { [self messageWasSent:message]; + // Clearing the text message is a key part of the send animation. + // It takes 10-15ms, but we do it inline rather than dispatch async + // since the send can't feel "complete" without it. + [BenchManager benchWithTitle:@"clearTextMessageAnimated" + block:^{ + [self.inputToolbar clearTextMessageAnimated:YES]; + }]; + [BenchManager completeEventWithEventId:@"fromSendUntil_clearTextMessageAnimated"]; + dispatch_async(dispatch_get_main_queue(), ^{ + // After sending we want to return from the numeric keyboard to the + // alphabetical one. Because this is so slow (40-50ms), we prefer it + // happens async, after any more essential send UI work is done. [BenchManager benchWithTitle:@"toggleDefaultKeyboard" block:^{ - if (updateKeyboardState) { - [self.inputToolbar toggleDefaultKeyboard]; - } - }]; - - [BenchManager benchWithTitle:@"clearTextMessageAnimated" - block:^{ - [self.inputToolbar clearTextMessageAnimated:YES]; + [self.inputToolbar toggleDefaultKeyboard]; }]; + [BenchManager completeEventWithEventId:@"fromSendUntil_toggleDefaultKeyboard"]; }); - [self clearDraft]; + [self.editingDatabaseConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [self.thread setDraft:@"" transaction:transaction]; + }]; + if (didAddToProfileWhitelist) { [self.conversationViewModel ensureDynamicInteractionsAndUpdateIfNecessary:YES]; } From b36a0061e18ef468bb409d0374c9aa3b87c4fe60 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 17:05:54 -0800 Subject: [PATCH 235/493] contact picker perf for contact with many phone numbers Only consider first n phone numbers for a contact. Some users have a "Spam" contact created by external apps which have thousands of known telemarkers/scammers phone numbers, this pathological case causes a slowdown in the presentation of the compose picker. --- SignalServiceKit/src/Contacts/Contact.m | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Contacts/Contact.m b/SignalServiceKit/src/Contacts/Contact.m index 046f96137..74d708798 100644 --- a/SignalServiceKit/src/Contacts/Contact.m +++ b/SignalServiceKit/src/Contacts/Contact.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "Contact.h" @@ -45,7 +45,16 @@ NS_ASSUME_NONNULL_BEGIN NSMutableArray *phoneNumbers = [NSMutableArray new]; NSMutableDictionary *phoneNumberNameMap = [NSMutableDictionary new]; - for (CNLabeledValue *phoneNumberField in cnContact.phoneNumbers) { + const NSUInteger kMaxPhoneNumbersConsidered = 50; + + NSArray *consideredPhoneNumbers; + if (cnContact.phoneNumbers.count <= kMaxPhoneNumbersConsidered) { + consideredPhoneNumbers = cnContact.phoneNumbers; + } else { + OWSLogInfo(@"For perf, only considering the first %lu phone numbers for contact with many numbers.", (unsigned long)kMaxPhoneNumbersConsidered); + consideredPhoneNumbers = [cnContact.phoneNumbers subarrayWithRange:NSMakeRange(0, kMaxPhoneNumbersConsidered)]; + } + for (CNLabeledValue *phoneNumberField in consideredPhoneNumbers) { if ([phoneNumberField.value isKindOfClass:[CNPhoneNumber class]]) { CNPhoneNumber *phoneNumber = (CNPhoneNumber *)phoneNumberField.value; [phoneNumbers addObject:phoneNumber.stringValue]; From 2a151dbf6d356cf8da2a70b7ab6a94cec3d48485 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Mar 2019 19:53:04 -0700 Subject: [PATCH 236/493] update settings key --- SignalServiceKit/src/Util/SSKPreferences.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/SSKPreferences.swift b/SignalServiceKit/src/Util/SSKPreferences.swift index 64c7e5795..2869610d8 100644 --- a/SignalServiceKit/src/Util/SSKPreferences.swift +++ b/SignalServiceKit/src/Util/SSKPreferences.swift @@ -44,7 +44,7 @@ public class SSKPreferences: NSObject { @objc public class func setHasSavedThread(value: Bool, transaction: YapDatabaseReadWriteTransaction) { transaction.setBool(value, - forKey: areLinkPreviewsEnabledKey, + forKey: hasSavedThreadKey, inCollection: collection) } From 3f6080765ab562be01b8adcec593ae5e76607189 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 23:01:34 -0400 Subject: [PATCH 237/493] "Bump build to 2.37.1.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index cbdba62f0..aef4381c2 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.37.0 + 2.37.1 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.0.9 + 2.37.1.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 426269f8c..54de6b176 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.37.0 + 2.37.1 CFBundleVersion - 2.37.0.9 + 2.37.1.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 97603e64cc8966f9468d3c95eb11567651610dfd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 5 Mar 2019 10:06:39 -0800 Subject: [PATCH 238/493] Deconflict "bottom view" layout and keyboard animations. --- .../ViewControllers/OWSViewController.m | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index b4d8a06ec..4019173e7 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -23,6 +23,7 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) @property (nonatomic, weak) UIView *bottomLayoutView; @property (nonatomic) NSLayoutConstraint *bottomLayoutConstraint; +@property (nonatomic) BOOL shouldAnimatedBottomLayout; @end @@ -64,6 +65,22 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) return self; } +#pragma mark - View Lifecycle + +- (void)viewDidAppear:(BOOL)animated +{ + [super viewDidAppear:animated]; + + self.shouldAnimatedBottomLayout = YES; +} + +- (void)viewDidDisappear:(BOOL)animated +{ + [super viewDidDisappear:animated]; + + self.shouldAnimatedBottomLayout = NO; +} + - (void)viewDidLoad { [super viewDidLoad]; @@ -73,6 +90,8 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) } } +#pragma mark - + - (void)autoPinViewToBottomOfViewControllerOrKeyboard:(UIView *)view avoidNotch:(BOOL)avoidNotch { OWSAssertDebug(view); @@ -185,11 +204,23 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) // bar. CGFloat offset = -MAX(0, (self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y)); - // There's no need to use: [UIView animateWithDuration:...]. - // Any layout changes made during these notifications are - // automatically animated. - self.bottomLayoutConstraint.constant = offset; - [self.bottomLayoutView.superview layoutIfNeeded]; + // UIKit by default animates all changes in response to keyboard events. + // We want to suppress those animations if the view isn't visible, + // otherwise presentation animations don't work properly. + dispatch_block_t updateLayout = ^{ + // There's no need to use: [UIView animateWithDuration:...]. + // Any layout changes made during these notifications are + // automatically animated. + self.bottomLayoutConstraint.constant = offset; + [self.bottomLayoutView.superview layoutIfNeeded]; + }; + + + if (self.shouldAnimatedBottomLayout) { + updateLayout(); + } else { + [UIView performWithoutAnimation:updateLayout]; + } } #pragma mark - Orientation From 53802d1a48bef63a05dbdfdd21e064087ff71276 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 5 Mar 2019 10:24:22 -0800 Subject: [PATCH 239/493] Deconflict "bottom view" layout and keyboard animations. --- SignalMessaging/ViewControllers/OWSViewController.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index 4019173e7..31350bd91 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -23,7 +23,7 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) @property (nonatomic, weak) UIView *bottomLayoutView; @property (nonatomic) NSLayoutConstraint *bottomLayoutConstraint; -@property (nonatomic) BOOL shouldAnimatedBottomLayout; +@property (nonatomic) BOOL shouldAnimateBottomLayout; @end @@ -71,14 +71,14 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) { [super viewDidAppear:animated]; - self.shouldAnimatedBottomLayout = YES; + self.shouldAnimateBottomLayout = YES; } - (void)viewDidDisappear:(BOOL)animated { [super viewDidDisappear:animated]; - self.shouldAnimatedBottomLayout = NO; + self.shouldAnimateBottomLayout = NO; } - (void)viewDidLoad @@ -216,7 +216,7 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) }; - if (self.shouldAnimatedBottomLayout) { + if (self.shouldAnimateBottomLayout) { updateLayout(); } else { [UIView performWithoutAnimation:updateLayout]; From d72c26796dba87438d72b980e3c67bb8c90f5c61 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 5 Mar 2019 10:31:20 -0800 Subject: [PATCH 240/493] Ensure onboarding views never reclaim layout space from dismissed keyboard. --- .../Registration/OnboardingBaseViewController.swift | 6 ++++++ SignalMessaging/ViewControllers/OWSViewController.h | 4 ++++ SignalMessaging/ViewControllers/OWSViewController.m | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift index a1594d3ec..6d59d0f9e 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingBaseViewController.swift @@ -73,6 +73,12 @@ public class OnboardingBaseViewController: OWSViewController { // MARK: - View Lifecycle + public override func viewDidLoad() { + super.viewDidLoad() + + self.shouldBottomViewReserveSpaceForKeyboard = true + } + public override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) diff --git a/SignalMessaging/ViewControllers/OWSViewController.h b/SignalMessaging/ViewControllers/OWSViewController.h index 6e0ed2c3c..71cb28ad2 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.h +++ b/SignalMessaging/ViewControllers/OWSViewController.h @@ -20,6 +20,10 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void); // BUT adjust its location upward if the keyboard appears. - (void)autoPinViewToBottomOfViewControllerOrKeyboard:(UIView *)view avoidNotch:(BOOL)avoidNotch; +// If YES, the bottom view never "reclaims" layout space if the keyboard is dismissed. +// Defaults to NO. +@property (nonatomic) BOOL shouldBottomViewReserveSpaceForKeyboard; + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index 31350bd91..5d756ee94 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -211,7 +211,11 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) // There's no need to use: [UIView animateWithDuration:...]. // Any layout changes made during these notifications are // automatically animated. - self.bottomLayoutConstraint.constant = offset; + if (self.shouldBottomViewReserveSpaceForKeyboard) { + self.bottomLayoutConstraint.constant = MIN(self.bottomLayoutConstraint.constant, offset); + } else { + self.bottomLayoutConstraint.constant = offset; + } [self.bottomLayoutView.superview layoutIfNeeded]; }; From 6e7c135348118c67a547b085639c451531407d9c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 5 Mar 2019 10:32:32 -0800 Subject: [PATCH 241/493] Ensure onboarding views never reclaim layout space from dismissed keyboard. --- SignalMessaging/ViewControllers/OWSViewController.m | 3 --- 1 file changed, 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index 5d756ee94..22e5bdc15 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -208,9 +208,6 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) // We want to suppress those animations if the view isn't visible, // otherwise presentation animations don't work properly. dispatch_block_t updateLayout = ^{ - // There's no need to use: [UIView animateWithDuration:...]. - // Any layout changes made during these notifications are - // automatically animated. if (self.shouldBottomViewReserveSpaceForKeyboard) { self.bottomLayoutConstraint.constant = MIN(self.bottomLayoutConstraint.constant, offset); } else { From 6fe3ce6d875a779a7ce82976a9f12e07d5fbf365 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 8 Mar 2019 10:33:36 -0500 Subject: [PATCH 242/493] Deconflict "bottom view" layout and keyboard animations. --- .../ConversationViewController.m | 18 +++++++++++++++--- .../ViewControllers/OWSViewController.m | 13 ++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 2cdb2cf1d..23391d999 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -214,6 +214,7 @@ typedef enum : NSUInteger { @property (nonatomic) BOOL isViewCompletelyAppeared; @property (nonatomic) BOOL isViewVisible; @property (nonatomic) BOOL shouldObserveVMUpdates; +@property (nonatomic) BOOL shouldAnimateKeyboardChanges; @property (nonatomic) BOOL viewHasEverAppeared; @property (nonatomic) BOOL hasUnreadMessages; @property (nonatomic) BOOL isPickingMediaAsDocument; @@ -1230,6 +1231,7 @@ typedef enum : NSUInteger { self.isViewCompletelyAppeared = YES; self.viewHasEverAppeared = YES; + self.shouldAnimateKeyboardChanges = YES; // HACK: Because the inputToolbar is the inputAccessoryView, we make some special considertations WRT it's firstResponder status. // @@ -1291,6 +1293,7 @@ typedef enum : NSUInteger { [super viewDidDisappear:animated]; self.userHasScrolled = NO; self.isViewVisible = NO; + self.shouldAnimateKeyboardChanges = NO; [self.audioAttachmentPlayer stop]; self.audioAttachmentPlayer = nil; @@ -3720,12 +3723,21 @@ typedef enum : NSUInteger { return; } CGRect keyboardEndFrame = [keyboardEndFrameValue CGRectValue]; + CGRect keyboardEndFrameConverted = [self.view convertRect:keyboardEndFrame fromView:nil]; UIEdgeInsets oldInsets = self.collectionView.contentInset; UIEdgeInsets newInsets = oldInsets; - // bottomLayoutGuide accounts for extra offset needed on iPhoneX - newInsets.bottom = keyboardEndFrame.size.height - self.bottomLayoutGuide.length; + // Use a content inset that so that the conversation content + // is not hidden behind the keyboard + input accessory. + // + // Make sure to leave space for the bottom layout guide (the notch). + // + // Always reserve room for the input accessory, which we display even + // if the keyboard is not active. + newInsets.bottom = MAX(0, + MAX(self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y, + self.inputToolbar.height)); BOOL wasScrolledToBottom = [self isScrolledToBottom]; @@ -3774,7 +3786,7 @@ typedef enum : NSUInteger { } }; - if (self.isViewCompletelyAppeared) { + if (self.shouldAnimateKeyboardChanges && CurrentAppContext().isAppForegroundAndActive) { adjustInsets(); } else { // Even though we are scrolling without explicitly animating, the notification seems to occur within the context diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index 22e5bdc15..daca2d68f 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -208,16 +208,19 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) // We want to suppress those animations if the view isn't visible, // otherwise presentation animations don't work properly. dispatch_block_t updateLayout = ^{ - if (self.shouldBottomViewReserveSpaceForKeyboard) { - self.bottomLayoutConstraint.constant = MIN(self.bottomLayoutConstraint.constant, offset); - } else { - self.bottomLayoutConstraint.constant = offset; + if (self.shouldBottomViewReserveSpaceForKeyboard && offset >= 0) { + // To avoid unnecessary animations / layout jitter, + // some views never reclaim layout space when the keyboard is dismissed. + // + // They _do_ need to relayout if the user switches keyboards. + return; } + self.bottomLayoutConstraint.constant = offset; [self.bottomLayoutView.superview layoutIfNeeded]; }; - if (self.shouldAnimateBottomLayout) { + if (self.shouldAnimateBottomLayout && CurrentAppContext().isAppForegroundAndActive) { updateLayout(); } else { [UIView performWithoutAnimation:updateLayout]; From ff08919206d11d6193fdce4036df83c0a9dab3d2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 23:25:13 -0400 Subject: [PATCH 243/493] Respond to CR. --- SignalMessaging/ViewControllers/OWSViewController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/OWSViewController.m b/SignalMessaging/ViewControllers/OWSViewController.m index daca2d68f..53d87d88f 100644 --- a/SignalMessaging/ViewControllers/OWSViewController.m +++ b/SignalMessaging/ViewControllers/OWSViewController.m @@ -204,9 +204,6 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) // bar. CGFloat offset = -MAX(0, (self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y)); - // UIKit by default animates all changes in response to keyboard events. - // We want to suppress those animations if the view isn't visible, - // otherwise presentation animations don't work properly. dispatch_block_t updateLayout = ^{ if (self.shouldBottomViewReserveSpaceForKeyboard && offset >= 0) { // To avoid unnecessary animations / layout jitter, @@ -223,6 +220,9 @@ UIInterfaceOrientationMask DefaultUIInterfaceOrientationMask(void) if (self.shouldAnimateBottomLayout && CurrentAppContext().isAppForegroundAndActive) { updateLayout(); } else { + // UIKit by default animates all changes in response to keyboard events. + // We want to suppress those animations if the view isn't visible, + // otherwise presentation animations don't work properly. [UIView performWithoutAnimation:updateLayout]; } } From 41a2a954f5e7f60a18c51b44e3201d3b5dd6441f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 10:53:54 -0400 Subject: [PATCH 244/493] Dismiss message actions UI on orientation change. --- .../ConversationView/ConversationViewController.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 23391d999..69015ab70 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4988,6 +4988,7 @@ typedef enum : NSUInteger { - (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem { OWSAssertIsOnMainThread(); + [[OWSWindowManager sharedManager] hideMenuActionsWindow]; } @@ -4996,8 +4997,12 @@ typedef enum : NSUInteger { - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { + OWSAssertIsOnMainThread(); + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + [[OWSWindowManager sharedManager] hideMenuActionsWindow]; + // Snapshot the "last visible row". NSIndexPath *_Nullable lastVisibleIndexPath = self.lastVisibleIndexPath; From 0a1947c961a15aee139d3296580e2b34f37092a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 10:55:26 -0400 Subject: [PATCH 245/493] Dismiss message actions UI on orientation change. --- .../ConversationView/ConversationViewController.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 69015ab70..74191822a 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -5001,6 +5001,10 @@ typedef enum : NSUInteger { [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + // The "message actions" window tries to pin the message + // in the content of this view. It's easier to dismiss the + // "message actions" window when the device changes orientation + // than to try to ensure this works in that case. [[OWSWindowManager sharedManager] hideMenuActionsWindow]; // Snapshot the "last visible row". From 0aebac0d07255b7b9bd963388b71b2ebb2173ec9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 11:50:29 -0400 Subject: [PATCH 246/493] Fix layout of the 'scroll down' button. --- .../ConversationViewController.m | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 74191822a..9059a8888 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2496,7 +2496,10 @@ typedef enum : NSUInteger { [self.scrollDownButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize]; [self.scrollDownButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize]; - self.scrollDownButtonButtomConstraint = [self.scrollDownButton autoPinEdgeToSuperviewMargin:ALEdgeBottom]; + // The "scroll down" button layout tracks the content inset of the collection view, + // so pin to the edge of the collection view. + self.scrollDownButtonButtomConstraint = + [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.collectionView]; [self.scrollDownButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; #ifdef DEBUG @@ -2510,6 +2513,13 @@ typedef enum : NSUInteger { [self.scrollUpButton autoPinToTopLayoutGuideOfViewController:self withInset:0]; [self.scrollUpButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; #endif + + [self updateScrollDownButtonLayout]; +} + +- (void)updateScrollDownButtonLayout +{ + self.scrollDownButtonButtomConstraint.constant = -1 * self.collectionView.contentInset.bottom; } - (void)setHasUnreadMessages:(BOOL)hasUnreadMessages @@ -3751,7 +3761,8 @@ typedef enum : NSUInteger { // does not fire a UIKeyboardFrameWillChange notification. In that case, the scroll // down button gets mostly obscured by the keyboard. // RADAR: #36297652 - self.scrollDownButtonButtomConstraint.constant = -1 * newInsets.bottom; + [self updateScrollDownButtonLayout]; + [self.scrollDownButton setNeedsLayout]; [self.scrollDownButton layoutIfNeeded]; // HACK: I've made the assumption that we are already in the context of an animation, in which case the @@ -5080,6 +5091,9 @@ typedef enum : NSUInteger { safeAreaInsets = self.view.safeAreaInsets; } [self.inputToolbar updateLayoutWithSafeAreaInsets:safeAreaInsets]; + + // Scroll button layout depends on input toolbar size. + [self updateScrollDownButtonLayout]; } #pragma mark - Conversation Snapshot From d84e0eead98bb69070bf3d4400349dd6e5da61a8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 10:44:46 -0400 Subject: [PATCH 247/493] Respond to TIOLI feedback from https://trello.com/c/ntO5hBbl/4161-prs-for-michael-to-review --- .../Interactions/OWSLinkPreview.swift | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 556505ccc..ec0a54ba6 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -531,11 +531,9 @@ public class OWSLinkPreview: MTLModel { private static var linkPreviewDraftCache: NSCache = NSCache() private class func cachedLinkPreview(forPreviewUrl previewUrl: String) -> OWSLinkPreviewDraft? { - var result: OWSLinkPreviewDraft? - serialQueue.sync { - result = linkPreviewDraftCache.object(forKey: previewUrl as NSString) + return serialQueue.sync { + return linkPreviewDraftCache.object(forKey: previewUrl as NSString) } - return result } private class func setCachedLinkPreview(_ linkPreviewDraft: OWSLinkPreviewDraft, @@ -561,7 +559,6 @@ public class OWSLinkPreview: MTLModel { } public class func tryToBuildPreviewInfo(previewUrl: String?) -> Promise { - guard OWSLinkPreview.featureEnabled else { return Promise(error: LinkPreviewError.featureDisabled) } @@ -578,14 +575,13 @@ public class OWSLinkPreview: MTLModel { return downloadLink(url: previewUrl) .then(on: DispatchQueue.global()) { (data) -> Promise in return parseLinkDataAndBuildDraft(linkData: data, linkUrlString: previewUrl) - .then(on: DispatchQueue.global()) { (linkPreviewDraft) -> Promise in - guard linkPreviewDraft.isValid() else { - return Promise(error: LinkPreviewError.noPreview) - } - setCachedLinkPreview(linkPreviewDraft, forPreviewUrl: previewUrl) - - return Promise.value(linkPreviewDraft) + }.then(on: DispatchQueue.global()) { (linkPreviewDraft) -> Promise in + guard linkPreviewDraft.isValid() else { + return Promise(error: LinkPreviewError.noPreview) } + setCachedLinkPreview(linkPreviewDraft, forPreviewUrl: previewUrl) + + return Promise.value(linkPreviewDraft) } } @@ -761,18 +757,18 @@ public class OWSLinkPreview: MTLModel { } return downloadImage(url: imageUrl, imageMimeType: imageMimeType) - .then(on: DispatchQueue.global()) { (imageData: Data) -> Promise in + .map(on: DispatchQueue.global()) { (imageData: Data) -> OWSLinkPreviewDraft in // We always recompress images to Jpeg. let imageFilePath = OWSFileSystem.temporaryFilePath(withFileExtension: "jpg") do { try imageData.write(to: NSURL.fileURL(withPath: imageFilePath), options: .atomicWrite) } catch let error as NSError { owsFailDebug("file write failed: \(imageFilePath), \(error)") - return Promise(error: LinkPreviewError.assertionFailure) + throw LinkPreviewError.assertionFailure } let linkPreviewDraft = OWSLinkPreviewDraft(urlString: linkUrlString, title: title, imageFilePath: imageFilePath) - return Promise.value(linkPreviewDraft) + return linkPreviewDraft } .recover(on: DispatchQueue.global()) { (_) -> Promise in return Promise.value(OWSLinkPreviewDraft(urlString: linkUrlString, title: title)) From 10383783e3beeda1c0d94c04452cb8a06a0de39a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 23:33:25 -0400 Subject: [PATCH 248/493] Respond to CR. --- SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index ec0a54ba6..9bb11b4de 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -577,7 +577,7 @@ public class OWSLinkPreview: MTLModel { return parseLinkDataAndBuildDraft(linkData: data, linkUrlString: previewUrl) }.then(on: DispatchQueue.global()) { (linkPreviewDraft) -> Promise in guard linkPreviewDraft.isValid() else { - return Promise(error: LinkPreviewError.noPreview) + throw LinkPreviewError.noPreview } setCachedLinkPreview(linkPreviewDraft, forPreviewUrl: previewUrl) From 6e492927d1a5742dcd98374febaa7bee349db4f2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 16:52:32 -0400 Subject: [PATCH 249/493] Prevent users from selecting additional images while processing images in the image picker. --- .../PhotoLibrary/ImagePickerController.swift | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift b/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift index c692952fc..54ac6aa07 100644 --- a/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift +++ b/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift @@ -380,19 +380,32 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat } func complete(withAssets assets: [PHAsset]) { - let attachmentPromises: [Promise] = assets.map({ - return photoCollectionContents.outgoingAttachment(for: $0) - }) - firstly { - when(fulfilled: attachmentPromises) - }.map { attachments in - Logger.debug("built all attachments") - self.didComplete(withAttachments: attachments) - }.catch { error in - Logger.error("failed to prepare attachments. error: \(error)") - OWSAlerts.showAlert(title: NSLocalizedString("IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS", comment: "alert title")) - }.retainUntilComplete() + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: false) { (modal) in + let attachmentPromises: [Promise] = assets.map({ + return self.photoCollectionContents.outgoingAttachment(for: $0) + }) + + firstly { + when(fulfilled: attachmentPromises) + }.map { attachments in + Logger.debug("built all attachments") + + DispatchQueue.main.async { + modal.dismiss(completion: { + self.didComplete(withAttachments: attachments) + }) + } + }.catch { error in + Logger.error("failed to prepare attachments. error: \(error)") + DispatchQueue.main.async { + modal.dismiss(completion: { + OWSAlerts.showAlert(title: NSLocalizedString("IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS", comment: "alert title")) + }) + } + }.retainUntilComplete() + } } private func didComplete(withAttachments attachments: [SignalAttachment]) { From 7a67a7b6b565af47536b21ad2c0979ff2999d25a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 16:52:58 -0400 Subject: [PATCH 250/493] Hide the status bar in the image picker / attachment approval. --- .../ConversationView/ConversationViewController.m | 4 +++- .../AttachmentApprovalViewController.swift | 11 +++++------ .../ViewControllers/OWSNavigationController.h | 7 ++++++- .../ViewControllers/OWSNavigationController.m | 8 ++++++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 9059a8888..ad2ecdf66 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2836,7 +2836,9 @@ typedef enum : NSUInteger { OWSImagePickerGridController *picker = [OWSImagePickerGridController new]; picker.delegate = self; - pickerModal = [[OWSNavigationController alloc] initWithRootViewController:picker]; + OWSNavigationController *modal = [[OWSNavigationController alloc] initWithRootViewController:picker]; + modal.ows_prefersStatusBarHidden = @(YES); + pickerModal = modal; } else { UIImagePickerController *picker = [OWSImagePickerController new]; picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 10fc300cb..66e9a6973 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -169,6 +169,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC let vc = AttachmentApprovalViewController(mode: .modal, attachments: attachments) vc.approvalDelegate = approvalDelegate let navController = OWSNavigationController(rootViewController: vc) + navController.ows_prefersStatusBarHidden = true guard let navigationBar = navController.navigationBar as? OWSNavigationBar else { owsFailDebug("navigationBar was nil or unexpected class") @@ -198,6 +199,10 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // MARK: - View Lifecycle + public override var prefersStatusBarHidden: Bool { + return true + } + override public func viewDidLoad() { super.viewDidLoad() @@ -229,8 +234,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC Logger.debug("") super.viewWillAppear(animated) - CurrentAppContext().setStatusBarHidden(true, animated: animated) - guard let navigationBar = navigationController?.navigationBar as? OWSNavigationBar else { owsFailDebug("navigationBar was nil or unexpected class") return @@ -251,10 +254,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC override public func viewWillDisappear(_ animated: Bool) { Logger.debug("") super.viewWillDisappear(animated) - - // Since this VC is being dismissed, the "show status bar" animation would feel like - // it's occuring on the presenting view controller - it's better not to animate at all. - CurrentAppContext().setStatusBarHidden(false, animated: false) } override public var inputAccessoryView: UIView? { diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.h b/SignalMessaging/ViewControllers/OWSNavigationController.h index 533a5b4d0..3cc656c8a 100644 --- a/SignalMessaging/ViewControllers/OWSNavigationController.h +++ b/SignalMessaging/ViewControllers/OWSNavigationController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN // unsaved changes. @interface OWSNavigationController : UINavigationController +// If set, this property lets us override prefersStatusBarHidden behavior. +// This is useful for supressing the status bar while a modal is presented, +// regardless of which view is currently visible. +@property (nonatomic, nullable) NSNumber *ows_prefersStatusBarHidden; + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m index 64fa3604b..b2e40a3a5 100644 --- a/SignalMessaging/ViewControllers/OWSNavigationController.m +++ b/SignalMessaging/ViewControllers/OWSNavigationController.m @@ -69,6 +69,14 @@ NS_ASSUME_NONNULL_BEGIN self.interactivePopGestureRecognizer.delegate = self; } +- (BOOL)prefersStatusBarHidden +{ + if (self.ows_prefersStatusBarHidden) { + return self.ows_prefersStatusBarHidden.boolValue; + } + return [super prefersStatusBarHidden]; +} + #pragma mark - UINavigationBarDelegate - (void)setupNavbar From e2d54d082efdb19c2e544627437ae78ea1f44587 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 17:02:09 -0400 Subject: [PATCH 251/493] Modify attachment approval back button to not have "back" text. --- .../ViewControllers/AttachmentApprovalViewController.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 66e9a6973..0ea34be8e 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -294,7 +294,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC cancelButton.tintColor = .white self.navigationItem.leftBarButtonItem = cancelButton } else { - self.navigationItem.leftBarButtonItem = nil + // Note: using a custom leftBarButtonItem breaks the interactive pop gesture. + self.navigationItem.leftBarButtonItem = self.createOWSBackButton() } } From 6f44167e5cd1df5fd63b9c9b19444c4099f13389 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Mar 2019 17:11:00 -0400 Subject: [PATCH 252/493] Tweak navigation bar button spacing. --- .../Views/ImageEditor/OWSViewController+ImageEditor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift index a7f50cf3e..4e91faa35 100644 --- a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift +++ b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift @@ -29,7 +29,7 @@ public extension UIViewController { return } - let spacing: CGFloat = 8 + let spacing: CGFloat = 16 let stackView = UIStackView(arrangedSubviews: navigationBarItems) stackView.axis = .horizontal stackView.spacing = spacing From eff929dd1a0f69a615cab147a21c41adc403fe90 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 10:41:00 -0400 Subject: [PATCH 253/493] Add border and shadow to image editor's palette view. --- .../Views/ImageEditor/ImageEditorPaletteView.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 2e7689604..0ba7170a6 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -100,7 +100,11 @@ public class ImageEditorPaletteView: UIView { // We use an invisible margin to expand the hot area of this control. let margin: CGFloat = 20 imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) - + imageView.layer.borderColor = UIColor.white.cgColor + imageView.layer.borderWidth = CGHairlineWidth() + imageView.layer.shadowColor = UIColor.black.cgColor + imageView.layer.shadowOpacity = 2.0 + imageView.layer.shadowOpacity = 0.33 selectionWrapper.layoutCallback = { [weak self] (view) in guard let strongSelf = self else { return From e9a4ae7addd157157b4ef26731b4f14aabf32a55 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:02:29 -0400 Subject: [PATCH 254/493] Fix image editor navigation bar button shadows. --- .../Views/ImageEditor/OWSViewController+ImageEditor.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift index 4e91faa35..9b233fd3f 100644 --- a/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift +++ b/SignalMessaging/Views/ImageEditor/OWSViewController+ImageEditor.swift @@ -15,6 +15,7 @@ public extension NSObject { button.layer.shadowColor = UIColor.black.cgColor button.layer.shadowRadius = 2 button.layer.shadowOpacity = 0.66 + button.layer.shadowOffset = .zero return button } } From 0a6ad365d4c9977b38903c82f2b1d3a501d349a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:03:26 -0400 Subject: [PATCH 255/493] Refine the image editor crop tool's gestures. --- .../ImageEditor/ImageEditorCropViewController.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index e3e2b0b0d..9113d8f20 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -368,14 +368,22 @@ class ImageEditorCropViewController: OWSViewController { let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) pinchGestureRecognizer.referenceView = self.clipView + // Use this VC as a delegate to ensure that pinches only + // receive touches that start inside of the cropped image bounds. pinchGestureRecognizer.delegate = self view.addGestureRecognizer(pinchGestureRecognizer) let panGestureRecognizer = ImageEditorPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:))) panGestureRecognizer.maximumNumberOfTouches = 1 panGestureRecognizer.referenceView = self.clipView - panGestureRecognizer.delegate = self + // _DO NOT_ use this VC as a delegate to filter touches; + // pan gestures can start outside the cropped image bounds. + // Otherwise the edges of the crop rect are difficult to + // "grab". view.addGestureRecognizer(panGestureRecognizer) + + // De-conflict the gestures; the pan gesture has priority. + panGestureRecognizer.shouldBeRequiredToFail(by: pinchGestureRecognizer) } override public var canBecomeFirstResponder: Bool { From 5aaa66792735b3a6c598cac0d7e98a457ab84cea Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:12:38 -0400 Subject: [PATCH 256/493] Modify the image editor's crop tool to render the cropped and uncropped content. --- .../ImageEditorCropViewController.swift | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 9113d8f20..2afb844b6 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -23,11 +23,13 @@ class ImageEditorCropViewController: OWSViewController { private var transform: ImageEditorTransform - public let contentView = OWSLayerView() - public let clipView = OWSLayerView() - private var imageLayer = CALayer() + public let croppedContentView = OWSLayerView() + public let uncroppedContentView = UIView() + + private var croppedImageLayer = CALayer() + private var uncroppedImageLayer = CALayer() private enum CropRegion { // The sides of the crop region. @@ -121,19 +123,32 @@ class ImageEditorCropViewController: OWSViewController { } wrapperView.addSubview(clipView) - imageLayer.contents = previewImage.cgImage - imageLayer.contentsScale = previewImage.scale - contentView.backgroundColor = .clear - contentView.isOpaque = false - contentView.layer.addSublayer(imageLayer) - contentView.layoutCallback = { [weak self] (_) in + croppedImageLayer.contents = previewImage.cgImage + croppedImageLayer.contentsScale = previewImage.scale + croppedContentView.backgroundColor = .clear + croppedContentView.isOpaque = false + croppedContentView.layer.addSublayer(croppedImageLayer) + croppedContentView.layoutCallback = { [weak self] (_) in guard let strongSelf = self else { return } strongSelf.updateContent() } - clipView.addSubview(contentView) - contentView.autoPinEdgesToSuperviewEdges() + clipView.addSubview(croppedContentView) + croppedContentView.autoPinEdgesToSuperviewEdges() + + uncroppedImageLayer.contents = previewImage.cgImage + uncroppedImageLayer.contentsScale = previewImage.scale + // The "uncropped" view/layer are used to display the + // content that has been cropped out. Its content + // should be semi-transparent to distinguish it from + // the content within the crop bounds. + uncroppedImageLayer.opacity = 0.5 + uncroppedContentView.backgroundColor = .clear + uncroppedContentView.isOpaque = false + uncroppedContentView.layer.addSublayer(uncroppedImageLayer) + wrapperView.addSubview(uncroppedContentView) + uncroppedContentView.autoPin(toEdgesOf: croppedContentView) // MARK: - Footer @@ -329,7 +344,7 @@ class ImageEditorCropViewController: OWSViewController { Logger.verbose("") - let viewSize = contentView.bounds.size + let viewSize = croppedContentView.bounds.size guard viewSize.width > 0, viewSize.height > 0 else { return @@ -354,13 +369,15 @@ class ImageEditorCropViewController: OWSViewController { } private func applyTransform() { - let viewSize = contentView.bounds.size - contentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) + let viewSize = croppedContentView.bounds.size + croppedContentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) + uncroppedContentView.layer.setAffineTransform(transform.affineTransform(viewSize: viewSize)) } private func updateImageLayer() { - let viewSize = contentView.bounds.size - ImageEditorCanvasView.updateImageLayer(imageLayer: imageLayer, viewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) + let viewSize = croppedContentView.bounds.size + ImageEditorCanvasView.updateImageLayer(imageLayer: croppedImageLayer, viewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) + ImageEditorCanvasView.updateImageLayer(imageLayer: uncroppedImageLayer, viewSize: viewSize, imageSize: model.srcImageSizePixels, transform: transform) } private func configureGestures() { From cea361705ea30e00a78efeb04fb568f68db6349a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:18:05 -0400 Subject: [PATCH 257/493] Update asset for "add more images to album" button. --- .../album_add_more.imageset/Contents.json | 6 +++--- .../album_add_more.imageset/add-photo-24@1x.png | Bin 262 -> 0 bytes .../album_add_more.imageset/add-photo-24@2x.png | Bin 392 -> 0 bytes .../album_add_more.imageset/add-photo-24@3x.png | Bin 549 -> 0 bytes .../create-album-outline-32@1x.png | Bin 0 -> 477 bytes .../create-album-outline-32@2x.png | Bin 0 -> 813 bytes .../create-album-outline-32@3x.png | Bin 0 -> 1208 bytes 7 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png delete mode 100644 Signal/Images.xcassets/album_add_more.imageset/add-photo-24@2x.png delete mode 100644 Signal/Images.xcassets/album_add_more.imageset/add-photo-24@3x.png create mode 100644 Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@1x.png create mode 100644 Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@2x.png create mode 100644 Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@3x.png diff --git a/Signal/Images.xcassets/album_add_more.imageset/Contents.json b/Signal/Images.xcassets/album_add_more.imageset/Contents.json index 3b4a85bc9..ae32da7a5 100644 --- a/Signal/Images.xcassets/album_add_more.imageset/Contents.json +++ b/Signal/Images.xcassets/album_add_more.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "add-photo-24@1x.png", + "filename" : "create-album-outline-32@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "add-photo-24@2x.png", + "filename" : "create-album-outline-32@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "add-photo-24@3x.png", + "filename" : "create-album-outline-32@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png deleted file mode 100644 index 1f653a075979628e27a0c9018bc16d772945f26f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px_Qq z7sn8f&a0t}d@Tw*w|n@%W`163Jmay`HD1=IezSF$qP?!2JFv=2*^oE&|54U26Fn|{ zYMXE*{Mb9j;$Iqv-}Zi};8RU{#>!`{5_EgkM87jXg|0CB&vA%fQkHolS(vXdzax87 z`W4Z`>ctuXm7m&0@8R53ksKw$1n{_}|EN_1qbLZd%*?5e0v0t(T zSRws4_Lm2S5TIo)O=s@{4B!IPi7qraQ5ScOwQkH$YF`^g#2Wy-j1Dl8g9+EQC!7T$ z78R(ekc}r;6OhZtT?i5T*ht4okTtM2c>uT%+i|)dB&artjfUT@Y*}dofS$43o{LT5 z#eOEfD4$INgycmLvv|_awQ2$~$&)07_^gP-1X!=oi*=xd3SI0%Rx9*k9S9-3$w6Z* z3eYT2rHBI3B4rs?K#k<%y<7T(xdtMjm60DIHY%~#g*cl&;yPpoTEhisv+I3;Be#~M z{;g}nXJC#rlC?e>q%-g&y$z84KTylRkGhWAs5b6GrPO+(^IJ%p|5*dlGmJJRGhneo mPdWLYdTm^QHZDLF0Qdk3yfx@OB4IHA0000y95KI&fr0V5 zr;B4q#hkZu8gmaT2)Mpq#Wz9FD#$#;Y_+?m*-JGSzsFh|E$wC`CI9eunrLw7;nN(x zM=o=VopSD-QGUY5%BaEN;K;zm6d=&h#30flA$)XY#|cjtz2ws7RGI59EB6?t>a7U1 z4Bokft12>UMb_une9!0TX)*7KZV$3vHFFOCJo8KjkSQBF6+&(GwfLP19amX(ocR9u zYsHyQ3--@BI9*spJyPkg4!>m0Td(PJ3PpvVOx)}>sbfy<*Us82su~LFo|l5{BPWJW zUBF=(ILYQO%k6eA(yeVco89QBfc8w3l&bQH%-RP8IJsx@!ib5!m2C6ErpD`-)gF>z18qFXsYU) z!x=2_^iNXSCBrFvzjgHuU&o}e2y%5b0X@&MK*8Z!nLFP~<20Y&LdLSnz>sOUtG98+ z>4RSPwx!59UbnsHa`p^sZO|p{ll#S2C)RFxy0c<38zks}x)0=aCh?foY(2{X4NkC$ zI@exZPFwZs;hf(SrwU&AmG$51@Rp00i_>zopr03j#U>;M1& diff --git a/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@1x.png b/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d23c007d13f7c74ecb487527c2e2ffa568ca4936 GIT binary patch literal 477 zcmV<30V4j1P)ff2ev!v^UF zjF3*Co;W#YED;<+6MB7jCUN}r{3OeQm>F~8Vb;~}fdIq=X#ubSaFFH^r3J79Pqy1jxp66hFrd_W1)v^j zie7V^n1G0+vS;Rsh-C54NJd}6Jgfjby5>j}ke^!L!_Hql=?0pkPz8)R`Uo6-!JBXd z5!rbgf4dY1#>noWQB!pI`;kzbRh(Cyc6tJ1(Geh`a#jM&d@!vOU@>$F$JVRxB%+fB zX0FWyDK5l;+BwT!sCA1oHUzgSd>gC)fM-X6cK~mC&T}^1DKnTrDr+QrlO=hAy9`8y z`7$AaZ^>kcXl;5 zT?XUja#s*=Ga{3g2M|%Ak!z{W*%xHw9_hQx@^V6lb!-kd+}<=Ro&*2<&nbW(iTSP3 Tbda`p00000NkvXXu0mjfzh=!U literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@2x.png b/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9ccabb7c69fce53efb9b3b2cb0d4a6d58bbf66a5 GIT binary patch literal 813 zcmV+|1JeA7P)h5!$HpY63(cTNF-&KQ-utRcXi9CHn| zTZlozkdpxa>6=fUhvjb$hn*3lbIR^g5|lzXwiSktMtR4MmpCyduMSEf96X2yH%9qr zbbNQKLu?}?XW6sa9ueJ>|L)a)XVOOQeCgHU$=QvF@zud%g`coFxo~H)%r(BU+PH_+ zK`9al@Z-J+=RMn#SBEJtL%q0uC!&L@u`r0ptzaL*ir0`u*S-xF=e)pHT(49qV+sM! z;yOIJEDt$xKZmTjb_C2l+h2kt+p0ehX#^W74lQ r?axuAsSJ$(rKt>!fC6k-4gl~E>TFL#pFtBG00000NkvXXu0mjfl8j{` literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@3x.png b/Signal/Images.xcassets/album_add_more.imageset/create-album-outline-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b13aa24b3e1399da20c58955939905ac51468983 GIT binary patch literal 1208 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJ<{->y95KI&fq^B< z)5S5QV$R#S7YlD2@U%6?-Ji@miT4%nth@=luY3ghC*(}Z7W zfB6YIOjOczT=wzq!`4Z;LH3+NTUZnY8y6lI-~DaZ42DyfsAlcY&m9%a4DPQ#&7HgE z{OW*aU4}OuFU+ltMD>L93>kK?G_W(=*u6gc2;V;6=}WJxr!5u#zilJ;ee>(vq*uOu z#l&!6a=^o|T;14ascBm!+dK3bK1`P7`24K>YfwSn=i4WC-4VRVt*yJX=)C=}b5pzH?AqKr`Wq23F^e1`QmI4|)XdLG>&*!A2tOd;~XU!Gr1_irz?T2Ef){YTGDl4@l6hn zIpR^P4aoL*CE9#;4=Y(Ftye+pfUp@MM zOM2F8HgOG8mK$8pJ#LGHHcxBqQs`}IE?Jji`hQZ)#!39sub8-O`REuuom;-bZKY;| z$iuuy&)FV<8?PuzPX4Fq?@}FhLoLXCvX#o=cU>zSG}OEfvIHChqh-q&{{H=AUgmcD z%k9};{vVs7oZu;)T|D9Hy|fqsr98ojR%*Ju;_YV{(c|BR^@IOj3E_!GOq)A zg+;pV+@3-QmaA637me3_=~=P;v!~0Ajguu7CO>0%nfamG#pcPfc#lk{4^_`dSq@f z3NFuWxf1()!X}+5nns$-&9pVv^n^@Qe|e{kCBo;NMf;R3Tcp>Rw&q{odqGVzW9r0^ znF$t?)?Ycf|AFGA&zh<$e=dJNk&9bfEj8-Bn(1Ahr*q?exUQdPSw6`;>-R!Sv-*;? zcP>`j3weKE^sMq?{}QjI_k>Pq-CmWN>YvUkykqgghqsz!)#~dV7ILiJ=eqdRYd-av z%uX)%l#8e7|CtlY(44$|sYWsrCdy!9_|MQZLF Date: Tue, 12 Mar 2019 11:24:19 -0400 Subject: [PATCH 258/493] Remove cancel button from attachment caption view. --- .../AttachmentCaptionViewController.swift | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index c54a8e31c..7b57106b6 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -75,11 +75,6 @@ class AttachmentCaptionViewController: OWSViewController { configureTextView() - let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, - target: self, - action: #selector(didTapCancel)) - cancelButton.tintColor = .white - navigationItem.leftBarButtonItem = cancelButton let doneIcon = UIImage(named: "image_editor_checkmark_full")?.withRenderingMode(.alwaysTemplate) let doneButton = UIBarButtonItem(image: doneIcon, style: .plain, target: self, @@ -96,7 +91,6 @@ class AttachmentCaptionViewController: OWSViewController { stackView.axis = .vertical stackView.spacing = 20 stackView.alignment = .fill - stackView.addBackgroundView(withBackgroundColor: UIColor(white: 0, alpha: 0.5)) stackView.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20) stackView.isLayoutMarginsRelativeArrangement = true self.view.addSubview(stackView) @@ -104,6 +98,15 @@ class AttachmentCaptionViewController: OWSViewController { stackView.autoPinEdge(toSuperviewEdge: .trailing) self.autoPinView(toBottomOfViewControllerOrKeyboard: stackView, avoidNotch: true) + let backgroundView = UIView() + backgroundView.backgroundColor = UIColor(white: 0, alpha: 0.5) + view.addSubview(backgroundView) + view.sendSubview(toBack: backgroundView) + backgroundView.autoPinEdge(toSuperviewEdge: .leading) + backgroundView.autoPinEdge(toSuperviewEdge: .trailing) + backgroundView.autoPinEdge(toSuperviewEdge: .bottom) + backgroundView.autoPinEdge(.top, to: .top, of: stackView) + let minTextHeight: CGFloat = textView.font?.lineHeight ?? 0 textViewHeightConstraint = textView.autoSetDimension(.height, toSize: minTextHeight) From c77835926d623030ab82cee2997dcac87e4529fb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:41:04 -0400 Subject: [PATCH 259/493] Tap to create new text item. --- SignalMessaging/Views/ImageEditor/ImageEditorView.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index c0e490931..5bba4bc0f 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -138,6 +138,12 @@ public class ImageEditorView: UIView { @objc func didTapNewText(sender: UIButton) { Logger.verbose("") + createNewTextItem() + } + + private func createNewTextItem() { + Logger.verbose("") + let viewSize = canvasView.gestureReferenceView.bounds.size let imageSize = model.srcImageSizePixels let imageFrame = ImageEditorCanvasView.imageFrame(forViewSize: viewSize, imageSize: imageSize, @@ -178,6 +184,8 @@ public class ImageEditorView: UIView { let location = gestureRecognizer.location(in: canvasView.gestureReferenceView) guard let textLayer = self.textLayer(forLocation: location) else { + // If there is no text item under the "tap", start a new one. + createNewTextItem() return } From 9e636b0fc91797edd42390d5d1a91755f8bfcdd9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 11:46:12 -0400 Subject: [PATCH 260/493] Hide controls during stroke. --- .../ImageEditorBrushViewController.swift | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 63a7590a7..af56c8db1 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -84,11 +84,18 @@ public class ImageEditorBrushViewController: OWSViewController { self.view.layoutSubviews() } - public func updateNavigationBar() { + private func updateNavigationBar() { + // Hide controls during stroke. + let hasStroke = currentStroke != nil + guard !hasStroke else { + updateNavigationBar(navigationBarItems: []) + return + } + let undoButton = navigationBarButton(imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", - selector: #selector(didTapDone(sender:))) + selector: #selector(didTapDone(sender:))) // Prevent users from undo any changes made before entering the view. let canUndo = model.canUndo() && firstUndoOperationId != model.currentUndoOperationId() @@ -101,6 +108,12 @@ public class ImageEditorBrushViewController: OWSViewController { updateNavigationBar(navigationBarItems: navigationBarItems) } + private func updateControls() { + // Hide controls during stroke. + let hasStroke = currentStroke != nil + paletteView.isHidden = hasStroke + } + // MARK: - Actions @objc func didTapUndo(sender: UIButton) { @@ -129,7 +142,12 @@ public class ImageEditorBrushViewController: OWSViewController { // MARK: - Brush // These properties are non-empty while drawing a stroke. - private var currentStroke: ImageEditorStrokeItem? + private var currentStroke: ImageEditorStrokeItem? { + didSet { + updateControls() + updateNavigationBar() + } + } private var currentStrokeSamples = [ImageEditorStrokeItem.StrokeSample]() @objc From e63b1169a3eecbb912373e3be09ce49dcb155635 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 12:19:09 -0400 Subject: [PATCH 261/493] Hide controls while moving text items. --- .../AttachmentApprovalViewController.swift | 57 +++++++++++++++++-- .../Views/ImageEditor/ImageEditorView.swift | 34 ++++++++--- 2 files changed, 78 insertions(+), 13 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 0ea34be8e..784828584 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -241,6 +241,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC navigationBar.overrideTheme(type: .clear) updateNavigationBar() + updateControlVisibility() } override public func viewDidAppear(_ animated: Bool) { @@ -249,6 +250,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC super.viewDidAppear(animated) updateNavigationBar() + updateControlVisibility() } override public func viewWillDisappear(_ animated: Bool) { @@ -262,12 +264,18 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } override public var canBecomeFirstResponder: Bool { - return true + return !shouldHideControls } // MARK: - Navigation Bar public func updateNavigationBar() { + guard !shouldHideControls else { + self.navigationItem.leftBarButtonItem = nil + self.navigationItem.rightBarButtonItem = nil + return + } + var navigationBarItems = [UIView]() var isShowingCaptionView = false @@ -299,6 +307,27 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } } + // MARK: - Control Visibility + + public var shouldHideControls: Bool { + guard let pageViewController = pageViewControllers.first else { + return false + } + return pageViewController.shouldHideControls + } + + private func updateControlVisibility() { + if shouldHideControls { + if isFirstResponder { + resignFirstResponder() + } + } else { + if !isFirstResponder { + becomeFirstResponder() + } + } + } + // MARK: - View Helpers func remove(attachmentItem: SignalAttachmentItem) { @@ -376,6 +405,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } updateNavigationBar() + updateControlVisibility() } // MARK: - UIPageViewControllerDataSource @@ -622,7 +652,11 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate } func prepViewControllerUpdateNavigationBar() { - self.updateNavigationBar() + updateNavigationBar() + } + + func prepViewControllerUpdateControls() { + updateControlVisibility() } func prepViewControllerAttachmentCount() -> Int { @@ -682,6 +716,8 @@ protocol AttachmentPrepViewControllerDelegate: class { func prepViewControllerUpdateNavigationBar() + func prepViewControllerUpdateControls() + func prepViewControllerAttachmentCount() -> Int } @@ -712,9 +748,17 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD fileprivate var isShowingCaptionView = false { didSet { prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() } } + public var shouldHideControls: Bool { + guard let imageEditorView = imageEditorView else { + return false + } + return imageEditorView.shouldHideControls + } + // MARK: - Initializers init(attachmentItem: SignalAttachmentItem) { @@ -794,8 +838,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD view.addSubview(imageEditorView) imageEditorView.autoPinEdgesToSuperviewEdges() - imageEditorView.addControls(to: imageEditorView, - viewController: self) + imageEditorUpdateNavigationBar() } } #endif @@ -872,6 +915,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD super.viewWillAppear(animated) prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() } override public func viewDidAppear(_ animated: Bool) { @@ -880,6 +924,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD super.viewDidAppear(animated) prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() } override public func viewWillLayoutSubviews() { @@ -1208,6 +1253,10 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { public func imageEditorUpdateNavigationBar() { prepDelegate?.prepViewControllerUpdateNavigationBar() } + + public func imageEditorUpdateControls() { + prepDelegate?.prepViewControllerUpdateControls() + } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 5bba4bc0f..3acac8e1c 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -9,6 +9,7 @@ public protocol ImageEditorViewDelegate: class { func imageEditor(presentFullScreenView viewController: UIViewController, isTransparent: Bool) func imageEditorUpdateNavigationBar() + func imageEditorUpdateControls() } // MARK: - @@ -81,16 +82,17 @@ public class ImageEditorView: UIView { return true } - // TODO: Should this method be private? - @objc - public func addControls(to containerView: UIView, - viewController: UIViewController) { + // MARK: - Navigation Bar + + private func updateNavigationBar() { delegate?.imageEditorUpdateNavigationBar() } - // MARK: - Navigation Bar - public func navigationBarItems() -> [UIView] { + guard !shouldHideControls else { + return [] + } + let undoButton = navigationBarButton(imageName: "image_editor_undo", selector: #selector(didTapUndo(sender:))) let brushButton = navigationBarButton(imageName: "image_editor_brush", @@ -110,6 +112,15 @@ public class ImageEditorView: UIView { return buttons } + private func updateControls() { + delegate?.imageEditorUpdateControls() + } + + public var shouldHideControls: Bool { + // Hide controls during "text item move". + return movingTextItem != nil + } + // MARK: - Actions @objc func didTapUndo(sender: UIButton) { @@ -271,7 +282,12 @@ public class ImageEditorView: UIView { // MARK: - Editor Gesture // These properties are valid while moving a text item. - private var movingTextItem: ImageEditorTextItem? + private var movingTextItem: ImageEditorTextItem? { + didSet { + updateNavigationBar() + updateControls() + } + } private var movingTextStartUnitCenter: CGPoint? private var movingTextHasMoved = false @@ -487,11 +503,11 @@ extension ImageEditorView: ImageEditorModelObserver { public func imageEditorModelDidChange(before: ImageEditorContents, after: ImageEditorContents) { - delegate?.imageEditorUpdateNavigationBar() + updateNavigationBar() } public func imageEditorModelDidChange(changedItemIds: [String]) { - delegate?.imageEditorUpdateNavigationBar() + updateNavigationBar() } } From dd16986d79909efcb5db42a6127ff5b0753c12d8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 12:25:13 -0400 Subject: [PATCH 262/493] Avoid layout changes due to selection changes in media rail. --- SignalMessaging/Views/GalleryRailView.swift | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index 2e52f9e06..66690ab2a 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -64,14 +64,17 @@ public class GalleryRailCellView: UIView { private(set) var isSelected: Bool = false func setIsSelected(_ isSelected: Bool) { + let borderWidth: CGFloat = 2 self.isSelected = isSelected + + // Reserve space for the selection border whether or not the cell is selected. + layoutMargins = UIEdgeInsets(top: 0, left: borderWidth, bottom: 0, right: borderWidth) + if isSelected { - layoutMargins = UIEdgeInsets(top: 0, left: 2, bottom: 0, right: 2) imageView.layer.borderColor = Theme.galleryHighlightColor.cgColor - imageView.layer.borderWidth = 2 - imageView.layer.cornerRadius = 2 + imageView.layer.borderWidth = borderWidth + imageView.layer.cornerRadius = borderWidth } else { - layoutMargins = .zero imageView.layer.borderWidth = 0 imageView.layer.cornerRadius = 0 } From 7521b3a145bb599eb81c1cbf988da26bc567039d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 12:46:24 -0400 Subject: [PATCH 263/493] Update "attachment has caption" indicator. --- .../image_editor_caption.imageset/Contents.json | 6 +++--- .../add-caption-32@1x.png | Bin 326 -> 0 bytes .../add-caption-32@2x.png | Bin 559 -> 0 bytes .../add-caption-32@3x.png | Bin 866 -> 0 bytes .../caption-24@1x.png | Bin 0 -> 153 bytes .../caption-24@2x.png | Bin 0 -> 190 bytes .../caption-24@3x.png | Bin 0 -> 297 bytes .../AttachmentApprovalViewController.swift | 7 ++++--- .../AttachmentCaptionViewController.swift | 2 +- .../ImageEditor/ImageEditorPaletteView.swift | 3 ++- 10 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json index 22defce50..80c4669a0 100644 --- a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json +++ b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "add-caption-32@1x.png", + "filename" : "caption-24@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "add-caption-32@2x.png", + "filename" : "caption-24@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "add-caption-32@3x.png", + "filename" : "caption-24@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png deleted file mode 100644 index 2d1325e014eecf410f1d981026df1a85d07607f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1FMR zi(^Pc>)UA$d7B(~TK7x+Kg^M{K-pqe-T{uj2OND3(guet9eI~YJZRCdv=FNB{J+Kh z_qy*pR-H4!?nAY%;sK`+^w|cR!ECpp6guM%u8S1 z@14pf$XVsOYE{KKMWzEsKl?PqF|DflHb*#NH>bV3f>NZh!ETPwts^$?fdBV}+)3w=0nR-&rsm)XTV>ZcE-YXesK)4@61>=R4 WEb`8ktgnG#z~JfX=d#Wzp$P!D(}NrU diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png deleted file mode 100644 index ba403c8b3fc8b64806371d50524e5d886ef121b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km-ofr0U% zr;B4q#hka%7jq982-L3o6>pZ|c7mhl0Ec8_phTmf5tFh3Q;vgrL8{;t<@DJuSuZD+ z`)^9Io%`T!x3K(2!K9vqW74JH@*1QcuzTuvO>4AKm`4QvO} zEq|@FV76eiV0w|<(|$63p4UV7WDm32jGBoPx0p>XIz6$R@%rl8%7stzl{52-El&pi zH575mXiNR7_(GqddgBwF2W8%6l50=41P3Oc6D|CD{Is3wzEek|Bs^~~2+Xp(vPIKL zWxt&I{BGl{BR5(~_4ImgneC9&UAnewL-*SSmeWtmX0dHanz!zstE@f qy95KI&fq_}X z)5S5QV$R#S7YlDW2(*1Ss^phFBHI!oF#Um00lTK+%LB44LP1Tjjvnk~>;VVU^e%bl zeZS!4@yGFdy|KBRpHS1^lBk~!-a(;?7WWLlMQAYaur@4YFc4vAV>%GPAi>4p%$R^8 zxMzO$cg>}1J8U{U{_Qr@E~%aG^Zx(Id_haA^*Y~WU7jpoC3ohM=9BZxdYMX_gePAA z6Vki&&%AQ+yjz&eslNM2-L0Ev-tdCp)KY* zS#Nzdoo&2-Wm|Og>-8_b`N{lKd+u6vVCLt4N5h%6-+I>3`Ete9Qy2HIUweN7OTJ2r zyQ2ns$hp5i=hQD>b*=SsSC(5mLGjQ zIkI_*p=RPNo&8d!`GW`x_OQNu zQF!OK5|hXdM@G%17xtLVJhp%#wAOU4ip&4G3pW>7RXHl%pZ%!BL_#eQdwi{)+cz(J zS4E};G%AJ9GA@5)7xA9&z_sOzPtVvh(^O`Wd6xZjQI|Z`ld;^-m7chUzHcu(A1nZg z_eD%+(r4E)@(1;|cFuGUX($hWa_-BPZgFn?G`4B0cTQM6W%bMXEB35AYh7ccz5V!P z;Xm68429QsO}-wn>5Q4+&sRs1XHH6u(vLp2sP_N1=Iy>~H|9L$n5GfEv+dB@;~9lZ z1Y_0~WS3^l$xi>o=q=vgyY#x`lmn0M#_q2B_|A#t^!4})X}@g~|1}&o`O$nX!9tn~ hdq5$l)Xt7SjO@lPMcrQ|#DSTH!PC{xWt~$(69E1JZeIWZ diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..5d651236768083334bf6ccb785a39e82294035c4 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0prE&> zi(`mK=iAAKTnq|4%)%cZ@3Zlfb#Y;LJ$UDeW7XkMuS1@fF1{7BQ9NNd;ZBv`q#GOz xQ{G)=`@_G?;?tCVW%nbgjmrHS9&BQ8U~QWvxxr|$?PZ{`44$rjF6*2UngE>_GK2sC literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c444e83a99a0a984d6949d80443e13be7bcbe588 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36fE#` zaSX|5e0$B1tHD5k^$ XpOFZkBlp=GXg7nWtDnm{r-UW|Bq&9U literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..740abdfffba21be0280854b96d43cbfb764a47a8 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KHND0th` z#WAE}&fA-gTug=n3| zg#ZB!4iPl&yUWk_evj{!I&b+q_aa{wQ0bux_O)B(^0n(ve*}6O;1S)JpLJ? Q1oS3@r>mdKI;Vst0JFkk=Kufz literal 0 HcmV?d00001 diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 784828584..40e681eda 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1460,7 +1460,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { // Add shadow in case overlayed on white content lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + lengthLimitLabel.layer.shadowOffset = .zero lengthLimitLabel.layer.shadowOpacity = 0.8 lengthLimitLabel.isHidden = true @@ -1694,6 +1694,7 @@ public class ApprovalRailCellView: GalleryRailCellView { imageView.layer.shadowColor = UIColor.black.cgColor imageView.layer.shadowRadius = 2 imageView.layer.shadowOpacity = 0.66 + imageView.layer.shadowOffset = .zero return imageView }() @@ -1725,8 +1726,8 @@ public class ApprovalRailCellView: GalleryRailCellView { if hasCaption { addSubview(captionIndicator) - captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 0) - captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 4) + captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 2) + captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 6) } else { captionIndicator.removeFromSuperview() } diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index 7b57106b6..e33fe9363 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -177,7 +177,7 @@ class AttachmentCaptionViewController: OWSViewController { // Add shadow in case overlayed on white content lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + lengthLimitLabel.layer.shadowOffset = .zero lengthLimitLabel.layer.shadowOpacity = 0.8 lengthLimitLabel.isHidden = true diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 0ba7170a6..e1c78ff24 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -103,8 +103,9 @@ public class ImageEditorPaletteView: UIView { imageView.layer.borderColor = UIColor.white.cgColor imageView.layer.borderWidth = CGHairlineWidth() imageView.layer.shadowColor = UIColor.black.cgColor - imageView.layer.shadowOpacity = 2.0 + imageView.layer.shadowRadius = 2.0 imageView.layer.shadowOpacity = 0.33 + imageView.layer.shadowOffset = .zero selectionWrapper.layoutCallback = { [weak self] (view) in guard let strongSelf = self else { return From 2f7880af8e70163f9a3aafe0a1d588178eccefda Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 13:17:49 -0400 Subject: [PATCH 264/493] Fix hit testing of text layers. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index dbe3448a3..dba18ef70 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -642,10 +642,24 @@ public class ImageEditorCanvasView: UIView { guard let sublayers = contentView.layer.sublayers else { return nil } + + // First we build a map of all text layers. + var layerMap = [String: EditorTextLayer]() for layer in sublayers { guard let textLayer = layer as? EditorTextLayer else { continue } + layerMap[textLayer.itemId] = textLayer + } + + // The layer ordering in the model is authoritative. + // Iterate over the layers in _reverse_ order of which they appear + // in the model, so that layers "on top" are hit first. + for item in model.items().reversed() { + guard let textLayer = layerMap[item.itemId] else { + // Not a text layer. + continue + } if textLayer.hitTest(point) != nil { return textLayer } From 66efcb4639b75440cf84ca5d4994db232f8f4355 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 13:27:35 -0400 Subject: [PATCH 265/493] Update rail icons. --- .../x-24.imageset/Contents.json | 23 ++++++++++++++++++ .../Images.xcassets/x-24.imageset/x-24@1x.png | Bin 0 -> 243 bytes .../Images.xcassets/x-24.imageset/x-24@2x.png | Bin 0 -> 398 bytes .../Images.xcassets/x-24.imageset/x-24@3x.png | Bin 0 -> 573 bytes .../AttachmentApprovalViewController.swift | 20 ++++++++------- SignalMessaging/Views/GalleryRailView.swift | 9 ++++--- 6 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 Signal/Images.xcassets/x-24.imageset/Contents.json create mode 100644 Signal/Images.xcassets/x-24.imageset/x-24@1x.png create mode 100644 Signal/Images.xcassets/x-24.imageset/x-24@2x.png create mode 100644 Signal/Images.xcassets/x-24.imageset/x-24@3x.png diff --git a/Signal/Images.xcassets/x-24.imageset/Contents.json b/Signal/Images.xcassets/x-24.imageset/Contents.json new file mode 100644 index 000000000..1f25af162 --- /dev/null +++ b/Signal/Images.xcassets/x-24.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "x-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "x-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "x-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/x-24.imageset/x-24@1x.png b/Signal/Images.xcassets/x-24.imageset/x-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6d0b887443c3733f4bf3dc008a1adce365639a GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px{zZ z7sn8f&bOhtTn!35wXa#^ZYq~4CkHIZJIgEcH&fxt=UR_fi>^r-z4j>muhP(=B`A6@ zMkG5zJ7N#}d4>Zlbry_M>dr}>*=zbIi2c0g0`*-^VY4WGsShchAuJR{iW<~ m>yER_Cs;lH?|)y9K|JM*R^O4Q$E1M{X7F_Nb6Mw<&;$VBSYMt1 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/x-24.imageset/x-24@2x.png b/Signal/Images.xcassets/x-24.imageset/x-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ea502285caf8531820a4cffebcb866af3b2bc408 GIT binary patch literal 398 zcmV;90df9`P)bfi!V8w;*bPFyWC? z5LS4a@X95KOM1<-BQz4(0Pjyx5J(e{|41VdCQu`pAP^>?!>~qrny{|9Xltai361lc z#Wm8|1hkG41kePe2n@fZ6psG(6RI>m#!qZC{{F*g=!qfnTLRL&#bj$Gc`3=U%j$ibvB^93G-~AMAJcc sIWaMN0f1J`aZ=wK!$5Bg16@HxZh($ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/x-24.imageset/x-24@3x.png b/Signal/Images.xcassets/x-24.imageset/x-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb9bb263d56a3b51b69b48ace2bb48ad7eb0b3a GIT binary patch literal 573 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fr0V8 zr;B4q#hkZu8aodg2(X05J6in|3!3Hasj2z!^2zcA?g#mgso%Y+c4=;c__PV4ZqF49 zRlNO9SvF_AUVYPPud72F#|Z&ONhJkmmXwYL9>EEUOhzS~0bZG&ns;5C1ExlKpPjx+ zJGj@F?Sn=;;}6CH>*_xl)1|IQot}OC<>$4ny7>>DNGiO2@I-rp%LSu`)a!v69=sO+ zDr#cjvmIQp>6ZL{q^VZy^hrgSzU7eubkbjY5&$a7ew{4&Q(T=h@ zmC8JoaiyBL#fK=182>N(ejdpvYGyt^^=k8kn1>DC=eONqkln*Kb=&giM%%d;Ocu`! z_c+WbSrFHoJxPAatp^>|mP>V6MuwibE!$Oj*vBw`r`9vy>Z38=0?)KMAC0LB zJ9C!1Yv*5AL-PR5XJR%-?;Ke<<936nd)sC1NgPr082$J?lrm=WZ9_y@ literal 0 HcmV?d00001 diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 40e681eda..a442a68aa 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1676,12 +1676,14 @@ public class ApprovalRailCellView: GalleryRailCellView { strongSelf.approvalRailCellDelegate?.approvalRailCellView(strongSelf, didRemoveItem: attachmentItem) } - button.setImage(#imageLiteral(resourceName: "ic_circled_x"), for: .normal) + button.setImage(UIImage(named: "x-24")?.withRenderingMode(.alwaysTemplate), for: .normal) + button.tintColor = .white + button.layer.shadowColor = UIColor.black.cgColor + button.layer.shadowRadius = 2 + button.layer.shadowOpacity = 0.66 + button.layer.shadowOffset = .zero - let kInsetDistance: CGFloat = 5 - button.imageEdgeInsets = UIEdgeInsets(top: kInsetDistance, left: kInsetDistance, bottom: kInsetDistance, right: kInsetDistance) - - let kButtonWidth: CGFloat = 24 + kInsetDistance * 2 + let kButtonWidth: CGFloat = 24 button.autoSetDimensions(to: CGSize(width: kButtonWidth, height: kButtonWidth)) return button @@ -1704,8 +1706,8 @@ public class ApprovalRailCellView: GalleryRailCellView { if isSelected { addSubview(deleteButton) - deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: -12) - deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: -8) + deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) + deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4) } else { deleteButton.removeFromSuperview() } @@ -1726,8 +1728,8 @@ public class ApprovalRailCellView: GalleryRailCellView { if hasCaption { addSubview(captionIndicator) - captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 2) - captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 6) + captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) + captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: cellBorderWidth + 4) } else { captionIndicator.removeFromSuperview() } diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index 66690ab2a..6f797ea6b 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -63,17 +63,18 @@ public class GalleryRailCellView: UIView { private(set) var isSelected: Bool = false + public let cellBorderWidth: CGFloat = 2 + func setIsSelected(_ isSelected: Bool) { - let borderWidth: CGFloat = 2 self.isSelected = isSelected // Reserve space for the selection border whether or not the cell is selected. - layoutMargins = UIEdgeInsets(top: 0, left: borderWidth, bottom: 0, right: borderWidth) + layoutMargins = UIEdgeInsets(top: 0, left: cellBorderWidth, bottom: 0, right: cellBorderWidth) if isSelected { imageView.layer.borderColor = Theme.galleryHighlightColor.cgColor - imageView.layer.borderWidth = borderWidth - imageView.layer.cornerRadius = borderWidth + imageView.layer.borderWidth = cellBorderWidth + imageView.layer.cornerRadius = cellBorderWidth } else { imageView.layer.borderWidth = 0 imageView.layer.cornerRadius = 0 From 337e32a909d259af49a7b2de6b32f6ee5050d3d4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 16:28:10 -0400 Subject: [PATCH 266/493] Fix a shadow. --- .../ViewControllers/AttachmentApprovalViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index a442a68aa..026aaa433 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1462,6 +1462,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor lengthLimitLabel.layer.shadowOffset = .zero lengthLimitLabel.layer.shadowOpacity = 0.8 + lengthLimitLabel.layer.shadowRadius = 2.0 lengthLimitLabel.isHidden = true return lengthLimitLabel From c0ca55b1e02e3f78adbf6ab903f49874475dcf12 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 17:04:58 -0400 Subject: [PATCH 267/493] Fix shadow on palette view. --- .../ImageEditor/ImageEditorPaletteView.swift | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index e1c78ff24..e2382c395 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -81,7 +81,9 @@ public class ImageEditorPaletteView: UIView { private let imageView = UIImageView() private let selectionView = UIView() - private let selectionWrapper = OWSLayerView() + // imageWrapper is used to host the "selection view". + private let imageWrapper = OWSLayerView() + private let shadowView = UIView() private var selectionConstraint: NSLayoutConstraint? private func createContents() { @@ -89,9 +91,18 @@ public class ImageEditorPaletteView: UIView { self.isOpaque = false self.layoutMargins = .zero + shadowView.backgroundColor = .black + shadowView.layer.shadowColor = UIColor.black.cgColor + shadowView.layer.shadowRadius = 2.0 + shadowView.layer.shadowOpacity = 0.33 + shadowView.layer.shadowOffset = .zero + addSubview(shadowView) + if let image = ImageEditorPaletteView.buildPaletteGradientImage() { imageView.image = image - imageView.layer.cornerRadius = image.size.width * 0.5 + let imageRadius = image.size.width * 0.5 + imageView.layer.cornerRadius = imageRadius + shadowView.layer.cornerRadius = imageRadius imageView.clipsToBounds = true } else { owsFailDebug("Missing image.") @@ -102,29 +113,27 @@ public class ImageEditorPaletteView: UIView { imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) imageView.layer.borderColor = UIColor.white.cgColor imageView.layer.borderWidth = CGHairlineWidth() - imageView.layer.shadowColor = UIColor.black.cgColor - imageView.layer.shadowRadius = 2.0 - imageView.layer.shadowOpacity = 0.33 - imageView.layer.shadowOffset = .zero - selectionWrapper.layoutCallback = { [weak self] (view) in + + imageWrapper.layoutCallback = { [weak self] (view) in guard let strongSelf = self else { return } strongSelf.updateState() } - self.addSubview(selectionWrapper) - selectionWrapper.autoPin(toEdgesOf: imageView) + addSubview(imageWrapper) + imageWrapper.autoPin(toEdgesOf: imageView) + shadowView.autoPin(toEdgesOf: imageView) selectionView.addBorder(with: .white) selectionView.layer.cornerRadius = selectionSize / 2 selectionView.autoSetDimensions(to: CGSize(width: selectionSize, height: selectionSize)) - selectionWrapper.addSubview(selectionView) + imageWrapper.addSubview(selectionView) selectionView.autoHCenterInSuperview() // There must be a better way to pin the selection view's location, // but I can't find it. let selectionConstraint = NSLayoutConstraint(item: selectionView, - attribute: .centerY, relatedBy: .equal, toItem: selectionWrapper, attribute: .top, multiplier: 1, constant: 0) + attribute: .centerY, relatedBy: .equal, toItem: imageWrapper, attribute: .top, multiplier: 1, constant: 0) selectionConstraint.autoInstall() self.selectionConstraint = selectionConstraint @@ -201,7 +210,7 @@ public class ImageEditorPaletteView: UIView { owsFailDebug("Missing selectionConstraint.") return } - let selectionY = selectionWrapper.height() * selectedValue.palettePhase + let selectionY = imageWrapper.height() * selectedValue.palettePhase selectionConstraint.constant = selectionY } From 75cfd979ba5400c81baf0ffb82d383c58e3dfe62 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 17:05:17 -0400 Subject: [PATCH 268/493] Modify brush stroke width to reflect current scale. --- .../ImageEditor/ImageEditorBrushViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index af56c8db1..ba47cb82d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -165,9 +165,9 @@ public class ImageEditorBrushViewController: OWSViewController { let view = self.canvasView.gestureReferenceView let viewBounds = view.bounds let newSample = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, - viewBounds: viewBounds, - model: self.model, - transform: self.model.currentTransform()) + viewBounds: viewBounds, + model: self.model, + transform: self.model.currentTransform()) if let prevSample = self.currentStrokeSamples.last, prevSample == newSample { @@ -179,7 +179,7 @@ public class ImageEditorBrushViewController: OWSViewController { let strokeColor = paletteView.selectedValue.color // TODO: Tune stroke width. - let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() + let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() / self.model.currentTransform().scaling switch gestureRecognizer.state { case .began: From fedbe3a5d057c3f285c372d8b32add7011723f95 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 17:08:07 -0400 Subject: [PATCH 269/493] Fix shadow on palette view. --- SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index e2382c395..746ba5303 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -111,8 +111,7 @@ public class ImageEditorPaletteView: UIView { // We use an invisible margin to expand the hot area of this control. let margin: CGFloat = 20 imageView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: margin, left: margin, bottom: margin, right: margin)) - imageView.layer.borderColor = UIColor.white.cgColor - imageView.layer.borderWidth = CGHairlineWidth() + imageView.addBorder(with: .white) imageWrapper.layoutCallback = { [weak self] (view) in guard let strongSelf = self else { From d6c91c27536ede1462b9d19280d278d38c371c69 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 11:40:43 -0400 Subject: [PATCH 270/493] Respond to CR. --- .../Views/ImageEditor/ImageEditorBrushViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index ba47cb82d..4281208dc 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -178,7 +178,6 @@ public class ImageEditorBrushViewController: OWSViewController { } let strokeColor = paletteView.selectedValue.color - // TODO: Tune stroke width. let unitStrokeWidth = ImageEditorStrokeItem.defaultUnitStrokeWidth() / self.model.currentTransform().scaling switch gestureRecognizer.state { From 88c07fc5345ae8d97739ba1ad58dd683984cf1e0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 10:15:23 -0400 Subject: [PATCH 271/493] Pinch to change text size in image editor text tool. --- Signal.xcodeproj/project.pbxproj | 6 +- .../ImageEditorCropViewController.swift | 1 - .../ImageEditor/ImageEditorPaletteView.swift | 4 ++ .../ImageEditor/ImageEditorTextItem.swift | 46 ++++++++++--- .../ImageEditorTextViewController.swift | 67 +++++++++++++++++-- .../Views/ImageEditor/ImageEditorView.swift | 32 +++++---- SignalMessaging/categories/UIView+OWS.swift | 9 +++ .../utils/UIGestureRecognizer+OWS.swift | 12 ++++ 8 files changed, 143 insertions(+), 34 deletions(-) create mode 100644 SignalMessaging/utils/UIGestureRecognizer+OWS.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 416e1822a..5d89294e2 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */; }; 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */; }; 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */; }; + 340872BF22393CFA00CB25B0 /* UIGestureRecognizer+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -644,6 +645,7 @@ 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorBrushViewController.swift; sourceTree = ""; }; 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OWSViewController+ImageEditor.swift"; sourceTree = ""; }; + 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+OWS.swift"; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1585,12 +1587,12 @@ 4C948FF62146EB4800349F0D /* BlockListCache.swift */, 343D3D991E9283F100165CA4 /* BlockListUIUtils.h */, 343D3D9A1E9283F100165CA4 /* BlockListUIUtils.m */, - 451777C71FD61554001225FF /* FullTextSearcher.swift */, 3466087120E550F300AFFE73 /* ConversationStyle.swift */, 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */, 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */, 348F2EAD1F0D21BC00D4ECE0 /* DeviceSleepManager.swift */, 344F248C2007CCD600CFB4F4 /* DisplayableText.swift */, + 451777C71FD61554001225FF /* FullTextSearcher.swift */, 346129AC1FD1F34E00532771 /* ImageCache.swift */, 34BEDB1421C80BC9007B0EAE /* OWSAnyTouchGestureRecognizer.h */, 34BEDB1521C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m */, @@ -1617,6 +1619,7 @@ 45360B8C1F9521F800FA666C /* Searcher.swift */, 346129BD1FD2068600532771 /* ThreadUtil.h */, 346129BE1FD2068600532771 /* ThreadUtil.m */, + 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */, 4C858A51212DC5E1001B45D3 /* UIImage+OWS.swift */, B97940251832BD2400BD66CB /* UIUtil.h */, B97940261832BD2400BD66CB /* UIUtil.m */, @@ -3416,6 +3419,7 @@ 346941A3215D2EE400B5BFAD /* Theme.m in Sources */, 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */, 34BBC84D220B2D0800857249 /* ImageEditorPinchGestureRecognizer.swift in Sources */, + 340872BF22393CFA00CB25B0 /* UIGestureRecognizer+OWS.swift in Sources */, 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */, 34AC0A14211B39EA00997B47 /* ContactCellView.m in Sources */, 34AC0A15211B39EA00997B47 /* ContactsViewHelper.m in Sources */, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 2afb844b6..3a78f54f6 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -214,7 +214,6 @@ class ImageEditorCropViewController: OWSViewController { } public func updateNavigationBar() { - // TODO: Change this asset. let resetButton = navigationBarButton(imageName: "image_editor_undo", selector: #selector(didTapReset(sender:))) let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 746ba5303..7101b333d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -54,6 +54,10 @@ public class ImageEditorColor: NSObject { return color.cgColor }) } + + static func ==(left: ImageEditorColor, right: ImageEditorColor) -> Bool { + return left.palettePhase.fuzzyEquals(right.palettePhase) + } } // MARK: - diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift index fe08e1adc..4d6c015aa 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextItem.swift @@ -131,42 +131,54 @@ public class ImageEditorTextItem: ImageEditorItem { } @objc - public func copy(withUnitCenter newUnitCenter: CGPoint) -> ImageEditorTextItem { + public func copy(unitCenter: CGPoint) -> ImageEditorTextItem { return ImageEditorTextItem(itemId: itemId, text: text, color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, - unitCenter: newUnitCenter, + unitCenter: unitCenter, unitWidth: unitWidth, rotationRadians: rotationRadians, scaling: scaling) } @objc - public func copy(withUnitCenter newUnitCenter: CGPoint, - scaling newScaling: CGFloat, - rotationRadians newRotationRadians: CGFloat) -> ImageEditorTextItem { + public func copy(scaling: CGFloat, + rotationRadians: CGFloat) -> ImageEditorTextItem { return ImageEditorTextItem(itemId: itemId, text: text, color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, - unitCenter: newUnitCenter, + unitCenter: unitCenter, unitWidth: unitWidth, - rotationRadians: newRotationRadians, - scaling: newScaling) + rotationRadians: rotationRadians, + scaling: scaling) } @objc - public func copy(withUnitCenter newUnitCenter: CGPoint, unitWidth newUnitWidth: CGFloat) -> ImageEditorTextItem { + public func copy(unitWidth: CGFloat) -> ImageEditorTextItem { return ImageEditorTextItem(itemId: itemId, text: text, color: color, font: font, fontReferenceImageWidth: fontReferenceImageWidth, - unitCenter: newUnitCenter, - unitWidth: newUnitWidth, + unitCenter: unitCenter, + unitWidth: unitWidth, + rotationRadians: rotationRadians, + scaling: scaling) + } + + @objc + public func copy(font: UIFont) -> ImageEditorTextItem { + return ImageEditorTextItem(itemId: itemId, + text: text, + color: color, + font: font, + fontReferenceImageWidth: fontReferenceImageWidth, + unitCenter: unitCenter, + unitWidth: unitWidth, rotationRadians: rotationRadians, scaling: scaling) } @@ -174,4 +186,16 @@ public class ImageEditorTextItem: ImageEditorItem { public override func outputScale() -> CGFloat { return scaling } + + static func ==(left: ImageEditorTextItem, right: ImageEditorTextItem) -> Bool { + return (left.text == right.text && + left.color == right.color && + left.font.fontName == right.font.fontName && + left.font.pointSize.fuzzyEquals(right.font.pointSize) && + left.fontReferenceImageWidth.fuzzyEquals(right.fontReferenceImageWidth) && + left.unitCenter.fuzzyEquals(right.unitCenter) && + left.unitWidth.fuzzyEquals(right.unitWidth) && + left.rotationRadians.fuzzyEquals(right.rotationRadians) && + left.scaling.fuzzyEquals(right.scaling)) + } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 8292582de..b99dfee94 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -92,7 +92,8 @@ private class VAlignTextView: UITextView { @objc public protocol ImageEditorTextViewControllerDelegate: class { - func textEditDidComplete(textItem: ImageEditorTextItem, text: String?, color: ImageEditorColor) + func textEditDidComplete(textItem: ImageEditorTextItem) + func textEditDidDelete(textItem: ImageEditorTextItem) func textEditDidCancel() } @@ -195,6 +196,10 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel // This will determine the text view's size. paletteView.autoPinEdge(.leading, to: .trailing, of: textView, withOffset: 0) + let pinchGestureRecognizer = ImageEditorPinchGestureRecognizer(target: self, action: #selector(handlePinchGesture(_:))) + pinchGestureRecognizer.referenceView = view + view.addGestureRecognizer(pinchGestureRecognizer) + updateNavigationBar() } @@ -230,6 +235,35 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel updateNavigationBar(navigationBarItems: navigationBarItems) } + // MARK: - Pinch Gesture + + private var pinchFontStart: UIFont? + + @objc + public func handlePinchGesture(_ gestureRecognizer: ImageEditorPinchGestureRecognizer) { + AssertIsOnMainThread() + + switch gestureRecognizer.state { + case .began: + pinchFontStart = textView.font + case .changed, .ended: + guard let pinchFontStart = pinchFontStart else { + return + } + var pointSize: CGFloat = pinchFontStart.pointSize + if gestureRecognizer.pinchStateLast.distance > 0 { + pointSize *= gestureRecognizer.pinchStateLast.distance / gestureRecognizer.pinchStateStart.distance + } + let minPointSize: CGFloat = 12 + let maxPointSize: CGFloat = 64 + pointSize = max(minPointSize, min(maxPointSize, pointSize)) + let font = pinchFontStart.withSize(pointSize) + textView.font = font + default: + pinchFontStart = nil + } + } + // MARK: - Events @objc func didTapUndo(sender: UIButton) { @@ -268,14 +302,39 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel imageSize: model.srcImageSizePixels, transform: model.currentTransform()) let unitWidth = textView.width() / imageFrame.width - - newTextItem = textItem.copy(withUnitCenter: textCenterImageUnit, unitWidth: unitWidth) + newTextItem = textItem.copy(unitCenter: textCenterImageUnit).copy(unitWidth: unitWidth) } + var font = textItem.font + if let newFont = textView.font { + font = newFont + } else { + owsFailDebug("Missing font.") + } + newTextItem = newTextItem.copy(font: font) + + guard let text = textView.text?.ows_stripped(), + text.count > 0 else { + self.delegate?.textEditDidDelete(textItem: textItem) + + self.dismiss(animated: false) { + // Do nothing. + } + + return + } + + newTextItem = newTextItem.copy(withText: text, color: paletteView.selectedValue) + // Hide the text view immediately to avoid animation glitches in the dismiss transition. textView.isHidden = true - self.delegate?.textEditDidComplete(textItem: newTextItem, text: textView.text, color: paletteView.selectedValue) + if textItem == newTextItem { + // No changes were made. Cancel to avoid dirtying the undo stack. + self.delegate?.textEditDidCancel() + } else { + self.delegate?.textEditDidComplete(textItem: newTextItem) + } self.dismiss(animated: false) { // Do nothing. diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift index 3acac8e1c..cfbebc097 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorView.swift @@ -260,9 +260,8 @@ public class ImageEditorView: UIView { let newRotationRadians = textItem.rotationRadians + gestureRecognizer.pinchStateLast.angleRadians - gestureRecognizer.pinchStateStart.angleRadians - let newItem = textItem.copy(withUnitCenter: unitCenter, - scaling: newScaling, - rotationRadians: newRotationRadians) + let newItem = textItem.copy(unitCenter: unitCenter).copy(scaling: newScaling, + rotationRadians: newRotationRadians) if pinchHasChanged { model.replace(item: newItem, suppressUndo: true) @@ -348,7 +347,7 @@ public class ImageEditorView: UIView { transform: self.model.currentTransform()) let gestureDeltaImageUnit = gestureNowImageUnit.minus(gestureStartImageUnit) let unitCenter = CGPointClamp01(movingTextStartUnitCenter.plus(gestureDeltaImageUnit)) - let newItem = textItem.copy(withUnitCenter: unitCenter) + let newItem = textItem.copy(unitCenter: unitCenter) if movingTextHasMoved { model.replace(item: newItem, suppressUndo: true) @@ -515,26 +514,25 @@ extension ImageEditorView: ImageEditorModelObserver { extension ImageEditorView: ImageEditorTextViewControllerDelegate { - public func textEditDidComplete(textItem: ImageEditorTextItem, text: String?, color: ImageEditorColor) { + public func textEditDidComplete(textItem: ImageEditorTextItem) { AssertIsOnMainThread() - guard let text = text?.ows_stripped(), - text.count > 0 else { - if model.has(itemForId: textItem.itemId) { - model.remove(item: textItem) - } - return - } - // Model items are immutable; we _replace_ the item rather than modify it. - let newItem = textItem.copy(withText: text, color: color) if model.has(itemForId: textItem.itemId) { - model.replace(item: newItem, suppressUndo: false) + model.replace(item: textItem, suppressUndo: false) } else { - model.append(item: newItem) + model.append(item: textItem) } - self.currentColor = color + self.currentColor = textItem.color + } + + public func textEditDidDelete(textItem: ImageEditorTextItem) { + AssertIsOnMainThread() + + if model.has(itemForId: textItem.itemId) { + model.remove(item: textItem) + } } public func textEditDidCancel() { diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index fb171452c..4c2d93ec7 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -145,6 +145,10 @@ public extension CGFloat { } public static let halfPi: CGFloat = CGFloat.pi * 0.5 + + public func fuzzyEquals(_ other: CGFloat, tolerance: CGFloat = 0.001) -> Bool { + return abs(self - other) < tolerance + } } public extension Int { @@ -213,6 +217,11 @@ public extension CGPoint { public func applyingInverse(_ transform: CGAffineTransform) -> CGPoint { return applying(transform.inverted()) } + + public func fuzzyEquals(_ other: CGPoint, tolerance: CGFloat = 0.001) -> Bool { + return (x.fuzzyEquals(other.x, tolerance: tolerance) && + y.fuzzyEquals(other.y, tolerance: tolerance)) + } } public extension CGRect { diff --git a/SignalMessaging/utils/UIGestureRecognizer+OWS.swift b/SignalMessaging/utils/UIGestureRecognizer+OWS.swift new file mode 100644 index 000000000..01dad6400 --- /dev/null +++ b/SignalMessaging/utils/UIGestureRecognizer+OWS.swift @@ -0,0 +1,12 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +extension UIGestureRecognizer { + @objc + public var stateString: String { + return NSStringForUIGestureRecognizerState(state) + } +} From c315c1c9ef839126c60e6dfbe18c6e8bf7d4329d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 10:47:04 -0400 Subject: [PATCH 272/493] Fix translation normalization of the image editor transform. --- Signal.xcodeproj/project.pbxproj | 4 + .../Views/ImageEditor/ImageEditorModel.swift | 230 ----------------- .../ImageEditor/ImageEditorTransform.swift | 240 ++++++++++++++++++ 3 files changed, 244 insertions(+), 230 deletions(-) create mode 100644 SignalMessaging/Views/ImageEditor/ImageEditorTransform.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 5d89294e2..539bf3cb0 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */; }; 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */; }; 340872BF22393CFA00CB25B0 /* UIGestureRecognizer+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */; }; + 340872C122394CAA00CB25B0 /* ImageEditorTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -646,6 +647,7 @@ 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorBrushViewController.swift; sourceTree = ""; }; 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OWSViewController+ImageEditor.swift"; sourceTree = ""; }; 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+OWS.swift"; sourceTree = ""; }; + 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTransform.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1933,6 +1935,7 @@ 34BBC854220C7ADA00857249 /* ImageEditorStrokeItem.swift */, 34BBC855220C7ADA00857249 /* ImageEditorTextItem.swift */, 34BBC84A220B2CB200857249 /* ImageEditorTextViewController.swift */, + 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */, 34BEDB1221C43F69007B0EAE /* ImageEditorView.swift */, 34BBC856220C7ADA00857249 /* OrderedDictionary.swift */, 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */, @@ -3409,6 +3412,7 @@ 45194F8F1FD71FF500333B2C /* ThreadUtil.m in Sources */, 34BEDB0E21C405B0007B0EAE /* ImageEditorModel.swift in Sources */, 451F8A3B1FD71297005CB9DA /* UIUtil.m in Sources */, + 340872C122394CAA00CB25B0 /* ImageEditorTransform.swift in Sources */, 450C800F20AD1AB900F3A091 /* OWSWindowManager.m in Sources */, 454A965A1FD6017E008D2A0E /* SignalAttachment.swift in Sources */, 45BC829D1FD9C4B400011CF3 /* ShareViewDelegate.swift in Sources */, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index cd7272096..ed33cdfe4 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -4,236 +4,6 @@ import UIKit -// The image editor uses multiple coordinate systems. -// -// * Image unit coordinates. Brush stroke and text content should be pegged to -// image content, so they are specified relative to the bounds of the image. -// * Canvas coordinates. We render the image, strokes and text into the "canvas", -// a viewport that has the aspect ratio of the view. Rendering is transformed, so -// this is pre-tranform. -// * View coordinates. The coordinates of the actual view (or rendered output). -// Bounded by the view's bounds / viewport. -// -// Sometimes we use unit coordinates. This facilitates a number of operations such -// as clamping to 0-1, etc. So in practice almost all values will be in one of six -// coordinate systems: -// -// * unit image coordinates -// * image coordinates -// * unit canvas coordinates -// * canvas coordinates -// * unit view coordinates -// * view coordinates -// -// For simplicity, the canvas bounds are always identical to view bounds. -// If we wanted to manipulate output quality, we would use the layer's "scale". -// But canvas values are pre-transform and view values are post-transform so they -// are only identical if the transform has no scaling, rotation or translation. -// -// The "ImageEditorTransform" can be used to generate an CGAffineTransform -// for the layers used to render the content. In practice, the affine transform -// is applied to a superlayer of the sublayers used to render content. -// -// CALayers apply their transform relative to the layer's anchorPoint, which -// by default is the center of the layer's bounds. E.g. rotation occurs -// around the center of the layer. Therefore when projecting absolute -// (but not relative) coordinates between the "view" and "canvas" coordinate -// systems, it's necessary to project them relative to the center of the -// view/canvas. -// -// To simplify our representation & operations, the default size of the image -// content is "exactly large enough to fill the canvas if rotation -// but not scaling or translation were applied". This might seem unusual, -// but we have a key invariant: we always want the image to fill the canvas. -// It's far easier to ensure this if the transform is always (just barely) -// valid when scaling = 1 and translation = .zero. The image size that -// fulfills this criteria is calculated using -// ImageEditorCanvasView.imageFrame(forViewSize:...). Transforming between -// the "image" and "canvas" coordinate systems is done with that image frame. -@objc -public class ImageEditorTransform: NSObject { - // The outputSizePixels is used to specify the aspect ratio and size of the - // output. - public let outputSizePixels: CGSize - // The unit translation of the content, relative to the - // canvas viewport. - public let unitTranslation: CGPoint - // Rotation about the center of the content. - public let rotationRadians: CGFloat - // x >= 1.0. - public let scaling: CGFloat - // Flipping is horizontal. - public let isFlipped: Bool - - public init(outputSizePixels: CGSize, - unitTranslation: CGPoint, - rotationRadians: CGFloat, - scaling: CGFloat, - isFlipped: Bool) { - self.outputSizePixels = outputSizePixels - self.unitTranslation = unitTranslation - self.rotationRadians = rotationRadians - self.scaling = scaling - self.isFlipped = isFlipped - } - - public class func defaultTransform(srcImageSizePixels: CGSize) -> ImageEditorTransform { - // It shouldn't be necessary normalize the default transform, but we do so to be safe. - return ImageEditorTransform(outputSizePixels: srcImageSizePixels, - unitTranslation: .zero, - rotationRadians: 0.0, - scaling: 1.0, - isFlipped: false).normalize(srcImageSizePixels: srcImageSizePixels) - } - - public var isNonDefault: Bool { - return !isEqual(ImageEditorTransform.defaultTransform(srcImageSizePixels: outputSizePixels)) - } - - public func affineTransform(viewSize: CGSize) -> CGAffineTransform { - let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize) - // Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation - // is not affected affected by the scaling or rotation, which shoud both be about the "origin" - // (in this case the center of the content). - // - // NOTE: CGAffineTransform transforms are composed in reverse order. - let transform = CGAffineTransform.identity.translate(translation).rotated(by: rotationRadians).scaledBy(x: scaling, y: scaling) - return transform - } - - // This method normalizes a "proposed" transform (self) into - // one that is guaranteed to be valid. - public func normalize(srcImageSizePixels: CGSize) -> ImageEditorTransform { - // Normalize scaling. - // The "src/background" image is rendered at a size that will fill - // the canvas bounds if scaling = 1.0 and translation = .zero. - // Therefore, any scaling >= 1.0 is valid. - let minScaling: CGFloat = 1.0 - let scaling = max(minScaling, self.scaling) - - // We don't need to normalize rotation. - - // Normalize translation. - // - // This is decidedly non-trivial because of the way that - // scaling, rotation and translation combine. We need to - // guarantee that the image _always_ fills the canvas - // bounds. So want to clamp the translation such that the - // image can be moved _exactly_ to the edge of the canvas - // and no further in a way that reflects the current - // crop, scaling and rotation. - // - // We need to clamp the translation to the valid "translation - // region" which is a rectangle centered on the origin. - // However, this rectangle is axis-aligned in canvas - // coordinates, not view coordinates. e.g. if you have - // a long image and a square output size, you could "slide" - // the crop region along the image's contents. That - // movement would appear diagonal to the user in the view - // but would be vertical on the canvas. - - // Normalize translation, Step 1: - // - // We project the viewport onto the canvas to determine - // its bounding box. - let viewBounds = CGRect(origin: .zero, size: self.outputSizePixels) - // This "naive" transform represents the proposed transform - // with no translation. - let naiveTransform = ImageEditorTransform(outputSizePixels: outputSizePixels, - unitTranslation: .zero, - rotationRadians: rotationRadians, - scaling: scaling, - isFlipped: self.isFlipped) - let naiveAffineTransform = naiveTransform.affineTransform(viewSize: viewBounds.size) - var naiveViewportMinCanvas = CGPoint.zero - var naiveViewportMaxCanvas = CGPoint.zero - // Find the "naive" bounding box of the viewport on the canvas - // by projecting its corners from view coordinates to canvas - // coordinates. - // - // Due to symmetry, it should be sufficient to project 2 corners - // but we do all four corners for safety. - for viewCorner in [ - viewBounds.topLeft, - viewBounds.topRight, - viewBounds.bottomLeft, - viewBounds.bottomRight - ] { - let naiveViewCornerInCanvas = viewCorner.minus(viewBounds.center).applyingInverse(naiveAffineTransform).plus(viewBounds.center) - naiveViewportMinCanvas = naiveViewportMinCanvas.min(naiveViewCornerInCanvas) - naiveViewportMaxCanvas = naiveViewportMaxCanvas.max(naiveViewCornerInCanvas) - } - let naiveViewportSizeCanvas: CGPoint = naiveViewportMaxCanvas.minus(naiveViewportMinCanvas) - - // Normalize translation, Step 2: - // - // Now determine the "naive" image frame on the canvas. - let naiveImageFrameCanvas = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: srcImageSizePixels, transform: naiveTransform) - let naiveImageSizeCanvas = CGPoint(x: naiveImageFrameCanvas.width, y: naiveImageFrameCanvas.height) - - // Normalize translation, Step 3: - // - // The min/max translation can now by computed by diffing - // the size of the bounding box of the naive viewport and - // the size of the image on canvas. - let maxTranslationCanvas = naiveImageSizeCanvas.minus(naiveViewportSizeCanvas).times(0.5).max(.zero) - - // Normalize translation, Step 4: - // - // Clamp the proposed translation to the "max translation" - // from the last step. - // - // This is subtle. We want to clamp in canvas coordinates - // since the min/max translation is specified by a bounding - // box in "unit canvas" coordinates. However, because the - // translation is applied in SRT order (scale-rotate-transform), - // it effectively operates in view coordinates since it is - // applied last. So we project it from view coordinates - // to canvas coordinates, clamp it, then project it back - // into unit view coordinates using the "naive" (no translation) - // transform. - let translationInView = self.unitTranslation.fromUnitCoordinates(viewBounds: viewBounds) - let translationInCanvas = translationInView.applyingInverse(naiveAffineTransform) - // Clamp the translation to +/- maxTranslationCanvasUnit. - let clampedTranslationInCanvas = translationInCanvas.min(maxTranslationCanvas).max(maxTranslationCanvas.inverse()) - let clampedTranslationInView = clampedTranslationInCanvas.applying(naiveAffineTransform) - let unitTranslation = clampedTranslationInView.toUnitCoordinates(viewBounds: viewBounds, shouldClamp: false) - - return ImageEditorTransform(outputSizePixels: outputSizePixels, - unitTranslation: unitTranslation, - rotationRadians: rotationRadians, - scaling: scaling, - isFlipped: self.isFlipped) - } - - public override func isEqual(_ object: Any?) -> Bool { - guard let other = object as? ImageEditorTransform else { - return false - } - return (outputSizePixels == other.outputSizePixels && - unitTranslation == other.unitTranslation && - rotationRadians == other.rotationRadians && - scaling == other.scaling && - isFlipped == other.isFlipped) - } - - public override var hash: Int { - return (outputSizePixels.width.hashValue ^ - outputSizePixels.height.hashValue ^ - unitTranslation.x.hashValue ^ - unitTranslation.y.hashValue ^ - rotationRadians.hashValue ^ - scaling.hashValue ^ - isFlipped.hashValue) - } - - open override var description: String { - return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling), isFlipped: \(isFlipped)]" - } -} - -// MARK: - - // Used to represent undo/redo operations. // // Because the image editor's "contents" and "items" diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTransform.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTransform.swift new file mode 100644 index 000000000..4854af6d7 --- /dev/null +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTransform.swift @@ -0,0 +1,240 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import UIKit + +// The image editor uses multiple coordinate systems. +// +// * Image unit coordinates. Brush stroke and text content should be pegged to +// image content, so they are specified relative to the bounds of the image. +// * Canvas coordinates. We render the image, strokes and text into the "canvas", +// a viewport that has the aspect ratio of the view. Rendering is transformed, so +// this is pre-tranform. +// * View coordinates. The coordinates of the actual view (or rendered output). +// Bounded by the view's bounds / viewport. +// +// Sometimes we use unit coordinates. This facilitates a number of operations such +// as clamping to 0-1, etc. So in practice almost all values will be in one of six +// coordinate systems: +// +// * unit image coordinates +// * image coordinates +// * unit canvas coordinates +// * canvas coordinates +// * unit view coordinates +// * view coordinates +// +// For simplicity, the canvas bounds are always identical to view bounds. +// If we wanted to manipulate output quality, we would use the layer's "scale". +// But canvas values are pre-transform and view values are post-transform so they +// are only identical if the transform has no scaling, rotation or translation. +// +// The "ImageEditorTransform" can be used to generate an CGAffineTransform +// for the layers used to render the content. In practice, the affine transform +// is applied to a superlayer of the sublayers used to render content. +// +// CALayers apply their transform relative to the layer's anchorPoint, which +// by default is the center of the layer's bounds. E.g. rotation occurs +// around the center of the layer. Therefore when projecting absolute +// (but not relative) coordinates between the "view" and "canvas" coordinate +// systems, it's necessary to project them relative to the center of the +// view/canvas. +// +// To simplify our representation & operations, the default size of the image +// content is "exactly large enough to fill the canvas if rotation +// but not scaling or translation were applied". This might seem unusual, +// but we have a key invariant: we always want the image to fill the canvas. +// It's far easier to ensure this if the transform is always (just barely) +// valid when scaling = 1 and translation = .zero. The image size that +// fulfills this criteria is calculated using +// ImageEditorCanvasView.imageFrame(forViewSize:...). Transforming between +// the "image" and "canvas" coordinate systems is done with that image frame. +@objc +public class ImageEditorTransform: NSObject { + // The outputSizePixels is used to specify the aspect ratio and size of the + // output. + public let outputSizePixels: CGSize + // The unit translation of the content, relative to the + // canvas viewport. + public let unitTranslation: CGPoint + // Rotation about the center of the content. + public let rotationRadians: CGFloat + // x >= 1.0. + public let scaling: CGFloat + // Flipping is horizontal. + public let isFlipped: Bool + + public init(outputSizePixels: CGSize, + unitTranslation: CGPoint, + rotationRadians: CGFloat, + scaling: CGFloat, + isFlipped: Bool) { + self.outputSizePixels = outputSizePixels + self.unitTranslation = unitTranslation + self.rotationRadians = rotationRadians + self.scaling = scaling + self.isFlipped = isFlipped + } + + public class func defaultTransform(srcImageSizePixels: CGSize) -> ImageEditorTransform { + // It shouldn't be necessary normalize the default transform, but we do so to be safe. + return ImageEditorTransform(outputSizePixels: srcImageSizePixels, + unitTranslation: .zero, + rotationRadians: 0.0, + scaling: 1.0, + isFlipped: false).normalize(srcImageSizePixels: srcImageSizePixels) + } + + public var isNonDefault: Bool { + return !isEqual(ImageEditorTransform.defaultTransform(srcImageSizePixels: outputSizePixels)) + } + + public func affineTransform(viewSize: CGSize) -> CGAffineTransform { + let translation = unitTranslation.fromUnitCoordinates(viewSize: viewSize) + // Order matters. We need want SRT (scale-rotate-translate) ordering so that the translation + // is not affected affected by the scaling or rotation, which shoud both be about the "origin" + // (in this case the center of the content). + // + // NOTE: CGAffineTransform transforms are composed in reverse order. + let transform = CGAffineTransform.identity.translate(translation).rotated(by: rotationRadians).scaledBy(x: scaling, y: scaling) + return transform + } + + // This method normalizes a "proposed" transform (self) into + // one that is guaranteed to be valid. + public func normalize(srcImageSizePixels: CGSize) -> ImageEditorTransform { + // Normalize scaling. + // The "src/background" image is rendered at a size that will fill + // the canvas bounds if scaling = 1.0 and translation = .zero. + // Therefore, any scaling >= 1.0 is valid. + let minScaling: CGFloat = 1.0 + let scaling = max(minScaling, self.scaling) + + // We don't need to normalize rotation. + + // Normalize translation. + // + // This is decidedly non-trivial because of the way that + // scaling, rotation and translation combine. We need to + // guarantee that the image _always_ fills the canvas + // bounds. So want to clamp the translation such that the + // image can be moved _exactly_ to the edge of the canvas + // and no further in a way that reflects the current + // crop, scaling and rotation. + // + // We need to clamp the translation to the valid "translation + // region" which is a rectangle centered on the origin. + // However, this rectangle is axis-aligned in canvas + // coordinates, not view coordinates. e.g. if you have + // a long image and a square output size, you could "slide" + // the crop region along the image's contents. That + // movement would appear diagonal to the user in the view + // but would be vertical on the canvas. + + // Normalize translation, Step 1: + // + // We project the viewport onto the canvas to determine + // its bounding box. + let viewBounds = CGRect(origin: .zero, size: self.outputSizePixels) + // This "naive" transform represents the proposed transform + // with no translation. + let naiveTransform = ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: .zero, + rotationRadians: rotationRadians, + scaling: scaling, + isFlipped: self.isFlipped) + let naiveAffineTransform = naiveTransform.affineTransform(viewSize: viewBounds.size) + var naiveViewportMinCanvas = CGPoint.zero + var naiveViewportMaxCanvas = CGPoint.zero + var isFirstCorner = true + // Find the "naive" bounding box of the viewport on the canvas + // by projecting its corners from view coordinates to canvas + // coordinates. + // + // Due to symmetry, it should be sufficient to project 2 corners + // but we do all four corners for safety. + for viewCorner in [ + viewBounds.topLeft, + viewBounds.topRight, + viewBounds.bottomLeft, + viewBounds.bottomRight + ] { + let naiveViewCornerInCanvas = viewCorner.minus(viewBounds.center).applyingInverse(naiveAffineTransform).plus(viewBounds.center) + if isFirstCorner { + naiveViewportMinCanvas = naiveViewCornerInCanvas + naiveViewportMaxCanvas = naiveViewCornerInCanvas + isFirstCorner = false + } else { + naiveViewportMinCanvas = naiveViewportMinCanvas.min(naiveViewCornerInCanvas) + naiveViewportMaxCanvas = naiveViewportMaxCanvas.max(naiveViewCornerInCanvas) + } + } + let naiveViewportSizeCanvas: CGPoint = naiveViewportMaxCanvas.minus(naiveViewportMinCanvas) + + // Normalize translation, Step 2: + // + // Now determine the "naive" image frame on the canvas. + let naiveImageFrameCanvas = ImageEditorCanvasView.imageFrame(forViewSize: viewBounds.size, imageSize: srcImageSizePixels, transform: naiveTransform) + let naiveImageSizeCanvas = CGPoint(x: naiveImageFrameCanvas.width, y: naiveImageFrameCanvas.height) + + // Normalize translation, Step 3: + // + // The min/max translation can now by computed by diffing + // the size of the bounding box of the naive viewport and + // the size of the image on canvas. + let maxTranslationCanvas = naiveImageSizeCanvas.minus(naiveViewportSizeCanvas).times(0.5).max(.zero) + + // Normalize translation, Step 4: + // + // Clamp the proposed translation to the "max translation" + // from the last step. + // + // This is subtle. We want to clamp in canvas coordinates + // since the min/max translation is specified by a bounding + // box in "unit canvas" coordinates. However, because the + // translation is applied in SRT order (scale-rotate-transform), + // it effectively operates in view coordinates since it is + // applied last. So we project it from view coordinates + // to canvas coordinates, clamp it, then project it back + // into unit view coordinates using the "naive" (no translation) + // transform. + let translationInView = self.unitTranslation.fromUnitCoordinates(viewBounds: viewBounds) + let translationInCanvas = translationInView.applyingInverse(naiveAffineTransform) + // Clamp the translation to +/- maxTranslationCanvasUnit. + let clampedTranslationInCanvas = translationInCanvas.min(maxTranslationCanvas).max(maxTranslationCanvas.inverse()) + let clampedTranslationInView = clampedTranslationInCanvas.applying(naiveAffineTransform) + let unitTranslation = clampedTranslationInView.toUnitCoordinates(viewBounds: viewBounds, shouldClamp: false) + + return ImageEditorTransform(outputSizePixels: outputSizePixels, + unitTranslation: unitTranslation, + rotationRadians: rotationRadians, + scaling: scaling, + isFlipped: self.isFlipped) + } + + public override func isEqual(_ object: Any?) -> Bool { + guard let other = object as? ImageEditorTransform else { + return false + } + return (outputSizePixels == other.outputSizePixels && + unitTranslation == other.unitTranslation && + rotationRadians == other.rotationRadians && + scaling == other.scaling && + isFlipped == other.isFlipped) + } + + public override var hash: Int { + return (outputSizePixels.width.hashValue ^ + outputSizePixels.height.hashValue ^ + unitTranslation.x.hashValue ^ + unitTranslation.y.hashValue ^ + rotationRadians.hashValue ^ + scaling.hashValue ^ + isFlipped.hashValue) + } + + open override var description: String { + return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling), isFlipped: \(isFlipped)]" + } +} From 0826864525fd4018513809d0fe8bebadde9b7a33 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 11:33:47 -0400 Subject: [PATCH 273/493] Decompose attachment approval into multiple source files. --- Signal.xcodeproj/project.pbxproj | 40 +- .../ApprovalRailCellView.swift | 88 + ...AttachmentApprovalInputAccessoryView.swift | 400 ++++ .../AttachmentApprovalViewController.swift | 619 ++++++ .../AttachmentCaptionViewController.swift | 2 + .../AttachmentItemCollection.swift | 111 ++ .../AttachmentPrepViewController.swift | 561 ++++++ .../AttachmentApprovalViewController.swift | 1738 ----------------- 8 files changed, 1813 insertions(+), 1746 deletions(-) create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift rename SignalMessaging/ViewControllers/{ => AttachmentApproval}/AttachmentCaptionViewController.swift (99%) create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift delete mode 100644 SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 539bf3cb0..75b9a8eca 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -12,11 +12,16 @@ 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; }; 34074F62203D0CBE004596AE /* OWSSounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 34074F60203D0CBE004596AE /* OWSSounds.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */; }; - 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */; }; 34080F02222853E30087E99F /* ImageEditorBrushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */; }; 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */; }; 340872BF22393CFA00CB25B0 /* UIGestureRecognizer+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */; }; 340872C122394CAA00CB25B0 /* ImageEditorTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */; }; + 340872C82239563500CB25B0 /* ApprovalRailCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C32239563500CB25B0 /* ApprovalRailCellView.swift */; }; + 340872C92239563500CB25B0 /* AttachmentItemCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */; }; + 340872CA2239563500CB25B0 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */; }; + 340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */; }; + 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */; }; + 340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -197,7 +202,6 @@ 34AC09ED211B39B100997B47 /* ContactFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09CF211B39B000997B47 /* ContactFieldView.swift */; }; 34AC09EE211B39B100997B47 /* EditContactShareNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D0211B39B000997B47 /* EditContactShareNameViewController.swift */; }; 34AC09EF211B39B100997B47 /* ViewControllerUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D1211B39B000997B47 /* ViewControllerUtils.m */; }; - 34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */; }; 34AC09F2211B39B100997B47 /* OWSViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC09D4211B39B000997B47 /* OWSViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34AC09F3211B39B100997B47 /* NewNonContactConversationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AC09D5211B39B100997B47 /* NewNonContactConversationViewController.m */; }; 34AC09F4211B39B100997B47 /* SelectThreadViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34AC09D6211B39B100997B47 /* SelectThreadViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -643,11 +647,16 @@ 34074F5F203D0CBD004596AE /* OWSSounds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSSounds.m; sourceTree = ""; }; 34074F60203D0CBE004596AE /* OWSSounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSSounds.h; sourceTree = ""; }; 34080EFD2225F96D0087E99F /* ImageEditorPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorPaletteView.swift; sourceTree = ""; }; - 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; 34080F01222853E30087E99F /* ImageEditorBrushViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorBrushViewController.swift; sourceTree = ""; }; 34080F03222858DC0087E99F /* OWSViewController+ImageEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OWSViewController+ImageEditor.swift"; sourceTree = ""; }; 340872BE22393CF900CB25B0 /* UIGestureRecognizer+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+OWS.swift"; sourceTree = ""; }; 340872C022394CAA00CB25B0 /* ImageEditorTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageEditorTransform.swift; sourceTree = ""; }; + 340872C32239563500CB25B0 /* ApprovalRailCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApprovalRailCellView.swift; sourceTree = ""; }; + 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentItemCollection.swift; sourceTree = ""; }; + 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = ""; }; + 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentPrepViewController.swift; sourceTree = ""; }; + 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; + 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalInputAccessoryView.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -884,7 +893,6 @@ 34AC09CF211B39B000997B47 /* ContactFieldView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactFieldView.swift; sourceTree = ""; }; 34AC09D0211B39B000997B47 /* EditContactShareNameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditContactShareNameViewController.swift; sourceTree = ""; }; 34AC09D1211B39B000997B47 /* ViewControllerUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewControllerUtils.m; sourceTree = ""; }; - 34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = ""; }; 34AC09D4211B39B000997B47 /* OWSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSViewController.h; sourceTree = ""; }; 34AC09D5211B39B100997B47 /* NewNonContactConversationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewNonContactConversationViewController.m; sourceTree = ""; }; 34AC09D6211B39B100997B47 /* SelectThreadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectThreadViewController.h; sourceTree = ""; }; @@ -1474,6 +1482,19 @@ path = Signal/AudioFiles/messageReceivedSounds; sourceTree = SOURCE_ROOT; }; + 340872C22239563500CB25B0 /* AttachmentApproval */ = { + isa = PBXGroup; + children = ( + 340872C32239563500CB25B0 /* ApprovalRailCellView.swift */, + 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */, + 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */, + 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */, + 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */, + 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */, + ); + path = AttachmentApproval; + sourceTree = ""; + }; 340FC875204DAC8C007AEB0F /* Registration */ = { isa = PBXGroup; children = ( @@ -2119,8 +2140,7 @@ 451F8A361FD7115D005CB9DA /* ViewControllers */ = { isa = PBXGroup; children = ( - 34AC09D2211B39B000997B47 /* AttachmentApprovalViewController.swift */, - 34080EFF22282C880087E99F /* AttachmentCaptionViewController.swift */, + 340872C22239563500CB25B0 /* AttachmentApproval */, 34AC09CF211B39B000997B47 /* ContactFieldView.swift */, 34AC09CD211B39B000997B47 /* ContactShareApprovalViewController.swift */, 34AC09DB211B39B100997B47 /* CountryCodeViewController.h */, @@ -3338,12 +3358,12 @@ buildActionMask = 2147483647; files = ( 45F59A0A2029140500E8D2B0 /* OWSVideoPlayer.swift in Sources */, + 340872C82239563500CB25B0 /* ApprovalRailCellView.swift in Sources */, 45194F951FD7216600333B2C /* TSUnreadIndicatorInteraction.m in Sources */, 4CB93DC22180FF07004B9764 /* ProximityMonitoringManager.swift in Sources */, 34AC09E1211B39B100997B47 /* SelectThreadViewController.m in Sources */, 34AC09EF211B39B100997B47 /* ViewControllerUtils.m in Sources */, 346941A2215D2EE400B5BFAD /* OWSConversationColor.m in Sources */, - 34080F0022282C880087E99F /* AttachmentCaptionViewController.swift in Sources */, 34AC0A17211B39EA00997B47 /* VideoPlayerView.swift in Sources */, 34BEDB1321C43F6A007B0EAE /* ImageEditorView.swift in Sources */, 34AC09EE211B39B100997B47 /* EditContactShareNameViewController.swift in Sources */, @@ -3355,6 +3375,7 @@ 34AC09DF211B39B100997B47 /* OWSNavigationController.m in Sources */, 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */, 34BEDB1721C80BCA007B0EAE /* OWSAnyTouchGestureRecognizer.m in Sources */, + 340872C92239563500CB25B0 /* AttachmentItemCollection.swift in Sources */, 34080EFE2225F96D0087E99F /* ImageEditorPaletteView.swift in Sources */, 34B6A909218B8824007C4606 /* OWS112TypingIndicatorsMigration.swift in Sources */, 4C3E245D21F2B395000AE092 /* DirectionalPanGestureRecognizer.swift in Sources */, @@ -3379,6 +3400,7 @@ 3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */, 34AC09E6211B39B100997B47 /* SelectRecipientViewController.m in Sources */, 4C858A52212DC5E1001B45D3 /* UIImage+OWS.swift in Sources */, + 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */, 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */, 346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */, 34AC0A11211B39EA00997B47 /* OWSLayerView.swift in Sources */, @@ -3397,6 +3419,7 @@ 34AC0A1F211B39EA00997B47 /* AvatarImageView.swift in Sources */, 3466087220E550F400AFFE73 /* ConversationStyle.swift in Sources */, 3478506B1FD9B78A007B8332 /* NoopCallMessageHandler.swift in Sources */, + 340872CA2239563500CB25B0 /* AttachmentApprovalViewController.swift in Sources */, 346129AD1FD1F34E00532771 /* ImageCache.swift in Sources */, 452C7CA72037628B003D51A5 /* Weak.swift in Sources */, 34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */, @@ -3408,6 +3431,7 @@ 346129F91FD5F31400532771 /* OWS104CreateRecipientIdentities.m in Sources */, 346129B61FD1F7E800532771 /* ProfileFetcherJob.swift in Sources */, 34AC09E9211B39B100997B47 /* OWSTableViewController.m in Sources */, + 340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */, 346129F51FD5F31400532771 /* OWS102MoveLoggingPreferenceToUserDefaults.m in Sources */, 45194F8F1FD71FF500333B2C /* ThreadUtil.m in Sources */, 34BEDB0E21C405B0007B0EAE /* ImageEditorModel.swift in Sources */, @@ -3430,6 +3454,7 @@ 346129FF1FD5F31400532771 /* OWS103EnableVideoCalling.m in Sources */, 346129E31FD5C0BE00532771 /* VersionMigrations.m in Sources */, 4C7537892193779700DF5E37 /* OWS113MultiAttachmentMediaMessages.swift in Sources */, + 340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */, 34AC0A16211B39EA00997B47 /* OWSNavigationBar.swift in Sources */, 34BEDB0B21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift in Sources */, 34AC0A1A211B39EA00997B47 /* CommonStrings.swift in Sources */, @@ -3456,7 +3481,6 @@ 349ED992221EE80D008045B0 /* AppPreferences.swift in Sources */, 34AC09E7211B39B100997B47 /* MessageApprovalViewController.swift in Sources */, 34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */, - 34AC09F0211B39B100997B47 /* AttachmentApprovalViewController.swift in Sources */, 451F8A441FD7156B005CB9DA /* BlockListUIUtils.m in Sources */, 34AC0A1E211B39EA00997B47 /* ThreadViewHelper.m in Sources */, 34BBC85A220C7ADA00857249 /* ImageEditorTextItem.swift in Sources */, diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift new file mode 100644 index 000000000..539baaf5b --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift @@ -0,0 +1,88 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit + +protocol ApprovalRailCellViewDelegate: class { + func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) +} + +// MARK: - + +public class ApprovalRailCellView: GalleryRailCellView { + + weak var approvalRailCellDelegate: ApprovalRailCellViewDelegate? + + lazy var deleteButton: UIButton = { + let button = OWSButton { [weak self] in + guard let strongSelf = self else { return } + + guard let attachmentItem = strongSelf.item as? SignalAttachmentItem else { + owsFailDebug("attachmentItem was unexpectedly nil") + return + } + + strongSelf.approvalRailCellDelegate?.approvalRailCellView(strongSelf, didRemoveItem: attachmentItem) + } + + button.setImage(UIImage(named: "x-24")?.withRenderingMode(.alwaysTemplate), for: .normal) + button.tintColor = .white + button.layer.shadowColor = UIColor.black.cgColor + button.layer.shadowRadius = 2 + button.layer.shadowOpacity = 0.66 + button.layer.shadowOffset = .zero + + let kButtonWidth: CGFloat = 24 + button.autoSetDimensions(to: CGSize(width: kButtonWidth, height: kButtonWidth)) + + return button + }() + + lazy var captionIndicator: UIView = { + let image = UIImage(named: "image_editor_caption")?.withRenderingMode(.alwaysTemplate) + let imageView = UIImageView(image: image) + imageView.tintColor = .white + imageView.layer.shadowColor = UIColor.black.cgColor + imageView.layer.shadowRadius = 2 + imageView.layer.shadowOpacity = 0.66 + imageView.layer.shadowOffset = .zero + return imageView + }() + + override func setIsSelected(_ isSelected: Bool) { + super.setIsSelected(isSelected) + + if isSelected { + addSubview(deleteButton) + + deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) + deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4) + } else { + deleteButton.removeFromSuperview() + } + } + + override func configure(item: GalleryRailItem, delegate: GalleryRailCellViewDelegate) { + super.configure(item: item, delegate: delegate) + + var hasCaption = false + if let attachmentItem = item as? SignalAttachmentItem { + if let captionText = attachmentItem.captionText { + hasCaption = captionText.count > 0 + } + } else { + owsFailDebug("Invalid item.") + } + + if hasCaption { + addSubview(captionIndicator) + + captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) + captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: cellBorderWidth + 4) + } else { + captionIndicator.removeFromSuperview() + } + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift new file mode 100644 index 000000000..3e21193b5 --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -0,0 +1,400 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit + +class AttachmentApprovalInputAccessoryView: UIView { + let mediaMessageTextToolbar: MediaMessageTextToolbar + let galleryRailView: GalleryRailView + + var isEditingMediaMessage: Bool { + return mediaMessageTextToolbar.textView.isFirstResponder + } + + let kGalleryRailViewHeight: CGFloat = 72 + + required init(isAddMoreVisible: Bool) { + mediaMessageTextToolbar = MediaMessageTextToolbar(isAddMoreVisible: isAddMoreVisible) + + galleryRailView = GalleryRailView() + galleryRailView.scrollFocusMode = .keepWithinBounds + galleryRailView.autoSetDimension(.height, toSize: kGalleryRailViewHeight) + + super.init(frame: .zero) + + // Specifying auto-resizing mask and an intrinsic content size allows proper + // sizing when used as an input accessory view. + self.autoresizingMask = .flexibleHeight + self.translatesAutoresizingMaskIntoConstraints = false + + backgroundColor = UIColor.black.withAlphaComponent(0.6) + preservesSuperviewLayoutMargins = true + + let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.mediaMessageTextToolbar]) + stackView.axis = .vertical + + addSubview(stackView) + stackView.autoPinEdgesToSuperviewEdges() + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: + + override var intrinsicContentSize: CGSize { + get { + // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify + // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. + return CGSize.zero + } + } +} + +// MARK: - + +// Coincides with Android's max text message length +let kMaxMessageBodyCharacterCount = 2000 + +protocol MediaMessageTextToolbarDelegate: class { + func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) + func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) + func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) + func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) +} + +// MARK: - + +class MediaMessageTextToolbar: UIView, UITextViewDelegate { + + weak var mediaMessageTextToolbarDelegate: MediaMessageTextToolbarDelegate? + + var messageText: String? { + get { return textView.text } + + set { + textView.text = newValue + updatePlaceholderTextViewVisibility() + } + } + + // Layout Constants + + let kMinTextViewHeight: CGFloat = 38 + var maxTextViewHeight: CGFloat { + // About ~4 lines in portrait and ~3 lines in landscape. + // Otherwise we risk obscuring too much of the content. + return UIDevice.current.orientation.isPortrait ? 160 : 100 + } + var textViewHeightConstraint: NSLayoutConstraint! + var textViewHeight: CGFloat + + // MARK: - Initializers + + init(isAddMoreVisible: Bool) { + self.addMoreButton = UIButton(type: .custom) + self.sendButton = UIButton(type: .system) + self.textViewHeight = kMinTextViewHeight + + super.init(frame: CGRect.zero) + + // Specifying autorsizing mask and an intrinsic content size allows proper + // sizing when used as an input accessory view. + self.autoresizingMask = .flexibleHeight + self.translatesAutoresizingMaskIntoConstraints = false + self.backgroundColor = UIColor.clear + + textView.delegate = self + + let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) + addMoreButton.setImage(addMoreIcon, for: .normal) + addMoreButton.tintColor = Theme.darkThemePrimaryColor + addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) + + let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") + sendButton.setTitle(sendTitle, for: .normal) + sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside) + + sendButton.titleLabel?.font = UIFont.ows_mediumFont(withSize: 16) + sendButton.titleLabel?.textAlignment = .center + sendButton.tintColor = Theme.galleryHighlightColor + + // Increase hit area of send button + sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8) + + let contentView = UIView() + contentView.addSubview(sendButton) + contentView.addSubview(textContainer) + contentView.addSubview(lengthLimitLabel) + if isAddMoreVisible { + contentView.addSubview(addMoreButton) + } + + addSubview(contentView) + contentView.autoPinEdgesToSuperviewEdges() + + // Layout + let kToolbarMargin: CGFloat = 8 + + // We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins + // when resigning first responder (verified by auditing with `layoutMarginsDidChange`). + // The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the + // user dismisses the keyboard, giving the input accessory view a wonky layout. + contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin) + + self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) + + // We pin all three edges explicitly rather than doing something like: + // textView.autoPinEdges(toSuperviewMarginsExcludingEdge: .right) + // because that method uses `leading` / `trailing` rather than `left` vs. `right`. + // So it doesn't work as expected with RTL layouts when we explicitly want something + // to be on the right side for both RTL and LTR layouts, like with the send button. + // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209 + textContainer.autoPinEdge(toSuperviewMargin: .top) + textContainer.autoPinEdge(toSuperviewMargin: .bottom) + if isAddMoreVisible { + addMoreButton.autoPinEdge(toSuperviewMargin: .left) + textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin) + addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton) + addMoreButton.setContentHuggingHigh() + addMoreButton.setCompressionResistanceHigh() + } else { + textContainer.autoPinEdge(toSuperviewMargin: .left) + } + + sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin) + sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3) + + sendButton.autoPinEdge(toSuperviewMargin: .right) + sendButton.setContentHuggingHigh() + sendButton.setCompressionResistanceHigh() + + lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left) + lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right) + lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textContainer, withOffset: -6) + lengthLimitLabel.setContentHuggingHigh() + lengthLimitLabel.setCompressionResistanceHigh() + } + + required init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - UIView Overrides + + override var intrinsicContentSize: CGSize { + get { + // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify + // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. + return CGSize.zero + } + } + + // MARK: - Subviews + + private let addMoreButton: UIButton + private let sendButton: UIButton + + private lazy var lengthLimitLabel: UILabel = { + let lengthLimitLabel = UILabel() + + // Length Limit Label shown when the user inputs too long of a message + lengthLimitLabel.textColor = .white + lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.") + lengthLimitLabel.textAlignment = .center + + // Add shadow in case overlayed on white content + lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor + lengthLimitLabel.layer.shadowOffset = .zero + lengthLimitLabel.layer.shadowOpacity = 0.8 + lengthLimitLabel.layer.shadowRadius = 2.0 + lengthLimitLabel.isHidden = true + + return lengthLimitLabel + }() + + lazy var textView: UITextView = { + let textView = buildTextView() + + textView.returnKeyType = .done + textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) + + return textView + }() + + private lazy var placeholderTextView: UITextView = { + let placeholderTextView = buildTextView() + + placeholderTextView.text = NSLocalizedString("MESSAGE_TEXT_FIELD_PLACEHOLDER", comment: "placeholder text for the editable message field") + placeholderTextView.isEditable = false + + return placeholderTextView + }() + + private lazy var textContainer: UIView = { + let textContainer = UIView() + + textContainer.layer.borderColor = Theme.darkThemePrimaryColor.cgColor + textContainer.layer.borderWidth = 0.5 + textContainer.layer.cornerRadius = kMinTextViewHeight / 2 + textContainer.clipsToBounds = true + + textContainer.addSubview(placeholderTextView) + placeholderTextView.autoPinEdgesToSuperviewEdges() + + textContainer.addSubview(textView) + textView.autoPinEdgesToSuperviewEdges() + + return textContainer + }() + + private func buildTextView() -> UITextView { + let textView = MessageTextView() + + textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance + textView.backgroundColor = .clear + textView.tintColor = Theme.darkThemePrimaryColor + + textView.font = UIFont.ows_dynamicTypeBody + textView.textColor = Theme.darkThemePrimaryColor + textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) + + return textView + } + + class MessageTextView: UITextView { + // When creating new lines, contentOffset is animated, but because + // we are simultaneously resizing the text view, this can cause the + // text in the textview to be "too high" in the text view. + // Solution is to disable animation for setting content offset. + override func setContentOffset(_ contentOffset: CGPoint, animated: Bool) { + super.setContentOffset(contentOffset, animated: false) + } + } + + // MARK: - Actions + + @objc func didTapSend() { + mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidTapSend(self) + } + + @objc func didTapAddMore() { + mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidAddMore(self) + } + + // MARK: - UITextViewDelegate + + public func textViewDidChange(_ textView: UITextView) { + updateHeight(textView: textView) + } + + public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + + if !FeatureFlags.sendingMediaWithOversizeText { + let existingText: String = textView.text ?? "" + let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) + + // Don't complicate things by mixing media attachments with oversize text attachments + guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { + Logger.debug("long text was truncated") + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be + // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is + // to just measure the utf8 encoded bytes of the replaced substring. + let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count + + // Accept as much of the input as we can + let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete + if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + self.lengthLimitLabel.isHidden = true + + // After verifying the byte-length is sufficiently small, verify the character count is within bounds. + guard proposedText.count < kMaxMessageBodyCharacterCount else { + Logger.debug("hit attachment message body character count limit") + + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count + + // Accept as much of the input as we can + let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete + if charBudget >= 0 { + let acceptableNewText = String(text.prefix(charBudget)) + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + } + + // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button + // allows the user to get the keyboard out of the way while in the attachment approval view. + if text == "\n" { + textView.resignFirstResponder() + return false + } else { + return true + } + } + + public func textViewDidBeginEditing(_ textView: UITextView) { + mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidBeginEditing(self) + updatePlaceholderTextViewVisibility() + } + + public func textViewDidEndEditing(_ textView: UITextView) { + mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidEndEditing(self) + updatePlaceholderTextViewVisibility() + } + + // MARK: - Helpers + + func updatePlaceholderTextViewVisibility() { + let isHidden: Bool = { + guard !self.textView.isFirstResponder else { + return true + } + + guard let text = self.textView.text else { + return false + } + + guard text.count > 0 else { + return false + } + + return true + }() + + placeholderTextView.isHidden = isHidden + } + + private func updateHeight(textView: UITextView) { + // compute new height assuming width is unchanged + let currentSize = textView.frame.size + let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width) + + if newHeight != textViewHeight { + Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)") + textViewHeight = newHeight + textViewHeightConstraint?.constant = textViewHeight + invalidateIntrinsicContentSize() + } + } + + private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat { + let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) + return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight) + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift new file mode 100644 index 000000000..690d044ed --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -0,0 +1,619 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import AVFoundation +import MediaPlayer +import PromiseKit + +@objc +public protocol AttachmentApprovalViewControllerDelegate: class { + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment]) + @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, addMoreToAttachments attachments: [SignalAttachment]) + @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) +} + +// MARK: - + +@objc +public enum AttachmentApprovalViewControllerMode: UInt { + case modal + case sharedNavigation +} + +// MARK: - + +@objc +public class AttachmentApprovalViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate { + + // MARK: - Properties + + private let mode: AttachmentApprovalViewControllerMode + + public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate? + + // MARK: - Initializers + + @available(*, unavailable, message:"use attachment: constructor instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + let kSpacingBetweenItems: CGFloat = 20 + + @objc + required public init(mode: AttachmentApprovalViewControllerMode, + attachments: [SignalAttachment]) { + assert(attachments.count > 0) + self.mode = mode + let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )} + self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems) + super.init(transitionStyle: .scroll, + navigationOrientation: .horizontal, + options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems]) + self.dataSource = self + self.delegate = self + } + + @objc + public class func wrappedInNavController(attachments: [SignalAttachment], approvalDelegate: AttachmentApprovalViewControllerDelegate) -> OWSNavigationController { + let vc = AttachmentApprovalViewController(mode: .modal, attachments: attachments) + vc.approvalDelegate = approvalDelegate + let navController = OWSNavigationController(rootViewController: vc) + navController.ows_prefersStatusBarHidden = true + + guard let navigationBar = navController.navigationBar as? OWSNavigationBar else { + owsFailDebug("navigationBar was nil or unexpected class") + return navController + } + navigationBar.overrideTheme(type: .clear) + + return navController + } + + // MARK: - Subviews + + var galleryRailView: GalleryRailView { + return bottomToolView.galleryRailView + } + + var mediaMessageTextToolbar: MediaMessageTextToolbar { + return bottomToolView.mediaMessageTextToolbar + } + + lazy var bottomToolView: AttachmentApprovalInputAccessoryView = { + let isAddMoreVisible = mode == .sharedNavigation + let bottomToolView = AttachmentApprovalInputAccessoryView(isAddMoreVisible: isAddMoreVisible) + + return bottomToolView + }() + + // MARK: - View Lifecycle + + public override var prefersStatusBarHidden: Bool { + return true + } + + override public func viewDidLoad() { + super.viewDidLoad() + + self.view.backgroundColor = .black + + // avoid an unpleasant "bounce" which doesn't make sense in the context of a single item. + pagerScrollView?.isScrollEnabled = attachmentItems.count > 1 + + // Bottom Toolbar + galleryRailView.delegate = self + mediaMessageTextToolbar.mediaMessageTextToolbarDelegate = self + + // Navigation + + self.navigationItem.title = nil + + guard let firstItem = attachmentItems.first else { + owsFailDebug("firstItem was unexpectedly nil") + return + } + + self.setCurrentItem(firstItem, direction: .forward, animated: false) + + // layout immediately to avoid animating the layout process during the transition + self.currentPageViewController.view.layoutIfNeeded() + } + + override public func viewWillAppear(_ animated: Bool) { + Logger.debug("") + super.viewWillAppear(animated) + + guard let navigationBar = navigationController?.navigationBar as? OWSNavigationBar else { + owsFailDebug("navigationBar was nil or unexpected class") + return + } + navigationBar.overrideTheme(type: .clear) + + updateNavigationBar() + updateControlVisibility() + } + + override public func viewDidAppear(_ animated: Bool) { + Logger.debug("") + + super.viewDidAppear(animated) + + updateNavigationBar() + updateControlVisibility() + } + + override public func viewWillDisappear(_ animated: Bool) { + Logger.debug("") + super.viewWillDisappear(animated) + } + + override public var inputAccessoryView: UIView? { + bottomToolView.layoutIfNeeded() + return bottomToolView + } + + override public var canBecomeFirstResponder: Bool { + return !shouldHideControls + } + + // MARK: - Navigation Bar + + public func updateNavigationBar() { + guard !shouldHideControls else { + self.navigationItem.leftBarButtonItem = nil + self.navigationItem.rightBarButtonItem = nil + return + } + + var navigationBarItems = [UIView]() + var isShowingCaptionView = false + + if let viewControllers = viewControllers, + viewControllers.count == 1, + let firstViewController = viewControllers.first as? AttachmentPrepViewController { + navigationBarItems = firstViewController.navigationBarItems() + isShowingCaptionView = firstViewController.isShowingCaptionView + } + + guard !isShowingCaptionView else { + // Hide all navigation bar items while the caption view is open. + self.navigationItem.leftBarButtonItem = nil + self.navigationItem.rightBarButtonItem = nil + return + } + + updateNavigationBar(navigationBarItems: navigationBarItems) + + let hasCancel = (mode != .sharedNavigation) + if hasCancel { + let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, + target: self, action: #selector(cancelPressed)) + cancelButton.tintColor = .white + self.navigationItem.leftBarButtonItem = cancelButton + } else { + // Note: using a custom leftBarButtonItem breaks the interactive pop gesture. + self.navigationItem.leftBarButtonItem = self.createOWSBackButton() + } + } + + // MARK: - Control Visibility + + public var shouldHideControls: Bool { + guard let pageViewController = pageViewControllers.first else { + return false + } + return pageViewController.shouldHideControls + } + + private func updateControlVisibility() { + if shouldHideControls { + if isFirstResponder { + resignFirstResponder() + } + } else { + if !isFirstResponder { + becomeFirstResponder() + } + } + } + + // MARK: - View Helpers + + func remove(attachmentItem: SignalAttachmentItem) { + if attachmentItem == currentItem { + if let nextItem = attachmentItemCollection.itemAfter(item: attachmentItem) { + setCurrentItem(nextItem, direction: .forward, animated: true) + } else if let prevItem = attachmentItemCollection.itemBefore(item: attachmentItem) { + setCurrentItem(prevItem, direction: .reverse, animated: true) + } else { + owsFailDebug("removing last item shouldn't be possible because rail should not be visible") + return + } + } + + guard let cell = galleryRailView.cellViews.first(where: { $0.item === attachmentItem }) else { + owsFailDebug("cell was unexpectedly nil") + return + } + + UIView.animate(withDuration: 0.2, + animations: { + // shrink stack view item until it disappears + cell.isHidden = true + + // simultaneously fade out + cell.alpha = 0 + }, + completion: { _ in + self.attachmentItemCollection.remove(item: attachmentItem) + self.updateMediaRail() + }) + } + + lazy var pagerScrollView: UIScrollView? = { + // This is kind of a hack. Since we don't have first class access to the superview's `scrollView` + // we traverse the view hierarchy until we find it. + let pagerScrollView = view.subviews.first { $0 is UIScrollView } as? UIScrollView + assert(pagerScrollView != nil) + + return pagerScrollView + }() + + // MARK: - UIPageViewControllerDelegate + + public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) { + Logger.debug("") + + assert(pendingViewControllers.count == 1) + pendingViewControllers.forEach { viewController in + guard let pendingPage = viewController as? AttachmentPrepViewController else { + owsFailDebug("unexpected viewController: \(viewController)") + return + } + + // use compact scale when keyboard is popped. + let scale: AttachmentPrepViewController.AttachmentViewScale = self.isFirstResponder ? .fullsize : .compact + pendingPage.setAttachmentViewScale(scale, animated: false) + } + } + + public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted: Bool) { + Logger.debug("") + + assert(previousViewControllers.count == 1) + previousViewControllers.forEach { viewController in + guard let previousPage = viewController as? AttachmentPrepViewController else { + owsFailDebug("unexpected viewController: \(viewController)") + return + } + + if transitionCompleted { + previousPage.zoomOut(animated: false) + updateMediaRail() + } + } + + updateNavigationBar() + updateControlVisibility() + } + + // MARK: - UIPageViewControllerDataSource + + public func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? { + guard let currentViewController = viewController as? AttachmentPrepViewController else { + owsFailDebug("unexpected viewController: \(viewController)") + return nil + } + + let currentItem = currentViewController.attachmentItem + guard let previousItem = attachmentItem(before: currentItem) else { + return nil + } + + guard let previousPage: AttachmentPrepViewController = buildPage(item: previousItem) else { + return nil + } + + return previousPage + } + + public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { + Logger.debug("") + + guard let currentViewController = viewController as? AttachmentPrepViewController else { + owsFailDebug("unexpected viewController: \(viewController)") + return nil + } + + let currentItem = currentViewController.attachmentItem + guard let nextItem = attachmentItem(after: currentItem) else { + return nil + } + + guard let nextPage: AttachmentPrepViewController = buildPage(item: nextItem) else { + return nil + } + + return nextPage + } + + public var currentPageViewController: AttachmentPrepViewController { + return pageViewControllers.first! + } + + public var pageViewControllers: [AttachmentPrepViewController] { + return super.viewControllers!.map { $0 as! AttachmentPrepViewController } + } + + var currentItem: SignalAttachmentItem! { + get { + return currentPageViewController.attachmentItem + } + set { + setCurrentItem(newValue, direction: .forward, animated: false) + } + } + + private var cachedPages: [SignalAttachmentItem: AttachmentPrepViewController] = [:] + private func buildPage(item: SignalAttachmentItem) -> AttachmentPrepViewController? { + + if let cachedPage = cachedPages[item] { + Logger.debug("cache hit.") + return cachedPage + } + + Logger.debug("cache miss.") + let viewController = AttachmentPrepViewController(attachmentItem: item) + viewController.prepDelegate = self + cachedPages[item] = viewController + + return viewController + } + + private func setCurrentItem(_ item: SignalAttachmentItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) { + guard let page = self.buildPage(item: item) else { + owsFailDebug("unexpectedly unable to build new page") + return + } + + page.loadViewIfNeeded() + + self.setViewControllers([page], direction: direction, animated: isAnimated, completion: nil) + updateMediaRail() + } + + func updateMediaRail() { + guard let currentItem = self.currentItem else { + owsFailDebug("currentItem was unexpectedly nil") + return + } + + let cellViewBuilder: () -> ApprovalRailCellView = { [weak self] in + let cell = ApprovalRailCellView() + cell.approvalRailCellDelegate = self + return cell + } + + galleryRailView.configureCellViews(itemProvider: attachmentItemCollection, + focusedItem: currentItem, + cellViewBuilder: cellViewBuilder) + + galleryRailView.isHidden = attachmentItemCollection.attachmentItems.count < 2 + } + + let attachmentItemCollection: AttachmentItemCollection + + var attachmentItems: [SignalAttachmentItem] { + return attachmentItemCollection.attachmentItems + } + + var attachments: [SignalAttachment] { + return attachmentItems.map { (attachmentItem) in + autoreleasepool { + return self.processedAttachment(forAttachmentItem: attachmentItem) + } + } + } + + // For any attachments edited with the image editor, returns a + // new SignalAttachment that reflects those changes. Otherwise, + // returns the original attachment. + // + // If any errors occurs in the export process, we fail over to + // sending the original attachment. This seems better than trying + // to involve the user in resolving the issue. + func processedAttachment(forAttachmentItem attachmentItem: SignalAttachmentItem) -> SignalAttachment { + guard let imageEditorModel = attachmentItem.imageEditorModel else { + // Image was not edited. + return attachmentItem.attachment + } + guard imageEditorModel.isDirty() else { + // Image editor has no changes. + return attachmentItem.attachment + } + guard let dstImage = ImageEditorCanvasView.renderForOutput(model: imageEditorModel, transform: imageEditorModel.currentTransform()) else { + owsFailDebug("Could not render for output.") + return attachmentItem.attachment + } + var dataUTI = kUTTypeImage as String + guard let dstData: Data = { + let isLossy: Bool = attachmentItem.attachment.mimeType.caseInsensitiveCompare(OWSMimeTypeImageJpeg) == .orderedSame + if isLossy { + dataUTI = kUTTypeJPEG as String + return UIImageJPEGRepresentation(dstImage, 0.9) + } else { + dataUTI = kUTTypePNG as String + return UIImagePNGRepresentation(dstImage) + } + }() else { + owsFailDebug("Could not export for output.") + return attachmentItem.attachment + } + guard let dataSource = DataSourceValue.dataSource(with: dstData, utiType: dataUTI) else { + owsFailDebug("Could not prepare data source for output.") + return attachmentItem.attachment + } + + // Rewrite the filename's extension to reflect the output file format. + var filename: String? = attachmentItem.attachment.sourceFilename + if let sourceFilename = attachmentItem.attachment.sourceFilename { + if let fileExtension: String = MIMETypeUtil.fileExtension(forUTIType: dataUTI) { + filename = (sourceFilename as NSString).deletingPathExtension.appendingFileExtension(fileExtension) + } + } + dataSource.sourceFilename = filename + + let dstAttachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .original) + if let attachmentError = dstAttachment.error { + owsFailDebug("Could not prepare attachment for output: \(attachmentError).") + return attachmentItem.attachment + } + return dstAttachment + } + + func attachmentItem(before currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { + guard let currentIndex = attachmentItems.index(of: currentItem) else { + owsFailDebug("currentIndex was unexpectedly nil") + return nil + } + + let index: Int = attachmentItems.index(before: currentIndex) + guard let previousItem = attachmentItems[safe: index] else { + // already at first item + return nil + } + + return previousItem + } + + func attachmentItem(after currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { + guard let currentIndex = attachmentItems.index(of: currentItem) else { + owsFailDebug("currentIndex was unexpectedly nil") + return nil + } + + let index: Int = attachmentItems.index(after: currentIndex) + guard let nextItem = attachmentItems[safe: index] else { + // already at last item + return nil + } + + return nextItem + } + + // MARK: - Event Handlers + + @objc func cancelPressed(sender: UIButton) { + self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) + } +} + +extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate { + func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + currentPageViewController.setAttachmentViewScale(.compact, animated: true) + } + + func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + currentPageViewController.setAttachmentViewScale(.fullsize, animated: true) + } + + func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + // Toolbar flickers in and out if there are errors + // and remains visible momentarily after share extension is dismissed. + // It's easiest to just hide it at this point since we're done with it. + currentPageViewController.shouldAllowAttachmentViewResizing = false + mediaMessageTextToolbar.isUserInteractionEnabled = false + mediaMessageTextToolbar.isHidden = true + + approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: mediaMessageTextToolbar.messageText) + } + + func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + self.approvalDelegate?.attachmentApproval?(self, addMoreToAttachments: attachments) + } +} + +// MARK: - + +extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate { + func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { + self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) + + updateMediaRail() + } + + func prepViewControllerUpdateNavigationBar() { + updateNavigationBar() + } + + func prepViewControllerUpdateControls() { + updateControlVisibility() + } + + func prepViewControllerAttachmentCount() -> Int { + return attachmentItemCollection.count + } +} + +// MARK: GalleryRail + +extension SignalAttachmentItem: GalleryRailItem { + var aspectRatio: CGFloat { + return self.imageSize.aspectRatio + } + + func getRailImage() -> Promise { + return self.getThumbnailImage() + } +} + +// MARK: - + +extension AttachmentItemCollection: GalleryRailItemProvider { + var railItems: [GalleryRailItem] { + return self.attachmentItems + } +} + +// MARK: - + +extension AttachmentApprovalViewController: GalleryRailViewDelegate { + public func galleryRailView(_ galleryRailView: GalleryRailView, didTapItem imageRailItem: GalleryRailItem) { + guard let targetItem = imageRailItem as? SignalAttachmentItem else { + owsFailDebug("unexpected imageRailItem: \(imageRailItem)") + return + } + + guard let currentIndex = attachmentItems.index(of: currentItem) else { + owsFailDebug("currentIndex was unexpectedly nil") + return + } + + guard let targetIndex = attachmentItems.index(of: targetItem) else { + owsFailDebug("targetIndex was unexpectedly nil") + return + } + + let direction: UIPageViewControllerNavigationDirection = currentIndex < targetIndex ? .forward : .reverse + + self.setCurrentItem(targetItem, direction: direction, animated: true) + } +} + +// MARK: - + +enum KeyboardScenario { + case hidden, editingMessage, editingCaption +} + +// MARK: - + +extension AttachmentApprovalViewController: ApprovalRailCellViewDelegate { + func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) { + remove(attachmentItem: attachmentItem) + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift similarity index 99% rename from SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift rename to SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift index e33fe9363..2c3aa4ed1 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift @@ -9,6 +9,8 @@ protocol AttachmentCaptionDelegate: class { func captionViewDidCancel() } +// MARK: - + class AttachmentCaptionViewController: OWSViewController { weak var delegate: AttachmentCaptionDelegate? diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift new file mode 100644 index 000000000..9637ee098 --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift @@ -0,0 +1,111 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import PromiseKit + +class SignalAttachmentItem: Hashable { + + enum SignalAttachmentItemError: Error { + case noThumbnail + } + + let attachment: SignalAttachment + + // This might be nil if the attachment is not a valid image. + var imageEditorModel: ImageEditorModel? + + init(attachment: SignalAttachment) { + self.attachment = attachment + + // Try and make a ImageEditorModel. + // This will only apply for valid images. + if ImageEditorModel.isFeatureEnabled, + let dataUrl: URL = attachment.dataUrl, + dataUrl.isFileURL { + let path = dataUrl.path + do { + imageEditorModel = try ImageEditorModel(srcImagePath: path) + } catch { + // Usually not an error; this usually indicates invalid input. + Logger.warn("Could not create image editor: \(error)") + } + } + } + + // MARK: + + var captionText: String? { + return attachment.captionText + } + + var imageSize: CGSize = .zero + + func getThumbnailImage() -> Promise { + return DispatchQueue.global().async(.promise) { () -> UIImage in + guard let image = self.attachment.staticThumbnail() else { + throw SignalAttachmentItemError.noThumbnail + } + return image + }.tap { result in + switch result { + case .fulfilled(let image): + self.imageSize = image.size + case .rejected(let error): + owsFailDebug("failed with error: \(error)") + } + } + } + + // MARK: Hashable + + public var hashValue: Int { + return attachment.hashValue + } + + // MARK: Equatable + + static func == (lhs: SignalAttachmentItem, rhs: SignalAttachmentItem) -> Bool { + return lhs.attachment == rhs.attachment + } +} + +// MARK: - + +class AttachmentItemCollection { + private (set) var attachmentItems: [SignalAttachmentItem] + init(attachmentItems: [SignalAttachmentItem]) { + self.attachmentItems = attachmentItems + } + + func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? { + guard let currentIndex = attachmentItems.index(of: item) else { + owsFailDebug("currentIndex was unexpectedly nil") + return nil + } + + let nextIndex = attachmentItems.index(after: currentIndex) + + return attachmentItems[safe: nextIndex] + } + + func itemBefore(item: SignalAttachmentItem) -> SignalAttachmentItem? { + guard let currentIndex = attachmentItems.index(of: item) else { + owsFailDebug("currentIndex was unexpectedly nil") + return nil + } + + let prevIndex = attachmentItems.index(before: currentIndex) + + return attachmentItems[safe: prevIndex] + } + + func remove(item: SignalAttachmentItem) { + attachmentItems = attachmentItems.filter { $0 != item } + } + + var count: Int { + return attachmentItems.count + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift new file mode 100644 index 000000000..1e273776a --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -0,0 +1,561 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit +import AVFoundation + +protocol AttachmentPrepViewControllerDelegate: class { + func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) + + func prepViewControllerUpdateNavigationBar() + + func prepViewControllerUpdateControls() + + func prepViewControllerAttachmentCount() -> Int +} + +// MARK: - + +public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate { + // We sometimes shrink the attachment view so that it remains somewhat visible + // when the keyboard is presented. + public enum AttachmentViewScale { + case fullsize, compact + } + + // MARK: - Properties + + weak var prepDelegate: AttachmentPrepViewControllerDelegate? + + let attachmentItem: SignalAttachmentItem + var attachment: SignalAttachment { + return attachmentItem.attachment + } + + private var videoPlayer: OWSVideoPlayer? + + private(set) var mediaMessageView: MediaMessageView! + private(set) var scrollView: UIScrollView! + private(set) var contentContainer: UIView! + private(set) var playVideoButton: UIView? + private var imageEditorView: ImageEditorView? + + public var isShowingCaptionView = false { + didSet { + prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() + } + } + + public var shouldHideControls: Bool { + guard let imageEditorView = imageEditorView else { + return false + } + return imageEditorView.shouldHideControls + } + + // MARK: - Initializers + + init(attachmentItem: SignalAttachmentItem) { + self.attachmentItem = attachmentItem + super.init(nibName: nil, bundle: nil) + assert(!attachment.hasError) + } + + public required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - Subviews + + // TODO: Do we still need this? + lazy var touchInterceptorView: UIView = { + let touchInterceptorView = UIView() + let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:))) + touchInterceptorView.addGestureRecognizer(tapGesture) + + return touchInterceptorView + }() + + // MARK: - View Lifecycle + + override public func loadView() { + self.view = UIView() + + self.mediaMessageView = MediaMessageView(attachment: attachment, mode: .attachmentApproval) + + // Anything that should be shrunk when user pops keyboard lives in the contentContainer. + let contentContainer = UIView() + self.contentContainer = contentContainer + view.addSubview(contentContainer) + contentContainer.autoPinEdgesToSuperviewEdges() + + // Scroll View - used to zoom/pan on images and video + scrollView = UIScrollView() + contentContainer.addSubview(scrollView) + scrollView.delegate = self + scrollView.showsHorizontalScrollIndicator = false + scrollView.showsVerticalScrollIndicator = false + + // Panning should stop pretty soon after the user stops scrolling + scrollView.decelerationRate = UIScrollViewDecelerationRateFast + + // We want scroll view content up and behind the system status bar content + // but we want other content (e.g. bar buttons) to respect the top layout guide. + self.automaticallyAdjustsScrollViewInsets = false + + scrollView.autoPinEdgesToSuperviewEdges() + + let backgroundColor = UIColor.black + self.view.backgroundColor = backgroundColor + + // Create full screen container view so the scrollView + // can compute an appropriate content size in which to center + // our media view. + let containerView = UIView.container() + scrollView.addSubview(containerView) + containerView.autoPinEdgesToSuperviewEdges() + containerView.autoMatch(.height, to: .height, of: self.view) + containerView.autoMatch(.width, to: .width, of: self.view) + + containerView.addSubview(mediaMessageView) + mediaMessageView.autoPinEdgesToSuperviewEdges() + + #if DEBUG + if let imageEditorModel = attachmentItem.imageEditorModel { + + let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) + if imageEditorView.configureSubviews() { + self.imageEditorView = imageEditorView + + mediaMessageView.isHidden = true + + view.addSubview(imageEditorView) + imageEditorView.autoPinEdgesToSuperviewEdges() + + imageEditorUpdateNavigationBar() + } + } + #endif + + if isZoomable { + // Add top and bottom gradients to ensure toolbar controls are legible + // when placed over image/video preview which may be a clashing color. + let topGradient = GradientView(from: backgroundColor, to: UIColor.clear) + self.view.addSubview(topGradient) + topGradient.autoPinWidthToSuperview() + topGradient.autoPinEdge(toSuperviewEdge: .top) + topGradient.autoSetDimension(.height, toSize: ScaleFromIPhone5(60)) + } + + // Hide the play button embedded in the MediaView and replace it with our own. + // This allows us to zoom in on the media view without zooming in on the button + if attachment.isVideo { + + guard let videoURL = attachment.dataUrl else { + owsFailDebug("Missing videoURL") + return + } + + let player = OWSVideoPlayer(url: videoURL) + self.videoPlayer = player + player.delegate = self + + let playerView = VideoPlayerView() + playerView.player = player.avPlayer + self.mediaMessageView.addSubview(playerView) + playerView.autoPinEdgesToSuperviewEdges() + + let pauseGesture = UITapGestureRecognizer(target: self, action: #selector(didTapPlayerView(_:))) + playerView.addGestureRecognizer(pauseGesture) + + let progressBar = PlayerProgressBar() + progressBar.player = player.avPlayer + progressBar.delegate = self + + // we don't want the progress bar to zoom during "pinch-to-zoom" + // but we do want it to shrink with the media content when the user + // pops the keyboard. + contentContainer.addSubview(progressBar) + + progressBar.autoPin(toTopLayoutGuideOf: self, withInset: 0) + progressBar.autoPinWidthToSuperview() + progressBar.autoSetDimension(.height, toSize: 44) + + self.mediaMessageView.videoPlayButton?.isHidden = true + let playButton = UIButton() + self.playVideoButton = playButton + playButton.accessibilityLabel = NSLocalizedString("PLAY_BUTTON_ACCESSABILITY_LABEL", comment: "Accessibility label for button to start media playback") + playButton.setBackgroundImage(#imageLiteral(resourceName: "play_button"), for: .normal) + playButton.contentMode = .scaleAspectFit + + let playButtonWidth = ScaleFromIPhone5(70) + playButton.autoSetDimensions(to: CGSize(width: playButtonWidth, height: playButtonWidth)) + self.contentContainer.addSubview(playButton) + + playButton.addTarget(self, action: #selector(playButtonTapped), for: .touchUpInside) + playButton.autoCenterInSuperview() + } + + // Caption + + view.addSubview(touchInterceptorView) + touchInterceptorView.autoPinEdgesToSuperviewEdges() + touchInterceptorView.isHidden = true + } + + override public func viewWillAppear(_ animated: Bool) { + Logger.debug("") + + super.viewWillAppear(animated) + + prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() + } + + override public func viewDidAppear(_ animated: Bool) { + Logger.debug("") + + super.viewDidAppear(animated) + + prepDelegate?.prepViewControllerUpdateNavigationBar() + prepDelegate?.prepViewControllerUpdateControls() + } + + override public func viewWillLayoutSubviews() { + Logger.debug("") + super.viewWillLayoutSubviews() + + // e.g. if flipping to/from landscape + updateMinZoomScaleForSize(view.bounds.size) + + ensureAttachmentViewScale(animated: false) + } + + // MARK: - Navigation Bar + + public func navigationBarItems() -> [UIView] { + let captionButton = navigationBarButton(imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) + + guard let imageEditorView = imageEditorView else { + // Show the "add caption" button for non-image attachments if + // there is more than one attachment. + if let prepDelegate = prepDelegate, + prepDelegate.prepViewControllerAttachmentCount() > 1 { + return [captionButton] + } + return [] + } + var navigationBarItems = imageEditorView.navigationBarItems() + + // Show the caption UI if there's more than one attachment + // OR if the attachment already has a caption. + var shouldShowCaptionUI = attachmentCount() > 0 + if let captionText = attachmentItem.captionText, captionText.count > 0 { + shouldShowCaptionUI = true + } + if shouldShowCaptionUI { + navigationBarItems.append(captionButton) + } + + return navigationBarItems + } + + private func attachmentCount() -> Int { + guard let prepDelegate = prepDelegate else { + owsFailDebug("Missing prepDelegate.") + return 0 + } + return prepDelegate.prepViewControllerAttachmentCount() + } + + @objc func didTapCaption(sender: UIButton) { + Logger.verbose("") + + presentCaptionView() + } + + private func presentCaptionView() { + let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) + self.imageEditor(presentFullScreenView: view, isTransparent: true) + + isShowingCaptionView = true + } + + // MARK: - Event Handlers + + @objc + func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) { + Logger.info("") + touchInterceptorView.isHidden = true + } + + @objc + public func didTapPlayerView(_ gestureRecognizer: UIGestureRecognizer) { + assert(self.videoPlayer != nil) + self.pauseVideo() + } + + @objc + public func playButtonTapped() { + self.playVideo() + } + + // MARK: - Video + + private func playVideo() { + Logger.info("") + + guard let videoPlayer = self.videoPlayer else { + owsFailDebug("video player was unexpectedly nil") + return + } + + guard let playVideoButton = self.playVideoButton else { + owsFailDebug("playVideoButton was unexpectedly nil") + return + } + UIView.animate(withDuration: 0.1) { + playVideoButton.alpha = 0.0 + } + videoPlayer.play() + } + + private func pauseVideo() { + guard let videoPlayer = self.videoPlayer else { + owsFailDebug("video player was unexpectedly nil") + return + } + + videoPlayer.pause() + guard let playVideoButton = self.playVideoButton else { + owsFailDebug("playVideoButton was unexpectedly nil") + return + } + UIView.animate(withDuration: 0.1) { + playVideoButton.alpha = 1.0 + } + } + + @objc + public func videoPlayerDidPlayToCompletion(_ videoPlayer: OWSVideoPlayer) { + guard let playVideoButton = self.playVideoButton else { + owsFailDebug("playVideoButton was unexpectedly nil") + return + } + + UIView.animate(withDuration: 0.1) { + playVideoButton.alpha = 1.0 + } + } + + public func playerProgressBarDidStartScrubbing(_ playerProgressBar: PlayerProgressBar) { + guard let videoPlayer = self.videoPlayer else { + owsFailDebug("video player was unexpectedly nil") + return + } + videoPlayer.pause() + } + + public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, scrubbedToTime time: CMTime) { + guard let videoPlayer = self.videoPlayer else { + owsFailDebug("video player was unexpectedly nil") + return + } + + videoPlayer.seek(to: time) + } + + public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, didFinishScrubbingAtTime time: CMTime, shouldResumePlayback: Bool) { + guard let videoPlayer = self.videoPlayer else { + owsFailDebug("video player was unexpectedly nil") + return + } + + videoPlayer.seek(to: time) + if (shouldResumePlayback) { + videoPlayer.play() + } + } + + // MARK: - Helpers + + var isZoomable: Bool { + return attachment.isImage || attachment.isVideo + } + + func zoomOut(animated: Bool) { + if self.scrollView.zoomScale != self.scrollView.minimumZoomScale { + self.scrollView.setZoomScale(self.scrollView.minimumZoomScale, animated: animated) + } + } + + // When the keyboard is popped, it can obscure the attachment view. + // so we sometimes allow resizing the attachment. + var shouldAllowAttachmentViewResizing: Bool = true + + var attachmentViewScale: AttachmentViewScale = .fullsize + public func setAttachmentViewScale(_ attachmentViewScale: AttachmentViewScale, animated: Bool) { + self.attachmentViewScale = attachmentViewScale + ensureAttachmentViewScale(animated: animated) + } + + func ensureAttachmentViewScale(animated: Bool) { + let animationDuration = animated ? 0.2 : 0 + guard shouldAllowAttachmentViewResizing else { + if self.contentContainer.transform != CGAffineTransform.identity { + UIView.animate(withDuration: animationDuration) { + self.contentContainer.transform = CGAffineTransform.identity + } + } + return + } + + switch attachmentViewScale { + case .fullsize: + guard self.contentContainer.transform != .identity else { + return + } + UIView.animate(withDuration: animationDuration) { + self.contentContainer.transform = CGAffineTransform.identity + } + case .compact: + guard self.contentContainer.transform == .identity else { + return + } + UIView.animate(withDuration: animationDuration) { + let kScaleFactor: CGFloat = 0.7 + let scale = CGAffineTransform(scaleX: kScaleFactor, y: kScaleFactor) + + let originalHeight = self.scrollView.bounds.size.height + + // Position the new scaled item to be centered with respect + // to it's new size. + let heightDelta = originalHeight * (1 - kScaleFactor) + let translate = CGAffineTransform(translationX: 0, y: -heightDelta / 2) + + self.contentContainer.transform = scale.concatenating(translate) + } + } + } +} + +// MARK: - + +extension AttachmentPrepViewController: AttachmentCaptionDelegate { + func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) { + let attachment = attachmentItem.attachment + attachment.captionText = captionText + prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem) + + isShowingCaptionView = false + } + + func captionViewDidCancel() { + isShowingCaptionView = false + } +} + +// MARK: - + +extension AttachmentPrepViewController: UIScrollViewDelegate { + + public func viewForZooming(in scrollView: UIScrollView) -> UIView? { + if isZoomable { + return mediaMessageView + } else { + // don't zoom for audio or generic attachments. + return nil + } + } + + fileprivate func updateMinZoomScaleForSize(_ size: CGSize) { + Logger.debug("") + + // Ensure bounds have been computed + mediaMessageView.layoutIfNeeded() + guard mediaMessageView.bounds.width > 0, mediaMessageView.bounds.height > 0 else { + Logger.warn("bad bounds") + return + } + + let widthScale = size.width / mediaMessageView.bounds.width + let heightScale = size.height / mediaMessageView.bounds.height + let minScale = min(widthScale, heightScale) + scrollView.maximumZoomScale = minScale * 5.0 + scrollView.minimumZoomScale = minScale + scrollView.zoomScale = minScale + } + + // Keep the media view centered within the scroll view as you zoom + public func scrollViewDidZoom(_ scrollView: UIScrollView) { + // The scroll view has zoomed, so you need to re-center the contents + let scrollViewSize = self.scrollViewVisibleSize + + // First assume that mediaMessageView center coincides with the contents center + // This is correct when the mediaMessageView is bigger than scrollView due to zoom + var contentCenter = CGPoint(x: (scrollView.contentSize.width / 2), y: (scrollView.contentSize.height / 2)) + + let scrollViewCenter = self.scrollViewCenter + + // if mediaMessageView is smaller than the scrollView visible size - fix the content center accordingly + if self.scrollView.contentSize.width < scrollViewSize.width { + contentCenter.x = scrollViewCenter.x + } + + if self.scrollView.contentSize.height < scrollViewSize.height { + contentCenter.y = scrollViewCenter.y + } + + self.mediaMessageView.center = contentCenter + } + + // return the scroll view center + private var scrollViewCenter: CGPoint { + let size = scrollViewVisibleSize + return CGPoint(x: (size.width / 2), y: (size.height / 2)) + } + + // Return scrollview size without the area overlapping with tab and nav bar. + private var scrollViewVisibleSize: CGSize { + let contentInset = scrollView.contentInset + let scrollViewSize = scrollView.bounds.standardized.size + let width = scrollViewSize.width - (contentInset.left + contentInset.right) + let height = scrollViewSize.height - (contentInset.top + contentInset.bottom) + return CGSize(width: width, height: height) + } +} + +// MARK: - + +extension AttachmentPrepViewController: ImageEditorViewDelegate { + public func imageEditor(presentFullScreenView viewController: UIViewController, + isTransparent: Bool) { + + let navigationController = OWSNavigationController(rootViewController: viewController) + navigationController.modalPresentationStyle = (isTransparent + ? .overFullScreen + : .fullScreen) + + if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { + navigationBar.overrideTheme(type: .clear) + } else { + owsFailDebug("navigationBar was nil or unexpected class") + } + + self.present(navigationController, animated: false) { + // Do nothing. + } + } + + public func imageEditorUpdateNavigationBar() { + prepDelegate?.prepViewControllerUpdateNavigationBar() + } + + public func imageEditorUpdateControls() { + prepDelegate?.prepViewControllerUpdateControls() + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift deleted file mode 100644 index 026aaa433..000000000 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ /dev/null @@ -1,1738 +0,0 @@ -// -// Copyright (c) 2019 Open Whisper Systems. All rights reserved. -// - -import Foundation -import AVFoundation -import MediaPlayer -import PromiseKit - -@objc -public protocol AttachmentApprovalViewControllerDelegate: class { - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment]) - @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, addMoreToAttachments attachments: [SignalAttachment]) - @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) -} - -// MARK: - - -class AttachmentItemCollection { - private (set) var attachmentItems: [SignalAttachmentItem] - init(attachmentItems: [SignalAttachmentItem]) { - self.attachmentItems = attachmentItems - } - - func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: item) else { - owsFailDebug("currentIndex was unexpectedly nil") - return nil - } - - let nextIndex = attachmentItems.index(after: currentIndex) - - return attachmentItems[safe: nextIndex] - } - - func itemBefore(item: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: item) else { - owsFailDebug("currentIndex was unexpectedly nil") - return nil - } - - let prevIndex = attachmentItems.index(before: currentIndex) - - return attachmentItems[safe: prevIndex] - } - - func remove(item: SignalAttachmentItem) { - attachmentItems = attachmentItems.filter { $0 != item } - } - - var count: Int { - return attachmentItems.count - } -} - -// MARK: - - -class SignalAttachmentItem: Hashable { - - enum SignalAttachmentItemError: Error { - case noThumbnail - } - - let attachment: SignalAttachment - - // This might be nil if the attachment is not a valid image. - var imageEditorModel: ImageEditorModel? - - init(attachment: SignalAttachment) { - self.attachment = attachment - - // Try and make a ImageEditorModel. - // This will only apply for valid images. - if ImageEditorModel.isFeatureEnabled, - let dataUrl: URL = attachment.dataUrl, - dataUrl.isFileURL { - let path = dataUrl.path - do { - imageEditorModel = try ImageEditorModel(srcImagePath: path) - } catch { - // Usually not an error; this usually indicates invalid input. - Logger.warn("Could not create image editor: \(error)") - } - } - } - - // MARK: - - var captionText: String? { - return attachment.captionText - } - - var imageSize: CGSize = .zero - - func getThumbnailImage() -> Promise { - return DispatchQueue.global().async(.promise) { () -> UIImage in - guard let image = self.attachment.staticThumbnail() else { - throw SignalAttachmentItemError.noThumbnail - } - return image - }.tap { result in - switch result { - case .fulfilled(let image): - self.imageSize = image.size - case .rejected(let error): - owsFailDebug("failed with error: \(error)") - } - } - } - - // MARK: Hashable - - public var hashValue: Int { - return attachment.hashValue - } - - // MARK: Equatable - - static func == (lhs: SignalAttachmentItem, rhs: SignalAttachmentItem) -> Bool { - return lhs.attachment == rhs.attachment - } -} - -// MARK: - - -@objc -public enum AttachmentApprovalViewControllerMode: UInt { - case modal - case sharedNavigation -} - -// MARK: - - -@objc -public class AttachmentApprovalViewController: UIPageViewController, UIPageViewControllerDataSource, UIPageViewControllerDelegate { - - // MARK: - Properties - - private let mode: AttachmentApprovalViewControllerMode - - public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate? - - // MARK: - Initializers - - @available(*, unavailable, message:"use attachment: constructor instead.") - required public init?(coder aDecoder: NSCoder) { - notImplemented() - } - - let kSpacingBetweenItems: CGFloat = 20 - - @objc - required public init(mode: AttachmentApprovalViewControllerMode, - attachments: [SignalAttachment]) { - assert(attachments.count > 0) - self.mode = mode - let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )} - self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems) - super.init(transitionStyle: .scroll, - navigationOrientation: .horizontal, - options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems]) - self.dataSource = self - self.delegate = self - } - - @objc - public class func wrappedInNavController(attachments: [SignalAttachment], approvalDelegate: AttachmentApprovalViewControllerDelegate) -> OWSNavigationController { - let vc = AttachmentApprovalViewController(mode: .modal, attachments: attachments) - vc.approvalDelegate = approvalDelegate - let navController = OWSNavigationController(rootViewController: vc) - navController.ows_prefersStatusBarHidden = true - - guard let navigationBar = navController.navigationBar as? OWSNavigationBar else { - owsFailDebug("navigationBar was nil or unexpected class") - return navController - } - navigationBar.overrideTheme(type: .clear) - - return navController - } - - // MARK: - Subviews - - var galleryRailView: GalleryRailView { - return bottomToolView.galleryRailView - } - - var mediaMessageTextToolbar: MediaMessageTextToolbar { - return bottomToolView.mediaMessageTextToolbar - } - - lazy var bottomToolView: BottomToolView = { - let isAddMoreVisible = mode == .sharedNavigation - let bottomToolView = BottomToolView(isAddMoreVisible: isAddMoreVisible) - - return bottomToolView - }() - - // MARK: - View Lifecycle - - public override var prefersStatusBarHidden: Bool { - return true - } - - override public func viewDidLoad() { - super.viewDidLoad() - - self.view.backgroundColor = .black - - // avoid an unpleasant "bounce" which doesn't make sense in the context of a single item. - pagerScrollView?.isScrollEnabled = attachmentItems.count > 1 - - // Bottom Toolbar - galleryRailView.delegate = self - mediaMessageTextToolbar.mediaMessageTextToolbarDelegate = self - - // Navigation - - self.navigationItem.title = nil - - guard let firstItem = attachmentItems.first else { - owsFailDebug("firstItem was unexpectedly nil") - return - } - - self.setCurrentItem(firstItem, direction: .forward, animated: false) - - // layout immediately to avoid animating the layout process during the transition - self.currentPageViewController.view.layoutIfNeeded() - } - - override public func viewWillAppear(_ animated: Bool) { - Logger.debug("") - super.viewWillAppear(animated) - - guard let navigationBar = navigationController?.navigationBar as? OWSNavigationBar else { - owsFailDebug("navigationBar was nil or unexpected class") - return - } - navigationBar.overrideTheme(type: .clear) - - updateNavigationBar() - updateControlVisibility() - } - - override public func viewDidAppear(_ animated: Bool) { - Logger.debug("") - - super.viewDidAppear(animated) - - updateNavigationBar() - updateControlVisibility() - } - - override public func viewWillDisappear(_ animated: Bool) { - Logger.debug("") - super.viewWillDisappear(animated) - } - - override public var inputAccessoryView: UIView? { - bottomToolView.layoutIfNeeded() - return bottomToolView - } - - override public var canBecomeFirstResponder: Bool { - return !shouldHideControls - } - - // MARK: - Navigation Bar - - public func updateNavigationBar() { - guard !shouldHideControls else { - self.navigationItem.leftBarButtonItem = nil - self.navigationItem.rightBarButtonItem = nil - return - } - - var navigationBarItems = [UIView]() - var isShowingCaptionView = false - - if let viewControllers = viewControllers, - viewControllers.count == 1, - let firstViewController = viewControllers.first as? AttachmentPrepViewController { - navigationBarItems = firstViewController.navigationBarItems() - isShowingCaptionView = firstViewController.isShowingCaptionView - } - - guard !isShowingCaptionView else { - // Hide all navigation bar items while the caption view is open. - self.navigationItem.leftBarButtonItem = nil - self.navigationItem.rightBarButtonItem = nil - return - } - - updateNavigationBar(navigationBarItems: navigationBarItems) - - let hasCancel = (mode != .sharedNavigation) - if hasCancel { - let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, - target: self, action: #selector(cancelPressed)) - cancelButton.tintColor = .white - self.navigationItem.leftBarButtonItem = cancelButton - } else { - // Note: using a custom leftBarButtonItem breaks the interactive pop gesture. - self.navigationItem.leftBarButtonItem = self.createOWSBackButton() - } - } - - // MARK: - Control Visibility - - public var shouldHideControls: Bool { - guard let pageViewController = pageViewControllers.first else { - return false - } - return pageViewController.shouldHideControls - } - - private func updateControlVisibility() { - if shouldHideControls { - if isFirstResponder { - resignFirstResponder() - } - } else { - if !isFirstResponder { - becomeFirstResponder() - } - } - } - - // MARK: - View Helpers - - func remove(attachmentItem: SignalAttachmentItem) { - if attachmentItem == currentItem { - if let nextItem = attachmentItemCollection.itemAfter(item: attachmentItem) { - setCurrentItem(nextItem, direction: .forward, animated: true) - } else if let prevItem = attachmentItemCollection.itemBefore(item: attachmentItem) { - setCurrentItem(prevItem, direction: .reverse, animated: true) - } else { - owsFailDebug("removing last item shouldn't be possible because rail should not be visible") - return - } - } - - guard let cell = galleryRailView.cellViews.first(where: { $0.item === attachmentItem }) else { - owsFailDebug("cell was unexpectedly nil") - return - } - - UIView.animate(withDuration: 0.2, - animations: { - // shrink stack view item until it disappears - cell.isHidden = true - - // simultaneously fade out - cell.alpha = 0 - }, - completion: { _ in - self.attachmentItemCollection.remove(item: attachmentItem) - self.updateMediaRail() - }) - } - - lazy var pagerScrollView: UIScrollView? = { - // This is kind of a hack. Since we don't have first class access to the superview's `scrollView` - // we traverse the view hierarchy until we find it. - let pagerScrollView = view.subviews.first { $0 is UIScrollView } as? UIScrollView - assert(pagerScrollView != nil) - - return pagerScrollView - }() - - // MARK: - UIPageViewControllerDelegate - - public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) { - Logger.debug("") - - assert(pendingViewControllers.count == 1) - pendingViewControllers.forEach { viewController in - guard let pendingPage = viewController as? AttachmentPrepViewController else { - owsFailDebug("unexpected viewController: \(viewController)") - return - } - - // use compact scale when keyboard is popped. - let scale: AttachmentPrepViewController.AttachmentViewScale = self.isFirstResponder ? .fullsize : .compact - pendingPage.setAttachmentViewScale(scale, animated: false) - } - } - - public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted: Bool) { - Logger.debug("") - - assert(previousViewControllers.count == 1) - previousViewControllers.forEach { viewController in - guard let previousPage = viewController as? AttachmentPrepViewController else { - owsFailDebug("unexpected viewController: \(viewController)") - return - } - - if transitionCompleted { - previousPage.zoomOut(animated: false) - updateMediaRail() - } - } - - updateNavigationBar() - updateControlVisibility() - } - - // MARK: - UIPageViewControllerDataSource - - public func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? { - guard let currentViewController = viewController as? AttachmentPrepViewController else { - owsFailDebug("unexpected viewController: \(viewController)") - return nil - } - - let currentItem = currentViewController.attachmentItem - guard let previousItem = attachmentItem(before: currentItem) else { - return nil - } - - guard let previousPage: AttachmentPrepViewController = buildPage(item: previousItem) else { - return nil - } - - return previousPage - } - - public func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { - Logger.debug("") - - guard let currentViewController = viewController as? AttachmentPrepViewController else { - owsFailDebug("unexpected viewController: \(viewController)") - return nil - } - - let currentItem = currentViewController.attachmentItem - guard let nextItem = attachmentItem(after: currentItem) else { - return nil - } - - guard let nextPage: AttachmentPrepViewController = buildPage(item: nextItem) else { - return nil - } - - return nextPage - } - - public var currentPageViewController: AttachmentPrepViewController { - return pageViewControllers.first! - } - - public var pageViewControllers: [AttachmentPrepViewController] { - return super.viewControllers!.map { $0 as! AttachmentPrepViewController } - } - - var currentItem: SignalAttachmentItem! { - get { - return currentPageViewController.attachmentItem - } - set { - setCurrentItem(newValue, direction: .forward, animated: false) - } - } - - private var cachedPages: [SignalAttachmentItem: AttachmentPrepViewController] = [:] - private func buildPage(item: SignalAttachmentItem) -> AttachmentPrepViewController? { - - if let cachedPage = cachedPages[item] { - Logger.debug("cache hit.") - return cachedPage - } - - Logger.debug("cache miss.") - let viewController = AttachmentPrepViewController(attachmentItem: item) - viewController.prepDelegate = self - cachedPages[item] = viewController - - return viewController - } - - private func setCurrentItem(_ item: SignalAttachmentItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) { - guard let page = self.buildPage(item: item) else { - owsFailDebug("unexpectedly unable to build new page") - return - } - - page.loadViewIfNeeded() - - self.setViewControllers([page], direction: direction, animated: isAnimated, completion: nil) - updateMediaRail() - } - - func updateMediaRail() { - guard let currentItem = self.currentItem else { - owsFailDebug("currentItem was unexpectedly nil") - return - } - - let cellViewBuilder: () -> ApprovalRailCellView = { [weak self] in - let cell = ApprovalRailCellView() - cell.approvalRailCellDelegate = self - return cell - } - - galleryRailView.configureCellViews(itemProvider: attachmentItemCollection, - focusedItem: currentItem, - cellViewBuilder: cellViewBuilder) - - galleryRailView.isHidden = attachmentItemCollection.attachmentItems.count < 2 - } - - let attachmentItemCollection: AttachmentItemCollection - - var attachmentItems: [SignalAttachmentItem] { - return attachmentItemCollection.attachmentItems - } - - var attachments: [SignalAttachment] { - return attachmentItems.map { (attachmentItem) in - autoreleasepool { - return self.processedAttachment(forAttachmentItem: attachmentItem) - } - } - } - - // For any attachments edited with the image editor, returns a - // new SignalAttachment that reflects those changes. Otherwise, - // returns the original attachment. - // - // If any errors occurs in the export process, we fail over to - // sending the original attachment. This seems better than trying - // to involve the user in resolving the issue. - func processedAttachment(forAttachmentItem attachmentItem: SignalAttachmentItem) -> SignalAttachment { - guard let imageEditorModel = attachmentItem.imageEditorModel else { - // Image was not edited. - return attachmentItem.attachment - } - guard imageEditorModel.isDirty() else { - // Image editor has no changes. - return attachmentItem.attachment - } - guard let dstImage = ImageEditorCanvasView.renderForOutput(model: imageEditorModel, transform: imageEditorModel.currentTransform()) else { - owsFailDebug("Could not render for output.") - return attachmentItem.attachment - } - var dataUTI = kUTTypeImage as String - guard let dstData: Data = { - let isLossy: Bool = attachmentItem.attachment.mimeType.caseInsensitiveCompare(OWSMimeTypeImageJpeg) == .orderedSame - if isLossy { - dataUTI = kUTTypeJPEG as String - return UIImageJPEGRepresentation(dstImage, 0.9) - } else { - dataUTI = kUTTypePNG as String - return UIImagePNGRepresentation(dstImage) - } - }() else { - owsFailDebug("Could not export for output.") - return attachmentItem.attachment - } - guard let dataSource = DataSourceValue.dataSource(with: dstData, utiType: dataUTI) else { - owsFailDebug("Could not prepare data source for output.") - return attachmentItem.attachment - } - - // Rewrite the filename's extension to reflect the output file format. - var filename: String? = attachmentItem.attachment.sourceFilename - if let sourceFilename = attachmentItem.attachment.sourceFilename { - if let fileExtension: String = MIMETypeUtil.fileExtension(forUTIType: dataUTI) { - filename = (sourceFilename as NSString).deletingPathExtension.appendingFileExtension(fileExtension) - } - } - dataSource.sourceFilename = filename - - let dstAttachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .original) - if let attachmentError = dstAttachment.error { - owsFailDebug("Could not prepare attachment for output: \(attachmentError).") - return attachmentItem.attachment - } - return dstAttachment - } - - func attachmentItem(before currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: currentItem) else { - owsFailDebug("currentIndex was unexpectedly nil") - return nil - } - - let index: Int = attachmentItems.index(before: currentIndex) - guard let previousItem = attachmentItems[safe: index] else { - // already at first item - return nil - } - - return previousItem - } - - func attachmentItem(after currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: currentItem) else { - owsFailDebug("currentIndex was unexpectedly nil") - return nil - } - - let index: Int = attachmentItems.index(after: currentIndex) - guard let nextItem = attachmentItems[safe: index] else { - // already at last item - return nil - } - - return nextItem - } - - // MARK: - Event Handlers - - @objc func cancelPressed(sender: UIButton) { - self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) - } -} - -extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate { - func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { - currentPageViewController.setAttachmentViewScale(.compact, animated: true) - } - - func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { - currentPageViewController.setAttachmentViewScale(.fullsize, animated: true) - } - - func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { - // Toolbar flickers in and out if there are errors - // and remains visible momentarily after share extension is dismissed. - // It's easiest to just hide it at this point since we're done with it. - currentPageViewController.shouldAllowAttachmentViewResizing = false - mediaMessageTextToolbar.isUserInteractionEnabled = false - mediaMessageTextToolbar.isHidden = true - - approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: mediaMessageTextToolbar.messageText) - } - - func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { - self.approvalDelegate?.attachmentApproval?(self, addMoreToAttachments: attachments) - } -} - -extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate { - func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { - self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) - - updateMediaRail() - } - - func prepViewControllerUpdateNavigationBar() { - updateNavigationBar() - } - - func prepViewControllerUpdateControls() { - updateControlVisibility() - } - - func prepViewControllerAttachmentCount() -> Int { - return attachmentItemCollection.count - } -} - -// MARK: GalleryRail - -extension SignalAttachmentItem: GalleryRailItem { - var aspectRatio: CGFloat { - return self.imageSize.aspectRatio - } - - func getRailImage() -> Promise { - return self.getThumbnailImage() - } -} - -extension AttachmentItemCollection: GalleryRailItemProvider { - var railItems: [GalleryRailItem] { - return self.attachmentItems - } -} - -extension AttachmentApprovalViewController: GalleryRailViewDelegate { - public func galleryRailView(_ galleryRailView: GalleryRailView, didTapItem imageRailItem: GalleryRailItem) { - guard let targetItem = imageRailItem as? SignalAttachmentItem else { - owsFailDebug("unexpected imageRailItem: \(imageRailItem)") - return - } - - guard let currentIndex = attachmentItems.index(of: currentItem) else { - owsFailDebug("currentIndex was unexpectedly nil") - return - } - - guard let targetIndex = attachmentItems.index(of: targetItem) else { - owsFailDebug("targetIndex was unexpectedly nil") - return - } - - let direction: UIPageViewControllerNavigationDirection = currentIndex < targetIndex ? .forward : .reverse - - self.setCurrentItem(targetItem, direction: direction, animated: true) - } -} - -// MARK: - Individual Page - -enum KeyboardScenario { - case hidden, editingMessage, editingCaption -} - -protocol AttachmentPrepViewControllerDelegate: class { - func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) - - func prepViewControllerUpdateNavigationBar() - - func prepViewControllerUpdateControls() - - func prepViewControllerAttachmentCount() -> Int -} - -public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarDelegate, OWSVideoPlayerDelegate { - // We sometimes shrink the attachment view so that it remains somewhat visible - // when the keyboard is presented. - enum AttachmentViewScale { - case fullsize, compact - } - - // MARK: - Properties - - weak var prepDelegate: AttachmentPrepViewControllerDelegate? - - let attachmentItem: SignalAttachmentItem - var attachment: SignalAttachment { - return attachmentItem.attachment - } - - private var videoPlayer: OWSVideoPlayer? - - private(set) var mediaMessageView: MediaMessageView! - private(set) var scrollView: UIScrollView! - private(set) var contentContainer: UIView! - private(set) var playVideoButton: UIView? - private var imageEditorView: ImageEditorView? - - fileprivate var isShowingCaptionView = false { - didSet { - prepDelegate?.prepViewControllerUpdateNavigationBar() - prepDelegate?.prepViewControllerUpdateControls() - } - } - - public var shouldHideControls: Bool { - guard let imageEditorView = imageEditorView else { - return false - } - return imageEditorView.shouldHideControls - } - - // MARK: - Initializers - - init(attachmentItem: SignalAttachmentItem) { - self.attachmentItem = attachmentItem - super.init(nibName: nil, bundle: nil) - assert(!attachment.hasError) - } - - public required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - // MARK: - Subviews - - // TODO: Do we still need this? - lazy var touchInterceptorView: UIView = { - let touchInterceptorView = UIView() - let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:))) - touchInterceptorView.addGestureRecognizer(tapGesture) - - return touchInterceptorView - }() - - // MARK: - View Lifecycle - - override public func loadView() { - self.view = UIView() - - self.mediaMessageView = MediaMessageView(attachment: attachment, mode: .attachmentApproval) - - // Anything that should be shrunk when user pops keyboard lives in the contentContainer. - let contentContainer = UIView() - self.contentContainer = contentContainer - view.addSubview(contentContainer) - contentContainer.autoPinEdgesToSuperviewEdges() - - // Scroll View - used to zoom/pan on images and video - scrollView = UIScrollView() - contentContainer.addSubview(scrollView) - scrollView.delegate = self - scrollView.showsHorizontalScrollIndicator = false - scrollView.showsVerticalScrollIndicator = false - - // Panning should stop pretty soon after the user stops scrolling - scrollView.decelerationRate = UIScrollViewDecelerationRateFast - - // We want scroll view content up and behind the system status bar content - // but we want other content (e.g. bar buttons) to respect the top layout guide. - self.automaticallyAdjustsScrollViewInsets = false - - scrollView.autoPinEdgesToSuperviewEdges() - - let backgroundColor = UIColor.black - self.view.backgroundColor = backgroundColor - - // Create full screen container view so the scrollView - // can compute an appropriate content size in which to center - // our media view. - let containerView = UIView.container() - scrollView.addSubview(containerView) - containerView.autoPinEdgesToSuperviewEdges() - containerView.autoMatch(.height, to: .height, of: self.view) - containerView.autoMatch(.width, to: .width, of: self.view) - - containerView.addSubview(mediaMessageView) - mediaMessageView.autoPinEdgesToSuperviewEdges() - - #if DEBUG - if let imageEditorModel = attachmentItem.imageEditorModel { - - let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) - if imageEditorView.configureSubviews() { - self.imageEditorView = imageEditorView - - mediaMessageView.isHidden = true - - view.addSubview(imageEditorView) - imageEditorView.autoPinEdgesToSuperviewEdges() - - imageEditorUpdateNavigationBar() - } - } - #endif - - if isZoomable { - // Add top and bottom gradients to ensure toolbar controls are legible - // when placed over image/video preview which may be a clashing color. - let topGradient = GradientView(from: backgroundColor, to: UIColor.clear) - self.view.addSubview(topGradient) - topGradient.autoPinWidthToSuperview() - topGradient.autoPinEdge(toSuperviewEdge: .top) - topGradient.autoSetDimension(.height, toSize: ScaleFromIPhone5(60)) - } - - // Hide the play button embedded in the MediaView and replace it with our own. - // This allows us to zoom in on the media view without zooming in on the button - if attachment.isVideo { - - guard let videoURL = attachment.dataUrl else { - owsFailDebug("Missing videoURL") - return - } - - let player = OWSVideoPlayer(url: videoURL) - self.videoPlayer = player - player.delegate = self - - let playerView = VideoPlayerView() - playerView.player = player.avPlayer - self.mediaMessageView.addSubview(playerView) - playerView.autoPinEdgesToSuperviewEdges() - - let pauseGesture = UITapGestureRecognizer(target: self, action: #selector(didTapPlayerView(_:))) - playerView.addGestureRecognizer(pauseGesture) - - let progressBar = PlayerProgressBar() - progressBar.player = player.avPlayer - progressBar.delegate = self - - // we don't want the progress bar to zoom during "pinch-to-zoom" - // but we do want it to shrink with the media content when the user - // pops the keyboard. - contentContainer.addSubview(progressBar) - - progressBar.autoPin(toTopLayoutGuideOf: self, withInset: 0) - progressBar.autoPinWidthToSuperview() - progressBar.autoSetDimension(.height, toSize: 44) - - self.mediaMessageView.videoPlayButton?.isHidden = true - let playButton = UIButton() - self.playVideoButton = playButton - playButton.accessibilityLabel = NSLocalizedString("PLAY_BUTTON_ACCESSABILITY_LABEL", comment: "Accessibility label for button to start media playback") - playButton.setBackgroundImage(#imageLiteral(resourceName: "play_button"), for: .normal) - playButton.contentMode = .scaleAspectFit - - let playButtonWidth = ScaleFromIPhone5(70) - playButton.autoSetDimensions(to: CGSize(width: playButtonWidth, height: playButtonWidth)) - self.contentContainer.addSubview(playButton) - - playButton.addTarget(self, action: #selector(playButtonTapped), for: .touchUpInside) - playButton.autoCenterInSuperview() - } - - // Caption - - view.addSubview(touchInterceptorView) - touchInterceptorView.autoPinEdgesToSuperviewEdges() - touchInterceptorView.isHidden = true - } - - override public func viewWillAppear(_ animated: Bool) { - Logger.debug("") - - super.viewWillAppear(animated) - - prepDelegate?.prepViewControllerUpdateNavigationBar() - prepDelegate?.prepViewControllerUpdateControls() - } - - override public func viewDidAppear(_ animated: Bool) { - Logger.debug("") - - super.viewDidAppear(animated) - - prepDelegate?.prepViewControllerUpdateNavigationBar() - prepDelegate?.prepViewControllerUpdateControls() - } - - override public func viewWillLayoutSubviews() { - Logger.debug("") - super.viewWillLayoutSubviews() - - // e.g. if flipping to/from landscape - updateMinZoomScaleForSize(view.bounds.size) - - ensureAttachmentViewScale(animated: false) - } - - // MARK: - Navigation Bar - - public func navigationBarItems() -> [UIView] { - let captionButton = navigationBarButton(imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) - - guard let imageEditorView = imageEditorView else { - // Show the "add caption" button for non-image attachments if - // there is more than one attachment. - if let prepDelegate = prepDelegate, - prepDelegate.prepViewControllerAttachmentCount() > 1 { - return [captionButton] - } - return [] - } - var navigationBarItems = imageEditorView.navigationBarItems() - - // Show the caption UI if there's more than one attachment - // OR if the attachment already has a caption. - var shouldShowCaptionUI = attachmentCount() > 0 - if let captionText = attachmentItem.captionText, captionText.count > 0 { - shouldShowCaptionUI = true - } - if shouldShowCaptionUI { - navigationBarItems.append(captionButton) - } - - return navigationBarItems - } - - private func attachmentCount() -> Int { - guard let prepDelegate = prepDelegate else { - owsFailDebug("Missing prepDelegate.") - return 0 - } - return prepDelegate.prepViewControllerAttachmentCount() - } - - @objc func didTapCaption(sender: UIButton) { - Logger.verbose("") - - presentCaptionView() - } - - private func presentCaptionView() { - let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) - self.imageEditor(presentFullScreenView: view, isTransparent: true) - - isShowingCaptionView = true - } - - // MARK: - Event Handlers - - @objc - func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) { - Logger.info("") - touchInterceptorView.isHidden = true - } - - @objc - public func didTapPlayerView(_ gestureRecognizer: UIGestureRecognizer) { - assert(self.videoPlayer != nil) - self.pauseVideo() - } - - @objc - public func playButtonTapped() { - self.playVideo() - } - - // MARK: - Video - - private func playVideo() { - Logger.info("") - - guard let videoPlayer = self.videoPlayer else { - owsFailDebug("video player was unexpectedly nil") - return - } - - guard let playVideoButton = self.playVideoButton else { - owsFailDebug("playVideoButton was unexpectedly nil") - return - } - UIView.animate(withDuration: 0.1) { - playVideoButton.alpha = 0.0 - } - videoPlayer.play() - } - - private func pauseVideo() { - guard let videoPlayer = self.videoPlayer else { - owsFailDebug("video player was unexpectedly nil") - return - } - - videoPlayer.pause() - guard let playVideoButton = self.playVideoButton else { - owsFailDebug("playVideoButton was unexpectedly nil") - return - } - UIView.animate(withDuration: 0.1) { - playVideoButton.alpha = 1.0 - } - } - - @objc - public func videoPlayerDidPlayToCompletion(_ videoPlayer: OWSVideoPlayer) { - guard let playVideoButton = self.playVideoButton else { - owsFailDebug("playVideoButton was unexpectedly nil") - return - } - - UIView.animate(withDuration: 0.1) { - playVideoButton.alpha = 1.0 - } - } - - public func playerProgressBarDidStartScrubbing(_ playerProgressBar: PlayerProgressBar) { - guard let videoPlayer = self.videoPlayer else { - owsFailDebug("video player was unexpectedly nil") - return - } - videoPlayer.pause() - } - - public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, scrubbedToTime time: CMTime) { - guard let videoPlayer = self.videoPlayer else { - owsFailDebug("video player was unexpectedly nil") - return - } - - videoPlayer.seek(to: time) - } - - public func playerProgressBar(_ playerProgressBar: PlayerProgressBar, didFinishScrubbingAtTime time: CMTime, shouldResumePlayback: Bool) { - guard let videoPlayer = self.videoPlayer else { - owsFailDebug("video player was unexpectedly nil") - return - } - - videoPlayer.seek(to: time) - if (shouldResumePlayback) { - videoPlayer.play() - } - } - - // MARK: - Helpers - - var isZoomable: Bool { - return attachment.isImage || attachment.isVideo - } - - func zoomOut(animated: Bool) { - if self.scrollView.zoomScale != self.scrollView.minimumZoomScale { - self.scrollView.setZoomScale(self.scrollView.minimumZoomScale, animated: animated) - } - } - - // When the keyboard is popped, it can obscure the attachment view. - // so we sometimes allow resizing the attachment. - var shouldAllowAttachmentViewResizing: Bool = true - - var attachmentViewScale: AttachmentViewScale = .fullsize - fileprivate func setAttachmentViewScale(_ attachmentViewScale: AttachmentViewScale, animated: Bool) { - self.attachmentViewScale = attachmentViewScale - ensureAttachmentViewScale(animated: animated) - } - - func ensureAttachmentViewScale(animated: Bool) { - let animationDuration = animated ? 0.2 : 0 - guard shouldAllowAttachmentViewResizing else { - if self.contentContainer.transform != CGAffineTransform.identity { - UIView.animate(withDuration: animationDuration) { - self.contentContainer.transform = CGAffineTransform.identity - } - } - return - } - - switch attachmentViewScale { - case .fullsize: - guard self.contentContainer.transform != .identity else { - return - } - UIView.animate(withDuration: animationDuration) { - self.contentContainer.transform = CGAffineTransform.identity - } - case .compact: - guard self.contentContainer.transform == .identity else { - return - } - UIView.animate(withDuration: animationDuration) { - let kScaleFactor: CGFloat = 0.7 - let scale = CGAffineTransform(scaleX: kScaleFactor, y: kScaleFactor) - - let originalHeight = self.scrollView.bounds.size.height - - // Position the new scaled item to be centered with respect - // to it's new size. - let heightDelta = originalHeight * (1 - kScaleFactor) - let translate = CGAffineTransform(translationX: 0, y: -heightDelta / 2) - - self.contentContainer.transform = scale.concatenating(translate) - } - } - } -} - -extension AttachmentPrepViewController: AttachmentCaptionDelegate { - func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) { - let attachment = attachmentItem.attachment - attachment.captionText = captionText - prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem) - - isShowingCaptionView = false - } - - func captionViewDidCancel() { - isShowingCaptionView = false - } -} - -extension AttachmentPrepViewController: UIScrollViewDelegate { - - public func viewForZooming(in scrollView: UIScrollView) -> UIView? { - if isZoomable { - return mediaMessageView - } else { - // don't zoom for audio or generic attachments. - return nil - } - } - - fileprivate func updateMinZoomScaleForSize(_ size: CGSize) { - Logger.debug("") - - // Ensure bounds have been computed - mediaMessageView.layoutIfNeeded() - guard mediaMessageView.bounds.width > 0, mediaMessageView.bounds.height > 0 else { - Logger.warn("bad bounds") - return - } - - let widthScale = size.width / mediaMessageView.bounds.width - let heightScale = size.height / mediaMessageView.bounds.height - let minScale = min(widthScale, heightScale) - scrollView.maximumZoomScale = minScale * 5.0 - scrollView.minimumZoomScale = minScale - scrollView.zoomScale = minScale - } - - // Keep the media view centered within the scroll view as you zoom - public func scrollViewDidZoom(_ scrollView: UIScrollView) { - // The scroll view has zoomed, so you need to re-center the contents - let scrollViewSize = self.scrollViewVisibleSize - - // First assume that mediaMessageView center coincides with the contents center - // This is correct when the mediaMessageView is bigger than scrollView due to zoom - var contentCenter = CGPoint(x: (scrollView.contentSize.width / 2), y: (scrollView.contentSize.height / 2)) - - let scrollViewCenter = self.scrollViewCenter - - // if mediaMessageView is smaller than the scrollView visible size - fix the content center accordingly - if self.scrollView.contentSize.width < scrollViewSize.width { - contentCenter.x = scrollViewCenter.x - } - - if self.scrollView.contentSize.height < scrollViewSize.height { - contentCenter.y = scrollViewCenter.y - } - - self.mediaMessageView.center = contentCenter - } - - // return the scroll view center - private var scrollViewCenter: CGPoint { - let size = scrollViewVisibleSize - return CGPoint(x: (size.width / 2), y: (size.height / 2)) - } - - // Return scrollview size without the area overlapping with tab and nav bar. - private var scrollViewVisibleSize: CGSize { - let contentInset = scrollView.contentInset - let scrollViewSize = scrollView.bounds.standardized.size - let width = scrollViewSize.width - (contentInset.left + contentInset.right) - let height = scrollViewSize.height - (contentInset.top + contentInset.bottom) - return CGSize(width: width, height: height) - } -} - -// MARK: - - -extension AttachmentPrepViewController: ImageEditorViewDelegate { - public func imageEditor(presentFullScreenView viewController: UIViewController, - isTransparent: Bool) { - - let navigationController = OWSNavigationController(rootViewController: viewController) - navigationController.modalPresentationStyle = (isTransparent - ? .overFullScreen - : .fullScreen) - - if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { - navigationBar.overrideTheme(type: .clear) - } else { - owsFailDebug("navigationBar was nil or unexpected class") - } - - self.present(navigationController, animated: false) { - // Do nothing. - } - } - - public func imageEditorUpdateNavigationBar() { - prepDelegate?.prepViewControllerUpdateNavigationBar() - } - - public func imageEditorUpdateControls() { - prepDelegate?.prepViewControllerUpdateControls() - } -} - -// MARK: - - -class BottomToolView: UIView { - let mediaMessageTextToolbar: MediaMessageTextToolbar - let galleryRailView: GalleryRailView - - var isEditingMediaMessage: Bool { - return mediaMessageTextToolbar.textView.isFirstResponder - } - - let kGalleryRailViewHeight: CGFloat = 72 - - required init(isAddMoreVisible: Bool) { - mediaMessageTextToolbar = MediaMessageTextToolbar(isAddMoreVisible: isAddMoreVisible) - - galleryRailView = GalleryRailView() - galleryRailView.scrollFocusMode = .keepWithinBounds - galleryRailView.autoSetDimension(.height, toSize: kGalleryRailViewHeight) - - super.init(frame: .zero) - - // Specifying auto-resizing mask and an intrinsic content size allows proper - // sizing when used as an input accessory view. - self.autoresizingMask = .flexibleHeight - self.translatesAutoresizingMaskIntoConstraints = false - - backgroundColor = UIColor.black.withAlphaComponent(0.6) - preservesSuperviewLayoutMargins = true - - let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.mediaMessageTextToolbar]) - stackView.axis = .vertical - - addSubview(stackView) - stackView.autoPinEdgesToSuperviewEdges() - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - // MARK: - - override var intrinsicContentSize: CGSize { - get { - // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify - // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. - return CGSize.zero - } - } -} - -// Coincides with Android's max text message length -let kMaxMessageBodyCharacterCount = 2000 - -protocol MediaMessageTextToolbarDelegate: class { - func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) -} - -class MediaMessageTextToolbar: UIView, UITextViewDelegate { - - weak var mediaMessageTextToolbarDelegate: MediaMessageTextToolbarDelegate? - - var messageText: String? { - get { return textView.text } - - set { - textView.text = newValue - updatePlaceholderTextViewVisibility() - } - } - - // Layout Constants - - let kMinTextViewHeight: CGFloat = 38 - var maxTextViewHeight: CGFloat { - // About ~4 lines in portrait and ~3 lines in landscape. - // Otherwise we risk obscuring too much of the content. - return UIDevice.current.orientation.isPortrait ? 160 : 100 - } - var textViewHeightConstraint: NSLayoutConstraint! - var textViewHeight: CGFloat - - // MARK: - Initializers - - init(isAddMoreVisible: Bool) { - self.addMoreButton = UIButton(type: .custom) - self.sendButton = UIButton(type: .system) - self.textViewHeight = kMinTextViewHeight - - super.init(frame: CGRect.zero) - - // Specifying autorsizing mask and an intrinsic content size allows proper - // sizing when used as an input accessory view. - self.autoresizingMask = .flexibleHeight - self.translatesAutoresizingMaskIntoConstraints = false - self.backgroundColor = UIColor.clear - - textView.delegate = self - - let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) - addMoreButton.setImage(addMoreIcon, for: .normal) - addMoreButton.tintColor = Theme.darkThemePrimaryColor - addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) - - let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") - sendButton.setTitle(sendTitle, for: .normal) - sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside) - - sendButton.titleLabel?.font = UIFont.ows_mediumFont(withSize: 16) - sendButton.titleLabel?.textAlignment = .center - sendButton.tintColor = Theme.galleryHighlightColor - - // Increase hit area of send button - sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8) - - let contentView = UIView() - contentView.addSubview(sendButton) - contentView.addSubview(textContainer) - contentView.addSubview(lengthLimitLabel) - if isAddMoreVisible { - contentView.addSubview(addMoreButton) - } - - addSubview(contentView) - contentView.autoPinEdgesToSuperviewEdges() - - // Layout - let kToolbarMargin: CGFloat = 8 - - // We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins - // when resigning first responder (verified by auditing with `layoutMarginsDidChange`). - // The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the - // user dismisses the keyboard, giving the input accessory view a wonky layout. - contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin) - - self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) - - // We pin all three edges explicitly rather than doing something like: - // textView.autoPinEdges(toSuperviewMarginsExcludingEdge: .right) - // because that method uses `leading` / `trailing` rather than `left` vs. `right`. - // So it doesn't work as expected with RTL layouts when we explicitly want something - // to be on the right side for both RTL and LTR layouts, like with the send button. - // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209 - textContainer.autoPinEdge(toSuperviewMargin: .top) - textContainer.autoPinEdge(toSuperviewMargin: .bottom) - if isAddMoreVisible { - addMoreButton.autoPinEdge(toSuperviewMargin: .left) - textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin) - addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton) - addMoreButton.setContentHuggingHigh() - addMoreButton.setCompressionResistanceHigh() - } else { - textContainer.autoPinEdge(toSuperviewMargin: .left) - } - - sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin) - sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3) - - sendButton.autoPinEdge(toSuperviewMargin: .right) - sendButton.setContentHuggingHigh() - sendButton.setCompressionResistanceHigh() - - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left) - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right) - lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textContainer, withOffset: -6) - lengthLimitLabel.setContentHuggingHigh() - lengthLimitLabel.setCompressionResistanceHigh() - } - - required init?(coder aDecoder: NSCoder) { - notImplemented() - } - - // MARK: - UIView Overrides - - override var intrinsicContentSize: CGSize { - get { - // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify - // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. - return CGSize.zero - } - } - - // MARK: - Subviews - - private let addMoreButton: UIButton - private let sendButton: UIButton - - private lazy var lengthLimitLabel: UILabel = { - let lengthLimitLabel = UILabel() - - // Length Limit Label shown when the user inputs too long of a message - lengthLimitLabel.textColor = .white - lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.") - lengthLimitLabel.textAlignment = .center - - // Add shadow in case overlayed on white content - lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = .zero - lengthLimitLabel.layer.shadowOpacity = 0.8 - lengthLimitLabel.layer.shadowRadius = 2.0 - lengthLimitLabel.isHidden = true - - return lengthLimitLabel - }() - - lazy var textView: UITextView = { - let textView = buildTextView() - - textView.returnKeyType = .done - textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) - - return textView - }() - - private lazy var placeholderTextView: UITextView = { - let placeholderTextView = buildTextView() - - placeholderTextView.text = NSLocalizedString("MESSAGE_TEXT_FIELD_PLACEHOLDER", comment: "placeholder text for the editable message field") - placeholderTextView.isEditable = false - - return placeholderTextView - }() - - private lazy var textContainer: UIView = { - let textContainer = UIView() - - textContainer.layer.borderColor = Theme.darkThemePrimaryColor.cgColor - textContainer.layer.borderWidth = 0.5 - textContainer.layer.cornerRadius = kMinTextViewHeight / 2 - textContainer.clipsToBounds = true - - textContainer.addSubview(placeholderTextView) - placeholderTextView.autoPinEdgesToSuperviewEdges() - - textContainer.addSubview(textView) - textView.autoPinEdgesToSuperviewEdges() - - return textContainer - }() - - private func buildTextView() -> UITextView { - let textView = MessageTextView() - - textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance - textView.backgroundColor = .clear - textView.tintColor = Theme.darkThemePrimaryColor - - textView.font = UIFont.ows_dynamicTypeBody - textView.textColor = Theme.darkThemePrimaryColor - textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) - - return textView - } - - class MessageTextView: UITextView { - // When creating new lines, contentOffset is animated, but because - // we are simultaneously resizing the text view, this can cause the - // text in the textview to be "too high" in the text view. - // Solution is to disable animation for setting content offset. - override func setContentOffset(_ contentOffset: CGPoint, animated: Bool) { - super.setContentOffset(contentOffset, animated: false) - } - } - - // MARK: - Actions - - @objc func didTapSend() { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidTapSend(self) - } - - @objc func didTapAddMore() { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidAddMore(self) - } - - // MARK: - UITextViewDelegate - - public func textViewDidChange(_ textView: UITextView) { - updateHeight(textView: textView) - } - - public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { - - if !FeatureFlags.sendingMediaWithOversizeText { - let existingText: String = textView.text ?? "" - let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) - - // Don't complicate things by mixing media attachments with oversize text attachments - guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { - Logger.debug("long text was truncated") - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be - // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is - // to just measure the utf8 encoded bytes of the replaced substring. - let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count - - // Accept as much of the input as we can - let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete - if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - self.lengthLimitLabel.isHidden = true - - // After verifying the byte-length is sufficiently small, verify the character count is within bounds. - guard proposedText.count < kMaxMessageBodyCharacterCount else { - Logger.debug("hit attachment message body character count limit") - - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count - - // Accept as much of the input as we can - let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete - if charBudget >= 0 { - let acceptableNewText = String(text.prefix(charBudget)) - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - } - - // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button - // allows the user to get the keyboard out of the way while in the attachment approval view. - if text == "\n" { - textView.resignFirstResponder() - return false - } else { - return true - } - } - - public func textViewDidBeginEditing(_ textView: UITextView) { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidBeginEditing(self) - updatePlaceholderTextViewVisibility() - } - - public func textViewDidEndEditing(_ textView: UITextView) { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidEndEditing(self) - updatePlaceholderTextViewVisibility() - } - - // MARK: - Helpers - - func updatePlaceholderTextViewVisibility() { - let isHidden: Bool = { - guard !self.textView.isFirstResponder else { - return true - } - - guard let text = self.textView.text else { - return false - } - - guard text.count > 0 else { - return false - } - - return true - }() - - placeholderTextView.isHidden = isHidden - } - - private func updateHeight(textView: UITextView) { - // compute new height assuming width is unchanged - let currentSize = textView.frame.size - let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width) - - if newHeight != textViewHeight { - Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)") - textViewHeight = newHeight - textViewHeightConstraint?.constant = textViewHeight - invalidateIntrinsicContentSize() - } - } - - private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat { - let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) - return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight) - } -} - -extension AttachmentApprovalViewController: ApprovalRailCellViewDelegate { - func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) { - remove(attachmentItem: attachmentItem) - } -} - -protocol ApprovalRailCellViewDelegate: class { - func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) -} - -public class ApprovalRailCellView: GalleryRailCellView { - - weak var approvalRailCellDelegate: ApprovalRailCellViewDelegate? - - lazy var deleteButton: UIButton = { - let button = OWSButton { [weak self] in - guard let strongSelf = self else { return } - - guard let attachmentItem = strongSelf.item as? SignalAttachmentItem else { - owsFailDebug("attachmentItem was unexpectedly nil") - return - } - - strongSelf.approvalRailCellDelegate?.approvalRailCellView(strongSelf, didRemoveItem: attachmentItem) - } - - button.setImage(UIImage(named: "x-24")?.withRenderingMode(.alwaysTemplate), for: .normal) - button.tintColor = .white - button.layer.shadowColor = UIColor.black.cgColor - button.layer.shadowRadius = 2 - button.layer.shadowOpacity = 0.66 - button.layer.shadowOffset = .zero - - let kButtonWidth: CGFloat = 24 - button.autoSetDimensions(to: CGSize(width: kButtonWidth, height: kButtonWidth)) - - return button - }() - - lazy var captionIndicator: UIView = { - let image = UIImage(named: "image_editor_caption")?.withRenderingMode(.alwaysTemplate) - let imageView = UIImageView(image: image) - imageView.tintColor = .white - imageView.layer.shadowColor = UIColor.black.cgColor - imageView.layer.shadowRadius = 2 - imageView.layer.shadowOpacity = 0.66 - imageView.layer.shadowOffset = .zero - return imageView - }() - - override func setIsSelected(_ isSelected: Bool) { - super.setIsSelected(isSelected) - - if isSelected { - addSubview(deleteButton) - - deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) - deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4) - } else { - deleteButton.removeFromSuperview() - } - } - - override func configure(item: GalleryRailItem, delegate: GalleryRailCellViewDelegate) { - super.configure(item: item, delegate: delegate) - - var hasCaption = false - if let attachmentItem = item as? SignalAttachmentItem { - if let captionText = attachmentItem.captionText { - hasCaption = captionText.count > 0 - } - } else { - owsFailDebug("Invalid item.") - } - - if hasCaption { - addSubview(captionIndicator) - - captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) - captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: cellBorderWidth + 4) - } else { - captionIndicator.removeFromSuperview() - } - } -} From 745ec2adb8574263f0066002b07aa7197d719752 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 12:10:56 -0400 Subject: [PATCH 274/493] Remove top gradient from attachment approval. --- .../Contents.json | 23 ++++++++++++++++++ .../chevron-left-shadow-24@1x.png | Bin 0 -> 452 bytes .../chevron-left-shadow-24@2x.png | Bin 0 -> 972 bytes .../chevron-left-shadow-24@3x.png | Bin 0 -> 1680 bytes .../Contents.json | 23 ++++++++++++++++++ .../chevron-right-shadow-24@1x.png | Bin 0 -> 1548 bytes .../chevron-right-shadow-24@2x.png | Bin 0 -> 2106 bytes .../chevron-right-shadow-24@3x.png | Bin 0 -> 2810 bytes .../AttachmentApprovalViewController.swift | 19 +++++++++++---- .../AttachmentPrepViewController.swift | 10 -------- 10 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 Signal/Images.xcassets/NavBarBackWithShadow.imageset/Contents.json create mode 100644 Signal/Images.xcassets/NavBarBackWithShadow.imageset/chevron-left-shadow-24@1x.png create mode 100644 Signal/Images.xcassets/NavBarBackWithShadow.imageset/chevron-left-shadow-24@2x.png create mode 100644 Signal/Images.xcassets/NavBarBackWithShadow.imageset/chevron-left-shadow-24@3x.png create mode 100644 Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/Contents.json create mode 100644 Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/chevron-right-shadow-24@1x.png create mode 100644 Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/chevron-right-shadow-24@2x.png create mode 100644 Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/chevron-right-shadow-24@3x.png diff --git a/Signal/Images.xcassets/NavBarBackWithShadow.imageset/Contents.json b/Signal/Images.xcassets/NavBarBackWithShadow.imageset/Contents.json new file mode 100644 index 000000000..82a078d60 --- /dev/null +++ b/Signal/Images.xcassets/NavBarBackWithShadow.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "chevron-left-shadow-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "chevron-left-shadow-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "chevron-left-shadow-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/NavBarBackWithShadow.imageset/chevron-left-shadow-24@1x.png b/Signal/Images.xcassets/NavBarBackWithShadow.imageset/chevron-left-shadow-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..373826d47d1bd3b957ddbd321c5d8f41a2b00579 GIT binary patch literal 452 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 a`2PSHX0T;VHzd0N0000!lvI6;>1s;*b z3=G`DAk4@xYYtEci%MolL`j6Nk5zJhu3lnFep0GlMQ#C5H3Nf9g%yyQn_7~nP?4LH zS8P>bs{~eI1!RMS^_3LBN=mYAl_Got6rA&mQWZ?~O!N$t?6?#Z6l{u8(yW49+@RWl zJX@uVl9B=|ef{$Ca=mh6z5JqdeM3u2OML?)eIp}XpbFjM%Dj@q3f;V7Wr!g#b6ir3 zlZ!G7N;32F6hP)CCgqow*eWT3EP?}wJ4-Ut5H{r%L%jv`pgu@O-%!s$ADgz+icB2Z zKr%SBr6j|BRZv=#1NKu&vVLk#YHn&?Nik5LAy(^vVGGxY;>e1`0*GbcK!o_s2IO+9 zpw#00oKjE_gyvx zocyBTg2d!hki)=Qkc7}xgRP0gWet)9lE#!|tK!n6tkmQZq}T$+8941bC8p~m3ESvn zRc!-I30A)ODVb@NE{P?nc18wgx1hC`MvXVZ_z`$7N z>EamT!TUDstY5Q(gh;l|3Q;E$sl^%h58e>}@TR-+tDujMso~Wl-=1t#XPR!-x}~6D zxq{3ZV_!v+fZLnCJe%&5a5J^-efoaaTakG}%Q|8ctd8@qla74bf3}XnD@JQSx=k~v(N9~6na-Ue=aLV=4k;N_Z6$=zopr07kh($ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/chevron-right-shadow-24@2x.png b/Signal/Images.xcassets/NavBarBackWithShadowRTL.imageset/chevron-right-shadow-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..24002aa78882e7c907d2c87ef31f2d39197c4230 GIT binary patch literal 2106 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 literal 0 HcmV?d00001 diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 690d044ed..285cb9331 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -190,10 +190,19 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC let hasCancel = (mode != .sharedNavigation) if hasCancel { - let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, - target: self, action: #selector(cancelPressed)) - cancelButton.tintColor = .white - self.navigationItem.leftBarButtonItem = cancelButton + // Mimic a UIBarButtonItem of type .cancel, but with a shadow. + let cancelButton = OWSButton(title: CommonStrings.cancelButton) { [weak self] in + self?.cancelPressed() + } + cancelButton.setTitleColor(.white, for: .normal) + if let titleLabel = cancelButton.titleLabel { + titleLabel.font = UIFont.systemFont(ofSize: 18.0) + titleLabel.layer.shadowColor = UIColor.black.cgColor + titleLabel.layer.shadowRadius = 2.0 + titleLabel.layer.shadowOpacity = 0.66 + titleLabel.layer.shadowOffset = .zero + } + navigationItem.leftBarButtonItem = UIBarButtonItem(customView: cancelButton) } else { // Note: using a custom leftBarButtonItem breaks the interactive pop gesture. self.navigationItem.leftBarButtonItem = self.createOWSBackButton() @@ -507,7 +516,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // MARK: - Event Handlers - @objc func cancelPressed(sender: UIButton) { + private func cancelPressed() { self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 1e273776a..46527237a 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -140,16 +140,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD } #endif - if isZoomable { - // Add top and bottom gradients to ensure toolbar controls are legible - // when placed over image/video preview which may be a clashing color. - let topGradient = GradientView(from: backgroundColor, to: UIColor.clear) - self.view.addSubview(topGradient) - topGradient.autoPinWidthToSuperview() - topGradient.autoPinEdge(toSuperviewEdge: .top) - topGradient.autoSetDimension(.height, toSize: ScaleFromIPhone5(60)) - } - // Hide the play button embedded in the MediaView and replace it with our own. // This allows us to zoom in on the media view without zooming in on the button if attachment.isVideo { From 4fd16a76140915a8ee17f3213627147a9007da0f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 12:25:02 -0400 Subject: [PATCH 275/493] Remove top gradient from attachment approval. --- .../AttachmentApprovalViewController.swift | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 285cb9331..be3493c8a 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -201,11 +201,56 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC titleLabel.layer.shadowRadius = 2.0 titleLabel.layer.shadowOpacity = 0.66 titleLabel.layer.shadowOffset = .zero + } else { + owsFailDebug("Missing titleLabel.") } + cancelButton.sizeToFit() navigationItem.leftBarButtonItem = UIBarButtonItem(customView: cancelButton) } else { + // Mimic a UIBarButtonItem of type .cancel, but with a shadow. + let isRTL = CurrentAppContext().isRTL + let imageName = isRTL ? "NavBarBackRTL" : "NavBarBack" + let backButton = OWSButton(imageName: imageName, tintColor: .white) { [weak self] in + self?.navigationController?.popViewController(animated: true) + } + + // Nudge closer to the left edge to match default back button item. + let kExtraLeftPadding: CGFloat = isRTL ? +0 : -8 + + // Give some extra hit area to the back button. This is a little smaller + // than the default back button, but makes sense for our left aligned title + // view in the MessagesViewController + let kExtraRightPadding: CGFloat = isRTL ? -0 : +10 + + // Extra hit area above/below + let kExtraHeightPadding: CGFloat = 4 + + // Matching the default backbutton placement is tricky. + // We can't just adjust the imageEdgeInsets on a UIBarButtonItem directly, + // so we adjust the imageEdgeInsets on a UIButton, then wrap that + // in a UIBarButtonItem. + + backButton.contentHorizontalAlignment = .left + + // Default back button is 1.5 pixel lower than our extracted image. + let kTopInsetPadding: CGFloat = 1.5 + backButton.imageEdgeInsets = UIEdgeInsets(top: kTopInsetPadding, left: kExtraLeftPadding, bottom: 0, right: 0) + + var backImageSize = CGSize.zero + if let backImage = UIImage(named: imageName) { + backImageSize = backImage.size + } else { + owsFailDebug("Missing backImage.") + } + backButton.frame = CGRect(origin: .zero, size: CGSize(width: backImageSize.width + kExtraRightPadding, + height: backImageSize.height + kExtraHeightPadding)) + + backButton.layer.shadowColor = UIColor.black.cgColor + backButton.layer.shadowRadius = 2.0 + backButton.layer.shadowOpacity = 0.66 + backButton.layer.shadowOffset = .zero // Note: using a custom leftBarButtonItem breaks the interactive pop gesture. - self.navigationItem.leftBarButtonItem = self.createOWSBackButton() + navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton) } } From 581d0a7bff1db54a6b3fed7a90556d101cd4f872 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 12:43:27 -0400 Subject: [PATCH 276/493] Respond to CR. --- .../AttachmentApproval/AttachmentApprovalViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index be3493c8a..2606edf99 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -207,7 +207,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC cancelButton.sizeToFit() navigationItem.leftBarButtonItem = UIBarButtonItem(customView: cancelButton) } else { - // Mimic a UIBarButtonItem of type .cancel, but with a shadow. + // Mimic a conventional back button, but with a shadow. let isRTL = CurrentAppContext().isRTL let imageName = isRTL ? "NavBarBackRTL" : "NavBarBack" let backButton = OWSButton(imageName: imageName, tintColor: .white) { [weak self] in From 268dd33e7d7951c220561ab88625952405a6d4ab Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Mar 2019 12:36:44 -0700 Subject: [PATCH 277/493] Change to non-crashing assert --- Signal/src/views/LinkPreviewView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift index d61ed8135..07d3037ac 100644 --- a/Signal/src/views/LinkPreviewView.swift +++ b/Signal/src/views/LinkPreviewView.swift @@ -117,7 +117,8 @@ public class LinkPreviewDraft: NSObject, LinkPreviewState { return nil } guard let image = UIImage(contentsOfFile: imageFilepath) else { - owsFail("Could not load image: \(imageFilepath)") + owsFailDebug("Could not load image: \(imageFilepath)") + return nil } return image } From 91ec9ebf9d620dd101c3d7757e0009b3da67094a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 22:10:29 -0800 Subject: [PATCH 278/493] Fix overzealous assert --- SignalServiceKit/src/Network/SSKWebSocket.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SignalServiceKit/src/Network/SSKWebSocket.swift b/SignalServiceKit/src/Network/SSKWebSocket.swift index c2a887a4a..c5724b1c1 100644 --- a/SignalServiceKit/src/Network/SSKWebSocket.swift +++ b/SignalServiceKit/src/Network/SSKWebSocket.swift @@ -145,6 +145,10 @@ extension SSKWebSocketImpl: WebSocketDelegate { switch error { case let wsError as WSError: websocketError = SSKWebSocketError(underlyingError: wsError) + case let nsError as NSError: + let networkDownCode = 50 + assert(nsError.domain == "NSPOSIXErrorDomain" && nsError.code == networkDownCode) + websocketError = error default: assert(error == nil, "unexpected error type: \(String(describing: error))") websocketError = error From 6d6d1de782c861b35e3b6c77a0d0398718c8c235 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 08:28:17 -0700 Subject: [PATCH 279/493] "Bump build to 2.37.2.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index aef4381c2..40ce1d468 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.37.1 + 2.37.2 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.37.1.0 + 2.37.2.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 54de6b176..6e9e39268 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.37.1 + 2.37.2 CFBundleVersion - 2.37.1.0 + 2.37.2.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 72ab6507ea459a35e4fa18dd6fc93ab903cd4893 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 07:56:48 -0700 Subject: [PATCH 280/493] fix crash when presenting alerts on iOS9 --- Signal.xcodeproj/project.pbxproj | 4 ++ Signal/src/UIAlerts+iOS9.m | 85 ++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 Signal/src/UIAlerts+iOS9.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index aadd52a2a..5ec0b33aa 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -462,6 +462,7 @@ 4C1885D2218F8E1C00B67051 /* PhotoGridViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1885D1218F8E1C00B67051 /* PhotoGridViewCell.swift */; }; 4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542DF51208B82E9007B4E76 /* ThreadViewModel.swift */; }; 4C20B2B920CA10DE001BAC90 /* ConversationSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */; }; + 4C21D5D6223A9DC500EF8A77 /* UIAlerts+iOS9.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */; }; 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C23A5F1215C4ADE00534937 /* SheetViewController.swift */; }; 4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */; }; 4C3E245C21F29FCE000AE092 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA5F792211E1F06008C2708 /* Toast.swift */; }; @@ -1196,6 +1197,7 @@ 4C1D233A218B6CDB00A0598F /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = translations/th.lproj/Localizable.strings; sourceTree = ""; }; 4C1D233B218B6D3100A0598F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = translations/tr.lproj/Localizable.strings; sourceTree = ""; }; 4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearchViewController.swift; sourceTree = ""; }; + 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIAlerts+iOS9.m"; sourceTree = ""; }; 4C23A5F1215C4ADE00534937 /* SheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetViewController.swift; sourceTree = ""; }; 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = ""; }; 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamParserTest.swift; sourceTree = ""; }; @@ -2614,6 +2616,7 @@ FCFA64B11A24F29E0007FB87 /* UI Categories */ = { isa = PBXGroup; children = ( + 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */, 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */, 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */, EF764C331DB67CC5000D9A87 /* UIViewController+Permissions.h */, @@ -3613,6 +3616,7 @@ 34D1F0841F8678AA0066283D /* ConversationInputToolbar.m in Sources */, 457F671B20746193000EABCD /* QuotedReplyPreview.swift in Sources */, 34A6C28021E503E700B5B12E /* OWSImagePickerController.swift in Sources */, + 4C21D5D6223A9DC500EF8A77 /* UIAlerts+iOS9.m in Sources */, 34DBF004206BD5A500025978 /* OWSBubbleView.m in Sources */, 3496957021A301A100DCFE74 /* OWSBackupIO.m in Sources */, 34E88D262098C5AE00A608F4 /* ContactViewController.swift in Sources */, diff --git a/Signal/src/UIAlerts+iOS9.m b/Signal/src/UIAlerts+iOS9.m new file mode 100644 index 000000000..bd2fa7ced --- /dev/null +++ b/Signal/src/UIAlerts+iOS9.m @@ -0,0 +1,85 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +#import + +@implementation UIAlertController (iOS9) + ++ (void)load { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + // On iOS9, avoids an exception when presenting an alert controller. + // + // *** Assertion failure in -[UIAlertController supportedInterfaceOrientations], /BuildRoot/Library/Caches/com.apple.xbs/Sources/UIKit/UIKit-3512.30.14/UIAlertController.m:542 + // Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'UIAlertController:supportedInterfaceOrientations was invoked recursively!' + // + // I'm not sure when this was introduced, or the exact root casue, but this quick workaround + // seems reasonable given the small size of our iOS9 userbase. + if (@available(iOS 10, *)) { + return; + } + + Class class = [self class]; + + // supportedInterfaceOrientation + + SEL originalOrientationSelector = @selector(supportedInterfaceOrientations); + SEL swizzledOrientationSelector = @selector(ows_iOS9Alerts_swizzle_supportedInterfaceOrientation); + + Method originalOrientationMethod = class_getInstanceMethod(class, originalOrientationSelector); + Method swizzledOrientationMethod = class_getInstanceMethod(class, swizzledOrientationSelector); + + BOOL didAddOrientationMethod = class_addMethod(class, + originalOrientationSelector, + method_getImplementation(swizzledOrientationMethod), + method_getTypeEncoding(swizzledOrientationMethod)); + + if (didAddOrientationMethod) { + class_replaceMethod(class, + swizzledOrientationSelector, + method_getImplementation(originalOrientationMethod), + method_getTypeEncoding(originalOrientationMethod)); + } else { + method_exchangeImplementations(originalOrientationMethod, swizzledOrientationMethod); + } + + // shouldAutorotate + + SEL originalAutorotateSelector = @selector(shouldAutorotate); + SEL swizzledAutorotateSelector = @selector(ows_iOS9Alerts_swizzle_shouldAutorotate); + + Method originalAutorotateMethod = class_getInstanceMethod(class, originalAutorotateSelector); + Method swizzledAutorotateMethod = class_getInstanceMethod(class, swizzledAutorotateSelector); + + BOOL didAddAutorotateMethod = class_addMethod(class, + originalAutorotateSelector, + method_getImplementation(swizzledAutorotateMethod), + method_getTypeEncoding(swizzledAutorotateMethod)); + + if (didAddAutorotateMethod) { + class_replaceMethod(class, + swizzledAutorotateSelector, + method_getImplementation(originalAutorotateMethod), + method_getTypeEncoding(originalAutorotateMethod)); + } else { + method_exchangeImplementations(originalAutorotateMethod, swizzledAutorotateMethod); + } + }); +} + +#pragma mark - Method Swizzling + +- (UIInterfaceOrientationMask)ows_iOS9Alerts_swizzle_supportedInterfaceOrientation +{ + OWSLogInfo(@"swizzled"); + return UIInterfaceOrientationMaskAllButUpsideDown; +} + +- (BOOL)ows_iOS9Alerts_swizzle_shouldAutorotate +{ + OWSLogInfo(@"swizzled"); + return NO; +} + +@end From d5664dae4b0e6d45030d631918e528dad3466544 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 11 Mar 2019 12:36:44 -0700 Subject: [PATCH 281/493] Change to non-crashing assert --- Signal/src/views/LinkPreviewView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift index d61ed8135..07d3037ac 100644 --- a/Signal/src/views/LinkPreviewView.swift +++ b/Signal/src/views/LinkPreviewView.swift @@ -117,7 +117,8 @@ public class LinkPreviewDraft: NSObject, LinkPreviewState { return nil } guard let image = UIImage(contentsOfFile: imageFilepath) else { - owsFail("Could not load image: \(imageFilepath)") + owsFailDebug("Could not load image: \(imageFilepath)") + return nil } return image } From a34266094357ffaef2760a7608786e991f6b848d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 13 Mar 2019 11:11:20 -0700 Subject: [PATCH 282/493] fix "none" notification tone --- .../Notifications/UserNotificationsAdaptee.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index 412ed633c..215d17ab1 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -113,7 +113,9 @@ extension UserNotificationPresenterAdaptee: NotificationPresenterAdaptee { content.categoryIdentifier = category.identifier content.userInfo = userInfo let isAppActive = UIApplication.shared.applicationState == .active - content.sound = sound?.notificationSound(isQuiet: isAppActive) + if let sound = sound, sound != OWSSound.none { + content.sound = sound.notificationSound(isQuiet: isAppActive) + } var notificationIdentifier: String = UUID().uuidString if let replacingIdentifier = replacingIdentifier { From 256d308e30c4d279102e05167987e250a93e6085 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 08:32:48 -0700 Subject: [PATCH 283/493] pull latest translations --- .../translations/cs.lproj/Localizable.strings | 4 +- .../translations/de.lproj/Localizable.strings | 6 +-- .../translations/et.lproj/Localizable.strings | 4 +- .../translations/hu.lproj/Localizable.strings | 4 +- .../translations/nb.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 54 +++++++++---------- .../translations/sl.lproj/Localizable.strings | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 853224313..21d2f8d29 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Začněte zadáním telefoního čísla"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Neplatné číslo"; @@ -1545,7 +1545,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Nastavit váš profil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Smluvní podmínky a zásady ochrany osobních údajů"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 98366cabc..9863669bd 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1057,7 +1057,7 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Suchen"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@ und %@"; @@ -1102,7 +1102,7 @@ "IN_CALL_CONNECTING" = "Verbinden …"; /* Call setup status label */ -"IN_CALL_RECONNECTING" = "Verbindung wird wiederhergestellt …"; +"IN_CALL_RECONNECTING" = "Neu verbinden …"; /* Call setup status label */ "IN_CALL_RINGING" = "Klingeln …"; @@ -1503,7 +1503,7 @@ "NOTIFICATIONS_SHOW" = "Anzeigen"; /* No comment provided by engineer. */ -"OK" = "O. K."; +"OK" = "Okay"; /* The first explanation in the 'onboarding 2FA' view. */ "ONBOARDING_2FA_EXPLANATION_1" = "Für diese Rufnummer ist eine Registrierungssperre aktiviert. Bitte gib die PIN für die Registrierungssperre ein."; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index 013abca4a..d15c5bb35 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Sisesta alustamiseks oma telefoninumber"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Vigane number"; @@ -1545,7 +1545,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Seadista oma profiil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Tingimused ja privaatsuspoliitika"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 18488bcf0..5f67b53ca 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -1048,7 +1048,7 @@ "GROUP_YOU_LEFT" = "Elhagytad a csoportot."; /* Label for 'archived conversations' button. */ -"HOME_VIEW_ARCHIVED_CONVERSATIONS" = "Archived Conversations"; +"HOME_VIEW_ARCHIVED_CONVERSATIONS" = "Archív beszélgetések"; /* Table cell subtitle label for a conversation the user has blocked. */ "HOME_VIEW_BLOCKED_CONVERSATION" = "Letiltva"; @@ -1114,7 +1114,7 @@ "IN_CALL_TERMINATED" = "Hívás vége"; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Ezek a beszélgetések archiválva vannak, ezért csak akkor jelennek meg újra a bejövő üzenet közt, ha újabb üzenet érkezik."; /* Message shown in the home view when the inbox is empty. */ "INBOX_VIEW_EMPTY_INBOX" = "Dobj a postaládádba valamit, hogy ne legyen olyan magányos! Láss hozzá, és üzenj egy barátodnak!"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index b1fa644f7..c6c0d5c03 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -1533,7 +1533,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Skriv inn telefonnummeret ditt for å komme i gang"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldig nummer"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 58d1e5450..31ab9d982 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -1057,16 +1057,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@ e %@"; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Inicie sua primeira conversa aqui."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Nenhum resultado encontrado para '%@'"; @@ -1087,10 +1087,10 @@ "IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; /* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; +"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Girar 45°"; /* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; +"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Girar 90°"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Você não pode compartilhar mais de %@ itens."; @@ -1509,82 +1509,82 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Este número de telefone está com o Bloqueio de Cadastro ativo. Por favor, insira o PIN de Desbloqueio de Cadastro."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Seu PIN de Bloqueio de Cadastro é diferente do código de verificação automático que foi enviado para o seu celular na última etapa."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Esqueci meu PIN"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Bloqueio de Cadastro"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Adicione um toque de humanidade às suas mensagens"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Habilitar permissões"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "As suas informações de contato são sempre transmitidas com segurança."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Agora Não"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "O Signal pode avisar quando você receber uma mensagem (e quem a mandou)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Insira seu número de telefone para começar"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número inválido"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Os perfis do Signal são criptografados de ponta a ponta, e o Signal jamais tem acesso a estas informações."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Seu nome"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Crie seu perfil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Termos & Política de Privacidade"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Leve a privacidade consigo.\nSeja você em cada mensagem."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Número errado?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Não recebi um código (disponível em %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "O código está incorreto"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Não recebi um código"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Por favor, verifique se o seu celular está com sinal e pode receber mensagens de SMS."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Nada de código?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Reenviar código"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ligue para mim"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Ainda nada de código?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Insira o código que enviamos para %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Acabamos de reenviar um código para %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Configurações"; @@ -2412,7 +2412,7 @@ "UNKNOWN_CONTACT_NAME" = "Contato Desconhecido"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "País desconhecido"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Desconhecida/o"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index e18b724a9..bc804add4 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -1114,7 +1114,7 @@ "IN_CALL_TERMINATED" = "Končan klic."; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "Ti pogovori so premaknjeni v arhiv in se bodo znova pojavili v nabiralniku samo, če prejmete novo sporočilo."; /* Message shown in the home view when the inbox is empty. */ "INBOX_VIEW_EMPTY_INBOX" = "Vaš poštni nabiralnik je lačen nove pošte. ;-) Začnite s sporočilom prijatelju!"; From 625656deb96b1eaf3be00b80819bcb0b1c33206d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 16:46:12 -0400 Subject: [PATCH 284/493] Pull out attachment text toolbar and text view classes. --- Signal.xcodeproj/project.pbxproj | 8 + ...AttachmentApprovalInputAccessoryView.swift | 353 +----------------- .../AttachmentApprovalViewController.swift | 22 +- .../AttachmentTextToolbar.swift | 339 +++++++++++++++++ .../AttachmentTextView.swift | 16 + 5 files changed, 378 insertions(+), 360 deletions(-) create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextView.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 75b9a8eca..cabb23b0a 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -22,6 +22,8 @@ 340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */; }; 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */; }; 340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */; }; + 340872DD22399F9100CB25B0 /* AttachmentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */; }; + 340872DE22399F9100CB25B0 /* AttachmentTextToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -657,6 +659,8 @@ 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentPrepViewController.swift; sourceTree = ""; }; 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalInputAccessoryView.swift; sourceTree = ""; }; + 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextView.swift; sourceTree = ""; }; + 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextToolbar.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1491,6 +1495,8 @@ 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */, 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */, 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */, + 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */, + 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */, ); path = AttachmentApproval; sourceTree = ""; @@ -3403,6 +3409,7 @@ 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */, 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */, 346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */, + 340872DD22399F9100CB25B0 /* AttachmentTextView.swift in Sources */, 34AC0A11211B39EA00997B47 /* OWSLayerView.swift in Sources */, 34AC0A1B211B39EA00997B47 /* GradientView.swift in Sources */, 34AC09E2211B39B100997B47 /* ReturnToCallViewController.swift in Sources */, @@ -3475,6 +3482,7 @@ 34BBC84B220B2CB200857249 /* ImageEditorTextViewController.swift in Sources */, 34AC09FA211B39B100997B47 /* SharingThreadPickerViewController.m in Sources */, 45F59A082028E4FB00E8D2B0 /* OWSAudioSession.swift in Sources */, + 340872DE22399F9100CB25B0 /* AttachmentTextToolbar.swift in Sources */, 34612A071FD7238600532771 /* OWSSyncManager.m in Sources */, 450C801220AD1D5B00F3A091 /* UIDevice+featureSupport.swift in Sources */, 451F8A471FD715BA005CB9DA /* OWSAvatarBuilder.m in Sources */, diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index 3e21193b5..d520b307c 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -6,17 +6,17 @@ import Foundation import UIKit class AttachmentApprovalInputAccessoryView: UIView { - let mediaMessageTextToolbar: MediaMessageTextToolbar + let attachmentTextToolbar: AttachmentTextToolbar let galleryRailView: GalleryRailView var isEditingMediaMessage: Bool { - return mediaMessageTextToolbar.textView.isFirstResponder + return attachmentTextToolbar.textView.isFirstResponder } let kGalleryRailViewHeight: CGFloat = 72 required init(isAddMoreVisible: Bool) { - mediaMessageTextToolbar = MediaMessageTextToolbar(isAddMoreVisible: isAddMoreVisible) + attachmentTextToolbar = AttachmentTextToolbar(isAddMoreVisible: isAddMoreVisible) galleryRailView = GalleryRailView() galleryRailView.scrollFocusMode = .keepWithinBounds @@ -32,7 +32,7 @@ class AttachmentApprovalInputAccessoryView: UIView { backgroundColor = UIColor.black.withAlphaComponent(0.6) preservesSuperviewLayoutMargins = true - let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.mediaMessageTextToolbar]) + let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.attachmentTextToolbar]) stackView.axis = .vertical addSubview(stackView) @@ -53,348 +53,3 @@ class AttachmentApprovalInputAccessoryView: UIView { } } } - -// MARK: - - -// Coincides with Android's max text message length -let kMaxMessageBodyCharacterCount = 2000 - -protocol MediaMessageTextToolbarDelegate: class { - func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) - func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) -} - -// MARK: - - -class MediaMessageTextToolbar: UIView, UITextViewDelegate { - - weak var mediaMessageTextToolbarDelegate: MediaMessageTextToolbarDelegate? - - var messageText: String? { - get { return textView.text } - - set { - textView.text = newValue - updatePlaceholderTextViewVisibility() - } - } - - // Layout Constants - - let kMinTextViewHeight: CGFloat = 38 - var maxTextViewHeight: CGFloat { - // About ~4 lines in portrait and ~3 lines in landscape. - // Otherwise we risk obscuring too much of the content. - return UIDevice.current.orientation.isPortrait ? 160 : 100 - } - var textViewHeightConstraint: NSLayoutConstraint! - var textViewHeight: CGFloat - - // MARK: - Initializers - - init(isAddMoreVisible: Bool) { - self.addMoreButton = UIButton(type: .custom) - self.sendButton = UIButton(type: .system) - self.textViewHeight = kMinTextViewHeight - - super.init(frame: CGRect.zero) - - // Specifying autorsizing mask and an intrinsic content size allows proper - // sizing when used as an input accessory view. - self.autoresizingMask = .flexibleHeight - self.translatesAutoresizingMaskIntoConstraints = false - self.backgroundColor = UIColor.clear - - textView.delegate = self - - let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) - addMoreButton.setImage(addMoreIcon, for: .normal) - addMoreButton.tintColor = Theme.darkThemePrimaryColor - addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) - - let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") - sendButton.setTitle(sendTitle, for: .normal) - sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside) - - sendButton.titleLabel?.font = UIFont.ows_mediumFont(withSize: 16) - sendButton.titleLabel?.textAlignment = .center - sendButton.tintColor = Theme.galleryHighlightColor - - // Increase hit area of send button - sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8) - - let contentView = UIView() - contentView.addSubview(sendButton) - contentView.addSubview(textContainer) - contentView.addSubview(lengthLimitLabel) - if isAddMoreVisible { - contentView.addSubview(addMoreButton) - } - - addSubview(contentView) - contentView.autoPinEdgesToSuperviewEdges() - - // Layout - let kToolbarMargin: CGFloat = 8 - - // We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins - // when resigning first responder (verified by auditing with `layoutMarginsDidChange`). - // The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the - // user dismisses the keyboard, giving the input accessory view a wonky layout. - contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin) - - self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) - - // We pin all three edges explicitly rather than doing something like: - // textView.autoPinEdges(toSuperviewMarginsExcludingEdge: .right) - // because that method uses `leading` / `trailing` rather than `left` vs. `right`. - // So it doesn't work as expected with RTL layouts when we explicitly want something - // to be on the right side for both RTL and LTR layouts, like with the send button. - // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209 - textContainer.autoPinEdge(toSuperviewMargin: .top) - textContainer.autoPinEdge(toSuperviewMargin: .bottom) - if isAddMoreVisible { - addMoreButton.autoPinEdge(toSuperviewMargin: .left) - textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin) - addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton) - addMoreButton.setContentHuggingHigh() - addMoreButton.setCompressionResistanceHigh() - } else { - textContainer.autoPinEdge(toSuperviewMargin: .left) - } - - sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin) - sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3) - - sendButton.autoPinEdge(toSuperviewMargin: .right) - sendButton.setContentHuggingHigh() - sendButton.setCompressionResistanceHigh() - - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left) - lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right) - lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textContainer, withOffset: -6) - lengthLimitLabel.setContentHuggingHigh() - lengthLimitLabel.setCompressionResistanceHigh() - } - - required init?(coder aDecoder: NSCoder) { - notImplemented() - } - - // MARK: - UIView Overrides - - override var intrinsicContentSize: CGSize { - get { - // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify - // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. - return CGSize.zero - } - } - - // MARK: - Subviews - - private let addMoreButton: UIButton - private let sendButton: UIButton - - private lazy var lengthLimitLabel: UILabel = { - let lengthLimitLabel = UILabel() - - // Length Limit Label shown when the user inputs too long of a message - lengthLimitLabel.textColor = .white - lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.") - lengthLimitLabel.textAlignment = .center - - // Add shadow in case overlayed on white content - lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = .zero - lengthLimitLabel.layer.shadowOpacity = 0.8 - lengthLimitLabel.layer.shadowRadius = 2.0 - lengthLimitLabel.isHidden = true - - return lengthLimitLabel - }() - - lazy var textView: UITextView = { - let textView = buildTextView() - - textView.returnKeyType = .done - textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) - - return textView - }() - - private lazy var placeholderTextView: UITextView = { - let placeholderTextView = buildTextView() - - placeholderTextView.text = NSLocalizedString("MESSAGE_TEXT_FIELD_PLACEHOLDER", comment: "placeholder text for the editable message field") - placeholderTextView.isEditable = false - - return placeholderTextView - }() - - private lazy var textContainer: UIView = { - let textContainer = UIView() - - textContainer.layer.borderColor = Theme.darkThemePrimaryColor.cgColor - textContainer.layer.borderWidth = 0.5 - textContainer.layer.cornerRadius = kMinTextViewHeight / 2 - textContainer.clipsToBounds = true - - textContainer.addSubview(placeholderTextView) - placeholderTextView.autoPinEdgesToSuperviewEdges() - - textContainer.addSubview(textView) - textView.autoPinEdgesToSuperviewEdges() - - return textContainer - }() - - private func buildTextView() -> UITextView { - let textView = MessageTextView() - - textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance - textView.backgroundColor = .clear - textView.tintColor = Theme.darkThemePrimaryColor - - textView.font = UIFont.ows_dynamicTypeBody - textView.textColor = Theme.darkThemePrimaryColor - textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) - - return textView - } - - class MessageTextView: UITextView { - // When creating new lines, contentOffset is animated, but because - // we are simultaneously resizing the text view, this can cause the - // text in the textview to be "too high" in the text view. - // Solution is to disable animation for setting content offset. - override func setContentOffset(_ contentOffset: CGPoint, animated: Bool) { - super.setContentOffset(contentOffset, animated: false) - } - } - - // MARK: - Actions - - @objc func didTapSend() { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidTapSend(self) - } - - @objc func didTapAddMore() { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidAddMore(self) - } - - // MARK: - UITextViewDelegate - - public func textViewDidChange(_ textView: UITextView) { - updateHeight(textView: textView) - } - - public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { - - if !FeatureFlags.sendingMediaWithOversizeText { - let existingText: String = textView.text ?? "" - let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) - - // Don't complicate things by mixing media attachments with oversize text attachments - guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { - Logger.debug("long text was truncated") - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be - // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is - // to just measure the utf8 encoded bytes of the replaced substring. - let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count - - // Accept as much of the input as we can - let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete - if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - self.lengthLimitLabel.isHidden = true - - // After verifying the byte-length is sufficiently small, verify the character count is within bounds. - guard proposedText.count < kMaxMessageBodyCharacterCount else { - Logger.debug("hit attachment message body character count limit") - - self.lengthLimitLabel.isHidden = false - - // `range` represents the section of the existing text we will replace. We can re-use that space. - let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count - - // Accept as much of the input as we can - let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete - if charBudget >= 0 { - let acceptableNewText = String(text.prefix(charBudget)) - textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) - } - - return false - } - } - - // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button - // allows the user to get the keyboard out of the way while in the attachment approval view. - if text == "\n" { - textView.resignFirstResponder() - return false - } else { - return true - } - } - - public func textViewDidBeginEditing(_ textView: UITextView) { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidBeginEditing(self) - updatePlaceholderTextViewVisibility() - } - - public func textViewDidEndEditing(_ textView: UITextView) { - mediaMessageTextToolbarDelegate?.mediaMessageTextToolbarDidEndEditing(self) - updatePlaceholderTextViewVisibility() - } - - // MARK: - Helpers - - func updatePlaceholderTextViewVisibility() { - let isHidden: Bool = { - guard !self.textView.isFirstResponder else { - return true - } - - guard let text = self.textView.text else { - return false - } - - guard text.count > 0 else { - return false - } - - return true - }() - - placeholderTextView.isHidden = isHidden - } - - private func updateHeight(textView: UITextView) { - // compute new height assuming width is unchanged - let currentSize = textView.frame.size - let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width) - - if newHeight != textViewHeight { - Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)") - textViewHeight = newHeight - textViewHeightConstraint?.constant = textViewHeight - invalidateIntrinsicContentSize() - } - } - - private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat { - let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) - return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight) - } -} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 2606edf99..759995258 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -79,8 +79,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return bottomToolView.galleryRailView } - var mediaMessageTextToolbar: MediaMessageTextToolbar { - return bottomToolView.mediaMessageTextToolbar + var attachmentTextToolbar: AttachmentTextToolbar { + return bottomToolView.attachmentTextToolbar } lazy var bottomToolView: AttachmentApprovalInputAccessoryView = { @@ -106,7 +106,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // Bottom Toolbar galleryRailView.delegate = self - mediaMessageTextToolbar.mediaMessageTextToolbarDelegate = self + attachmentTextToolbar.attachmentTextToolbarDelegate = self // Navigation @@ -566,27 +566,27 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } } -extension AttachmentApprovalViewController: MediaMessageTextToolbarDelegate { - func mediaMessageTextToolbarDidBeginEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { +extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { + func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar) { currentPageViewController.setAttachmentViewScale(.compact, animated: true) } - func mediaMessageTextToolbarDidEndEditing(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + func attachmentTextToolbarDidEndEditing(_ attachmentTextToolbar: AttachmentTextToolbar) { currentPageViewController.setAttachmentViewScale(.fullsize, animated: true) } - func mediaMessageTextToolbarDidTapSend(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + func attachmentTextToolbarDidTapSend(_ attachmentTextToolbar: AttachmentTextToolbar) { // Toolbar flickers in and out if there are errors // and remains visible momentarily after share extension is dismissed. // It's easiest to just hide it at this point since we're done with it. currentPageViewController.shouldAllowAttachmentViewResizing = false - mediaMessageTextToolbar.isUserInteractionEnabled = false - mediaMessageTextToolbar.isHidden = true + attachmentTextToolbar.isUserInteractionEnabled = false + attachmentTextToolbar.isHidden = true - approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: mediaMessageTextToolbar.messageText) + approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: attachmentTextToolbar.messageText) } - func mediaMessageTextToolbarDidAddMore(_ mediaMessageTextToolbar: MediaMessageTextToolbar) { + func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) { self.approvalDelegate?.attachmentApproval?(self, addMoreToAttachments: attachments) } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift new file mode 100644 index 000000000..078893bdd --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift @@ -0,0 +1,339 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit + +// Coincides with Android's max text message length +let kMaxMessageBodyCharacterCount = 2000 + +protocol AttachmentTextToolbarDelegate: class { + func attachmentTextToolbarDidTapSend(_ attachmentTextToolbar: AttachmentTextToolbar) + func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar) + func attachmentTextToolbarDidEndEditing(_ attachmentTextToolbar: AttachmentTextToolbar) + func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) +} + +// MARK: - + +class AttachmentTextToolbar: UIView, UITextViewDelegate { + + weak var attachmentTextToolbarDelegate: AttachmentTextToolbarDelegate? + + var messageText: String? { + get { return textView.text } + + set { + textView.text = newValue + updatePlaceholderTextViewVisibility() + } + } + + // Layout Constants + + let kMinTextViewHeight: CGFloat = 38 + var maxTextViewHeight: CGFloat { + // About ~4 lines in portrait and ~3 lines in landscape. + // Otherwise we risk obscuring too much of the content. + return UIDevice.current.orientation.isPortrait ? 160 : 100 + } + var textViewHeightConstraint: NSLayoutConstraint! + var textViewHeight: CGFloat + + // MARK: - Initializers + + init(isAddMoreVisible: Bool) { + self.addMoreButton = UIButton(type: .custom) + self.sendButton = UIButton(type: .system) + self.textViewHeight = kMinTextViewHeight + + super.init(frame: CGRect.zero) + + // Specifying autorsizing mask and an intrinsic content size allows proper + // sizing when used as an input accessory view. + self.autoresizingMask = .flexibleHeight + self.translatesAutoresizingMaskIntoConstraints = false + self.backgroundColor = UIColor.clear + + textView.delegate = self + + let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) + addMoreButton.setImage(addMoreIcon, for: .normal) + addMoreButton.tintColor = Theme.darkThemePrimaryColor + addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) + + let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") + sendButton.setTitle(sendTitle, for: .normal) + sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside) + + sendButton.titleLabel?.font = UIFont.ows_mediumFont(withSize: 16) + sendButton.titleLabel?.textAlignment = .center + sendButton.tintColor = Theme.galleryHighlightColor + + // Increase hit area of send button + sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8) + + let contentView = UIView() + contentView.addSubview(sendButton) + contentView.addSubview(textContainer) + contentView.addSubview(lengthLimitLabel) + if isAddMoreVisible { + contentView.addSubview(addMoreButton) + } + + addSubview(contentView) + contentView.autoPinEdgesToSuperviewEdges() + + // Layout + let kToolbarMargin: CGFloat = 8 + + // We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins + // when resigning first responder (verified by auditing with `layoutMarginsDidChange`). + // The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the + // user dismisses the keyboard, giving the input accessory view a wonky layout. + contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin) + + self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) + + // We pin all three edges explicitly rather than doing something like: + // textView.autoPinEdges(toSuperviewMarginsExcludingEdge: .right) + // because that method uses `leading` / `trailing` rather than `left` vs. `right`. + // So it doesn't work as expected with RTL layouts when we explicitly want something + // to be on the right side for both RTL and LTR layouts, like with the send button. + // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209 + textContainer.autoPinEdge(toSuperviewMargin: .top) + textContainer.autoPinEdge(toSuperviewMargin: .bottom) + if isAddMoreVisible { + addMoreButton.autoPinEdge(toSuperviewMargin: .left) + textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin) + addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton) + addMoreButton.setContentHuggingHigh() + addMoreButton.setCompressionResistanceHigh() + } else { + textContainer.autoPinEdge(toSuperviewMargin: .left) + } + + sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin) + sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3) + + sendButton.autoPinEdge(toSuperviewMargin: .right) + sendButton.setContentHuggingHigh() + sendButton.setCompressionResistanceHigh() + + lengthLimitLabel.autoPinEdge(toSuperviewMargin: .left) + lengthLimitLabel.autoPinEdge(toSuperviewMargin: .right) + lengthLimitLabel.autoPinEdge(.bottom, to: .top, of: textContainer, withOffset: -6) + lengthLimitLabel.setContentHuggingHigh() + lengthLimitLabel.setCompressionResistanceHigh() + } + + required init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - UIView Overrides + + override var intrinsicContentSize: CGSize { + get { + // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify + // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. + return CGSize.zero + } + } + + // MARK: - Subviews + + private let addMoreButton: UIButton + private let sendButton: UIButton + + private lazy var lengthLimitLabel: UILabel = { + let lengthLimitLabel = UILabel() + + // Length Limit Label shown when the user inputs too long of a message + lengthLimitLabel.textColor = .white + lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.") + lengthLimitLabel.textAlignment = .center + + // Add shadow in case overlayed on white content + lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor + lengthLimitLabel.layer.shadowOffset = .zero + lengthLimitLabel.layer.shadowOpacity = 0.8 + lengthLimitLabel.layer.shadowRadius = 2.0 + lengthLimitLabel.isHidden = true + + return lengthLimitLabel + }() + + lazy var textView: UITextView = { + let textView = buildTextView() + + textView.returnKeyType = .done + textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) + + return textView + }() + + private lazy var placeholderTextView: UITextView = { + let placeholderTextView = buildTextView() + + placeholderTextView.text = NSLocalizedString("MESSAGE_TEXT_FIELD_PLACEHOLDER", comment: "placeholder text for the editable message field") + placeholderTextView.isEditable = false + + return placeholderTextView + }() + + private lazy var textContainer: UIView = { + let textContainer = UIView() + + textContainer.layer.borderColor = Theme.darkThemePrimaryColor.cgColor + textContainer.layer.borderWidth = 0.5 + textContainer.layer.cornerRadius = kMinTextViewHeight / 2 + textContainer.clipsToBounds = true + + textContainer.addSubview(placeholderTextView) + placeholderTextView.autoPinEdgesToSuperviewEdges() + + textContainer.addSubview(textView) + textView.autoPinEdgesToSuperviewEdges() + + return textContainer + }() + + private func buildTextView() -> UITextView { + let textView = AttachmentTextView() + + textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance + textView.backgroundColor = .clear + textView.tintColor = Theme.darkThemePrimaryColor + + textView.font = UIFont.ows_dynamicTypeBody + textView.textColor = Theme.darkThemePrimaryColor + textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) + + return textView + } + + // MARK: - Actions + + @objc func didTapSend() { + attachmentTextToolbarDelegate?.attachmentTextToolbarDidTapSend(self) + } + + @objc func didTapAddMore() { + attachmentTextToolbarDelegate?.attachmentTextToolbarDidAddMore(self) + } + + // MARK: - UITextViewDelegate + + public func textViewDidChange(_ textView: UITextView) { + updateHeight(textView: textView) + } + + public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + + if !FeatureFlags.sendingMediaWithOversizeText { + let existingText: String = textView.text ?? "" + let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) + + // Don't complicate things by mixing media attachments with oversize text attachments + guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { + Logger.debug("long text was truncated") + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be + // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is + // to just measure the utf8 encoded bytes of the replaced substring. + let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count + + // Accept as much of the input as we can + let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete + if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + self.lengthLimitLabel.isHidden = true + + // After verifying the byte-length is sufficiently small, verify the character count is within bounds. + guard proposedText.count < kMaxMessageBodyCharacterCount else { + Logger.debug("hit attachment message body character count limit") + + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count + + // Accept as much of the input as we can + let charBudget: Int = Int(kMaxMessageBodyCharacterCount) - charsAfterDelete + if charBudget >= 0 { + let acceptableNewText = String(text.prefix(charBudget)) + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + } + + // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button + // allows the user to get the keyboard out of the way while in the attachment approval view. + if text == "\n" { + textView.resignFirstResponder() + return false + } else { + return true + } + } + + public func textViewDidBeginEditing(_ textView: UITextView) { + attachmentTextToolbarDelegate?.attachmentTextToolbarDidBeginEditing(self) + updatePlaceholderTextViewVisibility() + } + + public func textViewDidEndEditing(_ textView: UITextView) { + attachmentTextToolbarDelegate?.attachmentTextToolbarDidEndEditing(self) + updatePlaceholderTextViewVisibility() + } + + // MARK: - Helpers + + func updatePlaceholderTextViewVisibility() { + let isHidden: Bool = { + guard !self.textView.isFirstResponder else { + return true + } + + guard let text = self.textView.text else { + return false + } + + guard text.count > 0 else { + return false + } + + return true + }() + + placeholderTextView.isHidden = isHidden + } + + private func updateHeight(textView: UITextView) { + // compute new height assuming width is unchanged + let currentSize = textView.frame.size + let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width) + + if newHeight != textViewHeight { + Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)") + textViewHeight = newHeight + textViewHeightConstraint?.constant = textViewHeight + invalidateIntrinsicContentSize() + } + } + + private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat { + let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) + return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight) + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextView.swift new file mode 100644 index 000000000..4dac7dc52 --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextView.swift @@ -0,0 +1,16 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit + +class AttachmentTextView: UITextView { + // When creating new lines, contentOffset is animated, but because + // we are simultaneously resizing the text view, this can cause the + // text in the textview to be "too high" in the text view. + // Solution is to disable animation for setting content offset. + override func setContentOffset(_ contentOffset: CGPoint, animated: Bool) { + super.setContentOffset(contentOffset, animated: false) + } +} From d80f086f3134562f73c0e701e51ba3be033d6f0b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 13 Mar 2019 16:15:33 -0400 Subject: [PATCH 285/493] Rework attachment captioning. --- Signal.xcodeproj/project.pbxproj | 28 ++- .../translations/en.lproj/Localizable.strings | 72 +----- ...AttachmentApprovalInputAccessoryView.swift | 129 +++++++++- .../AttachmentApprovalViewController.swift | 111 ++++++--- .../AttachmentCaptionToolbar.swift | 222 ++++++++++++++++++ .../AttachmentPrepViewController.swift | 73 +----- 6 files changed, 449 insertions(+), 186 deletions(-) create mode 100644 SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index cabb23b0a..2eeeffa51 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -20,10 +20,11 @@ 340872C92239563500CB25B0 /* AttachmentItemCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */; }; 340872CA2239563500CB25B0 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */; }; 340872CB2239563500CB25B0 /* AttachmentPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */; }; - 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */; }; 340872CE2239596100CB25B0 /* AttachmentApprovalInputAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */; }; - 340872DD22399F9100CB25B0 /* AttachmentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */; }; - 340872DE22399F9100CB25B0 /* AttachmentTextToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */; }; + 340872D02239787F00CB25B0 /* AttachmentTextToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872CF2239787F00CB25B0 /* AttachmentTextToolbar.swift */; }; + 340872D622397E6800CB25B0 /* AttachmentCaptionToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872D522397E6800CB25B0 /* AttachmentCaptionToolbar.swift */; }; + 340872D822397F4600CB25B0 /* AttachmentCaptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872D722397F4500CB25B0 /* AttachmentCaptionViewController.swift */; }; + 340872DA22397FEB00CB25B0 /* AttachmentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340872D922397FEB00CB25B0 /* AttachmentTextView.swift */; }; 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */; }; 340FC8A9204DAC8D007AEB0F /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */; }; 340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340FC87C204DAC8C007AEB0F /* NotificationSettingsViewController.m */; }; @@ -657,10 +658,11 @@ 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentItemCollection.swift; sourceTree = ""; }; 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalViewController.swift; sourceTree = ""; }; 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentPrepViewController.swift; sourceTree = ""; }; - 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentApprovalInputAccessoryView.swift; sourceTree = ""; }; - 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextView.swift; sourceTree = ""; }; - 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextToolbar.swift; sourceTree = ""; }; + 340872CF2239787F00CB25B0 /* AttachmentTextToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextToolbar.swift; sourceTree = ""; }; + 340872D522397E6800CB25B0 /* AttachmentCaptionToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionToolbar.swift; sourceTree = ""; }; + 340872D722397F4500CB25B0 /* AttachmentCaptionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentCaptionViewController.swift; sourceTree = ""; }; + 340872D922397FEB00CB25B0 /* AttachmentTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentTextView.swift; sourceTree = ""; }; 340B02B61F9FD31800F9CFEC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = translations/he.lproj/Localizable.strings; sourceTree = ""; }; 340B02B91FA0D6C700F9CFEC /* ConversationViewItemTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversationViewItemTest.m; sourceTree = ""; }; 340FC87B204DAC8C007AEB0F /* NotificationSettingsOptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsOptionsViewController.m; sourceTree = ""; }; @@ -1492,11 +1494,12 @@ 340872C32239563500CB25B0 /* ApprovalRailCellView.swift */, 340872CD2239596000CB25B0 /* AttachmentApprovalInputAccessoryView.swift */, 340872C52239563500CB25B0 /* AttachmentApprovalViewController.swift */, - 340872C72239563500CB25B0 /* AttachmentCaptionViewController.swift */, + 340872D522397E6800CB25B0 /* AttachmentCaptionToolbar.swift */, + 340872D722397F4500CB25B0 /* AttachmentCaptionViewController.swift */, 340872C42239563500CB25B0 /* AttachmentItemCollection.swift */, 340872C62239563500CB25B0 /* AttachmentPrepViewController.swift */, - 340872DC22399F9100CB25B0 /* AttachmentTextToolbar.swift */, - 340872DB22399F9100CB25B0 /* AttachmentTextView.swift */, + 340872CF2239787F00CB25B0 /* AttachmentTextToolbar.swift */, + 340872D922397FEB00CB25B0 /* AttachmentTextView.swift */, ); path = AttachmentApproval; sourceTree = ""; @@ -3399,6 +3402,7 @@ 34BBC857220C7ADA00857249 /* ImageEditorItem.swift in Sources */, 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */, 34AC0A1C211B39EA00997B47 /* OWSFlatButton.swift in Sources */, + 340872D822397F4600CB25B0 /* AttachmentCaptionViewController.swift in Sources */, 34C3C7932040B0DD0000134C /* OWSAudioPlayer.m in Sources */, 34AC09E5211B39B100997B47 /* ScreenLockViewController.m in Sources */, 34AC09F7211B39B100997B47 /* MediaMessageView.swift in Sources */, @@ -3406,10 +3410,8 @@ 3461293A1FD1B47300532771 /* OWSPreferences.m in Sources */, 34AC09E6211B39B100997B47 /* SelectRecipientViewController.m in Sources */, 4C858A52212DC5E1001B45D3 /* UIImage+OWS.swift in Sources */, - 340872CC2239563500CB25B0 /* AttachmentCaptionViewController.swift in Sources */, 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */, 346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */, - 340872DD22399F9100CB25B0 /* AttachmentTextView.swift in Sources */, 34AC0A11211B39EA00997B47 /* OWSLayerView.swift in Sources */, 34AC0A1B211B39EA00997B47 /* GradientView.swift in Sources */, 34AC09E2211B39B100997B47 /* ReturnToCallViewController.swift in Sources */, @@ -3430,6 +3432,7 @@ 346129AD1FD1F34E00532771 /* ImageCache.swift in Sources */, 452C7CA72037628B003D51A5 /* Weak.swift in Sources */, 34D5872F208E2C4200D2255A /* OWS109OutgoingMessageState.m in Sources */, + 340872D02239787F00CB25B0 /* AttachmentTextToolbar.swift in Sources */, 34AC09F8211B39B100997B47 /* CountryCodeViewController.m in Sources */, 451F8A341FD710C3005CB9DA /* FullTextSearcher.swift in Sources */, 34080F04222858DC0087E99F /* OWSViewController+ImageEditor.swift in Sources */, @@ -3466,6 +3469,7 @@ 34BEDB0B21C2FA3D007B0EAE /* OWS114RemoveDynamicInteractions.swift in Sources */, 34AC0A1A211B39EA00997B47 /* CommonStrings.swift in Sources */, 34AC0A19211B39EA00997B47 /* OWSAlerts.swift in Sources */, + 340872DA22397FEB00CB25B0 /* AttachmentTextView.swift in Sources */, 34FDB29221FF986600A01202 /* UIView+OWS.swift in Sources */, 34BBC859220C7ADA00857249 /* ImageEditorStrokeItem.swift in Sources */, 451F8A351FD710DE005CB9DA /* Searcher.swift in Sources */, @@ -3482,7 +3486,6 @@ 34BBC84B220B2CB200857249 /* ImageEditorTextViewController.swift in Sources */, 34AC09FA211B39B100997B47 /* SharingThreadPickerViewController.m in Sources */, 45F59A082028E4FB00E8D2B0 /* OWSAudioSession.swift in Sources */, - 340872DE22399F9100CB25B0 /* AttachmentTextToolbar.swift in Sources */, 34612A071FD7238600532771 /* OWSSyncManager.m in Sources */, 450C801220AD1D5B00F3A091 /* UIDevice+featureSupport.swift in Sources */, 451F8A471FD715BA005CB9DA /* OWSAvatarBuilder.m in Sources */, @@ -3497,6 +3500,7 @@ 349EA07C2162AEA800F7B17F /* OWS111UDAttributesMigration.swift in Sources */, 34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */, 459B775C207BA46C0071D0AB /* OWSQuotedReplyModel.m in Sources */, + 340872D622397E6800CB25B0 /* AttachmentCaptionToolbar.swift in Sources */, 34ABB2C42090C59700C727A6 /* OWSResaveCollectionDBMigration.m in Sources */, 4C948FF72146EB4800349F0D /* BlockListCache.swift in Sources */, 4551DB5A205C562300C8AE75 /* Collection+OWS.swift in Sources */, diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index d206bb629..6ee9840fa 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "File type: %@"; @@ -305,15 +308,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -1068,13 +1065,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1089,21 +1086,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1811,12 +1793,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1838,9 +1814,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Country Code"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Enter Number"; @@ -1859,15 +1832,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "This phone number format is not supported, please contact support."; @@ -1877,9 +1841,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Your Phone Number"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verification Failed"; @@ -1889,9 +1850,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Register"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2525,24 +2483,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Back"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verification Code"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index d520b307c..22c553b7f 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -5,42 +5,148 @@ import Foundation import UIKit +protocol AttachmentApprovalInputAccessoryViewDelegate: class { + func attachmentApprovalInputUpdateMediaRail() + func attachmentApprovalInputEditCaptions() +} + +// MARK: - + class AttachmentApprovalInputAccessoryView: UIView { + + weak var delegate: AttachmentApprovalInputAccessoryViewDelegate? + let attachmentTextToolbar: AttachmentTextToolbar + let attachmentCaptionToolbar: AttachmentCaptionToolbar let galleryRailView: GalleryRailView + let currentCaptionLabel = UILabel() + let currentCaptionWrapper = UIView() var isEditingMediaMessage: Bool { return attachmentTextToolbar.textView.isFirstResponder } + private var isEditingCaptions: Bool = false + private var currentAttachmentItem: SignalAttachmentItem? + let kGalleryRailViewHeight: CGFloat = 72 required init(isAddMoreVisible: Bool) { attachmentTextToolbar = AttachmentTextToolbar(isAddMoreVisible: isAddMoreVisible) + attachmentCaptionToolbar = AttachmentCaptionToolbar() + galleryRailView = GalleryRailView() galleryRailView.scrollFocusMode = .keepWithinBounds galleryRailView.autoSetDimension(.height, toSize: kGalleryRailViewHeight) super.init(frame: .zero) + createContents() + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + private func createContents() { // Specifying auto-resizing mask and an intrinsic content size allows proper // sizing when used as an input accessory view. self.autoresizingMask = .flexibleHeight self.translatesAutoresizingMaskIntoConstraints = false + self.backgroundColor = .clear - backgroundColor = UIColor.black.withAlphaComponent(0.6) preservesSuperviewLayoutMargins = true - let stackView = UIStackView(arrangedSubviews: [self.galleryRailView, self.attachmentTextToolbar]) + // Use a background view that extends below the keyboard to avoid animation glitches. + let backgroundView = UIView() + backgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.6) + addSubview(backgroundView) + backgroundView.autoPinEdge(toSuperviewEdge: .top) + backgroundView.autoPinEdge(toSuperviewEdge: .leading) + backgroundView.autoPinEdge(toSuperviewEdge: .trailing) + backgroundView.autoPinEdge(toSuperviewEdge: .bottom, withInset: -200) + + currentCaptionLabel.textColor = UIColor(white: 1, alpha: 0.8) + currentCaptionLabel.font = UIFont.ows_dynamicTypeBody + currentCaptionLabel.numberOfLines = 5 + currentCaptionLabel.lineBreakMode = .byWordWrapping + + currentCaptionWrapper.isUserInteractionEnabled = true + currentCaptionWrapper.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(captionTapped))) + currentCaptionWrapper.addSubview(currentCaptionLabel) + currentCaptionLabel.autoPinEdgesToSuperviewMargins() + + attachmentCaptionToolbar.attachmentCaptionToolbarDelegate = self + + let stackView = UIStackView(arrangedSubviews: [currentCaptionWrapper, attachmentCaptionToolbar, galleryRailView, attachmentTextToolbar]) stackView.axis = .vertical addSubview(stackView) stackView.autoPinEdgesToSuperviewEdges() } - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") + // MARK: - Events + + @objc func captionTapped(sender: UIGestureRecognizer) { + guard sender.state == .recognized else { + return + } + delegate?.attachmentApprovalInputEditCaptions() + } + + // MARK: + + public var shouldHideControls = false { + didSet { + updateContents() + } + } + + private func updateContents() { + var hasCurrentCaption = false + if let currentAttachmentItem = currentAttachmentItem, + let captionText = currentAttachmentItem.captionText { + hasCurrentCaption = captionText.count > 0 + + attachmentCaptionToolbar.textView.text = captionText + currentCaptionLabel.text = captionText + } else { + attachmentCaptionToolbar.textView.text = nil + currentCaptionLabel.text = nil + } + + attachmentCaptionToolbar.isHidden = !isEditingCaptions + currentCaptionWrapper.isHidden = isEditingCaptions || !hasCurrentCaption + attachmentTextToolbar.isHidden = isEditingCaptions + + if (shouldHideControls) { + if attachmentCaptionToolbar.textView.isFirstResponder { + attachmentCaptionToolbar.textView.resignFirstResponder() + } else if attachmentTextToolbar.textView.isFirstResponder { + attachmentTextToolbar.textView.resignFirstResponder() + } + } else if (isEditingCaptions) { + if !attachmentCaptionToolbar.textView.isFirstResponder { + attachmentCaptionToolbar.textView.becomeFirstResponder() + } + } else { + if !attachmentTextToolbar.textView.isFirstResponder { + attachmentTextToolbar.textView.becomeFirstResponder() + } + } + + invalidateIntrinsicContentSize() + + layoutSubviews() + } + + public func update(isEditingCaptions: Bool, + currentAttachmentItem: SignalAttachmentItem?) { + self.isEditingCaptions = isEditingCaptions + self.currentAttachmentItem = currentAttachmentItem + + updateContents() } // MARK: @@ -53,3 +159,18 @@ class AttachmentApprovalInputAccessoryView: UIView { } } } + +// MARK: - + +extension AttachmentApprovalInputAccessoryView: AttachmentCaptionToolbarDelegate { + public func attachmentCaptionToolbarDidEdit(_ attachmentCaptionToolbar: AttachmentCaptionToolbar) { + guard let currentAttachmentItem = currentAttachmentItem else { + owsFailDebug("Missing currentAttachmentItem.") + return + } + + currentAttachmentItem.attachment.captionText = attachmentCaptionToolbar.textView.text + + delegate?.attachmentApprovalInputUpdateMediaRail() + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 759995258..5d5474b7d 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -34,6 +34,12 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate? + public var isEditingCaptions = false { + didSet { + updateContents() + } + } + // MARK: - Initializers @available(*, unavailable, message:"use attachment: constructor instead.") @@ -86,6 +92,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC lazy var bottomToolView: AttachmentApprovalInputAccessoryView = { let isAddMoreVisible = mode == .sharedNavigation let bottomToolView = AttachmentApprovalInputAccessoryView(isAddMoreVisible: isAddMoreVisible) + bottomToolView.delegate = self return bottomToolView }() @@ -133,8 +140,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } navigationBar.overrideTheme(type: .clear) - updateNavigationBar() - updateControlVisibility() + updateContents() } override public func viewDidAppear(_ animated: Bool) { @@ -142,8 +148,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC super.viewDidAppear(animated) - updateNavigationBar() - updateControlVisibility() + updateContents() } override public func viewWillDisappear(_ animated: Bool) { @@ -151,6 +156,14 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC super.viewWillDisappear(animated) } + private func updateContents() { + updateNavigationBar() + updateControlVisibility() + updateInputAccessory() + } + + // MARK: - Input Accessory + override public var inputAccessoryView: UIView? { bottomToolView.layoutIfNeeded() return bottomToolView @@ -160,6 +173,15 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return !shouldHideControls } + public func updateInputAccessory() { + var currentPageViewController: AttachmentPrepViewController? + if pageViewControllers.count == 1 { + currentPageViewController = pageViewControllers.first + } + let currentAttachmentItem: SignalAttachmentItem? = currentPageViewController?.attachmentItem + bottomToolView.update(isEditingCaptions: isEditingCaptions, currentAttachmentItem: currentAttachmentItem) + } + // MARK: - Navigation Bar public func updateNavigationBar() { @@ -169,21 +191,36 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return } + guard !isEditingCaptions else { + // Hide all navigation bar items while the caption view is open. + self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: NSLocalizedString("ATTACHMENT_APPROVAL_CAPTION_TITLE", comment: "Title for 'caption' mode of the attachment approval view."), style: .plain, target: nil, action: nil) + + let doneButton = navigationBarButton(imageName: "image_editor_checkmark_full", + selector: #selector(didTapCaptionDone(sender:))) + let navigationBarItems = [doneButton] + updateNavigationBar(navigationBarItems: navigationBarItems) + return + } + var navigationBarItems = [UIView]() - var isShowingCaptionView = false if let viewControllers = viewControllers, viewControllers.count == 1, let firstViewController = viewControllers.first as? AttachmentPrepViewController { navigationBarItems = firstViewController.navigationBarItems() - isShowingCaptionView = firstViewController.isShowingCaptionView - } - guard !isShowingCaptionView else { - // Hide all navigation bar items while the caption view is open. - self.navigationItem.leftBarButtonItem = nil - self.navigationItem.rightBarButtonItem = nil - return + // Show the caption UI if there's more than one attachment + // OR if the attachment already has a caption. + let attachmentCount = attachmentItemCollection.count + var shouldShowCaptionUI = attachmentCount > 0 + if let captionText = firstViewController.attachmentItem.captionText, captionText.count > 0 { + shouldShowCaptionUI = true + } + if shouldShowCaptionUI { + let captionButton = navigationBarButton(imageName: "image_editor_caption", + selector: #selector(didTapCaption(sender:))) + navigationBarItems.append(captionButton) + } } updateNavigationBar(navigationBarItems: navigationBarItems) @@ -264,15 +301,10 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } private func updateControlVisibility() { - if shouldHideControls { - if isFirstResponder { - resignFirstResponder() - } - } else { - if !isFirstResponder { - becomeFirstResponder() - } + if !shouldHideControls { + self.becomeFirstResponder() } + bottomToolView.shouldHideControls = shouldHideControls } // MARK: - View Helpers @@ -351,8 +383,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } } - updateNavigationBar() - updateControlVisibility() + updateContents() } // MARK: - UIPageViewControllerDataSource @@ -564,8 +595,22 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC private func cancelPressed() { self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) } + + @objc func didTapCaption(sender: UIButton) { + Logger.verbose("") + + isEditingCaptions = true + } + + @objc func didTapCaptionDone(sender: UIButton) { + Logger.verbose("") + + isEditingCaptions = false + } } +// MARK: - + extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar) { currentPageViewController.setAttachmentViewScale(.compact, animated: true) @@ -594,12 +639,6 @@ extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { // MARK: - extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate { - func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) { - self.approvalDelegate?.attachmentApproval?(self, changedCaptionOfAttachment: attachmentItem.attachment) - - updateMediaRail() - } - func prepViewControllerUpdateNavigationBar() { updateNavigationBar() } @@ -607,10 +646,6 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate func prepViewControllerUpdateControls() { updateControlVisibility() } - - func prepViewControllerAttachmentCount() -> Int { - return attachmentItemCollection.count - } } // MARK: GalleryRail @@ -671,3 +706,15 @@ extension AttachmentApprovalViewController: ApprovalRailCellViewDelegate { remove(attachmentItem: attachmentItem) } } + +// MARK: - + +extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryViewDelegate { + public func attachmentApprovalInputUpdateMediaRail() { + updateMediaRail() + } + + public func attachmentApprovalInputEditCaptions() { + isEditingCaptions = true + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift new file mode 100644 index 000000000..56b068c89 --- /dev/null +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift @@ -0,0 +1,222 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import UIKit + +protocol AttachmentCaptionToolbarDelegate: class { + func attachmentCaptionToolbarDidEdit(_ attachmentCaptionToolbar: AttachmentCaptionToolbar) +} + +// MARK: - + +class AttachmentCaptionToolbar: UIView, UITextViewDelegate { + + private let kMaxCaptionCharacterCount = 240 + + weak var attachmentCaptionToolbarDelegate: AttachmentCaptionToolbarDelegate? + + var messageText: String? { + get { return textView.text } + + set { + textView.text = newValue + } + } + + // Layout Constants + + let kMinTextViewHeight: CGFloat = 38 + var maxTextViewHeight: CGFloat { + // About ~4 lines in portrait and ~3 lines in landscape. + // Otherwise we risk obscuring too much of the content. + return UIDevice.current.orientation.isPortrait ? 160 : 100 + } + var textViewHeightConstraint: NSLayoutConstraint! + var textViewHeight: CGFloat + + // MARK: - Initializers + + init() { + self.textViewHeight = kMinTextViewHeight + + super.init(frame: CGRect.zero) + + // Specifying autorsizing mask and an intrinsic content size allows proper + // sizing when used as an input accessory view. + self.autoresizingMask = .flexibleHeight + self.translatesAutoresizingMaskIntoConstraints = false + self.backgroundColor = UIColor.clear + + textView.delegate = self + + // Layout + let kToolbarMargin: CGFloat = 8 + + self.textViewHeightConstraint = textView.autoSetDimension(.height, toSize: kMinTextViewHeight) + + lengthLimitLabel.setContentHuggingHigh() + lengthLimitLabel.setCompressionResistanceHigh() + + let contentView = UIStackView(arrangedSubviews: [textContainer, lengthLimitLabel]) + // We have to wrap the toolbar items in a content view because iOS (at least on iOS10.3) assigns the inputAccessoryView.layoutMargins + // when resigning first responder (verified by auditing with `layoutMarginsDidChange`). + // The effect of this is that if we were to assign these margins to self.layoutMargins, they'd be blown away if the + // user dismisses the keyboard, giving the input accessory view a wonky layout. + contentView.layoutMargins = UIEdgeInsets(top: kToolbarMargin, left: kToolbarMargin, bottom: kToolbarMargin, right: kToolbarMargin) + contentView.axis = .vertical + addSubview(contentView) + contentView.autoPinEdgesToSuperviewEdges() + } + + required init?(coder aDecoder: NSCoder) { + notImplemented() + } + + // MARK: - UIView Overrides + + override var intrinsicContentSize: CGSize { + get { + // Since we have `self.autoresizingMask = UIViewAutoresizingFlexibleHeight`, we must specify + // an intrinsicContentSize. Specifying CGSize.zero causes the height to be determined by autolayout. + return CGSize.zero + } + } + + // MARK: - Subviews + + private lazy var lengthLimitLabel: UILabel = { + let lengthLimitLabel = UILabel() + + // Length Limit Label shown when the user inputs too long of a message + lengthLimitLabel.textColor = .white + lengthLimitLabel.text = NSLocalizedString("ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED", comment: "One-line label indicating the user can add no more text to the media message field.") + lengthLimitLabel.textAlignment = .center + + // Add shadow in case overlayed on white content + lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor + lengthLimitLabel.layer.shadowOffset = .zero + lengthLimitLabel.layer.shadowOpacity = 0.8 + lengthLimitLabel.layer.shadowRadius = 2.0 + lengthLimitLabel.isHidden = true + + return lengthLimitLabel + }() + + lazy var textView: UITextView = { + let textView = buildTextView() + + textView.returnKeyType = .done + textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) + + return textView + }() + + private lazy var textContainer: UIView = { + let textContainer = UIView() + textContainer.clipsToBounds = true + textContainer.addSubview(textView) + textView.autoPinEdgesToSuperviewEdges() + return textContainer + }() + + private func buildTextView() -> UITextView { + let textView = AttachmentTextView() + + textView.keyboardAppearance = Theme.darkThemeKeyboardAppearance + textView.backgroundColor = .clear + textView.tintColor = Theme.darkThemePrimaryColor + + textView.font = UIFont.ows_dynamicTypeBody + textView.textColor = Theme.darkThemePrimaryColor + textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) + + return textView + } + + // MARK: - UITextViewDelegate + + public func textViewDidChange(_ textView: UITextView) { + updateHeight(textView: textView) + + attachmentCaptionToolbarDelegate?.attachmentCaptionToolbarDidEdit(self) + } + + public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { + + if !FeatureFlags.sendingMediaWithOversizeText { + let existingText: String = textView.text ?? "" + let proposedText: String = (existingText as NSString).replacingCharacters(in: range, with: text) + + // Don't complicate things by mixing media attachments with oversize text attachments + guard proposedText.utf8.count < kOversizeTextMessageSizeThreshold else { + Logger.debug("long text was truncated") + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + // Range is in units of NSStrings's standard UTF-16 characters. Since some of those chars could be + // represented as single bytes in utf-8, while others may be 8 or more, the only way to be sure is + // to just measure the utf8 encoded bytes of the replaced substring. + let bytesAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").utf8.count + + // Accept as much of the input as we can + let byteBudget: Int = Int(kOversizeTextMessageSizeThreshold) - bytesAfterDelete + if byteBudget >= 0, let acceptableNewText = text.truncated(toByteCount: UInt(byteBudget)) { + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + self.lengthLimitLabel.isHidden = true + + // After verifying the byte-length is sufficiently small, verify the character count is within bounds. + guard proposedText.count < kMaxCaptionCharacterCount else { + Logger.debug("hit attachment message body character count limit") + + self.lengthLimitLabel.isHidden = false + + // `range` represents the section of the existing text we will replace. We can re-use that space. + let charsAfterDelete: Int = (existingText as NSString).replacingCharacters(in: range, with: "").count + + // Accept as much of the input as we can + let charBudget: Int = Int(kMaxCaptionCharacterCount) - charsAfterDelete + if charBudget >= 0 { + let acceptableNewText = String(text.prefix(charBudget)) + textView.text = (existingText as NSString).replacingCharacters(in: range, with: acceptableNewText) + } + + return false + } + } + + // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button + // allows the user to get the keyboard out of the way while in the attachment approval view. + if text == "\n" { + textView.resignFirstResponder() + return false + } else { + return true + } + } + + // MARK: - Helpers + + private func updateHeight(textView: UITextView) { + // compute new height assuming width is unchanged + let currentSize = textView.frame.size + let newHeight = clampedTextViewHeight(fixedWidth: currentSize.width) + + if newHeight != textViewHeight { + Logger.debug("TextView height changed: \(textViewHeight) -> \(newHeight)") + textViewHeight = newHeight + textViewHeightConstraint?.constant = textViewHeight + invalidateIntrinsicContentSize() + } + } + + private func clampedTextViewHeight(fixedWidth: CGFloat) -> CGFloat { + let contentSize = textView.sizeThatFits(CGSize(width: fixedWidth, height: CGFloat.greatestFiniteMagnitude)) + return CGFloatClamp(contentSize.height, kMinTextViewHeight, maxTextViewHeight) + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 46527237a..878c3f767 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -7,13 +7,9 @@ import UIKit import AVFoundation protocol AttachmentPrepViewControllerDelegate: class { - func prepViewController(_ prepViewController: AttachmentPrepViewController, didUpdateCaptionForAttachmentItem attachmentItem: SignalAttachmentItem) - func prepViewControllerUpdateNavigationBar() func prepViewControllerUpdateControls() - - func prepViewControllerAttachmentCount() -> Int } // MARK: - @@ -42,13 +38,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD private(set) var playVideoButton: UIView? private var imageEditorView: ImageEditorView? - public var isShowingCaptionView = false { - didSet { - prepDelegate?.prepViewControllerUpdateNavigationBar() - prepDelegate?.prepViewControllerUpdateControls() - } - } - public var shouldHideControls: Bool { guard let imageEditorView = imageEditorView else { return false @@ -189,8 +178,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD playButton.autoCenterInSuperview() } - // Caption - view.addSubview(touchInterceptorView) touchInterceptorView.autoPinEdgesToSuperviewEdges() touchInterceptorView.isHidden = true @@ -227,52 +214,10 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD // MARK: - Navigation Bar public func navigationBarItems() -> [UIView] { - let captionButton = navigationBarButton(imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) - guard let imageEditorView = imageEditorView else { - // Show the "add caption" button for non-image attachments if - // there is more than one attachment. - if let prepDelegate = prepDelegate, - prepDelegate.prepViewControllerAttachmentCount() > 1 { - return [captionButton] - } return [] } - var navigationBarItems = imageEditorView.navigationBarItems() - - // Show the caption UI if there's more than one attachment - // OR if the attachment already has a caption. - var shouldShowCaptionUI = attachmentCount() > 0 - if let captionText = attachmentItem.captionText, captionText.count > 0 { - shouldShowCaptionUI = true - } - if shouldShowCaptionUI { - navigationBarItems.append(captionButton) - } - - return navigationBarItems - } - - private func attachmentCount() -> Int { - guard let prepDelegate = prepDelegate else { - owsFailDebug("Missing prepDelegate.") - return 0 - } - return prepDelegate.prepViewControllerAttachmentCount() - } - - @objc func didTapCaption(sender: UIButton) { - Logger.verbose("") - - presentCaptionView() - } - - private func presentCaptionView() { - let view = AttachmentCaptionViewController(delegate: self, attachmentItem: attachmentItem) - self.imageEditor(presentFullScreenView: view, isTransparent: true) - - isShowingCaptionView = true + return imageEditorView.navigationBarItems() } // MARK: - Event Handlers @@ -435,22 +380,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD // MARK: - -extension AttachmentPrepViewController: AttachmentCaptionDelegate { - func captionView(_ captionView: AttachmentCaptionViewController, didChangeCaptionText captionText: String?, attachmentItem: SignalAttachmentItem) { - let attachment = attachmentItem.attachment - attachment.captionText = captionText - prepDelegate?.prepViewController(self, didUpdateCaptionForAttachmentItem: attachmentItem) - - isShowingCaptionView = false - } - - func captionViewDidCancel() { - isShowingCaptionView = false - } -} - -// MARK: - - extension AttachmentPrepViewController: UIScrollViewDelegate { public func viewForZooming(in scrollView: UIScrollView) -> UIView? { From d824c49c074fdb44f103ba02368752eb6e666306 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 12:53:54 -0400 Subject: [PATCH 286/493] Respond to CR. --- .../AttachmentApprovalInputAccessoryView.swift | 9 +++------ .../AttachmentApprovalViewController.swift | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index 22c553b7f..643ddc535 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -127,16 +127,13 @@ class AttachmentApprovalInputAccessoryView: UIView { attachmentTextToolbar.textView.resignFirstResponder() } } else if (isEditingCaptions) { + // While editing captions, the keyboard should always remain visible. if !attachmentCaptionToolbar.textView.isFirstResponder { attachmentCaptionToolbar.textView.becomeFirstResponder() } - } else { - if !attachmentTextToolbar.textView.isFirstResponder { - attachmentTextToolbar.textView.becomeFirstResponder() - } } - - invalidateIntrinsicContentSize() + // NOTE: We don't automatically make attachmentTextToolbar.textView + // first responder; layoutSubviews() } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 5d5474b7d..f9ecc8e0d 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -301,8 +301,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } private func updateControlVisibility() { - if !shouldHideControls { - self.becomeFirstResponder() + if !shouldHideControls, !isFirstResponder { + becomeFirstResponder() } bottomToolView.shouldHideControls = shouldHideControls } From 25e7818f5697781e12b4e993958c9fb2bf7cef27 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:04:07 -0400 Subject: [PATCH 287/493] Ensure proper z-ordering of item layers. --- .../ImageEditor/ImageEditorCanvasView.swift | 17 +++++++++++++++-- .../Views/ImageEditor/ImageEditorContents.swift | 5 +++++ .../Views/ImageEditor/ImageEditorModel.swift | 5 +++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index dba18ef70..72d5fe3f7 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -33,6 +33,8 @@ public class ImageEditorCanvasView: UIView { private static let brushLayerZ: CGFloat = +1 // We want text to be rendered above the image and strokes. private static let textLayerZ: CGFloat = +2 + // We leave space for 10k items/layers of each type. + private static let zPositionSpacing: CGFloat = 0.0001 @objc public required init(model: ImageEditorModel, @@ -470,11 +472,22 @@ public class ImageEditorCanvasView: UIView { shapeLayer.fillColor = nil shapeLayer.lineCap = kCALineCapRound shapeLayer.lineJoin = kCALineJoinRound - shapeLayer.zPosition = brushLayerZ + shapeLayer.zPosition = zPositionForItem(item: item, model: model, zPositionBase: brushLayerZ) return shapeLayer } + private class func zPositionForItem(item: ImageEditorItem, + model: ImageEditorModel, + zPositionBase: CGFloat) -> CGFloat { + let itemIds = model.itemIds() + guard let itemIndex = itemIds.firstIndex(of: item.itemId) else { + owsFailDebug("Couldn't find index of item.") + return zPositionBase + } + return zPositionBase + CGFloat(itemIndex) * zPositionSpacing + } + private class func textLayerForItem(item: ImageEditorTextItem, model: ImageEditorModel, transform: ImageEditorTransform, @@ -532,7 +545,7 @@ public class ImageEditorCanvasView: UIView { let transform = CGAffineTransform.identity.scaledBy(x: item.scaling, y: item.scaling).rotated(by: item.rotationRadians) layer.setAffineTransform(transform) - layer.zPosition = textLayerZ + layer.zPosition = zPositionForItem(item: item, model: model, zPositionBase: textLayerZ) return layer } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift index e62d1b3d1..8725ba433 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift @@ -74,4 +74,9 @@ public class ImageEditorContents: NSObject { public func items() -> [ImageEditorItem] { return itemMap.orderedValues() } + + @objc + public func itemIds() -> [String] { + return itemMap.orderedKeys + } } diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index ed33cdfe4..38cea34de 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -114,6 +114,11 @@ public class ImageEditorModel: NSObject { return contents.items() } + @objc + public func itemIds() -> [String] { + return contents.itemIds() + } + @objc public func has(itemForId itemId: String) -> Bool { return item(forId: itemId) != nil From 660f35147fb320d8dbade59b76ea9f1eee3fe5d9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:05:15 -0400 Subject: [PATCH 288/493] Hide status bar in image editor modals. --- .../AttachmentApproval/AttachmentPrepViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 878c3f767..db2c391cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -458,6 +458,7 @@ extension AttachmentPrepViewController: ImageEditorViewDelegate { navigationController.modalPresentationStyle = (isTransparent ? .overFullScreen : .fullScreen) + navigationController.ows_prefersStatusBarHidden = true if let navigationBar = navigationController.navigationBar as? OWSNavigationBar { navigationBar.overrideTheme(type: .clear) From a559b61056484323e260e0410144496c2d992feb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:28:23 -0400 Subject: [PATCH 289/493] Fix keyboard return behavior in attachment approval. --- .../AttachmentApproval/AttachmentCaptionToolbar.swift | 10 +--------- .../ImageEditor/ImageEditorTextViewController.swift | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift index 56b068c89..0187053d9 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift @@ -107,7 +107,6 @@ class AttachmentCaptionToolbar: UIView, UITextViewDelegate { lazy var textView: UITextView = { let textView = buildTextView() - textView.returnKeyType = .done textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) return textView @@ -190,14 +189,7 @@ class AttachmentCaptionToolbar: UIView, UITextViewDelegate { } } - // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button - // allows the user to get the keyboard out of the way while in the attachment approval view. - if text == "\n" { - textView.resignFirstResponder() - return false - } else { - return true - } + return true } // MARK: - Helpers diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index b99dfee94..f4814c540 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -213,7 +213,6 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel textView.isOpaque = false // We use a white cursor since we use a dark background. textView.tintColor = .white - textView.returnKeyType = .done // TODO: Limit the size of the text? // textView.delegate = self textView.isScrollEnabled = true From f9445359d976a348760c7fce9d5d02d107a2dbe2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:28:44 -0400 Subject: [PATCH 290/493] Fix layout glitch related to attachment approval input accessory background. --- .../AttachmentApprovalInputAccessoryView.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index 643ddc535..57f89c27c 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -66,6 +66,8 @@ class AttachmentApprovalInputAccessoryView: UIView { backgroundView.autoPinEdge(toSuperviewEdge: .leading) backgroundView.autoPinEdge(toSuperviewEdge: .trailing) backgroundView.autoPinEdge(toSuperviewEdge: .bottom, withInset: -200) + backgroundView.setContentHuggingLow() + backgroundView.setCompressionResistanceLow() currentCaptionLabel.textColor = UIColor(white: 1, alpha: 0.8) currentCaptionLabel.font = UIFont.ows_dynamicTypeBody From a48c3d8d200a86a86741cc924bb84b3e9779ec4e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:38:17 -0400 Subject: [PATCH 291/493] Ensure attachment approval becomes first responder if app returns from background. --- .../AttachmentApprovalViewController.swift | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index f9ecc8e0d..6c9612508 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -61,6 +61,15 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems]) self.dataSource = self self.delegate = self + + NotificationCenter.default.addObserver(self, + selector: #selector(didBecomeActive), + name: NSNotification.Name.OWSApplicationDidBecomeActive, + object: nil) + } + + deinit { + NotificationCenter.default.removeObserver(self) } @objc @@ -79,6 +88,14 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return navController } + // MARK: - Notifications + + @objc func didBecomeActive() { + AssertIsOnMainThread() + + updateContents() + } + // MARK: - Subviews var galleryRailView: GalleryRailView { @@ -158,8 +175,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC private func updateContents() { updateNavigationBar() - updateControlVisibility() updateInputAccessory() + updateControlVisibility() } // MARK: - Input Accessory From b7d3a99f39ccea3e41982809e3f9dcaf989e48be Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:41:21 -0400 Subject: [PATCH 292/493] Update "crop lock" assets. --- .../crop-lock-32@2x.png | Bin 681 -> 681 bytes .../crop-unlock-32@1x.png | Bin 409 -> 402 bytes .../crop-unlock-32@2x.png | Bin 689 -> 694 bytes .../crop-unlock-32@3x.png | Bin 989 -> 979 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@2x.png b/Signal/Images.xcassets/image_editor_crop_lock.imageset/crop-lock-32@2x.png index 3ddf37b644028d0755fc65b994f9895524ca0c58..236acca0f46a532ff8c2fb6ed18a0acda59c4859 100644 GIT binary patch delta 550 zcmV+>0@?kk1*rv)S2th+7@;Gy6Tk>zgR((7!9$VU%J|%*`JyrBC!G{MpIrO-Bj<|? zl42QGrhA_S$O6cLjywBQnB*P+VBykYr$XPo%M=x=B&@5C03vcrvQ$nZ!i{cG(|KQn1<9Q%@z8e( zEEF?7UV_eVt89?7t;gRu-+ILIWOWwg;(8?{J0&qiO7HhKk@AgKUdHP1EvZcqz$_U3 zcjfe(Ydjt&{Te)x1Z~{-d?Y2ne>od&+f6wKLW(hlEP!H+Aq$`wW9TBl-h2L&P#D0= z;lvm4jM)jFcvu_@59=%lHH$jmfkNL|&45n#1KcHwkAVIXk#*Zx{6st-{@x&$7@`TBm?~$E$||Pv7^4*{V87%Za1d_o zk`UjjFd+UE`cQO2#qN~jsz8B3|Roh7(*%oyeej(I`Th9 o6=Mup0L2(X7GMHxxEw^}2br{{$+0MUMgRZ+07*qoM6N<$g3x62hyVZp delta 550 zcmV+>0@?kk1*rv)S2xN8FhWOYCx8($Lc2ja!9$T;WPEPYe9@TmlTM1BPpF%1ClvyqM-e>jTBmxydhZhAMd62P~LO33yivJCss#*}kn0-S8s zRe;zMSgL60Y019t8>_|QLj=T6&nB*P+VBykY=R)73%M=x=B&@5C03vcvvQ$nZ!i{cG(|KQn1WNcq+)FJpE1meeK)U>1!2 zhjRMOH6D+Xehr>Uf;Mh^K9UmPf07Ni?WUXqA;lO&7C&7#hCpwM>~`5fNKV)b{K0bB3+(S4dq7co^X7?pi60xvPY z0cXKzGoaJ`0C$PvGoTOdAkr!pKNHV~zck)UFXAq$`wV@O4SH^mH8NB-xi oVvHdRpcrGw0!*L{*Mo?B1DW)u$)IO~egFUf07*qoM6N<$f~1`K)c^nh diff --git a/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@1x.png b/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@1x.png index 0e61a460c6c92bdc3876350435853284aab9abe3..5eb24ab312551e413d642faed9051c20138b3d83 100644 GIT binary patch delta 354 zcmV-o0iFJt1Cj%fIe$b+L_t(oh3!}Eje{@@eXjbyBa{(tgpAM)j!`m7yTOfcqcB35 zz$bHV71bt$D+KAplPst|!Xx-4DKRs)#9`B?=LirH6HzpQS_EogCje1_DuGw9D}d(l z49}i2B%*J_?maXB&H#D@wV(z|nY?hbUoO;$CO|MFjv_0C%mEYwP8iI?tI97}f7fZb(+qF1Zh0{u~)L#^WQX z_r}apbJO3!%}%gr6Ebs~UQ6&lWXR0YtYiYU2)qTaGZPhbUMy#_^(J!k?5^AMqza^y z&qQ=JkvuK{PFtCbljaP_t%Ok%KZz)0cD3g!C%s^zQ<#{}COK40n%2aE+*q^_$uUYa zEgfEBW`F`@3Dm$E1ithjI)+|z2JC-Mw+>(+NG_w2f0S5>YCD9a5qJ<>Z#KWq)=Nu3bibya6OF6ICamt z3H{J3HW}_r&;1b-F{!ZX4v;*V&Izg=fruR9-J*{gwS6##o-`&hOzL-z8ur-el(Bs= z`=l01O}N2y70&O}GR* zeV%8N@FTwGB4U!gNE|!^*xT+Ad$sA2%YmSVFCy}kdDX^5D?Rrgm6I!5D)$3;5sjh2lg+uSB$G=6~JnE)D|tHc%DWk%%_o z7-CE~S0=z{+f)IxC9n};QWn<3fQjfK=+zHqevR#^5TF(ScqF3VUU%P^`98M$)qV>w z^9vFE@~H0sw!-lOq9XvnXP7bb&6f*+&RY%#X8tLhCXgaPQODt6DV&&jC7dSkKO{n( z_k1T>FTi{z*nb2Nj4?C;1Y-$`=1m~j22mo*oU^1RQakf8yWPa#M+_pYnfWMMA~AOftOYXz zsnBotPKwu)FPlTij2FNF#?S;1 jj4?C;3h2Y_Kt%7$qpZ(ashe>C0000#G)fe82(1<5?mfkJOQ(K~g;9i|f`G0g3?fV3-a7_?$FI zqTPG>a329h0K+x_9cPy{fHGnlo2e$OuyXA$`jkv+-X=zl6U0%&WfjO-{Po45^q z%s6Kzz{R#h1xO8njR})wVcj%XM4qEseJA5aY0Bnt82YN>UfX^@^dH3N0pi;x(K=OxiYQYcz7PTCXhQgWT$~d*)e@KKXb^T~c zJK#POECLwD8GniZhH(b>0%V^DjD`CMC;}KJ699Muumeyx!!lSMxSLmnS|0ER#@TyjPofiG};-5~7 zQ|V!wMX6@h<~vd9yGncxA7rWf4~c-ix_%Cyrt(Efl^c5H81=wQ%5TCbm@NVZoev0y zD1JxuDSRwMdgbC*^7;6AlN@45CQ&I>ZtRt9O656vD^-5aIp8APE^I=aOkqZttj~Fbl#T!Z002ovPDHLkV1nt;CBFaw diff --git a/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@3x.png b/Signal/Images.xcassets/image_editor_crop_unlock.imageset/crop-unlock-32@3x.png index 0bdca3444c4c143d836ba73461f00b968c199d0f..7ea042cd4b22ba294e1f813b7c879fa8f102d40a 100644 GIT binary patch delta 936 zcmcc1ewlrOWqqrsi(^Q|oVRn{=H50CXnWuFuiVW;&BJVid4`$CW=AW>$-H|U-|$}I ze3bXV=R(f{zXH~Y+BqFlawJva-K*pq?43BbtWp1CP`PB*OaYnrAMZ8>Fi3DQI5Q?_ zF!-1;uF6{bMdGfDQUvn>gg6gt!$JlF5r#IV1NC6h%R80Co|P^-^YN3KQt$HKjy*GO zR`=$6Gu~a}`efr44l~EQcREkZzqEPR8ph)r%{ISR<@zV}^vw_1r#;huHs+TtUlru! zl+HUtX;qcB62Gm}yfZr4lU*1&LrniH*LO`3i=VoBj;yiuLzc8{LK9m%{`9Wr%68D* zqh_OSSFabXdt#@?{>-IHi`!;Z_yB-&B^0E14Y*xzQVKONwv>kz6RVyd%ZPt}rW>r;u(ey)GGub@7}BhgL!Kzv%p_WiEn zms@_DZB?Bj!m#?GK_q}D;HutS#tEfrey_r`qkK6e6yY%{B_g8Z4m^nRo zj-i>OdEmL@Zry69{!X}1(jvX=)X8%atV`SsZ)>FA_?qPNsC~vvS*e==4sMftedS}% z2J>1-a{;3e?0I7=#zf({Ghfzqg!-a1h>Rv>a!*3_#@&wIQ}%*e{jfA-OA4JYR&t`AWkL}G80ddx0< zJ0mcK{~Yh+#8p)<73*`K-P8Yb-fymp(Ug$q^0vWKD%C_f`|A19SO4_(^Sq&cynk!* zDT`>vqsx^3H0%y3cFE$H5PNn1D+yWOd5@T44(-0)rtqk}d&GBgo9eQ9f7x{4_)@5t-BPi#FI_r*W3+i0q(zVOX&=W5}K3Ui5Xpu7Ri j1B#$b0MhB8r1YQR@8M5zj*I&rGXR07tDnm{r-UW|=`fj+ delta 946 zcmcc2ewTfMWqrS=i(^Q|oVRn{7D^ckw3QqG%=g-$U0~H9bf@txp9kwf(H6c2t~VtN zvJbd?I0Fu*J;`BO-2eG!#9g6^`I3Jf)Ze{!ytMFYr)x`te0;(C+D3+Sg#(ft1#C=n z422Jz5nAdQ#G$f)&4QWnoI``Lzylr@6lOhG_-IFj#C1=j^V7qXZe>LYUF`12`L!d8 zLu0eTBF|jGjHXj}gfB+F4UE0gP^RPZWZ|*C{c4ugVV>uH8vS{2>fOwlSsohK8oXO( zzVFDmqwvJj#b>q($B6@H9!|GYU9`GH`))+pnHMd_9Vg~=xVdcc-Y%5o5TD^YBb6^b zte#t^`O|5Q(8{bA!fQEqwolxxvRrwZ?*#*|>z<%w!>Y%@?& z-~unlihxZV`Zy)q^4f1ZC-xqZMV~9Y)ncf)BeWHm?R{8%0^!J|2oYBI(fIme`TLL z+w`L&^7^a>sRbF;aaH&3XNKg2&d?T_QT|d`A>q99!ke6z1=*F1E{WuQ3J!X8zTE!4 zNNZ=LnC2TTFYnd0-zRot%-z}M`SOO9v!34mb5nD@(u^P18(qE`{!o0fh)tl;^Zl3O zs|C~U9oy>WvLnQfeb$27-}0ONih^!U$z)+VwMFu83j?=H%I!k)*!|!6!BOn!kmmm< zCtj6FjG3|P>+bkmN8u+(G2FAX;rff>m$}6S4NDsq|DX2VlS8@f;u)UnMZI9?tzc8G1y+rB>z0Oxi9o;rDY3zaqcpW3!Wd9&glPeR6NP z?7YL$pG^&g7i6pJOyYG3PWw0QNmKb6dFSHCnhSMpy01)s0 z`Gq-bUC0spK<~OtqaDkIeXs6|%}#-osDu7xzNwe0)8EG|VG!hGl9P_xv035G@4)_0mhN)vX1fF0 jkgS4~YZ@8+J6@Pu{rmbXT_G))0SG)@{an^LB{Ts5Bh{Z0 From 684cebf2df9496ce3b7f9c9ecf0e9b25933c2bcc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 13:29:40 -0400 Subject: [PATCH 293/493] Respond to CR. --- ...AttachmentApprovalInputAccessoryView.swift | 24 ++++++++++++------- .../AttachmentApprovalViewController.swift | 6 ++++- .../AttachmentCaptionToolbar.swift | 11 ++++++++- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index 57f89c27c..b983274e2 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -7,7 +7,8 @@ import UIKit protocol AttachmentApprovalInputAccessoryViewDelegate: class { func attachmentApprovalInputUpdateMediaRail() - func attachmentApprovalInputEditCaptions() + func attachmentApprovalInputStartEditingCaptions() + func attachmentApprovalInputStopEditingCaptions() } // MARK: - @@ -62,12 +63,7 @@ class AttachmentApprovalInputAccessoryView: UIView { let backgroundView = UIView() backgroundView.backgroundColor = UIColor.black.withAlphaComponent(0.6) addSubview(backgroundView) - backgroundView.autoPinEdge(toSuperviewEdge: .top) - backgroundView.autoPinEdge(toSuperviewEdge: .leading) - backgroundView.autoPinEdge(toSuperviewEdge: .trailing) - backgroundView.autoPinEdge(toSuperviewEdge: .bottom, withInset: -200) - backgroundView.setContentHuggingLow() - backgroundView.setCompressionResistanceLow() + backgroundView.autoPinEdgesToSuperviewEdges() currentCaptionLabel.textColor = UIColor(white: 1, alpha: 0.8) currentCaptionLabel.font = UIFont.ows_dynamicTypeBody @@ -85,7 +81,13 @@ class AttachmentApprovalInputAccessoryView: UIView { stackView.axis = .vertical addSubview(stackView) - stackView.autoPinEdgesToSuperviewEdges() + stackView.autoPinEdge(toSuperviewEdge: .top) + stackView.autoPinEdge(toSuperviewEdge: .leading) + stackView.autoPinEdge(toSuperviewEdge: .trailing) + // We pin to the superview's _margin_. Otherwise the notch breaks + // the layout if you hide the keyboard in the simulator (or if the + // user uses an external keyboard). + stackView.autoPinEdge(toSuperviewMargin: .bottom) } // MARK: - Events @@ -94,7 +96,7 @@ class AttachmentApprovalInputAccessoryView: UIView { guard sender.state == .recognized else { return } - delegate?.attachmentApprovalInputEditCaptions() + delegate?.attachmentApprovalInputStartEditingCaptions() } // MARK: @@ -172,4 +174,8 @@ extension AttachmentApprovalInputAccessoryView: AttachmentCaptionToolbarDelegate delegate?.attachmentApprovalInputUpdateMediaRail() } + + public func attachmentCaptionToolbarDidComplete() { + delegate?.attachmentApprovalInputStopEditingCaptions() + } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 6c9612508..6d7451bcf 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -731,7 +731,11 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView updateMediaRail() } - public func attachmentApprovalInputEditCaptions() { + public func attachmentApprovalInputStartEditingCaptions() { isEditingCaptions = true } + + public func attachmentApprovalInputStopEditingCaptions() { + isEditingCaptions = false + } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift index 0187053d9..1e7f7c1c7 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionToolbar.swift @@ -7,6 +7,7 @@ import UIKit protocol AttachmentCaptionToolbarDelegate: class { func attachmentCaptionToolbarDidEdit(_ attachmentCaptionToolbar: AttachmentCaptionToolbar) + func attachmentCaptionToolbarDidComplete() } // MARK: - @@ -107,6 +108,7 @@ class AttachmentCaptionToolbar: UIView, UITextViewDelegate { lazy var textView: UITextView = { let textView = buildTextView() + textView.returnKeyType = .done textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) return textView @@ -189,7 +191,14 @@ class AttachmentCaptionToolbar: UIView, UITextViewDelegate { } } - return true + // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button + // allows the user to get the keyboard out of the way while in the attachment approval view. + if text == "\n" { + attachmentCaptionToolbarDelegate?.attachmentCaptionToolbarDidComplete() + return false + } else { + return true + } } // MARK: - Helpers From 284357137fb357b403c331139253dcbee16b586c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Mar 2019 21:05:58 -0800 Subject: [PATCH 294/493] Photo/Movie Capture --- Signal.xcodeproj/project.pbxproj | 14 +- .../ic_flash_mode_auto.imageset/Contents.json | 23 + .../flash-auto-32@1x.png | Bin 0 -> 585 bytes .../flash-auto-32@2x.png | Bin 0 -> 1168 bytes .../flash-auto-32@3x.png | Bin 0 -> 1763 bytes .../ic_flash_mode_off.imageset/Contents.json | 23 + .../flash-off-32@1x.png | Bin 0 -> 537 bytes .../flash-off-32@2x.png | Bin 0 -> 1026 bytes .../flash-off-32@3x.png | Bin 0 -> 1556 bytes .../ic_flash_mode_on.imageset/Contents.json | 23 + .../flash-on-32@1x.png | Bin 0 -> 445 bytes .../flash-on-32@2x.png | Bin 0 -> 840 bytes .../flash-on-32@3x.png | Bin 0 -> 1158 bytes .../ic_switch_camera.imageset/Contents.json | 23 + .../switch-camera-32@1x.png | Bin 0 -> 500 bytes .../switch-camera-32@2x.png | Bin 0 -> 954 bytes .../switch-camera-32@3x.png | Bin 0 -> 1511 bytes .../ic_x_with_shadow.imageset/Contents.json | 23 + .../ic_x_with_shadow.imageset/x-24@1x.png | Bin 0 -> 243 bytes .../ic_x_with_shadow.imageset/x-24@2x.png | Bin 0 -> 398 bytes .../ic_x_with_shadow.imageset/x-24@3x.png | Bin 0 -> 573 bytes .../ConversationViewController.m | 67 +- .../ImagePickerController.swift | 0 .../ViewControllers/Photos/PhotoCapture.swift | 673 ++++++++++++++++++ .../Photos/PhotoCaptureViewController.swift | 663 +++++++++++++++++ .../PhotoCollectionPickerController.swift | 2 +- .../PhotoLibrary.swift | 0 SignalMessaging/Views/OWSButton.swift | 8 +- SignalMessaging/categories/UIFont+OWS.h | 2 + SignalMessaging/categories/UIFont+OWS.m | 5 + SignalServiceKit/src/Util/FeatureFlags.swift | 5 + 31 files changed, 1536 insertions(+), 18 deletions(-) create mode 100644 Signal/Images.xcassets/ic_flash_mode_auto.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@1x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@2x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@3x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_off.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@1x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@2x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@3x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_on.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_flash_mode_on.imageset/flash-on-32@1x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_on.imageset/flash-on-32@2x.png create mode 100644 Signal/Images.xcassets/ic_flash_mode_on.imageset/flash-on-32@3x.png create mode 100644 Signal/Images.xcassets/ic_switch_camera.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@1x.png create mode 100644 Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@2x.png create mode 100644 Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@3x.png create mode 100644 Signal/Images.xcassets/ic_x_with_shadow.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@1x.png create mode 100644 Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@2x.png create mode 100644 Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@3x.png rename Signal/src/ViewControllers/{PhotoLibrary => Photos}/ImagePickerController.swift (100%) create mode 100644 Signal/src/ViewControllers/Photos/PhotoCapture.swift create mode 100644 Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift rename Signal/src/ViewControllers/{PhotoLibrary => Photos}/PhotoCollectionPickerController.swift (98%) rename Signal/src/ViewControllers/{PhotoLibrary => Photos}/PhotoLibrary.swift (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index cbff3b88c..5b751d7eb 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -476,6 +476,7 @@ 4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542DF51208B82E9007B4E76 /* ThreadViewModel.swift */; }; 4C20B2B920CA10DE001BAC90 /* ConversationSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */; }; 4C21D5D6223A9DC500EF8A77 /* UIAlerts+iOS9.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */; }; + 4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */; }; 4C23A5F2215C4ADE00534937 /* SheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C23A5F1215C4ADE00534937 /* SheetViewController.swift */; }; 4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */; }; 4C3E245C21F29FCE000AE092 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA5F792211E1F06008C2708 /* Toast.swift */; }; @@ -496,6 +497,7 @@ 4C9CA25D217E676900607C63 /* ZXingObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C9CA25C217E676900607C63 /* ZXingObjC.framework */; }; 4CA46F4C219CCC630038ABDE /* CaptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA46F4B219CCC630038ABDE /* CaptionView.swift */; }; 4CA46F4D219CFDAA0038ABDE /* GalleryRailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA46F49219C78050038ABDE /* GalleryRailView.swift */; }; + 4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA485BA2232339F004B9E7D /* PhotoCaptureViewController.swift */; }; 4CB5F26720F6E1E2004D1B42 /* MenuActionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF4C0920F55BBA005DA313 /* MenuActionsViewController.swift */; }; 4CB5F26920F7D060004D1B42 /* MessageActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB5F26820F7D060004D1B42 /* MessageActions.swift */; }; 4CB93DC22180FF07004B9764 /* ProximityMonitoringManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB93DC12180FF07004B9764 /* ProximityMonitoringManager.swift */; }; @@ -1225,6 +1227,7 @@ 4C1D233B218B6D3100A0598F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = translations/tr.lproj/Localizable.strings; sourceTree = ""; }; 4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearchViewController.swift; sourceTree = ""; }; 4C21D5D5223A9DC500EF8A77 /* UIAlerts+iOS9.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIAlerts+iOS9.m"; sourceTree = ""; }; + 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCapture.swift; sourceTree = ""; }; 4C23A5F1215C4ADE00534937 /* SheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetViewController.swift; sourceTree = ""; }; 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = ""; }; 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamParserTest.swift; sourceTree = ""; }; @@ -1243,6 +1246,7 @@ 4C9CA25C217E676900607C63 /* ZXingObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZXingObjC.framework; path = ThirdParty/Carthage/Build/iOS/ZXingObjC.framework; sourceTree = ""; }; 4CA46F49219C78050038ABDE /* GalleryRailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryRailView.swift; sourceTree = ""; }; 4CA46F4B219CCC630038ABDE /* CaptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaptionView.swift; sourceTree = ""; }; + 4CA485BA2232339F004B9E7D /* PhotoCaptureViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCaptureViewController.swift; sourceTree = ""; }; 4CA5F792211E1F06008C2708 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = ""; }; 4CB5F26820F7D060004D1B42 /* MessageActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageActions.swift; sourceTree = ""; }; 4CB93DC12180FF07004B9764 /* ProximityMonitoringManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProximityMonitoringManager.swift; sourceTree = ""; }; @@ -1847,14 +1851,16 @@ path = mocks; sourceTree = ""; }; - 34969558219B605E00DCFE74 /* PhotoLibrary */ = { + 34969558219B605E00DCFE74 /* Photos */ = { isa = PBXGroup; children = ( 34969559219B605E00DCFE74 /* ImagePickerController.swift */, 3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */, 3496955B219B605E00DCFE74 /* PhotoLibrary.swift */, + 4CA485BA2232339F004B9E7D /* PhotoCaptureViewController.swift */, + 4C21D5D7223AC60F00EF8A77 /* PhotoCapture.swift */, ); - path = PhotoLibrary; + path = Photos; sourceTree = ""; }; 3496956121A301A100DCFE74 /* Backup */ = { @@ -1912,7 +1918,7 @@ 345BC30A2047030600257B7C /* OWS2FASettingsViewController.h */, 345BC30B2047030600257B7C /* OWS2FASettingsViewController.m */, 34A6C27F21E503E600B5B12E /* OWSImagePickerController.swift */, - 34969558219B605E00DCFE74 /* PhotoLibrary */, + 34969558219B605E00DCFE74 /* Photos */, 34CE88E51F2FB9A10098030F /* ProfileViewController.h */, 34CE88E61F2FB9A10098030F /* ProfileViewController.m */, 340FC875204DAC8C007AEB0F /* Registration */, @@ -3615,6 +3621,7 @@ 4556FA681F54AA9500AF40DD /* DebugUIProfile.swift in Sources */, 45A6DAD61EBBF85500893231 /* ReminderView.swift in Sources */, 34D1F0881F8678AA0066283D /* ConversationViewLayout.m in Sources */, + 4CA485BB2232339F004B9E7D /* PhotoCaptureViewController.swift in Sources */, 3448E16422135FFA004B052E /* OnboardingPhoneNumberViewController.swift in Sources */, 34330AA31E79686200DF2FB9 /* OWSProgressView.m in Sources */, 344825C6211390C800DB4BD8 /* OWSOrphanDataCleaner.m in Sources */, @@ -3628,6 +3635,7 @@ 348BB25D20A0C5530047AEC2 /* ContactShareViewHelper.swift in Sources */, 34B3F8801E8DF1700035BE1A /* InviteFlow.swift in Sources */, 457C87B82032645C008D52D6 /* DebugUINotifications.swift in Sources */, + 4C21D5D8223AC60F00EF8A77 /* PhotoCapture.swift in Sources */, 4C13C9F620E57BA30089A98B /* ColorPickerViewController.swift in Sources */, 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */, 3448E16022134C89004B052E /* OnboardingSplashViewController.swift in Sources */, diff --git a/Signal/Images.xcassets/ic_flash_mode_auto.imageset/Contents.json b/Signal/Images.xcassets/ic_flash_mode_auto.imageset/Contents.json new file mode 100644 index 000000000..8d25a5404 --- /dev/null +++ b/Signal/Images.xcassets/ic_flash_mode_auto.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "flash-auto-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "flash-auto-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "flash-auto-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@1x.png b/Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..caeae3779cdff6b09bfa83e94ea4794cffaeedff GIT binary patch literal 585 zcmV-P0=E5$P)5FbsX-_}^|oHXs``BXk4G1at#BLc2lO05(WB z2pg0Q!UWeBs{%X0ky#18oJ6_vls^g(z$rA z1O4UaAM~2V91xhU^wr${8jvTBrlHHJqTyePvaAM|tWUE~4 z)gnC#01vKUF|%%1mRAwMCPOR;UMvKYA&4s7+M1K;KqLFqmVGb;MAS)vdCRQv4y9f# zkY4cw;GLOEwIUS)N0^ZW+YTVu{f3}YOoTYB4QAR7$)F+Afp4DVr0tLl8Zr*AVuA@@ zlBA1e&W)(oh={0`nsH|4T}VbEYDBhb7t5q0H<3{rk8q$9DFeor(HtM9 zgVu17=K#I{ XH*8JS^OiGb00000NkvXXu0mjf5~%zQ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@2x.png b/Signal/Images.xcassets/ic_flash_mode_auto.imageset/flash-auto-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fdc0d600b124a282b6a1e858534a12befb7d78d8 GIT binary patch literal 1168 zcmV;B1aJF^P)1?D82}N-h&V&U z8`W6}@4W|^0wOK};45{H0br6)EsC@7fcVzg;3M2TU~mIOw+Db*ON03yx-;4>3Fh7hLodBo(d?tefGftropaA0j0Q(fx25q*=|&m&t^4?DTv-{gWz>14g8>P8Cw%67@ zh0e^2dHGU>E{~LL}Ih^qBsw&>vfR7eRt;Nl#oOv%}IY`vQs? zfZTW|(%eQiH$0|BYvonFIe?Y7ob;v{(&LaRa0%>t-NUj<%eTJ~Z*6Yrxy13aLAfVx zEIq54!WLh+6oX$`dQO8+R-07}V36LX%NG_NyyT$H8Kn~BnvuS?BE3q3zcIpaYU$=$ zw$u1RX>Iof4E8)L@hnSAucQG^wsyh6&t(`|dc_PtEL(ftZZ(KgNl&(OIv~+l542cf z>ki8*R-*^B-dw4c zLYOJV9yk{RB6<9Suc46RqN+`=IQxNFZvU#Du*NQ*m_=t|%) z_~eeT!3~YorpOQY=bfdmuD67h4Ip!QzE$42+7$XSxyl+ZwjoH66W}A8(&YN$PdY)8 z1Rc0~0mVE&an`u@ID`Szi4Y<^zLOkDZ?3M?u*j4X-$-2{FoXd(yRRwJlV=7kR<~en zuk$IjdG*$Fj(=v54{?mRnQ|0Xfa}UeGl5CQ>cC)TRU# z2QOo@Ri>9}Mxm5z$@_bTfEA0q%3I3+d7-502@zi7#1AuE4Ped5liW&B2J(1~GA<&n znGuo(@SFvt0lJbNN1N58bwd9YJPp9zJf0a`D2?`LbG(Kd<}USHMDOGBQ)1=RL%ZYc i$J0u3Ww>qw0Kh+oHbn-l^;g&c0000$zCXgWdd z4g4l(GC|`BnrvWCz#i3b!bes??Y#H2pd7wgWM3AG0t#bM zKw&HjD2&-Dz&Ur}oV$0B_x?iERs^#qC_%a*o4sPoFa?}*Ye2eh;8s-=Fj-UplkP8~ z;W#6{g7i#(nOB8tiOS@fz9-&%M``XF62qIcf=Cib(B>Z>0XHjqI+Isp{S<`1ysKfORRLCz4t5bvyW!LoA>@wTu~vao&gEc zJ)B0pW%ENdE5JE-nGod4dw(L`Ytd?ifT>mmw1gQxd+$R5uS5@Ban+$p4q(zni>;0K z{x<3xzd-c?xDeIN0O#DDBK#c?zG?GAwJE?k*O-$(M8h%8gG>#oGh=?JCIv9*ig?b+ z;|WMN#G-&4Xd&IZh;&0NCMXjgm6h(F-utzv{g^TF_kf);Q>sOA1vE)i3h6d0-8)hH z0W|tenI9^x0A9uZE*g%ci{d*Wko`AheyF4Z*o8#qB}KX+kOIujfFcXAAhwU}{%6hZ zN52t2xS0T4h*C2^3ok!(6h0dL=FAV3PymzePojb7OY>z*)M6k7m@_|gZUrPrch@tC z7I{D>XTaGwAd$s(;P7&10fG-OO$LM$9Sz_tGoWRqd)rg^*WhIFnA8~ivlXOknKrS^Qi^7;b>4u@|7 znaJ*IqL4*LBKnh)%Hj{f?V#S2QLjuU%47KN`R2~d=oHwwAjP!!`Kj_qrT zsTM7vlQ=VP9BL-0f_DFG?<6WR5tL=&-+}kZM!InsOu}p<{}m0#FvA+`**X{2Lpdiw zx^L`Al(`+)G$=8vg>+Myd808#0j(d; z3t*_Av?KvFGcOx5kT9CIrAqI(Ov02tq5j!PA5~f?O2Ds|t>)}IB>dNNg-*;KR|68W zdhLwKnItdq}*?gte82iDq2(8X)Ei44FYSo@M@x7u~k^s0~{2scl zOR;8xkokcluZ46wXXYu3z8Gjt(FxWRfP^9Je+%jMO%g!&+<<$ceyy0L0=N#5?r#H< z1manD;0S7$XKRNs4iKSl&?oB$b#TwEQa>nsZDs~^*%^~K)OE)n+jHFW#5wUyLY`JD zESVrQ#ovX{cD~%em2T>u!jui+0ZR%{J)oA%yw!-zJR#74Ly-4{o-v8J%mDOZg)(HZ z#R7ddc?y}MXH3G%!L1j-t7*c=dk!xnKYTMLwyzwA6Du>`ojF?*gkEgRb{}s1j?b6N zbkBIy#|rtRoMWfLv;vgWn1j+k$30^Oj5b476cCT9FC6DVrYF~jl~|B(;CB(f^qK)y zqM@;m{i3W!v!sqI_WxCJGY^pifcoe_tFy{hzbmk+eF1gZGO`o-LS0MejoTJX5Sr4l z>3PmTx*^7LNayPMv> z_k{S|)2l|2T?R(&UJw$-2~(wxqtUxnLJ$ALIkyF~W|i1w`HtF65E2G;IMj6vkkVD* zC)&~P2-L0sbPVMbq#Gh$b9C8tgUsM86cC%3?4%n)S!f~Qeg%G>I6Lo(2|Wo5|Dtrm zVTVQ#kJb+7Zo{np)ZZfJwoB3+76lZ>qJY9!6i^aG^dB7{?_+v`njZiF002ovPDHLk FV1nN-GhhG! literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_flash_mode_off.imageset/Contents.json b/Signal/Images.xcassets/ic_flash_mode_off.imageset/Contents.json new file mode 100644 index 000000000..642c424c7 --- /dev/null +++ b/Signal/Images.xcassets/ic_flash_mode_off.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "flash-off-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "flash-off-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "flash-off-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@1x.png b/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..306fa9721947bebc3d5e017b4352a9a7f682ccb4 GIT binary patch literal 537 zcmV+!0_OdRP)0pxvjb@Bup^?1G-V1 z+UGH4lj5Qhc%XY0@v64|hDtGDLHEJTgJb}60!XH3QY&DPv>yVpb;xEh3^<@O^==&b z@&6sP&0+yan%RQRkvAgSh3pmyK%7{__nvO!1eU{ZAs@+YNJM71JOFrS=2uU*Hnmqq znpyx)W?(V1URa^1Jb+cFSTcAFWiVL+Z_+iPGnoPG_k@HQ&RaVrOF^gZ z3JEg;=)F0x4V}9r2;IrH_ZL+O)dpa<;E$~3YMRrACmF$`(iBkD-?4lhn|3p8H;Zoj bdk)|i@{}%Gd2w~y00000NkvXXu0mjf`qA6^ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@2x.png b/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd5ae27da0aabdbcc9fb86d19706596f49c9eeb GIT binary patch literal 1026 zcmV+d1pWJoP)-_+C0u0exshoEu zz;zseh$AI>HNWp=$h!&P;hDT9Lo9krmG@uy@86?=h%owcMtG(`r5gW4L<=?ITSec> z3>N|raRvZiglR)W6aG9BcGvJfAf!Of!aYo)?88u(>jtXsA@}p>k~IQY^eSZ@6Vd+o zS=G6|0RplSz@k^Fk=`Q_$uO7UzZ1l`A!h_wq8CMj`0U>M2UvM=Y2jh6%-nBGoX8YT&7 z^2v^r5fB>xQT+eg5IqU`1}GzdkVpi(ik|QvD*v(NcM~GmRrJ(%^yn~kY3+by1aKJd z)iC#@ni~<5qjZX@vo%0WZ>8u>T0~Dm4}nvlKIX?sLP$jn^8~dqf!-+KMrJ?Ie1c8b2`7aANtkmDWn* zhMH~n1q|^#3-v6O<(HCxi`h=t_?b>a%P$!Ltg^Y^+npM5sp#o)O$Q`S&IdXyvGs?= zidFalt)5F&TJ?lAXq!3>BZFfe>$DnLe!^dOz})h?r4*3E;a%H~Fd~Mz!)IYy5z#bq zJOkH4K;!%Y5yQaiyD;rio*ybnz{v%Xo=a@!!O9DV{6D!MnoIPqMFU<+OOYBX6jsQ8>`9VbHoFFG$H2@L!4X4AO z#IZS7c%BpuJHr2>3TM&N@Js<~KQR6DwkJFZ7)6$s#y746d7vZ#MMO`-lK>g!LG$>C-vj`_f4G-rZyRgPj{pDw07*qoM6N<$f1^@s6 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@3x.png b/Signal/Images.xcassets/ic_flash_mode_off.imageset/flash-off-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..deb4174165bcb6a9ba96e892ff204eec18b911e7 GIT binary patch literal 1556 zcmV+v2J88WP)*0hbEM zTLDQ0Z>|E83b?C4jOUbzv1ISZdDqg;J~RGf`|ftF)$`a|*@r{~E85|!b?n<>H9%vm z255}c0FALY10doVBHkk66Cz%T4#u#kSr8�KgLfd=pjwL`09Gvk@%D1HzLJ0FTMw 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%0Dsk?%5nr)j@1xRVY=cQk3{G2o3TM5(c17*Vg z=<~Olm`*X%?Sqy9DaudQ?d7SU36P@vtSmiC_S^*cBqFA|H_$vFW&!3**W4){(rYUh z5y5w+n|*IT1f&uaT7FEKZXYB8LhpcjE6B5pdJ(V_krLi7~ym9|FQ%(8@m$=z_jMH{Cu}{ir`8?J3E^Gyw|J1Sm`spd>`} Y2WiwiRHWc?`Tzg`07*qoM6N<$f|}6_FaQ7m literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_switch_camera.imageset/Contents.json b/Signal/Images.xcassets/ic_switch_camera.imageset/Contents.json new file mode 100644 index 000000000..1ceab7bf7 --- /dev/null +++ b/Signal/Images.xcassets/ic_switch_camera.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "switch-camera-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "switch-camera-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "switch-camera-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@1x.png b/Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..a005bca9ed0dfe8f9233eea5d2c1448afd1e1527 GIT binary patch literal 500 zcmV(gLVW)=m;4hBV+`+LAn7W zkPX=2D_6F7{4P8Vgi5vKApCy&?0*}FLI~KC9(MKq7XUmak{KeR5&&~yGSTGGzKqoluz3+KIgYS7<5?GH*fl_7(V0@0w3qo74G29ec5GXbdGT8>o# z401<#lLiFf-Lsu2ZpAz+c>U#G&I>(ryLPXU>|~w;d5BkzUdym^*FB+4pC`|BUPdMD ze%2F#F>qdCAW3fi5&)ZzWI01=C7IBn^g~L@8%nwJy~z7j+W7RC?xFH{x3S#Gh>qU} qv(!nQPe*L+Ed{VP{qsMk0KNeH-Q}D^xZ2(T0000Y#xw<0bmaRC%Z%>+d1~x^wb8UCImPDz$Jm< zF55W|+L|$(EE7aT>)uBI_#sYy&>Ok+-NiL3Sg3qg&I8S3foQ~;A(ZH@AC)_HziSl$ zY_;n`Y_9=;GT=>i%}r>I>>*$kpu4FVp3GeXVbu-+Hwggbs#ixLdt7PqiGV0QYZjV( zHUK=vw=s(JSbM8@-BFXx0sy(a>yD=s@z_&`n%1s0nVbN)=tn6K2}JaBMht{ldD@>s z@>Af>c>ulVf3u;peP3r!RWnl`09uyh+{k!eLNgiav>QakgOlMM=U}|0P9A`W7nYj7 z8Dq9WXrlDc11R=+US0{IIRijx=$-7{uZ6^fsS5ym_Ip;wTM7a|?$4_?vjgB!No>b{ zTlc>Ri4hW&;c7~muaq&W`AQ!E(i9*v6B*w)ukFTqvj)O@2-u4dv8IbT@z>qwdp{sQ zM&p5w8=t?crcXg}L8Sm&@I}f&!m*_+CV!{9jqch&ePG~efIm>D$Xfr0-2Xsm&M@XGB*x7Z7 zA)?J*|FEH-q5mTWcY_lpUcb17j9&r(Cvn!HSph)BTVB3h}Dqd z?JPV15es_V-OG1pV@x3g6`H&Uu<{qLU6w-7Lvsj$+Nl8j>eWA_rH4J!&g7k215@75 zI!3QKw7~%i)X&@}PwH+v=~ST#3b6~v+o7i2NOHy;*UO!INi2wiq literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@3x.png b/Signal/Images.xcassets/ic_switch_camera.imageset/switch-camera-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..72b1732a0cf5af16d1c1d40b3957180112477072 GIT binary patch literal 1511 zcmVE)_%_Sm{6=MCm{!s05}0%N6)i zL8J;SRgk+5WhLAX1vhr~R3(UH2^u3DP9AHf@p~xV(z+!bJ{#liSl6L%?AO(p`bdabWJt zJpjeZF{%J$>$ys{;YudykxO5wOb>L=D^s3s*m3D+BS6H{b{La*rhE@EW#rOMUVuQw zMr-1cW!3$}nJH%*o=Wu#R>TP8kJ`y4lsPm=*mLP7CqRJwYUAyM@^6{Gp_m!6A_|eO zE41R$OjLwbM}&Fw0iMy$tjIS+Xt@7|41>&sY4!5E^~Y^Bay`XW$f=G_I?TPs#zp|1c(X2tP^I^D@{2TlRmCWw}mx#ixi zkROjeeE`?-ejR;1edfqALG<+hXGH%X)AMX45IB+B0(Mr+ZPFs-CnC88koUs>)*k@B ziva1!X#pE6=4Sha{0!s>z>V*@4p|U^BopK?KQD+Fau*ahklF&)R?Ka;NRWwC=Ufqh zfl_Ki%hxTM*vV+B33@jDHW5)-7cL0oTKUDO@r71`gCeAwAk%5~WL+WT1Fa4pX{p|e z4@QO?S0bAInqY^XzI^Tl9`ch!col#${1&Sm!4e=dpIIS-{1#ym9Q(Ov({+S4Ud;X8 zwQ)@_pScI7jxoW>1JKNt%j8|6kN}>7ow*y&F?i~jEdr23lFKXXHIYw%K*1*O3l!-k z;i}`2i3{@inlHY2g*g-X1n?AW3FKetr9m@(@A0yGZ&^Aw@rlql1bAe;$d*DrlKEaU z@%sRuZ5W(lhx@k`l z?uL914_o6JuK=NZteXZB`NCb1@8H3zqoZ%M-hFW8W8Kh`$QP`F-Ju8@$A6qhxFvuq zpWtdJO{0$v_d_5T#KrE2an5NeE5uRD(H;>NO+MVXF$ugN;>xy6hzW{E!;lY-w}ql10z`luvHoJN{HO2B=wgBb z@Vty3?SSipv;Yr?d{^f>$otU61yD*gRFPSsL%uoWgh9{2;I_^N+{$aW>*jo5lNkm* zz{!dzKt6Uvn9Gr69PxvbUrYdpr$8GT&PjCw#D|WsEOK<26)|9Co|sB>y~3t;Y^CpH z-+3I`XJzhxqJCAZW@{kd*84oTwNuF*Qz^4=*pGT(_KoE~_lDI9_ov$r%CwjSXBBxr{ z%(o0URYqzNi~od4l@?&4;zxW=G{ULsS~;c9SglBiF+O88nbW=I@FBOgV?itiFVuI) zhur!=K4mB<2HB9Q3=yC*M1aZ=0V+cTs02BR0px{zZ z7sn8f&bOhtTn!35wXa#^ZYq~4CkHIZJIgEcH&fxt=UR_fi>^r-z4j>muhP(=B`A6@ zMkG5zJ7N#}d4>Zlbry_M>dr}>*=zbIi2c0g0`*-^VY4WGsShchAuJR{iW<~ m>yER_Cs;lH?|)y9K|JM*R^O4Q$E1M{X7F_Nb6Mw<&;$VBSYMt1 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@2x.png b/Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ea502285caf8531820a4cffebcb866af3b2bc408 GIT binary patch literal 398 zcmV;90df9`P)bfi!V8w;*bPFyWC? z5LS4a@X95KOM1<-BQz4(0Pjyx5J(e{|41VdCQu`pAP^>?!>~qrny{|9Xltai361lc z#Wm8|1hkG41kePe2n@fZ6psG(6RI>m#!qZC{{F*g=!qfnTLRL&#bj$Gc`3=U%j$ibvB^93G-~AMAJcc sIWaMN0f1J`aZ=wK!$5Bg16@HxZh($ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@3x.png b/Signal/Images.xcassets/ic_x_with_shadow.imageset/x-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb9bb263d56a3b51b69b48ace2bb48ad7eb0b3a GIT binary patch literal 573 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fr0V8 zr;B4q#hkZu8aodg2(X05J6in|3!3Hasj2z!^2zcA?g#mgso%Y+c4=;c__PV4ZqF49 zRlNO9SvF_AUVYPPud72F#|Z&ONhJkmmXwYL9>EEUOhzS~0bZG&ns;5C1ExlKpPjx+ zJGj@F?Sn=;;}6CH>*_xl)1|IQot}OC<>$4ny7>>DNGiO2@I-rp%LSu`)a!v69=sO+ zDr#cjvmIQp>6ZL{q^VZy^hrgSzU7eubkbjY5&$a7ew{4&Q(T=h@ zmC8JoaiyBL#fK=182>N(ejdpvYGyt^^=k8kn1>DC=eONqkln*Kb=&giM%%d;Ocu`! z_c+WbSrFHoJxPAatp^>|mP>V6MuwibE!$Oj*vBw`r`9vy>Z38=0?)KMAC0LB zJ9C!1Yv*5AL-PR5XJR%-?;Ke<<936nd)sC1NgPr082$J?lrm=WZ9_y@ literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ad2ecdf66..4ef70c224 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -153,6 +153,7 @@ typedef enum : NSUInteger { UIDocumentPickerDelegate, UIImagePickerControllerDelegate, OWSImagePickerControllerDelegate, + OWSPhotoCaptureViewControllerDelegate, UINavigationControllerDelegate, UITextViewDelegate, ConversationCollectionViewDelegate, @@ -2781,6 +2782,24 @@ typedef enum : NSUInteger { [self showApprovalDialogForAttachment:attachment]; } +#pragma mark - OWSPhotoCaptureViewControllerDelegate + +- (void)photoCaptureViewController:(OWSPhotoCaptureViewController *)photoCaptureViewController + didFinishProcessingAttachment:(SignalAttachment *)attachment +{ + OWSLogDebug(@""); + [self dismissViewControllerAnimated:YES + completion:^{ + [self showApprovalDialogForAttachment:attachment]; + }]; +} + +- (void)photoCaptureViewControllerDidCancel:(OWSPhotoCaptureViewController *)photoCaptureViewController +{ + OWSLogDebug(@""); + [self dismissViewControllerAnimated:YES completion:nil]; +} + #pragma mark - UIImagePickerController /* @@ -2788,20 +2807,48 @@ typedef enum : NSUInteger { */ - (void)takePictureOrVideo { - [self ows_askForCameraPermissions:^(BOOL granted) { - if (!granted) { + [self ows_askForCameraPermissions:^(BOOL cameraGranted) { + if (!cameraGranted) { OWSLogWarn(@"camera permission denied."); return; } + [self ows_askForMicrophonePermissions:^(BOOL micGranted) { + if (!micGranted) { + OWSLogWarn(@"proceeding, though mic permission denied."); + // We can still continue without mic permissions, but any captured video will + // be silent. + } - UIImagePickerController *picker = [OWSImagePickerController new]; - picker.sourceType = UIImagePickerControllerSourceTypeCamera; - picker.mediaTypes = @[ (__bridge NSString *)kUTTypeImage, (__bridge NSString *)kUTTypeMovie ]; - picker.allowsEditing = NO; - picker.delegate = self; - - [self dismissKeyBoard]; - [self presentViewController:picker animated:YES completion:nil]; + UIViewController *pickerModal; + + if (SSKFeatureFlags.useCustomPhotoCapture) { + OWSPhotoCaptureViewController *captureVC = [OWSPhotoCaptureViewController new]; + captureVC.delegate = self; + OWSNavigationController *navController = + [[OWSNavigationController alloc] initWithRootViewController:captureVC]; + UINavigationBar *navigationBar = navController.navigationBar; + if (![navigationBar isKindOfClass:[OWSNavigationBar class]]) { + OWSFailDebug(@"navigationBar was nil or unexpected class"); + } else { + OWSNavigationBar *owsNavigationBar = (OWSNavigationBar *)navigationBar; + [owsNavigationBar overrideThemeWithType:NavigationBarThemeOverrideClear]; + } + navController.ows_prefersStatusBarHidden = @(YES); + + pickerModal = navController; + } else { + UIImagePickerController *picker = [OWSImagePickerController new]; + pickerModal = picker; + picker.sourceType = UIImagePickerControllerSourceTypeCamera; + picker.mediaTypes = @[ (__bridge NSString *)kUTTypeImage, (__bridge NSString *)kUTTypeMovie ]; + picker.allowsEditing = NO; + picker.delegate = self; + } + OWSAssertDebug(pickerModal); + + [self dismissKeyBoard]; + [self presentViewController:pickerModal animated:YES completion:nil]; + }]; }]; } diff --git a/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift similarity index 100% rename from Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift rename to Signal/src/ViewControllers/Photos/ImagePickerController.swift diff --git a/Signal/src/ViewControllers/Photos/PhotoCapture.swift b/Signal/src/ViewControllers/Photos/PhotoCapture.swift new file mode 100644 index 000000000..0cbc8bdea --- /dev/null +++ b/Signal/src/ViewControllers/Photos/PhotoCapture.swift @@ -0,0 +1,673 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import PromiseKit + +protocol PhotoCaptureDelegate: AnyObject { + func photoCapture(_ photoCapture: PhotoCapture, didFinishProcessingAttachment attachment: SignalAttachment) + func photoCapture(_ photoCapture: PhotoCapture, processingDidError error: Error) + + func photoCaptureDidBeginVideo(_ photoCapture: PhotoCapture) + func photoCaptureDidCompleteVideo(_ photoCapture: PhotoCapture) + func photoCaptureDidCancelVideo(_ photoCapture: PhotoCapture) + + var zoomScaleReferenceHeight: CGFloat? { get } + var captureOrientation: AVCaptureVideoOrientation { get } +} + +class PhotoCapture: NSObject { + + weak var delegate: PhotoCaptureDelegate? + var flashMode: AVCaptureDevice.FlashMode { + return captureOutput.flashMode + } + let session: AVCaptureSession + + let sessionQueue = DispatchQueue(label: "PhotoCapture.sessionQueue") + + private var currentCaptureInput: AVCaptureDeviceInput? + private let captureOutput: CaptureOutput + var captureDevice: AVCaptureDevice? { + return currentCaptureInput?.device + } + private(set) var desiredPosition: AVCaptureDevice.Position = .back + + override init() { + self.session = AVCaptureSession() + self.captureOutput = CaptureOutput() + } + + func startCapture() -> Promise { + return sessionQueue.async(.promise) { [weak self] in + guard let self = self else { return } + + self.session.beginConfiguration() + defer { self.session.commitConfiguration() } + + try self.updateCurrentInput(position: .back) + + let audioDevice = AVCaptureDevice.default(for: .audio) + // verify works without audio permissions + let audioDeviceInput = try AVCaptureDeviceInput(device: audioDevice!) + if self.session.canAddInput(audioDeviceInput) { + self.session.addInput(audioDeviceInput) + } else { + owsFailDebug("Could not add audio device input to the session") + } + + guard let photoOutput = self.captureOutput.photoOutput else { + throw PhotoCaptureError.initializationFailed + } + + guard self.session.canAddOutput(photoOutput) else { + throw PhotoCaptureError.initializationFailed + } + + if let connection = photoOutput.connection(with: .video) { + if connection.isVideoStabilizationSupported { + connection.preferredVideoStabilizationMode = .auto + } + } + + self.session.addOutput(photoOutput) + + let movieOutput = self.captureOutput.movieOutput + + if self.session.canAddOutput(movieOutput) { + self.session.addOutput(movieOutput) + self.session.sessionPreset = .medium + if let connection = movieOutput.connection(with: .video) { + if connection.isVideoStabilizationSupported { + connection.preferredVideoStabilizationMode = .auto + } + } + } + }.done(on: sessionQueue) { + self.session.startRunning() + } + } + + func stopCapture() -> Guarantee { + return sessionQueue.async(.promise) { + self.session.stopRunning() + } + } + + func assertIsOnSessionQueue() { + assertOnQueue(sessionQueue) + } + + func switchCamera() -> Promise { + AssertIsOnMainThread() + let newPosition: AVCaptureDevice.Position + switch desiredPosition { + case .front: + newPosition = .back + case .back: + newPosition = .front + case .unspecified: + newPosition = .front + } + desiredPosition = newPosition + + return sessionQueue.async(.promise) { [weak self] in + guard let self = self else { return } + + self.session.beginConfiguration() + defer { self.session.commitConfiguration() } + try self.updateCurrentInput(position: newPosition) + } + } + + // This method should be called on the serial queue, + // and between calls to session.beginConfiguration/commitConfiguration + func updateCurrentInput(position: AVCaptureDevice.Position) throws { + assertIsOnSessionQueue() + + guard let device = captureOutput.videoDevice(position: position) else { + throw PhotoCaptureError.assertionError(description: description) + } + + let newInput = try AVCaptureDeviceInput(device: device) + + if let oldInput = self.currentCaptureInput { + session.removeInput(oldInput) + NotificationCenter.default.removeObserver(self, name: .AVCaptureDeviceSubjectAreaDidChange, object: oldInput.device) + } + session.addInput(newInput) + NotificationCenter.default.addObserver(self, selector: #selector(subjectAreaDidChange), name: .AVCaptureDeviceSubjectAreaDidChange, object: newInput.device) + + currentCaptureInput = newInput + + resetFocusAndExposure() + } + + func switchFlashMode() -> Guarantee { + return sessionQueue.async(.promise) { + switch self.captureOutput.flashMode { + case .auto: + Logger.debug("new flashMode: on") + self.captureOutput.flashMode = .on + case .on: + Logger.debug("new flashMode: off") + self.captureOutput.flashMode = .off + case .off: + Logger.debug("new flashMode: auto") + self.captureOutput.flashMode = .auto + } + } + } + + func focus(with focusMode: AVCaptureDevice.FocusMode, + exposureMode: AVCaptureDevice.ExposureMode, + at devicePoint: CGPoint, + monitorSubjectAreaChange: Bool) { + sessionQueue.async { + guard let device = self.captureDevice else { + owsFailDebug("device was unexpectedly nil") + return + } + do { + try device.lockForConfiguration() + + // Setting (focus/exposure)PointOfInterest alone does not initiate a (focus/exposure) operation. + // Call set(Focus/Exposure)Mode() to apply the new point of interest. + if device.isFocusPointOfInterestSupported && device.isFocusModeSupported(focusMode) { + device.focusPointOfInterest = devicePoint + device.focusMode = focusMode + } + + if device.isExposurePointOfInterestSupported && device.isExposureModeSupported(exposureMode) { + device.exposurePointOfInterest = devicePoint + device.exposureMode = exposureMode + } + + device.isSubjectAreaChangeMonitoringEnabled = monitorSubjectAreaChange + device.unlockForConfiguration() + } catch { + owsFailDebug("error: \(error)") + } + } + } + + func resetFocusAndExposure() { + let devicePoint = CGPoint(x: 0.5, y: 0.5) + focus(with: .continuousAutoFocus, exposureMode: .continuousAutoExposure, at: devicePoint, monitorSubjectAreaChange: false) + } + + @objc + func subjectAreaDidChange(notification: NSNotification) { + resetFocusAndExposure() + } + + // MARK: - Zoom + + let minimumZoom: CGFloat = 1.0 + let maximumZoom: CGFloat = 3.0 + var previousZoomFactor: CGFloat = 1.0 + + func updateZoom(alpha: CGFloat) { + assert(alpha >= 0 && alpha <= 1) + sessionQueue.async { + guard let captureDevice = self.captureDevice else { + owsFailDebug("captureDevice was unexpectedly nil") + return + } + + // we might want this to be non-linear + let scale = CGFloatLerp(self.minimumZoom, self.maximumZoom, alpha) + let zoomFactor = self.clampZoom(scale, device: captureDevice) + self.updateZoom(factor: zoomFactor) + } + } + + func updateZoom(scaleFromPreviousZoomFactor scale: CGFloat) { + sessionQueue.async { + guard let captureDevice = self.captureDevice else { + owsFailDebug("captureDevice was unexpectedly nil") + return + } + + let zoomFactor = self.clampZoom(scale * self.previousZoomFactor, device: captureDevice) + self.updateZoom(factor: zoomFactor) + } + } + + func completeZoom(scaleFromPreviousZoomFactor scale: CGFloat) { + sessionQueue.async { + guard let captureDevice = self.captureDevice else { + owsFailDebug("captureDevice was unexpectedly nil") + return + } + + let zoomFactor = self.clampZoom(scale * self.previousZoomFactor, device: captureDevice) + + Logger.debug("ended with scaleFactor: \(zoomFactor)") + + self.previousZoomFactor = zoomFactor + self.updateZoom(factor: zoomFactor) + } + } + + private func updateZoom(factor: CGFloat) { + assertIsOnSessionQueue() + + guard let captureDevice = self.captureDevice else { + owsFailDebug("captureDevice was unexpectedly nil") + return + } + + do { + try captureDevice.lockForConfiguration() + captureDevice.videoZoomFactor = factor + captureDevice.unlockForConfiguration() + } catch { + owsFailDebug("error: \(error)") + } + } + + private func clampZoom(_ factor: CGFloat, device: AVCaptureDevice) -> CGFloat { + return min(factor.clamp(minimumZoom, maximumZoom), device.activeFormat.videoMaxZoomFactor) + } +} + +extension PhotoCapture: CaptureButtonDelegate { + + // MARK: - Photo + + func didTapCaptureButton(_ captureButton: CaptureButton) { + Logger.verbose("") + sessionQueue.async { + self.captureOutput.takePhoto(delegate: self) + } + } + + // MARK: - Video + + func didBeginLongPressCaptureButton(_ captureButton: CaptureButton) { + AssertIsOnMainThread() + + Logger.verbose("") + sessionQueue.async { + self.captureOutput.beginVideo(delegate: self) + + DispatchQueue.main.async { + self.delegate?.photoCaptureDidBeginVideo(self) + } + } + } + + func didCompleteLongPressCaptureButton(_ captureButton: CaptureButton) { + Logger.verbose("") + sessionQueue.async { + self.captureOutput.completeVideo(delegate: self) + } + AssertIsOnMainThread() + // immediately inform UI that capture is stopping + delegate?.photoCaptureDidCompleteVideo(self) + } + + func didCancelLongPressCaptureButton(_ captureButton: CaptureButton) { + Logger.verbose("") + AssertIsOnMainThread() + delegate?.photoCaptureDidCancelVideo(self) + } + + var zoomScaleReferenceHeight: CGFloat? { + return delegate?.zoomScaleReferenceHeight + } + + func longPressCaptureButton(_ captureButton: CaptureButton, didUpdateZoomAlpha zoomAlpha: CGFloat) { + Logger.verbose("zoomAlpha: \(zoomAlpha)") + updateZoom(alpha: zoomAlpha) + } +} + +extension PhotoCapture: CaptureOutputDelegate { + + var captureOrientation: AVCaptureVideoOrientation { + guard let delegate = delegate else { return .portrait } + + return delegate.captureOrientation + } + + // MARK: - Photo + + func captureOutputDidFinishProcessing(photoData: Data?, error: Error?) { + Logger.verbose("") + AssertIsOnMainThread() + + if let error = error { + delegate?.photoCapture(self, processingDidError: error) + return + } + + guard let photoData = photoData else { + owsFailDebug("photoData was unexpectedly nil") + delegate?.photoCapture(self, processingDidError: PhotoCaptureError.captureFailed) + + return + } + + let dataSource = DataSourceValue.dataSource(with: photoData, utiType: kUTTypeJPEG as String) + + let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: kUTTypeJPEG as String, imageQuality: .medium) + delegate?.photoCapture(self, didFinishProcessingAttachment: attachment) + } + + // MARK: - Movie + + func fileOutput(_ output: AVCaptureFileOutput, didStartRecordingTo fileURL: URL, from connections: [AVCaptureConnection]) { + Logger.verbose("") + AssertIsOnMainThread() + } + + func fileOutput(_ output: AVCaptureFileOutput, didFinishRecordingTo outputFileURL: URL, from connections: [AVCaptureConnection], error: Error?) { + Logger.verbose("") + AssertIsOnMainThread() + + if let error = error { + delegate?.photoCapture(self, processingDidError: error) + return + } + + let dataSource = DataSourcePath.dataSource(with: outputFileURL, shouldDeleteOnDeallocation: true) + + let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: kUTTypeMPEG4 as String) + delegate?.photoCapture(self, didFinishProcessingAttachment: attachment) + } +} + +// MARK: - Capture Adapter + +protocol CaptureOutputDelegate: AVCaptureFileOutputRecordingDelegate { + var session: AVCaptureSession { get } + func assertIsOnSessionQueue() + func captureOutputDidFinishProcessing(photoData: Data?, error: Error?) + var captureOrientation: AVCaptureVideoOrientation { get } +} + +protocol ImageCaptureOutput: AnyObject { + var avOutput: AVCaptureOutput { get } + var flashMode: AVCaptureDevice.FlashMode { get set } + func videoDevice(position: AVCaptureDevice.Position) -> AVCaptureDevice? + + func takePhoto(delegate: CaptureOutputDelegate) +} + +class CaptureOutput { + + let imageOutput: ImageCaptureOutput + let movieOutput: AVCaptureMovieFileOutput + + init() { + if #available(iOS 10.0, *) { + imageOutput = PhotoCaptureOutputAdaptee() + } else { + imageOutput = StillImageCaptureOutput() + } + + movieOutput = AVCaptureMovieFileOutput() + } + + var photoOutput: AVCaptureOutput? { + return imageOutput.avOutput + } + + var flashMode: AVCaptureDevice.FlashMode { + get { return imageOutput.flashMode } + set { imageOutput.flashMode = newValue } + } + + func videoDevice(position: AVCaptureDevice.Position) -> AVCaptureDevice? { + return imageOutput.videoDevice(position: position) + } + + func takePhoto(delegate: CaptureOutputDelegate) { + delegate.assertIsOnSessionQueue() + + guard let photoOutput = photoOutput else { + owsFailDebug("photoOutput was unexpectedly nil") + return + } + + guard let photoVideoConnection = photoOutput.connection(with: .video) else { + owsFailDebug("photoVideoConnection was unexpectedly nil") + return + } + + let videoOrientation = delegate.captureOrientation + photoVideoConnection.videoOrientation = videoOrientation + Logger.verbose("videoOrientation: \(videoOrientation)") + + return imageOutput.takePhoto(delegate: delegate) + } + + // MARK: - Movie Output + + func beginVideo(delegate: CaptureOutputDelegate) { + delegate.assertIsOnSessionQueue() + guard let videoConnection = movieOutput.connection(with: .video) else { + owsFailDebug("movieOutputConnection was unexpectedly nil") + return + } + + let videoOrientation = delegate.captureOrientation + videoConnection.videoOrientation = videoOrientation + + let outputFilePath = OWSFileSystem.temporaryFilePath(withFileExtension: "mp4") + movieOutput.startRecording(to: URL(fileURLWithPath: outputFilePath), recordingDelegate: delegate) + } + + func completeVideo(delegate: CaptureOutputDelegate) { + delegate.assertIsOnSessionQueue() + movieOutput.stopRecording() + } + + func cancelVideo(delegate: CaptureOutputDelegate) { + delegate.assertIsOnSessionQueue() + // There's currently no user-visible way to cancel, if so, we may need to do some cleanup here. + owsFailDebug("video was unexpectedly canceled.") + } +} + +@available(iOS 10.0, *) +class PhotoCaptureOutputAdaptee: NSObject, ImageCaptureOutput { + + let photoOutput = AVCapturePhotoOutput() + var avOutput: AVCaptureOutput { + return photoOutput + } + + var flashMode: AVCaptureDevice.FlashMode = .off + + override init() { + photoOutput.isLivePhotoCaptureEnabled = false + photoOutput.isHighResolutionCaptureEnabled = true + } + + private var photoProcessors: [Int64: PhotoProcessor] = [:] + + func takePhoto(delegate: CaptureOutputDelegate) { + delegate.assertIsOnSessionQueue() + + let settings = buildCaptureSettings() + + let photoProcessor = PhotoProcessor(delegate: delegate, completion: { [weak self] in + self?.photoProcessors[settings.uniqueID] = nil + }) + photoProcessors[settings.uniqueID] = photoProcessor + photoOutput.capturePhoto(with: settings, delegate: photoProcessor) + } + + func videoDevice(position: AVCaptureDevice.Position) -> AVCaptureDevice? { + // use dual camera where available + return AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: position) + } + + // MARK: - + + private func buildCaptureSettings() -> AVCapturePhotoSettings { + let photoSettings = AVCapturePhotoSettings() + photoSettings.flashMode = flashMode + + photoSettings.isAutoStillImageStabilizationEnabled = + photoOutput.isStillImageStabilizationSupported + + return photoSettings + } + + private class PhotoProcessor: NSObject, AVCapturePhotoCaptureDelegate { + weak var delegate: CaptureOutputDelegate? + let completion: () -> Void + + init(delegate: CaptureOutputDelegate, completion: @escaping () -> Void) { + self.delegate = delegate + self.completion = completion + } + + @available(iOS 11.0, *) + func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) { + let data = photo.fileDataRepresentation()! + DispatchQueue.main.async { + self.delegate?.captureOutputDidFinishProcessing(photoData: data, error: error) + } + completion() + } + + // for legacy (iOS10) devices + func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photoSampleBuffer: CMSampleBuffer?, previewPhoto previewPhotoSampleBuffer: CMSampleBuffer?, resolvedSettings: AVCaptureResolvedPhotoSettings, bracketSettings: AVCaptureBracketedStillImageSettings?, error: Error?) { + if #available(iOS 11, *) { + owsFailDebug("unexpectedly calling legacy method.") + } + + guard let photoSampleBuffer = photoSampleBuffer else { + owsFailDebug("sampleBuffer was unexpectedly nil") + return + } + + let data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(photoSampleBuffer) + DispatchQueue.main.async { + self.delegate?.captureOutputDidFinishProcessing(photoData: data, error: error) + } + completion() + } + } +} + +class StillImageCaptureOutput: ImageCaptureOutput { + var flashMode: AVCaptureDevice.FlashMode = .off + + let stillImageOutput = AVCaptureStillImageOutput() + var avOutput: AVCaptureOutput { + return stillImageOutput + } + + init() { + stillImageOutput.isHighResolutionStillImageOutputEnabled = true + } + + // MARK: - + + func takePhoto(delegate: CaptureOutputDelegate) { + guard let videoConnection = stillImageOutput.connection(with: .video) else { + owsFailDebug("videoConnection was unexpectedly nil") + return + } + + stillImageOutput.captureStillImageAsynchronously(from: videoConnection) { [weak delegate] (sampleBuffer, error) in + guard let sampleBuffer = sampleBuffer else { + owsFailDebug("sampleBuffer was unexpectedly nil") + return + } + + let data = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(sampleBuffer) + DispatchQueue.main.async { + delegate?.captureOutputDidFinishProcessing(photoData: data, error: error) + } + } + } + + func videoDevice(position: AVCaptureDevice.Position) -> AVCaptureDevice? { + let captureDevices = AVCaptureDevice.devices() + guard let device = (captureDevices.first { $0.hasMediaType(.video) && $0.position == position }) else { + Logger.debug("unable to find desired position: \(position)") + return captureDevices.first + } + + return device + } +} + +extension AVCaptureVideoOrientation { + init?(deviceOrientation: UIDeviceOrientation) { + switch deviceOrientation { + case .portrait: self = .portrait + case .portraitUpsideDown: self = .portraitUpsideDown + case .landscapeLeft: self = .landscapeRight + case .landscapeRight: self = .landscapeLeft + default: return nil + } + } +} + +extension AVCaptureVideoOrientation: CustomStringConvertible { + public var description: String { + switch self { + case .portrait: + return "AVCaptureVideoOrientation.portrait" + case .portraitUpsideDown: + return "AVCaptureVideoOrientation.portraitUpsideDown" + case .landscapeRight: + return "AVCaptureVideoOrientation.landscapeRight" + case .landscapeLeft: + return "AVCaptureVideoOrientation.landscapeLeft" + } + } +} + +extension UIDeviceOrientation: CustomStringConvertible { + public var description: String { + switch self { + case .unknown: + return "UIDeviceOrientation.unknown" + case .portrait: + return "UIDeviceOrientation.portrait" + case .portraitUpsideDown: + return "UIDeviceOrientation.portraitUpsideDown" + case .landscapeLeft: + return "UIDeviceOrientation.landscapeLeft" + case .landscapeRight: + return "UIDeviceOrientation.landscapeRight" + case .faceUp: + return "UIDeviceOrientation.faceUp" + case .faceDown: + return "UIDeviceOrientation.faceDown" + } + } +} + +extension UIImageOrientation: CustomStringConvertible { + public var description: String { + switch self { + case .up: + return "UIImageOrientation.up" + case .down: + return "UIImageOrientation.down" + case .left: + return "UIImageOrientation.left" + case .right: + return "UIImageOrientation.right" + case .upMirrored: + return "UIImageOrientation.upMirrored" + case .downMirrored: + return "UIImageOrientation.downMirrored" + case .leftMirrored: + return "UIImageOrientation.leftMirrored" + case .rightMirrored: + return "UIImageOrientation.rightMirrored" + } + } +} diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift new file mode 100644 index 000000000..104df7d12 --- /dev/null +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -0,0 +1,663 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import AVFoundation +import PromiseKit + +@objc(OWSPhotoCaptureViewControllerDelegate) +protocol PhotoCaptureViewControllerDelegate: AnyObject { + func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) + func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) +} + +enum PhotoCaptureError: Error { + case assertionError(description: String) + case initializationFailed + case captureFailed +} + +extension PhotoCaptureError: LocalizedError { + var localizedDescription: String { + switch self { + case .initializationFailed: + return NSLocalizedString("PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA", comment: "alert title") + case .captureFailed: + return NSLocalizedString("PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE", comment: "alert title") + case .assertionError: + return NSLocalizedString("PHOTO_CAPTURE_GENERIC_ERROR", comment: "alert title, generic error preventing user from capturing a photo") + } + } +} + +@objc(OWSPhotoCaptureViewController) +class PhotoCaptureViewController: OWSViewController { + + @objc + weak var delegate: PhotoCaptureViewControllerDelegate? + + private var photoCapture: PhotoCapture! + + deinit { + UIDevice.current.endGeneratingDeviceOrientationNotifications() + if let photoCapture = photoCapture { + photoCapture.stopCapture().done { + Logger.debug("stopCapture completed") + }.retainUntilComplete() + } + } + + // MARK: - Dependencies + + var audioActivity: AudioActivity? + var audioSession: OWSAudioSession { + return Environment.shared.audioSession + } + + // MARK: - Overrides + + override func loadView() { + self.view = UIView() + self.view.backgroundColor = Theme.darkThemeBackgroundColor + + let audioActivity = AudioActivity(audioDescription: "PhotoCaptureViewController", behavior: .playAndRecord) + self.audioActivity = audioActivity + if !self.audioSession.startAudioActivity(audioActivity) { + owsFailDebug("unexpectedly unable to start audio activity") + } + } + + override func viewDidLoad() { + super.viewDidLoad() + setupPhotoCapture() + setupOrientationMonitoring() + + updateNavigationItems() + updateFlashModeControl() + + let initialCaptureOrientation = AVCaptureVideoOrientation(deviceOrientation: UIDevice.current.orientation) ?? .portrait + updateIconOrientations(isAnimated: false, captureOrientation: initialCaptureOrientation) + + view.addGestureRecognizer(pinchZoomGesture) + view.addGestureRecognizer(focusGesture) + view.addGestureRecognizer(doubleTapToSwitchCameraGesture) + } + + override var prefersStatusBarHidden: Bool { + return true + } + + // MARK - + var isRecordingMovie: Bool = false + let recordingTimerView = RecordingTimerView() + + func updateNavigationItems() { + if isRecordingMovie { + navigationItem.leftBarButtonItem = nil + navigationItem.rightBarButtonItems = nil + navigationItem.titleView = recordingTimerView + recordingTimerView.sizeToFit() + } else { + navigationItem.titleView = nil + navigationItem.leftBarButtonItem = dismissControl.barButtonItem + let fixedSpace = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) + fixedSpace.width = 16 + + navigationItem.rightBarButtonItems = [flashModeControl.barButtonItem, fixedSpace, switchCameraControl.barButtonItem] + } + } + + // HACK: Though we don't have an input accessory view, the VC we are presented above (ConversationVC) does. + // If the app is backgrounded and then foregrounded, when OWSWindowManager calls mainWindow.makeKeyAndVisible + // the ConversationVC's inputAccessoryView will appear *above* us unless we'd previously become first responder. + override public var canBecomeFirstResponder: Bool { + Logger.debug("") + return true + } + + override var supportedInterfaceOrientations: UIInterfaceOrientationMask { + return .portrait + } + + // MARK: - Views + + let captureButton = CaptureButton() + var previewView: CapturePreviewView! + + class PhotoControl { + let button: OWSButton + let barButtonItem: UIBarButtonItem + + init(imageName: String, block: @escaping () -> Void) { + self.button = OWSButton(imageName: imageName, tintColor: .ows_white, block: block) + if #available(iOS 10, *) { + button.autoPinToSquareAspectRatio() + } else { + button.sizeToFit() + } + + button.layer.shadowOffset = CGSize.zero + button.layer.shadowOpacity = 0.35 + button.layer.shadowRadius = 4 + + self.barButtonItem = UIBarButtonItem(customView: button) + } + + func setImage(imageName: String) { + button.setImage(imageName: imageName) + } + } + private lazy var dismissControl: PhotoControl = { + return PhotoControl(imageName: "ic_x_with_shadow") { [weak self] in + self?.didTapClose() + } + }() + + private lazy var switchCameraControl: PhotoControl = { + return PhotoControl(imageName: "ic_switch_camera") { [weak self] in + self?.didTapSwitchCamera() + } + }() + + private lazy var flashModeControl: PhotoControl = { + return PhotoControl(imageName: "ic_flash_mode_auto") { [weak self] in + self?.didTapFlashMode() + } + }() + + lazy var pinchZoomGesture: UIPinchGestureRecognizer = { + return UIPinchGestureRecognizer(target: self, action: #selector(didPinchZoom(pinchGesture:))) + }() + + lazy var focusGesture: UITapGestureRecognizer = { + return UITapGestureRecognizer(target: self, action: #selector(didTapFocusExpose(tapGesture:))) + }() + + lazy var doubleTapToSwitchCameraGesture: UITapGestureRecognizer = { + let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didDoubleTapToSwitchCamera(tapGesture:))) + tapGesture.numberOfTapsRequired = 2 + return tapGesture + }() + + // MARK: - Events + + @objc + func didTapClose() { + self.delegate?.photoCaptureViewControllerDidCancel(self) + } + + @objc + func didTapSwitchCamera() { + Logger.debug("") + switchCamera() + } + + @objc + func didDoubleTapToSwitchCamera(tapGesture: UITapGestureRecognizer) { + Logger.debug("") + switchCamera() + } + + private func switchCamera() { + UIView.animate(withDuration: 0.2) { + let epsilonToForceCounterClockwiseRotation: CGFloat = 0.00001 + self.switchCameraControl.button.transform = self.switchCameraControl.button.transform.rotate(.pi + epsilonToForceCounterClockwiseRotation) + } + photoCapture.switchCamera().catch { error in + self.showFailureUI(error: error) + }.retainUntilComplete() + } + + @objc + func didTapFlashMode() { + Logger.debug("") + photoCapture.switchFlashMode().done { + self.updateFlashModeControl() + }.retainUntilComplete() + } + + @objc + func didPinchZoom(pinchGesture: UIPinchGestureRecognizer) { + switch pinchGesture.state { + case .began: fallthrough + case .changed: + photoCapture.updateZoom(scaleFromPreviousZoomFactor: pinchGesture.scale) + case .ended: + photoCapture.completeZoom(scaleFromPreviousZoomFactor: pinchGesture.scale) + default: + break + } + } + + @objc + func didTapFocusExpose(tapGesture: UITapGestureRecognizer) { + let viewLocation = tapGesture.location(in: view) + let devicePoint = previewView.previewLayer.captureDevicePointConverted(fromLayerPoint: viewLocation) + photoCapture.focus(with: .autoFocus, exposureMode: .autoExpose, at: devicePoint, monitorSubjectAreaChange: true) + } + + // MARK: - Orientation + + private func setupOrientationMonitoring() { + UIDevice.current.beginGeneratingDeviceOrientationNotifications() + + NotificationCenter.default.addObserver(self, + selector: #selector(didChangeDeviceOrientation), + name: .UIDeviceOrientationDidChange, + object: UIDevice.current) + } + + var lastKnownCaptureOrientation: AVCaptureVideoOrientation = .portrait + + @objc + func didChangeDeviceOrientation(notification: Notification) { + let currentOrientation = UIDevice.current.orientation + + if let captureOrientation = AVCaptureVideoOrientation(deviceOrientation: currentOrientation) { + // since the "face up" and "face down" orientations aren't reflected in the photo output, + // we need to capture the last known _other_ orientation so we can reflect the appropriate + // portrait/landscape in our captured photos. + Logger.verbose("lastKnownCaptureOrientation: \(lastKnownCaptureOrientation)->\(captureOrientation)") + lastKnownCaptureOrientation = captureOrientation + updateIconOrientations(isAnimated: true, captureOrientation: captureOrientation) + } + } + + // MARK: - + + private func updateIconOrientations(isAnimated: Bool, captureOrientation: AVCaptureVideoOrientation) { + Logger.verbose("captureOrientation: \(captureOrientation)") + + let transformFromOrientation: CGAffineTransform + switch captureOrientation { + case .portrait: + transformFromOrientation = .identity + case .portraitUpsideDown: + transformFromOrientation = CGAffineTransform(rotationAngle: .pi) + case .landscapeLeft: + transformFromOrientation = CGAffineTransform(rotationAngle: .halfPi) + case .landscapeRight: + transformFromOrientation = CGAffineTransform(rotationAngle: -1 * .halfPi) + } + + // Don't "unrotate" the switch camera icon if the front facing camera had been selected. + let tranformFromCameraType: CGAffineTransform = photoCapture.desiredPosition == .front ? CGAffineTransform(rotationAngle: -.pi) : .identity + + let updateOrientation = { + self.flashModeControl.button.transform = transformFromOrientation + self.switchCameraControl.button.transform = transformFromOrientation.concatenating(tranformFromCameraType) + } + + if isAnimated { + UIView.animate(withDuration: 0.3, animations: updateOrientation) + } else { + updateOrientation() + } + } + + private func setupPhotoCapture() { + photoCapture = PhotoCapture() + photoCapture.delegate = self + captureButton.delegate = photoCapture + previewView = CapturePreviewView(session: photoCapture.session) + + photoCapture.startCapture().done { [weak self] in + guard let self = self else { return } + + self.showCaptureUI() + }.catch { [weak self] error in + guard let self = self else { return } + + self.showFailureUI(error: error) + }.retainUntilComplete() + } + + private func showCaptureUI() { + Logger.debug("") + view.addSubview(previewView) + if UIDevice.current.hasIPhoneXNotch { + previewView.autoPinEdgesToSuperviewEdges() + } else { + previewView.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: 0, leading: 0, bottom: 40, trailing: 0)) + } + + view.addSubview(captureButton) + captureButton.autoHCenterInSuperview() + let captureButtonDiameter: CGFloat = 80 + captureButton.autoSetDimensions(to: CGSize(width: captureButtonDiameter, height: captureButtonDiameter)) + // on iPhoneX 12.1 + captureButton.autoPinEdge(toSuperviewMargin: .bottom, withInset: 10) + } + + private func showFailureUI(error: Error) { + Logger.error("error: \(error)") + + OWSAlerts.showAlert(title: nil, + message: error.localizedDescription, + buttonTitle: CommonStrings.dismissButton, + buttonAction: { [weak self] _ in self?.dismiss(animated: true) }) + } + + private func updateFlashModeControl() { + let imageName: String + switch photoCapture.flashMode { + case .auto: + imageName = "ic_flash_mode_auto" + case .on: + imageName = "ic_flash_mode_on" + case .off: + imageName = "ic_flash_mode_off" + } + + self.flashModeControl.setImage(imageName: imageName) + } +} + +extension PhotoCaptureViewController: PhotoCaptureDelegate { + + // MARK: - Photo + + func photoCapture(_ photoCapture: PhotoCapture, didFinishProcessingAttachment attachment: SignalAttachment) { + delegate?.photoCaptureViewController(self, didFinishProcessingAttachment: attachment) + } + + func photoCapture(_ photoCapture: PhotoCapture, processingDidError error: Error) { + showFailureUI(error: error) + } + + // MARK: - Video + + func photoCaptureDidBeginVideo(_ photoCapture: PhotoCapture) { + isRecordingMovie = true + updateNavigationItems() + recordingTimerView.startCounting() + } + + func photoCaptureDidCompleteVideo(_ photoCapture: PhotoCapture) { + // Stop counting, but keep visible + recordingTimerView.stopCounting() + } + + func photoCaptureDidCancelVideo(_ photoCapture: PhotoCapture) { + owsFailDebug("If we ever allow this, we should test.") + isRecordingMovie = false + recordingTimerView.stopCounting() + updateNavigationItems() + } + + // MARK: - + + var zoomScaleReferenceHeight: CGFloat? { + return view.bounds.height + } + + var captureOrientation: AVCaptureVideoOrientation { + return lastKnownCaptureOrientation + } +} + +// MARK: - Views + +protocol CaptureButtonDelegate: AnyObject { + // MARK: Photo + func didTapCaptureButton(_ captureButton: CaptureButton) + + // MARK: Video + func didBeginLongPressCaptureButton(_ captureButton: CaptureButton) + func didCompleteLongPressCaptureButton(_ captureButton: CaptureButton) + func didCancelLongPressCaptureButton(_ captureButton: CaptureButton) + + var zoomScaleReferenceHeight: CGFloat? { get } + func longPressCaptureButton(_ captureButton: CaptureButton, didUpdateZoomAlpha zoomAlpha: CGFloat) +} + +class CaptureButton: UIView { + + let innerButton = CircleView() + + var tapGesture: UITapGestureRecognizer! + + var longPressGesture: UILongPressGestureRecognizer! + let longPressDuration = 0.5 + + let zoomIndicator = CircleView() + + weak var delegate: CaptureButtonDelegate? + + override init(frame: CGRect) { + super.init(frame: frame) + + tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap)) + innerButton.addGestureRecognizer(tapGesture) + + longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(didLongPress)) + longPressGesture.minimumPressDuration = longPressDuration + innerButton.addGestureRecognizer(longPressGesture) + + addSubview(innerButton) + innerButton.backgroundColor = UIColor.ows_white.withAlphaComponent(0.33) + innerButton.layer.shadowOffset = .zero + innerButton.layer.shadowOpacity = 0.33 + innerButton.layer.shadowRadius = 2 + innerButton.autoPinEdgesToSuperviewEdges() + + zoomIndicator.isUserInteractionEnabled = false + addSubview(zoomIndicator) + zoomIndicator.layer.borderColor = UIColor.ows_white.cgColor + zoomIndicator.layer.borderWidth = 1.5 + zoomIndicator.autoPin(toEdgesOf: innerButton) + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - Gestures + + @objc + func didTap(_ gesture: UITapGestureRecognizer) { + delegate?.didTapCaptureButton(self) + } + + var initialTouchLocation: CGPoint? + + @objc + func didLongPress(_ gesture: UILongPressGestureRecognizer) { + Logger.verbose("") + + guard let gestureView = gesture.view else { + owsFailDebug("gestureView was unexpectedly nil") + return + } + + switch gesture.state { + case .possible: break + case .began: + initialTouchLocation = gesture.location(in: gesture.view) + zoomIndicator.transform = .identity + delegate?.didBeginLongPressCaptureButton(self) + case .changed: + guard let referenceHeight = delegate?.zoomScaleReferenceHeight else { + owsFailDebug("referenceHeight was unexpectedly nil") + return + } + + guard referenceHeight > 0 else { + owsFailDebug("referenceHeight was unexpectedly <= 0") + return + } + + guard let initialTouchLocation = initialTouchLocation else { + owsFailDebug("initialTouchLocation was unexpectedly nil") + return + } + + let currentLocation = gesture.location(in: gestureView) + let minDistanceBeforeActivatingZoom: CGFloat = 30 + let distance = initialTouchLocation.y - currentLocation.y - minDistanceBeforeActivatingZoom + let distanceForFullZoom = referenceHeight / 4 + let ratio = distance / distanceForFullZoom + + let alpha = ratio.clamp(0, 1) + + Logger.verbose("distance: \(distance), alpha: \(alpha)") + + let transformScale = CGFloatLerp(1, 0.1, alpha) + zoomIndicator.transform = CGAffineTransform(scaleX: transformScale, y: transformScale) + zoomIndicator.superview?.layoutIfNeeded() + + delegate?.longPressCaptureButton(self, didUpdateZoomAlpha: alpha) + case .ended: + zoomIndicator.transform = .identity + delegate?.didCompleteLongPressCaptureButton(self) + case .cancelled, .failed: + zoomIndicator.transform = .identity + delegate?.didCancelLongPressCaptureButton(self) + } + } +} + +class CapturePreviewView: UIView { + + let previewLayer: AVCaptureVideoPreviewLayer + + override var bounds: CGRect { + didSet { + previewLayer.frame = bounds + } + } + + init(session: AVCaptureSession) { + previewLayer = AVCaptureVideoPreviewLayer(session: session) + super.init(frame: .zero) + self.contentMode = .scaleAspectFill + previewLayer.frame = bounds + layer.addSublayer(previewLayer) + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} + +class RecordingTimerView: UIView { + + let stackViewSpacing: CGFloat = 4 + + override init(frame: CGRect) { + super.init(frame: frame) + + let stackView = UIStackView(arrangedSubviews: [icon, label]) + stackView.axis = .horizontal + stackView.alignment = .center + stackView.spacing = stackViewSpacing + + addSubview(stackView) + stackView.autoPinEdgesToSuperviewMargins() + + updateView() + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - Subviews + + private lazy var label: UILabel = { + let label = UILabel() + label.font = UIFont.ows_monospacedDigitFont(withSize: 20) + label.textAlignment = .center + label.textColor = UIColor.white + label.layer.shadowOffset = CGSize.zero + label.layer.shadowOpacity = 0.35 + label.layer.shadowRadius = 4 + + return label + }() + + static let iconWidth: CGFloat = 6 + + private let icon: UIView = { + let icon = CircleView() + icon.layer.shadowOffset = CGSize.zero + icon.layer.shadowOpacity = 0.35 + icon.layer.shadowRadius = 4 + + icon.backgroundColor = .red + icon.autoSetDimensions(to: CGSize(width: iconWidth, height: iconWidth)) + icon.alpha = 0 + + return icon + }() + + // MARK: - Overrides // + + override func sizeThatFits(_ size: CGSize) -> CGSize { + if #available(iOS 10, *) { + return super.sizeThatFits(size) + } else { + // iOS9 manual layout sizing required for items in the navigation bar + var baseSize = label.frame.size + baseSize.width = baseSize.width + stackViewSpacing + RecordingTimerView.iconWidth + layoutMargins.left + layoutMargins.right + baseSize.height = baseSize.height + layoutMargins.top + layoutMargins.bottom + return baseSize + } + } + + // MARK: - + var recordingStartTime: TimeInterval? + + func startCounting() { + recordingStartTime = CACurrentMediaTime() + timer = Timer.weakScheduledTimer(withTimeInterval: 0.1, target: self, selector: #selector(updateView), userInfo: nil, repeats: true) + UIView.animate(withDuration: 0.5, + delay: 0, + options: [.autoreverse, .repeat], + animations: { self.icon.alpha = 1 }) + } + + func stopCounting() { + timer?.invalidate() + timer = nil + icon.layer.removeAllAnimations() + UIView.animate(withDuration: 0.4) { + self.icon.alpha = 0 + } + } + + // MARK: - + + private var timer: Timer? + + private lazy var timeFormatter: DateFormatter = { + let formatter = DateFormatter() + formatter.dateFormat = "mm:ss" + formatter.timeZone = TimeZone(identifier: "UTC")! + + return formatter + }() + + // This method should only be called when the call state is "connected". + var recordingDuration: TimeInterval { + guard let recordingStartTime = recordingStartTime else { + return 0 + } + + return CACurrentMediaTime() - recordingStartTime + } + + @objc + private func updateView() { + let recordingDuration = self.recordingDuration + Logger.verbose("recordingDuration: \(recordingDuration)") + let durationDate = Date(timeIntervalSinceReferenceDate: recordingDuration) + label.text = timeFormatter.string(from: durationDate) + if #available(iOS 10, *) { + // do nothing + } else { + label.sizeToFit() + } + } +} diff --git a/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift similarity index 98% rename from Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift rename to Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift index c0b79e506..de5b6d2d3 100644 --- a/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift b/Signal/src/ViewControllers/Photos/PhotoLibrary.swift similarity index 100% rename from Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift rename to Signal/src/ViewControllers/Photos/PhotoLibrary.swift diff --git a/SignalMessaging/Views/OWSButton.swift b/SignalMessaging/Views/OWSButton.swift index 7985be1dd..e9fc08787 100644 --- a/SignalMessaging/Views/OWSButton.swift +++ b/SignalMessaging/Views/OWSButton.swift @@ -13,7 +13,7 @@ public class OWSButton: UIButton { // MARK: - @objc - init(block: @escaping () -> Void = { }) { + public init(block: @escaping () -> Void = { }) { super.init(frame: .zero) self.block = block @@ -21,7 +21,7 @@ public class OWSButton: UIButton { } @objc - init(title: String, block: @escaping () -> Void = { }) { + public init(title: String, block: @escaping () -> Void = { }) { super.init(frame: .zero) self.block = block @@ -30,8 +30,8 @@ public class OWSButton: UIButton { } @objc - init(imageName: String, - tintColor: UIColor, + public init(imageName: String, + tintColor: UIColor?, block: @escaping () -> Void = { }) { super.init(frame: .zero) diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h index 88da5beb9..2e4dc57b1 100644 --- a/SignalMessaging/categories/UIFont+OWS.h +++ b/SignalMessaging/categories/UIFont+OWS.h @@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN + (UIFont *)ows_boldFontWithSize:(CGFloat)size; ++ (UIFont *)ows_monospacedDigitFontWithSize:(CGFloat)size; + #pragma mark - Icon Fonts + (UIFont *)ows_fontAwesomeFont:(CGFloat)size; diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 28e26021d..8f3675773 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -34,6 +34,11 @@ NS_ASSUME_NONNULL_BEGIN return [UIFont boldSystemFontOfSize:size]; } ++ (UIFont *)ows_monospacedDigitFontWithSize:(CGFloat)size; +{ + return [self monospacedDigitSystemFontOfSize:size weight:UIFontWeightRegular]; +} + #pragma mark - Icon Fonts + (UIFont *)ows_fontAwesomeFont:(CGFloat)size diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 539085932..afe797338 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -19,4 +19,9 @@ public class FeatureFlags: NSObject { public static var sendingMediaWithOversizeText: Bool { return false } + + @objc + public static var useCustomPhotoCapture: Bool { + return true + } } From 3b008ad9634d569b6a6e1e036d2103d82c57e867 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 15:40:40 -0400 Subject: [PATCH 295/493] Fix conversation view content offset and scroll down button layout. --- .../ConversationViewController.m | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 4ef70c224..28b6ed57d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1272,6 +1272,7 @@ typedef enum : NSUInteger { self.actionOnOpen = ConversationViewActionNone; [self updateInputToolbarLayout]; + [self ensureScrollDownButton]; } // `viewWillDisappear` is called whenever the view *starts* to disappear, @@ -2500,7 +2501,7 @@ typedef enum : NSUInteger { // The "scroll down" button layout tracks the content inset of the collection view, // so pin to the edge of the collection view. self.scrollDownButtonButtomConstraint = - [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.collectionView]; + [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view]; [self.scrollDownButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; #ifdef DEBUG @@ -2520,7 +2521,9 @@ typedef enum : NSUInteger { - (void)updateScrollDownButtonLayout { - self.scrollDownButtonButtomConstraint.constant = -1 * self.collectionView.contentInset.bottom; + CGFloat inset = -(self.collectionView.contentInset.bottom + self.bottomLayoutGuide.length); + self.scrollDownButtonButtomConstraint.constant = inset; + [self.view setNeedsLayout]; } - (void)setHasUnreadMessages:(BOOL)hasUnreadMessages @@ -2593,20 +2596,11 @@ typedef enum : NSUInteger { } } - if (shouldShowScrollDownButton) { - self.scrollDownButton.hidden = NO; - - } else { - self.scrollDownButton.hidden = YES; - } + self.scrollDownButton.hidden = !shouldShowScrollDownButton; #ifdef DEBUG BOOL shouldShowScrollUpButton = self.collectionView.contentOffset.y > 0; - if (shouldShowScrollUpButton) { - self.scrollUpButton.hidden = NO; - } else { - self.scrollUpButton.hidden = YES; - } + self.scrollUpButton.hidden = !shouldShowScrollUpButton; #endif } @@ -3794,9 +3788,7 @@ typedef enum : NSUInteger { // // Always reserve room for the input accessory, which we display even // if the keyboard is not active. - newInsets.bottom = MAX(0, - MAX(self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y, - self.inputToolbar.height)); + newInsets.bottom = MAX(0, self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y); BOOL wasScrolledToBottom = [self isScrolledToBottom]; From 441c784146e6f716f468702cf25a4b06190836c5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 12:16:38 -0400 Subject: [PATCH 296/493] Add preview view to the color palette control. --- SignalMessaging/Views/GalleryRailView.swift | 10 -- .../ImageEditor/ImageEditorPaletteView.swift | 136 +++++++++++++++++- SignalMessaging/categories/UIView+OWS.swift | 23 +++ 3 files changed, 157 insertions(+), 12 deletions(-) diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index 6f797ea6b..4227c108c 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -264,13 +264,3 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate { } } } - -public extension CGSize { - var aspectRatio: CGFloat { - guard self.height > 0 else { - return 0 - } - - return self.width / self.height - } -} diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 7101b333d..fc0f11032 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -62,6 +62,118 @@ public class ImageEditorColor: NSObject { // MARK: - +private class PalettePreviewView: OWSLayerView { + + private static let innerRadius: CGFloat = 32 + private static let shadowMargin: CGFloat = 0 + // The distance from the "inner circle" to the "teardrop". + private static let circleMargin: CGFloat = 3 + private static let teardropTipRadius: CGFloat = 4 + private static let teardropPointiness: CGFloat = 12 + + private let teardropColor = UIColor.white + public var selectedColor = UIColor.white { + didSet { + circleLayer.fillColor = selectedColor.cgColor + } + } + + private let circleLayer: CAShapeLayer + private let teardropLayer: CAShapeLayer + + override init() { + let circleLayer = CAShapeLayer() + let teardropLayer = CAShapeLayer() + self.circleLayer = circleLayer + self.teardropLayer = teardropLayer + + super.init() + + circleLayer.strokeColor = nil + teardropLayer.strokeColor = nil + // Layer order matters. + layer.addSublayer(teardropLayer) + layer.addSublayer(circleLayer) + + teardropLayer.fillColor = teardropColor.cgColor + teardropLayer.shadowColor = UIColor.black.cgColor + teardropLayer.shadowRadius = 2.0 + teardropLayer.shadowOpacity = 0.33 + teardropLayer.shadowOffset = .zero + + layoutCallback = { (view) in + PalettePreviewView.updateLayers(view: view, + circleLayer: circleLayer, + teardropLayer: teardropLayer) + } + + // The bounding rect of the teardrop + shadow is non-trivial, so + // we use a generous size that reserves plenty of space. + // + // The size doesn't matter since this view is + // mostly transparent and isn't hot. + autoSetDimensions(to: CGSize(width: PalettePreviewView.innerRadius * 4, + height: PalettePreviewView.innerRadius * 4)) + } + + @available(*, unavailable, message: "use other init() instead.") + required public init?(coder aDecoder: NSCoder) { + notImplemented() + } + + static func updateLayers(view: UIView, + circleLayer: CAShapeLayer, + teardropLayer: CAShapeLayer) { + let bounds = view.bounds + let outerRadius = innerRadius + circleMargin + let rightEdge = CGPoint(x: bounds.width, + y: bounds.height * 0.5) + let teardropTipCenter = rightEdge.minus(CGPoint(x: teardropTipRadius + shadowMargin, y: 0)) + let circleCenter = teardropTipCenter.minus(CGPoint(x: teardropPointiness + innerRadius, y: 0)) + + // The "teardrop" shape is bounded by 2 circles, joined by their tangents. + // + // UIBezierPath can be used to draw this using 2 arcs, if we + // have the angle of the tangents. + // + // Finding the tangent between two circles of known distance + radius + // is pretty straightforward. We solve for the right triangle that + // defines the tangents and atan() that triangle to get the angle. + // + // 1. Find the length of the hypotenuse. + let circleCenterDistance = teardropTipCenter.minus(circleCenter).length + // 2. Fine the length of the first side. + let radiusDiff = outerRadius - teardropTipRadius + // 2. Fine the length of the second side. + let tangentLength = (circleCenterDistance.square - radiusDiff.square).squareRoot() + let angle = atan2(tangentLength, radiusDiff) + + let teardropPath = UIBezierPath() + teardropPath.addArc(withCenter: circleCenter, + radius: outerRadius, + startAngle: +angle, + endAngle: -angle, + clockwise: true) + teardropPath.addArc(withCenter: teardropTipCenter, + radius: teardropTipRadius, + startAngle: -angle, + endAngle: +angle, + clockwise: true) + + teardropLayer.path = teardropPath.cgPath + teardropLayer.frame = bounds + + let innerCircleSize = CGSize(width: innerRadius * 2, + height: innerRadius * 2) + let circleFrame = CGRect(origin: circleCenter.minus(innerCircleSize.asPoint.times(0.5)), + size: innerCircleSize) + circleLayer.path = UIBezierPath(ovalIn: circleFrame).cgPath + circleLayer.frame = bounds + } +} + +// MARK: - + public class ImageEditorPaletteView: UIView { public weak var delegate: ImageEditorPaletteViewDelegate? @@ -89,6 +201,8 @@ public class ImageEditorPaletteView: UIView { private let imageWrapper = OWSLayerView() private let shadowView = UIView() private var selectionConstraint: NSLayoutConstraint? + private let previewView = PalettePreviewView() + private var previewConstraint: NSLayoutConstraint? private func createContents() { self.backgroundColor = .clear @@ -140,6 +254,14 @@ public class ImageEditorPaletteView: UIView { selectionConstraint.autoInstall() self.selectionConstraint = selectionConstraint + previewView.isHidden = true + addSubview(previewView) + previewView.autoPinEdge(.trailing, to: .leading, of: imageView, withOffset: -24) + let previewConstraint = NSLayoutConstraint(item: previewView, + attribute: .centerY, relatedBy: .equal, toItem: imageWrapper, attribute: .top, multiplier: 1, constant: 0) + previewConstraint.autoInstall() + self.previewConstraint = previewConstraint + isUserInteractionEnabled = true addGestureRecognizer(PaletteGestureRecognizer(target: self, action: #selector(didTouch))) @@ -208,6 +330,7 @@ public class ImageEditorPaletteView: UIView { private func updateState() { selectionView.backgroundColor = selectedValue.color + previewView.selectedColor = selectedValue.color guard let selectionConstraint = selectionConstraint else { owsFailDebug("Missing selectionConstraint.") @@ -215,6 +338,12 @@ public class ImageEditorPaletteView: UIView { } let selectionY = imageWrapper.height() * selectedValue.palettePhase selectionConstraint.constant = selectionY + + guard let previewConstraint = previewConstraint else { + owsFailDebug("Missing previewConstraint.") + return + } + previewConstraint.constant = selectionY } // MARK: Events @@ -222,9 +351,12 @@ public class ImageEditorPaletteView: UIView { @objc func didTouch(gesture: UIGestureRecognizer) { switch gesture.state { - case .began, .changed, .ended: - break + case .began, .changed: + previewView.isHidden = false + case .ended: + previewView.isHidden = true default: + previewView.isHidden = true return } diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 4c2d93ec7..a05025f0c 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -149,6 +149,10 @@ public extension CGFloat { public func fuzzyEquals(_ other: CGFloat, tolerance: CGFloat = 0.001) -> Bool { return abs(self - other) < tolerance } + + public var square: CGFloat { + return self * self + } } public extension Int { @@ -222,6 +226,25 @@ public extension CGPoint { return (x.fuzzyEquals(other.x, tolerance: tolerance) && y.fuzzyEquals(other.y, tolerance: tolerance)) } + + public static func tan(angle: CGFloat) -> CGPoint { + return CGPoint(x: sin(angle), + y: cos(angle)) + } +} + +public extension CGSize { + var aspectRatio: CGFloat { + guard self.height > 0 else { + return 0 + } + + return self.width / self.height + } + + var asPoint: CGPoint { + return CGPoint(x: width, y: height) + } } public extension CGRect { From d26c47ceba7c1a77ec1d25b64c531d9fa7d12af4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 12:33:53 -0700 Subject: [PATCH 297/493] grow button as recording starts --- .../Photos/PhotoCaptureViewController.swift | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 104df7d12..7d480b333 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -324,9 +324,7 @@ class PhotoCaptureViewController: OWSViewController { view.addSubview(captureButton) captureButton.autoHCenterInSuperview() - let captureButtonDiameter: CGFloat = 80 - captureButton.autoSetDimensions(to: CGSize(width: captureButtonDiameter, height: captureButtonDiameter)) - // on iPhoneX 12.1 + captureButton.autoPinEdge(toSuperviewMargin: .bottom, withInset: 10) } @@ -425,9 +423,15 @@ class CaptureButton: UIView { weak var delegate: CaptureButtonDelegate? + let defaultDiameter: CGFloat = ScaleFromIPhone5To7Plus(60, 80) + let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(90, 120) + var sizeConstraints: [NSLayoutConstraint]! + override init(frame: CGRect) { super.init(frame: frame) + sizeConstraints = autoSetDimensions(to: CGSize(width: defaultDiameter, height: defaultDiameter)) + tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap)) innerButton.addGestureRecognizer(tapGesture) @@ -477,6 +481,10 @@ class CaptureButton: UIView { initialTouchLocation = gesture.location(in: gesture.view) zoomIndicator.transform = .identity delegate?.didBeginLongPressCaptureButton(self) + UIView.animate(withDuration: 0.3) { + self.sizeConstraints.forEach { $0.constant = self.recordingDiameter } + self.superview?.layoutIfNeeded() + } case .changed: guard let referenceHeight = delegate?.zoomScaleReferenceHeight else { owsFailDebug("referenceHeight was unexpectedly nil") @@ -509,10 +517,19 @@ class CaptureButton: UIView { delegate?.longPressCaptureButton(self, didUpdateZoomAlpha: alpha) case .ended: - zoomIndicator.transform = .identity + UIView.animate(withDuration: 0.3) { + self.zoomIndicator.transform = .identity + self.sizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.superview?.layoutIfNeeded() + } delegate?.didCompleteLongPressCaptureButton(self) case .cancelled, .failed: - zoomIndicator.transform = .identity + + UIView.animate(withDuration: 0.3) { + self.zoomIndicator.transform = .identity + self.sizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.superview?.layoutIfNeeded() + } delegate?.didCancelLongPressCaptureButton(self) } } From 9d5d120e69417652f60eb68da7b04c9083939fb6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 12:41:43 -0700 Subject: [PATCH 298/493] recording button design changes --- .../Photos/PhotoCaptureViewController.swift | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 7d480b333..20271cb02 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -425,13 +425,12 @@ class CaptureButton: UIView { let defaultDiameter: CGFloat = ScaleFromIPhone5To7Plus(60, 80) let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(90, 120) - var sizeConstraints: [NSLayoutConstraint]! + var innerButtonSizeConstraints: [NSLayoutConstraint]! + var zoomIndicatorSizeConstraints: [NSLayoutConstraint]! override init(frame: CGRect) { super.init(frame: frame) - sizeConstraints = autoSetDimensions(to: CGSize(width: defaultDiameter, height: defaultDiameter)) - tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap)) innerButton.addGestureRecognizer(tapGesture) @@ -440,17 +439,20 @@ class CaptureButton: UIView { innerButton.addGestureRecognizer(longPressGesture) addSubview(innerButton) + innerButtonSizeConstraints = autoSetDimensions(to: CGSize(width: defaultDiameter, height: defaultDiameter)) innerButton.backgroundColor = UIColor.ows_white.withAlphaComponent(0.33) innerButton.layer.shadowOffset = .zero innerButton.layer.shadowOpacity = 0.33 innerButton.layer.shadowRadius = 2 innerButton.autoPinEdgesToSuperviewEdges() - zoomIndicator.isUserInteractionEnabled = false addSubview(zoomIndicator) + zoomIndicatorSizeConstraints = zoomIndicator.autoSetDimensions(to: CGSize(width: defaultDiameter, height: defaultDiameter)) + zoomIndicator.isUserInteractionEnabled = false zoomIndicator.layer.borderColor = UIColor.ows_white.cgColor zoomIndicator.layer.borderWidth = 1.5 - zoomIndicator.autoPin(toEdgesOf: innerButton) + zoomIndicator.autoAlignAxis(.horizontal, toSameAxisOf: innerButton) + zoomIndicator.autoAlignAxis(.vertical, toSameAxisOf: innerButton) } required init?(coder aDecoder: NSCoder) { @@ -479,10 +481,10 @@ class CaptureButton: UIView { case .possible: break case .began: initialTouchLocation = gesture.location(in: gesture.view) - zoomIndicator.transform = .identity delegate?.didBeginLongPressCaptureButton(self) - UIView.animate(withDuration: 0.3) { - self.sizeConstraints.forEach { $0.constant = self.recordingDiameter } + UIView.animate(withDuration: 0.2) { + self.innerButtonSizeConstraints.forEach { $0.constant = self.recordingDiameter } + self.zoomIndicatorSizeConstraints.forEach { $0.constant = self.recordingDiameter } self.superview?.layoutIfNeeded() } case .changed: @@ -511,23 +513,25 @@ class CaptureButton: UIView { Logger.verbose("distance: \(distance), alpha: \(alpha)") - let transformScale = CGFloatLerp(1, 0.1, alpha) - zoomIndicator.transform = CGAffineTransform(scaleX: transformScale, y: transformScale) + let zoomIndicatorDiameter = CGFloatLerp(recordingDiameter, 3, alpha) + self.zoomIndicatorSizeConstraints.forEach { $0.constant = zoomIndicatorDiameter } zoomIndicator.superview?.layoutIfNeeded() delegate?.longPressCaptureButton(self, didUpdateZoomAlpha: alpha) case .ended: - UIView.animate(withDuration: 0.3) { - self.zoomIndicator.transform = .identity - self.sizeConstraints.forEach { $0.constant = self.defaultDiameter } + UIView.animate(withDuration: 0.2) { + self.innerButtonSizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.zoomIndicatorSizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.superview?.layoutIfNeeded() } delegate?.didCompleteLongPressCaptureButton(self) case .cancelled, .failed: - UIView.animate(withDuration: 0.3) { - self.zoomIndicator.transform = .identity - self.sizeConstraints.forEach { $0.constant = self.defaultDiameter } + UIView.animate(withDuration: 0.2) { + self.innerButtonSizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.zoomIndicatorSizeConstraints.forEach { $0.constant = self.defaultDiameter } + self.superview?.layoutIfNeeded() } delegate?.didCancelLongPressCaptureButton(self) From 89dce94986e0d25904636df374a1593609019a35 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 12:50:16 -0700 Subject: [PATCH 299/493] "Bump build to 2.38.0.3." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 073de9f9e..bde7a2037 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.2 + 2.38.0.3 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index bcc9a58bf..5bb7ff908 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.2 + 2.38.0.3 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 3795fd138188a9d917666f8aa0fa36e78ae44b6e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Mar 2019 16:49:10 -0500 Subject: [PATCH 300/493] Enable image editor in production. --- .../AttachmentApproval/AttachmentPrepViewController.swift | 2 -- SignalMessaging/Views/ImageEditor/ImageEditorModel.swift | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index db2c391cb..887565cd4 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -112,7 +112,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD containerView.addSubview(mediaMessageView) mediaMessageView.autoPinEdgesToSuperviewEdges() - #if DEBUG if let imageEditorModel = attachmentItem.imageEditorModel { let imageEditorView = ImageEditorView(model: imageEditorModel, delegate: self) @@ -127,7 +126,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD imageEditorUpdateNavigationBar() } } - #endif // Hide the play button embedded in the MediaView and replace it with our own. // This allows us to zoom in on the media view without zooming in on the button diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift index 38cea34de..b52629052 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorModel.swift @@ -43,7 +43,7 @@ public class ImageEditorModel: NSObject { @objc public static var isFeatureEnabled: Bool { - return _isDebugAssertConfiguration() + return true } @objc From 6c6e516a3ac95718f23f620f1ab36c3e6c5f8782 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 16:42:33 -0400 Subject: [PATCH 301/493] "Bump build to 2.38.0.4." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index bde7a2037..0e7535531 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.3 + 2.38.0.4 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 5bb7ff908..d9aed993d 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.3 + 2.38.0.4 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From c37f425d5f2e31ba6acef46ff4c4e7628e480a92 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 16:27:08 -0400 Subject: [PATCH 302/493] Reduce logging. --- .../ConversationView/ConversationViewLayout.m | 3 --- .../DisappearingTimerConfigurationView.swift | 20 +------------------ .../src/Messages/UD/OWSUDManager.swift | 2 +- .../src/Network/API/TSNetworkManager.m | 2 -- SignalServiceKit/src/Util/DataSource.m | 3 +-- 5 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m index ddfb470e8..96e51af42 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m @@ -92,9 +92,6 @@ NS_ASSUME_NONNULL_BEGIN } self.hasLayout = YES; - // TODO: Remove this log statement after we've reduced the invalidation churn. - OWSLogVerbose(@"prepareLayout"); - [self prepareLayoutOfItems]; } diff --git a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift index c74310fd8..ec5f9d86d 100644 --- a/SignalMessaging/Views/DisappearingTimerConfigurationView.swift +++ b/SignalMessaging/Views/DisappearingTimerConfigurationView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -26,24 +26,6 @@ public class DisappearingTimerConfigurationView: UIView { } } - override public var frame: CGRect { - didSet { - Logger.verbose("\(oldValue) -> \(frame)") - } - } - - override public var bounds: CGRect { - didSet { - Logger.verbose("\(oldValue) -> \(bounds)") - } - } - - override public func layoutSubviews() { - let oldFrame = self.frame - super.layoutSubviews() - Logger.verbose("Frame: \(oldFrame) -> \(self.frame)") - } - private let imageView: UIImageView private let label: UILabel private var pressGesture: UILongPressGestureRecognizer! diff --git a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift index f0c4005de..3c1de038f 100644 --- a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift +++ b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift @@ -180,7 +180,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { @objc public func isUDVerboseLoggingEnabled() -> Bool { - return true + return false } // MARK: - Dependencies diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index bb0d4af62..eb69e8be0 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -182,10 +182,8 @@ dispatch_queue_t NetworkManagerQueue() OWSSessionManager *_Nullable sessionManager = [self.pool lastObject]; if (sessionManager) { - OWSLogVerbose(@"Cache hit."); [self.pool removeLastObject]; } else { - OWSLogVerbose(@"Cache miss."); sessionManager = [OWSSessionManager new]; } OWSAssertDebug(sessionManager); diff --git a/SignalServiceKit/src/Util/DataSource.m b/SignalServiceKit/src/Util/DataSource.m index 4c46e84ed..468a21b20 100755 --- a/SignalServiceKit/src/Util/DataSource.m +++ b/SignalServiceKit/src/Util/DataSource.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "DataSource.h" @@ -323,7 +323,6 @@ NS_ASSUME_NONNULL_BEGIN @synchronized(self) { if (!self.cachedData) { - OWSLogError(@"---- reading data"); self.cachedData = [NSData dataWithContentsOfFile:self.filePath]; } if (!self.cachedData) { From d76fac1096f95813d7e635b7aea97965eecf377c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 09:55:21 -0400 Subject: [PATCH 303/493] Add accessibility identifiers in the onboarding views. --- .../Registration/Onboarding2FAViewController.swift | 6 ++++++ .../Registration/OnboardingCaptchaViewController.swift | 2 ++ .../OnboardingPermissionsViewController.swift | 4 ++++ .../OnboardingPhoneNumberViewController.swift | 8 ++++++++ .../Registration/OnboardingProfileViewController.swift | 5 +++++ .../Registration/OnboardingSplashViewController.swift | 4 ++++ .../OnboardingVerificationViewController.swift | 4 ++++ 7 files changed, 33 insertions(+) diff --git a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift index 3f6bd3672..1739c74db 100644 --- a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift +++ b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift @@ -32,6 +32,8 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { comment: "The first explanation in the 'onboarding 2FA' view.")) explanationLabel1.font = UIFont.ows_dynamicTypeCaption1 explanationLabel2.font = UIFont.ows_dynamicTypeCaption1 + explanationLabel1.accessibilityLabel = "onboarding.2fa." + "explanationLabel1" + explanationLabel2.accessibilityLabel = "onboarding.2fa." + "explanationLabel2" pinTextField.textAlignment = .center pinTextField.delegate = self @@ -41,6 +43,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { pinTextField.setContentHuggingHorizontalLow() pinTextField.setCompressionResistanceHorizontalLow() pinTextField.autoSetDimension(.height, toSize: 40) + pinTextField.accessibilityLabel = "onboarding.2fa." + "pinTextField" pinStrokeNormal = pinTextField.addBottomStroke() pinStrokeError = pinTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) @@ -50,6 +53,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { validationWarningLabel.textColor = .ows_destructiveRed validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped validationWarningLabel.textAlignment = .center + validationWarningLabel.accessibilityLabel = "onboarding.2fa." + "validationWarningLabel" let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) @@ -59,10 +63,12 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { let forgotPinLink = self.linkButton(title: NSLocalizedString("ONBOARDING_2FA_FORGOT_PIN_LINK", comment: "Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view."), selector: #selector(forgotPinLinkTapped)) + forgotPinLink.accessibilityLabel = "onboarding.2fa." + "forgotPinLink" let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) + nextButton.accessibilityLabel = "onboarding.2fa." + "nextButton" let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 24615ab78..4e755c07d 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -17,6 +17,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_CAPTCHA_TITLE", comment: "Title of the 'onboarding Captcha' view.")) + titleLabel.accessibilityLabel = "onboarding.captcha." + "titleLabel" let titleRow = UIStackView(arrangedSubviews: [ titleLabel @@ -43,6 +44,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { webView.allowsLinkPreview = false webView.scrollView.contentInset = .zero webView.layoutMargins = .zero + webView.accessibilityLabel = "onboarding.captcha." + "webView" let stackView = UIStackView(arrangedSubviews: [ titleRow, diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 1500343a1..01e468e14 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -20,17 +20,21 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { action: #selector(skipWasPressed)) let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.")) + titleLabel.accessibilityLabel = "onboarding.permissions." + "titleLabel" let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.")) + explanationLabel.accessibilityLabel = "onboarding.permissions." + "explanationLabel" let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", comment: "Label for the 'give access' button in the 'onboarding permissions' view."), selector: #selector(giveAccessPressed)) + giveAccessButton.accessibilityLabel = "onboarding.permissions." + "giveAccessButton" let notNowButton = self.linkButton(title: NSLocalizedString("ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON", comment: "Label for the 'not now' button in the 'onboarding permissions' view."), selector: #selector(notNowPressed)) + notNowButton.accessibilityLabel = "onboarding.permissions." + "notNowButton" let stackView = UIStackView(arrangedSubviews: [ titleLabel, diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index bd521d2db..a6bca69ef 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -34,6 +34,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) + titleLabel.accessibilityLabel = "onboarding.phoneNumber." + "titleLabel" // Country @@ -43,6 +44,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryNameLabel.font = UIFont.ows_dynamicTypeBodyClamped countryNameLabel.setContentHuggingHorizontalLow() countryNameLabel.setCompressionResistanceHorizontalLow() + countryNameLabel.accessibilityLabel = "onboarding.phoneNumber." + "countryNameLabel" let countryIcon = UIImage(named: (CurrentAppContext().isRTL ? "small_chevron_left" @@ -51,6 +53,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryImageView.tintColor = Theme.placeholderColor countryImageView.setContentHuggingHigh() countryImageView.setCompressionResistanceHigh() + countryImageView.accessibilityLabel = "onboarding.phoneNumber." + "countryImageView" let countryRow = UIStackView(arrangedSubviews: [ countryNameLabel, @@ -63,6 +66,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) countryRow.autoSetDimension(.height, toSize: rowHeight) _ = countryRow.addBottomStroke() + countryRow.accessibilityLabel = "onboarding.phoneNumber." + "countryRow" callingCodeLabel.textColor = Theme.primaryColor callingCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped @@ -72,6 +76,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) _ = callingCodeLabel.addBottomStroke() callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) + callingCodeLabel.accessibilityLabel = "onboarding.phoneNumber." + "callingCodeLabel" phoneNumberTextField.textAlignment = .left phoneNumberTextField.delegate = self @@ -80,6 +85,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.font = UIFont.ows_dynamicTypeBodyClamped phoneNumberTextField.setContentHuggingHorizontalLow() phoneNumberTextField.setCompressionResistanceHorizontalLow() + phoneNumberTextField.accessibilityLabel = "onboarding.phoneNumber." + "phoneNumberTextField" phoneStrokeNormal = phoneNumberTextField.addBottomStroke() phoneStrokeError = phoneNumberTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) @@ -99,6 +105,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { validationWarningLabel.textColor = .ows_destructiveRed validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped validationWarningLabel.autoSetDimension(.height, toSize: validationWarningLabel.font.lineHeight) + validationWarningLabel.accessibilityLabel = "onboarding.phoneNumber." + "validationWarningLabel" let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) @@ -108,6 +115,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) + nextButton.accessibilityLabel = "onboarding.phoneNumber." + "nextButton" self.nextButton = nextButton let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift index b88e8a4fb..04792c5df 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -31,13 +31,16 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PROFILE_TITLE", comment: "Title of the 'onboarding profile' view.")) + titleLabel.accessibilityLabel = "onboarding.profile." + "titleLabel" let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PROFILE_EXPLANATION", comment: "Explanation in the 'onboarding profile' view.")) + explanationLabel.accessibilityLabel = "onboarding.profile." + "explanationLabel" let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) + nextButton.accessibilityLabel = "onboarding.profile." + "nextButton" avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarSize), height: CGFloat(avatarSize))) @@ -64,6 +67,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { avatarWrapper.addSubview(cameraCircle) cameraCircle.autoPinEdge(toSuperviewEdge: .trailing) cameraCircle.autoPinEdge(toSuperviewEdge: .bottom) + avatarWrapper.accessibilityLabel = "onboarding.profile." + "avatarWrapper" nameTextfield.textAlignment = .left nameTextfield.delegate = self @@ -74,6 +78,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { comment: "Placeholder text for the profile name in the 'onboarding profile' view.") nameTextfield.setContentHuggingHorizontalLow() nameTextfield.setCompressionResistanceHorizontalLow() + nameTextfield.accessibilityLabel = "onboarding.profile." + "nameTextfield" let nameWrapper = UIView.container() nameWrapper.setCompressionResistanceHorizontalLow() diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index c0c23b4a4..5ad303df8 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -21,10 +21,12 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { heroImageView.layer.magnificationFilter = kCAFilterTrilinear heroImageView.setCompressionResistanceLow() heroImageView.setContentHuggingVerticalLow() + heroImageView.accessibilityLabel = "onboarding.splash." + "heroImageView" let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_SPLASH_TITLE", comment: "Title of the 'onboarding splash' view.")) view.addSubview(titleLabel) titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) + titleLabel.accessibilityLabel = "onboarding.splash." + "titleLabel" let explanationLabel = UILabel() explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", @@ -36,11 +38,13 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { explanationLabel.lineBreakMode = .byWordWrapping explanationLabel.isUserInteractionEnabled = true explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explanationLabelTapped))) + explanationLabel.accessibilityLabel = "onboarding.splash." + "explanationLabel" let continueButton = self.button(title: NSLocalizedString("BUTTON_CONTINUE", comment: "Label for 'continue' button."), selector: #selector(continuePressed)) view.addSubview(continueButton) + continueButton.accessibilityLabel = "onboarding.splash." + "continueButton" let stackView = UIStackView(arrangedSubviews: [ heroImageView, diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 4388cfea4..9251ab9d3 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -277,11 +277,13 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController let titleLabel = self.titleLabel(text: "") self.titleLabel = titleLabel + titleLabel.accessibilityLabel = "onboarding.verification." + "titleLabel" let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", comment: "Label for the link that lets users change their phone number in the onboarding views."), selector: #selector(backLinkTapped)) self.backLink = backLink + backLink.accessibilityLabel = "onboarding.verification." + "backLink" onboardingCodeView.delegate = self @@ -291,6 +293,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController errorLabel.font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() errorLabel.textAlignment = .center errorLabel.autoSetDimension(.height, toSize: errorLabel.font.lineHeight) + errorLabel.accessibilityLabel = "onboarding.verification." + "errorLabel" // Wrap the error label in a row so that we can show/hide it without affecting view layout. let errorRow = UIView() @@ -301,6 +304,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController selector: #selector(resendCodeLinkTapped)) codeStateLink.enableMultilineLabel() self.codeStateLink = codeStateLink + codeStateLink.accessibilityLabel = "onboarding.verification." + "codeStateLink" let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() From 189bbb9f1699d93b9e2d42296d8da9a3ad9c18df Mon Sep 17 00:00:00 2001 From: Nancy Mast Date: Thu, 7 Feb 2019 15:18:29 -0800 Subject: [PATCH 304/493] added accessibility ids to HomeViewController and ProfileViewController --- Signal/src/ViewControllers/HomeView/HomeViewController.m | 8 +++++++- Signal/src/ViewControllers/ProfileViewController.m | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 4ebfde9c9..b6c631676 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -340,7 +340,6 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.view addSubview:self.emptyInboxView]; [self.emptyInboxView autoPinWidthToSuperviewMargins]; [self.emptyInboxView autoVCenterInSuperview]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _emptyInboxView); [self createFirstConversationCueView]; [self.view addSubview:self.firstConversationCueView]; @@ -361,6 +360,13 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { action:@selector(pullToRefreshPerformed:) forControlEvents:UIControlEventValueChanged]; [self.tableView insertSubview:pullToRefreshView atIndex:0]; + + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _tableView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _emptyInboxView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationCueView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationLabel); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _searchBar); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _reminderStackView); } - (UIView *)createEmptyInboxView diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 96417a830..f71e9f38f 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -15,13 +15,18 @@ #import #import #import +#import #import #import #import -#import NS_ASSUME_NONNULL_BEGIN +#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) +#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ + _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) + typedef NS_ENUM(NSInteger, ProfileViewMode) { ProfileViewMode_AppSettings = 0, ProfileViewMode_Registration, From 99cd3f9b26a6abb130973304797b61b964a16b10 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Feb 2019 16:20:17 -0500 Subject: [PATCH 305/493] Use accessibility identifier macros in UIUtil.h. --- Signal/src/ViewControllers/ProfileViewController.m | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index f71e9f38f..e765d0483 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -22,11 +22,6 @@ NS_ASSUME_NONNULL_BEGIN -#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) -#define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ - _variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) - typedef NS_ENUM(NSInteger, ProfileViewMode) { ProfileViewMode_AppSettings = 0, ProfileViewMode_Registration, From 79d6384bc9e83eed47dad9117a6d9f2b4dc0ebdc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 10:26:38 -0400 Subject: [PATCH 306/493] Add accessibility identifiers to privacy settings view. --- .../PrivacySettingsTableViewController.m | 186 +++++++++++------- .../ViewControllers/OWSTableViewController.h | 16 ++ .../ViewControllers/OWSTableViewController.m | 44 +++++ 3 files changed, 179 insertions(+), 67 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 86b66f022..7c9a286d9 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -88,6 +88,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [blocklistSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_BLOCK_LIST_TITLE", @"Label for the block list section of the settings view") + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"blocklist"] actionBlock:^{ [weakSelf showBlocklist]; }]]; @@ -101,11 +102,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [readReceiptsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_READ_RECEIPT", @"Label for the 'read receipts' setting.") - isOnBlock:^{ - return [OWSReadReceiptManager.sharedManager areReadReceiptsEnabled]; - } - target:weakSelf - selector:@selector(didToggleReadReceiptsSwitch:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"read_receipts"] + isOnBlock:^{ + return [OWSReadReceiptManager.sharedManager areReadReceiptsEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleReadReceiptsSwitch:)]]; [contents addSection:readReceiptsSection]; OWSTableSection *typingIndicatorsSection = [OWSTableSection new]; @@ -116,11 +121,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [typingIndicatorsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_TYPING_INDICATORS", @"Label for the 'typing indicators' setting.") - isOnBlock:^{ - return [SSKEnvironment.shared.typingIndicators areTypingIndicatorsEnabled]; - } - target:weakSelf - selector:@selector(didToggleTypingIndicatorsSwitch:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"typing_indicators"] + isOnBlock:^{ + return [SSKEnvironment.shared.typingIndicators areTypingIndicatorsEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleTypingIndicatorsSwitch:)]]; [contents addSection:typingIndicatorsSection]; OWSTableSection *screenLockSection = [OWSTableSection new]; @@ -132,11 +141,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_LOCK_SWITCH_LABEL", @"Label for the 'enable screen lock' switch of the privacy settings.") - isOnBlock:^{ - return [OWSScreenLock.sharedManager isScreenLockEnabled]; - } - target:self - selector:@selector(isScreenLockEnabledDidChange:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"screenlock"] + isOnBlock:^{ + return [OWSScreenLock.sharedManager isScreenLockEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:self + selector:@selector(isScreenLockEnabledDidChange:)]]; [contents addSection:screenLockSection]; if (OWSScreenLock.sharedManager.isScreenLockEnabled) { @@ -145,13 +158,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s NSString *screenLockTimeoutString = [self formatScreenLockTimeout:screenLockTimeout useShortFormat:YES]; [screenLockTimeoutSection addItem:[OWSTableItem - disclosureItemWithText: - NSLocalizedString(@"SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT", - @"Label for the 'screen lock activity timeout' setting of the privacy settings.") - detailText:screenLockTimeoutString - actionBlock:^{ - [weakSelf showScreenLockTimeoutUI]; - }]]; + disclosureItemWithText: + NSLocalizedString(@"SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT", + @"Label for the 'screen lock activity timeout' setting of the privacy settings.") + detailText:screenLockTimeoutString + accessibilityIdentifier:[NSString + stringWithFormat:@"settings.privacy.%@", @"screen_lock_timeout"] + actionBlock:^{ + [weakSelf showScreenLockTimeoutUI]; + }]]; [contents addSection:screenLockTimeoutSection]; } @@ -160,11 +175,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s screenSecuritySection.footerTitle = NSLocalizedString(@"SETTINGS_SCREEN_SECURITY_DETAIL", nil); [screenSecuritySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_SECURITY", @"") - isOnBlock:^{ - return [Environment.shared.preferences screenSecurityIsEnabled]; - } - target:weakSelf - selector:@selector(didToggleScreenSecuritySwitch:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"screen_security"] + isOnBlock:^{ + return [Environment.shared.preferences screenSecurityIsEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleScreenSecuritySwitch:)]]; [contents addSection:screenSecuritySection]; // Allow calls to connect directly vs. using TURN exclusively @@ -176,11 +195,16 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [callingSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString( @"SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE", @"Table cell label") - isOnBlock:^{ - return [Environment.shared.preferences doCallsHideIPAddress]; - } - target:weakSelf - selector:@selector(didToggleCallsHideIPAddressSwitch:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", + @"calling_hide_ip_address"] + isOnBlock:^{ + return [Environment.shared.preferences doCallsHideIPAddress]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleCallsHideIPAddressSwitch:)]]; [contents addSection:callingSection]; if (@available(iOS 11, *)) { @@ -189,11 +213,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s addItem:[OWSTableItem switchItemWithText:NSLocalizedString( @"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE", @"Short table cell label") - isOnBlock:^{ - return [Environment.shared.preferences isSystemCallLogEnabled]; - } - target:weakSelf - selector:@selector(didToggleEnableSystemCallLogSwitch:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"callkit_history"] + isOnBlock:^{ + return [Environment.shared.preferences isSystemCallLogEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleEnableSystemCallLogSwitch:)]]; callKitSection.footerTitle = NSLocalizedString( @"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION", @"Settings table section footer."); [contents addSection:callKitSection]; @@ -201,23 +229,32 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s OWSTableSection *callKitSection = [OWSTableSection new]; callKitSection.footerTitle = NSLocalizedString(@"SETTINGS_SECTION_CALL_KIT_DESCRIPTION", @"Settings table section footer."); - [callKitSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_CALLKIT_TITLE", - @"Short table cell label") - isOnBlock:^{ - return [Environment.shared.preferences isCallKitEnabled]; - } - target:weakSelf - selector:@selector(didToggleEnableCallKitSwitch:)]]; + [callKitSection + addItem:[OWSTableItem switchItemWithText:NSLocalizedString( + @"SETTINGS_PRIVACY_CALLKIT_TITLE", @"Short table cell label") + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"callkit"] + isOnBlock:^{ + return [Environment.shared.preferences isCallKitEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleEnableCallKitSwitch:)]]; if (self.preferences.isCallKitEnabled) { [callKitSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE", @"Label for 'CallKit privacy' preference") - isOnBlock:^{ - return (BOOL) ! - [Environment.shared.preferences isCallKitPrivacyEnabled]; - } - target:weakSelf - selector:@selector(didToggleEnableCallKitPrivacySwitch:)]]; + accessibilityIdentifier:[NSString + stringWithFormat:@"settings.privacy.%@", @"callkit_privacy"] + isOnBlock:^{ + return (BOOL) ![Environment.shared.preferences isCallKitPrivacyEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleEnableCallKitPrivacySwitch:)]]; } [contents addSection:callKitSection]; } @@ -236,17 +273,20 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s @"Indicates that 'two factor auth' is enabled in the privacy settings.") : NSLocalizedString(@"SETTINGS_TWO_FACTOR_AUTH_DISABLED", @"Indicates that 'two factor auth' is disabled in the privacy settings.")) - actionBlock:^{ - [weakSelf show2FASettings]; - }]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"2fa"] + actionBlock:^{ + [weakSelf show2FASettings]; + }]]; [contents addSection:twoFactorAuthSection]; OWSTableSection *historyLogsSection = [OWSTableSection new]; historyLogsSection.headerTitle = NSLocalizedString(@"SETTINGS_HISTORYLOG_TITLE", @"Section header"); - [historyLogsSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_CLEAR_HISTORY", @"") - actionBlock:^{ - [weakSelf clearHistoryLogs]; - }]]; + [historyLogsSection + addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_CLEAR_HISTORY", @"") + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"clear_logs"] + actionBlock:^{ + [weakSelf clearHistoryLogs]; + }]]; [contents addSection:historyLogsSection]; OWSTableSection *unidentifiedDeliveryIndicatorsSection = [OWSTableSection new]; @@ -285,6 +325,8 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s action:@selector(didToggleUDShowIndicatorsSwitch:) forControlEvents:UIControlEventValueChanged]; [cellSwitch setContentHuggingHorizontalHigh]; + cellSwitch.accessibilityIdentifier = + [NSString stringWithFormat:@"settings.privacy.%@", @"sealed_sender"]; UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ label, iconView, spacer, cellSwitch ]]; @@ -310,11 +352,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s OWSTableSection *unidentifiedDeliveryUnrestrictedSection = [OWSTableSection new]; OWSTableItem *unrestrictedAccessItem = [OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS", @"switch label") - isOnBlock:^{ - return [SSKEnvironment.shared.udManager shouldAllowUnrestrictedAccessLocal]; - } - target:weakSelf - selector:@selector(didToggleUDUnrestrictedAccessSwitch:)]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"sealed_sender_unrestricted"] + isOnBlock:^{ + return [SSKEnvironment.shared.udManager shouldAllowUnrestrictedAccessLocal]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleUDUnrestrictedAccessSwitch:)]; [unidentifiedDeliveryUnrestrictedSection addItem:unrestrictedAccessItem]; unidentifiedDeliveryUnrestrictedSection.footerTitle = NSLocalizedString(@"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER", @"table section footer"); @@ -324,6 +370,8 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [unidentifiedDeliveryLearnMoreSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_UNIDENTIFIED_DELIVERY_LEARN_MORE", @"Label for a link to more info about unidentified delivery.") + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", + @"sealed_sender_learn_more"] actionBlock:^{ NSURL *url = [NSURL URLWithString:kSealedSenderInfoURL]; OWSAssertDebug(url); @@ -335,11 +383,15 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [linkPreviewsSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_LINK_PREVIEWS", @"Setting for enabling & disabling link previews.") - isOnBlock:^{ - return [SSKPreferences areLinkPreviewsEnabled]; - } - target:weakSelf - selector:@selector(didToggleLinkPreviewsEnabled:)]]; + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.%@", @"link_previews"] + isOnBlock:^{ + return [SSKPreferences areLinkPreviewsEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleLinkPreviewsEnabled:)]]; linkPreviewsSection.headerTitle = NSLocalizedString( @"SETTINGS_LINK_PREVIEWS_HEADER", @"Header for setting for enabling & disabling link previews."); linkPreviewsSection.footerTitle = NSLocalizedString( diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.h b/SignalMessaging/ViewControllers/OWSTableViewController.h index bc24cc005..c525a2684 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.h +++ b/SignalMessaging/ViewControllers/OWSTableViewController.h @@ -72,10 +72,19 @@ typedef BOOL (^OWSTableSwitchBlock)(void); + (OWSTableItem *)disclosureItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock; ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; + + (OWSTableItem *)disclosureItemWithText:(NSString *)text detailText:(NSString *)detailText actionBlock:(nullable OWSTableActionBlock)actionBlock; ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + detailText:(NSString *)detailText + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; + + (OWSTableItem *)disclosureItemWithText:(NSString *)text customRowHeight:(CGFloat)customRowHeight actionBlock:(nullable OWSTableActionBlock)actionBlock; @@ -115,6 +124,13 @@ typedef BOOL (^OWSTableSwitchBlock)(void); target:(id)target selector:(SEL)selector; ++ (OWSTableItem *)switchItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + isOnBlock:(OWSTableSwitchBlock)isOnBlock + isEnabledBlock:(OWSTableSwitchBlock)isEnabledBlock + target:(id)target + selector:(SEL)selector; + - (nullable UITableViewCell *)customCell; - (NSNumber *)customRowHeight; diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m index e6caf9962..f0625f368 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.m +++ b/SignalMessaging/ViewControllers/OWSTableViewController.m @@ -170,6 +170,16 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; return [self itemWithText:text actionBlock:actionBlock accessoryType:UITableViewCellAccessoryDisclosureIndicator]; } ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock +{ + return [self itemWithText:text + accessibilityIdentifier:accessibilityIdentifier + actionBlock:actionBlock + accessoryType:UITableViewCellAccessoryDisclosureIndicator]; +} + + (OWSTableItem *)checkmarkItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock { return [self itemWithText:text actionBlock:actionBlock accessoryType:UITableViewCellAccessoryCheckmark]; @@ -178,6 +188,14 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; + (OWSTableItem *)itemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock accessoryType:(UITableViewCellAccessoryType)accessoryType +{ + return [self itemWithText:text accessibilityIdentifier:nil actionBlock:actionBlock accessoryType:accessoryType]; +} + ++ (OWSTableItem *)itemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock + accessoryType:(UITableViewCellAccessoryType)accessoryType { OWSAssertDebug(text.length > 0); OWSAssertDebug(actionBlock); @@ -188,6 +206,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; UITableViewCell *cell = [OWSTableItem newCell]; cell.textLabel.text = text; cell.accessoryType = accessoryType; + cell.accessibilityIdentifier = accessibilityIdentifier; return cell; }; return item; @@ -207,6 +226,14 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; + (OWSTableItem *)disclosureItemWithText:(NSString *)text detailText:(NSString *)detailText actionBlock:(nullable OWSTableActionBlock)actionBlock +{ + return [self disclosureItemWithText:text detailText:detailText accessibilityIdentifier:nil actionBlock:actionBlock]; +} + ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + detailText:(NSString *)detailText + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock { OWSAssertDebug(text.length > 0); OWSAssertDebug(actionBlock); @@ -220,6 +247,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; cell.textLabel.text = text; cell.detailTextLabel.text = detailText; [cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator]; + cell.accessibilityIdentifier = accessibilityIdentifier; return cell; }; return item; @@ -385,6 +413,21 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; isEnabledBlock:(OWSTableSwitchBlock)isEnabledBlock target:(id)target selector:(SEL)selector +{ + return [self switchItemWithText:text + accessibilityIdentifier:nil + isOnBlock:isOnBlock + isEnabledBlock:isEnabledBlock + target:target + selector:selector]; +} + ++ (OWSTableItem *)switchItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + isOnBlock:(OWSTableSwitchBlock)isOnBlock + isEnabledBlock:(OWSTableSwitchBlock)isEnabledBlock + target:(id)target + selector:(SEL)selector { OWSAssertDebug(text.length > 0); OWSAssertDebug(target); @@ -401,6 +444,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; [cellSwitch setOn:isOnBlock()]; [cellSwitch addTarget:weakTarget action:selector forControlEvents:UIControlEventValueChanged]; cellSwitch.enabled = isEnabledBlock(); + cellSwitch.accessibilityIdentifier = accessibilityIdentifier; cell.selectionStyle = UITableViewCellSelectionStyleNone; From c3857e5dff2fd1d16207cf3ca58793703aa98417 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 10:26:48 -0400 Subject: [PATCH 307/493] Add accessibility identifiers to select recipient views. --- .../ViewControllers/SelectRecipientViewController.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index 4319895d8..d93b57015 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -64,6 +64,12 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien if (self.delegate.shouldHideContacts) { self.tableViewController.tableView.scrollEnabled = NO; } + + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _countryCodeButton); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberTextField); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberButton); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _examplePhoneNumberLabel); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _tableViewController); } - (void)viewDidLoad From 050a9676f651265e6038ff428b14721e43b307b9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 10:28:12 -0400 Subject: [PATCH 308/493] Add accessibility identifiers to select recipient views. --- SignalMessaging/ViewControllers/SelectRecipientViewController.m | 1 - 1 file changed, 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index d93b57015..ac420bc4b 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -69,7 +69,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberTextField); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberButton); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _examplePhoneNumberLabel); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _tableViewController); } - (void)viewDidLoad From 991974ee35309086b268174f2c442216c93801c1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Mar 2019 15:51:54 -0400 Subject: [PATCH 309/493] Add accessibility identifiers in the onboarding views. --- .../Onboarding2FAViewController.swift | 12 ++++++------ .../OnboardingCaptchaViewController.swift | 4 ++-- .../OnboardingPermissionsViewController.swift | 8 ++++---- .../OnboardingPhoneNumberViewController.swift | 16 ++++++++-------- .../OnboardingProfileViewController.swift | 10 +++++----- .../OnboardingSplashViewController.swift | 8 ++++---- .../OnboardingVerificationViewController.swift | 8 ++++---- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift index 1739c74db..861223698 100644 --- a/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift +++ b/Signal/src/ViewControllers/Registration/Onboarding2FAViewController.swift @@ -32,8 +32,8 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { comment: "The first explanation in the 'onboarding 2FA' view.")) explanationLabel1.font = UIFont.ows_dynamicTypeCaption1 explanationLabel2.font = UIFont.ows_dynamicTypeCaption1 - explanationLabel1.accessibilityLabel = "onboarding.2fa." + "explanationLabel1" - explanationLabel2.accessibilityLabel = "onboarding.2fa." + "explanationLabel2" + explanationLabel1.accessibilityIdentifier = "onboarding.2fa." + "explanationLabel1" + explanationLabel2.accessibilityIdentifier = "onboarding.2fa." + "explanationLabel2" pinTextField.textAlignment = .center pinTextField.delegate = self @@ -43,7 +43,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { pinTextField.setContentHuggingHorizontalLow() pinTextField.setCompressionResistanceHorizontalLow() pinTextField.autoSetDimension(.height, toSize: 40) - pinTextField.accessibilityLabel = "onboarding.2fa." + "pinTextField" + pinTextField.accessibilityIdentifier = "onboarding.2fa." + "pinTextField" pinStrokeNormal = pinTextField.addBottomStroke() pinStrokeError = pinTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) @@ -53,7 +53,7 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { validationWarningLabel.textColor = .ows_destructiveRed validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped validationWarningLabel.textAlignment = .center - validationWarningLabel.accessibilityLabel = "onboarding.2fa." + "validationWarningLabel" + validationWarningLabel.accessibilityIdentifier = "onboarding.2fa." + "validationWarningLabel" let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) @@ -63,12 +63,12 @@ public class Onboarding2FAViewController: OnboardingBaseViewController { let forgotPinLink = self.linkButton(title: NSLocalizedString("ONBOARDING_2FA_FORGOT_PIN_LINK", comment: "Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view."), selector: #selector(forgotPinLinkTapped)) - forgotPinLink.accessibilityLabel = "onboarding.2fa." + "forgotPinLink" + forgotPinLink.accessibilityIdentifier = "onboarding.2fa." + "forgotPinLink" let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) - nextButton.accessibilityLabel = "onboarding.2fa." + "nextButton" + nextButton.accessibilityIdentifier = "onboarding.2fa." + "nextButton" let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() diff --git a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift index 4e755c07d..b14130ce7 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingCaptchaViewController.swift @@ -17,7 +17,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_CAPTCHA_TITLE", comment: "Title of the 'onboarding Captcha' view.")) - titleLabel.accessibilityLabel = "onboarding.captcha." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.captcha." + "titleLabel" let titleRow = UIStackView(arrangedSubviews: [ titleLabel @@ -44,7 +44,7 @@ public class OnboardingCaptchaViewController: OnboardingBaseViewController { webView.allowsLinkPreview = false webView.scrollView.contentInset = .zero webView.layoutMargins = .zero - webView.accessibilityLabel = "onboarding.captcha." + "webView" + webView.accessibilityIdentifier = "onboarding.captcha." + "webView" let stackView = UIStackView(arrangedSubviews: [ titleRow, diff --git a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift index 01e468e14..ba96e8c03 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPermissionsViewController.swift @@ -20,21 +20,21 @@ public class OnboardingPermissionsViewController: OnboardingBaseViewController { action: #selector(skipWasPressed)) let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PERMISSIONS_TITLE", comment: "Title of the 'onboarding permissions' view.")) - titleLabel.accessibilityLabel = "onboarding.permissions." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.permissions." + "titleLabel" let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PERMISSIONS_EXPLANATION", comment: "Explanation in the 'onboarding permissions' view.")) - explanationLabel.accessibilityLabel = "onboarding.permissions." + "explanationLabel" + explanationLabel.accessibilityIdentifier = "onboarding.permissions." + "explanationLabel" let giveAccessButton = self.button(title: NSLocalizedString("ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON", comment: "Label for the 'give access' button in the 'onboarding permissions' view."), selector: #selector(giveAccessPressed)) - giveAccessButton.accessibilityLabel = "onboarding.permissions." + "giveAccessButton" + giveAccessButton.accessibilityIdentifier = "onboarding.permissions." + "giveAccessButton" let notNowButton = self.linkButton(title: NSLocalizedString("ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON", comment: "Label for the 'not now' button in the 'onboarding permissions' view."), selector: #selector(notNowPressed)) - notNowButton.accessibilityLabel = "onboarding.permissions." + "notNowButton" + notNowButton.accessibilityIdentifier = "onboarding.permissions." + "notNowButton" let stackView = UIStackView(arrangedSubviews: [ titleLabel, diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index a6bca69ef..04ef51c59 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -34,7 +34,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PHONE_NUMBER_TITLE", comment: "Title of the 'onboarding phone number' view.")) - titleLabel.accessibilityLabel = "onboarding.phoneNumber." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.phoneNumber." + "titleLabel" // Country @@ -44,7 +44,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryNameLabel.font = UIFont.ows_dynamicTypeBodyClamped countryNameLabel.setContentHuggingHorizontalLow() countryNameLabel.setCompressionResistanceHorizontalLow() - countryNameLabel.accessibilityLabel = "onboarding.phoneNumber." + "countryNameLabel" + countryNameLabel.accessibilityIdentifier = "onboarding.phoneNumber." + "countryNameLabel" let countryIcon = UIImage(named: (CurrentAppContext().isRTL ? "small_chevron_left" @@ -53,7 +53,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryImageView.tintColor = Theme.placeholderColor countryImageView.setContentHuggingHigh() countryImageView.setCompressionResistanceHigh() - countryImageView.accessibilityLabel = "onboarding.phoneNumber." + "countryImageView" + countryImageView.accessibilityIdentifier = "onboarding.phoneNumber." + "countryImageView" let countryRow = UIStackView(arrangedSubviews: [ countryNameLabel, @@ -66,7 +66,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { countryRow.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryRowTapped))) countryRow.autoSetDimension(.height, toSize: rowHeight) _ = countryRow.addBottomStroke() - countryRow.accessibilityLabel = "onboarding.phoneNumber." + "countryRow" + countryRow.accessibilityIdentifier = "onboarding.phoneNumber." + "countryRow" callingCodeLabel.textColor = Theme.primaryColor callingCodeLabel.font = UIFont.ows_dynamicTypeBodyClamped @@ -76,7 +76,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { callingCodeLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(countryCodeTapped))) _ = callingCodeLabel.addBottomStroke() callingCodeLabel.autoSetDimension(.width, toSize: rowHeight, relation: .greaterThanOrEqual) - callingCodeLabel.accessibilityLabel = "onboarding.phoneNumber." + "callingCodeLabel" + callingCodeLabel.accessibilityIdentifier = "onboarding.phoneNumber." + "callingCodeLabel" phoneNumberTextField.textAlignment = .left phoneNumberTextField.delegate = self @@ -85,7 +85,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { phoneNumberTextField.font = UIFont.ows_dynamicTypeBodyClamped phoneNumberTextField.setContentHuggingHorizontalLow() phoneNumberTextField.setCompressionResistanceHorizontalLow() - phoneNumberTextField.accessibilityLabel = "onboarding.phoneNumber." + "phoneNumberTextField" + phoneNumberTextField.accessibilityIdentifier = "onboarding.phoneNumber." + "phoneNumberTextField" phoneStrokeNormal = phoneNumberTextField.addBottomStroke() phoneStrokeError = phoneNumberTextField.addBottomStroke(color: .ows_destructiveRed, strokeWidth: 2) @@ -105,7 +105,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { validationWarningLabel.textColor = .ows_destructiveRed validationWarningLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped validationWarningLabel.autoSetDimension(.height, toSize: validationWarningLabel.font.lineHeight) - validationWarningLabel.accessibilityLabel = "onboarding.phoneNumber." + "validationWarningLabel" + validationWarningLabel.accessibilityIdentifier = "onboarding.phoneNumber." + "validationWarningLabel" let validationWarningRow = UIView() validationWarningRow.addSubview(validationWarningLabel) @@ -115,7 +115,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) - nextButton.accessibilityLabel = "onboarding.phoneNumber." + "nextButton" + nextButton.accessibilityIdentifier = "onboarding.phoneNumber." + "nextButton" self.nextButton = nextButton let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() diff --git a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift index 04792c5df..6a746588e 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingProfileViewController.swift @@ -31,16 +31,16 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { view.layoutMargins = .zero let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_PROFILE_TITLE", comment: "Title of the 'onboarding profile' view.")) - titleLabel.accessibilityLabel = "onboarding.profile." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.profile." + "titleLabel" let explanationLabel = self.explanationLabel(explanationText: NSLocalizedString("ONBOARDING_PROFILE_EXPLANATION", comment: "Explanation in the 'onboarding profile' view.")) - explanationLabel.accessibilityLabel = "onboarding.profile." + "explanationLabel" + explanationLabel.accessibilityIdentifier = "onboarding.profile." + "explanationLabel" let nextButton = self.button(title: NSLocalizedString("BUTTON_NEXT", comment: "Label for the 'next' button."), selector: #selector(nextPressed)) - nextButton.accessibilityLabel = "onboarding.profile." + "nextButton" + nextButton.accessibilityIdentifier = "onboarding.profile." + "nextButton" avatarView.autoSetDimensions(to: CGSize(width: CGFloat(avatarSize), height: CGFloat(avatarSize))) @@ -67,7 +67,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { avatarWrapper.addSubview(cameraCircle) cameraCircle.autoPinEdge(toSuperviewEdge: .trailing) cameraCircle.autoPinEdge(toSuperviewEdge: .bottom) - avatarWrapper.accessibilityLabel = "onboarding.profile." + "avatarWrapper" + avatarWrapper.accessibilityIdentifier = "onboarding.profile." + "avatarWrapper" nameTextfield.textAlignment = .left nameTextfield.delegate = self @@ -78,7 +78,7 @@ public class OnboardingProfileViewController: OnboardingBaseViewController { comment: "Placeholder text for the profile name in the 'onboarding profile' view.") nameTextfield.setContentHuggingHorizontalLow() nameTextfield.setCompressionResistanceHorizontalLow() - nameTextfield.accessibilityLabel = "onboarding.profile." + "nameTextfield" + nameTextfield.accessibilityIdentifier = "onboarding.profile." + "nameTextfield" let nameWrapper = UIView.container() nameWrapper.setCompressionResistanceHorizontalLow() diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 5ad303df8..4ada56d8c 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -21,12 +21,12 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { heroImageView.layer.magnificationFilter = kCAFilterTrilinear heroImageView.setCompressionResistanceLow() heroImageView.setContentHuggingVerticalLow() - heroImageView.accessibilityLabel = "onboarding.splash." + "heroImageView" + heroImageView.accessibilityIdentifier = "onboarding.splash." + "heroImageView" let titleLabel = self.titleLabel(text: NSLocalizedString("ONBOARDING_SPLASH_TITLE", comment: "Title of the 'onboarding splash' view.")) view.addSubview(titleLabel) titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) - titleLabel.accessibilityLabel = "onboarding.splash." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.splash." + "titleLabel" let explanationLabel = UILabel() explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", @@ -38,13 +38,13 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { explanationLabel.lineBreakMode = .byWordWrapping explanationLabel.isUserInteractionEnabled = true explanationLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(explanationLabelTapped))) - explanationLabel.accessibilityLabel = "onboarding.splash." + "explanationLabel" + explanationLabel.accessibilityIdentifier = "onboarding.splash." + "explanationLabel" let continueButton = self.button(title: NSLocalizedString("BUTTON_CONTINUE", comment: "Label for 'continue' button."), selector: #selector(continuePressed)) view.addSubview(continueButton) - continueButton.accessibilityLabel = "onboarding.splash." + "continueButton" + continueButton.accessibilityIdentifier = "onboarding.splash." + "continueButton" let stackView = UIStackView(arrangedSubviews: [ heroImageView, diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 9251ab9d3..3213a1a92 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -277,13 +277,13 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController let titleLabel = self.titleLabel(text: "") self.titleLabel = titleLabel - titleLabel.accessibilityLabel = "onboarding.verification." + "titleLabel" + titleLabel.accessibilityIdentifier = "onboarding.verification." + "titleLabel" let backLink = self.linkButton(title: NSLocalizedString("ONBOARDING_VERIFICATION_BACK_LINK", comment: "Label for the link that lets users change their phone number in the onboarding views."), selector: #selector(backLinkTapped)) self.backLink = backLink - backLink.accessibilityLabel = "onboarding.verification." + "backLink" + backLink.accessibilityIdentifier = "onboarding.verification." + "backLink" onboardingCodeView.delegate = self @@ -293,7 +293,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController errorLabel.font = UIFont.ows_dynamicTypeBodyClamped.ows_mediumWeight() errorLabel.textAlignment = .center errorLabel.autoSetDimension(.height, toSize: errorLabel.font.lineHeight) - errorLabel.accessibilityLabel = "onboarding.verification." + "errorLabel" + errorLabel.accessibilityIdentifier = "onboarding.verification." + "errorLabel" // Wrap the error label in a row so that we can show/hide it without affecting view layout. let errorRow = UIView() @@ -304,7 +304,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController selector: #selector(resendCodeLinkTapped)) codeStateLink.enableMultilineLabel() self.codeStateLink = codeStateLink - codeStateLink.accessibilityLabel = "onboarding.verification." + "codeStateLink" + codeStateLink.accessibilityIdentifier = "onboarding.verification." + "codeStateLink" let topSpacer = UIView.vStretchingSpacer() let bottomSpacer = UIView.vStretchingSpacer() From c180d20dcd879458445f725b180e161d0c9bb859 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 09:36:07 -0400 Subject: [PATCH 310/493] Store media size from attachment pointer protos. --- .../ViewControllers/DebugUI/DebugUIMessages.m | 6 +++-- .../Attachments/TSAttachmentPointer.h | 7 ++++-- .../Attachments/TSAttachmentPointer.m | 23 +++++++++++++++++-- .../Messages/Attachments/TSAttachmentStream.m | 13 +++++++++++ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 660c0362e..acf3440cf 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -3802,7 +3802,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac sourceFilename:@"test.mp3" caption:nil albumMessageId:nil - attachmentType:TSAttachmentTypeDefault]; + attachmentType:TSAttachmentTypeDefault + mediaSize:CGSizeZero]; pointer.state = TSAttachmentPointerStateFailed; [pointer saveWithTransaction:transaction]; // MJK - should be safe to remove this senderTimestamp @@ -4701,7 +4702,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac sourceFilename:fakeAssetLoader.filename caption:nil albumMessageId:nil - attachmentType:TSAttachmentTypeDefault]; + attachmentType:TSAttachmentTypeDefault + mediaSize:CGSizeZero]; attachmentPointer.state = TSAttachmentPointerStateFailed; [attachmentPointer saveWithTransaction:transaction]; return attachmentPointer; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h index a4a19bd28..9090c9cf8 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSAttachment.h" @@ -36,6 +36,8 @@ typedef NS_ENUM(NSUInteger, TSAttachmentPointerState) { // messages received from other clients @property (nullable, nonatomic, readonly) NSData *digest; +@property (nonatomic, readonly) CGSize mediaSize; + // Non-nil for attachments which need "lazy backup restore." - (nullable OWSBackupFragment *)lazyRestoreFragment; @@ -49,7 +51,8 @@ typedef NS_ENUM(NSUInteger, TSAttachmentPointerState) { sourceFilename:(nullable NSString *)sourceFilename caption:(nullable NSString *)caption albumMessageId:(nullable NSString *)albumMessageId - attachmentType:(TSAttachmentType)attachmentType NS_DESIGNATED_INITIALIZER; + attachmentType:(TSAttachmentType)attachmentType + mediaSize:(CGSize)mediaSize NS_DESIGNATED_INITIALIZER; - (instancetype)initForRestoreWithAttachmentStream:(TSAttachmentStream *)attachmentStream NS_DESIGNATED_INITIALIZER; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m index bcf7aef20..e967ed40d 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "TSAttachmentPointer.h" @@ -12,6 +12,15 @@ NS_ASSUME_NONNULL_BEGIN +@interface TSAttachmentStream (TSAttachmentPointer) + +- (CGSize)cachedImageSize; + +@end + +#pragma mark - + + @interface TSAttachmentPointer () // Optional property. Only set for attachments which need "lazy backup restore." @@ -53,6 +62,7 @@ NS_ASSUME_NONNULL_BEGIN caption:(nullable NSString *)caption albumMessageId:(nullable NSString *)albumMessageId attachmentType:(TSAttachmentType)attachmentType + mediaSize:(CGSize)mediaSize { self = [super initWithServerId:serverId encryptionKey:key @@ -69,6 +79,7 @@ NS_ASSUME_NONNULL_BEGIN _state = TSAttachmentPointerStateEnqueued; self.attachmentType = attachmentType; _pointerType = TSAttachmentPointerTypeIncoming; + _mediaSize = mediaSize; return self; } @@ -89,6 +100,7 @@ NS_ASSUME_NONNULL_BEGIN _state = TSAttachmentPointerStateEnqueued; self.attachmentType = attachmentStream.attachmentType; _pointerType = TSAttachmentPointerTypeRestoring; + _mediaSize = (attachmentStream.shouldHaveImageSize ? attachmentStream.cachedImageSize : CGSizeZero); return self; } @@ -129,6 +141,12 @@ NS_ASSUME_NONNULL_BEGIN albumMessageId = albumMessage.uniqueId; } + CGSize mediaSize = CGSizeZero; + if (attachmentProto.hasWidth && attachmentProto.hasHeight && attachmentProto.width > 0 + && attachmentProto.height > 0) { + mediaSize = CGSizeMake(attachmentProto.width, attachmentProto.height); + } + TSAttachmentPointer *pointer = [[TSAttachmentPointer alloc] initWithServerId:attachmentProto.id key:attachmentProto.key digest:digest @@ -137,7 +155,8 @@ NS_ASSUME_NONNULL_BEGIN sourceFilename:attachmentProto.fileName caption:caption albumMessageId:albumMessageId - attachmentType:attachmentType]; + attachmentType:attachmentType + mediaSize:mediaSize]; return pointer; } diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index 9109cd4e3..bb0384d8d 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -526,6 +526,19 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail); } } +- (CGSize)cachedImageSize +{ + OWSAssertDebug(self.shouldHaveImageSize); + + @synchronized(self) { + if (self.cachedImageWidth && self.cachedImageHeight) { + return CGSizeMake(self.cachedImageWidth.floatValue, self.cachedImageHeight.floatValue); + } else { + return CGSizeZero; + } + } +} + #pragma mark - Update With... - (void)applyChangeAsyncToLatestCopyWithChangeBlock:(void (^)(TSAttachmentStream *))changeBlock From 14e7274c3d2eb4d66f6acbbd42130118dfdda6dd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 09:47:04 -0400 Subject: [PATCH 311/493] Ensure constant bubble sizes for visual media. --- .../ConversationView/Cells/OWSMessageBubbleView.m | 3 +-- .../ConversationView/ConversationViewItem.m | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 0f2f3ef01..db8bf8a08 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -1027,8 +1027,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes if (self.viewItem.mediaAlbumItems.count == 1) { // Honor the content aspect ratio for single media. ConversationMediaAlbumItem *mediaAlbumItem = self.viewItem.mediaAlbumItems.firstObject; - if (mediaAlbumItem.attachmentStream && mediaAlbumItem.mediaSize.width > 0 - && mediaAlbumItem.mediaSize.height > 0) { + if (mediaAlbumItem.mediaSize.width > 0 && mediaAlbumItem.mediaSize.height > 0) { CGSize mediaSize = mediaAlbumItem.mediaSize; CGFloat contentAspectRatio = mediaSize.width / mediaSize.height; // Clamp the aspect ratio so that very thin/wide content is presented diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 8decd7c26..caf782ef5 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -704,10 +704,15 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) : nil); if (![attachment isKindOfClass:[TSAttachmentStream class]]) { + TSAttachmentPointer *attachmentPointer = (TSAttachmentPointer *)attachment; + CGSize mediaSize = CGSizeZero; + if (attachmentPointer.mediaSize.width > 0 && attachmentPointer.mediaSize.height > 0) { + mediaSize = attachmentPointer.mediaSize; + } [mediaAlbumItems addObject:[[ConversationMediaAlbumItem alloc] initWithAttachment:attachment attachmentStream:nil caption:caption - mediaSize:CGSizeZero]]; + mediaSize:mediaSize]]; continue; } TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachment; From fed4899c8db6587eab3a7657a2ba3ecce6bc0102 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 10:01:57 -0400 Subject: [PATCH 312/493] Handle incoming attachments with missing MIME type. --- .../Messages/Attachments/TSAttachmentPointer.m | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m index e967ed40d..da2684f01 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m @@ -116,9 +116,17 @@ NS_ASSUME_NONNULL_BEGIN OWSFailDebug(@"Invalid attachment key."); return nil; } - if (attachmentProto.contentType.length < 1) { - OWSFailDebug(@"Invalid attachment content type."); - return nil; + NSString *_Nullable fileName = attachmentProto.fileName; + NSString *_Nullable contentType = attachmentProto.contentType; + if (contentType.length < 1) { + OWSLogError(@"Invalid attachment content type."); + NSString *_Nullable fileExtension = [fileName pathExtension].lowercaseString; + if (fileExtension.length > 0) { + contentType = [MIMETypeUtil mimeTypeForFileExtension:fileExtension]; + } + if (contentType.length < 1) { + contentType = OWSMimeTypeApplicationOctetStream; + } } // digest will be empty for old clients. @@ -151,8 +159,8 @@ NS_ASSUME_NONNULL_BEGIN key:attachmentProto.key digest:digest byteCount:attachmentProto.size - contentType:attachmentProto.contentType - sourceFilename:attachmentProto.fileName + contentType:contentType + sourceFilename:fileName caption:caption albumMessageId:albumMessageId attachmentType:attachmentType From d1447d0730c6b1c7da09c29576cd8c50b1a29ece Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 11:39:21 -0400 Subject: [PATCH 313/493] Ensure constant bubble sizes for audio media. --- .../Cells/OWSAudioMessageView.h | 6 +- .../Cells/OWSAudioMessageView.m | 22 +++--- .../Cells/OWSMessageBubbleView.m | 69 ++++++++----------- .../ConversationView/ConversationViewItem.m | 8 ++- 4 files changed, 50 insertions(+), 55 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.h index f7be8be2e..1c6d2d573 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.h @@ -1,17 +1,17 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @class ConversationStyle; -@class TSAttachmentStream; +@class TSAttachment; @protocol ConversationViewItem; @interface OWSAudioMessageView : UIStackView -- (instancetype)initWithAttachment:(TSAttachmentStream *)attachmentStream +- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming viewItem:(id)viewItem conversationStyle:(ConversationStyle *)conversationStyle; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m index f06f9a2ea..358428aa4 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSAudioMessageView.h" @@ -15,7 +15,8 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSAudioMessageView () -@property (nonatomic) TSAttachmentStream *attachmentStream; +@property (nonatomic) TSAttachment *attachment; +@property (nonatomic, nullable) TSAttachmentStream *attachmentStream; @property (nonatomic) BOOL isIncoming; @property (nonatomic, weak) id viewItem; @property (nonatomic, readonly) ConversationStyle *conversationStyle; @@ -30,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation OWSAudioMessageView -- (instancetype)initWithAttachment:(TSAttachmentStream *)attachmentStream +- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming viewItem:(id)viewItem conversationStyle:(ConversationStyle *)conversationStyle @@ -38,7 +39,10 @@ NS_ASSUME_NONNULL_BEGIN self = [super init]; if (self) { - _attachmentStream = attachmentStream; + _attachment = attachment; + if ([attachment isKindOfClass:[TSAttachmentStream class]]) { + _attachmentStream = (TSAttachmentStream *)attachment; + } _isIncoming = isIncoming; _viewItem = viewItem; _conversationStyle = conversationStyle; @@ -66,8 +70,6 @@ NS_ASSUME_NONNULL_BEGIN - (CGFloat)audioDurationSeconds { - OWSAssertDebug(self.viewItem.audioDurationSeconds > 0.f); - return self.viewItem.audioDurationSeconds; } @@ -174,7 +176,7 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)isVoiceMessage { - return self.attachmentStream.isVoiceMessage; + return self.attachment.isVoiceMessage; } - (void)createContents @@ -190,13 +192,13 @@ NS_ASSUME_NONNULL_BEGIN [self addArrangedSubview:self.audioPlayPauseButton]; [self.audioPlayPauseButton setContentHuggingHigh]; - NSString *filename = self.attachmentStream.sourceFilename; - if (!filename) { + NSString *_Nullable filename = self.attachment.sourceFilename; + if (filename.length < 1) { filename = [self.attachmentStream.originalFilePath lastPathComponent]; } NSString *topText = [[filename stringByDeletingPathExtension] ows_stripped]; if (topText.length < 1) { - topText = [MIMETypeUtil fileExtensionForMIMEType:self.attachmentStream.contentType].localizedUppercaseString; + topText = [MIMETypeUtil fileExtensionForMIMEType:self.attachment.contentType].localizedUppercaseString; } if (topText.length < 1) { topText = NSLocalizedString(@"GENERIC_ATTACHMENT_LABEL", @"A label for generic attachments."); diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index db8bf8a08..40d3b762c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -168,22 +168,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return self.viewItem.displayableBodyText; } -- (nullable TSAttachmentStream *)attachmentStream -{ - // This should always be valid for the appropriate cell types. - OWSAssertDebug(self.viewItem.attachmentStream); - - return self.viewItem.attachmentStream; -} - -- (nullable TSAttachmentPointer *)attachmentPointer -{ - // This should always be valid for the appropriate cell types. - OWSAssertDebug(self.viewItem.attachmentPointer); - - return self.viewItem.attachmentPointer; -} - - (TSMessage *)message { OWSAssertDebug([self.viewItem.interaction isKindOfClass:[TSMessage class]]); @@ -276,7 +260,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_TextOnlyMessage: break; case OWSMessageCellType_Audio: - OWSAssertDebug(self.viewItem.attachmentStream); bodyMediaView = [self loadViewForAudio]; break; case OWSMessageCellType_GenericAttachment: @@ -837,10 +820,11 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (UIView *)loadViewForAudio { - OWSAssertDebug(self.attachmentStream); - OWSAssertDebug([self.attachmentStream isAudio]); + TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); + OWSAssertDebug(attachment); + OWSAssertDebug([attachment isAudio]); - OWSAudioMessageView *audioMessageView = [[OWSAudioMessageView alloc] initWithAttachment:self.attachmentStream + OWSAudioMessageView *audioMessageView = [[OWSAudioMessageView alloc] initWithAttachment:attachment isIncoming:self.isIncoming viewItem:self.viewItem conversationStyle:self.conversationStyle]; @@ -861,8 +845,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (UIView *)loadViewForGenericAttachment { OWSAssertDebug(self.viewItem.attachmentStream); + + // TODO: OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:self.attachmentStream isIncoming:self.isIncoming]; + [[OWSGenericAttachmentView alloc] initWithAttachment:self.viewItem.attachmentStream isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; [self addAttachmentUploadViewIfNecessary]; @@ -878,12 +864,12 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (UIView *)loadViewForDownloadingAttachment { - OWSAssertDebug(self.attachmentPointer); + OWSAssertDebug(self.viewItem.attachmentPointer); // TODO: We probably want to do something different for attachments // being restored from backup. AttachmentPointerView *downloadView = - [[AttachmentPointerView alloc] initWithAttachmentPointer:self.attachmentPointer + [[AttachmentPointerView alloc] initWithAttachmentPointer:self.viewItem.attachmentPointer isIncoming:self.isIncoming conversationStyle:self.conversationStyle]; @@ -929,7 +915,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (void)addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback: (nullable AttachmentStateBlock)attachmentStateCallback { - OWSAssertDebug(self.attachmentStream); + if (!self.viewItem.attachmentStream) { + return; + } if (!attachmentStateCallback) { attachmentStateCallback = ^(BOOL isAttachmentReady) { @@ -937,9 +925,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } if (self.isOutgoing) { - if (!self.attachmentStream.isUploaded) { + if (!self.viewItem.attachmentStream.isUploaded) { AttachmentUploadView *attachmentUploadView = - [[AttachmentUploadView alloc] initWithAttachment:self.attachmentStream + [[AttachmentUploadView alloc] initWithAttachment:self.viewItem.attachmentStream attachmentStateCallback:attachmentStateCallback]; [self.bubbleView addSubview:attachmentUploadView]; [attachmentUploadView ows_autoPinToSuperviewEdges]; @@ -1007,7 +995,8 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_GenericAttachment: { OWSAssertDebug(self.viewItem.attachmentStream); OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:self.attachmentStream isIncoming:self.isIncoming]; + [[OWSGenericAttachmentView alloc] initWithAttachment:self.viewItem.attachmentStream + isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; result = [attachmentView measureSizeWithMaxMessageWidth:maxMessageWidth]; break; @@ -1391,29 +1380,27 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes { OWSAssertDebug(self.delegate); + if (self.viewItem.attachmentPointer && self.viewItem.attachmentPointer.state == TSAttachmentPointerStateFailed) { + [self.delegate didTapFailedIncomingAttachment:self.viewItem]; + return; + } + switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: break; case OWSMessageCellType_Audio: - OWSAssertDebug(self.viewItem.attachmentStream); - - [self.delegate didTapAudioViewItem:self.viewItem attachmentStream:self.viewItem.attachmentStream]; + if (self.viewItem.attachmentStream) { + [self.delegate didTapAudioViewItem:self.viewItem attachmentStream:self.viewItem.attachmentStream]; + } return; case OWSMessageCellType_GenericAttachment: - OWSAssertDebug(self.viewItem.attachmentStream); - - [AttachmentSharing showShareUIForAttachment:self.viewItem.attachmentStream]; - break; - case OWSMessageCellType_DownloadingAttachment: { - TSAttachmentPointer *_Nullable attachmentPointer = self.viewItem.attachmentPointer; - OWSAssertDebug(attachmentPointer); - - if (attachmentPointer.state == TSAttachmentPointerStateFailed) { - [self.delegate didTapFailedIncomingAttachment:self.viewItem]; + if (self.viewItem.attachmentStream) { + [AttachmentSharing showShareUIForAttachment:self.viewItem.attachmentStream]; } break; - } + case OWSMessageCellType_DownloadingAttachment: + break; case OWSMessageCellType_ContactShare: [self.delegate didTapContactShareViewItem:self.viewItem]; break; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index caf782ef5..530a69c00 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -632,13 +632,19 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) self.audioDurationSeconds = audioDurationSeconds; self.messageCellType = OWSMessageCellType_Audio; } else { + OWSLogVerbose(@"contentType: %@", self.attachmentStream.contentType); self.messageCellType = OWSMessageCellType_GenericAttachment; } } else if (self.messageCellType == OWSMessageCellType_Unknown) { self.messageCellType = OWSMessageCellType_GenericAttachment; } } else if ([mediaAttachment isKindOfClass:[TSAttachmentPointer class]]) { - self.messageCellType = OWSMessageCellType_DownloadingAttachment; + if ([mediaAttachment isAudio]) { + self.audioDurationSeconds = 0; + self.messageCellType = OWSMessageCellType_Audio; + } else { + self.messageCellType = OWSMessageCellType_DownloadingAttachment; + } self.attachmentPointer = (TSAttachmentPointer *)mediaAttachment; } else { OWSFailDebug(@"Unknown attachment type"); From 3702dfa1980914af2218fc3dba560e9215039616 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 12:34:33 -0400 Subject: [PATCH 314/493] Rework "upload progress", "download progress" and "tap to retry" states. --- .../Cells/AttachmentUploadView.h | 7 +- .../Cells/AttachmentUploadView.m | 14 +-- .../Cells/OWSMessageBubbleView.m | 113 +++++++++++++++--- 3 files changed, 97 insertions(+), 37 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.h b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.h index 312676e89..76c30e613 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.h @@ -1,13 +1,11 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @class TSAttachmentStream; -typedef void (^AttachmentStateBlock)(BOOL isAttachmentReady); - // This entity is used to display upload progress for outgoing // attachments in conversation view cells. // @@ -18,8 +16,7 @@ typedef void (^AttachmentStateBlock)(BOOL isAttachmentReady); // * Disable any media view controls using a callback. @interface AttachmentUploadView : UIView -- (instancetype)initWithAttachment:(TSAttachmentStream *)attachment - attachmentStateCallback:(AttachmentStateBlock _Nullable)attachmentStateCallback; +- (instancetype)initWithAttachment:(TSAttachmentStream *)attachment; @end diff --git a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m index 48fc5a3b9..b3b4a5432 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "AttachmentUploadView.h" @@ -21,8 +21,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) UILabel *progressLabel; -@property (nonatomic) AttachmentStateBlock _Nullable attachmentStateCallback; - @property (nonatomic) BOOL isAttachmentReady; @property (nonatomic) CGFloat lastProgress; @@ -34,7 +32,6 @@ NS_ASSUME_NONNULL_BEGIN @implementation AttachmentUploadView - (instancetype)initWithAttachment:(TSAttachmentStream *)attachment - attachmentStateCallback:(AttachmentStateBlock _Nullable)attachmentStateCallback { self = [super init]; @@ -42,7 +39,6 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(attachment); self.attachment = attachment; - self.attachmentStateCallback = attachmentStateCallback; [self createContents]; @@ -54,10 +50,6 @@ NS_ASSUME_NONNULL_BEGIN _isAttachmentReady = self.attachment.isUploaded; [self ensureViewState]; - - if (attachmentStateCallback) { - self.attachmentStateCallback(_isAttachmentReady); - } } return self; } @@ -110,10 +102,6 @@ NS_ASSUME_NONNULL_BEGIN _isAttachmentReady = isAttachmentReady; [self ensureViewState]; - - if (self.attachmentStateCallback) { - self.attachmentStateCallback(isAttachmentReady); - } } - (void)setLastProgress:(CGFloat)lastProgress diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 40d3b762c..fe9e77099 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -60,6 +60,15 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes @implementation OWSMessageBubbleView +#pragma mark - Dependencies + +- (OWSAttachmentDownloads *)attachmentDownloads +{ + return SSKEnvironment.shared.attachmentDownloads; +} + +#pragma mark - + - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; @@ -830,7 +839,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes conversationStyle:self.conversationStyle]; self.viewItem.lastAudioMessageView = audioMessageView; [audioMessageView createContents]; - [self addAttachmentUploadViewIfNecessary]; + [self addProgressViewsIfNecessary:audioMessageView]; self.loadCellContentBlock = ^{ // Do nothing. @@ -850,7 +859,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes OWSGenericAttachmentView *attachmentView = [[OWSGenericAttachmentView alloc] initWithAttachment:self.viewItem.attachmentStream isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; - [self addAttachmentUploadViewIfNecessary]; + [self addProgressViewsIfNecessary:attachmentView]; self.loadCellContentBlock = ^{ // Do nothing. @@ -907,32 +916,98 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return contactShareView; } -- (void)addAttachmentUploadViewIfNecessary +- (void)addProgressViewsIfNecessary:(UIView *)bodyMediaView { - [self addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback:nil]; + if (self.viewItem.attachmentStream) { + [self addUploadViewIfNecessary:bodyMediaView]; + } else if (self.viewItem.attachmentPointer) { + [self addDownloadViewIfNecessary:bodyMediaView]; + } } -- (void)addAttachmentUploadViewIfNecessaryWithAttachmentStateCallback: - (nullable AttachmentStateBlock)attachmentStateCallback +- (void)addUploadViewIfNecessary:(UIView *)bodyMediaView { - if (!self.viewItem.attachmentStream) { + OWSAssertDebug(self.viewItem.attachmentStream); + + if (!self.isOutgoing) { + return; + } + if (self.viewItem.attachmentStream.isUploaded) { return; } - if (!attachmentStateCallback) { - attachmentStateCallback = ^(BOOL isAttachmentReady) { - }; + AttachmentUploadView *uploadView = [[AttachmentUploadView alloc] initWithAttachment:self.viewItem.attachmentStream]; + [self.bubbleView addSubview:uploadView]; + [uploadView autoPinEdgesToSuperviewEdges]; + [uploadView setContentHuggingLow]; + [uploadView setCompressionResistanceLow]; +} + +- (void)addDownloadViewIfNecessary:(UIView *)bodyMediaView +{ + OWSAssertDebug(self.viewItem.attachmentPointer); + + switch (self.viewItem.attachmentPointer.state) { + case TSAttachmentPointerStateFailed: + [self addTapToRetryView:bodyMediaView]; + return; + case TSAttachmentPointerStateEnqueued: + case TSAttachmentPointerStateDownloading: + break; + } + switch (self.viewItem.attachmentPointer.pointerType) { + case TSAttachmentPointerTypeRestoring: + // TODO: Show "restoring" indicator and possibly progress. + return; + case TSAttachmentPointerTypeUnknown: + case TSAttachmentPointerTypeIncoming: + break; + } + NSString *_Nullable uniqueId = self.viewItem.attachmentPointer.uniqueId; + if (uniqueId.length < 1) { + OWSFailDebug(@"Missing uniqueId."); + return; + } + if ([self.attachmentDownloads downloadProgressForAttachmentId:uniqueId] == nil) { + OWSFailDebug(@"Missing download progress."); + return; } - if (self.isOutgoing) { - if (!self.viewItem.attachmentStream.isUploaded) { - AttachmentUploadView *attachmentUploadView = - [[AttachmentUploadView alloc] initWithAttachment:self.viewItem.attachmentStream - attachmentStateCallback:attachmentStateCallback]; - [self.bubbleView addSubview:attachmentUploadView]; - [attachmentUploadView ows_autoPinToSuperviewEdges]; - } - } + UIView *overlayView = [UIView new]; + overlayView.backgroundColor = [self.bubbleColor colorWithAlphaComponent:0.5]; + [bodyMediaView addSubview:overlayView]; + [overlayView autoPinEdgesToSuperviewEdges]; + [overlayView setContentHuggingLow]; + [overlayView setCompressionResistanceLow]; + + MediaDownloadView *downloadView = + [[MediaDownloadView alloc] initWithAttachmentId:uniqueId radius:self.conversationStyle.maxMessageWidth * 0.1f]; + bodyMediaView.layer.opacity = 0.5f; + [self.bubbleView addSubview:downloadView]; + [downloadView autoPinEdgesToSuperviewEdges]; + [downloadView setContentHuggingLow]; + [downloadView setCompressionResistanceLow]; +} + +- (void)addTapToRetryView:(UIView *)bodyMediaView +{ + OWSAssertDebug(self.viewItem.attachmentPointer); + + // Hide the body media view, replace with "tap to retry" indicator. + + UILabel *label = [UILabel new]; + label.text = NSLocalizedString( + @"ATTACHMENT_DOWNLOADING_STATUS_FAILED", @"Status label when an attachment download has failed."); + label.font = UIFont.ows_dynamicTypeCaption1Font; + label.textColor = Theme.primaryColor; + label.numberOfLines = 0; + label.lineBreakMode = NSLineBreakByWordWrapping; + label.textAlignment = NSTextAlignmentCenter; + label.backgroundColor = self.bubbleColor; + [bodyMediaView addSubview:label]; + [label autoPinEdgesToSuperviewEdges]; + [label setContentHuggingLow]; + [label setCompressionResistanceLow]; } - (void)showAttachmentErrorViewWithMediaView:(UIView *)mediaView From dc168270c2a94613fdecbf6007db195140c65585 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 12:44:02 -0400 Subject: [PATCH 315/493] Ensure constant bubble sizes for generic attachments. --- .../Cells/OWSGenericAttachmentView.h | 6 +-- .../Cells/OWSGenericAttachmentView.m | 38 ++++++++++++------- .../Cells/OWSMessageBubbleView.m | 13 +++---- .../ConversationView/ConversationViewItem.m | 2 +- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h index f3cf1bb04..350b93465 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h @@ -1,15 +1,15 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @class ConversationStyle; -@class TSAttachmentStream; +@class TSAttachment; @interface OWSGenericAttachmentView : UIStackView -- (instancetype)initWithAttachment:(TSAttachmentStream *)attachmentStream isIncoming:(BOOL)isIncoming; +- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming; - (void)createContentsWithConversationStyle:(ConversationStyle *)conversationStyle; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m index 29c2eea37..b4895613d 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSGenericAttachmentView.h" @@ -18,7 +18,8 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSGenericAttachmentView () -@property (nonatomic) TSAttachmentStream *attachmentStream; +@property (nonatomic) TSAttachment *attachment; +@property (nonatomic, nullable) TSAttachmentStream *attachmentStream; @property (nonatomic) BOOL isIncoming; @property (nonatomic) UILabel *topLabel; @property (nonatomic) UILabel *bottomLabel; @@ -29,12 +30,15 @@ NS_ASSUME_NONNULL_BEGIN @implementation OWSGenericAttachmentView -- (instancetype)initWithAttachment:(TSAttachmentStream *)attachmentStream isIncoming:(BOOL)isIncoming +- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming { self = [super init]; if (self) { - _attachmentStream = attachmentStream; + _attachment = attachment; + if ([attachment isKindOfClass:[TSAttachmentStream class]]) { + _attachmentStream = (TSAttachmentStream *)attachment; + } _isIncoming = isIncoming; } @@ -105,13 +109,13 @@ NS_ASSUME_NONNULL_BEGIN [self addArrangedSubview:imageView]; [imageView setContentHuggingHigh]; - NSString *filename = self.attachmentStream.sourceFilename; + NSString *_Nullable filename = self.attachment.sourceFilename; if (!filename) { filename = [[self.attachmentStream originalFilePath] lastPathComponent]; } NSString *fileExtension = filename.pathExtension; if (fileExtension.length < 1) { - fileExtension = [MIMETypeUtil fileExtensionForMIMEType:self.attachmentStream.contentType]; + fileExtension = [MIMETypeUtil fileExtensionForMIMEType:self.attachment.contentType]; } UILabel *fileTypeLabel = [UILabel new]; @@ -132,9 +136,9 @@ NS_ASSUME_NONNULL_BEGIN labelsView.alignment = UIStackViewAlignmentLeading; [self addArrangedSubview:labelsView]; - NSString *topText = [self.attachmentStream.sourceFilename ows_stripped]; + NSString *topText = [self.attachment.sourceFilename ows_stripped]; if (topText.length < 1) { - topText = [MIMETypeUtil fileExtensionForMIMEType:self.attachmentStream.contentType].localizedUppercaseString; + topText = [MIMETypeUtil fileExtensionForMIMEType:self.attachment.contentType].localizedUppercaseString; } if (topText.length < 1) { topText = NSLocalizedString(@"GENERIC_ATTACHMENT_LABEL", @"A label for generic attachments."); @@ -147,12 +151,18 @@ NS_ASSUME_NONNULL_BEGIN topLabel.font = [OWSGenericAttachmentView topLabelFont]; [labelsView addArrangedSubview:topLabel]; - NSError *error; - unsigned long long fileSize = - [[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachmentStream originalFilePath] error:&error] - .fileSize; - OWSAssertDebug(!error); - NSString *bottomText = [OWSFormat formatFileSize:fileSize]; + unsigned long long fileSize = 0; + if (self.attachmentStream) { + NSError *error; + fileSize = [[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachmentStream originalFilePath] + error:&error] + .fileSize; + OWSAssertDebug(!error); + } + NSString *bottomText = @" "; + if (fileSize > 0) { + bottomText = [OWSFormat formatFileSize:fileSize]; + } UILabel *bottomLabel = [UILabel new]; self.bottomLabel = bottomLabel; bottomLabel.text = bottomText; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index fe9e77099..28643adae 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -853,11 +853,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (UIView *)loadViewForGenericAttachment { - OWSAssertDebug(self.viewItem.attachmentStream); - - // TODO: + TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); + OWSAssertDebug(attachment); OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:self.viewItem.attachmentStream isIncoming:self.isIncoming]; + [[OWSGenericAttachmentView alloc] initWithAttachment:attachment isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; [self addProgressViewsIfNecessary:attachmentView]; @@ -1068,10 +1067,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes result = CGSizeMake(maxMessageWidth, OWSAudioMessageView.bubbleHeight); break; case OWSMessageCellType_GenericAttachment: { - OWSAssertDebug(self.viewItem.attachmentStream); + TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); + OWSAssertDebug(attachment); OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:self.viewItem.attachmentStream - isIncoming:self.isIncoming]; + [[OWSGenericAttachmentView alloc] initWithAttachment:attachment isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; result = [attachmentView measureSizeWithMaxMessageWidth:maxMessageWidth]; break; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 530a69c00..c486ebb82 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -643,7 +643,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) self.audioDurationSeconds = 0; self.messageCellType = OWSMessageCellType_Audio; } else { - self.messageCellType = OWSMessageCellType_DownloadingAttachment; + self.messageCellType = OWSMessageCellType_GenericAttachment; } self.attachmentPointer = (TSAttachmentPointer *)mediaAttachment; } else { From 67c89cb4e30924cd24f71851c975404fe1768c95 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 13:21:54 -0400 Subject: [PATCH 316/493] Ensure constant bubble sizes for oversize text. --- Signal.xcodeproj/project.pbxproj | 4 - .../Cells/OWSMessageBubbleView.m | 71 ++++----- .../ConversationView/ConversationViewItem.h | 3 +- .../ConversationView/ConversationViewItem.m | 93 ++++++++--- Signal/src/views/AttachmentPointerView.swift | 145 ------------------ 5 files changed, 107 insertions(+), 209 deletions(-) delete mode 100644 Signal/src/views/AttachmentPointerView.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 5b751d7eb..0dba75b4d 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -369,7 +369,6 @@ 452C468F1E427E200087B011 /* OutboundCallInitiator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452C468E1E427E200087B011 /* OutboundCallInitiator.swift */; }; 452C7CA72037628B003D51A5 /* Weak.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45F170D51E315310003FC1F2 /* Weak.swift */; }; 452D1AF12081059C00A67F7F /* StringAdditionsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452D1AF02081059C00A67F7F /* StringAdditionsTest.swift */; }; - 452EA09E1EA7ABE00078744B /* AttachmentPointerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452EA09D1EA7ABE00078744B /* AttachmentPointerView.swift */; }; 452EC6DF205E9E30000E787C /* MediaGalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452EC6DE205E9E30000E787C /* MediaGalleryViewController.swift */; }; 452EC6E1205FF5DC000E787C /* Bench.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452EC6E0205FF5DC000E787C /* Bench.swift */; }; 452ECA4D1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */; }; @@ -1093,7 +1092,6 @@ 452B998F20A34B6B006F2F9E /* AddContactShareToExistingContactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactShareToExistingContactViewController.swift; sourceTree = ""; }; 452C468E1E427E200087B011 /* OutboundCallInitiator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutboundCallInitiator.swift; sourceTree = ""; }; 452D1AF02081059C00A67F7F /* StringAdditionsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringAdditionsTest.swift; sourceTree = ""; }; - 452EA09D1EA7ABE00078744B /* AttachmentPointerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentPointerView.swift; sourceTree = ""; }; 452EC6DE205E9E30000E787C /* MediaGalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaGalleryViewController.swift; sourceTree = ""; }; 452EC6E0205FF5DC000E787C /* Bench.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bench.swift; sourceTree = ""; }; 452ECA4C1E087E7200E2F016 /* MessageFetcherJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageFetcherJob.swift; sourceTree = ""; }; @@ -2419,7 +2417,6 @@ 76EB052B18170B33006006FC /* Views */ = { isa = PBXGroup; children = ( - 452EA09D1EA7ABE00078744B /* AttachmentPointerView.swift */, 34E3E5671EC4B19400495BAC /* AudioProgressView.swift */, 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */, 4CA46F4B219CCC630038ABDE /* CaptionView.swift */, @@ -3602,7 +3599,6 @@ 34B3F87B1E8DF1700035BE1A /* ExperienceUpgradesPageViewController.swift in Sources */, 3448E1622213585C004B052E /* OnboardingBaseViewController.swift in Sources */, 34E5DC8220D8050D00C08145 /* RegistrationUtils.m in Sources */, - 452EA09E1EA7ABE00078744B /* AttachmentPointerView.swift in Sources */, 45638BDC1F3DD0D400128435 /* DebugUICalling.swift in Sources */, 34E3E5681EC4B19400495BAC /* AudioProgressView.swift in Sources */, 34D1F0521F7E8EA30066283D /* GiphyDownloader.swift in Sources */, diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 28643adae..246363ea4 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -274,15 +274,16 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_GenericAttachment: bodyMediaView = [self loadViewForGenericAttachment]; break; - case OWSMessageCellType_DownloadingAttachment: - bodyMediaView = [self loadViewForDownloadingAttachment]; - break; case OWSMessageCellType_ContactShare: bodyMediaView = [self loadViewForContactShare]; break; case OWSMessageCellType_MediaMessage: bodyMediaView = [self loadViewForMediaAlbum]; break; + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + bodyMediaView = [self loadViewForOversizeTextDownload]; + break; } if (bodyMediaView) { @@ -564,8 +565,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: - case OWSMessageCellType_DownloadingAttachment: case OWSMessageCellType_ContactShare: + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: return NO; case OWSMessageCellType_MediaMessage: return YES; @@ -579,9 +581,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return NO; case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: - case OWSMessageCellType_DownloadingAttachment: case OWSMessageCellType_ContactShare: case OWSMessageCellType_MediaMessage: + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: return YES; } } @@ -870,31 +873,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return attachmentView; } -- (UIView *)loadViewForDownloadingAttachment -{ - OWSAssertDebug(self.viewItem.attachmentPointer); - - // TODO: We probably want to do something different for attachments - // being restored from backup. - AttachmentPointerView *downloadView = - [[AttachmentPointerView alloc] initWithAttachmentPointer:self.viewItem.attachmentPointer - isIncoming:self.isIncoming - conversationStyle:self.conversationStyle]; - - UIView *wrapper = [UIView new]; - [wrapper addSubview:downloadView]; - [downloadView autoPinEdgesToSuperviewEdges]; - - self.loadCellContentBlock = ^{ - // Do nothing. - }; - self.unloadCellContentBlock = ^{ - // Do nothing. - }; - - return wrapper; -} - - (UIView *)loadViewForContactShare { OWSAssertDebug(self.viewItem.contactShare); @@ -915,6 +893,26 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes return contactShareView; } +- (UIView *)loadViewForOversizeTextDownload +{ + BOOL isFailed = self.cellType == OWSMessageCellType_OversizeTextFailed; + + // We can use an empty view. The progress views will display download + // progress or tap-to-retry UI. + UIView *attachmentView = [UIView new]; + + [self addProgressViewsIfNecessary:attachmentView]; + + self.loadCellContentBlock = ^{ + // Do nothing. + }; + self.unloadCellContentBlock = ^{ + // Do nothing. + }; + + return attachmentView; +} + - (void)addProgressViewsIfNecessary:(UIView *)bodyMediaView { if (self.viewItem.attachmentStream) { @@ -1075,9 +1073,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes result = [attachmentView measureSizeWithMaxMessageWidth:maxMessageWidth]; break; } - case OWSMessageCellType_DownloadingAttachment: - result = CGSizeMake(MIN(200, maxMessageWidth), [AttachmentPointerView measureHeight]); - break; case OWSMessageCellType_ContactShare: OWSAssertDebug(self.viewItem.contactShare); @@ -1122,6 +1117,12 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } } break; + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + // There's no way to predict the size of the oversize text, + // so we just use a square bubble. + result = CGSizeMake(maxMessageWidth, maxMessageWidth); + break; } OWSAssertDebug(result.width <= maxMessageWidth); @@ -1462,6 +1463,8 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes switch (self.cellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: break; case OWSMessageCellType_Audio: if (self.viewItem.attachmentStream) { @@ -1473,8 +1476,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes [AttachmentSharing showShareUIForAttachment:self.viewItem.attachmentStream]; } break; - case OWSMessageCellType_DownloadingAttachment: - break; case OWSMessageCellType_ContactShare: [self.delegate didTapContactShareViewItem:self.viewItem]; break; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h index 3ec982aeb..b82272eaa 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h @@ -12,9 +12,10 @@ typedef NS_ENUM(NSInteger, OWSMessageCellType) { OWSMessageCellType_TextOnlyMessage, OWSMessageCellType_Audio, OWSMessageCellType_GenericAttachment, - OWSMessageCellType_DownloadingAttachment, OWSMessageCellType_ContactShare, OWSMessageCellType_MediaMessage, + OWSMessageCellType_OversizeTextDownloading, + OWSMessageCellType_OversizeTextFailed, }; NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index c486ebb82..180eef15e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -26,14 +26,16 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) return @"OWSMessageCellType_Audio"; case OWSMessageCellType_GenericAttachment: return @"OWSMessageCellType_GenericAttachment"; - case OWSMessageCellType_DownloadingAttachment: - return @"OWSMessageCellType_DownloadingAttachment"; case OWSMessageCellType_Unknown: return @"OWSMessageCellType_Unknown"; case OWSMessageCellType_ContactShare: return @"OWSMessageCellType_ContactShare"; case OWSMessageCellType_MediaMessage: return @"OWSMessageCellType_MediaMessage"; + case OWSMessageCellType_OversizeTextDownloading: + return @"OWSMessageCellType_OversizeTextDownloading"; + case OWSMessageCellType_OversizeTextFailed: + return @"OWSMessageCellType_OversizeTextFailed"; } } @@ -591,10 +593,18 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } TSAttachment *_Nullable oversizeTextAttachment = [message oversizeTextAttachmentWithTransaction:transaction]; - if (oversizeTextAttachment != nil && [oversizeTextAttachment isKindOfClass:[TSAttachmentStream class]]) { + if ([oversizeTextAttachment isKindOfClass:[TSAttachmentStream class]]) { TSAttachmentStream *oversizeTextAttachmentStream = (TSAttachmentStream *)oversizeTextAttachment; self.displayableBodyText = [self displayableBodyTextForOversizeTextAttachment:oversizeTextAttachmentStream interactionId:message.uniqueId]; + } else if ([oversizeTextAttachment isKindOfClass:[TSAttachmentPointer class]]) { + TSAttachmentPointer *oversizeTextAttachmentPointer = (TSAttachmentPointer *)oversizeTextAttachment; + // TODO: Handle backup restore. + self.messageCellType = (oversizeTextAttachmentPointer.state == TSAttachmentPointerStateFailed + ? OWSMessageCellType_OversizeTextFailed + : OWSMessageCellType_OversizeTextDownloading); + self.attachmentPointer = (TSAttachmentPointer *)oversizeTextAttachmentPointer; + return; } else { NSString *_Nullable bodyText = [message bodyTextWithTransaction:transaction]; if (bodyText) { @@ -860,6 +870,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (void)copyTextAction { + if (self.attachmentPointer != nil) { + OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); + return; + } + switch (self.messageCellType) { case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_Audio: @@ -869,10 +884,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) [UIPasteboard.generalPasteboard setString:self.displayableBodyText.fullText]; break; } - case OWSMessageCellType_DownloadingAttachment: { - OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); - break; - } case OWSMessageCellType_Unknown: { OWSFailDebug(@"No text to copy"); break; @@ -882,11 +893,20 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSFailDebug(@"Not implemented yet"); break; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); + return; } } - (void)copyMediaAction { + if (self.attachmentPointer != nil) { + OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); + return; + } + switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -899,10 +919,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) [self copyAttachmentToPasteboard:self.attachmentStream]; break; } - case OWSMessageCellType_DownloadingAttachment: { - OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); - break; - } case OWSMessageCellType_MediaMessage: { if (self.mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = self.mediaAlbumItems.firstObject; @@ -915,6 +931,10 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSFailDebug(@"Can't copy media album"); break; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); + return; } } @@ -937,6 +957,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (void)shareMediaAction { + if (self.attachmentPointer != nil) { + OWSFailDebug(@"Can't share not-yet-downloaded attachment"); + return; + } + switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -947,10 +972,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_GenericAttachment: [AttachmentSharing showShareUIForAttachment:self.attachmentStream]; break; - case OWSMessageCellType_DownloadingAttachment: { - OWSFailDebug(@"Can't share not-yet-downloaded attachment"); - break; - } case OWSMessageCellType_MediaMessage: { // TODO: We need a "canShareMediaAction" method. OWSAssertDebug(self.mediaAlbumItems); @@ -967,11 +988,19 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) [AttachmentSharing showShareUIForAttachments:attachmentStreams completion:nil]; break; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + OWSFailDebug(@"Can't share not-yet-downloaded attachment"); + return; } } - (BOOL)canCopyMedia { + if (self.attachmentPointer != nil) { + return NO; + } + switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -980,7 +1009,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_Audio: return NO; case OWSMessageCellType_GenericAttachment: - case OWSMessageCellType_DownloadingAttachment: case OWSMessageCellType_MediaMessage: { if (self.mediaAlbumItems.count == 1) { ConversationMediaAlbumItem *mediaAlbumItem = self.mediaAlbumItems.firstObject; @@ -990,11 +1018,18 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } return NO; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + return NO; } } - (BOOL)canSaveMedia { + if (self.attachmentPointer != nil) { + return NO; + } + switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -1003,7 +1038,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_Audio: return NO; case OWSMessageCellType_GenericAttachment: - case OWSMessageCellType_DownloadingAttachment: return NO; case OWSMessageCellType_MediaMessage: { for (ConversationMediaAlbumItem *mediaAlbumItem in self.mediaAlbumItems) { @@ -1025,11 +1059,18 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } return NO; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + return NO; } } - (void)saveMediaAction { + if (self.attachmentPointer != nil) { + OWSFailDebug(@"Can't save not-yet-downloaded attachment"); + return; + } switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -1042,14 +1083,14 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_GenericAttachment: OWSFailDebug(@"Cannot save media data."); break; - case OWSMessageCellType_DownloadingAttachment: { - OWSFailDebug(@"Can't save not-yet-downloaded attachment"); - break; - } case OWSMessageCellType_MediaMessage: { [self saveMediaAlbumItems]; break; } + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + OWSFailDebug(@"Can't save not-yet-downloaded attachment"); + return; } } @@ -1112,6 +1153,10 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (BOOL)hasMediaActionContent { + if (self.attachmentPointer != nil) { + return NO; + } + switch (self.messageCellType) { case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: @@ -1120,11 +1165,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_Audio: case OWSMessageCellType_GenericAttachment: return self.attachmentStream != nil; - case OWSMessageCellType_DownloadingAttachment: { - return NO; - } case OWSMessageCellType_MediaMessage: return self.firstValidAlbumAttachment != nil; + case OWSMessageCellType_OversizeTextDownloading: + case OWSMessageCellType_OversizeTextFailed: + return NO; } } diff --git a/Signal/src/views/AttachmentPointerView.swift b/Signal/src/views/AttachmentPointerView.swift deleted file mode 100644 index ada2e7c97..000000000 --- a/Signal/src/views/AttachmentPointerView.swift +++ /dev/null @@ -1,145 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -import Foundation -import SignalServiceKit -import SignalMessaging - -class AttachmentPointerView: UIStackView { - - let isIncoming: Bool - let attachmentPointer: TSAttachmentPointer - let conversationStyle: ConversationStyle - - let progressView = OWSProgressView() - let nameLabel = UILabel() - let statusLabel = UILabel() - let filename: String - let genericFilename = NSLocalizedString("ATTACHMENT_DEFAULT_FILENAME", comment: "Generic filename for an attachment with no known name") - - var progress: CGFloat = 0 { - didSet { - self.progressView.progress = progress - } - } - - @objc - required init(attachmentPointer: TSAttachmentPointer, isIncoming: Bool, conversationStyle: ConversationStyle) { - self.attachmentPointer = attachmentPointer - self.isIncoming = isIncoming - self.conversationStyle = conversationStyle - - let attachmentPointerFilename = attachmentPointer.sourceFilename - if let filename = attachmentPointerFilename, !filename.isEmpty { - self.filename = filename - } else { - self.filename = genericFilename - } - - super.init(frame: CGRect.zero) - - createSubviews() - updateViews() - - if attachmentPointer.state == .downloading { - NotificationCenter.default.addObserver(self, - selector: #selector(attachmentDownloadProgress(_:)), - name: NSNotification.Name.attachmentDownloadProgress, - object: nil) - } - } - - deinit { - NotificationCenter.default.removeObserver(self) - } - - @objc internal func attachmentDownloadProgress(_ notification: Notification) { - guard let attachmentId = attachmentPointer.uniqueId else { - owsFailDebug("Missing attachment id.") - return - } - guard let progress = (notification as NSNotification).userInfo?[kAttachmentDownloadProgressKey] as? NSNumber else { - owsFailDebug("Attachment download notification missing progress.") - return - } - guard let notificationAttachmentId = (notification as NSNotification).userInfo?[kAttachmentDownloadAttachmentIDKey] as? String else { - owsFailDebug("Attachment download notification missing attachment id.") - return - } - guard notificationAttachmentId == attachmentId else { - return - } - self.progress = CGFloat(progress.floatValue) - } - - @available(*, unavailable, message: "use init(call:) constructor instead.") - required init(coder aDecoder: NSCoder) { - notImplemented() - } - - private static var vSpacing: CGFloat = 5 - private class func nameFont() -> UIFont { return UIFont.ows_dynamicTypeBody } - private class func statusFont() -> UIFont { return UIFont.ows_dynamicTypeCaption1 } - private static var progressWidth: CGFloat = 80 - private static var progressHeight: CGFloat = 6 - - func createSubviews() { - progressView.autoSetDimension(.width, toSize: AttachmentPointerView.progressWidth) - progressView.autoSetDimension(.height, toSize: AttachmentPointerView.progressHeight) - - // truncate middle to be sure we include file extension - nameLabel.lineBreakMode = .byTruncatingMiddle - nameLabel.textAlignment = .center - nameLabel.textColor = self.textColor - nameLabel.font = AttachmentPointerView.nameFont() - - statusLabel.textAlignment = .center - statusLabel.adjustsFontSizeToFitWidth = true - statusLabel.numberOfLines = 2 - statusLabel.textColor = self.textColor - statusLabel.font = AttachmentPointerView.statusFont() - - self.axis = .vertical - self.spacing = AttachmentPointerView.vSpacing - addArrangedSubview(nameLabel) - addArrangedSubview(progressView) - addArrangedSubview(statusLabel) - } - - func updateViews() { - let emoji = TSAttachment.emoji(forMimeType: self.attachmentPointer.contentType) - nameLabel.text = "\(emoji) \(self.filename)" - - statusLabel.text = { - switch self.attachmentPointer.state { - case .enqueued: - return NSLocalizedString("ATTACHMENT_DOWNLOADING_STATUS_QUEUED", comment: "Status label when an attachment is enqueued, but hasn't yet started downloading") - case .downloading: - return NSLocalizedString("ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS", comment: "Status label when an attachment is currently downloading") - case .failed: - return NSLocalizedString("ATTACHMENT_DOWNLOADING_STATUS_FAILED", comment: "Status label when an attachment download has failed.") - } - }() - - if attachmentPointer.state == .downloading { - progressView.isHidden = false - progressView.autoSetDimension(.height, toSize: 8) - } else { - progressView.isHidden = true - progressView.autoSetDimension(.height, toSize: 0) - } - } - - var textColor: UIColor { - return conversationStyle.bubbleTextColor(isIncoming: isIncoming) - } - - @objc - public class func measureHeight() -> CGFloat { - return ceil(nameFont().lineHeight + - statusFont().lineHeight + - progressHeight + - vSpacing * 2) - } -} From 4bfa2513215982097f9b11b92453f6f7ceb90f99 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 13:22:54 -0400 Subject: [PATCH 317/493] Ensure constant bubble sizes for oversize text. --- .../ConversationView/Cells/OWSMessageBubbleView.m | 7 ------- .../ConversationView/ConversationViewItem.h | 1 - .../ConversationView/ConversationViewItem.m | 13 +------------ 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 246363ea4..fb6dcaa6a 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -281,7 +281,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes bodyMediaView = [self loadViewForMediaAlbum]; break; case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: bodyMediaView = [self loadViewForOversizeTextDownload]; break; } @@ -567,7 +566,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_GenericAttachment: case OWSMessageCellType_ContactShare: case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: return NO; case OWSMessageCellType_MediaMessage: return YES; @@ -584,7 +582,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_ContactShare: case OWSMessageCellType_MediaMessage: case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: return YES; } } @@ -895,8 +892,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - (UIView *)loadViewForOversizeTextDownload { - BOOL isFailed = self.cellType == OWSMessageCellType_OversizeTextFailed; - // We can use an empty view. The progress views will display download // progress or tap-to-retry UI. UIView *attachmentView = [UIView new]; @@ -1118,7 +1113,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } break; case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: // There's no way to predict the size of the oversize text, // so we just use a square bubble. result = CGSizeMake(maxMessageWidth, maxMessageWidth); @@ -1464,7 +1458,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes case OWSMessageCellType_Unknown: case OWSMessageCellType_TextOnlyMessage: case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: break; case OWSMessageCellType_Audio: if (self.viewItem.attachmentStream) { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h index b82272eaa..22bcf932c 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h @@ -15,7 +15,6 @@ typedef NS_ENUM(NSInteger, OWSMessageCellType) { OWSMessageCellType_ContactShare, OWSMessageCellType_MediaMessage, OWSMessageCellType_OversizeTextDownloading, - OWSMessageCellType_OversizeTextFailed, }; NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 180eef15e..de576aeaa 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -34,8 +34,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) return @"OWSMessageCellType_MediaMessage"; case OWSMessageCellType_OversizeTextDownloading: return @"OWSMessageCellType_OversizeTextDownloading"; - case OWSMessageCellType_OversizeTextFailed: - return @"OWSMessageCellType_OversizeTextFailed"; } } @@ -600,9 +598,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) } else if ([oversizeTextAttachment isKindOfClass:[TSAttachmentPointer class]]) { TSAttachmentPointer *oversizeTextAttachmentPointer = (TSAttachmentPointer *)oversizeTextAttachment; // TODO: Handle backup restore. - self.messageCellType = (oversizeTextAttachmentPointer.state == TSAttachmentPointerStateFailed - ? OWSMessageCellType_OversizeTextFailed - : OWSMessageCellType_OversizeTextDownloading); + self.messageCellType = OWSMessageCellType_OversizeTextDownloading; self.attachmentPointer = (TSAttachmentPointer *)oversizeTextAttachmentPointer; return; } else { @@ -894,7 +890,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) break; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); return; } @@ -932,7 +927,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) break; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: OWSFailDebug(@"Can't copy not-yet-downloaded attachment"); return; } @@ -989,7 +983,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) break; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: OWSFailDebug(@"Can't share not-yet-downloaded attachment"); return; } @@ -1019,7 +1012,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) return NO; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: return NO; } } @@ -1060,7 +1052,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) return NO; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: return NO; } } @@ -1088,7 +1079,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) break; } case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: OWSFailDebug(@"Can't save not-yet-downloaded attachment"); return; } @@ -1168,7 +1158,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) case OWSMessageCellType_MediaMessage: return self.firstValidAlbumAttachment != nil; case OWSMessageCellType_OversizeTextDownloading: - case OWSMessageCellType_OversizeTextFailed: return NO; } } From 936aa5842d5affeaade4b26fdffc39fe12e082fe Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 13:28:28 -0400 Subject: [PATCH 318/493] Clean up ahead of PR. --- .../ConversationView/Cells/OWSMessageBubbleView.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index fb6dcaa6a..eee75e651 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -990,14 +990,14 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes UILabel *label = [UILabel new]; label.text = NSLocalizedString( @"ATTACHMENT_DOWNLOADING_STATUS_FAILED", @"Status label when an attachment download has failed."); - label.font = UIFont.ows_dynamicTypeCaption1Font; - label.textColor = Theme.primaryColor; + label.font = UIFont.ows_dynamicTypeBodyFont; + label.textColor = Theme.secondaryColor; label.numberOfLines = 0; label.lineBreakMode = NSLineBreakByWordWrapping; label.textAlignment = NSTextAlignmentCenter; label.backgroundColor = self.bubbleColor; [bodyMediaView addSubview:label]; - [label autoPinEdgesToSuperviewEdges]; + [label autoPinEdgesToSuperviewMargins]; [label setContentHuggingLow]; [label setCompressionResistanceLow]; } From b6724ee1813b72ee0d9ed4fd218f0113f5091727 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 13:39:13 -0400 Subject: [PATCH 319/493] Clean up ahead of PR. --- .../src/ViewControllers/ConversationView/ConversationViewItem.m | 1 - 1 file changed, 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index de576aeaa..d7f53ad92 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -638,7 +638,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) self.audioDurationSeconds = audioDurationSeconds; self.messageCellType = OWSMessageCellType_Audio; } else { - OWSLogVerbose(@"contentType: %@", self.attachmentStream.contentType); self.messageCellType = OWSMessageCellType_GenericAttachment; } } else if (self.messageCellType == OWSMessageCellType_Unknown) { From df4cf5c09e8bf0c45968dc8aceed7a8d104876b7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Mar 2019 14:24:33 -0400 Subject: [PATCH 320/493] Respond to CR. --- .../ConversationView/Cells/OWSGenericAttachmentView.m | 3 +++ .../ConversationView/ConversationViewItem.m | 3 +++ .../src/Messages/Attachments/TSAttachmentPointer.m | 8 +++++--- .../src/Messages/Attachments/TSAttachmentStream.m | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m index b4895613d..b95fd220d 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m @@ -159,6 +159,9 @@ NS_ASSUME_NONNULL_BEGIN .fileSize; OWSAssertDebug(!error); } + // We don't want to show the file size while the attachment is downloading. + // To avoid layout jitter when the download completes, we reserve space in + // the layout using a whitespace string. NSString *bottomText = @" "; if (fileSize > 0) { bottomText = [OWSFormat formatFileSize:fileSize]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index d7f53ad92..5999f6731 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -990,6 +990,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (BOOL)canCopyMedia { if (self.attachmentPointer != nil) { + // The attachment is still downloading. return NO; } @@ -1018,6 +1019,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (BOOL)canSaveMedia { if (self.attachmentPointer != nil) { + // The attachment is still downloading. return NO; } @@ -1143,6 +1145,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) - (BOOL)hasMediaActionContent { if (self.attachmentPointer != nil) { + // The attachment is still downloading. return NO; } diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m index da2684f01..0e04b52bd 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TSAttachmentStream (TSAttachmentPointer) -- (CGSize)cachedImageSize; +- (CGSize)cachedMediaSize; @end @@ -100,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN _state = TSAttachmentPointerStateEnqueued; self.attachmentType = attachmentStream.attachmentType; _pointerType = TSAttachmentPointerTypeRestoring; - _mediaSize = (attachmentStream.shouldHaveImageSize ? attachmentStream.cachedImageSize : CGSizeZero); + _mediaSize = (attachmentStream.shouldHaveImageSize ? attachmentStream.cachedMediaSize : CGSizeZero); return self; } @@ -119,7 +119,9 @@ NS_ASSUME_NONNULL_BEGIN NSString *_Nullable fileName = attachmentProto.fileName; NSString *_Nullable contentType = attachmentProto.contentType; if (contentType.length < 1) { - OWSLogError(@"Invalid attachment content type."); + // Content type might not set if the sending client can't + // infer a MIME type from the file extension. + OWSLogWarn(@"Invalid attachment content type."); NSString *_Nullable fileExtension = [fileName pathExtension].lowercaseString; if (fileExtension.length > 0) { contentType = [MIMETypeUtil mimeTypeForFileExtension:fileExtension]; diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index bb0384d8d..8fba29f15 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -526,7 +526,7 @@ typedef void (^OWSLoadedThumbnailSuccess)(OWSLoadedThumbnail *loadedThumbnail); } } -- (CGSize)cachedImageSize +- (CGSize)cachedMediaSize { OWSAssertDebug(self.shouldHaveImageSize); From c0ad7da592528bd4f860910caa60e9c7d3857e1d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Mar 2019 17:25:03 -0700 Subject: [PATCH 321/493] update WebRTC artifact to M73 --- ThirdParty/WebRTC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdParty/WebRTC b/ThirdParty/WebRTC index 55de5593c..1445d719b 160000 --- a/ThirdParty/WebRTC +++ b/ThirdParty/WebRTC @@ -1 +1 @@ -Subproject commit 55de5593cc261fa9368c5ccde98884ed1e278ba0 +Subproject commit 1445d719bf05280270e9f77576f80f973fd847f8 From e66b45f6ce5bbb985f155714c348b2085e6ef1dd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 15:15:13 -0400 Subject: [PATCH 322/493] Fix spurious 'now' labels in date formatting. --- Signal/src/util/DateUtil.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m index 2349c9450..fd896fe0e 100644 --- a/Signal/src/util/DateUtil.m +++ b/Signal/src/util/DateUtil.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "DateUtil.h" @@ -361,11 +361,11 @@ static NSString *const DATE_FORMAT_WEEKDAY = @"EEEE"; [calendar components:NSCalendarUnitMinute | NSCalendarUnitHour fromDate:date toDate:nowDate options:0]; NSInteger minutesDiff = MAX(0, [relativeDiffComponents minute]); - if (minutesDiff < 1) { + NSInteger hoursDiff = MAX(0, [relativeDiffComponents hour]); + if (hoursDiff < 1 && minutesDiff < 1) { return NSLocalizedString(@"DATE_NOW", @"The present; the current time."); } - NSInteger hoursDiff = MAX(0, [relativeDiffComponents hour]); if (hoursDiff < 1) { NSString *minutesString = [OWSFormat formatInt:(int)minutesDiff]; return [NSString stringWithFormat:NSLocalizedString(@"DATE_MINUTES_AGO_FORMAT", From 6cc28bdf8fb5a792fd2b7d106afdedf68f6ff628 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 16:25:59 -0400 Subject: [PATCH 323/493] Redraw message bubbles when corner state changes. --- .../ConversationView/ConversationViewItem.m | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index 5999f6731..9f2f6a2a0 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -283,6 +283,32 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) [self clearCachedLayoutState]; } +- (void)setIsFirstInCluster:(BOOL)isFirstInCluster +{ + if (_isFirstInCluster == isFirstInCluster) { + return; + } + + _isFirstInCluster = isFirstInCluster; + + // Although this doesn't affect layout size, the view model use + // hasCachedLayoutState to detect which cells needs to be redrawn due to changes. + [self clearCachedLayoutState]; +} + +- (void)setIsLastInCluster:(BOOL)isLastInCluster +{ + if (_isLastInCluster == isLastInCluster) { + return; + } + + _isLastInCluster = isLastInCluster; + + // Although this doesn't affect layout size, the view model use + // hasCachedLayoutState to detect which cells needs to be redrawn due to changes. + [self clearCachedLayoutState]; +} + - (void)setUnreadIndicator:(nullable OWSUnreadIndicator *)unreadIndicator { if ([NSObject isNullableObject:_unreadIndicator equalTo:unreadIndicator]) { From 78ce3583ed6b27308ee110fe90f7b4c922999be1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 18 Mar 2019 11:08:40 -0700 Subject: [PATCH 324/493] fix rotation issue --- Signal/test/util/StringAdditionsTest.swift | 34 ++++++++- SignalMessaging/utils/OWSWindowManager.m | 87 ++++++++++++++++++++++ SignalServiceKit/src/Util/String+SSK.swift | 63 ++++++++++++++++ 3 files changed, 180 insertions(+), 4 deletions(-) diff --git a/Signal/test/util/StringAdditionsTest.swift b/Signal/test/util/StringAdditionsTest.swift index 005d742c5..3118ee600 100644 --- a/Signal/test/util/StringAdditionsTest.swift +++ b/Signal/test/util/StringAdditionsTest.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import XCTest @@ -16,7 +16,7 @@ class StringAdditionsTest: SignalBaseTest { super.tearDown() } - func testASCII() { + func test_truncated_ASCII() { let originalString = "Hello World" var truncatedString = originalString.truncated(toByteCount: 8) @@ -35,7 +35,7 @@ class StringAdditionsTest: SignalBaseTest { XCTAssertEqual("Hello World", truncatedString) } - func testMultiByte() { + func test_truncated_MultiByte() { let originalString = "🇨🇦🇨🇦🇨🇦🇨🇦" var truncatedString = originalString.truncated(toByteCount: 0) @@ -63,7 +63,7 @@ class StringAdditionsTest: SignalBaseTest { XCTAssertEqual("🇨🇦🇨🇦", truncatedString) } - func testMixed() { + func test_truncated_Mixed() { let originalString = "Oh🇨🇦Canada🇨🇦" var truncatedString = originalString.truncated(toByteCount: 0) @@ -97,4 +97,30 @@ class StringAdditionsTest: SignalBaseTest { XCTAssertEqual("Oh🇨🇦Canada🇨🇦", truncatedString) } + func test_caesar() { + XCTAssertEqual("abc", try! "abc".caesar(shift: 0)) + XCTAssertEqual("abc", try! "abc".caesar(shift: 127)) + + XCTAssertEqual("bcd", try! "abc".caesar(shift: 1)) + XCTAssertEqual("bcd", try! "abc".caesar(shift: 128)) + + XCTAssertEqual("z{b", try! "yza".caesar(shift: 1)) + XCTAssertEqual("|}d", try! "yza".caesar(shift: 3)) + XCTAssertEqual("ef=g", try! "bc:d".caesar(shift: 3)) + + let shifted = try! "abc".caesar(shift: 32) + let roundTrip = try! shifted.caesar(shift: 127 - 32) + XCTAssertEqual("abc", roundTrip) + } + + func test_encodedForSelector() { + XCTAssertEqual("cnN0", "abc".encodedForSelector) + XCTAssertEqual("abc", "abc".encodedForSelector!.decodedForSelector) + + XCTAssertNotEqual("abcWithFoo:bar:", "abcWithFoo:bar:".encodedForSelector) + XCTAssertEqual("abcWithFoo:bar:", "abcWithFoo:bar:".encodedForSelector!.decodedForSelector) + + XCTAssertNotEqual("abcWithFoo:bar:zaz1:", "abcWithFoo:bar:zaz1:".encodedForSelector) + XCTAssertEqual("abcWithFoo:bar:zaz1:", "abcWithFoo:bar:zaz1:".encodedForSelector!.decodedForSelector) + } } diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m index deea32f06..f85485492 100644 --- a/SignalMessaging/utils/OWSWindowManager.m +++ b/SignalMessaging/utils/OWSWindowManager.m @@ -500,6 +500,8 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) // In the normal case, that means the SignalViewController will call `becomeFirstResponder` // on the vc on top of its navigation stack. [self.rootWindow makeKeyAndVisible]; + + [self fixit_workAroundRotationIssue]; } - (void)ensureRootWindowHidden @@ -618,6 +620,91 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) [self showCallView]; } +#pragma mark - Fixit + +- (void)fixit_workAroundRotationIssue +{ + // ### Symptom + // + // The app can get into a degraded state where the main window will incorrectly remain locked in + // portrait mode. Worse yet, the status bar and input window will continue to rotate with respect + // to the device orientation. So once you're in this degraded state, the status bar and input + // window can be in landscape while simultaneoulsy the view controller behind them is in portrait. + // + // ### To Reproduce + // + // On an iPhone6 (not reproducible on an iPhoneX) + // + // 0. Ensure "screen protection" is enabled (not necessarily screen lock) + // 1. Enter Conversation View Controller + // 2. Pop Keyboard + // 3. Begin dismissing keyboard with one finger, but stopping when it's about 50% dismissed, + // keep your finger there with the keyboard partially dismissed. + // 4. With your other hand, hit the home button to leave Signal. + // 5. Re-enter Signal + // 6. Rotate to landscape + // + // Expected: Conversation View, Input Toolbar window, and Settings Bar should all rotate to landscape. + // Actual: The input toolbar and the settings toolbar rotate to landscape, but the Conversation + // View remains in portrait, this looks super broken. + // + // ### Background + // + // Some debugging shows that the `ConversationViewController.view.window.isInterfaceAutorotationDisabled` + // is true. This is a private property, whose function we don't exactly know, but it seems like + // `interfaceAutorotation` is disabled when certain transition animations begin, and then + // re-enabled once the animation completes. + // + // My best guess is that autorotation is intended to be disabled for the duration of the + // interactive-keyboard-dismiss-transition, so when we start the interactive dismiss, autorotation + // has been disabled, but because we hide the main app window in the middle of the transition, + // autorotation doesn't have a chance to be re-enabled. + // + // ## So, The Fix + // + // If we find ourself in a situation where autorotation is disabled while showing the rootWindow, + // we re-enable autorotation. + + // NSString *encodedSelectorString1 = @"isInterfaceAutorotationDisabled".encodedForSelector; + NSString *encodedSelectorString1 = @"egVaAAZ2BHdydHZSBwYBBAEGcgZ6AQBVegVyc312dQ=="; + NSString *_Nullable selectorString1 = encodedSelectorString1.decodedForSelector; + if (selectorString1 == nil) { + OWSFailDebug(@"selectorString1 was unexpectedly nil"); + return; + } + SEL selector1 = NSSelectorFromString(selectorString1); + + if (![self.rootWindow respondsToSelector:selector1]) { + OWSFailDebug(@"failure: doesn't respond to selector1"); + return; + } + IMP imp1 = [self.rootWindow methodForSelector:selector1]; + BOOL (*func1)(id, SEL) = (void *)imp1; + BOOL isDisabled = func1(self.rootWindow, selector1); + OWSLogInfo(@"autorotation is disabled: %d", isDisabled); + + if (isDisabled) { + // NSString *encodedSelectorString2 = @"endDisablingInterfaceAutorotation".encodedForSelector; + NSString *encodedSelectorString2 = @"dgB1VXoFcnN9egB4WgAGdgR3cnR2UgcGAQQBBnIGegEA"; + NSString *selectorString2 = encodedSelectorString2.decodedForSelector; + if (selectorString2 == nil) { + OWSFailDebug(@"selectorString2 was unexpectedly nil"); + return; + } + SEL selector2 = NSSelectorFromString(selectorString2); + + if (![self.rootWindow respondsToSelector:selector2]) { + OWSFailDebug(@"failure: doesn't respond to selector2"); + return; + } + + IMP imp2 = [self.rootWindow methodForSelector:selector2]; + void (*func2)(id, SEL) = (void *)imp2; + func2(self.rootWindow, selector2); + OWSLogInfo(@"re-enabling autorotation"); + } +} + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Util/String+SSK.swift b/SignalServiceKit/src/Util/String+SSK.swift index 3b6684c5e..cdfdaee57 100644 --- a/SignalServiceKit/src/Util/String+SSK.swift +++ b/SignalServiceKit/src/Util/String+SSK.swift @@ -20,4 +20,67 @@ public extension String { public func substring(to index: Int) -> String { return String(prefix(index)) } + + enum StringError: Error { + case invalidCharacterShift + } +} + +// MARK: - Selector Encoding + +private let selectorOffset: UInt32 = 17 + +public extension String { + + public func caesar(shift: UInt32) throws -> String { + let shiftedScalars: [UnicodeScalar] = try unicodeScalars.map { c in + guard let shiftedScalar = UnicodeScalar((c.value + shift) % 127) else { + owsFailDebug("invalidCharacterShift") + throw StringError.invalidCharacterShift + } + return shiftedScalar + } + return String(String.UnicodeScalarView(shiftedScalars)) + } + + public var encodedForSelector: String? { + guard let shifted = try? self.caesar(shift: selectorOffset) else { + owsFailDebug("shifted was unexpectedly nil") + return nil + } + + guard let data = shifted.data(using: .utf8) else { + owsFailDebug("data was unexpectedly nil") + return nil + } + + return data.base64EncodedString() + } + + public var decodedForSelector: String? { + guard let data = Data(base64Encoded: self) else { + owsFailDebug("data was unexpectedly nil") + return nil + } + + guard let shifted = String(data: data, encoding: .utf8) else { + owsFailDebug("shifted was unexpectedly nil") + return nil + } + + return try? shifted.caesar(shift: 127 - selectorOffset) + } +} + +public extension NSString { + + @objc + public var encodedForSelector: String? { + return (self as String).encodedForSelector + } + + @objc + public var decodedForSelector: String? { + return (self as String).decodedForSelector + } } From 134cade52c06e238f411fcc6d9fc7b1f0c8642ec Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 15 Mar 2019 16:25:14 -0700 Subject: [PATCH 325/493] fix longtext layout: though text content should be inset from the edges, the scrollbar should abut the edge of the screen. --- Signal/src/ViewControllers/LongTextViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 27b7391aa..b6f0062a3 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -153,8 +153,9 @@ public class LongTextViewController: OWSViewController { view.addSubview(messageTextView) messageTextView.autoPinEdge(toSuperviewEdge: .top) - messageTextView.autoPinEdge(toSuperviewMargin: .leading) - messageTextView.autoPinEdge(toSuperviewMargin: .trailing) + messageTextView.autoPinEdge(toSuperviewEdge: .leading) + messageTextView.autoPinEdge(toSuperviewEdge: .trailing) + messageTextView.textContainerInset = UIEdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 16) let footer = UIToolbar() view.addSubview(footer) From 0b638f4831a7001c5757b998901c5b3f40e9df9b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 14 Mar 2019 18:24:15 -0700 Subject: [PATCH 326/493] link checks --- Podfile.lock | 2 +- .../Cells/OWSMessageBubbleView.h | 2 - .../Cells/OWSMessageBubbleView.m | 13 ++-- .../Cells/OWSMessageTextView.h | 2 +- .../ViewControllers/DebugUI/DebugUIMessages.m | 52 +++++++++++++++ .../LongTextViewController.swift | 35 +++++----- .../test/util/DisplayableTextFilterTest.swift | 58 +++++++++++++++- SignalMessaging/Views/OWSTextView.h | 6 +- SignalMessaging/Views/OWSTextView.m | 30 ++++++++- SignalMessaging/utils/DisplayableText.swift | 66 ++++++++++++++++++- .../src/Util/NSRegularExpression+SSK.swift | 17 +++++ 11 files changed, 248 insertions(+), 35 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index efec89b65..d70f2e075 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -269,7 +269,7 @@ CHECKOUT OPTIONS: :commit: 9599b1d9796280c97cb2f786f34984fc98a3b6ef :git: https://github.com/signalapp/Mantle SignalCoreKit: - :commit: 061f41321675ffe5af5e547d578bbd2266a46d33 + :commit: 0326310d32744902539bd6a2f170ee7413805754 :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62 diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h index b9b1e7723..942cc0c1e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.h @@ -25,8 +25,6 @@ typedef NS_ENUM(NSUInteger, OWSMessageGestureLocation) { OWSMessageGestureLocation_LinkPreview, }; -extern const UIDataDetectorTypes kOWSAllowedDataDetectorTypes; - @protocol OWSMessageBubbleViewDelegate - (void)didTapImageViewItem:(id)viewItem diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index eee75e651..4308f3513 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -21,9 +21,6 @@ NS_ASSUME_NONNULL_BEGIN -const UIDataDetectorTypes kOWSAllowedDataDetectorTypes - = UIDataDetectorTypeLink | UIDataDetectorTypeAddress | UIDataDetectorTypeCalendarEvent; - @interface OWSMessageBubbleView () @property (nonatomic) OWSBubbleView *bubbleView; @@ -107,8 +104,6 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes [self.senderNameLabel ows_autoPinToSuperviewMargins]; self.bodyTextView = [self newTextView]; - // Setting dataDetectorTypes is expensive. Do it just once. - self.bodyTextView.dataDetectorTypes = kOWSAllowedDataDetectorTypes; self.bodyTextView.hidden = YES; self.linkPreviewView = [[LinkPreviewView alloc] initWithDraftDelegate:nil]; @@ -682,7 +677,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes shouldIgnoreEvents = outgoingMessage.messageState != TSOutgoingMessageStateSent; } [self.class loadForTextDisplay:self.bodyTextView - text:self.displayableBodyText.displayText + displayableText:self.displayableBodyText searchText:self.delegate.lastSearchedText textColor:self.bodyTextColor font:self.textMessageFont @@ -690,7 +685,7 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } + (void)loadForTextDisplay:(OWSMessageTextView *)textView - text:(NSString *)text + displayableText:(DisplayableText *)displayableText searchText:(nullable NSString *)searchText textColor:(UIColor *)textColor font:(UIFont *)font @@ -707,6 +702,8 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes }; textView.shouldIgnoreEvents = shouldIgnoreEvents; + NSString *text = displayableText.displayText; + NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:text attributes:@{ NSFontAttributeName : font, NSForegroundColorAttributeName : textColor }]; @@ -725,6 +722,8 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes } } + [textView ensureShouldLinkifyText:displayableText.shouldAllowLinkification]; + // For perf, set text last. Otherwise changing font/color is more expensive. // We use attributedText even when we're not highlighting searched text to esnure any lingering diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.h index 7b100c497..ea06066e7 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTextView.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index acf3440cf..38e12da3a 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -287,6 +287,11 @@ NS_ASSUME_NONNULL_BEGIN actionBlock:^{ [DebugUIMessages testDirectionalFilenamesInThread:thread]; }], + [OWSTableItem itemWithTitle:@"Test Linkification" + actionBlock:^{ + [DebugUIMessages testLinkificationInThread:thread]; + }], + ]]; if ([thread isKindOfClass:[TSContactThread class]]) { @@ -4342,6 +4347,53 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac [message save]; } ++ (void)testLinkificationInThread:(TSThread *)thread +{ + NSArray *strings = @[@"google.com", + @"foo.google.com", + @"https://foo.google.com", + @"https://foo.google.com/some/path.html", + @"http://кц.com", + @"кц.com", + @"http://asĸ.com", + @"кц.рф", + @"кц.рф/some/path", + @"https://кц.рф/some/path", + @"http://foo.кц.рф"]; + + [OWSPrimaryStorage.sharedManager.dbReadWriteConnection + readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + for (NSString *string in strings) { + // DO NOT log these strings with the debugger attached. + // OWSLogInfo(@"%@", string); + + { + [self createFakeIncomingMessage:thread + messageBody:string + fakeAssetLoader:nil + isAttachmentDownloaded:NO + quotedMessage:nil + transaction:transaction]; + } + { + NSString *recipientId = @"+1323555555"; + NSString *groupName = string; + NSMutableArray *recipientIds = [@[ + recipientId, + [TSAccountManager localNumber], + ] mutableCopy]; + NSData *groupId = [Randomness generateRandomBytes:kGroupIdLength]; + TSGroupModel *groupModel = + [[TSGroupModel alloc] initWithTitle:groupName memberIds:recipientIds image:nil groupId:groupId]; + + TSGroupThread *groupThread = + [TSGroupThread getOrCreateThreadWithGroupModel:groupModel transaction:transaction]; + OWSAssertDebug(groupThread); + } + } + }]; +} + + (void)testIndicScriptsInThread:(TSThread *)thread { NSArray *strings = @[ diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index b6f0062a3..2f9b88bbb 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -28,10 +28,16 @@ public class LongTextViewController: OWSViewController { let viewItem: ConversationViewItem - let messageBody: String - var messageTextView: UITextView! + var displayableText: DisplayableText? { + return viewItem.displayableBodyText + } + + var fullText: String { + return displayableText?.fullText ?? "" + } + // MARK: Initializers @available(*, unavailable, message:"use other constructor instead.") @@ -42,23 +48,9 @@ public class LongTextViewController: OWSViewController { @objc public required init(viewItem: ConversationViewItem) { self.viewItem = viewItem - - self.messageBody = LongTextViewController.displayableText(viewItem: viewItem) - super.init(nibName: nil, bundle: nil) } - private class func displayableText(viewItem: ConversationViewItem) -> String { - guard viewItem.hasBodyText else { - return "" - } - guard let displayableText = viewItem.displayableBodyText else { - return "" - } - let messageBody = displayableText.fullText - return messageBody - } - // MARK: View Lifecycle public override func viewDidLoad() { @@ -137,8 +129,13 @@ public class LongTextViewController: OWSViewController { messageTextView.showsVerticalScrollIndicator = true messageTextView.isUserInteractionEnabled = true messageTextView.textColor = Theme.primaryColor - messageTextView.dataDetectorTypes = kOWSAllowedDataDetectorTypes - messageTextView.text = messageBody + if let displayableText = displayableText { + messageTextView.text = fullText + messageTextView.ensureShouldLinkifyText(displayableText.shouldAllowLinkification) + } else { + owsFailDebug("displayableText was unexpectedly nil") + messageTextView.text = "" + } // RADAR #18669 // https://github.com/lionheart/openradar-mirror/issues/18669 @@ -173,6 +170,6 @@ public class LongTextViewController: OWSViewController { // MARK: - Actions @objc func shareButtonPressed() { - AttachmentSharing.showShareUI(forText: messageBody) + AttachmentSharing.showShareUI(forText: fullText) } } diff --git a/Signal/test/util/DisplayableTextFilterTest.swift b/Signal/test/util/DisplayableTextFilterTest.swift index 204f4521e..bcb08ae70 100644 --- a/Signal/test/util/DisplayableTextFilterTest.swift +++ b/Signal/test/util/DisplayableTextFilterTest.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import XCTest @@ -106,4 +106,60 @@ class DisplayableTextTest: SignalBaseTest { XCTAssertFalse("H҉̸̧͘͠A͢͞V̛̛I̴̸N͏̕͏G҉̵͜͏͢ ̧̧́T̶̛͘͡R̸̵̨̢̀O̷̡U͡҉B̶̛͢͞L̸̸͘͢͟É̸ ̸̛͘͏R͟È͠͞A̸͝Ḑ̕͘͜I̵͘҉͜͞N̷̡̢͠G̴͘͠ ͟͞T͏̢́͡È̀X̕҉̢̀T̢͠?̕͏̢͘͢".containsOnlyEmoji) XCTAssertFalse("L̷̳͔̲͝Ģ̵̮̯̤̩̙͍̬̟͉̹̘̹͍͈̮̦̰̣͟͝O̶̴̮̻̮̗͘͡!̴̷̟͓͓".containsOnlyEmoji) } + + func test_shouldAllowLinkification() { + func assertLinkifies(_ text: String, file: StaticString = #file, line: UInt = #line) { + let displayableText = DisplayableText.displayableText(text) + XCTAssert(displayableText.shouldAllowLinkification, "was not linkifiable text: \(text)", file: file, line: line) + } + + func assertNotLinkifies(_ text: String, file: StaticString = #file, line: UInt = #line) { + let displayableText = DisplayableText.displayableText(text) + XCTAssertFalse(displayableText.shouldAllowLinkification, "was linkifiable text: \(text)", file: file, line: line) + } + + // some basic happy paths + assertLinkifies("foo google.com") + assertLinkifies("google.com/foo") + assertLinkifies("blah google.com/foo") + assertLinkifies("foo http://google.com") + assertLinkifies("foo https://google.com") + + // cyrillic host with ascii tld + assertNotLinkifies("foo http://asĸ.com") + assertNotLinkifies("http://asĸ.com") + assertNotLinkifies("asĸ.com") + + // Mixed latin and cyrillic text, but it's not a link + // (nothing to linkify, but there's nothing illegal here) + assertLinkifies("asĸ") + + // Cyrillic host with cyrillic TLD + assertLinkifies("http://кц.рф") + assertLinkifies("https://кц.рф") + assertLinkifies("кц.рф") + assertLinkifies("https://кц.рф/foo") + assertLinkifies("https://кц.рф/кц") + assertLinkifies("https://кц.рф/кцfoo") + + // ascii text outside of the link, with cyrillic host + cyrillic domain + assertLinkifies("some text: кц.рф") + + // Mixed ascii/cyrillic text outside of the link, with cyrillic host + cyrillic domain + assertLinkifies("asĸ кц.рф") + + assertLinkifies("google.com") + assertLinkifies("foo.google.com") + assertLinkifies("https://foo.google.com") + assertLinkifies("https://foo.google.com/some/path.html") + + assertNotLinkifies("asĸ.com") + assertNotLinkifies("https://кц.cфm") + assertNotLinkifies("https://google.cфm") + + assertLinkifies("кц.рф") + assertLinkifies("кц.рф/some/path") + assertLinkifies("https://кц.рф/some/path") + assertNotLinkifies("http://foo.кц.рф") + } } diff --git a/SignalMessaging/Views/OWSTextView.h b/SignalMessaging/Views/OWSTextView.h index 6a703cd0f..0e63c7f7a 100644 --- a/SignalMessaging/Views/OWSTextView.h +++ b/SignalMessaging/Views/OWSTextView.h @@ -1,11 +1,15 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN +extern const UIDataDetectorTypes kOWSAllowedDataDetectorTypes; + @interface OWSTextView : UITextView +- (void)ensureShouldLinkifyText:(BOOL)shouldLinkifyText; + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/Views/OWSTextView.m b/SignalMessaging/Views/OWSTextView.m index a175766d6..d06d74036 100644 --- a/SignalMessaging/Views/OWSTextView.m +++ b/SignalMessaging/Views/OWSTextView.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSTextView.h" @@ -7,6 +7,12 @@ NS_ASSUME_NONNULL_BEGIN +const UIDataDetectorTypes kOWSAllowedDataDetectorTypes + = UIDataDetectorTypeLink | UIDataDetectorTypeAddress | UIDataDetectorTypeCalendarEvent; + +const UIDataDetectorTypes kOWSAllowedDataDetectorTypesExceptLinks + = UIDataDetectorTypeAddress | UIDataDetectorTypeCalendarEvent; + @implementation OWSTextView - (instancetype)initWithFrame:(CGRect)frame textContainer:(nullable NSTextContainer *)textContainer @@ -15,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN [self ows_applyTheme]; } + // Setting dataDetectorTypes is expensive. Do it just once. + self.dataDetectorTypes = kOWSAllowedDataDetectorTypes; + return self; } @@ -24,6 +33,8 @@ NS_ASSUME_NONNULL_BEGIN [self ows_applyTheme]; } + self.dataDetectorTypes = kOWSAllowedDataDetectorTypes; + return self; } @@ -32,6 +43,23 @@ NS_ASSUME_NONNULL_BEGIN self.keyboardAppearance = Theme.keyboardAppearance; } +// MARK: - + +- (void)ensureShouldLinkifyText:(BOOL)shouldLinkifyText +{ + if (shouldLinkifyText) { + // Setting dataDetectorTypes can be expensive, so we only update it when it's changed. + if (self.dataDetectorTypes != kOWSAllowedDataDetectorTypes) { + self.dataDetectorTypes = kOWSAllowedDataDetectorTypes; + } + } else { + // Setting dataDetectorTypes can be expensive, so we only update it when it's changed. + if (self.dataDetectorTypes != kOWSAllowedDataDetectorTypesExceptLinks) { + self.dataDetectorTypes = kOWSAllowedDataDetectorTypesExceptLinks; + } + } +} + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/utils/DisplayableText.swift b/SignalMessaging/utils/DisplayableText.swift index 964ef28e0..9ef58c2c0 100644 --- a/SignalMessaging/utils/DisplayableText.swift +++ b/SignalMessaging/utils/DisplayableText.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -165,7 +165,8 @@ extension String { // MARK: Initializers - @objc public init(fullText: String, displayText: String, isTextTruncated: Bool) { + @objc + public init(fullText: String, displayText: String, isTextTruncated: Bool) { self.fullText = fullText self.displayText = displayText self.isTextTruncated = isTextTruncated @@ -198,6 +199,67 @@ extension String { return UInt(emojiCount) } + // For perf we use a static linkDetector. It doesn't change and building DataDetectors is + // surprisingly expensive. This should be fine, since NSDataDetector is an NSRegularExpression + // and NSRegularExpressions are thread safe. + private static let linkDetector: NSDataDetector? = { + return try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue) + }() + + private static let hostRegex: NSRegularExpression? = { + let pattern = "^(?:https?:\\/\\/)?([^:\\/\\s]+)(.*)?$" + return try? NSRegularExpression(pattern: pattern) + }() + + @objc + public lazy var shouldAllowLinkification: Bool = { + guard let linkDetector: NSDataDetector = DisplayableText.linkDetector else { + owsFailDebug("linkDetector was unexpectedly nil") + return false + } + + func isValidLink(linkText: String) -> Bool { + guard let hostRegex = DisplayableText.hostRegex else { + owsFailDebug("hostRegex was unexpectedly nil") + return false + } + + guard let hostText = hostRegex.parseFirstMatch(inText: linkText) else { + owsFailDebug("hostText was unexpectedly nil") + return false + } + + let strippedHost = hostText.replacingOccurrences(of: ".", with: "") as NSString + + if strippedHost.isOnlyASCII { + return true + } else if strippedHost.hasAnyASCII { + // mix of ascii and non-ascii is invalid + return false + } else { + // IDN + return true + } + } + + for match in linkDetector.matches(in: fullText, options: [], range: NSRange(location: 0, length: fullText.utf16.count)) { + guard let matchURL: URL = match.url else { + continue + } + + // We extract the exact text from the `fullText` rather than use match.url.host + // because match.url.host actually escapes non-ascii domains into puny-code. + // + // But what we really want is to check the text which will ultimately be presented to + // the user. + let rawTextOfMatch = (fullText as NSString).substring(with: match.range) + guard isValidLink(linkText: rawTextOfMatch) else { + return false + } + } + return true + }() + // MARK: Filter Methods @objc diff --git a/SignalServiceKit/src/Util/NSRegularExpression+SSK.swift b/SignalServiceKit/src/Util/NSRegularExpression+SSK.swift index e9b398d38..e4574467d 100644 --- a/SignalServiceKit/src/Util/NSRegularExpression+SSK.swift +++ b/SignalServiceKit/src/Util/NSRegularExpression+SSK.swift @@ -35,4 +35,21 @@ public extension NSRegularExpression { return nil } } + + @objc + public func parseFirstMatch(inText text: String, + options: NSRegularExpression.Options = []) -> String? { + guard let match = self.firstMatch(in: text, + options: [], + range: NSRange(location: 0, length: text.utf16.count)) else { + return nil + } + let matchRange = match.range(at: 1) + guard let textRange = Range(matchRange, in: text) else { + owsFailDebug("Invalid match.") + return nil + } + let substring = String(text[textRange]) + return substring + } } From 204098f38aae767fd369cf9995f9706e626eb772 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 18 Mar 2019 15:23:40 -0700 Subject: [PATCH 327/493] update pods --- Pods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pods b/Pods index 4e153f47e..1da2265dd 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 4e153f47ef16d84b3256dd5d3884c708fdf0ab33 +Subproject commit 1da2265dd490b9d232a963b26a0ae3da26e6b71c From 52d6aa69b844ea8dd74d92342f99958eabf90d23 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Mar 2019 16:25:24 -0400 Subject: [PATCH 328/493] Improve measurement of image editor text layers. --- .../ImageEditor/ImageEditorCanvasView.swift | 23 +++++++++++-------- SignalMessaging/categories/UIView+OWS.swift | 4 ++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 72d5fe3f7..92ec0ef7c 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -500,8 +500,14 @@ public class ImageEditorCanvasView: UIView { // using the image width as reference. let fontSize = item.font.pointSize * imageFrame.size.width / item.fontReferenceImageWidth + let text = item.text.filterForDisplay ?? "" + let attributedString = NSAttributedString(string: text, + attributes: [ + NSAttributedStringKey.font: item.font.withSize(fontSize), + NSAttributedStringKey.foregroundColor: item.color.color + ]) let layer = EditorTextLayer(itemId: item.itemId) - layer.string = item.text + layer.string = attributedString layer.foregroundColor = item.color.cgColor layer.font = CGFont(item.font.fontName as CFString) layer.fontSize = fontSize @@ -523,21 +529,18 @@ public class ImageEditorCanvasView: UIView { let maxSize = CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude) // TODO: Is there a more accurate way to measure text in a CATextLayer? // CoreText? - let textBounds = (item.text as NSString).boundingRect(with: maxSize, - options: [ - .usesLineFragmentOrigin, - .usesFontLeading + let textBounds = attributedString.boundingRect(with: maxSize, + options: [ + .usesLineFragmentOrigin, + .usesFontLeading ], - attributes: [ - .font: item.font.withSize(fontSize) - ], - context: nil) + context: nil) // The text item's center is specified in "image unit" coordinates, but // needs to be rendered in "canvas" coordinates. The imageFrame // is the bounds of the image specified in "canvas" coordinates, // so to transform we can simply convert from image frame units. let centerInCanvas = item.unitCenter.fromUnitCoordinates(viewBounds: imageFrame) - let layerSize = CGSizeCeil(textBounds.size) + let layerSize = textBounds.size.ceil layer.frame = CGRect(origin: CGPoint(x: centerInCanvas.x - layerSize.width * 0.5, y: centerInCanvas.y - layerSize.height * 0.5), size: layerSize) diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index a05025f0c..a3d6ac960 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -245,6 +245,10 @@ public extension CGSize { var asPoint: CGPoint { return CGPoint(x: width, y: height) } + + var ceil: CGSize { + return CGSizeCeil(self) + } } public extension CGRect { From 4f06e6dd6e2c2b0e12e183b8ed189f39f5501d5c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Feb 2019 13:01:57 -0500 Subject: [PATCH 329/493] Conversation view always observes view model. --- .../ConversationViewController.m | 203 +- .../ConversationView/ConversationViewModel.h | 2 - .../ConversationView/ConversationViewModel.m | 14 - temp.txt | 16486 ++++++++++++++++ 4 files changed, 16492 insertions(+), 213 deletions(-) create mode 100644 temp.txt diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 28b6ed57d..3cec015f0 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -108,25 +108,6 @@ typedef enum : NSUInteger { #pragma mark - -// We use snapshots to ensure that the view has a consistent -// representation of view model state which is not updated -// when the view is not observing view model changes. -@interface ConversationSnapshot : NSObject - -@property (nonatomic) NSArray> *viewItems; -@property (nonatomic) ThreadDynamicInteractions *dynamicInteractions; -@property (nonatomic) BOOL canLoadMoreItems; - -@end - -#pragma mark - - -@implementation ConversationSnapshot - -@end - -#pragma mark - - @interface ConversationViewController () > *)viewItems { - return self.conversationSnapshot.viewItems; + return self.conversationViewModel.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions { - return self.conversationSnapshot.dynamicInteractions; + return self.conversationViewModel.dynamicInteractions; } - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator @@ -882,7 +853,6 @@ typedef enum : NSUInteger { // Avoid layout corrupt issues and out-of-date message subtitles. self.lastReloadDate = [NSDate new]; [self.conversationViewModel viewDidResetContentAndLayout]; - [self tryToUpdateConversationSnapshot]; [self.collectionView.collectionViewLayout invalidateLayout]; [self.collectionView reloadData]; @@ -1749,7 +1719,7 @@ typedef enum : NSUInteger { { OWSAssertDebug(self.conversationViewModel); - self.showLoadMoreHeader = self.conversationSnapshot.canLoadMoreItems; + self.showLoadMoreHeader = self.conversationViewModel.canLoadMoreItems; } - (void)setShowLoadMoreHeader:(BOOL)showLoadMoreHeader @@ -1998,8 +1968,6 @@ typedef enum : NSUInteger { - (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController { [[OWSWindowManager sharedManager] hideMenuActionsWindow]; - - [self updateShouldObserveVMUpdates]; } - (void)menuActions:(MenuActionsViewController *)menuActionsViewController @@ -2106,8 +2074,6 @@ typedef enum : NSUInteger { self.conversationViewModel.mostRecentMenuActionsViewItem = cell.viewItem; [[OWSWindowManager sharedManager] showMenuActionsWindow:menuActionsViewController]; - - [self updateShouldObserveVMUpdates]; } - (NSAttributedString *)attributedContactOrProfileNameForPhoneIdentifier:(NSString *)recipientId @@ -4308,7 +4274,6 @@ typedef enum : NSUInteger { { _isViewVisible = isViewVisible; - [self updateShouldObserveVMUpdates]; [self updateCellsVisible]; } @@ -4321,134 +4286,8 @@ typedef enum : NSUInteger { } } -- (void)updateShouldObserveVMUpdates -{ - if (!CurrentAppContext().isAppForegroundAndActive) { - self.shouldObserveVMUpdates = NO; - return; - } - - if (!self.isViewVisible) { - self.shouldObserveVMUpdates = NO; - return; - } - - if (OWSWindowManager.sharedManager.isPresentingMenuActions) { - self.shouldObserveVMUpdates = NO; - return; - } - - self.shouldObserveVMUpdates = YES; -} - -- (void)setShouldObserveVMUpdates:(BOOL)shouldObserveVMUpdates -{ - if (_shouldObserveVMUpdates == shouldObserveVMUpdates) { - return; - } - - _shouldObserveVMUpdates = shouldObserveVMUpdates; - - if (self.shouldObserveVMUpdates) { - OWSLogVerbose(@"resume observation of view model."); - - [self updateConversationSnapshot]; - [self resetContentAndLayout]; - [self updateBackButtonUnreadCount]; - [self updateNavigationBarSubtitleLabel]; - [self updateDisappearingMessagesConfiguration]; - - // Detect changes in the mapping's "window" size. - if (self.previousViewTopToContentBottom && self.previousViewItemCount - && self.previousViewItemCount.unsignedIntegerValue != self.viewItems.count) { - CGFloat newContentHeight = self.safeContentHeight; - CGPoint newContentOffset - = CGPointMake(0, MAX(0, newContentHeight - self.previousViewTopToContentBottom.floatValue)); - [self.collectionView setContentOffset:newContentOffset animated:NO]; - } - - // When we resume observing database changes, we want to scroll to show the user - // any new items inserted while we were not observing. We therefore find the - // first item at or after the "view horizon". See the comments below which explain - // the "view horizon". - id _Nullable lastViewItem = self.viewItems.lastObject; - BOOL hasAddedNewItems = (lastViewItem && self.previousLastTimestamp - && lastViewItem.interaction.timestamp > self.previousLastTimestamp.unsignedLongLongValue); - - OWSLogInfo(@"hasAddedNewItems: %d", hasAddedNewItems); - if (hasAddedNewItems) { - NSIndexPath *_Nullable indexPathToShow = [self firstIndexPathAtViewHorizonTimestamp]; - if (indexPathToShow) { - // The goal is to show _both_ the last item before the "view horizon" and the - // first item after the "view horizon". We can't do "top on first item after" - // or "bottom on last item before" or we won't see the other. Unfortunately, - // this gets tricky if either is huge. The largest cells are oversize text, - // which should be rare. Other cells are considerably smaller than a screenful. - [self.collectionView scrollToItemAtIndexPath:indexPathToShow - atScrollPosition:UICollectionViewScrollPositionCenteredVertically - animated:NO]; - } - } - self.viewHorizonTimestamp = nil; - OWSLogVerbose(@"resumed observation of view model."); - } else { - OWSLogVerbose(@"pausing observation of view model."); - // When stopping observation, try to record the timestamp of the "view horizon". - // The "view horizon" is where we'll want to focus the users when we resume - // observation if any changes have happened while we weren't observing. - // Ideally, we'll focus on those changes. But we can't skip over unread - // interactions, so we prioritize those, if any. - // - // We'll use this later to update the view to reflect any changes made while - // we were not observing the database. See extendRangeToIncludeUnobservedItems - // and the logic above. - id _Nullable lastViewItem = self.viewItems.lastObject; - if (lastViewItem) { - self.previousLastTimestamp = @(lastViewItem.interaction.timestamp); - self.previousViewItemCount = @(self.viewItems.count); - } else { - self.previousLastTimestamp = nil; - self.previousViewItemCount = nil; - } - - __block TSInteraction *_Nullable firstUnseenInteraction = nil; - [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { - firstUnseenInteraction = - [[TSDatabaseView unseenDatabaseViewExtension:transaction] firstObjectInGroup:self.thread.uniqueId]; - }]; - if (firstUnseenInteraction) { - // If there are any unread interactions, focus on the first one. - self.viewHorizonTimestamp = @(firstUnseenInteraction.timestamp); - } else if (lastViewItem) { - // Otherwise, focus _just after_ the last interaction. - self.viewHorizonTimestamp = @(lastViewItem.interaction.timestamp + 1); - } else { - self.viewHorizonTimestamp = nil; - } - - // Snapshot the scroll state by measuring the "distance from top of view to - // bottom of content"; if the mapping's "window" size grows, it will grow - // _upward_. - OWSAssertDebug([self.collectionView.collectionViewLayout isKindOfClass:[ConversationViewLayout class]]); - ConversationViewLayout *conversationViewLayout - = (ConversationViewLayout *)self.collectionView.collectionViewLayout; - // To avoid laying out the collection view during initial view - // presentation, don't trigger layout here (via safeContentHeight) - // until layout has been done at least once. - if (conversationViewLayout.hasEverHadLayout) { - self.previousViewTopToContentBottom = @(self.safeContentHeight - self.collectionView.contentOffset.y); - } else { - self.previousViewTopToContentBottom = nil; - } - - OWSLogVerbose(@"paused observation of view model."); - } -} - - (nullable NSIndexPath *)firstIndexPathAtViewHorizonTimestamp { - OWSAssertDebug(self.shouldObserveVMUpdates); - if (!self.viewHorizonTimestamp) { return nil; } @@ -4795,11 +4634,6 @@ typedef enum : NSUInteger { #pragma mark - ConversationViewModelDelegate -- (BOOL)isObservingVMUpdates -{ - return self.shouldObserveVMUpdates; -} - - (void)conversationViewModelWillUpdate { OWSAssertIsOnMainThread(); @@ -4823,11 +4657,6 @@ typedef enum : NSUInteger { OWSAssertDebug(conversationUpdate); OWSAssertDebug(self.conversationViewModel); - if (!self.shouldObserveVMUpdates) { - return; - } - - [self updateConversationSnapshot]; [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; @@ -5137,26 +4966,6 @@ typedef enum : NSUInteger { [self updateScrollDownButtonLayout]; } -#pragma mark - Conversation Snapshot - -- (void)tryToUpdateConversationSnapshot -{ - if (!self.isObservingVMUpdates) { - return; - } - - [self updateConversationSnapshot]; -} - -- (void)updateConversationSnapshot -{ - ConversationSnapshot *conversationSnapshot = [ConversationSnapshot new]; - conversationSnapshot.viewItems = self.conversationViewModel.viewItems; - conversationSnapshot.dynamicInteractions = self.conversationViewModel.dynamicInteractions; - conversationSnapshot.canLoadMoreItems = self.conversationViewModel.canLoadMoreItems; - _conversationSnapshot = conversationSnapshot; -} - @end NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index 8b218d541..382548f8b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -76,8 +76,6 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { - (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem; -- (BOOL)isObservingVMUpdates; - - (ConversationStyle *)conversationStyle; @end diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 99c928218..3a23a3e31 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -542,19 +542,12 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSLogVerbose(@""); - if (!self.delegate.isObservingVMUpdates) { - return; - } - // External database modifications (e.g. changes from another process such as the SAE) // are "flushed" using touchDbAsync when the app re-enters the foreground. } - (void)uiDatabaseWillUpdate:(NSNotification *)notification { - if (!self.delegate.isObservingVMUpdates) { - return; - } [self.delegate conversationViewModelWillUpdate]; } @@ -705,13 +698,6 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSAssertDebug(oldItemIdList); OWSAssertDebug(updatedItemSetParam); - if (!self.delegate.isObservingVMUpdates) { - OWSLogVerbose(@"Skipping VM update."); - // We fire this event, but it will be ignored. - [self.delegate conversationViewModelDidUpdate:ConversationUpdate.minorUpdate]; - return; - } - if (oldItemIdList.count != [NSSet setWithArray:oldItemIdList].count) { OWSFailDebug(@"Old view item list has duplicates."); [self.delegate conversationViewModelDidUpdate:ConversationUpdate.reloadUpdate]; diff --git a/temp.txt b/temp.txt new file mode 100644 index 000000000..3b074b043 --- /dev/null +++ b/temp.txt @@ -0,0 +1,16486 @@ +* c37f425d5 (HEAD -> charlesmchen/reduceLogging, private/charlesmchen/reduceLogging) Reduce logging. +* 6c6e516a3 (tag: 2.38.0.4, private/master, master) "Bump build to 2.38.0.4." +* 3795fd138 Enable image editor in production. +* 89dce9498 (tag: 2.38.0.3) "Bump build to 2.38.0.3." +* 19d205719 Merge branch 'mkirk/recording-button-design-changes' +|\ +| * 9d5d120e6 recording button design changes +| * d26c47ceb grow button as recording starts +|/ +* 29cea4b7c Merge branch 'charlesmchen/imageEditorDesign13' +|\ +| * 441c78414 (charlesmchen/imageEditorDesign13) Add preview view to the color palette control. +|/ +* 283741364 Merge branch 'charlesmchen/scrollDownButtonLayout' +|\ +| * 3b008ad96 (charlesmchen/scrollDownButtonLayout) Fix conversation view content offset and scroll down button layout. +|/ +* f50ec0724 Merge branch 'mkirk/photo-capture' +|\ +| * 284357137 Photo/Movie Capture +|/ +* 95b11ddf8 Merge tag '2.37.2.0' +|\ +| * 256d308e3 (tag: 2.37.2.0, private/release/2.37.2) pull latest translations +| * 83a9d386c Merge branch 'mkirk/notification-none-tone' into release/2.37.2 +| |\ +| | * a34266094 (private/mkirk/notification-none-tone) fix "none" notification tone +| |/ +| * d5664dae4 Change to non-crashing assert +| * cadb9ea9a Merge branch 'mkirk/ios9-crash' into release/2.37.2 +| |\ +| | * 72ab6507e (private/mkirk/ios9-crash) fix crash when presenting alerts on iOS9 +| |/ +| * 6d6d1de78 "Bump build to 2.37.2.0." +* | 152a4a8c5 Merge branch 'charlesmchen/imageEditorDesign12' +|\ \ +| * | 684cebf2d (charlesmchen/imageEditorDesign12) Respond to CR. +| * | b7d3a99f3 Update "crop lock" assets. +| * | a48c3d8d2 Ensure attachment approval becomes first responder if app returns from background. +| * | f9445359d Fix layout glitch related to attachment approval input accessory background. +| * | a559b6105 Fix keyboard return behavior in attachment approval. +| * | 660f35147 Hide status bar in image editor modals. +| * | 25e7818f5 Ensure proper z-ordering of item layers. +|/ / +* | 4176d9a15 Merge branch 'charlesmchen/imageEditorDesign11' +|\ \ +| * | d824c49c0 (private/charlesmchen/imageEditorDesign11, charlesmchen/imageEditorDesign11) Respond to CR. +| * | d80f086f3 Rework attachment captioning. +| * | 625656deb Pull out attachment text toolbar and text view classes. +|/ / +* | 48dfdae0c Merge branch 'mkirk/fix-overzealous-assert-2' +|\ \ +| * | 91ec9ebf9 Fix overzealous assert +|/ / +* | 6ad5faad1 Merge branch 'mkirk/fix-overzealous-assert' +|\ \ +| * | 268dd33e7 (private/mkirk/fix-overzealous-assert) Change to non-crashing assert +|/ / +* | f4ba7d211 Merge branch 'charlesmchen/imageEditorDesign10' +|\ \ +| * | 581d0a7bf (charlesmchen/imageEditorDesign10) Respond to CR. +| * | 4fd16a761 Remove top gradient from attachment approval. +| * | 745ec2adb Remove top gradient from attachment approval. +|/ / +* | 102eed8ba Merge branch 'charlesmchen/imageEditorDesign9' +|\ \ +| * | 082686452 (charlesmchen/imageEditorDesign9) Decompose attachment approval into multiple source files. +|/ / +* | fdf3da8b0 Merge branch 'charlesmchen/imageEditorDesign8' +|\ \ +| * | c315c1c9e (charlesmchen/imageEditorDesign8) Fix translation normalization of the image editor transform. +|/ / +* | 2ce057bcd Merge branch 'charlesmchen/imageEditorDesign7' +|\ \ +| * | 88c07fc53 (charlesmchen/imageEditorDesign7) Pinch to change text size in image editor text tool. +|/ / +* | b86ff1425 Merge branch 'charlesmchen/imageEditorDesign6' +|\ \ +| * | d6c91c275 (charlesmchen/imageEditorDesign6) Respond to CR. +| * | fedbe3a5d Fix shadow on palette view. +| * | 75cfd979b Modify brush stroke width to reflect current scale. +| * | c0ca55b1e Fix shadow on palette view. +| * | 337e32a90 Fix a shadow. +| * | 66efcb463 Update rail icons. +| * | 2f7880af8 Fix hit testing of text layers. +|/ / +* | 575de76a4 Merge branch 'charlesmchen/imageEditorDesign5' +|\ \ +| * | 7521b3a14 (charlesmchen/imageEditorDesign5) Update "attachment has caption" indicator. +| * | dd16986d7 Avoid layout changes due to selection changes in media rail. +| * | e63b1169a Hide controls while moving text items. +| * | 9e636b0fc Hide controls during stroke. +| * | c77835926 Tap to create new text item. +| * | fb6631df5 Remove cancel button from attachment caption view. +| * | cea361705 Update asset for "add more images to album" button. +| * | 5aaa66792 Modify the image editor's crop tool to render the cropped and uncropped content. +| * | 0a6ad365d Refine the image editor crop tool's gestures. +| * | e9a4ae7ad Fix image editor navigation bar button shadows. +| * | eff929dd1 Add border and shadow to image editor's palette view. +| * | 6f44167e5 Tweak navigation bar button spacing. +| * | e2d54d082 Modify attachment approval back button to not have "back" text. +| * | 7a67a7b6b Hide the status bar in the image picker / attachment approval. +| * | 6e492927d Prevent users from selecting additional images while processing images in the image picker. +|/ / +* | 863c96c62 Merge tag '2.37.1.0' +|\ \ +| |/ +| * 3f6080765 (tag: 2.37.1.0, private/release/2.37.1, origin/release/2.37.1, origin/master, origin/HEAD) "Bump build to 2.37.1.0." +| * 0a5f8b7a4 Merge branch 'mkirk/update-settings' into release/2.37.1 +| |\ +| | * 2a151dbf6 (private/mkirk/update-settings) update settings key +| |/ +* | 29b875e05 Merge branch 'charlesmchen/tioli' +|\ \ +| * | 10383783e Respond to CR. +| * | d84e0eead Respond to TIOLI feedback from https://trello.com/c/ntO5hBbl/4161-prs-for-michael-to-review +|/ / +* | fc7d118cd Merge branch 'charlesmchen/scrollDownButtonLayout' +|\ \ +| * | 0aebac0d0 Fix layout of the 'scroll down' button. +|/ / +* | e19408c1c Merge branch 'charlesmchen/messageActionsVsOrientationChange' +|\ \ +| * | 0a1947c96 Dismiss message actions UI on orientation change. +| * | 41a2a954f Dismiss message actions UI on orientation change. +|/ / +* | ef3f36ad4 Merge branch 'charlesmchen/bottomViewAnimations' +|\ \ +| * | ff0891920 Respond to CR. +| * | 6fe3ce6d8 Deconflict "bottom view" layout and keyboard animations. +| * | 6e7c13534 Ensure onboarding views never reclaim layout space from dismissed keyboard. +| * | d72c26796 Ensure onboarding views never reclaim layout space from dismissed keyboard. +| * | 53802d1a4 Deconflict "bottom view" layout and keyboard animations. +| * | 97603e64c Deconflict "bottom view" layout and keyboard animations. +|/ / +* | 26237c058 Merge branch 'mkirk/large-contacts' +|\ \ +| * | b36a0061e contact picker perf for contact with many phone numbers +|/ / +* | 348cd6c48 Merge branch 'mkirk/snappier-message-clearing' +|\ \ +| * | 1c78350f9 Clear input bar UI earlier in send process for snappier send animation. +|/ / +* | 60bfa7e85 Only fetch contacts if already authorized +* | e2fd2c917 CR: return immutable array +* | bf4b9fa70 Merge tag '2.37.0.9' +|\ \ +| |/ +| * c5da7c67d (tag: 2.37.0.9, private/release/2.37.0, origin/release/2.37.0) "Bump build to 2.37.0.9." +| * 32150fa7f pull translations +| * 1ad3e64e1 Merge branch 'mkirk/show-suggested-contacts-initially' into release/2.37.0 +| |\ +| | * 913ae2b80 Show suggested contacts upon first entry into HomeView. +| |/ +| * 5fd6ca99a Merge branch 'mkirk/no-self-in-contact-suggestion' into release/2.37.0 +| |\ +| | * 9fa0308d9 exclude self from "suggested contacts" +| |/ +| * 62b4a1583 Merge branch 'mkirk/fixup-tests-3' into release/2.37.0 +| |\ +| | * 932d02b93 fixup tests +| |/ +| * e8dffb4a0 update translations +* | be523d5fe Merge branch 'release/2.37.0' +|\ \ +| |/ +| * 22c78f917 (tag: 2.37.0.8) Bump build to 2.37.0.8. +| * 8527283d6 (tag: 2.37.0.7) "Bump build to 2.37.0.7." +| * 42e6b76a9 sync translations +| * 2c71f9b8a Merge branch 'mkirk/errant-missed-call-notification' into release/2.37.0 +| |\ +| | * 2850266d0 Only show "missed call" notification for incoming calls +| |/ +| * e647ba1d2 Merge branch 'charlesmchen/onboardingFixes' into release/2.37.0 +| |\ +| | * 70a163f3f Respond to CR. +| | * d006f4a29 Improve cramped layouts in onboarding views. +| | * 4fac50be6 Remove spurious error in onboarding verification process. +| | * e992ff3bc Fix glitch in presentation animations for onboarding views. +| | * 2112f04ab Fix layout of "first conversation" prompt. +| | * 14c5c2118 Fix size of "empty home view" image. +| | * 7912c338a Update onboarding splash copy. +| |/ +| * 77b1a2a72 (tag: 2.37.0.6) "Bump build to 2.37.0.6." +| * d44a824a3 sync translations +| * f9b780ff4 Merge branch 'mkirk/fixup-longtext-audio' into release/2.37.0 +| |\ +| | * 72e0d2c20 Only render visual media as album +| |/ +| * 1c255969f Merge branch 'mkirk/lanscape-flicker' into release/2.37.0 +| |\ +| | * 3be41e8c2 Unless you're on a call, all windows respect the orientation mask of the primary app visible VC. +| |/ +* | 6cae61bf1 Revert "Temporarily enable image editor." +* | aba6eb329 (tag: 2.38.0.2) "Bump build to 2.38.0.2." +* | 49685c52b Temporarily enable image editor. +* | 0ad6b2685 Merge branch 'charlesmchen/imageEditorNormalizedImage' +|\ \ +| * | 3209ce6cd Normalize images in the image editor. +|/ / +* | 22626bdff Revert "Temporarily enable image editor." +* | 9a6c36229 (tag: 2.38.0.1) "Bump build to 2.38.0.1." +* | 1078756bc Temporarily enable image editor. +* | 6052ce477 Revert "Temporarily enable image editor." +* | 3b56b2fb4 (tag: 2.38.0.0) "Bump build to 2.38.0.0." +* | 66c041913 Temporarily enable image editor. +* | 258a5beaa Merge branch 'charlesmchen/imageEditorDesign4' +|\ \ +| * | ddbef4e31 Respond to CR. +| * | c31d46965 Improve new text item continuity. +| * | 371c12bd4 Show caption indicators in attachment approval media rail. +| * | 80d297c10 Render strokes behind text. +|/ / +* | b2968d2be Merge branch 'charlesmchen/imageEditorDesign3' +|\ \ +| * | 871dceac3 (charlesmchen/imageEditorDesign3) Improve palette interactions. +| * | 1a159d4d7 Clean up brush stroke gesture usage. +| * | 3d96cd488 Improve color continuity in the image editor. +| * | 93cb0e3a1 Fix bar button layout on iOS 9. +| * | 65ead451c (charlesmchen/imageEditorDesign3_) Don't enable undo in stroke view for items created before stroke view. +|/ / +* | 5091587ed Merge branch 'charlesmchen/imageEditorDesign2' +|\ \ +| * | 9be84fc91 (private/charlesmchen/imageEditorDesign2, charlesmchen/imageEditorDesign2) Respond to CR. +| * | 919e886eb (charlesmchen/imageEditorDesign2_) Ensure brush strokes include the entire gesture. +| * | 65ee1dbd7 Hide the current text item while the text item editor is open. +| * | d15f5b581 Tweak how image editor overlays are presented. +| * | 7ee38f808 Show "add attachment caption" button for non-media attachments; only show if more than one attachment. +|/ / +* | 0813ebe16 Merge branch 'charlesmchen/imageEditorCaptions' +|\ \ +| * | 82f18d8e4 (charlesmchen/imageEditorCaptions) Respond to CR. +| * | 63637af24 Clean up ahead of PR. +| * | dc4e174e8 Clean up ahead of PR. +| * | 7c486d909 Clean up image editor. +| * | fa08b18fd Clean up image editor. +| * | b64be3aa7 Clean up image editor. +| * | 97660e0a1 Clean up image editor. +| * | bc31c8fcf Add brush view controller. +| * | 00aa5be55 Use navigation bar for image editor buttons. +| * | e47ceab41 Use navigation bar for image editor buttons. +| * | a630974e7 Use navigation bar for image editor buttons. +| * | 87646b179 Replace old caption view with new caption view. +|/ / +* | 504416f79 Merge branch 'mkirk/conversation-search' +|\ \ +| * | 71dd4eb15 in-conversation search +|/ / +* | 6095500f8 Merge branch 'charlesmchen/imageEditorDesign1' +|\ \ +| * | be26c135e (charlesmchen/imageEditorDesign1) Rework image editor buttons, modes, etc. +| * | d08445969 Generate gradient for color picker. +| * | fac123eeb Add "crop lock" button and feature. +| * | e01f39e8e Apply image editor design. +|/ / +* | 0e806ea63 Merge branch 'charlesmchen/imageEditorPalette' +|\ \ +| |/ +|/| +| * d419709eb (charlesmchen/imageEditorPalette) Respond to CR. +| * de27ed872 Add color palette to image editor. +|/ +* 530a07f8c (tag: 2.37.0.5) sync translations +* 117411009 Add public keyword to fix compilation for framework integration +* c48679abf "Bump build to 2.37.0.5." +* ee168e9a0 Merge branch 'mkirk/longtext-dismiss' +|\ +| * b11308b2f Return to conversation after deleting long text +|/ +* 05cc3c00f Merge branch 'charlesmchen/imageEditorFlip' +|\ +| * dd2b47bd7 (charlesmchen/imageEditorFlip) Add "flip horizontal" feature. +|/ +* 7caa29e47 Merge branch 'charlesmchen/imageEditorCrop3' +|\ +| * 0ce84b792 (charlesmchen/imageEditorCrop3) Respond to CR. +| * 69635fafa Update crop view to reflect design. +| * 4db09b45b Update crop view to reflect design. +| * c07a74d02 Update crop view to reflect design. +|/ +* 42a92bd03 Merge branch 'charlesmchen/imageEditorNormalizeTranslation' +|\ +| * ac1e89ce1 (charlesmchen/imageEditorNormalizeTranslation) Respond to CR. +| * cc20182ec Normalize translation in image editor. +| * 0d26caced Normalize translation in image editor. +| * f01fe8e56 Normalize translation in image editor. +|/ +* 5361720b1 log token in debug +* 5bd3cec6d Merge tag '2.36.1.0' +|\ +| * 91e83da44 (tag: 2.36.1.0, private/release/2.36.1) reflect new build params in plist +| * 2c961380c update translations +| * 72082edad Fix a visual bug that would sometimes occur while rendering settings switches. Thanks to Gunnar C. Pope for the bug report. +| * c15084c6f "Bump build to 2.36.1.0." +* | e6ad6c85b Merge branch 'mkirk/long-text-nondurable' +|\ \ +| * | 870caaa84 simplify completion checking - make nonnull +| * | 13154fb82 allow long text with non-durable sends (SAE) +|/ / +* | bb8dd0561 Merge branch 'charlesmchen/conversationSnapshot2' +|\ \ +| * | 7711ee92a (charlesmchen/conversationSnapshot2) Revert "Conversation view always observes view model." +| * | 6ed4045fb Conversation view always observes view model. +| * | 56e5feca4 Introduce ConversationSnapshot. +| * | 586b362b8 Introduce ConversationSnapshot. +|/ / +* | aaac445c5 Merge branch 'charlesmchen/proxiedContentChanges' +|\ \ +| * | fff93f8bb (charlesmchen/proxiedContentChanges) Use content proxy to configure all proxied content requests. +| * | ad90a8e0c Use content proxy to configure all proxied content requests. +| * | 5eaeeff83 Use content proxy to configure all proxied content requests. +|/ / +* | a2d48aa02 Merge branch 'charlesmchen/imageEditorTranslation' +|\ \ +| * | 2bc5ac14c (charlesmchen/imageEditorTranslation) Respond to CR. +| * | 7130895e3 Fix translation in all of editor view's gestures. +| * | 674cf2e01 Render stroke and text items in image coordinates, not canvas coordinates. +| * | 7aa826748 Fix translation in crop editor's pinch gesture. +| * | 4022ba1a1 Fix translation in crop editor's pan gesture. +|/ / +* | d1d99bc64 Merge branch 'mkirk/disappearing-menu-bar' +|\ \ +| * | 233bc3858 dismiss menu actions when selected item is deleted +|/ / +* | 504d5f89b Merge branch 'mkirk/fix-tests-1' +|\ \ +| * | a7e8f9713 Try to account for variability in network backed tests +| * | 7b174e9b0 correct constants. +|/ / +* | 0bd113e5d Merge branch 'mkirk/long-text' +|\ \ +| * | cc94d6946 update pods +| * | f1623b603 missing nullability text +| * | c6a3772a5 clearer constant names +| * | 7e5256856 render media+longText message +| * | b7989e938 feature flag approval sending +| * | bc4260b44 Send long-text with other attachments +| * | a218d6c46 Send first chars of longtext in protobuf +|/ / +* | d0287b28b Merge branch 'charlesmchen/proxiedRequestPaddingHeader' +|\ \ +| * | 0f98d6336 Tweak name of proxied request padding header. +|/ / +* | 59cd14047 (tag: 2.37.0.4) "Bump build to 2.37.0.4." +* | ce7ff58f9 Merge branch 'mkirk/input-bar-lanscape' +|\ \ +| * | 680b844f3 Allow all windows to do landscape, fixes: +|/ / +* | 4e3af534d Merge branch 'mkirk/read-pool' +|\ \ +| * | 645a26cbd use connection pool for reads +|/ / +* | 2d8612732 Merge branch 'mkirk/slow-launch' +|\ \ +| * | 7a4041cdd Cache dark theme preference +|/ / +* | 4f43c2485 Merge branch 'mkirk/disappearing-cleanup' +|\ \ +| * | fabd3996c pop view if message is deleted +|/ / +* | 1afc25140 Merge branch 'charlesmchen/userAgentForProxiedRequests' +|\ \ +| * | 20d22f639 Add user agent for proxied requests. +|/ / +* | 1b5227529 Merge branch 'charlesmchen/onboardingCameraAsset' +|\ \ +| * | d14386430 Update camera asset in onboarding profile view. +|/ / +* | c0ec9bfaf Merge branch 'charlesmchen/sentUpdates' +|\ \ +| * | 5f0de5c36 Respond to CR. +| * | 6ef65ad9d Send and process 'recipient update' sync messages. +| * | bb7d32826 Send and process 'recipient update' sync messages. +| * | e27e27cc3 Send and process 'recipient update' sync messages. +| * | 01b1df537 Add 'is update' flag to 'sent message' transcript proto schema. +| * | f19915fb7 Add 'is update' flag to 'sent message' transcript proto schema. +| * | 5f3a03a06 Add 'sent update' transcripts to proto schema. +| * | 4f19d03bd Send 'sent update' sync messages. +| * | 6ce84e7f9 Process 'sent update' transcripts. +| * | ccc1bd333 Process 'sent update' transcripts. +| * | 304c28554 Add 'sent update' transcripts to proto schema. +| * | b53243da3 Add 'sent update' transcripts to proto schema. +| * | 907159f3f Process 'sent update' transcripts. +| * | f36373e3c Add 'sent update' transcripts to proto schema. +|/ / +* | 63235ec1f Merge branch 'charlesmchen/proxiedRequestPadding' +|\ \ +| * | 32965a0c1 Respond to CR. +| * | 40768825c Pad proxied request sizes. +|/ / +* | daa58c2ac Merge branch 'charlesmchen/headlessProxy' +|\ \ +| * | a47930f61 Skip HEAD for proxied content downloads. +| * | f006972c3 Skip HEAD for proxied content downloads. +| * | 089eec413 Skip HEAD for proxied content downloads. +|/ / +* | 2dc5d8a2a Merge branch 'charlesmchen/onboardingDesignFeedback' +|\ \ +| * | 9402e088b Apply design feedback from Myles. +| * | 93e09be18 Apply design feedback from Myles. +|/ / +* | 1ec1a9aa6 Merge branch 'charlesmchen/onboardingRemoveOldViews' +|\ \ +| * | aa8fd9e69 (charlesmchen/onboardingRemoveOldViews) Remove old registration views. +|/ / +* | 88dcd8385 Merge branch 'charlesmchen/conversationSnapshotBuild' +|\ \ +| * | 67632a48e Revert "Introduce ConversationSnapshot." +| * | 3f1312da6 Revert "Introduce ConversationSnapshot." +| * | 01cc5cb36 (tag: 2.37.0.3, private/charlesmchen/conversationSnapshotBuild) "Bump build to 2.37.0.3." +| * | 8b3d08c7e Introduce ConversationSnapshot. +| * | 9471f24cf Introduce ConversationSnapshot. +* | | 8237a43d8 Merge branch 'mkirk/link-preview-restrictions' +|\ \ \ +| * | | cdb8663c8 fix up selecting after url case +| * | | 6d6d076c0 Use correct cache for LinkPreviewDraft, add stricter typing to help avoid similar issues. +| * | | 467dde2bc Try to avoid generating link previews while user is actively editing the URL +|/ / / +* | | f0e4c9f9b Merge branch 'charlesmchen/firstConversationCueVisibility' +|\ \ \ +| |/ / +|/| | +| * | dd1d02593 Fix "first conversation cue" visibility. +|/ / +* | a6ee64fe7 (tag: 2.37.0.2) "Bump build to 2.37.0.2." +* | 29b49d6f4 Enable new onboarding in production. +* | e68faf9ab Merge branch 'mkirk/increase-retries' +|\ \ +| * | 34585bdeb Increase message retries +|/ / +* | 41fb19df6 Merge branch 'nancy/uiAutomation1' +|\ \ +| * | 8ecad8867 Move the accessibility identifier macros into UIUtil.h. +| * | d0e4e081e added accessibility ids to HomeViewController and ProfileViewController +| * | a02531d22 Add accessibility identifiers to registration view. +|/ / +* | 0dc0ef644 (tag: 2.37.0.1) "Bump build to 2.37.0.1." +* | b9615bb53 Merge branch 'mkirk/fix-release-build' +|\ \ +| * | a01cb04d8 FIX: Onboarding controller sets phoneNumberAwaitingForVerification +|/ / +* | 247eab22c (tag: 2.37.0.0) reenable UNUserNotifications +* | 4b38653ee "Bump build to 2.37.0.0." +* | d26c095fe Merge remote-tracking branch 'origin/release/2.36.0' +|\ \ +| |/ +| * 35f79c1e9 (tag: 2.36.0.7, private/release/2.36.0, private/hotfix/2.36.1, origin/release/2.36.0) "Bump build to 2.36.0.7." +| * 4aaac90d3 sync translations +| * 0d5f9e010 Disable UserNotifications for this release +| * 1d409ef80 Merge branch 'mkirk/reply-marks-as-read' into release/2.36.0 +| |\ +| | * 1844bdbeb update pods +| | * 6c08f98fb replying to notification marks thread as read +| |/ +| * 1e0504e8f (tag: 2.36.0.6, release/2.36.0) "Bump build to 2.36.0.6." +| * 6287bd8f1 Merge branch 'mkirk/fix-crashes' into release/2.36.0 +| |\ +| | * 38da911d4 Don't crash when user has 0 saved photos +| | * db2294888 Fix crash after deleting message w/ link preview +| |/ +| * eae341a72 sync translations +| * d65353874 Merge branch 'mkirk/clear-notifications' into release/2.36.0 +| |\ +| | * 5e0c10a1a remove any lingering legacy notifications in modern notification adapter +| | * cb3a36ba3 Platform specific notification clearing +| |/ +| * cd13be64f Merge branch 'mkirk/cds-feedback-specifics' into release/2.36.0 +| |\ +| | * 0d5d5c693 limit reason length +| | * 62784a477 fix staging url +| | * 1de0ede52 (private/mkirk/cds-feedback-specifics) Specific CDS feedback +| |/ +* | b74e2309f Merge branch 'charlesmchen/onboardingPhoneNumberFormatting' +|\ \ +| * | 4d4b84078 Respond to CR. +| * | ef5cd5344 Fix the auto-format of phone numbers in the onboarding views. +|/ / +* | 1c832a04e Merge branch 'charlesmchen/onboardingCleanup2' +|\ \ +| * | f7d659bde Clean up onboarding changes. +| * | 850b36907 Clean up onboarding changes. +|/ / +* | 8d4cea0c2 Merge branch 'charlesmchen/onboardingHome' +|\ \ +| * | 3bb49e7d7 Respond to CR. +| * | d5944b4b9 Add first conversation prompt. +| * | c4cc5f574 Rework 'empty inbox' state of home view. +| * | edf09c92f Rework "empty inbox" state. +|/ / +* | 91aa9fcce Merge branch 'charlesmchen/onboarding2FA' +|\ \ +| * | 0b55ecc68 Sketch out the 'onboarding 2FA' view. +|/ / +* | 9d0813d7b Merge branch 'charlesmchen/onboardingProfile' +|\ \ +| * | 3ac77e5b0 Sketch out the 'onboarding profile' view. +| * | ab3b79cfe Sketch out the 'onboarding profile' view. +| * | afcacbb55 Sketch out the 'onboarding profile' view. +|/ / +* | d81e9d41f Merge branch 'charlesmchen/onboardingVerification2' +|\ \ +| * | e3946e577 Sketch out the 'onboarding code verification' view. +|/ / +* | 260d3253f Merge branch 'charlesmchen/onboardingVerification' +|\ \ +| * | e1dc534fe Respond to CR. +| * | b4aec5879 Sketch out the 'onboarding code verification' view. +| * | 854a75ae6 Sketch out the 'onboarding code verification' view. +| * | c2b2d38f2 Sketch out the 'onboarding code verification' view. +| * | efe5513c4 Sketch out the 'onboarding code verification' view. +| * | 1f922aa47 Sketch out the 'onboarding code verification' view. +| * | d193eec37 Sketch out the 'onboarding code verification' view. +|/ / +* | 0e6251454 Merge branch 'charlesmchen/onboardingCleanup' +|\ \ +| * | ead71d436 Clean up ahead of PR. +| * | ee200aaed Add validation warnings to 'onboarding phone number' view. +| * | 05d63fd6b Update font sizes in onboarding views. +| * | 8cfe768e8 Update font sizes in onboarding views. +| * | 6bc46fad6 Update permissions view. +| * | 8bdbe24bd Update permissions view. +| * | 78ea3e565 Update splash view. +| * | f6d6dd767 Update splash asset. +|/ / +* | 91834454a Respond to CR. +* | 4d72e0d5d Merge branch 'charlesmchen/onboardingCaptcha' +|\ \ +| * | b9d94e77f Respond to CR. +| * | 413d3cdbd Sketch out CAPTCHA onboarding view. +| * | 58abf7624 Sketch out CAPTCHA onboarding view. +| * | df12f71b7 Sketch out CAPTCHA onboarding view. +| * | 9381220d8 Sketch out CAPTCHA onboarding view. +| * | 8a97503b1 Sketch out CAPTCHA onboarding view. +|/ / +* | c54c25c1c Merge branch 'charlesmchen/onboardingPhoneNumber' +|\ \ +| * | 57394f001 Respond to CR. +| * | 21b618396 Fix rebase breakage. +| * | 1411148c7 Sketch out the 'onboarding phone number' view. +| * | b65886631 Sketch out the 'onboarding phone number' view. +| * | 2a4b9426c Sketch out the 'onboarding phone number' view. +|/ / +* | f25e54f58 Merge branch 'charlesmchen/imageEditorCrop2' +|\ \ +| * | c0f907c44 Respond to CR. +| * | 69c5492fc Clean up ahead of PR. +| * | 331a013f8 Clean up ahead of PR. +| * | 922f787ff Clean up ahead of PR. +| * | 618a3b1d4 Sketch out crop tool. +| * | 080732519 First draft of image editor's text tool. +|/ / +* | 8eb760421 Merge branch 'charlesmchen/callSetupTimeLogging' +|\ \ +| * | d62fa19cb Respond to CR. +| * | ed30b15fd Add call setup time logging. +|/ / +* | d9b23a9ad Merge branch 'charlesmchen/onboardingSplash' +|\ \ +| * | 54c8c1f35 (private/charlesmchen/onboardingSplash) Sketch out the onboarding splash view. +|/ / +* | 9fb08c117 Merge branch 'charlesmchen/onboarding' +|\ \ +| * | d6826b94e Respond to CR. +| * | 407571c9d Sketch out the onboarding permissions view. +| * | 29e65a93a Sketch out the onboarding permissions view. +| * | 18c4ed4a2 Sketch out the onboarding permissions view. +| * | 193c3dd96 Sketch out the onboarding permissions view. +| * | 2c0aa7a22 Sketch out the onboarding permissions view. +|/ / +* | bb64dc1bc Merge branch 'mkirk/main-thread-registration-update' +|\ \ +| * | af475aa1e update registration state on main thread +|/ / +* | 1a24102a4 Merge branch 'mkirk/fix-sort' +|\ \ +| * | a1b412c70 Fix "missed calls" not sorting threads +|/ / +* | 273974880 Update Signal info plist. +* | 9c93a03d2 Merge branch 'charlesmchen/imageEditorText' +|\ \ +| |/ +|/| +| * 73b36c540 Respond to CR. +| * 2f00cbdfe First draft of image editor's text tool. +| * 6ac2dd7ea First draft of image editor's text tool. +| * 3f8ea271b First draft of image editor's text tool. +|/ +* 4e172fe8b (tag: 2.36.0.5) "Bump build to 2.36.0.5." +* 44ea962c3 Merge branch 'mkirk/fix-call-back-action' +|\ +| * b0254fddd Fix call-back action, which requires phone number +|/ +* b22348f86 sync translations +* eb2db19ea Merge branch 'mkirk/fixup-lock' +|\ +| * 2c59b1bf1 fix iPhoneX layout +|/ +* 8746055e1 Merge branch 'mkirk/note-to-self-avatar-2' +|\ +| * cc2e062b8 CR: clean up graphics context code +| * 2323cc21f note-to-self avatar +|/ +* 56d3b2a3c (tag: 2.36.0.4) update plist +* 86babb49e "Bump build to 2.36.0.4." +* ce5478520 move nb_NO -> nb +* 8453df436 sync translations +* 182ddf737 update starscream +* 285ba14df Merge branch 'mkirk/voice-note-lock2' +|\ +| * d29ce740c Voice Note Lock +|/ +* a566145d5 Merge branch 'mkirk/missing-protocol-error' +|\ +| * 8cda3c887 (private/mkirk/missing-protocol-error) error when missing required protocol methods +|/ +* d59ebae39 Merge tag '2.35.0.13' +|\ +| * d14fdb7e1 (tag: 2.35.0.13, private/release/2.35.0) "Bump build to 2.35.0.13." +| * 25422bcdf Update l10n strings. +* | ae60ba9d1 (tag: 2.36.0.3) "Bump build to 2.36.0.3." +* | ea547fa46 Merge tag '2.35.0.12' +|\ \ +| |/ +| * 4afcb34c4 (tag: 2.35.0.12) "Bump build to 2.35.0.12." +| * 0acac9a60 Merge branch 'charlesmchen/instaCDn' into release/2.35.0 +| |\ +| | * f575c0f10 Add fbcdn.net to link previews media whitelist. +| |/ +| * 2e150d32e Merge branch 'mkirk/webrtc-m72' into release/2.35.0 +| |\ +| | * a573bd4d3 update WebRTC artifact to M72 +| |/ +| * 312cae9c3 (tag: 2.35.0.11) "Bump build to 2.35.0.11." +| * 94089f1d5 Merge branch 'charlesmchen/linkNewDeviceVsOrientation' into release/2.35.0 +| |\ +| | * 4cbe3236e Respond to CR. +| | * 6bfe0f041 Ensure 'link new device' view is portrait. +| | * bf685776b Ensure 'link new device' view is portrait. +| | * 7a990ed1f Ensure 'link new device' view is portrait. +| |/ +* | f94796b6d Merge branch 'mkirk/notification-title' +|\ \ +| * | fe4e416da filter notification text +| * | d88ffc477 Notification titles for iOS10+ +|/ / +* | 1dbb9849c Remove 'message receipt ordering' logging. +* | 7d5057f54 (tag: 2.36.0.2) "Bump build to 2.36.0.2." +* | bb4672089 Add logging around socket ordering. +* | d920b2551 Merge branch 'charlesmchen/sessionManagerPools' +|\ \ +| * | 2cdb7bb0e Respond to CR. +| * | 928b0a163 Add session manager pools. +| * | e2b92ed42 Add session manager pools. +| * | 280b9378b Add session manager pools. +|/ / +* | 5fd6b52eb Merge branch 'mkirk/notifications' +|\ \ +| * | b02e57e59 update pods +| * | a6a7616fd move notification action handlers to environment +| * | c2aee429b move ContactsManager to local dependency +| * | fe84275cc Respect audio preferences/throttling +| * | 1bfe69189 In app notifications for iOS10+ +| * | 312384201 rename CallNotificationsAdapter.swift -> NotificationsAdapter.swift +| * | c01284f84 beef up notifications DebugUI +| * | 11afc967d move NotificationsManager behind NotificationsAdapter +| * | ac3bbe26b rename CallNotificationsAdapter->NotificationsAdapter +|/ / +* | 18df5e43e (tag: 2.36.0.1) "Bump build to 2.36.0.1." +* | 501e883cc Merge tag '2.35.0.10' +|\ \ +| |/ +| * feebd551e (tag: 2.35.0.10) "Bump build to 2.35.0.10." +| * fb62ffbd4 Merge branch 'charlesmchen/inputToolbarBorder' into release/2.35.0 +| |\ +| | * dd506430d Fix the input toolbar border. +| |/ +| * 0a522b8f0 Merge branch 'mkirk/ios9-cds' into release/2.35.0 +| |\ +| | * 5f5962325 fix CDS for iOS9 +| |/ +| * 4a56c1c05 (tag: 2.35.0.9) "Bump build to 2.35.0.9." +| * 808b6d2cb Merge branch 'charlesmchen/launchIntoPortrait' into release/2.35.0 +| |\ +| | * 2d55ff096 Require app to launch in portrait orientation. +| |/ +| * 7df69f84d (tag: 2.35.0.8) "Bump build to 2.35.0.8." +* | 83e2c7671 Merge branch 'charlesmchen/outOfOrderLogging' +|\ \ +| * | 63a5de185 Add logging around socket ordering. +|/ / +* | 229450bc4 Enable 'note to self' feature flag. +* | 690eaa4d2 (tag: 2.36.0.0) "Bump build to 2.36.0.0." +* | 817328844 "Bump build to 2.35.1.0." +* | 4fdb18f50 Merge branch 'charlesmchen/callSetup' +|\ \ +| |/ +|/| +| * 867efb62f Respond to CR. +| * 41b7205b0 Clean up ahead of PR. +| * 6b3fe0453 Use connection property for errors in message receiver. +| * bb1759297 Fail call if ICE updates fail to send. +| * 70185dd87 Batch outgoing ICE updates. +| * 5bb78cba2 Tune concurrency in call service. +| * 6b5952abd Move work off main thread. +| * 4feb0011d Reduce logging. +|/ +* 9ea398afd Merge branch 'charlesmchen/maxBodyMediaWidth' +|\ +| * 6a132a065 Add upper bound on body media size. +| * 4827de5d8 Add upper bound on body media size. +|/ +* 10e674a22 Merge branch 'charlesmchen/linkPreviewsInputBackground2' +|\ +| * f71483a20 Fix input toolbar background in dark mode. +| * a222a12fa Fix input toolbar background in dark mode. +|/ +* 1f99b5780 (tag: 2.35.0.7) "Bump build to 2.35.0.7." +* 3b9fe50b4 Merge branch 'charlesmchen/linkPreviewsInputBackground' +|\ +| * 230612f02 Fix input toolbar background in dark mode. +|/ +* 41922dfd2 Merge branch 'charlesmchen/orientationVsBackgroundScreenshot' +|\ +| * 12e57ecd2 Improve background screenshots v. orientation. +|/ +* 67c32490b Merge branch 'charlesmchen/linkPreviewsFixOmnibus3' +|\ +| * 6fa4e52a8 Fix link preview activity indicator in dark theme. +| * 445daed60 Update splash asset. +|/ +* 94a377b4f (tag: 2.35.0.6) "Bump build to 2.35.0.6." +* 9e132400c Merge branch 'charlesmchen/linkPreviewsSplash2' +|\ +| * 1023d18c4 Add link previews splash. +|/ +* ef363ddf5 Merge branch 'charlesmchen/linkPreviewsSplash' +|\ +| * f5e35eca4 Add link previews splash. +|/ +* 938353c14 Update reverse integration check. +* e53dfa86c Update localization. +* 2c71cd92e (tag: 2.35.0.5) "Bump build to 2.35.0.5." +* cf93949b4 Merge branch 'charlesmchen/syncLinkPreviewsSetting' +|\ +| * 4be302bbe Update link previews setting behavior. +| * 77396e11f Send sync messages with link previews preference. +| * b1cce5ef7 Add link previews preference to configuration protos. +|/ +* 4c9b3a3ed Merge branch 'charlesmchen/fixNavigateToQuotedReply' +|\ +| * 3d1b930e0 Fix navigation to quoted replies outside load window. +|/ +* ef62bcd00 Disable 'Note to Self.' +* 60163c2ce Merge branch 'charlesmchen/linkPreviewsUserAgent' +|\ +| * 6d967cb31 Fix 'link preview prefs taint cache' issue. +| * 890dfdcc0 Fix reset of 'link preview cancelled' state. +| * f2d580cae Update user agent for proxied content downloads. +|/ +* 4de09bc7b Merge branch 'charlesmchen/linkPreviewsMigration' +|\ +| * 910df7069 Link previews migration. +| * 7f2ca6061 Link previews migration. +|/ +* a4873123f Merge branch 'charlesmchen/linkPreviewsStyle' +|\ +| * 2b71c433a Update appearance of draft quoted replies. +| * 25fd43d64 Update appearance of draft quoted replies. +| * ccb174120 Tweak conversation input toolbar layout. +|/ +* 32d0433ee (tag: 2.35.0.4) "Bump build to 2.35.0.4." +* 26de1beb1 Merge branch 'charlesmchen/removeSafeAreaInsetsHack' +|\ +| * 57a9f464d Revert "Remove safe area insets hack in conversation input toolbar." +| * 67a8e90f3 (tag: 2.35.0.3) "Bump build to 2.35.0.3." +| * 70775e785 Remove safe area insets hack in conversation input toolbar. +|/ +* 70359b184 Merge branch 'charlesmchen/doubleActivation' +|\ +| * 39de96ac2 Re-enable landscape orientation; fix 'double activation' issue. +| * c31938a33 Enabled landscape. +|/ +* 5311847c6 Merge branch 'charlesmchen/noSonarPing' +|\ +| * c359f2b70 Replace "connecting/sonar ping" with "outbound ringing." +|/ +* 3c0235d57 Enable 'note to self' feature flag. +* 8857f3214 Merge remote-tracking branch 'private/charlesmchen/linkPreviewsFixOmnibus2' +|\ +| * b0704074b Rework quoted attachments. +| * 56dfdaf6e Align draft view of link preview and draft view of quoted reply. +|/ +* 024d8f752 (tag: 2.35.0.2) "Bump build to 2.35.0.2." +* b614d33a2 Merge remote-tracking branch 'private/charlesmchen/linkPreviewsFixOmnibus' +|\ +| * 5830c6240 Fix quoted reply image aspect ratio. +| * 75e017b2c Align draft view of link preview and draft view of quoted reply. +| * c02d63327 Align draft view of link preview and draft view of quoted reply. +| * bba679eae Add user-agent for media downloads. +| * 0cc667d12 Fix spacing between quoted replies and link previews in sent message bubbles. +| * e4d11eb15 Fix conversation text input background color. +| * 0ce9d1a85 Always re-encode link preview images as JPEG even if they don't need to be resized. +| * 9c806d59d Safely ignore invalid link preview images. +|/ +* 673588a98 Merge branch 'charlesmchen/linkPreviewVsTitleNewlines' +|\ +| * c68eee5bf Accept newlines in link preview titles. +|/ +* fdb696f97 (tag: 2.35.0.1) "Bump build to 2.35.0.1." +* 569ebfb3a Merge branch 'charlesmchen/linkPreviewMoreRefinements2' +|\ +| * 957a73383 Yet more link preview refinements. +|/ +* 98faed28e Merge branch 'charlesmchen/linkPreviewsReviseWhitelists' +|\ +| * b48d5fbcf Revise link preview domain whitelists. +|/ +* cf4c83341 Merge branch 'charlesmchen/linkPreviewsCleanup' +|\ +| * f174d5be6 Clean up link previews. +|/ +* 473f1e6ee Merge branch 'charlesmchen/flushDBChanges' +|\ +| * c6387e7c6 Simplify the logic to flush database changes. +| * e7b9f7da9 Flush multi-process writes more aggressively. +|/ +* f9bbbbd0c Merge branch 'charlesmchen/linkPreviewTests2' +|\ +| * 4c5b9001c Elaborate the link preview tests. +|/ +* fdefb2ff4 Merge branch 'charlesmchen/linkPreviewTests' +|\ +| * 2e9f2e615 Elaborate the link preview tests. +|/ +* 4e1098475 Merge branch 'charlesmchen/linkPreviewDataDetector' +|\ +| * 090dd1f52 Use NSDataDetector to extract URLs for link previews. +|/ +* b29808065 Merge branch 'charlesmchen/fixLinkPreviewTests' +|\ +| * 744d3074a Fix link preview tests. +|/ +* aff7d8320 (tag: 2.35.0.0) "Bump build to 2.35.0.0." +* 9ae817d94 Merge branch 'charlesmchen/linkPreviewImageMaxSize' +|\ +| * b5cf497ff Update Cocoapods. +| * e4d5926b3 Resize link preview images if necessary. +| * 9149282e9 Resize link preview images if necessary. +| * 9b33d70d7 Constrain max size of link preview image. +|/ +* e35c6eaf6 Merge branch 'charlesmchen/conversationViewInvalidation_' +|\ +| * 9efe1377a Refine invalidation of conversation view layout. +|/ +* 096e54da6 Merge branch 'charlesmchen/fakeProfileManagerWarnings' +|\ +| * c4274d63c Fix build warnings in fake profile manager. +|/ +* b14006e08 Merge branch 'charlesmchen/linkPreviewsComposeCancel' +|\ +| * 1df8b9203 Update cancel button asset for link previews. +|/ +* cad5ab387 Merge branch 'charlesmchen/linkPreviewsPrefCopy' +|\ +| * b20172e44 Update the copy for the link previews preference. +|/ +* 3541be18c Merge branch 'charlesmchen/linkPreviewsRefinements2' +|\ +| * 019ddb241 Fix measurement of link previews. +|/ +* f6e6142f8 Merge branch 'charlesmchen/linkPreviewsRefinements3' +|\ +| * e172eeff0 Link preview preference should only affect outgoing link previews. +|/ +* 5b645db73 Merge branch 'charlesmchen/linkPreviewsSegmentedDownloads' +|\ +| * d0cc0dbfc Update Cocoapods. +| * 23980152f Segment proxied content downloads. +| * db15ff9a2 Segment proxied content downloads. +| * 4e7dbc486 Segment proxied content downloads. +|/ +* bf4c43f06 Merge branch 'charlesmchen/linkPreviewsRefinements' +|\ +| * 635b5740a Add missing domain to link preview whitelist. +| * e2747dc70 Fix glitch in link loading. +| * d2347f2b0 Add missing stroke to loading state of link preview view. +| * 82ceb044e Use link preview image when quote replying. +| * b002c0c9e Refine link parsing and validation logic. +|/ +* 8153926bb Merge branch 'charlesmchen/fixBuildWarningsNullability' +|\ +| * a7d848ef7 Add missing nullability annotations. +| * becd72329 Fix build warnings about nullability. +|/ +* 772e73a8d Merge branch 'charlesmchen/linkPreviewsApprovalLayout' +|\ +| * eb7c6ff44 Respond to CR. +| * 9b7ae86a6 Rework layout of conversation input toolbar. +| * 6ff6ee2e2 Rework layout of conversation input toolbar. +|/ +* 8a8d1f43f update pods +* 62023659a Revert PromiseKit update for now +* 06f26eca4 Merge branch 'mkirk/update-pods-2' +|\ +| * dfc1df838 update pods +|/ +* 88301cbc2 Merge branch 'charlesmchen/linkPreviewsAttachmentCleanup' +|\ +| * 7e9c3b2da Clean up all message attachments. +|/ +* 1ab5a7ed6 Merge branch 'charlesmchen/linkPreviewsVsIncomingAttachments' +|\ +| * 7d4e89daa Discard link previews if incoming message has attachments. +|/ +* aa1f90757 Merge branch 'charlesmchen/linkPreviewsOpen' +|\ +| * 8452f5e74 Open link preview URLs when tapped. +|/ +* 00f0d4490 Merge branch 'charlesmchen/linkPreviewsSentView' +|\ +| * a51182321 Respond to CR. +| * 3d757b492 Add link previews to conversation message bubbles. +| * ca8a4b375 Make LinkPreviewView reusable. +| * c7053aa36 Add link previews to converastion view items. +|/ +* f62e48f4b Merge branch 'charlesmchen/linkPreviewsTempFiles' +|\ +| * 0569ed3f5 Respond to CR. +| * f73f10071 Link preview temp files. +|/ +* 186e4e14d Merge branch 'charlesmchen/linkPreviewsPreference' +|\ +| * feaf5253a Update Cocoapods. +| * 1b87e3165 Add link previews setting. +| * c57b0d98c Add link previews setting. +|/ +* 8c7c9b27a Merge tag '2.34.0.26' +|\ +| * bdd7d53c7 (tag: 2.34.0.26, private/release/2.34.0) "Bump build to 2.34.0.26." +| * 7ed79c2ed Update l10n strings. +| * f822ee737 (release/2.34.0) Merge branch 'charlesmchen/shareAllMediaInAlbum' into release/2.34.0 +| |\ +| | * 79000d5fb Save and share all items in album. +| | * 8dc6ea0c0 Revert "Save and share all items in album" +| | * 4fda1be3f Save and share all items in album +| |/ +| * baa42dc91 Merge branch 'mkirk/ios9-10-picker' into release/2.34.0 +| |\ +| | * 293da74c5 Fix title view for iOS9/10 +| |/ +| * 131945a64 Merge branch 'mkirk/body-text-limit' into release/2.34.0 +| |\ +| | * 896a9f78f limit media message body to 2k chars +| |/ +| * 7f47fd251 allow batch deselection when at attachment limit +| * 14436da2e Merge branch 'mkirk/pan-select' into release/2.34.0 +| |\ +| | * 34d11dda4 bulk deselect +| | * 599a57e3a (private/mkirk/pan-select) Pan horizontal to bulk select images +| |/ +| * 3ac9732b6 Merge branch 'mkirk/fix-miscolored-status-bar' into release/2.34.0 +| |\ +| | * f1e508cb6 (private/mkirk/fix-miscolored-status-bar) Recover status bar style when canceling PhotoPicker +| |/ +| * df4e5eb73 Merge branch 'mkirk/max-attachment-toast' into release/2.34.0 +| |\ +| | * 169581f12 (private/mkirk/max-attachment-toast) show toast when selecting too many items +| |/ +| * f5be0d545 Merge branch 'mkirk/fix-offset' into release/2.34.0 +| |\ +| | * 870a7f292 Fix scroll offset for non-iPhoneX devices +| |/ +* | b5596dcdb Merge branch 'charlesmchen/linkPreviews5b' +|\ \ +| * | a7144abf9 Respond to CR. +| * | 416aa2b34 Add rough draft of link preview view to composer. +|/ / +* | 977ee9ffe Merge remote-tracking branch 'private/release/2.34.0' +|\ \ +| |/ +| * 710b80e56 Merge branch 'charlesmchen/noteToSelfFeatureFlag' into release/2.34.0 +| |\ +| | * 7878c0fac Add feature flag for 'note to self'. +| |/ +| * 7f1c6a84c (tag: 2.34.0.25) "Bump build to 2.34.0.25." +| * 3d3928691 Update l10n strings. +| * cf2371222 Merge branch 'mkirk/fix-must-reselect' into release/2.34.0 +| |\ +| | * 066b40059 Honor selection with "Add More" +| |/ +| * bd5148d27 (tag: 2.34.0.24) "Bump build to 2.34.0.24." +| * 99478047c Merge branch 'mkirk/fix-missing-retry' into release/2.34.0 +| |\ +| | * 343c7d8ec Remove timer queue. +| | * 323249baa NSRunLoop methods should only be accessed on it's corresponding thread. +| | * 64cdaae02 schedule retry timer on main run loop +| |/ +| * a479e4162 Merge branch 'charlesmchen/sortIdMigrationRobustness' into release/2.34.0 +| |\ +| | * debf2e7a9 Fix 'mutation during enumeration' and 'bad ordering' crashes. +| |/ +| * fc36fe4fc Merge branch 'charlesmchen/convoLoadMore' into release/2.34.0 +| |\ +| | * 127ccccb8 Tweak conversation view's "load more" behavior. +| |/ +| * 70f4d69fb Merge branch 'mkirk/fix-missing-captionview' into release/2.34.0 +| |\ +| | * 3c0982e0f Fix missing captionView when navigating via RailView +| |/ +| * c5d568de5 (tag: 2.34.0.23) "Bump build to 2.34.0.23." +| * b23a8b75d Merge branch 'charlesmchen/landscapeOrientationFeatureFlag' into release/2.34.0 +| |\ +| | * be714399c Add feature flag for landscape orientation. +| | * eab3599ce Add feature flag for landscape orientation. +| |/ +| * cef28eb10 (tag: 2.34.0.22) "Bump build to 2.34.0.22." +| * acab31bb6 Merge branch 'charlesmchen/syncDeviceOrientation' into release/2.34.0 +| |\ +| | * 9d020e490 Respond to CR. +| | * 48fda586c Sync device orientation when conversation view and home view appear. +| |/ +| * a5d9a40c8 Merge branch 'charlesmchen/shareExtensionNavbar' into release/2.34.0 +| |\ +| | * 635a644e2 Fix safe area insets in SAE. +| | * 50f9a089b Fix navbar layout in share extension. +| |/ +| * 4f0c26d5c Merge branch 'charlesmchen/unlinkDeviceName' into release/2.34.0 +| |\ +| | * db30ffb75 Decrypt device name in unlink confirmation alert. +| |/ +| * 83309616b (tag: 2.34.0.21) "Bump build to 2.34.0.21." +| * a372e00ab Merge branch 'charlesmchen/tapAlbumWithFailedImage2' into release/2.34.0 +| |\ +| | * e91195385 Respond to CR. +| | * 04a300784 Respond to CR. +| | * 42762ad90 Allow taps in albums with failed images. +| |/ +| * b6e28adfe Merge branch 'charlesmchen/inputToolbarMarginsVsRotation3' into release/2.34.0 +| |\ +| | * b8e2cb626 Respond to CR. +| | * 18c890bb9 Fix input toolbar margins issue. +| |/ +| * 8d8744998 Merge branch 'mkirk/eagerly-load-rail' into release/2.34.0 +| |\ +| | * 7fddb3571 eagerly load entire album to populate rail +| |/ +| * 101d17cfe Merge branch 'mkirk/video-select' into release/2.34.0 +| |\ +| | * a497e44ce (private/mkirk/video-select) Fix iCloud download +| | * 59e037986 Show error when image request fails +| |/ +* | 6ce673626 Merge branch 'charlesmchen/linkPreviews5a' +|\ \ +| * | d6a51a2a4 Fix merge breakage. +| * | f37aacca8 Respond to CR. +| * | 2dcc79fbc Fix issues around link previews. +|/ / +* | dd7ff1360 Merge branch 'charlesmchen/linkPreviews4' +|\ \ +| * | e819f777d Update Cocoapods. +| * | 6e044675a Respond to CR. +| * | 8e44bf554 Respond to CR. +| * | d775a70a8 Build link previews. +| * | 31ea64bda Build link previews. +|/ / +* | d87fc27e7 Merge branch 'mkirk/faster-contact-search' +|\ \ +| * | 721f33029 warm non-signal accounts cache in the background +|/ / +* | 168c77c6f Merge branch 'mkirk/unblock-reads' +|\ \ +| * | 0fb6dab02 avoid blocking write connection with long running read when building sync message +|/ / +* | 2233957b8 Merge branch 'mkirk/contact-search' +|\ \ +| * | 0c1b2e9f4 CR: remove unnecessary param, clearer code, comment typo +| * | 6e50a5353 rename for clarity +| * | b4908e71e Use FTS for compose picker search +|/ / +* | 1d24fa7c5 Fixup WebSocket +* | e4bb34542 Merge branch 'mkirk/websocket-swift' +|\ \ +| * | 16c8a1a76 replace SocketRocket with Starscream +|/ / +* | 4b3c43eed Merge branch 'charlesmchen/linkPreviews3' +|\ \ +| * | 55d634d40 Update Cocoapods. +| * | f13c1de73 Respond to Cr. +| * | 55376975f Add link preview parsing and validation logic. +|/ / +* | 74ccee26a Merge branch 'charlesmchen/linkPreviews2' +|\ \ +| * | 45b93cc4b (private/charlesmchen/linkPreviews2) Respond to CR. +| * | a477e01a4 Apply LinkPreview model. +| * | 4eb05e369 Add LinkPreview model. +|/ / +* | 631de58b0 Merge branch 'charlesmchen/linkPreviews1' +|\ \ +| |/ +|/| +| * aa916965d Update protos to reflect link previews. +| * 5a529567a Update protos to reflect link previews. +| * 76f410b2b Update protos to reflect link previews. +|/ +* 623c2574d Merge branch 'mkirk/dont-select-unless-batch' +|\ +| * 5fdb88ddf Don't add to selection unless in batch select mode +|/ +* 2df6ae2cf Merge branch 'mkirk/scroll-to-bottom-when-switching-albums' +|\ +| * 924b8b18b Scroll to bottom when switching albums +|/ +* ff2fdcb7e Merge branch 'mkirk/fix-conversion' +|\ +| * 119f30978 Fixup database conversion vis a vis SQLCipher4 +|/ +* 96fffb92c Merge tag '2.33.1.0' +|\ +| * 5568482e4 (tag: 2.33.1.0, private/hotfix/2.33.1, origin/hotfix/2.33.1, origin/charlesmchen/uiAutomation, charlesmchen/uiAutomation) "Bump build to 2.33.1.0." +| * cc4d85a91 Encrypted device names. +* | ed15e5cc4 Update YapDB to fix DB conversion logic +* | 433ef0823 (tag: 2.34.0.14) "Bump build to 2.34.0.14." +* | fba26653c "Bump build to 2.34.0.13." +* | a8ba8b668 Merge branch 'charlesmchen/imagePickingFixes' +|\ \ +| * | 63aa71c31 Respond to CR. +| * | 6c38f8d14 Only complete media loads once. +| * | 6b100e80e Only enter batch select mode if user uses "add more" button. +|/ / +* | 3e36dcf91 Merge branch 'charlesmchen/conversationRotationVsScrollContinuity' +|\ \ +| * | d32372ec2 Respond to CR. +| * | 9dda2fa8c Improve scroll state continuity during conversation view rotations. +|/ / +* | 1fc90974f (private/mkirk/remain-landscape-after-media-dismiss) Merge branch 'charlesmchen/honorAlbumSelectionOrder' +|\ \ +| * | 9051191ba Honor album selection order. +|/ / +* | af81404e4 Merge branch 'mkirk/remain-landscape-after-media-dismiss' +|\ \ +| * | 0f85e52ec Remain landscape after media dismiss +|/ / +* | c5cd52db0 Merge branch 'charlesmchen/cullUnknownMigrations' +|\ \ +| * | efd1be30c Cull unknown migrations. +|/ / +* | 162a4894e Merge branch 'mkirk/remove-feature-flag' +|\ \ +| * | 371ff08d4 remove legal terms feature flag +|/ / +* | 145a94cf3 Merge branch 'mkirk/ci-label-branches' +|\ \ +| * | 0795fc911 ci labels PRs with GH title +|/ / +* | d58ffed11 Merge branch 'mkirk/bump-migration' +|\ \ +| * | 0e78f9912 bump migration version +|/ / +* | 6fccd76cd update pods +* | 444c2af65 Merge branch 'mkirk/clientside-registration-validation' +|\ \ +| * | eb71c4979 registration validator +|/ / +* | cd70f9d0c move to yapdb@signal-release +* | 73f622db6 (tag: 2.34.0.5) "Bump build to 2.34.0.5." +* | 7fb2f2dc1 (tag: 2.34.0.4) "Bump build to 2.34.0.4." +* | 1440998cb Merge branch 'mkirk/sqlcipher4' +|\ \ +| * | 5708754d3 update to sqlcipher4 +|/ / +* | 7e3ccad22 Merge branch 'mkirk/area-code-inference' +|\ \ +| * | 60f816c74 Area code inference for US and Brazil +| * | 5d9e03ba4 convert to guard statements for readability +| * | ea76ea949 fix phone number parsing test +|/ / +* | f5a36ad5b Merge branch 'charlesmchen/landscapeOrientation6' +|\ \ +| * | cb228bdd2 Fix conversation view keyboard. +| * | bf0d92acf Landscape layout in gif picker. +|/ / +* | 8577221b5 Merge branch 'charlesmchen/landscapeOrientation7' +|\ \ +| * | ec16860e4 Fix "device won't rotate after calls" issue. +|/ / +* | 34833b8cb (tag: 2.34.0.3) "Bump build to 2.34.0.3." +* | fe00781ce Merge branch 'charlesmchen/landscapeOrientation4' +|\ \ +| * | 4ab0c8fe5 Landscape orientation. +| * | 2ddde368e Landscape orientation. +| * | b668237e8 Landscape orientation. +|/ / +* | d4d72448d Merge branch 'charlesmchen/landscapeOrientation2' +|\ \ +| * | 82d151746 Landscape orientation. +| * | ff24e826c Landscape orientation. +| * | 7654d0541 Landscape orientation. +|/ / +* | a0bf2717a Merge branch 'charlesmchen/landscapeOrientation3' +|\ \ +| * | 18a1d49b4 Landscape orientation. +| * | 721cab788 Landscape orientation. +| * | 9497a38d7 Landscape orientation. +| * | b5d5822b7 Landscape orientation. +| * | 5adcbac5e Landscape orientation. +| * | aefe0eabe Landscape orientation. +| * | 045b11272 Landscape orientation. +|/ / +* | 5fc88789b Merge branch 'charlesmchen/landscapeOrientation1' +|\ \ +| * | 460f160cb Landscape orientation. +|/ / +* | feac8d264 Merge branch 'mkirk/enable-multisend' +|\ \ +| * | 099b9f60c enable multisend +|/ / +* | fe5997970 Merge branch 'mkirk/multisend-delete-icon' +|\ \ +| * | 0ab326da9 Only show delete button on selected rail item +|/ / +* | 268d1c4b6 (tag: 2.34.0.2) "Bump build to 2.34.0.2." +* | c76bc6dba Merge branch 'charlesmchen/fixRegistration' +|\ \ +| * | 63260ee94 Fix registration. +|/ / +* | 736d0c421 Merge branch 'charlesmchen/removeLockInteractionController' +|\ \ +| * | c0922fc2c Remove LockInteractionController. +|/ / +* | 517458dc6 Merge tag '2.33.0.12' +|\ \ +| |/ +| * 74274e58d (tag: 2.33.0.12, private/release/2.33.0) "Bump build to 2.33.0.12." +* | d873ac278 Merge branch 'mkirk/fix-ios9-crash' +|\ \ +| * | 014cf9c50 fix crash on iOS9 +|/ / +* | 76c7ea8f7 Merge branch 'mkirk/fix-image-editor-swipe' +|\ \ +| * | 265552ae0 enable multisend in debug +| * | c690ac271 allow deselecting tool +| * | a8200d6f4 Fix swipe between multi-images +|/ / +* | 5cc02501f Merge branch 'charlesmchen/conversationViewModelAssert' +|\ \ +| * | c30f15522 Fix overzealous assert. +|/ / +* | 3f4ff2321 (tag: 2.34.0.1) "Bump build to 2.34.0.1." +* | 8dddea3c6 Merge branch 'charlesmchen/conversationScrollRefinements' +|\ \ +| * | 7df17251a Fix edge cases in conversation view scroll continuity. +| * | b92051c88 Fix edge cases in conversation view scroll continuity. +| * | 6b881b9ef Fix edge cases in conversation view scroll continuity. +|/ / +* | c92e0959c Update info.plist to reflect WebRTC update. +* | 4daf764bd Merge branch 'mkirk/ci' +|\ \ +| * | edab44b89 include url in status message +| * | b95dcd4ae fix broken test +| * | 2233d4c72 Add jenkinsfile +| * | 2a2f30e2a update fastlane +| * | 5fe26b4ba bump ruby version +|/ / +* | b09ad7bf9 Merge branch 'charlesmchen/conversationViewMapping' +|\ \ +| * | f90e49226 Respond to CR. +| * | 46b0cdb87 Caution around group avatars. +| * | 73f5d9237 Avoid overflow. +| * | f32edc93e Tweak conversation view animations. +| * | 435379926 Introduce conversation view mapping; rework conversation view scrolling. +| * | c5b0c7305 Introduce conversation view mapping; rework conversation view scrolling. +| * | c775dbcd6 Introduce conversation view mapping; rework conversation view scrolling. +|/ / +* | 371a6a6f1 Merge branch 'mkirk/m71' +|\ \ +| * | e09155160 Fix: subsequent video calls fail to transmit video +| * | 91cf02271 WebRTC M71 +|/ / +* | befe37a8d Merge branch 'charlesmchen/signalingKey' +|\ \ +| * | 951f0dab2 Respond to CR. +| * | 3a5de59dc Try to update account attributes every time we upgrade. +| * | ed25f4748 Deprecate 'signaling key'. +|/ / +* | b29f55b99 Merge branch 'charlesmchen/noSearchResultsSeparators' +|\ \ +| * | 858e47b9b Remove unsightly separators from 'no search results' state. +|/ / +* | aabb468bf Merge branch 'charlesmchen/noSessionForTransientMessages' +|\ \ +| * | 78d0685cb Discard transient messages if there is no session. +|/ / +* | 27bc569fb Merge branch 'charlesmchen/unseenVsUnreadViews' +|\ \ +| * | 1934b5d58 Tweak unseen database view accessor. +|/ / +* | 4011ee025 Merge branch 'charlesmchen/imageEditorFeatureFlag' +|\ \ +| * | 5e3de84fd Add feature flag for image editor. +|/ / +* | 8d8469d1c Merge branch 'charlesmchen/noteToSelf2' +|\ \ +| * | 9ab8bec2b Fix searching for 'note to self'. +|/ / +* | f68c1e179 Update Cocoapods. +* | 914d12eda Merge branch 'mkirk/fix-timer-update-message' +|\ \ +| * | 432af13b6 Fix timer update message. +|/ / +* | 5ec28406e (tag: 2.34.0.0) "Bump build to 2.34.0.0." +* | de8abe269 Merge branch 'charlesmchen/noteToSelf' +|\ \ +| * | 449633e0d Respond to CR. +| * | a7909c9c2 Note to Self. +| * | fc8fbebd9 Note to Self. +| * | 1d13a0292 Note to Self. +| * | e52feb3c3 Note to Self. +|/ / +* | f2e44487a Merge branch 'charlesmchen/imageEditor6' +|\ \ +| * | fcedd1d10 Revert "Revert "Revert "Debug scaffolding.""" +| * | 8aa68327e Add primitive color picker. +| * | e6d499a35 Revert "Revert "Debug scaffolding."" +|/ / +* | 58cb02bc9 Merge branch 'charlesmchen/imageEditor5' +|\ \ +| * | a440f692c Clean up image editor temp files. +| * | b24e8e4f8 Use autoreleasepool when rendering image editor output. +| * | 2b25d875b Don't select a tool by default in image editor view. +|/ / +* | 8736db96a Merge branch 'charlesmchen/imageEditor4' +|\ \ +| * | 5dcde4448 Image editor fixes. +| * | 17c3ba058 Image editor fixes. +| * | a6bc32877 Revert "Revert "Revert "Debug scaffolding.""" +| * | 5ac6d97bc Revert "Revert "Debug scaffolding."" +|/ / +* | ab8122d9a Merge branch 'charlesmchen/attachmentCrash' +|\ \ +| * | dc6dadad4 Respond to CR. +| * | 1260e7459 Add asserts around attachment crash. +|/ / +* | 4a84a19d0 Merge tag '2.33.0.11' +|\ \ +| |/ +| * 3cd31c6c5 (tag: 2.33.0.11) "Bump build to 2.33.0.11." +| * 43527ac73 Merge branch 'mkirk/fix-view-model-update' into release/2.33.0 +| |\ +| | * 049b85812 Fix crash when update corresponds to a move. +| |/ +| * badc959e6 Update l10n. +| * 3d6b9e1dc Fix build warning. +* | 9f67d181b Merge branch 'release/2.33.0' +|\ \ +| |/ +| * 00f5e4d3e Merge tag '2.32.2.0' into release/2.33.0 +| |\ +| | * b0318f59d (tag: 2.32.2.0, private/hotfix/2.32.2) Merge branch 'mkirk/sae-crash' into hotfix/2.32.2 +| | |\ +| | | * f27d0ef99 Fix SAE crash +| | |/ +| | * 9da8d1ac3 "Bump build to 2.32.2.0." +* | | 38d5db965 remove unnecessary logging +* | | a1a5fd4b9 Update Cocoapods. +* | | d47a5e2dc Merge branch 'mkirk/string-extensions' +|\ \ \ +| * | | b6f52ef12 update pods +| * | | 260002b02 move extension methods to SCK +| * | | 3151e6e1a move string extensions up +| * | | e73591638 move all possible methods into String+OWS in SCK +| * | | df79fc9ed Move String+OWS into SSK +|/ / / +* | | 6edf9e585 Merge branch 'charlesmchen/deviceNames' +|\ \ \ +| * | | 7eeec34aa Update Cocoapods. +| * | | 1d905119a Fix issues from integration testing. +| * | | cd194af31 Respond to CR. +| * | | bf2edf248 Update comments. +| * | | 2d3314751 Clean up ahead of PR. +| * | | 0005a33d3 Decrypt device names in linked devices views. +| * | | c113c8e96 Add DeviceNamesTest. +| * | | d59e2bb61 Add decryption to DeviceNames. +| * | | 0d20ebc62 Add encryption to DeviceNames. +| * | | 79375e20b Update proto schema. +|/ / / +* | | 4a26952f5 Merge branch 'mkirk/orm-perf' +|\ \ \ +| * | | d8fda8a7a (private/mkirk/orm-perf) Update pods with perf improvements +| * | | 7bc535739 [PERF] optimize search normalization saves 2.5% on large migration +| * | | 0cb702b37 [PERF] save 2% on large migrations +| * | | a0770c14c baseline perf test for migration +| * | | ca5b3c8ec make factory methods public +| * | | 40470ec42 fixup test fixes +| * | | 3be856389 fixup broken tests +|/ / / +* | | 686d6e498 Merge branch 'mkirk/fix-sort-id-rebased' +|\ \ \ +| * | | fc7a71361 CR: use existing transaction rather than open sneaky one +| * | | e0c9b590c CR: fix comment typo +| * | | af7ee5e1d address compiler breakage after rebase +| * | | 0db3f240d keep legacy properties around just in case... +| * | | 45e572e82 assert monotonic order for migration +| * | | 9d5753bd8 fix sortId comparison +| * | | 5671fd252 Revert "Revert 'new sort id'." +|/ / / +* | | 11b881927 Merge branch 'charlesmchen/l10nVoiceCodes' +|\ \ \ +| * | | 8949a49f6 Localize voice verification codes. +| * | | 2df70aba6 Localize voice verification codes. +|/ / / +* | | a1dbb2f04 Merge branch 'charlesmchen/imageEditor3' +|\ \ \ +| * | | 35b6f6cf1 Respond to CR. +| * | | 18f07d12b Revert "Revert "Revert "Debug scaffolding.""" +| * | | db8bc58b6 Implement crop. +| * | | 57f888a44 Add crop gesture. +| * | | 03cbeb5fe Start working on crop. +| * | | ce6a40e7c Revert "Revert "Debug scaffolding."" +|/ / / +* | | 3c68e2983 Merge branch 'charlesmchen/imageEditor2' +|\ \ \ +| * | | fe02575b6 Revert "Revert "Revert "Debug scaffolding.""" +| * | | 2f95413bc Use narrow change events in image editor. +| * | | f224c2130 Suppress undo during strokes. +| * | | cf1763e79 Suppress undo during strokes. +| * | | 3d67c6574 Suppress undo during strokes. +| * | | 9378ab219 Add undo/redo buttons to image editor. +| * | | 967da78f2 Revert "Revert "Debug scaffolding."" +|/ / / +* | | dfb985f46 Merge tag '2.33.0.10' +|\ \ \ +| |/ / +| * | 21a910d93 (tag: 2.33.0.10, origin/release/2.33.0, release/2.33.0) "Bump build to 2.33.0.10." +| * | c4e21c641 Sync translations +| * | 6fe33ab80 Merge branch 'charlesmchen/typingIndicatorsVsBlockAndLeftGroup' into release/2.33.0 +| |\ \ +| | * | 4e0cfac91 (charlesmchen/typingIndicatorsVsBlockAndLeftGroup) Respond to CR. +| | * | 07fef1615 Discard typing indicators for blocked and left groups. +| |/ / +| * | 1f6b18413 Merge branch 'charlesmchen/mpgVideo' into release/2.33.0 +| |\ \ +| | * | fa9af6c92 (charlesmchen/mpgVideo) Try to play .mpg videos. +| |/ / +* | | 8b6386b64 Merge branch 'charlesmchen/alwaysMessageActions' +|\ \ \ +| * | | 039755c0d Respond to CR. +| * | | dd836ef58 Respond to CR. +| * | | f2d585f43 Always allow long-press for message actions. +|/ / / +* | | f4dbc22d0 Merge remote-tracking branch 'release/2.33.0' +|\ \ \ +| |/ / +| * | 19d0119c6 Merge branch 'mkirk/fix-photo-picker-ios10' into release/2.33.0 +| |\ \ +| | * | fcea9f07b Fix hang on iOS10. +| |/ / +| * | e4d924d28 Merge tag '2.32.1.0' into release/2.33.0 +| |\ \ +| | |/ +| | * 31a1fe10c (tag: 2.32.1.0, private/hotfix/2.32.1, origin/hotfix/2.32.1) "Bump build to 2.32.1.0." +| | * 1a7127a75 Merge branch 'mkirk/fix-caption' into hotfix/2.32.1 +| | |\ +| | | * cf48fb307 Don't use caption field +| | |/ +* | | 3489668ad Merge branch 'charlesmchen/purgeDynamicInteractions' +|\ \ \ +| * | | bd40aacd5 Purge dynamic interactions from database. +|/ / / +* | | 98137e9dd Merge branch 'charlesmchen/imageEditor' +|\ \ \ +| * | | d1cf942f7 Respond to CR. +| * | | 825826aa0 Reduce jitter with smoothing. +| * | | b8775006b Clean up ahead of PR. +| * | | 794241963 Clean up ahead of PR. +| * | | e3d4523bc Revert "Debug scaffolding." +| * | | da13dc1d2 Clean up ahead of PR. +| * | | bf734d595 Clean up ahead of PR. +| * | | 04cd6c349 Clean up ahead of PR. +| * | | 639dac4e2 Add stroke drawing to the image editor. +| * | | b0e0c6e8c Replace edited attachments when sending. +| * | | 2f7e99de4 Smooth stroke rendering. +| * | | e2afe27f5 Add trivial test interaction to image editor. +| * | | 0d81139be Debug scaffolding. +| * | | 4752cb94f Add ImageEditorView. +| * | | 04440ed1e Add ImageEditorStrokeItem. +| * | | 8704ffe93 Sketch out image editor undo/redo. +| * | | 57232683f Sketch out image editor undo/redo. +| * | | f95526bff Start sketching out image editor. +| * | | 26a25f861 Start sketching out image editor. +|/ / / +* | | 7245307c9 Merge branch 'mkirk/perf-tweaks' +|\ \ \ +| * | | fd6a56b3a (private/mkirk/perf-tweaks) format bench in ms +| * | | f51416b2d save a few ms on send, hoist async dispatch to caller, and use it for clearing draft +|/ / / +* | | 6764d3e75 Merge branch 'mkirk/send-perf' +|\ \ \ +| * | | 6232b1ef6 CR: add debug asserts +| * | | 81bc357bb more robust handling of unsaved outgoing messages +| * | | 62cf05cd8 assert only trivial unsaved messages are appended to the view model +| * | | 087e32003 Track 'persisted' viewItems separately +| * | | e3610d436 Apply other requisite ViewItem attributes +| * | | 0ae482195 always put typing indicator last +| * | | 668cc22af Perf: Insert outgoing message into conversation before save completes. +|/ / / +* | | 176543d2a Merge branch 'mkirk/fix-compiler-warnings2' +|\ \ \ +| * | | 67cc1027c Fix compiler warnings +|/ / / +* | | f9ff1b22c Merge branch 'mkirk/input-bar-async' +|\ \ \ +| * | | 4b84583de reload input bar async +| * | | ac2c9cc52 Benchmark Events by ID +|/ / / +* | | 6e07999b8 Merge branch 'charlesmchen/settleConversationLoadWindow' +|\ \ \ +| * | | 9c46ce866 Re-enable prefetching a bit sooner. +| * | | 6797d4351 Auto-extend conversation load window size. +| * | | 8a6f30518 Auto-extend conversation load window size. +|/ / / +* | | 2b36cfed9 Merge branch 'charlesmchen/morePerfTweaks' +|\ \ \ +| * | | 6bc8f6d3a More perf tweaks for conversation view. +| * | | 2bf0c55ab More perf tweaks for conversation view. +|/ / / +* | | 91c246cf5 Merge branch 'charlesmchen/preheatUIDBViews2' +|\ \ \ +| * | | ca129bf36 Preheat more UI DB views. +|/ / / +* | | e08b725d9 Merge branch 'charlesmchen/moreCVMPerf' +|\ \ \ +| * | | be8a61b55 Refine contact offers logic. +| * | | 19a2bfeaa More conversation viewmodel perf improvements. +|/ / / +* | | 5087feb55 Merge branch 'charlesmchen/preheatUIDBViews' +|\ \ \ +| * | | 5f637f24e Preheat UI DB views. +|/ / / +* | | e453d19c1 Merge branch 'charlesmchen/legacyBuildSystem' +|\ \ \ +| * | | 7703155bb Enable legacy build system. +|/ / / +* | | 87ef86186 Merge branch 'charlesmchen/reverseDispatchQueue' +|\ \ \ +| * | | d32088db9 (private/charlesmchen/reverseDispatchQueue) Update Cocoapods. +| * | | b0295b736 Add ReverseDispatchQueue. +|/ / / +* | | 9f04e7c5d Merge branch 'charlesmchen/refineViewModelDiffs' +|\ \ \ +| * | | 85f6d05e0 Refine view model diffing. +| * | | 90d8fb3d1 Refine view model diffing. +|/ / / +* | | 99c45cde1 Merge branch 'charlesmchen/asyncConversationMedia' +|\ \ \ +| * | | 9db50bd9e Reduce priority of media loads. +| * | | 21ab3fbbc Respond to CR. +| * | | 962c1acc9 Fix "blinking" regression media views. +| * | | 047afe21a Fix typo. +| * | | b9404938c Respond to CR. +| * | | 358d97bf5 Always load conversation media async. +| * | | ddd6732f7 Revert "Always load conversation media async." +| * | | 5cb319a9c Always load conversation media async. +| * | | 956859244 Always load conversation media async. +| * | | c1578b4b0 Always load conversation media async. +|/ / / +* | | d5dbef6af Merge branch 'charlesmchen/contactOffersVsVM' +|\ \ \ +| * | | fea40d571 Move contact offers to Conversation view model. +|/ / / +* | | 98210e92d Merge branch 'charlesmchen/reduceInitialConversationLoadWindowSize' +|\ \ \ +| * | | 15826cec5 Reduce initial conversation load window size. +|/ / / +* | | 1f3e24ae4 Merge branch 'charlesmchen/profileFetchConcurrency' +|\ \ \ +| * | | d717ee541 Parse and apply profile fetches off main thread. +|/ / / +* | | 6239c5313 Merge branch 'charlesmchen/vmSortInteractions' +|\ \ \ +| * | | 9017c16e7 Sort interactions in CVM. +|/ / / +* | | c04c7e646 Merge branch 'charlesmchen/persistMediaValidityCache' +|\ \ \ +| |/ / +|/| | +| * | bd318a84a Fix typo. +| * | a96c6ed3b Persist the media validity cache. +|/ / +* | f9c083c69 (tag: 2.33.0.9) "Bump build to 2.33.0.9." +* | 3ee1c078f Merge branch 'charlesmchen/dbConnForOrphanDataCleaner' +|\ \ +| * | 95bc7a23f Use dedicated db connection in orphan data cleaner. +|/ / +* | ada1f1ae1 (tag: 2.33.0.8) "Bump build to 2.33.0.8." +* | 6ece45a2e toggle multisend feature flag +* | a6a51813e (tag: 2.33.0.7) "Bump build to 2.33.0.7." +* | 1bc81ad76 Merge branch 'mkirk/group-soft-delete' +|\ \ +| * | 425bdd7a4 guard against edge case +| * | c8c932033 add proper nullability annotation +| * | beb02afce Soft delete group threads +| * | c0cb7df10 rename hasEverHadMessage -> shouldThreadBeVisible +|/ / +* | 4ac93276c (tag: 2.33.0.6) sync translations +* | 70f826799 "Bump build to 2.33.0.6." +* | 823a6d9e0 Merge branch 'charlesmchen/finalizeOrphanCleanup' +|\ \ +| * | af3cff339 Prep orphan data cleaner. +| * | 8ba747916 Prep orphan data cleaner. +|/ / +* | 585ed0c31 Merge branch 'mkirk/moreRetainUntilComplete' +|\ \ +| * | b7ab036c0 (private/mkirk/moreRetainUntilComplete) warn_unused_result on AnyPromise methods +|/ / +* | a29db6cb5 Merge branch 'charlesmchen/moreRetainUntilComplete' +|\ \ +| * | acd97602c Respond to CR. +| * | 48bd0cfa0 Add missing retains to promises. +|/ / +* | 222e07c5b Merge branch 'charlesmchen/moreBackupFeatureFlag' +|\ \ +| * | 15653498b (charlesmchen/moreBackupFeatureFlag) Apply backup feature flag. +|/ / +* | f68c410bc (tag: 2.33.0.5) "Bump build to 2.33.0.5." +* | af2522516 Merge branch 'mkirk/order-photo-collections' +|\ \ +| * | ff4507021 Optimize album ordering - remove unnecessary albums +* | | 7f1791b2f Sync translations +|/ / +* | a50541009 Merge branch 'mkirk/album-design-tweaks' +|\ \ +| * | 1ab0daeb9 just a bit faster +| * | ed12a74cc album picker design tweaks +|/ / +* | 1fecdd132 Merge branch 'mkirk/collection-presentation' +|\ \ +| * | 3e032f55c clear selectedIds in sync with deselection +| * | d85350bf8 remain in "multiselect" mode after switching PhotoCollection +| * | e776a2410 update comment per code review +| * | 6556a3173 Don't extend PhotoCollection picker beneath navbar +| * | 2eb2c2856 fix conversation input appearing over image picker +| * | 6a61d660b Don't show "selected" badge unless in batch mode (per myles) +| * | ac7e2f76d Properly handle external library changes, avoid overzealous deselect +| * | 82d49350e properly deselect items when switching collections +| * | 635401dc5 Hide "Select" button while album chooser presented +| * | 5490f07bb Animate title chevron +| * | caf002069 Present CollectionPicker as child view +| * | 083d587ef WIP: Present CollectionPicker as child view +| * | 0e1a65446 WIP: Present CollectionPicker as child view +|/ / +* | f3b52945f Merge branch 'mkirk/video-thumbnails' +|\ \ +| * | 858ba6ef3 fix missing video thumbnails in approval view +|/ / +* | d77d968bf Merge branch 'mkirk/remove-overzealous-assert' +|\ \ +| * | 78e963404 remove overzealous assert, since we now sometimes post notification without threadId +|/ / +* | d29763acf Merge branch 'mirk/attachment-approval-placeholder' +|\ \ +| * | 3e48ed105 keyboard is always dark in attachment approval +| * | 2f92995cd Add placeholder text to message input field +|/ / +* | 800994f10 Merge branch 'mkirk/fix-draft-scrolling' +|\ \ +| * | 52e21be65 fix draft scrolling +|/ / +* | 19d76ac95 Merge branch 'charlesmchen/conversationViewScrollDown' +|\ \ +| * | 00c6ed2f3 (charlesmchen/conversationViewScrollDown) Tweak scroll down animation behavior in conversation view. +|/ / +* | 6f6ce86ab Merge branch 'charlesmchen/cloudKitNotificationThreadSafety' +|\ \ +| * | 734cc22cb (charlesmchen/cloudKitNotificationThreadSafety) Fix thread safety around CloudKit notifications. +|/ / +* | d5b2b2cdd Merge branch 'charlesmchen/lazyRestoreVsAppReadiness' +|\ \ +| * | c646dbc56 (charlesmchen/lazyRestoreVsAppReadiness) Deconflict lazy restore and app readiness. +|/ / +* | 0b03f275e Merge branch 'charlesmchen/refineConversationDeleteAndArchive' +|\ \ +| * | 02c7a52a6 (charlesmchen/refineConversationDeleteAndArchive) Refine conversation delete/archive. +|/ / +* | 9eb0c5e77 Merge branch 'release/2.32.0' +|\ \ +| |/ +| * d0f68177f (tag: 2.32.0.23, private/release/2.32.0, origin/release/2.32.0) "Bump build to 2.32.0.23." +| * 1328191a1 log transcript timestamp +* | eb96eec94 Merge branch 'release/2.32.0' +|\ \ +| |/ +| * 973390099 (tag: 2.32.0.22) "Bump build to 2.32.0.22." +| * 870f0903f Merge branch 'mkirk/landscape-bug' into release/2.32.0 +| |\ +| | * e83455064 ensure layout invalidated after leaving media landscape +| |/ +| * 2d3e34030 Merge branch 'mkirk/fix-settings-accessibility' into release/2.32.0 +| |\ +| | * 34737567c fix voice over for settings bar button item +| |/ +| * 7845b26d7 Merge branch 'mkirk/logging' into release/2.32.0 +| |\ +| | * 542360739 debug logging +| |/ +| * 3d9e27ff6 (tag: 2.32.0.21) "Bump build to 2.32.0.21." +| * b0bd0ecb3 "Bump build to 2.32.0.20." +| * ac012ac59 (tag: 2.32.0.20) Merge branch 'charlesmchen/typingIndicatorsBug2' into release/2.32.0 +| |\ +| | * 4f0fa23c4 Don't ever show TI when they are disabled. +| |/ +| * eda7d6b45 Update 'tags to ignore.' +* | faa6b3e4a Merge branch 'charlesmchen/timerIcons' +|\ \ +| * | 92ed5f54a Update timer icons. +|/ / +* | d48cc0823 Merge branch 'charlesmchen/darkThemeVsMediaDownloads' +|\ \ +| * | b88416a93 Apply dark theme changes to media downloads. +|/ / +* | 694b9ef7e Merge tag '2.32.0.20' +|\ \ +| * | e5f99b9d6 "Bump build to 2.32.0.20." +| |/ +| * 9921a6fe4 Merge branch 'charlesmchen/typingIndicatorsBug' into release/2.32.0 +| |\ +| | * 6e457e43c Clear typing indicators when they are disabled. +| |/ +* | eb613c87c Merge branch 'mkirk/limit-attachments' +|\ \ +| * | f8e073f09 enforce attachment limit in photo picker +| * | de73c220d increment version canary +| * | 1a5c47df2 Fix SAE, limit max attachments +|/ / +* | f7e0448f1 Merge branch 'charlesmchen/batchBackupTransfers' +|\ \ +| * | 304f0824f Respond to CR. +| * | 8811c61d2 Respond to CR. +| * | 855cba3c4 Batch backup exports. +| * | 57205facb Batch backup exports. +| * | c1ac5c187 Batch backup exports. +| * | 163c46748 Fix incremental backup exports. +|/ / +* | 607620911 Merge branch 'charlesmchen/lazyRestoreVsBackupImport' +|\ \ +| * | 019a4d580 Respond to CR. +| * | e45b27bb2 Stop lazy attachment restore during backup import. +| * | cafc732dc Fix incremental backup exports. +|/ / +* | ada0ea999 Merge branch 'charlesmchen/ignoreLocalProfileRestoreFailures' +|\ \ +| * | e8ddc041d Respond to CR. +| * | 0a4f00493 Ignore local profile restore failures. +| * | c3704931e Fix incremental backup exports. +|/ / +* | a1bb5fa43 Merge branch 'charlesmchen/fixIncrementalBackups' +|\ \ +| * | 7506d93ea Respond to CR. +| * | f6b5a9eec Fix incremental backup exports. +| * | e26eb5459 Fix incremental backup exports. +| * | 9a123d8ce Fix incremental backup exports. +| * | fe8259bf0 Fix incremental backup exports. +|/ / +* | d70aa4418 Merge branch 'release/2.32.0' +|\ \ +| |/ +| * 151b33933 Merge branch 'charlesmchen/explicitBackupFeatureFlag' into release/2.32.0 +| |\ +| | * 4ea920e89 Add explicit feature flag for backup. +| |/ +| * 58b36d18a Merge branch 'charlesmchen/tweakProfilesDebugUI' into release/2.32.0 +| |\ +| | * aa4fea64c Improve Profiles Debug UI. +| |/ +* | c8cf5e01a Merge branch 'charlesmchen/attachmentRestore' +|\ \ +| * | 52f52a94a Respond to CR. +| * | cb349ad0f Fix local profile restore. +| * | 894fd1379 Fix spurious assert. +| * | ee74691e8 Activate lazy restore of attachments. +| * | 998c079e6 Account for local profile avatar item in backup cleanup. +| * | 02150efa2 Fix assert in backup import. +| * | f7842dd2a Rework lazy attachment restore. +| * | 3bff89c7e Fix cancel in backup restore view. +| * | 7e77a69f8 Improve backup logging. +|/ / +* | e0f20bc8d (tag: 2.33.0.4) "Bump build to 2.33.0.4." +* | 96c472cfc update info.plist +* | 92dd77779 Merge tag '2.32.0.19' +|\ \ +| |/ +| * db3c0c631 (tag: 2.32.0.19) "Bump build to 2.32.0.19." +| * 22ae227da pull latest translations +| * 9eeed9970 fix formatting after merge +| * 156302acc Merge tag '2.31.2.0' into release/2.32.0 +| |\ +| | * 250bb8dc2 (tag: 2.31.2.0, private/hotfix/2.31.2) "Bump build to 2.31.2.0." +| | * e92512f65 Merge branch 'charlesmchen/envelopes' into hotfix/2.31.2 +| | |\ +| | | * 0955ab866 Refine envelope processing. +| | |/ +| * | f8299a212 (tag: 2.32.0.18, release/2.32.0) "Bump build to 2.32.0.18." +| * | 21d762f70 sync translations +| * | 46a44f68f Merge branch 'charlesmchen/quotedReplyVsAlbums' into release/2.32.0 +| |\ \ +| | * | ab9e2c4e1 (origin/charlesmchen/quotedReplyVsAlbums) Ensure quoted replies with attachments are handled properly. +| |/ / +| * | 68b939d89 Merge branch 'mkirk/splash-screen-changes' into release/2.32.0 +| |\ \ +| | * | 1ab4ed9ae enable typing indicators directly from splash +| | * | 13da4bc7d rename to "primary button" +| |/ / +* | | 036c6dca4 Merge branch 'release/2.32.0' +|\ \ \ +| |/ / +| * | 973afd041 Merge branch 'hotfix/2.31.1' into release/2.32.0 +| |\ \ +| | |/ +| | * f9bdf574f (tag: 2.31.1.3, private/hotfix/2.31.1, origin/hotfix/2.31.1) "Bump build to 2.31.1.3." +| | * 189f3c4c1 Merge branch 'mkirk/empty-message' into hotfix/2.31.1 +| | |\ +| | | * 2b43fe31e verify serialzed message exists +| | |/ +| | * 4ab37a0f3 Update Cocoapods. +| | * 5ce4f4a18 (tag: 2.31.1.2) "Bump build to 2.31.1.2." +| | * eb101e758 Merge branch 'charlesmchen/udIndicators' into hotfix/2.31.1 +| | |\ +| | | * a2dfcd028 Respond to CR. +| | | * c183aeca8 Refine asserts around message sending. +| | | * a6cef1c4c Update UD indicators. +| | |/ +| | * d6b107ec1 (tag: 2.31.1.1) "Bump build to 2.31.1.1." +| | * d78371be7 Don't use UD for "self" profile fetches. +| | * de2917c66 Merge branch 'charlesmchen/ccHeaders' into hotfix/2.31.1 +| | |\ +| | | * b290c9a89 Fix headers for censorship circumvention. +| | |/ +| | * b083d6a94 Merge branch 'charlesmchen/tweakFailover' into hotfix/2.31.1 +| | |\ +| | | * 4d1c38cc4 Never failover message sends. +| | |/ +* | | 8868e0a55 Merge branch 'charlesmchen/backupRestoreFlow' +|\ \ \ +| * | | 26c337d7b Add RegistrationController. +| * | | 782fbe656 Add RegistrationController. +| * | | e9bdc4c2c Rework backup restore flow. +|/ / / +* | | d821bd8e0 Merge branch 'charlesmchen/backupFixes' +|\ \ \ +| * | | 7624b01d1 Respond to CR. +| * | | 0a6d54e8b Clean up ahead of CR. +| * | | 4b7b7c19b Clean up. +| * | | 08de701d6 Clean up ahead of CR. +| * | | ca6532571 Don't send messages with restoring attachments. +| * | | 15dc7b2c7 Enable backup after successful backup restore. +|/ / / +* | | 08cd514e6 Merge branch 'charlesmchen/backupLocalProfile' +|\ \ \ +| * | | d085520c3 Respond to CR. +| * | | 9774b5d62 Backup local profile. +| * | | c9c76c650 Backup local profile. +| * | | 3acfa707d Backup local profile. +| * | | d6ca969c6 Backup local profile. +|/ / / +* | | 033044c1f Merge branch 'charlesmchen/backupPromises' +|\ \ \ +| * | | 8bd21fd02 Respond to CR. +| * | | 44d0ad34f Convert backup logic to use promises. +| * | | af477d3bf Convert backup logic to use promises. +| * | | 6d8fa7802 Convert backup logic to use promises. +| * | | a9120906f Convert backup logic to use promises. +| * | | e19b457cb Handle iCloud status. +| * | | c7f504705 Handle iCloud status. +|/ / / +* | | 3ad89e404 (tag: 2.33.0.3) "Bump build to 2.33.0.3." +* | | 39c8a153d fixup 2.32.0 RI +* | | 0b1907794 (tag: 2.33.0.2) "Bump build to 2.33.0.2." +* | | 128bb9be8 Merge tag '2.32.0.17' +|\ \ \ +| |/ / +| * | a247701cc (tag: 2.32.0.17) "Bump build to 2.32.0.17." +| * | b6e336a07 Merge tag '2.31.1.0' into release/2.32.0 +| |\ \ +| | |/ +| | * 9713c5870 (tag: 2.31.1.0) "Bump build to 2.31.1.0." +| | * 24a19eaac update REST endpoint ack url +| * | 74e6eddf0 Merge branch 'charlesmchen/moreUdTweaks' into release/2.32.0 +| |\ \ +| | * | 4126b35a2 Respond to CR. +| | * | 4ce0b68a8 Discard sender certificates after 24 hours. +| | * | 3edf3ed19 Don't use UD for "self" profile fetches. +| |/ / +* | | 5cfcee9d2 Merge tag '2.32.0.3' +|\ \ \ +| * | | d94392f02 (tag: 2.32.0.3) "Bump build to 2.32.0.3." +* | | | 79b774174 sync translations +* | | | 11592a6ae Merge branch 'mkirk/fix-caption-visibility' +|\ \ \ \ +| * | | | 71ab5817e fix captionview visibility +|/ / / / +* | | | 076281109 (tag: 2.33.0.1) "Bump build to 2.33.0.1." +* | | | 87109b44b add missing translation +* | | | 3d25ba09b Merge branch 'mkirk/fix-multiple-done' +|\ \ \ \ +| * | | | ee228794b Only press Done once +|/ / / / +* | | | ac9025bad Merge branch 'mkirk/update-infoscript' +|\ \ \ \ +| * | | | d66221d46 update BuildDetails +| * | | | d0a5bcd5c remove gem version logging from, since the canonical version is in the Gemfile.lock +| * | | | db6357c53 use bundle to report accurate cocoapods +| * | | | 63553a782 fail on any error +| * | | | 5213fbe21 make runnable from command line +| * | | | 4b5c4fae1 extract script to external file for more readable version control +|/ / / / +* | | | 7eaab544b Merge branch 'mkirk/fix-album-picker-background-color' +|\ \ \ \ +| * | | | cf2cdb4b9 Dark background for album picker in light theme too +|/ / / / +* | | | a4435f075 Merge branch 'mkirk/fix-missing-album-thumbnail' +|\ \ \ \ +| * | | | 53101a3fc Fix missing album thumbnails +|/ / / / +* | | | 6cbfc66eb Merge branch 'mkirk/album-picker-designs' +|\ \ \ \ +| * | | | 46102e57b AlbumPicker cells to spec +| * | | | 58eda67a7 show *most recent* thumbnail in album picker +| * | | | 87d133841 remove unused code +| * | | | ca1119e48 extract method for clarity +|/ / / / +* | | | e37a35858 Merge branch 'charlesmchen/backupMoreCollections' +|\ \ \ \ +| * | | | c3ad65af1 Respond to CR. +| * | | | 437e5605a Backup misc collections. +| * | | | c5744321b Backup misc collections. +| * | | | 95e1f840c Backup misc collections. +| * | | | 7e39bf97e Backup misc collections. +|/ / / / +* | | | 6d014f449 Merge branch 'charlesmchen/cleanupMigrations' +|\ \ \ \ +| * | | | 455602556 Update migrations. +|/ / / / +* | | | 86b18ddac Merge branch 'mkirk/dont-show-caption-for-single' +|\ \ \ \ +| * | | | 61758dcf0 Only show caption for multiple images +| * | | | 0ac8f13c0 remove redunant method, consolidate naming, adding array getter +| * | | | 6fdd5d100 dont initializer pagerScrollView as sideEffect +|/ / / / +* | | | f9b1b2f36 Merge branch 'mkirk/photo-picker-scroll-to-bottom' +|\ \ \ \ +| * | | | 69e8b187a only scroll down once +| * | | | 1a43498c2 update masks for "always dark" media views +| * | | | 83c156f9e Scroll photo-picker to bottom +|/ / / / +* | | | e9ab2a811 Merge branch 'mkirk/spurious-crash-logs' +|\ \ \ \ +| * | | | 7aad3a9e7 Avoid spurious crash reporting +|/ / / / +* | | | 2c344f6a5 Merge branch 'mkirk/photopicker-design' +|\ \ \ \ +| * | | | 9bcc6a6c5 show navbar for photo/album picker, not approval +|/ / / / +* | | | 753c88437 Merge branch 'charlesmchen/iCloudVsMultipleBackups' +|\ \ \ \ +| * | | | 1c012e9a2 Respond to CR. +| * | | | e23773ed2 Support multiple backups in single iCloud account. +| * | | | c86518e44 Support multiple backups in single iCloud account. +|/ / / / +* | | | df25301d5 Merge branch 'charlesmchen/longLivedBackup' +|\ \ \ \ +| * | | | 7fab42abf Use long-lived operations for CK backup. +| * | | | 0eafb8dc3 Use long-lived operations for CK backup. +| * | | | ba3a1863d Use long-lived operations for CK backup. +|/ / / / +* | | | 018fe6cb4 Merge branch 'charlesmchen/backupRestoreView' +|\ \ \ \ +| * | | | e3363ab9a Add isRegisteredAndReady to TSAccountManager. +| * | | | 8ad58e335 Respond to CR. +| * | | | dcaaff7ea Add isRegisteredAndReady to TSAccountManager. +| * | | | 70b2280aa Add isRegisteredAndReady to TSAccountManager. +| * | | | 8110e0c76 Clean up usage of TSAccountManager. +| * | | | d44a8f999 Sketch out the backup restore view. +| * | | | 156aa8419 Clean up ahead of PR. +| * | | | 4ee095838 Sketch out the backup restore view. +| * | | | 56fe3663e Fix retain cycle in settings views. +| * | | | f40b81ca4 Sketch out the backup restore view. +| * | | | 03f598a13 Sketch out the backup restore view. +| * | | | 332f202a5 Sketch out the backup restore view. +| * | | | 5010b027b Sketch out the backup restore view. +| * | | | 5c0d98b83 Show 'restore backup' view after registration. +|/ / / / +* | | | b2d75eb1a (tag: 2.33.0.0) "Bump build to 2.33.0.0." +* | | | d7f94b6d1 Merge branch 'mkirk/fix-resign-animation' +|\ \ \ \ +| * | | | 26ca47b51 Avoid CaptionTextView animation glitch while dismissing MessageTextView +|/ / / / +* | | | 78c74d87b Merge tag '2.32.0.16' +|\ \ \ \ +| | |/ / +| |/| | +| * | | dd6faa647 (tag: 2.32.0.16) "Bump build to 2.32.0.16." +| * | | 31782af2f dark theme section headers in tile gallery +* | | | d9942aa5e Merge branch 'mkirk/multisend-design' +|\ \ \ \ +| * | | | 9317ee9c9 (private/mkirk/multisend-design) design comment +| * | | | e3120a5b8 cleanup keyboard animation code +| * | | | 0562619ca smaller margins between rail images, avoid choppy change as the margin updates are not being animated smoothly. +| * | | | 55807f9a4 iPhoneX compatible keyboard animations +| * | | | 279694e70 keyboard animation cleanup +| * | | | 080845839 fix caption dismiss animation/placeholder for multiline message body +| * | | | 4f1f09f23 Use snapshot view to avoid momentary missing bottomToolbar while switching firstResponder from CaptionView to AttachmentApprovalViewController. +| * | | | 3bfda7ea8 Smooth kbd dismiss: avoid bouncing CaptionView due to quick transition of firstResponder +| * | | | b108f284b WIP: hide caption keyboard +| * | | | 838012d1e Caption length limit and label +| * | | | e0f7513df white tint for attachment approval textview cursors +| * | | | a946ec005 new icon assets per design +| * | | | 8776dd190 New "add caption" and "done" assets +| * | | | feb5a0c44 fix initial CaptionView layout glitch +| * | | | e65eeff0f Keyboard should cover _Caption_ TextView when _Message_ TextView becomes first responder. +| * | | | 33750baf6 finally got dismiss-before-swipe +| * | | | dd82803a1 second abandoned attempt to require dismiss before page +| * | | | b98b3d1fd WIP: require dismiss before swipe +| * | | | 706dd3d0c initial layout of keyboard is correct across pages +| * | | | 280664c76 WIP: keyboard +| * | | | eed255805 Avoid glitch in keyboard dismiss. +| * | | | 8b5d1d9e6 Only add delete button once +|/ / / / +* | | | 31637656f Merge branch 'mkirk/separate-caption-and-body' +|\ \ \ \ +| * | | | 28f8fc591 per cr, avoid unnecessary +| * | | | fcc4b516a fix typo in logging +| * | | | 4f0092615 Support captions *and* independent message body +| * | | | cd88ef2be CaptionView text field per page +| * | | | 79995cc52 rename captioning -> messageText +| * | | | 47affb81c Move gallery rail into input accessory view +|/ / / / +* | | | f65708c36 Merge branch 'charlesmchen/registrationEdgeCases' +|\ \ \ \ +| * | | | fa8095bf2 Respond to CR. +| * | | | 544bdbd7f Fix edge cases around registration. +|/ / / / +* | | | 6cdef57e2 Merge tag '2.32.0.15' +|\ \ \ \ +| |/ / / +| * | | 8ebe860ff (tag: 2.32.0.15) pull latest translations +| * | | 894ffa484 "Bump build to 2.32.0.15." +| * | | 7a3de0beb Merge branch 'mkirk/fix-sync-processing' into release/2.32.0 +| |\ \ \ +| | * | | 4a70f8dc0 only process attachments if they exist +| |/ / / +| * | | 18766280f fix crash when non-registered user upgrades +| * | | a5dec2321 (tag: 2.32.0.14) "Bump build to 2.32.0.14." +| * | | c29224e4e sync translations +| * | | 68a7a6da0 Merge branch 'mkirk/fix-tap-crash-on-iOS10' into release/2.32.0 +| |\ \ \ +| | * | | dbe8e5706 avoid crash on iOS9/10 +| |/ / / +| * | | 9483566ef Merge branch 'mkirk/fix-video-play-button-in-gallery' into release/2.32.0 +| |\ \ \ +| | * | | 343e58595 fix pause/play functionality +| |/ / / +* | | | af61418b0 Merge branch 'charlesmchen/restoreWithAttachmentPointers' +|\ \ \ \ +| * | | | de6c058ac Update Cocoapods. +| * | | | 5f8755f2e Respond to CR. +| * | | | f5ba8048b Clean up ahead of PR. +| * | | | d76bdf3a5 Use attachment pointers to restore attachments from backup. +| * | | | e72dafb08 Use attachment pointers to restore attachments from backup. +| * | | | 90e7df551 Use attachment pointers to restore attachments from backup. +|/ / / / +* | | | 7425f7f41 Merge branch 'charlesmchen/rekindleBackup' +|\ \ \ \ +| * | | | dae80ad4c Reorganize util code. +|/ / / / +* | | | 88026be42 Merge branch 'release/2.32.0' +|\ \ \ \ +| |/ / / +| * | | bfbf9d39a Update Cocoapods. +| * | | f7df229fc Merge tag '2.31.0.39' into release/2.32.0 +| |\ \ \ +| | | |/ +| | |/| +| | * | 221d280e4 (tag: 2.31.0.39, private/release/2.31.0, origin/release/2.31.0) "Bump build to 2.31.0.39." +| | * | 128ec6648 Merge branch 'charlesmchen/unregisteredAccountAttributesUpdate' into release/2.31.0 +| | |\ \ +| | | * | 4d2bbfc54 Fix crash around account attributes update when unregistered. +| | |/ / +* | | | 80f611c4d Merge branch 'mkirk/remove-message-author-id' +|\ \ \ \ +| * | | | 0d0359ee1 (origin/mkirk/remove-message-author-id) Fix crash due to empty authorId on old messages +|/ / / / +* | | | 7b3bf8636 Merge branch 'mkirk/simplify-dependency-documentation' +|\ \ \ \ +| * | | | f6d78d04b (origin/mkirk/simplify-dependency-documentation) removed outdated build instructions. +|/ / / / +* | | | 1df55c70f Merge branch 'mkirk/update-deps' +|\ \ \ \ +| * | | | e28eb330e (origin/mkirk/update-deps) bundle update +| * | | | 4db5df4bf pod update +|/ / / / +* | | | b87b2522e Merge tag '2.32.0.13' +|\ \ \ \ +| |/ / / +| * | | dc3cc3f40 (tag: 2.32.0.13) "Bump build to 2.32.0.13." +| * | | 8932c4a3f Sync translations +| * | | 6935761ab Merge tag '2.31.0.38' into release/2.32.0 +| |\ \ \ +| | |/ / +| | * | 9a7f08b70 (tag: 2.31.0.38) "Bump build to 2.31.0.38." +| | * | eb85684ba Merge branch 'mkirk/ud-error-handling' into release/2.31.0 +| | |\ \ +| | | * | f52a58e31 (origin/mkirk/ud-error-handling) Handle known sender +| | | * | 6c2dbbc7c verify envelope source before proceeding with error handling +| | |/ / +| * | | dc09d1473 (tag: 2.32.0.12) "Bump build to 2.32.0.12." +| * | | 715c9f19d Merge remote-tracking branch 'origin/charlesmchen/multipleLoadMore' into release/2.32.0 +| |\ \ \ +| | * | | 0bbfd3eb2 (origin/charlesmchen/multipleLoadMore) "Auto load more" async while scrolling. +| | * | | 910b24911 "Auto load more" async while scrolling. +| |/ / / +| * | | 6c9c8eb65 Fix build breaks. +| * | | 377e0f0f8 (tag: 2.32.0.11) "Bump build to 2.32.0.11." +| * | | 5e1423085 Merge branch 'mkirk/dark-theme-splash' into release/2.32.0 +| |\ \ \ +| | * | | 12aa76855 dark theme typing splash +| |/ / / +| * | | 8acc13e44 (tag: 2.32.0.10) "Bump build to 2.32.0.10." +| * | | 8ba028073 update pods +| * | | a94ce9855 Merge branch 'mkirk/fix-delete-share' into release/2.32.0 +| |\ \ \ +| | * | | bf21e9425 fix delete/share button +| | * | | f5de076c6 fix remove from rail when deleted +| |/ / / +| * | | 078799c87 update translations +| * | | 20be554a7 Update Cocoapods. +| * | | 391f901d1 Merge branch 'charlesmchen/fixSAE' into release/2.32.0 +| |\ \ \ +| | * | | 08a135a3f Respond to CR. +| | * | | 81f234f6a Fix breakage in share extension. +| |/ / / +| * | | 0efb96032 (tag: 2.32.0.9) "Bump build to 2.32.0.9." +* | | | d325d02d7 Merge branch 'charlesmchen/imagePickerAddMore' +|\ \ \ \ +| * | | | 8eb2550e0 Respond to CR. +| * | | | 8b24fba09 Add "add more" button to image picker. Provide caption editing continuity. +|/ / / / +* | | | 2efbf1f43 Merge branch 'mkirk/sender-rail' +|\ \ \ \ +| * | | | 87bfdbb72 (origin/mkirk/sender-rail) Sender Rail +|/ / / / +* | | | 1b759719e Merge branch 'charlesmchen/collectionPicker' +|\ \ \ \ +| * | | | 800ef06cd (origin/charlesmchen/collectionPicker) Update Cocoapods. +| * | | | 86d006ba1 Respond to CR. +| * | | | 2919e8d78 Respond to CR. +| * | | | ea080eda7 Sketch out the photo collection picker. +|/ / / / +* | | | 9641edbfd Fix build breakage. +* | | | 80585126d update pods +* | | | 92135af8b Merge branch 'release/2.32.0' +|\ \ \ \ +| |/ / / +| * | | 12b916ad3 Merge tag '2.31.0.37' into release/2.32.0 +| |\ \ \ +| | |/ / +| | * | 5c02f8d34 (tag: 2.31.0.37) "Bump build to 2.31.0.37." +| | * | b38a1030d Merge branch 'charlesmchen/socketCleanup' into release/2.31.0 +| | |\ \ +| | | * | dacccccf7 Remove UD websocket. +| | |/ / +| | * | 99d41256a (tag: 2.31.0.36) "Bump build to 2.31.0.36." +| | * | 534b0da73 Merge branch 'charlesmchen/messageFetchACK' into release/2.31.0 +| | |\ \ +| | | * | 210da5086 Rework ACK of messages fetched via REST. +| | |/ / +| | * | f6df3b01e (tag: 2.31.0.35) "Bump build to 2.31.0.35." +| | * | c2cc74f38 Fix build break. +| | * | 71aa42031 (tag: 2.31.0.34) "Bump build to 2.31.0.34." +| | * | 2296d2256 Merge branch 'charlesmchen/udVsPersistentConnection' into release/2.31.0 +| | |\ \ +| | | * | 949225d52 Respond to CR. +| | | * | bbdeeffc7 Use persistent HTTP connection for UD requests. +| | | * | c0e57bb35 Use persistent HTTP connection for UD requests. +| | | * | 11f8fcc80 Use persistent HTTP connection for UD requests. +| | |/ / +| | * | 2eff3cb55 (tag: 2.31.0.33) "Bump build to 2.31.0.33." +| | * | 2b33c2a15 Merge branch 'charlesmchen/udVsWebsocket' into release/2.31.0 +| | |\ \ +| | | * | b865b9114 Use REST for UD requests. +| | |/ / +| | * | 16aec33e2 Merge branch 'charlesmchen/clearMayHaveLinkedDevices' into release/2.31.0 +| | |\ \ +| | | * | b583e96a0 (origin/charlesmchen/clearMayHaveLinkedDevices) Tweak clearMayHaveLinkedDevices. +| | |/ / +| | * | d71a4c6ff Revert "Randomly fail half of all websocket requests." +| * | | a27b04613 CR: simplify scroll check +| * | | a60dc2bfe Merge branch 'mkirk/pager-rail-style' into release/2.32.0 +| |\ \ \ +| | * | | ff63c31da (origin/mkirk/pager-rail-style) CR: rename colors +| | * | | 47a711431 Gallery pager style changes +| |/ / / +| * | | c5bcba45b Merge branch 'mkirk/fix-all-media-view' into release/2.32.0 +| |\ \ \ +| | * | | f6e9fce0d fix All Media button from conversation settings +| | * | | 542d5826d fix a million retain cycles in conversation settings +| |/ / / +| * | | 8eff8966b Merge branch 'mkirk/pager-rail' into release/2.32.0 +| |\ \ \ +| | * | | 84879b991 Album rail in Gallery +| |/ / / +| * | | fd424f389 Revert accidental schema changes. +| * | | b120995dc Merge branch 'charlesmchen/mediaViewGlitches' into release/2.32.0 +| |\ \ \ +| | * | | 2e50cc1f2 Respond to CR. +| | * | | 84d6f61d5 Fix glitches in conversation media view. +| |/ / / +* | | | 3ccf0a3c9 Merge branch 'charlesmchen/multiSendSAE' +|\ \ \ \ +| * | | | 19d4834e7 Update Cocoapods. +| * | | | 3135e6f6f Respond to CR. +| * | | | aeadea67e Send multiple attachments from the share extension. +| * | | | 2bad0c20b Only fetch profiles in the main app. +| * | | | 7f89c90f1 Fix bug when sending non-body attachments (e.g. group avatars). +| * | | | 901f58c7e Fix bug when sending non-body attachments (e.g. group avatars). +| * | | | f7e7477f5 Add sharing scenarios to Debug UI. +| * | | | 860eb44ed Fix breakage in share extension. +|/ / / / +* | | | 24745570d Merge tag '2.32.0.8' +|\ \ \ \ +| |/ / / +| * | | f9e2c8172 (tag: 2.32.0.8) "Bump build to 2.32.0.8." +| * | | 27f9f6647 Merge branch 'mkirk/self-recipient' into release/2.32.0 +| |\ \ \ +| | * | | b25a70403 Fix: Compose thread picker doesn't show self +| | * | | 7eaaab7be restrict self device id in message building, not in recipient data model +| |/ / / +| * | | 6749eccaa (tag: 2.32.0.7) "Bump build to 2.32.0.7." +| * | | b19cfbc55 Fixup AppReadiness vis a vis RI +| * | | c6cead7bb (tag: 2.32.0.6) "Bump build to 2.32.0.6." +| * | | 3faa700d6 Merge tag '2.31.0.31' into release/2.32.0 +| |\ \ \ +| * \ \ \ 3c9be9c3d Merge branch 'mkirk/image-picker' into release/2.32.0 +| |\ \ \ \ +| | * | | | fa82d43e6 (origin/mkirk/image-picker) put custom image picker behind feature flag +| |/ / / / +* | | | | 0e749d552 Fix build break. +* | | | | be784d14d Revert "Disable the orphan data cleaner." +* | | | | 04064779d Revert "Randomly fail half of all websocket requests." +* | | | | 49c8e6db7 Merge remote-tracking branch 'origin/release/2.31.0' +|\ \ \ \ \ +| |/ / / / +|/| | / / +| | |/ / +| |/| | +| * | | 220fdfc14 (tag: 2.31.0.32) "Bump build to 2.31.0.32." +| * | | cae430bac Randomly fail half of all websocket requests. +| |/ / +| * | 38f551e22 (tag: 2.31.0.31) "Bump build to 2.31.0.31." +| * | fc3780c24 Merge branch 'mkirk/fix-disable-earpiece' into release/2.31.0 +| |\ \ +| | * | 4b213df95 Fix race in ProximityMonitoringManager. +| | * | 0d7e94f2f Fix: Voice Messages don't restore audio to speaker when held up to the ear past the voice notes duration. +| |/ / +| * | eafc3719a Merge branch 'mkirk/fix-missing-profile-after-rotation' into release/2.31.0 +| |\ \ +| | * | ae63e399b (origin/mkirk/fix-missing-profile-after-rotation) use new key to verify local profile +| |/ / +| * | fd482da42 Merge branch 'mkirk/overzealous-profile-key-rotation' into release/2.31.0 +| |\ \ +| | * | 5ed123d86 (origin/mkirk/overzealous-profile-key-rotation) Fix overzealous profile key rotation +| |/ / +| * | 6d55f707f Merge branch 'mkirk/dont-whitelist-blocked-contact' into release/2.31.0 +| |\ \ +| | * | 0aca0c15c specify recipient when profile download fails +| | * | 209e79ce3 Don't add blocked contact to your profile whitelist +| |/ / +| * | 6a1673862 (tag: 2.31.0.30) "Bump build to 2.31.0.30." +| * | 1692a28fc Update l10n. +| * | 7c47fe6b4 Disable the orphan data cleaner. +* | | 2241c1b13 Merge branch 'mkirk/fix-compiler-warnings' +|\ \ \ +| * | | 27f66f9f2 (origin/mkirk/fix-compiler-warnings) explicitly discard result +| * | | 2bd3e5ef2 cast to same integer signedness for comparison +| * | | 3c450eeea degrade from crashing to debug assert, upon failure we return a fully (overly) redacted string +| * | | 54059532f remove unused strong capture +| * | | 97e9871f1 remove unnecessary implicitly unwrapped optional +| * | | 2a1c62f6f remove unused delegate method declaration +| * | | 24f97f122 compiler warning: discard result explicitly +| * | | b79860ae0 fix compiler doc warning +| * | | c50b8dd0d fix compiler warning +|/ / / +* | | 46ebe52a2 update pods +* | | 5ba757999 Merge branch 'mkirk/fixup-tests-2' +|\ \ \ +| * | | f30e7cf54 (origin/mkirk/fixup-tests-2) update pods +| * | | 10af14d96 Remove legacy built in test runner from SSK. +| * | | 7cba367c0 reconcile jobqueue tests with NSTimer based retry +| * | | 4971be5c2 Fix DESIGNATED_INITIALIZER syntax +| * | | 2f3d875dc fixup ud manager tests +| * | | 79bed93b2 reconcile jobqueue with new readiness based setup +| * | | 2c44cbccf avoid assertion when deliberately testing for failure +| * | | 24668fa79 update to reflect id assignment on build +| * | | 4b0fc5193 update test to reflect correct behavior +| * | | e2ad9d81b attachment factory +| * | | 4d860bb9c fixup job queue test +| * | | 24f57cedd add missing method to FakeContactsManager, convert to Swift to avoid missing protocol methods in the future. +| * | | ca58bb00f fixup tests from throws_ audit +| * | | d49281666 Fixup certificate parsing tests +|/ / / +* | | 197f06af7 Merge branch 'mkirk/fix-tests' +|\ \ \ +| * | | 47a47afa0 (origin/mkirk/fix-tests) update pods +| * | | f45908c89 fixup spk deletion test +| * | | 06b763dfc Remove unused methods/tests +| * | | 8472801c4 fix link error when launching SSK tests +| * | | 59d3699e1 remove invalid test - non-optional argument triggers debug assert +| * | | dd9bd1c1b remove unused header for DatabaseConverter test +| * | | c710b7f8f Fixup certificate parsing tests +|/ / / +* | | caba577f2 (tag: 2.32.0.5) "Bump build to 2.32.0.5." +* | | a3a31c7f9 Merge branch 'charlesmchen/missingAlbumMessageId' +|\ \ \ +| * | | da4f41def Fix missing albumMessageId. +|/ / / +* | | 8acca4d56 Merge branch 'charlesmchen/tapOnAlbumItem' +|\ \ \ +| * | | 6f64a809f Tap on album item. +|/ / / +* | | 08a6be23a Update Cocoapods. +* | | 8b0e4f902 Merge branch 'mkirk/gallery-pager-fixups' +|\ \ \ +| * | | d805246cb (origin/mkirk/gallery-pager-fixups) update caption after deleting item +| * | | ca30a9645 Increase caption height +| * | | 78b1c9a8b caption should not be selectable/editable +| * | | 43489a655 remove gradient when viewing attachment with no caption +|/ / / +* | | 7b421ad4d Format tags_to_ignore +* | | 96c546d6b Update pods +* | | 5da525ce2 Merge remote-tracking branch 'origin/release/2.31.0' +|\ \ \ +| |/ / +| * | a431829a7 (tag: 2.31.0.29) "Bump build to 2.31.0.29." +| * | ec3061489 Merge branch 'charlesmchen/manualMessageFetchVsUD_' into release/2.31.0 +| |\ \ +| | * | 1ac74cfb8 Modify MessageFetcherJob to handle incoming UD messages. +| |/ / +| * | 745abb672 Merge branch 'charlesmchen/unregisteredVsReceipts' into release/2.31.0 +| |\ \ +| | * | c9c9d35d1 Discard receipts for unregistered users. +| |/ / +| * | dfdaf9340 (tag: 2.31.0.28) "Bump build to 2.31.0.28." +| * | 54e68a39d Merge branch 'charlesmchen/websocketVs409410' into release/2.31.0 +| |\ \ +| | * | 2b5a79f12 Cycle websocket after learning of new linked devices via 409/410. +| |/ / +| * | 13defe79b Merge branch 'charlesmchen/requestMakerFailureLogging' into release/2.31.0 +| |\ \ +| | * | f6322cb08 Fix logging in request maker. +| |/ / +| * | d64b0388e Merge branch 'charlesmchen/noUDSync' into release/2.31.0 +| |\ \ +| | * | 47022377c Respond to CR. +| | * | 954f32b77 Never use UD for sync messages. +| | * | 8ff8f17b2 Never use UD for sync messages. +| | * | 3a46a344a Never use UD for sync messages. +| |/ / +| * | 4c98a200d Merge branch 'charlesmchen/signalRecipientReloads' into release/2.31.0 +| |\ \ +| | * | 1c21c31c2 Fix failed reloads in SignalRecipient. +| |/ / +| * | 1e5a228c5 (tag: 2.31.0.27) "Bump build to 2.31.0.27." +| * | 6d2c34884 Merge branch 'mkirk/update-translations-2' into release/2.31.0 +| |\ \ +| | * | 62e9f51c0 (origin/mkirk/update-translations-2) sync translations +| | * | 18343e1af l10n tr_TR -> tr +| | * | 3585e111b l10n th_TH -> th +| | * | a726fef89 l10n sv_SE -> sv +| | * | 735331dc9 l10n ja_JP -> ja +| | * | 6d052f137 l10n it_IT -> it +| | * | c01475836 l10n el_GR -> el +| | * | f8207c6d2 l10n az_AZ -> az +| | * | 3cfbc75f6 l10n ko_KR -> ko +| | * | 0d0659030 update existing translations +| |/ / +* | | d99777248 use https:// url for gitmodules +* | | adcd089f8 Merge branch 'charlesmchen/longVersionString' +|\ \ \ +| * | | 1be757788 Prevent long version strings from being scrubbed in the logs. +|/ / / +* | | cc068b0b7 Merge branch 'mkirk/media-gallery-shows-captions' +|\ \ \ +| * | | 11fece2f3 move category method to be shared +| * | | 74b25c14f filter caption strings for display +| * | | 3b53ee08b Long captions use ScrollView rather than resizing +| * | | cfd2e8d9d Show captions in gallery page view +|/ / / +* | | 1da59dd9b (tag: 2.32.0.4) "Bump build to 2.32.0.4." +* | | 29b470231 Fix build break. +* | | f3f7f9924 Update Cocoapods. +* | | 71e97229d Merge branch 'mkirk/interaction-uuid' +|\ \ \ +| * | | 366b228c0 use UUID for TSInteractions.uniqueId +|/ / / +* | | 65cef9f98 Merge branch 'charlesmchen/appSettingsButtonAccessibility' +|\ \ \ +| * | | 52af57f8a Fix accessibility for app settings button. +|/ / / +* | | 14b20db7c Merge branch 'charlesmchen/invalidAndRetryAssets' +|\ \ \ +| * | | b475695f5 Respond to CR. +| * | | 34b4ea377 Revise media progress views. +| * | | 15c42642e Apply invalid and rety assets. +|/ / / +* | | 934164cd1 Merge branch 'charlesmchen/newCaptionAsset' +|\ \ \ +| * | | 9d1579a48 Update caption indicator asset. +|/ / / +* | | b7e6f1d42 Merge branch 'charlesmchen/allMediaAreAlbums' +|\ \ \ +| * | | cd224a159 Render single media as albums. +|/ / / +* | | 1b49fa294 Merge branch 'charlesmchen/albumProgress' +|\ \ \ +| * | | 82fb766c2 (origin/charlesmchen/albumProgress) Respond to CR. +| * | | c7582b6bd Update Cocoapods. +| * | | 654325c6d Add download progress indicators. +| * | | a26086b30 Show attachment upload progress indicators. +| * | | c1a5e1e25 Rename to media album. +|/ / / +* | | 6a3ecb3d0 Merge branch 'charlesmchen/attachmentDownloads' +|\ \ \ +| * | | 04e627cdc (origin/charlesmchen/attachmentDownloads) Update Cocoapods. +| * | | 3daf7d474 Add OWSAttachmentDownloads. +|/ / / +* | | b25f17a27 Merge branch 'mkirk/album-gallery-view' +|\ \ \ +| * | | 03aba9398 CR: use id for hashvalue, make clearer that we don't expect to use incrementing ID's for uniqueId +| * | | 7cf53293d restore Share/Delete functionality to gallery items in the post multi-attachment world +| * | | 42bf26760 fixup plumbing for incoming messages/synced transcripts +| * | | e096406e5 migrate existing attachments to album-compatible gallery schema +| * | | 57681bd6f Gallery supports album messages +| * | | 27cb91e9c Plumb through messageAlbumId so an Attachment knows what album (if any) it belongs to. +|/ / / +* | | 6b796579d Merge branch 'charlesmchen/typingIndicatorsFooter' +|\ \ \ +| * | | f37c4f71a Add footer to 'typing indicators' setting. +|/ / / +* | | fade52344 Merge branch 'charlesmchen/typingIndicatorTiming' +|\ \ \ +| * | | 8b5a99369 Tweak timing of typing indicators. +|/ / / +* | | 2f8b25b4b Merge branch 'charlesmchen/albumStrokes' +|\ \ \ +| * | | 02a9cc918 Remove stroke on album items. +|/ / / +* | | 00adefa51 "Bump build to 2.32.0.3." +* | | 272678ca9 Merge branch 'charlesmchen/reduceTypingIndicators' +|\ \ \ +| |_|/ +|/| | +| * | 9a44f24bc Reduce typing indicators. +|/ / +* | f382cd770 Fix build break. +* | 2c50e3460 Merge branch 'charlesmchen/mediaAlbumRename' +|\ \ +| * | 777e2b925 Rename to media album. +| * | 2dfd4b2c0 Rename to media album. +|/ / +* | dd0f642ff Fix build break. +* | 3ff3779f1 CR: remove unnecessary assert +* | 195c42b9c Merge branch 'charlesmchen/captionIndicators' +|\ \ +| * | c7c02f03d Display caption indicators for media albums in conversation view. +|/ / +* | db3e5f608 Merge branch 'mkirk/multi-image-approval' +|\ \ +| * | 7cef41f8e (origin/mkirk/multi-image-approval) Multi-approval +|/ / +* | b519baf37 Merge branch 'charlesmchen/typingIndicatorsVsSelf' +|\ \ +| * | b7fd48ec4 Respond to CR. +| * | 9cdf8d06f Ignore typing indicators from self. +|/ / +* | af85c0960 Merge branch 'charlesmchen/mediaGalleryCells4' +|\ \ +| * | 57de08911 Add support for album captions to models. +| * | 3816cb4bf Update proto schema to reflect album captions. +|/ / +* | 268c456d5 Merge branch 'charlesmchen/mediaGalleryCellsDebug' +|\ \ +| * | 60c5a84dd Fix issues in media gallery cells; Improve debug galleries. +|/ / +* | 88a1186e4 Restore XCode 9 compatability. +* | ada4bf595 Merge branch 'charlesmchen/typingIndicatorFixes' +|\ \ +| * | cdfd2779a Fix a couple small bugs in the typing indicators. +|/ / +* | 3f135e9f7 Merge branch 'charlesmchen/mediaGalleryCells' +|\ \ +| * | 5aa6467d2 Fix issues in media gallery cells. +| * | f45693ec3 Respond to CR. +| * | 736d7c735 Fix media gallery cell edge cases. +| * | d53830163 Fix media gallery cell edge cases. +| * | 34e85dd90 Fix media gallery cell edge cases. +| * | ee3bdca33 Fix media gallery cell edge cases. +| * | cfcb6cb15 Clean up ahead of PR. +| * | 0c76e1c02 Use ConversationMediaView to simplify media rendering in conversation view cells. +| * | f2c0a6f7d Clean up ahead of PR. +| * | c89bdd2a1 Modify MediaGalleryCellView to handle animated images and videos. +| * | 2c9a55678 Remove overzealous assert in ConversationViewModel. +| * | cf057e3af Modify MediaGalleryCellView to handle still images. +| * | ec6de40bd Modify MessageBubbleView to support media galleries. +| * | 0341f5dc2 Modify ConversationViewItem to support media galleries. +| * | f2c098590 Add 'is valid media?' method. +|/ / +* | a5c4d1b9e Merge branch 'mkirk/multi-image-send' +|\ \ +| * | 4c5d46e8f Custom photo picker, respects theme/call banner +|/ / +* | c8ac66ff8 (tag: 2.32.0.2) "Bump build to 2.32.0.2." +* | dfc7b032b Merge branch 'charlesmchen/incrementalDiffOrdering' +|\ \ +| * | 2ca32fddc Preserve ordering in incremental diffs. +| * | aa5e6b456 Preserve ordering in incremental diffs. +|/ / +* | 5d6ff608c (tag: 2.32.0.1) "Bump build to 2.32.0.1." +* | 43eda866e Merge branch 'charlesmchen/appWillBecomeReady_' +|\ \ +| * | 1c7add2b8 Respond to CR. +| * | 39c820b86 Distinguish 'app will/did become ready' events. +| * | eb2e16872 Distinguish 'app will/did become ready' events. +|/ / +* | d338e00b1 Merge branch 'charlesmchen/conversationViewModelStartupRace' +|\ \ +| * | af249de68 Fix race in CVM startup. +|/ / +* | 269fae21a Merge branch 'mkirk/bundle-update' +|\ \ +| * | e9ac38b90 bundle update +|/ / +* | 65776cdae (tag: 2.32.0.0) "Bump build to 2.32.0.0." +* | 1e31e6aec Merge branch 'charlesmchen/debugUIMultiImageSends' +|\ \ +| * | c7d427029 Respond to CR. +| * | 47fda2e37 Add debug UI for multi-image sends. +| * | ecba67b51 Add debug UI for multi-image sends. +| * | f6591fac2 Add debug UI for multi-image sends. +| * | d04f1e6e3 Add debug UI for multi-image sends. +|/ / +* | 078503ff2 Merge branch 'charlesmchen/unregisteredGroup' +|\ \ +| * | f89398046 Add debug UI function to make group with unregistered users. +|/ / +* | b0bf8ed29 Merge branch 'charlesmchen/infoPlistOrdering' +|\ \ +| * | 58856748d Update info plist to reflect PlistBuddy ordering. +|/ / +* | 7c65a9806 Fix breakage from typing indicators. +* | b90fee08b Merge remote-tracking branch 'origin/release/2.31.0' +|\ \ +| |/ +| * 78987445e (tag: 2.31.0.26) "Bump build to 2.31.0.26." +| * 3d8a2a7f8 Merge branch 'charlesmchen/unregisteredUsersCache_' into release/2.31.0 +| |\ +| | * 3eab5b82c Respond to CR. +| | * 3011175ce Fix "413 on prekey fetch" errors. +| | * e89d8b40d Fix "413 on prekey fetch" errors. +| | * 3cc1988f2 Fix "413 on prekey fetch" errors. +| | * 97e234f78 Fix "413 on prekey fetch" errors. +| |/ +| * 9e7c25af1 Merge branch 'charlesmchen/informLinkedDevicesOfProfileChanges' into release/2.31.0 +| |\ +| | * ac051fc89 Inform linked devices about profile changes. +| |/ +* | 5b0962c01 Merge branch 'charlesmchen/typingIndicators7' +|\ \ +| * | 58f36fba4 (origin/charlesmchen/typingIndicators7) Disable typing indicators by default for legacy users. +|/ / +* | cc63c5307 Merge branch 'charlesmchen/typingIndicators5_' +|\ \ +| * | b8e9cd6b5 Respond to CR. +| * | 22c922bf5 Respond to CR. +| * | 650469c6a Respond to CR. +| * | 4088bebe0 Clean up ahead of PR. +| * | 94eaed002 Fix rebase breakage. +| * | f8a5a4141 Apply dark theme to typing indicator. +| * | 37ae4ef36 Add typing indicator animation. +| * | 63d88ef5c Sketch out TypingIndicatorCell. +| * | eedc9f9a2 Sketch out "typing indicators" interaction and cell. +| * | 50381cc94 Add typing indicators in home view. +| * | b063a49d5 Rework typing indicators API. +| * | a113271b5 Merge branch 'mkirk/splash-screen' +| |\ \ +| | * | d9a4c6e83 typing indicator upgrade screen +| |/ / +* | | 994081093 typing indicator upgrade screen +|/ / +* | 13ab75fea Merge branch 'charlesmchen/typingIndicators6' +|\ \ +| * | 1db5a157c Respond to CR. +| * | a5ebe394d Include typing indicators in configuration sync messages; emit when that value changes. +| * | 33f5398ba Update proto schema for configuration messages to reflect typing indicators setting. +|/ / +* | 6b1b2ddae Merge branch 'mkirk/whitelist-staging-cds' +|\ \ +| * | aa22f9a55 whitelist staging cds domain +|/ / +* | 2a7ee15ea Merge branch 'mkirk/media-gallery-call-banner' +|\ \ +| * | 77bd9b885 Extract most Gallery functionality from the gallery NavigationController. +| * | 6d8a7ed80 things working +| * | 1af750363 fix media-gallery doesn't respect call banner +|/ / +* | cdafeb838 Merge branch 'charlesmchen/conversationViewModel1' +|\ \ +| * | 834bba888 Respond to CR. +| * | 32d3eed7b Add ConversationViewModel. +|/ / +* | 10868c9f9 Merge branch 'charlesmchen/typingIndicators3' +|\ \ +| * | ea734ad17 Respond to CR. +| * | a09cb16e7 Add typing indicators setting. +|/ / +* | 5f7eee92d Merge branch 'mkirk/orientation-changes' +|\ \ +| * | f24ef7a0e separate title view for landscape +| * | 432fcc016 Gallery tile landscape +| * | 85a4fc7b6 restore calling banner +| * | 19f2d0db4 WIP: Media Landscape Mode +|/ / +* | 85f85d9c3 fix debug crash +* | fe15a260e Merge branch 'release/2.31.0' +|\ \ +| |/ +| * 338364eff Merge branch 'charlesmchen/profileFetchConcurrency' into release/2.31.0 +| |\ +| | * 372939850 Request profile fetches on main thread. +| |/ +* | d620c36a5 Merge branch 'charlesmchen/typingIndicators1' +|\ \ +| * | 3d0e7386a Respond to CR. +| * | a98c82645 Start work on typing indicators. +|/ / +* | 40aa78e00 Merge remote-tracking branch 'origin/release/2.31.0' +|\ \ +| |/ +| * ec2478645 (tag: 2.31.0.25, release/2.31.0) "Bump build to 2.31.0.25." +| * 82d64405d fixup blogpost url +| * b5bf3761a (tag: 2.31.0.24) "Bump build to 2.31.0.24." +| * 08befe914 Merge branch 'charlesmchen/udRefinements' into release/2.31.0 +| |\ +| | * 698e48f2d Respond to security review. +| | * 7d8b20d09 Apply refinements to UD logic. +| | * 44f677439 Apply refinements to UD logic. +| | * c28d131f9 Respond to CR. +| | * e11d43d1f Respond to CR. +| | * ee87f1b48 Fix test breakage. +| | * c5f471159 Apply refinements to UD logic. +| | * 2541be161 Apply refinements to UD logic. +| |/ +| * e94e4d0a9 Merge branch 'mkirk/wrap-exceptions' into release/2.31.0 +| |\ +| | * 86066a37d update pods for exception wrapping +| | * 1dea927a3 Remove some usage of throwswrapped_ in udmanager since we don't need to propogate the wrapped exception anyway. +| | * 3d9cd4f4e CR: comments and code clarity +| | * 3bef78335 find -E . -type f -regex ".*\.(m|h|swift)" -exec sed -i "" -e "s/trywrapped_/throwswrapped_/g" {} \; +| | * cb9aa6304 find -E . -type f -regex ".*\.(m|h)" -exec sed -i "" -e "s/try_/throws_/" {} \; +| | * e09a18144 SQUASHME review podfile changes +| | * 8544c8642 Swift Exception wrap HKDFKit +| | * c4f897530 Swift Exception wrap Curve25519 +| | * c686e766b Exception audit, fail directly where intended +| | * 9d2731c9b exception auditing OWSRaiseException +| | * 3a6aafc45 Swift Exception wrap NSData+keyVersionByte +| | * 5f5ec9b82 ExceptionWrap loadPreKey +| | * b622b3a02 Exception wrap TSDerivedSecrets for Swift +| | * 8d823193f Exception wrap WhisperMessage for Swift +| | * 1482c600b Exception wrap PreKeyWhisperMessage for Swift +| | * 60769a3d1 Exception wrap SessionCipher for Swift +| |/ +| * 0d7d83f27 Update carthage version in Info.plist. +| * 5535abd01 Update "sealed sender" blog post URL. +| * d24dce758 (tag: 2.31.0.23) Bump build to 2.31.0.23. +| * 1c6bfb454 (tag: 2.31.0.18) "Bump build to 2.31.0.18." +| * 9417bdeaa Merge branch 'charlesmchen/networkManagerErrors' into release/2.31.0 +| |\ +| | * a5f715eca Fix network manager error wrapping. +| |/ +| * 6e386b75c Merge branch 'charlesmchen/reregistrationVsProfile' into release/2.31.0 +| |\ +| | * 9fa16cc66 Fix small bug in the re-registration flow. +| |/ +| * af9a264c9 Merge branch 'charlesmchen/fixUDManagerTests' into release/2.31.0 +| |\ +| | * deafc749d Fix UD manager tests. +| |/ +| * 29ba1bd34 Merge branch 'mkirk/more-logging' into release/2.31.0 +| |\ +| | * ccd30e0e1 more logging +| |/ +| * 8a98a8abb Merge branch 'mkirk/minimize-prekey-checks' into release/2.31.0 +| |\ +| | * e26db74fc only check prekeys when decrypting a PKWM +| |/ +| * db60083dd Merge branch 'mkirk/persist-devices' into release/2.31.0 +| |\ +| | * af3102441 ensure device updates are persisted +| |/ +| * ef25b9c19 Merge branch 'mkirk/fixup-test-build' into release/2.31.0 +| |\ +| | * 90500475f fixup searcher test +| | * 159c546d1 update test environment +| | * af1940517 update carthage build path for tests +| |/ +| * faa556163 (tag: 2.31.0.17) "Bump build to 2.31.0.17." +| * 2e3a32e7d Merge branch 'mkirk/disable-proximity' into release/2.31.0 +| |\ +| | * 6968dbab1 Update UIDevice on main thread +| | * b0a6d1857 leave proximity enabled as long as CallViewController exists +| | * 5632bd2d8 Use reference counting to disable proximity monitoring after audio message +| |/ +| * 7f37400f1 Merge branch 'mkirk/fix-missing-own-avatar-after-key-rotation' into release/2.31.0 +| |\ +| | * 68353631d copy avatar file when rotating, since updating avatarURL entails removing the underlying file +| |/ +| * 9a65c8326 Merge branch 'charlesmchen/smallUDTweaks' into release/2.31.0 +| |\ +| | * 33f0a32e5 Improve UD logging. +| | * 302da6601 Fix UD access logic. +| |/ +| * 514c7b603 (tag: 2.31.0.16) "Bump build to 2.31.0.16." +| * c556d0c72 Merge branch 'charlesmchen/unrestrictedRandomProfileGets' into release/2.31.0 +| |\ +| | * 15e6916ba Update Cocoapods. +| | * 737f64b76 Improve UD logging. +| | * ad59b2f6d Move "ud access for sends" logic into UD manager. +| | * 3f10ce740 Tweak profile fetch auth behavior in unknown mode case. +| | * 36f39d9a3 Remove SSKUnidentifiedAccess. +| | * 7de289f6b Remove SSKUnidentifiedAccess. +| | * 5d18497ad Try random UD access keys in profile gets. +| | * dbe635f72 Try random UD access keys in profile gets. +| |/ +| * b65d515ac Update cocoapods. +| * 0cf24e39a Merge branch 'charlesmchen/avatarIconQuality' into release/2.31.0 +| |\ +| | * 408008d3e Use different contact avatar assets depending on size of output. +| | * 4ea6d7200 Improve default avatar quality. +| |/ +| * a602a807f Merge branch 'charlesmchen/moreStartupLogging' into release/2.31.0 +| |\ +| | * bf1f9e706 Exclude date/time and Xcode version info in debug builds to avoid churn. +| | * ed4fa2e8c Respond to CR. +| | * 38f3321e9 Improve startup logging. +| |/ +| * c879878d6 Merge branch 'charlesmchen/contactManagerDeadlocks' into release/2.31.0 +| |\ +| | * 70f274598 Avoid deadlocks in contact manager. +| | * f26241ebd Avoid deadlocks in contact manager. +| |/ +| * bf140971e Merge branch 'charlesmchen/consistentAvatarColors' into release/2.31.0 +| |\ +| | * 5b339a642 Respond to CR. +| | * 25ed886e7 Update home and group cells' dependencies. +| | * 763acae15 Use thread to ensure consistent colors in contact cells. +| | * 28f37a7a3 Update contacts cells' dependencies. +| |/ +| * 08518c66b Merge branch 'charlesmchen/groupAvatarUpdateAsserts' into release/2.31.0 +| |\ +| | * 278c61fd1 Remove assert around group avatar updates. +| |/ +| * cc97090ef Merge branch 'charlesmchen/logWebRTCVersion' into release/2.31.0 +| |\ +| | * 8e1103c28 Log WebRTC version. +| |/ +| * 8cb62e7f8 (tag: 2.31.0.15) "Bump build to 2.31.0.15." +| * 81d6b60ad Fix icon layout in privacy settings. +| * 7868bed2a Merge branch 'charlesmchen/syncMessagesForSuccess' into release/2.31.0 +| |\ +| | * 9df94b847 Rework sync transcript sending. +| |/ +| * 6f6612048 (tag: 2.31.0.14) "Bump build to 2.31.0.14." +| * 0270423a1 Merge branch 'mkirk/voicenote-earpiece' into release/2.31.0 +| |\ +| | * ce9ca1bda audio player type +| | * 4b4b18c62 Proximity playsback through earpiece +| | * 3b4188f34 hoist audio session singleton to Environment +| | * 3d022adf4 WIP: audio activities +| |/ +| * 14f2b8936 Merge branch 'mkirk/m70' into release/2.31.0 +| |\ +| | * 9708a1aed update WebRTC to M70 +| |/ +| * c8c63c18d (tag: 2.31.0.13) "Bump build to 2.31.0.13." +| * 6a91f021a Update l10n for UD. +| * 11c5257a4 (tag: 2.31.0.12) "Bump build to 2.31.0.12." +* | c4677c9d4 CR: add some reachability asserts +* | 9ad77399c Merge branch 'mkirk/durable-queue-reachability' into master +|\ \ +| * | 0c2bb439f kick-queue upon reachability +| * | 54c63c7a2 Reachability Singleton +| * | b8e4bfff8 shuffle isReady->isSetup, centralize starting workStep +|/ / +* | c9d6ccc48 Merge branch 'mkirk/durable-queue' into master +|\ \ +| |/ +|/| +| * 751b6e568 documentation for MessageSenderJobQueue +| * 037bdebfa clarify backoff delay examples +| * 86a0efedc Don't delete session upon starting retry +| * d35b735d7 Log message type in message sender +| * 3560f3be5 Durable send operation +| * e20df022c always show footer for in-progress sending +| * 25af0f4c1 more factories +| * 3a1769c81 unrelated swift fix +| * 456b2c083 Avoid crash during test runs +|/ +* cc9dad02a Merge branch 'charlesmchen/deviceChangeVsWebsocket' +|\ +| * 21cf467bb Don't use websocket after 409/410. +|/ +* 0ccda03a2 Merge branch 'charlesmchen/udCopy' +|\ +| * 55ab6c39d Rework UD settings. +| * f765c6c1b Update UD settings copy. +|/ +* 8194409f5 Merge branch 'mkirk/webrtc-repo' into master +|\ +| * 91eba4dbf Move WebRTC to separate submodule +|/ +* 0441d1fe7 (tag: 2.31.0.11) "Bump build to 2.31.0.11." +* 910fa11ad Merge branch 'charlesmchen/testsVsNSUserDefaults' +|\ +| * 1a53005e0 Respond to CR. +| * a9aabf763 Use temporary user defaults in tests. +|/ +* 196542fd9 Merge branch 'charlesmchen/udVsLinkedDevices2' +|\ +| * b003049d9 Improve UD logging. +| * b33886366 Always disable UD for users without verifier. +|/ +* 639f38571 Merge branch 'charlesmchen/udVsLinkedDevices' +|\ +| * 8c8b3a95b Respond to CR. +| * 00d79900e Fix edge cases around UD v. linked devices. +| * b83299888 Fix edge cases around UD v. linked devices. +| * 8fec73dda Fix edge cases around UD v. linked devices. +| * d656ae101 Fix edge cases around UD v. linked devices. +|/ +* 24e3dbbe4 (tag: 2.31.0.10) "Bump build to 2.31.0.10." +* 81830ee0f Merge branch 'charlesmchen/udIFFSync' +|\ +| * 64aa43edb Only enable UD if UD is supported by all linked devices. +|/ +* bdf6ba15d (tag: 2.31.0.9) "Bump build to 2.31.0.9." +* 060be88e8 Merge branch 'charlesmchen/lazyTranscripts' +|\ +| * 86e22edcb Send "sent message transcript" sync messages at the _end_ of a send, not after the first recipient is sent. +|/ +* 9cb7f1a4f Merge branch 'charlesmchen/udSyncVsDeviceLinking' +|\ +| * 9c161e913 Respond to CR; handle device changes in SignalRecipient as well. +| * 55369a1ca Only send 'sent message transcript' sync messages using UD. +| * 94c7b7236 Only send "sent message transcript" sync messages using UD. +|/ +* 991cf5148 Merge branch 'charlesmchen/requestMaker' +|\ +| * 553d1ac3b Respond to CR. +| * 2894db0d6 Add request maker. +|/ +* b5ed4e8ea Merge branch 'charlesmchen/prekeyFetchViaWebSocket' +|\ +| * ab6c4a4c3 Try prekey fetches via websocket. +|/ +* b7920fef8 Remove obsolete TODO. +* 72903105c Merge branch 'charlesmchen/syncVsProfileKeyRotation' +|\ +| * 99d0495ec Respond to CR. +| * 5809d026d Clean up ahead of PR. +| * bbcbbafaa Sync local profile key after rotating it. +|/ +* e803f2bfb (tag: 2.31.0.8) "Bump build to 2.31.0.8." +* c86733ab9 Merge branch 'charlesmchen/debugLogEmailTemplate' +|\ +| * a74687439 Improve the debug logs email template. +|/ +* 693b3e13a Revert "Sync local profile key after rotating it." +* ddbd20e70 Sync local profile key after rotating it. +* 855615d76 Merge branch 'charlesmchen/udProduction' +|\ +| * 7115d45d0 Changes for UD in production. +|/ +* 4a5c1b6b1 Merge branch 'charlesmchen/udSendCleanup' +|\ +| * d44e414b5 Clean up message sender. +|/ +* c7fc7ade0 Merge branch 'charlesmchen/linkedDeviceUDState' +|\ +| * 6d075747c Update local profile after registration and profile key rotation. +| * 932244288 Don't assume all linked devices support UD. +|/ +* d9e5e9ddc Merge branch 'charlesmchen/udFixes2' +|\ +| * 353f91db6 Respond to CR. +| * 9519e7961 Rework recipient device updates. +| * a00ebdf4a Fix UD auth edge cases. +| * 2f4094e80 Fix UD auth edge cases. +| * 4d89670f1 Fix UD auth edge cases. +|/ +* 398e72c69 Merge branch 'charlesmchen/udProdTrustRoot' +|\ +| * de8b5b55c Update production trust root. +|/ +* 7f1377472 Merge branch 'charlesmchen/groupIdLength' +|\ +| * 6d3f62453 Add asserts around group id length. +|/ +* ca2ab587a Merge branch 'charlesmchen/codeVerificationPromise' +|\ +| * a9b4b06c8 Retain code verification promise. +|/ +* 34bd61870 (tag: 2.31.0.7) "Bump build to 2.31.0.7." +* c7029ddb8 Merge branch 'charlesmchen/syncUDIndicatorSetting' +|\ +| * 0add39c2a Respond to CR. +| * 275414cbd Respond to CR. +| * 7c1f1882d Sync "show UD indicators" setting. +| * 43960aadd Update proto schema. +|/ +* 87c89d414 Merge branch 'mkirk/fix-factory' +|\ +| * aff35329b make factory Swift 4.1 compatible +|/ +* cccd24612 Revert "Revert Factories." +* 44b951fdf Merge branch 'charlesmchen/migrationCompletion' +|\ +| * 2b8c70ef9 Fix UD attributes migration completion. +|/ +* 2e4a655b7 Merge branch 'charlesmchen/pasteLogUpdates' +|\ +| * 92b55b945 Revert copy change. +| * 866338fba Refine debug logs UI. +|/ +* d5aa72a22 Merge branch 'charlesmchen/singletonAgain' +|\ +| * c6ef7f18e Improve test logging. +| * 79ed05133 Move db connections to environments. +| * f1646b6cb Move db connections to environments. +| * 829851bd7 Hang PushManager on AppEnvironment. +|/ +* fa89e487a Merge branch 'charlesmchen/udThreadlessErrors' +|\ +| * 9d7c3afda Show (threadless) error notifications for UD decrypt failures. +|/ +* 10309faf5 (tag: 2.31.0.6) "Bump build to 2.31.0.6." +* b1e52c30b Fix build breakage. +* 3cf13ee15 (tag: 2.31.0.5) "Bump build to 2.31.0.5." +* 7aabb821b Revert Factories. +* d5bf17e59 (tag: 2.31.0.4) "Bump build to 2.31.0.4." +* 92f21e96b Update Cocoapods. +* ce8b18274 (tag: 2.31.0.3) "Bump build to 2.31.0.3." +* 0a56b8258 Merge branch 'mkirk/fix-testutils-breakage' into master +|\ +| * d6cbdddc4 Fix test build, rename src/Test/ ->src/TestUtils/ to avoid confusion with the existing test/ directory +|/ +* db09a4dae Merge branch 'mkirk/test-factories' into master +|\ +| * ac7f9f62d factories for tests +|/ +* 59551ddab Merge branch 'charlesmchen/enableOrphanDataCleaner' +|\ +| * 72d21f511 Enable orphan data cleaner. +|/ +* f92ef8447 Merge branch 'charlesmchen/buildBreakage3' +|\ +| * 48c4576c0 Fix failing test. +| * 8830f0a59 Clean up ahead of PR. +| * 0b4ed1175 Create AppEnvironment. +| * d7e52367f Create AppEnvironment. +|/ +* dbaa49d2f Merge branch 'charlesmchen/buildBreakage' +|\ +| * bc4ac8cd1 Respond to CR. +| * df6fe05d0 Get tests running. +| * 53466386f Get tests running. +| * 32cf68bec Get all tests building. +|/ +* 814921935 Merge remote-tracking branch 'origin/release/2.30.2' +|\ +| * 0767dd66a (tag: 2.30.2.16, origin/release/2.30.2) "Bump build to 2.30.2.16." +| * 1a1bf38ff update translations +| * 3d3454ceb "Bump build to 2.30.2.15." +| * d2ac64b30 update carthage +* | 88c96f3c2 Update Cocoapods. +* | ab9e95961 Merge branch 'mkirk/call-missing-retain' into master +|\ \ +| * | 5b8d712ad add missing retain in peer connection client +|/ / +* | 5a6c2d32f Merge branch 'charlesmchen/smEnvironment' +|\ \ +| * | 603e3bf0b Move SM singletons to Environment. +|/ / +* | b9d592ed1 Merge branch 'mkirk/upgrade-promisekit' into master +|\ \ +| * | 0cfa5c07f (private/mkirk/upgrade-promisekit) update pods +| * | d6a6024f3 Update PromiseKit +|/ / +* | f578ab1df Merge branch 'mkirk/dev-fixups' into private-master +|\ \ +| * | 92e8b117f fixup debug contacts +|/ / +* | 9b6d2be37 (tag: 2.31.0.2) "Bump build to 2.31.0.2." +* | c9abd5a6e Merge branch 'mkirk/fix-new-account-registration' into master +|\ \ +| * | c425aa949 dont rotate profile keys for unregistered user +|/ / +* | b44a5e9d2 (tag: 2.31.0.1) "Bump build to 2.31.0.1." +* | f4db5e6bb Merge branch 'charlesmchen/accountAttributeUpdates' +|\ \ +| * | c9922cda3 Respond to CR. +| * | 8fdf6009f Sync contacts after rotating profile key. +| * | eb7abdfc6 Account attributes updates. +|/ / +* | f1d93d447 Merge remote-tracking branch 'origin/release/2.30.2' +|\ \ +| |/ +| * c995c838d (tag: 2.30.2.14, private/release/2.30.2) "Bump build to 2.30.2.14." +| * 97d6ac370 Merge branch 'mkirk/blue-group' into release/2.30.2 +| |\ +| | * d5f69e4bb feature flag for group avatar color +| |/ +| * ebd356054 (tag: 2.30.2.13) "Bump build to 2.30.2.13." +| * 76b305034 Merge branch 'mkirk/cds-failures' into release/2.30.2 +| |\ +| | * 5edf2e426 Only report attestation failure if we *received* the attestion. +| | * c4550ebc9 don't submit feedback for connectivity errors +| | * e22ad8ba6 include underlying error in wrapped TSNetworkErrors +| | * e7170dc6e conventional error structure for connectivity error +| | * 54b184bc9 Whitelist cds domain +| |/ +| * 51699ebc0 (tag: 2.30.2.12) "Bump build to 2.30.2.12." +| * d3d5dd71a Merge branch 'mkirk/dark-theme-toggle' into release/2.30.2 +| |\ +| | * 4435d16f9 dark theme toggle in app settings +| |/ +| * c39cec413 Merge branch 'charlesmchen/bumpRuby' into release/2.30.2 +| |\ +| | * b88cbef1f Bump ruby version to v2.5.0. +| |/ +| * 501f4641a (tag: 2.30.2.11) "Bump build to 2.30.2.11." +| * 770c9c08b Merge branch 'charlesmchen/convoBubbleColors' into release/2.30.2 +| |\ +| | * 17541a888 Change conversation bubble colors. +| |/ +| * 5344766ef (tag: 2.30.2.10) "Bump build to 2.30.2.10." +| * 6104fb675 Merge branch 'mkirk/archive-stack' into release/2.30.2 +| |\ +| | * ac1216962 Keep home view controller in the navigation stack when entering an archived conversation. +| |/ +| * f78198c07 Merge branch 'charlesmchen/settingsButtonGlitch' into release/2.30.2 +| |\ +| | * acdd7f280 Fix settings button glitch on iOS 10. +| |/ +| * 0cb6a5765 (tag: 2.30.2.9) "Bump build to 2.30.2.9." +| * af236f57e Merge branch 'mkirk/sync-modern-colors' into release/2.30.2 +| |\ +| | * 2b805e4ea Constantize ConversationColorName, map previous incorrect values +| | * d59e21e7f Nothing outside of TSThread should know about legacy colors +| |/ +| * b612533d4 (tag: 2.30.2.8) "Bump build to 2.30.2.8." +| * b02f3eec1 update translations +| * 54c061fb9 Merge branch 'mkirk/fixup-color-for-new-conversation' into release/2.30.2 +| |\ +| | * 405cc31a3 Apply new colors to new conversation +| |/ +| * 6b21849b8 (tag: 2.30.2.7) "Bump build to 2.30.2.7." +| * e18af5a47 sync translations +| * b797ac83c Merge branch 'mkirk/attachment-download-failures-2' into release/2.30.2 +| |\ +| | * f243914fe NSTemporaryDirectory -> OWSTemporaryDirectory/AccessibleAfterFirstAuth +| | * e1e355bfe fixup filebrowser +| |/ +| * 2d3bd87de (tag: 2.30.2.6) sync translations +| * 9f7cdc3f8 "Bump build to 2.30.2.6." +| * 91c129a13 update pods +| * a065c391d (tag: 2.30.2.5) "Bump build to 2.30.2.5." +| * 049fd63f4 Merge branch 'mkirk/attachment-download-failures' into release/2.30.2 +| |\ +| | * 656035837 Fix failed attachment downloads in beta +| |/ +| * 1fb4ca999 Merge branch 'mkirk/color-picker-tweaks' into release/2.30.2 +| |\ +| | * dcb65854e More scaleable across device sizes. +| | * bdb5bd559 minimize diff +| | * 375c8bee0 Use stand accessoryView mechanics +| | * 5127352f7 update color picker cell per design +| | * 8faf8668b lighter sheetview handle for dark theme +| | * bbbc5bbb8 update copy per myles +| | * 043b0c835 swipe to dismiss sheet view +| |/ +| * 17ad905f2 Merge branch 'mkirk/fix-multiple-review-requests' into release/2.30.2 +| |\ +| | * 7805e0044 work around multiple review's appearing +| |/ +| * eac0c8e35 (origin/mkirk/color-update-delay) Merge branch 'mkirk/color-update-delay' into release/2.30.2 +| |\ +| | * 006021ea4 Fix: group color change doesn't immediately apply +| |/ +* | 6fe05a61b Merge branch 'charlesmchen/sendDeliveryReceipts' +|\ \ +| * | 5e0bc1bc1 Respond to CR. +| * | 3e85c8c02 clang-format branch changes +| * | b53cb9e61 Clean up ahead of PR. +| * | 5cf8909a2 Modify OWSOutgoingReceiptManager to handle read receipts. +| * | 010ce1f6c Rename to OWSOutgoingReceiptManager. +| * | 2b45a8348 Clean up ahead of PR. +| * | f5591ef7b Clean up ahead of PR. +| * | 62d1fd202 Clean up ahead of PR. +| * | 45d6250ae Send delivery receipts. +| * | de7bffa59 Send delivery receipts. +| * | 13373db3b Send delivery receipts. +|/ / +* | b5f6670de Merge branch 'charlesmchen/obsoleteCDSConstant' +|\ \ +| * | 9ef0f35d2 Remove obsolete CDS constant. +|/ / +* | 45119d7ef Merge branch 'charlesmchen/udStatusSync' +|\ \ +| * | c5f52cc0b Respond to CR. +| * | fd9ee4c9f Fix small bug. +| * | 7e7fcc169 Apply UD status from transcripts. +| * | 0c6c506a3 Send UD status in sync messages. +| * | 994e95a64 Update protos. +|/ / +* | 4820af8ea Merge branch 'mkirk/ud-ui-2' into master +|\ \ +| * | 43884af19 remove redundant "failed to download" method +| * | efe07e1dd Secret sender icon in message details +|/ / +* | 2054bdc69 (tag: 2.31.0.0) "Bump build to 2.31.0.0." +* | aa04608e7 Merge branch 'charlesmchen/blockListVsProfileWhitelist' +|\ \ +| * | 794914353 Respond to CR. +| * | f00f60883 Respond to CR. +| * | f7827cda7 Respond to CR. +| * | 0ce2e4d4d Rotate profile key if blocklist intersects profile whitelist. +| * | c907721a1 Rotate profile key if blocklist intersects profile whitelist. +|/ / +* | d8a0baf9e Merge branch 'charlesmchen/udFixes' +|\ \ +| * | 1f37980a0 Suppress UD against production service to avoid de-registration. +| * | f2a1df4e9 Update device message auditing to reflect UD behavior. +| * | 960b4f537 Suppress UD against production service to avoid de-registration. +|/ / +* | a5655649d Merge branch 'mkirk/ud-ui' into master +|\ \ +| * | 1544f8db4 Optionally show UD status in message details +| * | 221ce513f extract dependencies, no change in behavior +| * | c68090864 add toggle for unrestricted access +|/ / +* | 9323e411f Revert AppReadiness singleton. +* | 27700ef78 Revert AppVersion singleton. +* | 09db42bf9 Merge branch 'charlesmchen/moreSingletons' +|\ \ +| * | f24ccb3ce (private/charlesmchen/moreSingletons) Hang more singletons on SSKEnv. +|/ / +* | 409673612 Merge branch 'charlesmchen/udManagerBreakage' +|\ \ +| * | 8bd97aaaa Respond to CR. +| * | 03f23b5f7 Fix breakage in UD manager; add UD manager test, hang TSAccountManager on SSKEnv, fix bugs in tests. +| * | 1f2bfe8df Fix breakage in UD manager. +|/ / +* | d6762a264 Merge branch 'charlesmchen/udProperties' into private-master +|\ \ +| * | bda6fdf44 Respond to CR. +| * | a6eed3012 Add 'is ud' property to outgoing messages. +| * | cba8c6798 Add 'is ud' property to incoming messages. +|/ / +* | 68f1c75f3 Merge branch 'charlesmchen/udWebSocketFailures' +|\ \ +| * | 0d588346f Fix rebase breakage. +| * | a4cdc5272 Handle UD auth errors in websocket sends. +|/ / +* | 92f182762 Merge branch 'mkirk/unidentified-profile-fetch' into private-master +|\ \ +| * | a5db222c7 move ud auth to request factory +| * | fb2abdcd1 UD auth for profile fetching +| * | 0be1f8cca Move UD auth into request initializers +| * | 39ba41343 Track UD mode enum instead of two booleans +|/ / +* | 1b9420745 Merge branch 'charlesmchen/selfSync' +|\ \ +| * | fab79e267 Respond to CR. +| * | 75e59bbc6 Discard self-sent messages during the decryption process. +| * | e47b69e0a Send sync messages to self via UD (only); discard self-sent sync messages. +| * | 283cb1828 Re-run UD attributes migration. +| * | 7ef39bf25 Clean up proto utils. +| * | d9c8a218b Use local profile data for the local phone number. +| * | 5e253f1c2 Always include "local user" in contacts sync messages. +|/ / +* | 1319116a6 Merge branch 'charlesmchen/themeConcurrency' +|\ \ +| * | 23088e412 Remove overzealous assert in theme. +|/ / +* | 396a17af3 Merge branch 'charlesmchen/udAccessVerifier' +|\ \ +| * | 624ffdf9b Update cocoapods. +| * | 01f63792f Respond to CR. +| * | 7cb015833 Apply UD access verifier. +|/ / +* | a81a89871 Merge branch 'charlesmchen/removeServerGUID' +|\ \ +| * | 21b383f4e Remove server GUID from TSIncomingMessage. +|/ / +* | 5beff56ce Merge branch 'charlesmchen/missingServerTimestamps' +|\ \ +| * | d5ec4daa6 Update Cocoapods. +| * | 7441c565b Fix missing server timestamps. +| * | f4148edf9 Fix missing server timestamps. +| * | ad56be27c Fix missing server timestamps. +|/ / +* | b60fa3cc9 Merge branch 'charlesmchen/udWebSocket' +|\ \ +| * | 337453b2f Update Cocoapods. +| * | 01ca416f4 Fix rebase breakage. +| * | 2f2b6b071 UD sends over web sockets; update web socket auth for UD. +| * | 3b06434d4 Split out second web socket. +| * | c137e95ae Move socket manager to hang on SSKEnvironment. +|/ / +* | 0567a3d24 Merge branch 'charlesmchen/ud9' +|\ \ +| * | fbfda5b9d Respond to CR. +| * | 1a23186ec Fix 'info message for group events'. +| * | 61a99c3f8 Further sender cleanup. +|/ / +* | fbf0c51e7 Merge branch 'charlesmchen/ud8' +|\ \ +| * | 51bce77cd Update Cocoapods. +| * | f2a9c10c2 Respond to CR. +| * | a69707227 Respond to CR. +| * | f9e90215b Respond to CR. +| * | ccb67f49a Fix issues in UD send & receive. +| * | 0b41e5e24 Rework profile fetch to reflect UD changes. +| * | 2eeba2d79 Fix spurious assert in orphan data clenaer. +| * | 1e10a8663 UD send via REST. +| * | 24b0eed1f UD send via REST. +| * | d08479980 UD send via REST. +|/ / +* | c856859fb Fix build breakage. +* | bebabdd26 Merge branch 'charlesmchen/ud7' +|\ \ +| * | 1b25a18e5 Respond to CR. +| * | f0b16186c Respond to CR. +| * | b8c5e1475 Apply UD trust root value for staging. +| * | 0c0d2a702 Decrypt incoming UD messages. +|/ / +* | bfbd418cb Merge branch 'charlesmchen/ud6' +|\ \ +| * | cec8df422 Respond to CR. +| * | 3eb84ed0e Move message processing singletons to SSKEnvironment. +|/ / +* | f37fce2df Merge branch 'charlesmchen/ud5' +|\ \ +| * | 580d0486b Respond to CR. +| * | 9f2a15925 Add new envelope properties for UD. +|/ / +* | a266fc359 Merge branch 'charlesmchen/ud3' +|\ \ +| * | 4ab281346 Respond to CR. +| * | 39f1be65f Respond to CR. +| * | 95387dd22 Fix rebase breakage. +| * | 1b1312c45 Clean up ahead of CR. +| * | 1d40cbfb4 Rework account attributes; persist manual message fetch; add "unrestricted UD" setting. +|/ / +* | 12c8eaf06 Merge branch 'charlesmchen/ud2' +|\ \ +| * | d4fab97a7 Fix build breakage. +| * | b808c2b33 Respond to CR. +| * | 5da4f7bb5 Update podfile. +| * | dca46e019 Respond to CR. +| * | e98c57215 Sketch out sender certificate validation. +| * | 45233ec86 Revert UD server certificate parsing. +| * | f7379deb6 Add setup method to UD manager. Try to verify server certificate expiration. +| * | 7fd15d2fd Add server certificate methods to UD manager. +| * | b714e528f Add UDManager. +|/ / +* | 8deaf652e Merge branch 'charlesmchen/ud' +|\ \ +| * | 21177e84d Fix or disable tests broken by recent merges. +| * | 71da31233 Post-SMK ud changes. +|/ / +* | 935aaa420 Merge branch 'charlesmchen/sck' +|\ \ +| * | 2c4c096d9 Fix typo in swift names. +| * | db487705c Fix breakage in the tests. +| * | a22440187 Respond to CR. +| * | 24d7a9761 Fix rebase breakage. +| * | f4c2b5e47 Update cocoapods. +| * | 7d727b7ac Modify proto wrapper builders to require required fields. +| * | 74e456f90 Modify proto wrapper builders to require required fields. +| * | 0da5a7395 Clean up ahead of PR. +| * | 04db4ca95 Get SMK tests building and passing. +| * | 8f5e21c7c Fix build breakage from SMK. +| * | 3738155c8 Fix build breakage from SMK. +| * | 8ae200ac2 Fix build breakage around SignalCoreKit. +| * | b77528ca0 Fix asserts & logging. +| * | 0125535d4 Pull out SignalCoreKit. +|/ / +* | f0f25aa41 Merge remote-tracking branch 'origin/release/2.30.2' +|\ \ +| |/ +| * 5fc21bce9 (tag: 2.30.2.4) "Bump build to 2.30.2.4." +| * 39a73abce update pods +| * 26fadaf10 Merge branch 'charlesmchen/iOS9CustomBarButton' into release/2.30.2 +| |\ +| | * 9474a1bfc Fix "broken settings button layout in iOS 9" issue. +| |/ +| * ea0aba1f9 Merge branch 'charlesmchen/unreadBadgeRound' into release/2.30.2 +| |\ +| | * 908d6dfd7 Ensure unread badges in home view are always at least a circle. +| |/ +| * b07de266c (tag: 2.30.2.3) "Bump build to 2.30.2.3." +| * c07147210 Merge branch 'mkirk/picker-bubble-preview' into release/2.30.2 +| |\ +| | * 56387f357 demo conversation colors when selecting +| | * 06eae47e0 ConversationViewItem -> protocol +| |/ +| * f56ac96d3 (tag: 2.30.2.2) "Bump build to 2.30.2.2." +| * ebae75af0 Revert 'new sort id'. +| * 673dae83d (tag: 2.30.2.1) Bump build to 2.30.2.1. +|/ +* 69b805c39 "Bump build to 2.30.1.1." +* 64007e7d7 Merge branch 'charlesmchen/swiftExit' +|\ +| * b076f1496 Swift exit(). +| * 3c22d0b0c Swift exit(). +|/ +* 90e7d9fbb Update AxolotlKit. +* 2629f0114 Update tags_to_ignore. +* 1e82caed0 Remove dark theme feature flag. +* fbeb07d2e Fix build break. +* 2f1f7a8e2 Update cocoapods. +* 99766fe07 Update l10n strings. +* 6f9c99f99 Merge branch 'mkirk/color-picker' +|\ +| * acd042c35 Sort conversation colors +| * 4765ed9a0 Color picker +| * 95a6df649 Generic SheetViewController +|/ +* 6b9133e5e Merge branch 'strings-audit' +|\ +| * 97d0543ce String cleanup: +|/ +* 57047e67e Merge branch 'mkirk/fix-hang-on-entry' +|\ +| * e3e6c3161 fix hang on conversation load +|/ +* c05f9a4de update pods +* 79add78d5 Merge branch 'release/2.30.1' +|\ +| * 58103060e (origin/release/2.30.1) Merge branch 'mkirk/wip-sort-id' into release/2.30.1 +| |\ +| | * 3518d37c3 use autorelease pool in migration to avoid accumulating memory +| | * 04a52980a fixup migration +| | * fe7d69e9c Update thread's sorting order based on whatever the currently last message is +| | * 02692e42b remove addressed TODO's +| | * c2f87c738 trivial replace of timestampForSorting -> sortId in some logging +| | * c21020d7e Use received date for footer-collapse supression +| | * 6f8eddc95 unread indicator uses sortId +| | * 3240e0d9d Be explicit about receivedAt time +| | * 6bfd0f29e mark self-sent messages as read as soon as it was created +| | * c0c973de1 Sort gallery finder by sortId +| | * 2eb3ec6d0 benchmark migration +| | * b281b3763 replace thread.lastMessageDate/archivalDate -> thread.lastSortId, thread.archivedAsOfSortId +| | * c27d35f8f sort search results by sortId +| | * 1459fad01 sort media gallery by sortId +| | * 90aa593dc sortId vs. Read status +| | * 089c4f09e bump all views which rely on message sorting +| | * d6d6c4fca ConversationVC - lastSeenSortId +| | * ab55e8530 step 1: timestampForSorting audit, change signature +| | * e1a46d85f investigation shows we don't use this timestamp for call error messages +| | * df6131649 minimize diff senderTimestamp -> timestamp +| | * 00d0d1e00 Remove legacy Error backdating - no changes in functionality +| | * 550e7ba63 Create disappearing message update info messages before messages they affect +| | * eef1368ad Timestamp audit step1: change signature +| | * 6c5fbc6de Update existing contact offers in place +| | * a60d8eb16 WIP: migration / autoincrement logic +| | * ae668ceca include sequence number in fake messages +| |/ +| * 87509df26 Merge branch 'mkirk/fix-release-compile' into release/2.30.1 +| |\ +| | * bccb633b6 fix release compile +| |/ +| * 4b9d720b9 ignore RI check for unreleased 2.30 tags +| * 306c6ade7 "Bump build to 2.30.1.0." +* | 0298c3584 Merge branch 'charlesmchen/productionizeCDS2' +|\ \ +| * | bb5c9ff10 Respond to CR. +| * | c0f425459 Mark CDS feature flag for removal. +| * | 0884598a3 Fix CDS cookie handling. +| * | c368aabf9 Fix the "de-register" logic. +| * | b10bf441c Add note about curl cookie support. +| * | 370c96af5 Enable CDS in contact intersection. +| * | 43d0b9b9b Fix misnamed method. +| * | b6a14ea01 Fix the CDS version checking. +| * | bcb882f5a Update CDS URLs. +|/ / +* | 7b056d624 Merge branch 'charlesmchen/crashAppGesture' +|\ \ +| * | 2ef878bfc Add crash gesture to about view. +|/ / +* | 469bb3fee Merge branch 'charlesmchen/conversationColorsClass' +|\ \ +| * | 2b75c4034 Pull out OWSConversationColor to its own file. +| * | 5a99cd347 Pull out OWSConversationColor to its own file. +|/ / +* | c90c12702 Merge branch 'charlesmchen/conversationColorsFixBubbleSecondaryColor' +|\ \ +| * | 43dc362fc Fix secondary color within message bubbles. +|/ / +* | 4003e3185 Merge branch 'charlesmchen/conversationColorsDefaultContactAvatarAsset' +|\ \ +| * | 0e5f42def Use new asset for default contact avatars. +|/ / +* | 1c1d305a7 Respond to CR. +* | 8c6a396bd Merge branch 'charlesmchen/conversationColorsMapLegacyColors' +|\ \ +| * | 857cdf436 Map the legacy conversation color names. +|/ / +* | 3c8639b8a Merge branch 'charlesmchen/conversationColorsDefaultAvatarTextSize' +|\ \ +| * | ec0206ff0 Adapt text size of default avatars to avatar size. +|/ / +* | 05d4836c7 Merge branch 'charlesmchen/conversationColorsDefaultProfileAvatars' +|\ \ +| * | 6d14a1b47 Local profile default avatars should use steel background. +| * | 27488f078 Replace old "default profile avatar" icon with default avatar for local user. +|/ / +* | e4ab36071 Respond to CR. +* | 2cb9de5ea Merge branch 'charlesmchen/converationColorsAppSettingsAvatar' +|\ \ +| * | b5c5d1c3e Use local avatar as app settings button. +|/ / +* | 307a7ebf8 Merge branch 'charlesmchen/conversationColorsMediaShadows' +|\ \ +| * | cbaf40d4c Respond to CR. +| * | d161e5ff3 Add inner shadows to media thumbnails. +|/ / +* | ade88966c Merge branch 'charlesmchen/conversationColorsProfileShadows' +|\ \ +| * | 547724b5c Add inner shadows to profile pics. +| * | 352777765 Add inner shadows to profile pics. +|/ / +* | 228964905 Merge branch 'charlesmchen/conversationColorsVsText' +|\ \ +| * | ff6feafe8 Update text colors. +|/ / +* | b5dd8d0c7 Merge branch 'charlesmchen/converationColorsVsBubbles' +|\ \ +| * | 6715e3d1a (origin/charlesmchen/converationColorsVsBubbles) Respond to CR. +| * | b20cd5738 Rename OWSConversationColor. +| * | 3adc03fa2 Rework conversation message bubble colors; add "conversation colors" class. +| * | b3ad6e27d Rework conversation message bubble colors; add "conversation colors" class. +| * | 26a2d568d Add "conversation color mode" enum. +| * | e5150267c Rework the conversation color constants. +|/ / +* | 5471e1ba9 Merge branch 'charlesmchen/converationColorsGroupAvatars' +|\ \ +| * | da6373144 Respond to CR. +| * | 8db4595bd Rework group avatars to reflect conversation colors. +| * | 1c920c6be Rework group avatars to reflect conversation colors. +| * | 25d56b30c Rework group avatars to reflect conversation colors. +|/ / +* | 7ab76551c Merge branch 'charlesmchen/converationColorsVsAvatars' +|\ \ +| * | 2f9eae5ca Respond to CR. +| * | 72562920e Fix author conversation colors. +| * | 4186ce9a7 Respond to CR. +| * | 7b2dd19fb Respond to CR. +| * | 8910f1f65 Enable conversation colors. +| * | ae84528dc Update avatar colors; add shaded conversation color constants, modify color picker to be color-name-based, not color-based, use shaded conversation colors, remove JSQ. +|/ / +* | c89033591 Merge branch 'charlesmchen/converationColorsMessageStatusLayout' +|\ \ +| * | a5628c420 Rework layout of message status in home view. +|/ / +* | f0155c529 (origin/charlesmchen/converationColorsUnreadBadges) Merge branch 'charlesmchen/converationColorsUnreadBadges' +|\ \ +| * | 0701d2465 Replace shadow with stroke. +| * | 810615878 Move unread badge on home view; propose shadow. +|/ / +* | 4b5021d8f Merge branch 'charlesmchen/darkThemeReminders' +|\ \ +| * | d13624897 Fix reminder changes in home view. +| * | 0eb13dd82 Fix nag reminder v. dark theme. +|/ / +* | a02a5160f Merge branch 'charlesmchen/offerButtonMargins' +|\ \ +| * | b30bfec21 Fix contact offer button margins. +|/ / +* | 9c6902d17 Merge branch 'charlesmchen/contactUtils' +|\ \ +| |/ +|/| +| * 0b7d26901 Rename DebugContactsUtils. +| * bcee59f5e Add contact utils class. +|/ +* 6a5935c6e Merge branch 'charlesmchen/fix-ssk-tests-o' +|\ +| * be7626710 Update cocoapods. +| * 98630cca5 Respond to CR; add db utility methods to test base classes. +| * 559c496ae Clean up. +| * 66fc389fb Get SSK tests building and running. +|/ +* c87eea2ab Merge branch 'charlesmchen/fix-ssk-tests-n' +|\ +| * 87836f506 Move more singletons to SSKEnvironment. +|/ +* 6e3462c13 Merge branch 'charlesmchen/fixProtoStreamTest' +|\ +| * b881bb467 Fix proto stream test. +|/ +* 52c27005e Merge branch 'charlesmchen/logCurl' +|\ +| * 39ebdf092 Log curl command for failed requests in debug builds. +|/ +* 562d516a7 Merge branch 'charlesmchen/newGrayscalePalette' +|\ +| * 6a712366a Tweak gray 95. +| * 922c50555 Respond to CR. +| * ef6689410 Design feedback from Myles. +| * 8cf5f3e58 New grayscale palette. +|/ +* c7eb80700 Fix memory leak in Curve25519Kit. +* e7b7fb929 Merge branch 'charlesmchen/corruptThreadView' +|\ +| * 15b52db8b Respond to CR. +| * 29bb69032 DRY up the debounce of db extension version increment. +| * 20de08744 Repair corrupt thread view. +|/ +* a0a48431c Merge branch 'charlesmchen/fix-ssk-tests-l' +|\ +| * 6563c829e Update cocoapods. +| * e8186a700 Fix rebase breakage. Make environment properties mutable in tests. +| * 3b2c5bfc7 Modify mock environments to register all db views. +| * 83e648415 Respond to CR. Rework how OWSUploadOperation's networkManager property. +| * a7a05e9bb Respond to CR. Rework how CallNotificationsAdapter adaptee is populated. +| * edcedd284 Remove selfRecipient method. +| * e1db60c1c Rework creation of singletons. +|/ +* 27023c9d8 Merge branch 'charlesmchen/brokenSignalTests' +|\ +| * 0c6f6cdaf Fix compilation errors in Signal tests. +|/ +* 313a58c4d Merge branch 'mkirk/new-phones' +|\ +| * 21e67e9a1 New resolutions for call banner, rename to accommodate multiple X devices. +|/ +* 14aa86f16 Update cocoapods. +* 687be6b79 Merge branch 'charlesmchen/assertReview' +|\ +| * 4ad7ca79b Respond to CR. +| * e8eac9f30 Clean up ahead of PR. +| * b883209f9 Refine logging. +|/ +* 03f10b723 Merge branch 'delete-legacy-passphrase-fix' +|\ +| * 69290f7ec Improve logging around failied keychain deletion. +| * d25579e47 Treat failure to delete a non-existent password as success +|/ +* ec019f286 Merge branch 'mkirk/fix-test-run' +|\ +| * 25bec8632 update pods +| * 60a6128af Remove SSK tests from Signal-iOS xcode test run +| * 13856acb0 remove wrong import +|/ +* e9f0c31d4 Merge branch 'mkirk/debounce-prekey-checks2' +|\ +| * ec77b83c3 (private/mkirk/debounce-prekey-checks2) update pods +| * e1f131f09 restore save after marking item as uploaded +| * cb55ba57f CR: rename classes, no functional changes +| * 9f35b9364 CR: clarify comment +| * f5efa9ee9 update pods +| * 9bca1c8e5 Add some missing nullability annotations +| * b3d3c27f3 CR: Split operations into separate files (no changes in functionality) +| * ff3e9bcdd cr: add comment about operation queue +| * bfd8eb63c Add some comments/nullability annotations for clarity +| * c9218b59c CR: add operation queue name +| * 5a7d7634b store keys before uploading to avoid race condition with service +| * 1853e79c3 Don't retry send until SPK has been rotated +| * 5e1306aaa Restore check debounce +| * 8e488b5c3 remove unused code +| * 85d35b52d restore PreKey upload failure tracking +| * 39b691b69 Fix operations not being de-alloced +| * 619597cd6 ensure operations run to completion on the PreKey operation queue +| * 3df0e72ed Extract SPK rotation and CreatePreKey operations +| * 286d3c8ce Serialize RefreshKeyOperation +| * 01811a489 fix swift method signature +| * b11bd6ea4 extract convenience intitializer for param parser +| * 1eb05c1d0 remove unused preKeyLastResort +| * 966db1bd4 Get tests compiling by any means necessary +| * fdc846cb5 remove test for deleted method +| * 170eb6377 update old non-existant API usage +| * 7a832e85e remove wrong import +|/ +* f285fc4e1 Merge branch 'mkirk/keyword-checks' +|\ +| * 5236fba69 keyword checks +|/ +* 551102210 include C assert variants in keywords check +* 920a82564 Merge tag '2.29.3.3' +|\ +| * e7f9598e6 (tag: 2.29.3.3, private/release/2.29.3, origin/release/2.29.3) disable dark theme switch for production +| * 2ffca9807 "Bump build to 2.29.3.3." +| * 770c19ea0 (tag: 2.29.3.2) sync translations +| * 7b709666b "Bump build to 2.29.3.2." +| * 53087ff72 Merge branch 'mkirk/cache-group-name' into release/2.29.3 +| |\ +| | * df67e883f BlockList vs. "zero length" group names +| | * b447e6859 clarify post-unblock-group copy +| | * c1b88b5f4 copy cleanup: remove redundant body +| | * 24ea8262d consolidate blocked-group state tracking +| | * 0f9b0936d Use cached group details when rendering blocklist +| | * 1f15ba6dc Cache group details on blocking manager +| |/ +| * 8d51839a2 sync translations +| * 7b664ee21 update translation comment +| * e53766d80 (tag: 2.29.3.1) "Bump build to 2.29.3.1." +| * b96e9a6a8 Fix: not receiving group deliveries +| * c0991fce7 (tag: 2.29.3.0) enable dark theme for beta +| * c384b961d Merge branch 'mkirk/ignore-left-group-messages' into release/2.29.3 +| |\ +| | * 01627446a update pods +| | * b09831d8d copy updates +| | * f1e5b1862 Ignore messages from left groups +| | * b369ffa88 add type annotations +| | * 7b7da4bc1 add docs to BlockListCache +| | * fd492f379 Use BlockListCache where possible +| | * 2eca462ef can view conversation settings for left group +| | * 2c49232db remove barely used getters +| | * 448936d15 BlockListCache +| | * 28d28cf2b remove unused code +| | * b6eb1476c Leave group when blocking it +| | * 13cf9eab3 copy fixups +| | * 8aba5725c BlockListViewController v. group blocking +| | * 809b3766c Home view cell v. group blocking +| | * 2c9d905a1 Message processor ignores messages from blocked group +| | * c6de8c579 WIP: Localizations +| | * b1da5e93d group blocking v. conversation view +| | * eadb04efc WIP: ContactViewHelper incorporates group blocking +| | * b282d51da SyncMessages for blocked groups +| | * 236c17f65 WIP: group blocking +| | * bfe1f38c7 update protos for group blocking +| |/ +| * 2c4cd1150 Merge branch 'mkirk/fix-group-avatar-update' into release/2.29.3 +| |\ +| | * 08c0b248e fix group avatar updates and quote generation +| |/ +| * 99b256499 "Bump build to 2.29.3.0." +| * 17da53257 (tag: 2.29.2.4, private/release/2.29.2, origin/release/2.29.2) "Bump build to 2.29.2.4." +| * e4d12feeb rev gallery db extension since our `isValid` checks have changed +| * 5bafc7b6d Don't allow enabling dark theme in production yet +* | 5627e6718 Merge branch 'charlesmchen/attachmentCleanup' +|\ \ +| * | 22afe39cd Respond to CR. +| * | 2ea751bba Clean up attachment downloads. +| * | 32f1ce947 Clean up attachment downloads. +|/ / +* | 6a2e00928 Merge branch 'charlesmchen/loggingAndAsserts' +|\ \ +| * | 8ef3497e5 Update cocoapods. +| * | b00858921 Update Cocoapods. +| * | 9b94580da Update assertions. +|/ / +* | 5e6a93cff Merge branch 'charlesmchen/operationQueueNames' +|\ \ +| * | e15b8ebe1 Add names to operation queues. +|/ / +* | a3cc9ab67 Merge branch 'charlesmchen/fix-ssk-tests-k3' +|\ \ +| * | 6c8af5b54 Update cocoapods. +| * | 62c55c9cf Fix broken tests. +|/ / +* | 68714b296 Merge branch 'charlesmchen/fix-ssk-tests-k2' +|\ \ +| * | 2ba642c9e Ensure fakes/mocks are debug-only. +| * | ef12612a9 Update cocoapods. +| * | e784f9fee Move fakes to SSK/tests. +|/ / +* | 45ff1979a Update cocoapods. +* | 2710f33af Merge branch 'charlesmchen/fix-ssk-tests-k1' +|\ \ +| * | 25239ca60 Respond to CR. +| * | 3935b019f Add base class for tests. +|/ / +* | e740d8fd4 Merge branch 'charlesmchen/removeLogTag' +|\ \ +| * | 3fe7d7f9b Remove more usage of logTag. +|/ / +* | 7872145e1 Merge branch 'charlesmchen/fix-ssk-tests-h' +|\ \ +| * | df7acfeed Simplify OWSPreferences access. +|/ / +* | 6007f8df6 Merge branch 'charlesmchen/fix-ssk-tests-d' +|\ \ +| * | 106ecf2e8 Respond to CR. +| * | 6a83eab4f Update Cocoapods. +| * | cc117b385 Modify environment accessors to use our 'shared' convention. +| * | 3a12446be Modify environment accessors to use our 'shared' convention. +| * | bd05cdc03 Rename TextSecureKitEnv to SSKEnvironment. +|/ / +* | b642a5fab Update log. +* | 7dd6132c6 Merge branch 'charlesmchen/fix-ssk-tests-c' +|\ \ +| * | 8b143e710 Update cocoapods. +| * | bcceda186 Respond to CR. +| * | cfb511aa5 Respond to CR. +| * | eb616a341 Respond to CR. +| * | 535241ef9 Add test app context; use mock "document" and "shared data container" directories in tests, use mock keychain storage in tests. +| * | 399dd13ce Add test app context; use mock "document" and "shared data container" directories in tests, use mock keychain storage in tests. +|/ / +* | 0357699fc RI Cocoapods submodule. +* | f9eab5cd2 Merge remote-tracking branch 'origin/release/2.29.2' +|\ \ +| |/ +| * 654c98d80 (tag: 2.29.2.3) "Bump build to 2.29.2.3." +| * a443a64ff Merge branch 'charlesmchen/convoThumbnails3' into release/2.29.2 +| |\ +| | * 9fefdd2e2 Respond to CR. +| | * a2fe4dbe3 Refine image validation. +| | * 34a05cdb8 Refine image validation. +| |/ +| * 5b04a421b Merge branch 'charlesmchen/convoThumbnails2' into release/2.29.2 +| |\ +| | * 1c325cd21 (private/charlesmchen/convoThumbnails2) Respond to CR. +| | * b6649319d Fix build breakage. +| | * 27fa5dc2e Make thumbnail logic thread-safe to being called on main thread. +| | * a04aa259e Fix bug in sync loading of thumbnails. +| | * 5bdbf76b0 Cache "is valid image/video" properties. +| | * b1f2b9e75 Clean up thumbnail-related logic. +| | * 51e8fdcb2 Use small thumbnail when creating quoted reply. +| | * dc3467dcd Tidy up attachment usage. +| | * 0be12da3d Use thumbnails in media views. +| | * 5d96af98b Use large thumbnail in media views. +| | * 30ed6caf0 Use thumbnails as video stills in conversation view. +| | * a2fad5796 Load GIFs from disk in media view; don't cache GIF data in memory. +| | * 12307aeee Load GIFs from disk in media view; don't cache GIF data in memory. +| |/ +| * 9ad661c29 Merge branch 'charlesmchen/convoThumbnails' into release/2.29.2 +| |\ +| | * a088b94c7 Update Cocoapods, fix build breakage. +| | * b91751a11 Respond to CR. +| | * ad0d09483 Fix build breakage. +| | * 748b24315 Restore full-screen thumbnails. +| | * 9eb2a4f5a Raise max valid image size. +| | * 72a71c185 Improve handling of thumbnails dir. +| | * 3a5d1877d Reduce thumbnail sizes. +| | * ec83ed182 Clean up. +| | * 32bf47fc7 Don't track thumbnail metadata in db; improve thumbnail quality. +| | * 8026d3465 Remove full-screen thumbnail. +| | * 2daa66fdf Use thumbnails dir. +| | * a9096209e Add failure methods to thumbnail service. +| | * 8748dc9b2 Modify new thumbnail system to include video and GIF thumbnails. +| | * 206432fdf Add failure methods to thumbnail service. +| | * f6e792c70 Add failure methods to thumbnail service. +| | * cf469da94 Use new thumbnails in conversation cells. +| | * 3437361d7 Use new thumbnails in media gallery thumbnails. +| | * ac4365e1c Add OWSThumbnailService. +| | * 1831f0b1f Reorder AttachmentStream methods. +| | * 446ceb2b9 Rename AttachmentStream methods. +| | * 498828f93 Rename AttachmentStream methods. +| |/ +| * 17f1ba3b9 (tag: 2.29.2.2) "Bump build to 2.29.2.2." +| * a92be0811 "Bump build to 2.29.2.1." +| * be6d92440 Merge branch 'mkirk/webrtc-m69' into release/2.29.2 +| |\ +| | * 30b28be52 Update WebRTC to M69 +| |/ +| * c961bffc1 Merge branch 'mkirk/enable-sw-decoders' into release/2.29.2 +| |\ +| | * 9ab4da5c8 cherry-pick Merge branch 'charlesmchen/logSdp' +| | * d57c2f515 enable sw decoders +| |/ +| * c0b9639aa "Bump build to 2.29.2.0." +| * d37827de1 (tag: 2.29.2.1) "Bump build to 2.29.2.1." +| * d6f856a62 fixup: Leave theme enabled if ever enabled +| * c81e0a58b (tag: 2.29.2.0) "Bump build to 2.29.2.0." +| * 4e19a7943 Leave theme enabled if ever enabled +| * 64dd7c79e enable dark theme for beta +* | c9fdefd19 Merge branch 'mkirk/overflow-rebased' +|\ \ +| * | d534651ac (private/mkirk/overflow-rebased) check keywords in diff +| * | 9ec82b9a4 graceful failure when receiving too-small profile data +| * | 01a6a3d98 avoid overflow in debug logging +| * | 503cb046e remove unused FunctionalUtil code +| * | a2852ee93 Overflow math and safer asserts in Cryptography.m +|/ / +* | ccea3ff0f Merge branch 'mkirk/production-asserts' +|\ \ +| * | 48a85aab1 remove unused files +| * | c7662b5a8 Step 2/2 %s/OWSAssert/OWSAssertDebug for existing previous assert semantics +| * | a54ed8b20 Step 1/2 Prefer safer asserts +|/ / +* | 6f6b1d0aa Merge branch 'charlesmchen/hotfixLoggingAndFails' +|\ \ +| * | 44a3a8146 Update logging and asserts in hotfix changes. +|/ / +* | 6a01f01f2 (private/signingkey) Merge branch 'mkirk/size-input-toolbar' +|\ \ +| * | 5d9cd86d1 size toolbar WRT draft +|/ / +* | 17656a3aa Merge branch 'charlesmchen/fix-ssk-tests-b' +|\ \ +| * | fac7f6932 (origin/charlesmchen/fix-ssk-tests-b) Rename TSGroupMetaMessage enum values. +|/ / +* | f4d1f2565 Merge remote-tracking branch 'origin/release/2.29.1' +|\ \ +| |/ +| * 055fe76c9 (tag: 2.29.1.1, origin/release/2.29.1) "Bump build to 2.29.1.1." +| * 2cdca0299 show generic file icon for invalid GIF +| * d1dead058 (tag: 2.29.1.0) sync translations +| * c709fe220 "Bump build to 2.29.1.0." +| * e7c70db38 Merge branch 'mkirk/images' into release/2.29.1 +| |\ +| | * 6821e4a3a (private/mkirk/images) Don't include invalid media in gallery +| | * e715bf9ea image sizing +| |/ +* | 19f79bc77 Merge branch 'mkirk/fix-ssk-tests' +|\ \ +| * | 8c2515a66 update pods for embedding ssk tests +| * | 495830f08 Fixup some SSK tests +| * | 6d9241393 WIP: Run SSK tests +|/ / +* | 7df897655 Fix breakage in production builds. +* | beea74b76 Merge branch 'charlesmchen/performUpdatesExceptionDetails' +|\ \ +| * | 1cc0fbcb1 Elaborate logging around 'perform updates' crash. +|/ / +* | 97d4b3bc1 Merge branch 'charlesmchen/objcLogging' +|\ \ +| * | 947760673 Apply OWS log functions in Objective-C. +| * | f473f6011 Apply OWS log functions in Objective-C. +| * | cc5a480ba Apply OWS log functions in Objective-C. +| * | 03829779c Apply OWS log functions in Objective-C. +| * | c0d486b1f Apply OWS log functions in Objective-C. +| * | 3a5037790 Apply OWS log functions in Objective-C. +| * | d81dea1d8 Add OWS log macros. +|/ / +* | 2c60f6f22 Merge branch 'charlesmchen/logSdp' +|\ \ +| * | 0b5b74a90 Respond to CR. +| * | 490ac5dd7 Redact ice-pwd from SDP. +| * | 02daca11a Redact ice-pwd from SDP. +| * | b4539328e Log call session description. +| * | 2d06c05a4 Log call session description. +| * | 329f8d6f4 Log call session description. +|/ / +* | 77711df27 Merge branch 'charlesmchen/prodFail' +|\ \ +| * | 713606271 (private/charlesmchen/prodFail) Rename fail macros in Obj-C. +| * | 5b50e81b4 Rename fail macros in Swift. +| * | 7be8f3087 Apply -> Never. +| * | d01023d86 Respond to CR. +| * | 11eaf1474 Add OWSProdExit(). +|/ / +* | 202a91680 Merge branch 'charlesmchen/reworkingLogging' +|\ \ +| * | 16a7361e5 Update Cocoapods. +| * | 4f2f4a44a Respond to CR. +| * | d4f7b5d45 Respond to CR. +| * | f34bdd34b Respond to CR. +| * | dd4f1babb Respond to CR. +| * | e1049fdfc Respond to CR. +| * | bc23e38ef Respond to CR. +| * | cf6f3841a Apply new Swift logging. +| * | 3697974ca Rework Swift logging. +|/ / +* | 1a92f414e Revert "Disable dark theme in production." +* | 1d2590fa1 Merge tag '2.29.0.17' +|\ \ +| |/ +| * 2c8cec183 (tag: 2.29.0.17, private/release/2.29.1, origin/release/2.29.0) "Bump build to 2.29.0.17." +| * 472a92a1a Disable dark theme in production. +* | 65c323440 update translation location +* | 1503608f5 Merge branch 'mkirk/faster-presentation' +|\ \ +| * | 7e8b2e303 (michaelkirk/mkirk/faster-presentation) Faster conversation presentation. +|/ / +* | ae44b316a (charlesmchen/callServiceState_) Merge branch 'mkirk/show-message-actions-on-call' +|\ \ +| * | bc2ba63c2 DRY refactor +| * | 37738c24c Allow menuActions + callBanner +|/ / +* | 495ed5667 Merge branch 'mkirk/cleanup-longview' +|\ \ +| * | 464b854eb CR: follow naming conventions +| * | 9c9f3875a Link styling +| * | 5148747c1 clean up long text VC +|/ / +* | c8c2b8c64 Merge branch 'mkirk/swift-assert-main-thread' +|\ \ +| * | 82e559d11 Use swift macros for main thread assert +|/ / +* | aabf9e79e Merge branch 'mkirk/async-search' +|\ \ +| * | 781c53532 weak capture self +| * | fc7dc03ce don't block main thread during search +|/ / +* | 65fe3cc1d Merge branch 'mkirk/debug-protos' +|\ \ +| * | 2fc3a211f restrict debug methods +|/ / +* | 1295a09ab add comment +* | b75bc27d5 Respond to CR. +* | c6132249e Respond to CR. +* | cb827169f Respond to CR. +|/ +* 1bf273eb3 Merge branch 'mkirk/theme-message-actions-overlay' +|\ +| * eaf8d789f Darken message actions overlay in dark theme +|/ +* 1fc5ebdc1 Merge branch 'mkirk/search-bar-theme-2' +|\ +| * 1743407cc Code cleanup per code review +| * e4b7d253a Theme "no results" cell +| * 3022f9292 Tweak tint for search bar icons in dark theme +| * 75bb9b60d Alternative dark theme search bar +| * e435358bf Revert "Add custom themed search bar." +|/ +* bc7efaf4a (tag: 2.29.0.16) "Bump build to 2.29.0.16." +* 4971d40c7 Respond to CR. +* 10ab97bb6 (tag: 2.29.0.15) "Bump build to 2.29.0.15." +* 501b5a7c9 Merge branch 'charlesmchen/themeQuotedReplies' +|\ +| * 9e2161229 Respond to CR. +| * 6dd474d79 Theme quoted replies. +| * a92fca5c1 Theme quoted replies. +|/ +* 7b835bd08 Merge branch 'mkirk/fix-toolbar-appearance' +|\ +| * 32f879534 media tile toolbar respects theme by using UIAppearance defaults +|/ +* 61dc39b69 Merge branch 'mkirk/quote-2' +|\ +| * 93cb378f7 constantize toast inset +| * 06a8bffa6 Never show more than one toast view +| * 75ead2ac0 quoted reply: distinguish "not found" vs. "no longer available" +|/ +* fb9958b1d (tag: 2.29.0.14) "Bump build to 2.29.0.14." +* 122e138f0 Merge branch 'charlesmchen/disableCDS' +|\ +| * 2b8b688fb Disable CDS. +| * 2af0a897e Disable CDS. +|/ +* cbdc46fda Merge branch 'mkirk/dark-keyboard' +|\ +| * b80d88c82 theme attachment approval keyboard +|/ +* 5907cd2a0 Merge branch 'mkirk/tap-to-retry' +|\ +| * c6f77ec6e "Tap to retry" retries, rather than maybe deletes. +|/ +* 7b156be73 Merge branch 'mkirk/gallery-headers' +|\ +| * 8cd290ba2 fix section headers not appearing on iOS11/iPhoneX +| * 92de74552 theme gallery section headers +|/ +* d070693b7 Merge branch 'mkirk/overzealous-assert' +|\ +| * c1df969a2 remove overzealous assert +| * 191b0232b SAE uses statusBarHeight via OWSNavigationController via OWSNavbar +| * d57cbf2ac main thread operation init which creates background task +|/ +* 6aee5d539 (michaelkirk/master) Merge branch 'charlesmchen/deletePhoneNumberFormatting' +|\ +| * c7ed09ed9 Fix 'can't delete formatting in phone number' issue. +|/ +* 7020798e3 (tag: 2.29.0.13) "Bump build to 2.29.0.13." +* f717dceef Merge branch 'charlesmchen/themeSearchBar' +|\ +| * 8daaef22d Add custom themed search bar. +|/ +* 6e4414f47 (tag: 2.29.0.12) "Bump build to 2.29.0.12." +* af1c07630 Merge branch 'charlesmchen/themeReview' +|\ +| * decb0c54c Theme review. +| * d62e07d6f Theme review. +| * 4ea5d9b84 Theme review. +|/ +* ccc77511f Merge branch 'charlesmchen/messageTimeFormatPerf' +|\ +| * b4b4cd61d (charlesmchen/messageTimeFormatPerf) Improve message timestamp formatting. +|/ +* ab10bc9bc Merge branch 'charlesmchen/tapToCopySentTimestamp' +|\ +| * be7482eb6 (charlesmchen/tapToCopySentTimestamp) Tap to copy sender timestamp to clipboard. +|/ +* 419e30f38 Merge branch 'charlesmchen/conversationCrash' +|\ +| * f89fa8359 (origin/charlesmchen/conversationCrash, charlesmchen/conversationCrash) Revert "Add logging around 'SAE to same thread' crash." +| * e3378dec6 Revert "Add logging around 'share from SAE to same conversation' crash." +| * 87d51aaa8 "Bump build to 2.29.0.11." +| * f62bf7d18 Add logging around 'share from SAE to same conversation' crash. +|/ +* e148ec785 Merge branch 'charlesmchen/syncConversationColors' +|\ +| * 52be2127f Sync conversation colors. +|/ +* a712a20da (tag: 2.29.0.10) "Bump build to 2.29.0.10." +* eee2f7c8c Add logging around 'SAE to same thread' crash. +* 56e3ff14f Merge branch 'charlesmchen/conversationViewCrashLogging' +|\ +| * b347c40c6 Clean up ahead of PR. +| * d9d73ba70 "Bump build to 2.29.0.9." +| * 0a7b3537b Recreate message database view when message mappings are corrupt. +| * 1e75b6518 "Bump build to 2.29.0.8." +| * db2f5bf3b Add temporary logging around conversation view crashes. +| * 30ce67523 "Bump build to 2.29.0.7." +| * 420f5f88f Add logging, error checking and recovery around corrupt message mappings. +|/ +* 8f6151048 Merge branch 'charlesmchen/hideHomeViewSearch' +|\ +| * f261a47bd Hide home view search by default. +|/ +* 5f0c1aafb Merge branch 'charlesmchen/themeQA' +|\ +| * a76d488e8 Fix QA issues in theme. +| * 22dda476b Fix QA issues in theme. +|/ +* e628962fd Merge branch 'charlesmchen/messageDetailsVsInsetsFix' +|\ +| * 4e276b109 Apply 'insets fix' correctly in message details view. +|/ +* 7766cb6d7 (tag: 2.29.0.6) "Bump build to 2.29.0.6." +* 9b02bc104 Merge branch 'charlesmchen/conversationViewCrashLogging' +|\ +| * 664e13fb4 (charlesmchen/conversationViewCrashLogging) Revert "Add temporary logging around conversation view crashes." +| * 408689bbf (tag: 2.29.0.5) "Bump build to 2.29.0.5." +| * 26ad9814e Add temporary logging around conversation view crashes. +|/ +* 606b0debc (tag: 2.29.0.4) "Bump build to 2.29.0.4." +* 07a41be5a Merge branch 'charlesmchen/conversationViewExceptionLogging' +|\ +| * b3c19b790 (charlesmchen/conversationViewExceptionLogging) Improve logging of conversation view exceptions. +|/ +* 84bda352e Merge branch 'charlesmchen/isRegisteredRace' +|\ +| * 8ce9f3b24 (charlesmchen/isRegisteredRace) Fix nominal race in "is registered" state. +|/ +* a635a5d1c Merge branch 'charlesmchen/unifyTag' +|\ +| * 26001e49d (charlesmchen/unifyTag) Unify log tags. +|/ +* 767e1e7f4 Merge branch 'charlesmchen/string_h_audit' +|\ +| * 79c25981b (charlesmchen/string_h_audit) String.h audit. +|/ +* e56abeac3 (tag: 2.29.0.3) "Bump build to 2.29.0.3." +* b3cdf3dc0 sync translations +* df2d247ad Merge branch 'mkirk/apply-theme-atomically' +|\ +| * 71cb90b57 Avoid incremental theme-redraws +|/ +* a465c2522 (origin/mkirk/before-apply-theme-atomically) Merge branch 'mkirk/jumboer-emoji' +|\ +| * a1e8bb865 Larger jumbomoji +|/ +* c44f3f3c3 Merge branch 'mkirk/quotes' +|\ +| * 8829cdfb4 Toast view when tapped message doesn't exist, mark remotely sourced. +|/ +* 9ab447a3d Merge branch 'mkirk/tweak-bar-theme' +|\ +| * 7a0d74c17 Use dark blur for navbar +|/ +* 76fbec899 Merge branch 'mkirk/profile-colors' +|\ +| * 1ff443c3a restore transparent navbar in attachment approval +| * ebd2e6d5a Tweak theme +|/ +* 73174d794 Merge branch 'mkirk/log-owsfail' +|\ +| * c05700fd9 Log in OWSFail +|/ +* 5f468f426 (tag: 2.29.0.2) "Bump build to 2.29.0.2." +* 02d7f28f4 Merge branch 'charlesmchen/noInsertAnimations' +|\ +| * 8ecf6884c Remove "sending" color for outgoing messages. +|/ +* 46bc46c38 Merge branch 'charlesmchen/cacheLabelSizes' +|\ +| * 4096d2e0d Respond to CR. +| * 2fecb270e Cache footer timestamp size. +| * c91bc71eb Cache sender name size. +|/ +* e2dfe0012 Merge branch 'charlesmchen/themeSearchBars' +|\ +| * 3fc342560 Theme search bars. +|/ +* 47ab354f5 Merge branch 'charlesmchen/conversationCellsDontAutosize' +|\ +| * dd7e42931 Skip default implementation of preferredLayoutAttributesFittingAttributes. +|/ +* 0fe22ee0e Merge branch 'charlesmchen/cacheSystemMessageText' +|\ +| * 0ac1cb1e7 Cache system message text. +|/ +* fe492b8a9 Merge branch 'charlesmchen/configureDefaultCells' +|\ +| * 800689d9f Configure default cells. +|/ +* d493fd0bc Merge branch 'charlesmchen/mergeNSDataCategories' +|\ +| * 307a8dd85 Merge NSData categories. +| * db3df249b Merge NSData categories. +|/ +* 2c9c02850 Clean up. +* db92704b5 (tag: 2.29.0.1) "Bump build to 2.29.0.1." +* adadf094d Enable theme. +* 4d44d99ec Merge branch 'charlesmchen/refineThemeYetAgain' +|\ +| * 6dfe36f9b Respond to CR. +| * 816f02fba Fix unintentional moves. +| * 9c92719ec Refine theme. +| * 5ef0b6d05 Refine theme. +| * acd7d094b Refine theme. +| * a56a16411 Refine theme. +| * a543cd5a4 Refine theme. +| * 931562de3 Refine theme. +| * ce4fdd513 Refine theme. +| * 9fefce94a Refine theme. +| * d34f83b44 Refine theme. +| * 069c66e5e Refine theme. +| * 8da96e979 Refine theme. +| * 4f8dbf39b Refine theme. +|/ +* 84fcf1ea3 Merge branch 'charlesmchen/noHasAccessors' +|\ +| * 7437e7a6b Remove 'has' accessors from proto wrappers. +|/ +* e4a123bce Merge branch 'charlesmchen/appLaunchTime' +|\ +| * 5d3b0f793 (tag: 2.29.0.0) "Bump build to 2.29.0.0." +| * 1868c5803 Converge appLaunchTime. +|/ +* b3c62d91b Merge remote-tracking branch 'origin/release/2.28.1' +|\ +| * 882c699db (tag: 2.28.1.5, origin/release/2.28.1) "Bump build to 2.28.1.5." +| * 01b6634ac synthesize appLaunchTime +| * 15dfa6e97 (tag: 2.28.1.4) "Bump build to 2.28.1.4." +| * 87f97b8b9 fix typo +| * 504f4afae fix typo +| * 9e45104ee (tag: 2.28.1.3) "Bump build to 2.28.1.3." +| * 2e5cae2a6 Fix typo +| * 5039a6a9e (tag: 2.28.1.2) "Bump build to 2.28.1.2." +| * 19c95359f Merge branch 'charlesmchen/newIncompleteCallsVsJob' into release/2.28.1 +| |\ +| | * 463addaa6 Ignore new calls in the incomplete calls job. +| |/ +| * 4af4ca3cc Merge branch 'charlesmchen/lazyCollapseFooter' into release/2.28.1 +| |\ +| | * faf3cd6a5 (charlesmchen/lazyCollapseFooter, charlesmchen/callEdgeCases) Fix lazy collapse of message cell footers. +| |/ +* | 707112a1c Merge branch 'charlesmchen/saveMediaVsNonMedia' +|\ \ +| * | 7cc867420 Fix "save non-media attachment" crash. +|/ / +* | df0046d09 Merge branch 'charlesmchen/protoWrapperInits' +|\ \ +| * | e5eda8b45 Add convenience initializers to proto wrappers. +|/ / +* | 908b50faa Merge branch 'mkirk/app-updater' +|\ \ +| * | 0620aba3b Add cancel button +| * | 9662b3cb1 Wait a week before nagging when a new release comes out +|/ / +* | 63c94efc8 Merge branch 'mkirk/fix-collectionview-crash' +|\ \ +| * | 51b176136 Fix crash during CollectionView thrash +|/ / +* | 74be5fb1b Merge branch 'mkirk/ios12' +|\ \ +| * | 7e5d9480b Add missing header file +|/ / +* | baa46f6e5 Merge branch 'mkirk/store-kit-review' +|\ \ +| * | 2ea7e2b03 CR: clean up preferences +| * | ff2a5a151 Fixup copy +| * | e5b3cbd00 Use StoreKit for reviews +|/ / +* | 289e3f7a9 Merge branch 'mkirk/rotation-time' +|\ \ +| * | ab6286885 (private/mkirk/rotation-time) Remove noisy comments, update rotation time. +|/ / +* | c94c33d61 Merge branch 'charlesmchen/removeObjcProtos' +|\ \ +| * | a9b5c7962 Update Cocoapods. +| * | 21523ac52 Respond to CR. +| * | 1ab084240 Remove Obj-c proto parser. +| * | a5ffbdebb Remove Obj-c proto parser. +|/ / +* | 39124190a Merge branch 'charlesmchen/protoWrapperTests' +|\ \ +| * | a4d24c78a Respond to CR. +| * | 90002459c Add unit tests around proto wrappers. +|/ / +* | 01268f016 Merge branch 'charlesmchen/callWrappers' +|\ \ +| * | d239c111d Update Cocoapods. +| * | f4a11f0c6 Respond to CR. +| * | dc012d46e Migrate call proto wrappers. +| * | 135a1655f Migrate call proto wrappers. +| * | 32d0f23b2 Migrate call proto wrappers. +| * | 94675e880 Migrate call proto wrappers. +| * | 8837e5902 Migrate call proto wrappers. +|/ / +* | 0610530ee Merge branch 'charlesmchen/protoWrappers4' +|\ \ +| * | 521c725d2 Update Cocoapods. +| * | 68241e8a0 Respond to CR. +| * | 34a404f58 Clean up ahead of PR. +| * | 379104c53 Migrate to WebRTC proto wrappers. +| * | 67110d0de Migrate to websocket proto wrappers. +| * | f795ec352 Migrate to backup proto wrappers. +| * | eaf59b122 Migrate to provisioning proto wrappers. +| * | 50db472be Migrate to fingerprint proto wrappers. +|/ / +* | cace335d4 Merge branch 'charlesmchen/orphanDataCleanerV2' +|\ \ +| * | aeb539502 Update Cocoapods. +| * | 2fd77fcc2 Fix typo. +| * | 4bb0122c0 Respond to CR. +| * | 815ccbdcd Respond to CR. +| * | 06d84860a Fix rebase breakage. +| * | 45e782c24 Revamp orphan data cleaner. +|/ / +* | 95d734b1b Update BUILDING.md +* | 58897928f Update BUILDING.md +* | b26ebee3a Merge branch 'mkirk/update-pods2' +|\ \ +| * | 495c334d1 update pods +|/ / +* | d3a4447f8 Convert overzealous assert. +* | 64c6d820f Fix typo. +* | 3395bdab6 Merge branch 'charlesmchen/redundantContentInsets' +|\ \ +| * | cea93784b (charlesmchen/redundantContentInsets) Avoid redundant content inset updates. +|/ / +* | 55158e2a5 Merge branch 'charlesmchen/cleanupFormatting2' +|\ \ +| * | c687c0976 (charlesmchen/cleanupFormatting2) Update Cocoapods. +| * | d709a0249 Clean up formatting. +|/ / +* | 9b45a15c3 Merge branch 'release/2.28.1' +|\ \ +| |/ +| * c8f33e4fc (tag: 2.28.1.1, release/2.28.1) "Bump build to 2.28.1.1." +| * 89b3ebb72 Merge branch 'charlesmchen/deferMessageResizing' into release/2.28.1 +| |\ +| | * 4918b8994 (charlesmchen/deferMessageResizing) Delay footer collapse in new messages. +| | * 95cf4f5c6 Don't reserve space for timestamp in footer. +| | * 251eef46a Delay footer collapse in new messages. +| |/ +| * c957578a0 (tag: 2.28.1.0) Merge branch 'mkirk/fix-remaining-navbar' into release/2.28.1 +| |\ +| | * dbbccaadb fixup block table vis a new navbar style +| | * 991848b36 Fix "blue navbar" for contact picker +| |/ +| * 4d42fafdf Merge branch 'charlesmchen/redesignOptimizations' into release/2.28.1 +| |\ +| | * 4d2bdf9bd (charlesmchen/redesignOptimizations) Respond to CR. +| | * 21c630c09 Ignore redundant body text view updates; cache body text view size. +| | * ea765437e Improve date formatting perf. +| |/ +| * d6d16ed16 "Bump build to 2.28.1.0." +* | f633ebe2d update socketrocket +* | c6697bb4b Merge branch 'mkirk/seed' +|\ \ +| * | 0bc03b0fd Move seed +|/ / +* | 4704c6751 Merge branch 'mkirk/update-pods' +|\ \ +| * | a7bc02352 update pods +|/ / +* | ae488d330 Merge branch 'mkirk/upstream-yap-db' +|\ \ +| * | fc1ce02ae CR: Now that we have transaction semantics, this shouldn't happen. +| * | 1eb7fc986 YapDB introduced a method purpose built to do what we were approximating. +| * | df01c7e63 Update to latest YapDB (with Signal patches applied) +|/ / +* | 2ba5f65d8 Merge branch 'charlesmchen/protoWrappers3' +|\ \ +| * | 2433a08c8 Update Cocoapods. +| * | a647b5be4 Respond to CR. +| * | 3f4752437 Respond to CR. +| * | 03a9b21cf Respond to CR. +| * | 632dc145f Code generate Swift wrappers for protocol buffers. +| * | 6be3d2e42 Code generate Swift wrappers for protocol buffers. +| * | 8d814a521 Code generate Swift wrappers for protocol buffers. +| * | 950cab7eb Code generate Swift wrappers for protocol buffers. +| * | ff8565dbd Code generate Swift wrappers for protocol buffers. +| * | d3adb8024 Code generate Swift wrappers for protocol buffers. +| * | ab31e5a07 Code generate Swift wrappers for protocol buffers. +|/ / +* | faebd9af8 Merge branch 'charlesmchen/protoWrappers2' +|\ \ +| * | 2819c758f Update Cocoapods. +| * | 28acea3cf Respond to CR. +| * | e1eb58ba3 Swift proto parsing wrappers. +| * | 0d23b06cb Code generate Swift wrappers for protocol buffers. +| * | 377634a1f Code generate Swift wrappers for protocol buffers. +| * | b164ce940 Code generate Swift wrappers for protocol buffers. +|/ / +* | 808443f2a Merge branch 'charlesmchen/protoWrappers' +|\ \ +| * | 547938904 Update cocoapods. +| * | 73f22ae62 Code generate Swift wrappers for protocol buffers. +| * | aefbc3c0b Code generate Swift wrappers for protocol buffers. +| * | 6941ab8c8 Code generate Swift wrappers for protocol buffers. +| * | 827f97928 Code generate Swift wrappers for protocol buffers. +| * | 77810f591 Code generate Swift wrappers for protocol buffers. +| * | 64c99988a Code generate Swift wrappers for protocol buffers. +| * | 02a4de637 Code generate Swift wrappers for protocol buffers. +| * | 2b05bbc0a Code generate Swift wrappers for protocol buffers. +| * | 937ae2455 Code generate Swift wrappers for protocol buffers. +| * | d8378c537 Code generate Swift wrappers for protocol buffers. +| * | f814157a9 Code generate Swift wrappers for protocol buffers. +| * | e45a6d5be Code generate Swift wrappers for protocol buffers. +| * | 0cf199bd7 Code generate Swift wrappers for protocol buffers. +| * | c81acb1fa Code generate Swift wrappers for protocol buffers. +| * | d0c7489b7 Code generate Swift wrappers for protocol buffers. +| * | 1e21dbfaa Code generate Swift wrappers for protocol buffers. +| * | 6276a0de8 Code generate Swift wrappers for protocol buffers. +| * | 9846a529f Code generate Swift wrappers for protocol buffers. +|/ / +* | 70b6382d0 Merge branch 'charlesmchen/tidyFiles' +|\ \ +| * | c15ddf85f (charlesmchen/tidyFiles) Respond to CR. +| * | dfc39b4a1 Tidy files. +| * | e6bc37d94 Tidy files. +| * | 2c1947439 Tidy files. +| * | 8f55f5332 Tidy files. +|/ / +* | ed47c0a6d Merge branch 'charlesmchen/tidyProfileAvatars' +|\ \ +| * | d6cb07cc4 (charlesmchen/tidyProfileAvatars) Respond to CR. +| * | 0f4e846ed Tidy profile avatars. +|/ / +* | 2647beceb Merge branch 'charlesmchen/cdsAuthProperties' +|\ \ +| * | 16e51b854 (charlesmchen/cdsAuthProperties) Fixup CDS auth properties. +|/ / +* | 6bf0465bc Merge branch 'charlesmchen/nilSignalAccounts' +|\ \ +| * | 579e88bdc (charlesmchen/nilSignalAccounts) Improve nullability handling for SignalAccount. +|/ / +* | 20c82e6ad Merge branch 'charlesmchen/logLogLogs' +|\ \ +| * | f611abc16 (charlesmchen/logLogLogs) Log when we change logging state. +|/ / +* | 103a8dc57 ubsan fixups +* | 78ad597e4 Merge tag '2.28.0.15' +|\ \ +| |/ +| * 48a69c46d (tag: 2.28.0.15, origin/release/2.28.0, release/2.28.0) "Bump build to 2.28.0.15." +| * d713c4158 sync translations +| * f81db023f Merge branch 'charlesmchen/newMessageAnimations' into release/2.28.0 +| |\ +| | * cd6225c43 Respond to CR. +| | * 995c2f2a2 Refine 'new message' animations. +| | * 24d85898e Refine 'new message' animations. +| | * 026ef02ce Refine 'new message' animations. +| |/ +| * 2bb12e6fb Merge branch 'mkirk/inbox-behind-navbar' into release/2.28.0 +| |\ +| | * def8b43da iOS9/10 fixups +| | * 78b4df95a fixup call banner offsets +| | * bfe1eb550 Move reminder views into scrollable content +| |/ +| * 3afdd9850 Merge branch 'mkirk/message-actions-ux' into release/2.28.0 +| |\ +| | * 29c459fe6 Haptic feedback when changing menu action selection +| | * e5e5bbddc Menu UX +| |/ +| * 6539318b4 Merge branch 'mkirk/fix-video-call-ar' into release/2.28.0 +| |\ +| | * 04c00ff28 Fix letterboxed video on M68 +| |/ +| * 181d99d80 (tag: 2.28.0.14) "Bump build to 2.28.0.14." +| * 0fb3ac85a Sync translations +| * 87f4b0ac2 (private/release/2.28.0) Clean up data. +* | a2c65e3a4 Merge branch 'jsq/fix-warnings' +|\ \ +| * | 6dc74ddca Fix some project warnings + other fixes +|/ / +* | a0b8016bc Merge branch 'charlesmchen/timerAnimation' +|\ \ +| * | 1b01e8f65 Clean up timer animation. +|/ / +* | 2fe619370 Merge branch 'mkirk/tsan' +|\ \ +| * | 165881210 TSan config +|/ / +* | 31c6f44b4 Merge branch 'charlesmchen/fileCleanup' +|\ \ +| * | 4a4edc68e Clean up data. +|/ / +* | 54afa2163 rename token -> password +* | 6e94fd50b Merge branch 'charlesmchen/certificateSubject' +|\ \ +| * | 8c4b34aa5 Revert "rename token -> password" +| * | 9e80c96d1 Revert "Revert "Revert "Revert "Revert temporary changes."""" +| * | 8e18f4057 Respond to CR. +| * | 3cac5bbfe Respond to CR. +| * | c0022ecea Move from test to staging environments. +| * | ef6aed75b Revert "Revert "Revert "Revert temporary changes.""" +| * | 8d1011a1f Verify certificate subject. +| * | c65b38ad6 Revert "Revert "Revert temporary changes."" +| * | aef881cad Verify certificate subject. +| * | 54d025e11 Revert "Revert temporary changes." +|/ / +* | 594c9aacf Merge branch 'mkirk/update-auth-params' +|\ \ +| * | 5e2dc1893 rename token -> password +|/ / +* | 1ce277a95 Merge branch 'mkirk/parser-fixup' +|\ \ +| * | ac461ca2d Fixup parser: Robust to servers various "empty" types +|/ / +* | 4a37b0e79 Merge branch 'mkirk/unbatch-legacy-contact' +|\ \ +| * | 6d46ed0e3 No change in behavior: move class down +| * | 2e38fa145 Unbatch legacy contact requests +|/ / +* | e602cf55a Merge branch 'charlesmchen/refineTheme' +|\ \ +| * | baf432f1e (origin/charlesmchen/refineTheme, charlesmchen/refineTheme) Respond to CR. +| * | fa8a07abf Respond to CR. +| * | 581347a7f Refine theme. +| * | 7759c9ca0 Refine theme. +| * | f795b12a8 Refine theme. +|/ / +* | 594eeea19 Merge branch 'charlesmchen/cleanupAttachment' +|\ \ +| * | 9334143f5 (charlesmchen/cleanupAttachment) Organize attachments. +|/ / +* | e194959c1 Merge branch 'charlesmchen/recipientDevices' +|\ \ +| * | b0a516c36 (charlesmchen/recipientDevices) Refine recipient device updates. +| * | 0518b335d Refine recipient device updates. +|/ / +* | 2c8a64a48 Merge branch 'mkirk/dry-up-param-parsing' +|\ \ +| * | bae2e8649 (origin/mkirk/dry-up-param-parsing) Dry up Parameter parsing logic +|/ / +* | c2ed507d6 Merge tag '2.28.0.13' +|\ \ +| |/ +| * 1824d7dce (tag: 2.28.0.13) "Bump build to 2.28.0.13." +| * 778a8aa07 sync translations +| * 4a84404d1 Update WebRTC +* | 0081a877e Merge branch 'mkirk/validated-protos' +|\ \ +| * | 7f8dc8333 Update Pods +| * | d39906f60 CR: test malformed protos +| * | e5856b2ac CR: Add back deprecated constructor to debug list +| * | abcd0a1d2 CR: revert logging change +| * | 06bbe907b builder pattern for proto construction +| * | 9299c5e57 CR: tweak proto class name, include yet-to-be-used protos +| * | b860dce7f Swift protos for Envelope +|/ / +* | e77b798aa Merge branch 'mkirk/webrtc-m68' +|\ \ +| * | 19ece45c8 (origin/mkirk/webrtc-m68) Update WebRTC to M68 +| * | d5ebd5a60 UBSan fixup +|/ / +* | 73012d469 Merge branch 'jsq/xcode-file-templates' +|\ \ +| * | 868a35ce4 (origin/jsq/xcode-file-templates, jsq/xcode-file-templates) Add IDE template macro for consistent headers +|/ / +* | 3126db431 Merge branch 'jsq/building-update' +|\ \ +| * | 196b2fb1f [Build] Update clone instructions +|/ / +* | 2298d50d1 Merge branch 'mkirk/cds-retry' +|\ \ +| * | f002f89f2 Update retryable +|/ / +* | 0598733fc Merge branch 'mkirk/cds-feedback-2' +|\ \ +| * | 3507367a9 Don't report feedback for HTTP errors. +|/ / +* | 11db859e6 adapt to changes since RI +* | 6e1c1a681 Merge tag '2.28.0.12' +|\ \ +| |/ +| * 6518aa24a (tag: 2.28.0.12) "Bump build to 2.28.0.12." +| * d04bb8625 sync translations +| * 48fb652d8 Merge branch 'charlesmchen/unknownObjectVsNPE' +| * fd9125ce1 Merge branch 'mkirk/remove-swipe-for-info' into release/2.28.0 +| |\ +| | * 2d4eb7d05 remove interactive 'swipe for info' +| |/ +| * 57c4d9709 Merge branch 'mkirk/speed-up-message-action-presentation' into release/2.28.0 +| |\ +| | * aba358e89 faster message actions presentation +| |/ +| * 58e2e1383 Merge branch 'mkirk/fixup-navbar' into release/2.28.0 +| |\ +| | * 1d4ead080 fix color behind navbar +| | * 3d6b8e2bb hide navbar blur layer in attachment approval, which has a clear navbar +| |/ +| * 9d279b4d8 (tag: 2.28.0.11) "Bump build to 2.28.0.11." +| * 9fc8a0eb2 Merge branch 'charlesmchen/messageSaveTouchesThread' into release/2.28.0 +| |\ +| | * f0d797a91 Always touch the thread when updating a message. +| | * d793c008b Always touch the thread when updating a message. +| |/ +| * 28f892b3c Merge branch 'charlesmchen/footerAlignment' into release/2.28.0 +| |\ +| | * 88c5fc1af Fix message footer alignment. +| |/ +| * d8c247fc0 Merge branch 'charlesmchen/gesturesVsBreaks' into release/2.28.0 +| |\ +| | * e271730f3 Ignore gestures in date breaks and unread indicators. +| |/ +| * 9049153c6 Merge branch 'charlesmchen/distinctSenderNames' into release/2.28.0 +| |\ +| | * 9d5af7bb2 Set sender names apart. +| |/ +* | 76f0a6b8b Merge branch 'charlesmchen/unknownObjectVsNPE' +|\ \ +| * | 5530b8d70 (charlesmchen/unknownObjectVsNPE) Respond to CR. +| * | 7a898f5e9 Fix NPE using mock for unknown database objects. +| * | 2c973782c Fix NPE using mock for unknown database objects. +| * | 723691400 Fix NPE using mock for unknown database objects. +| * | 708ef6f7d Fix NPE using mock for unknown database objects. +| * | 060e0fd06 Fix NPE using mock for unknown database objects. +|/ / +* | 79dcbf8a7 Update cocoapods. +* | 28ad8d065 Revert Pods update. +* | f31c6a22f Merge branch 'mkirk/cds-feedback' +|\ \ +| * | 558b3bd24 (private/mkirk/cds-feedback) Report contact discovery feedback +|/ / +* | 072100025 Merge branch 'mkirk/contact-discovery' +|\ \ +| * | 8c5d6ba9b (private/mkirk/contact-discovery) Respond to code review. +| * | b42f52871 Integrate with new contact discovery endpoint +| * | a61162569 fixup lookup threading +| * | dedfea78d callback handlers for remote attestation +|/ / +* | e27e45e66 Merge branch 'charlesmchen/socketVsNewLinkedDevice' +|\ \ +| * | bebb8ecfd (charlesmchen/socketVsNewLinkedDevice) Cycle the socket after linking a new device. +|/ / +* | c92f84353 Merge branch 'charlesmchen/byteParser' +|\ \ +| * | b197e4776 (charlesmchen/byteParser) Respond to CR. +| * | 82ebb6e76 Update cocoapods. +| * | 73eb0778c Add unit tests around byte parser. +| * | 28f021ba5 Pull byte parser out into separate source file. +|/ / +* | 2fd996a24 Merge branch 'charlesmchen/internJSQ' +|\ \ +| * | 10636957a (charlesmchen/internJSQ) Intern JSQMessagesViewController. +| * | e0db33e63 Intern JSQMessagesViewController. +| * | 25a98554b Intern JSQMessagesViewController. +|/ / +* | 906d0b01a Fix build break. +* | 6c02c2065 Merge branch 'charlesmchen/sendToSelfIsRead' +|\ \ +| * | baed56103 (charlesmchen/sendToSelfIsRead) Mark message sent to self as read. +|/ / +* | 77fd69c4e Merge branch 'charlesmchen/contactsVsConcurrency' +|\ \ +| * | 304240f26 (charlesmchen/contactsVsConcurrency) Fix concurrency in contacts updater. +| * | 9904443fc Fix concurrency in contacts updater. +|/ / +* | 492debce4 Merge branch 'charlesmchen/remoteTwistedOak' +|\ \ +| * | 88be3a575 (charlesmchen/remoteTwistedOak) Respond to CR. +| * | 819c2b1ce Remove Twisted Oak. +|/ / +* | 1ec04bc37 Merge branch 'charlesmchen/remoteAttestation3' +|\ \ +| * | c3d47d332 (charlesmchen/remoteAttestation3) Respond to CR. +| * | 904ed1549 Add unit test around remote attestation. +|/ / +* | 2427df23f Merge branch 'charlesmchen/remoteAttestation2' +|\ \ +| * | 797bd9be3 (private/charlesmchen/remoteAttestation2, charlesmchen/remoteAttestation2) Respond to CR. +| * | 81a940a27 Clean up ahead of CR. +| * | 7acf9b15e Finish signature verification. +| * | 7476ef123 Remote attestation. +|/ / +* | 551bb5b93 ubsan fixup +* | a680e70b4 Merge branch 'charlesmchen/refineHomeView2' +|\ \ +| * | 2b1f92877 (charlesmchen/refineHomeView2) Respond to CR. +| * | b90e406a5 Clean up ahead of PR. +| * | 48975eaac Respond to CR. +| * | b2b95597c Refine views. +| * | 8862f9a53 Refine views. +| * | fcbf8d4dc Refine views. +| * | 9f9e0965d Refine table views. +|/ / +* | 0025999b2 Merge branch 'mkirk/fix-overzealous-error' +|\ \ +| * | ab1190222 Fix overzealous failure when user has no Signal contacts +| * | 90430c75c update ubsan +|/ / +* | e88e7ef75 Merge branch 'charlesmchen/remoteAttestation' +|\ \ +| * | 81bd4c46e (charlesmchen/remoteAttestation) Update cocoapods for CDS. +| * | 75c3b385b Respond to CR. +| * | 97eb405a9 Revert temporary changes. +| * | f2fdb9693 Clean up ahead of PR. +| * | 460f7344a Remote attestation. +| * | 6686ecb12 Remote attestation. +| * | d7bb2b750 Remote attestation. +| * | f3ba6d4c2 Remote attestation. +|/ / +* | 20284ebc8 update BUILDING.md +* | 6082bd918 Merge branch 'mkirk/update-san' +|\ \ +| * | 9e348f2a2 update ubsan +|/ / +* | 0513077d2 Merge branch 'mkirk/batch-contact-intersections' +|\ \ +| * | eb4c62593 (origin/mkirk/batch-contact-intersections) Cancel quickly if dependent operation fails +| * | 90214ae57 make contact intersection queue serial +| * | 0db339b84 fixup double failure +| * | 9293eb96f code re-org +| * | 344c2a37c update pods for batching contact intersections +| * | 75248b5dc Stub out feedback operation +| * | b7288b256 Move contact intersection into batched operation +| * | f277ae877 Clarify OWSOperation behavior (no behavioral changes) +|/ / +* | e05877a01 Merge branch 'update-translations' +|\ \ +| * | 4ab6892e2 changed string text for MULTIDEVICE_PAIRING_MAX_DESC, ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY, CONTACT_FIELD_ADDRESS_POSTCODE, END_CALL_RESPONDER_IS_BUSY. changed comment for SETTINGS_INVITE_TWITTER_TEXT +| * | c2f7c15f7 removed jsq strings, modified MULTIDEVICE_PAIRING_MAX_RECOVERY text and comment +|/ / +* | a9353ed4e Merge branch 'charlesmchen/deltaContactIntersection2' +|\ \ +| * | 39c7fd9f1 Respond to CR. +| * | 3aa28aee3 Respond to CR. +| * | 3c3742aae Clean up ahead of PR. +| * | bf1642052 Fix nullability. +| * | 03e5d2973 Delta contact intersections. +|/ / +* | 3b2ae010d Merge branch 'charlesmchen/streamlineSignalRecipient' +|\ \ +| * | 899e96f70 (origin/charlesmchen/streamlineSignalRecipient) Respond to CR. +| * | 7f33236d6 Respond to CR. +| * | 094cf3691 Respond to CR. +| * | cc91cb3db Respond to CR. +| * | ace07ac62 Respond to CR. +| * | c830f880a Streamline SignalRecipient. +| * | 77884913d Streamline SignalRecipient. +| * | b6489c694 Streamline SignalRecipient. +| * | 05a4222b2 Streamline SignalRecipient. +| * | ef3933bfa Streamline SignalRecipient. +| * | 10b21d10e Streamline SignalRecipient. +| * | 9618fc16c Streamline SignalRecipient. +| * | ebe87348a Streamline SignalRecipient. +| * | d14f764b5 Streamline SignalRecipient. +|/ / +* | 601f1ffe7 update pods to remove test build configuration +* | 256ad75a4 Merge branch 'mkirk/remove-test-build-config' +|\ \ +| * | ef9a0880a (origin/mkirk/remove-test-build-config) Fix analyzer warnings +| * | baacebc95 Enable (quick) static analyzer for normal builds +| * | 77997639f Use CurrentAppContext instead of compiler flag to affect test behavior +|/ / +* | e00f4b30f Merge branch 'mkirk/fixup-tests-5' +|\ \ +| |/ +|/| +| * 12ef25420 Fixup SSK tests +| * d591fb7f2 Fix some compiler warnings +| * 8354a9c13 update fastlane to latest +| * c19a8ce07 Fixup tests +|/ +* 1c9a47416 (tag: 2.28.0.10) "Bump build to 2.28.0.10." +* 89f02a851 sync translations +* e0ee0bd9b Merge branch 'charlesmchen/contentInsetsRevisited' +|\ +| * 0c453c8d5 Fix content insets. +|/ +* 5cecce997 Merge branch 'mkirk/add-header-to-system-info' +|\ +| * 2b5db4fd1 Add header view to info messages. +|/ +* 41deb92ad Merge branch 'mkirk/fix-bottom-artifact-after-selecting-compose' +|\ +| * 11fc674ef Avoid blur as overly-tall navigation bar lingers after dismissal. +| * 7a5f5476d rename to avoid confusion +|/ +* 7b29822c3 Merge branch 'mkirk/fix-table-cell-sizing' +|\ +| * a6a09f4d9 fix squashed cells on ios9/10 +|/ +* 573f60ee5 Merge branch 'mkirk/fixup-audio-margins' +|\ +| * 17e79a522 fixup audio/generic atachment margins +|/ +* c2063d860 replace bullet with center-dot unicode +* cfe3c893d Merge branch 'mkirk/tweak-delivery-status-baseline' +|\ +| * 7b8541013 per design: MessageStatus 1pt below baseline +|/ +* a87be31c6 Merge branch 'mkirk/remove-new-message-after-send' +|\ +| * 567f62590 touch instead of reload to make sure any adjacent bubbles are updated appropriately. +| * 2c3f7db4e Only add one 'incoming message' unread indicator per foreground. +| * f2f3b9eae reload cell after removing unread indicator +|/ +* 51d753c13 Merge branch 'mkirk/tweak-quote-corner-radius' +|\ +| * 1b7888266 per design: tweak quote corner radius +|/ +* b9f3e08e9 (tag: 2.28.0.9) "Bump build to 2.28.0.9." +* 089010cc5 Sync translations +* fa96e0c30 Merge branch 'oscarmv/SettingsButtonMargin' +|\ +| * 24f30e015 Fixed settings button margin in home view controller, also fixes land scape button image glitch. +|/ +* 219d2bd9d Merge branch 'mkirk/fix-insets-compose' +|\ +| * c53f777bc CR: explanatory comment +| * 898d64ae1 Fix compose picker content scrolls behind navbar +|/ +* 16b20f301 Merge branch 'charlesmchen/removeThumbnailShadows' +|\ +| * e3622739b Remove media thumbnail shadows. +|/ +* b9b16f972 Merge branch 'charlesmchen/fileIcon' +|\ +| * 15bfe44b1 Update icon for generic attachments. +|/ +* 257e49740 Merge branch 'mkirk/fix-call-screen-status' +|\ +| * 06b4584e0 move fix to OWSViewController +| * 90e3cb0ed update status bar after screenprotection shows +|/ +* ba1dc6c24 Merge branch 'mkirk/adjust-header-spacing' +|\ +| * 24060c17d CR: proper width calculation for header view +| * f33e5c019 CR: assign gutter trailing/leading in HeaderView +| * fef6c64bd decrease header spacing from 32->28. +|/ +* 5fc21b69e Merge branch 'mkirk/fix-contact-cell' +|\ +| * 8da47b64d clarify different methods +| * 9df6b4bb7 Fix "contact cell too close to edge" in detail view (iOS9/iOS10) +|/ +* 7d0733fa8 (tag: 2.28.0.8) "Bump build to 2.28.0.8." +* 8984e1a71 Sync translations +* a2521169d Merge branch 'mkirk/fix-content-inset' +|\ +| * 0847c0baf ScrollToBottom accounts for top inset +|/ +* 4ee4df631 Merge branch 'charlesmchen/badUnreadIndicatorAnimation' +|\ +| * 687efabed Respond to CR. +| * 96a8df5f8 Fix "new unread indicator animation" issue. +| * f69945ea2 Fix 'breaks vs. collapse' issue. +|/ +* 810d67c3b Merge branch 'charlesmchen/oversizeAccessory' +|\ +| * c3b02522c Fix oversize accessory view. +| * 3a3fb0e41 Fix oversize accessory view. +|/ +* 54bef5b34 Merge branch 'charlesmchen/cdsFeatureFlag' +|\ +| * 23848844f Add feature flag for contact discovery service. +|/ +* 1a2428a4b CR: leave some wiggle room on max window height. +* 34be31b16 Merge branch 'mkirk/message-actions' +|\ +| * e911de01e Ensure delegate is informed of dismissal +| * 39bbcca73 CR: cleanup / copy tweak +| * bdc8181cb hide menu view controller when resigning active +| * dde2fd6f3 Hide menu window when vc dismisses. +| * 82fdd5b88 Split out generic action sheet components +| * 093a5eaa6 don't dismiss if pan is over actionsheet +| * 41af4f8c9 highlight on press +| * 2606ac47f swipe gesture / code reorg +| * 41c1c2fcd scroll focused view to maximize visability +| * 3a157d9df window level on iOS11 +| * d31b91663 new icons +| * ce3030917 MessageActions for info messages +| * 42eb7a8d3 cleanup unused code +| * 9496bedce remove redundant menu controller from media detail +| * b65be4599 quote actions +| * 210cba3e3 Media actions +| * 729336774 delete text +| * 255236814 add text reply action, comment out more deprecated uimenu code +| * 6079ae243 show text details, dismiss before action to avoid problems when action presents +| * 5c2a5b00a comment +| * 0c4cae133 milestone: route one real action (copy text) +| * bb6722ea4 animate in/out +| * ceeddbc67 localize, proper action height +| * adfaeaa8e round top corners +| * 57400e1ec WIP: ActionView +| * 18adf26e0 Don't present over navbar. +| * 635c0275d stop observing db notifications while message actions are presented +| * 6275a2f10 Highlight focused view +| * 22fada245 don't dismiss keyboard when presenting actions +| * ea179a398 first responder debugging +| * aa98963fd Abandonded: separate window pattern +| * 6037a440c wire up window mgmt +|/ +* 3cc13a66a Merge branch 'mkirk/navbar-blur' +|\ +| * a2c67bb96 Enhance navbar blur, match input toolbar blur +|/ +* c08022ade Merge branch 'mkirk/fix-initial-sync' +|\ +| * 872c89fbf Update recipient devices on successful decrypt to avoid wasting a valid session created by sender. +|/ +* 3729943cd Fix production build breakage. +* cd730e7db Merge branch 'charlesmchen/registrationHeaders' +|\ +| * 7866c5ab2 Tweak status bar colors in registration flow. +|/ +* 3e57a4442 Merge branch 'charlesmchen/refineHomeView' +|\ +| * b2f42adb8 Respond to CR. +| * f6eb8dfe7 Refine app settings view. +| * 20d1d1125 Refine home view. +|/ +* 4a2a6362b (tag: 2.28.0.7) "Bump build to 2.28.0.7." +* 9f9c83365 sync translations +* a75f1ac17 Merge branch 'charlesmchen/disappearingMessagesIcon2' +|\ +| * 246218e33 Apply 'disappearing messages disabled' icon. +| * 4d3707a16 Apply "disappearing messages disabled" icon. +|/ +* 92515bdd1 Merge branch 'charlesmchen/moreTweaks' +|\ +| * 828707649 More design tweaks. +|/ +* 220dfef1a Merge branch 'charlesmchen/dedupeForwardClasses' +|\ +| * 49b0ea993 Dedupe forward class declarations. +|/ +* 5a91391ae Fix release breakage. +* 343faed8b Merge branch 'charlesmchen/tweakAppearance' +|\ +| * 83545e72a Tweak appearance. +| * 0c420ed28 Tweak appearance. +| * 750b93512 Tweak appearance. +|/ +* 19173a20b (tag: 2.28.0.6) "Bump build to 2.28.0.6." +* cba041db1 sync translations +* 68ad2dde5 Merge branch 'charlesmchen/reworkUnreadIndicator2' +|\ +| * a505c2a89 Tweak unread indicator + date. +|/ +* 04da18c7f Merge branch 'charlesmchen/reworkUnreadIndicator' +|\ +| * 376e2cc1d Respond to CR. +| * 35f058c46 Rework unread indicators. +| * ecafe546b Rework unread indicators. +| * 8d72bb032 Rework unread indicators. +|/ +* 1ce147e94 Merge branch 'charlesmchen/tweakDisappearingMessagesIndicator' +|\ +| * e48a1e081 Respond to CR. +| * 6711ed1cf Respond to CR. +| * f426af816 Respond to CR. +| * 6d45d533e Respond to CR. +| * e01579ed4 Tweak disappearing messages indicator. +| * 0038c9b3b Tweak disappearing messages indicator. +| * d42ff03ec Tweak disappearing messages indicator. +|/ +* ec7365971 Update cocoapods. +* bbe276048 Merge branch 'charlesmchen/tweakSystemMessages2' +|\ +| * dbb0a494f Tweak system messages. +| * d278017df Tweak system messages. +| * 158aa3abc Tweak system messages; incomplete vs. missed calls. +| * 8b3bdb88f Revert "Merge branch 'charlesmchen/tweakCalls'" +|/ +* b2fe4b910 Merge branch 'charlesmchen/disappearingMessagesIcon' +|\ +| * 949402310 Update disappearing messages icon. +|/ +* 5caa289bc (tag: 2.28.0.5) "Bump build to 2.28.0.5." +* df568753c sync translations +* 4a4eb9b83 Merge branch 'charlesmchen/tweakPhoneNumberProfileNames' +|\ +| * fdc4fafe7 Tweak phone number & profile names. +|/ +* c4d52505b Merge branch 'mkirk/sync-colors' +|\ +| * f0175c0b6 feature gate color syncing +| * a66c88e3c Fix getter for contact threads, remove sneaky read transaction for DM config. +| * 92705490a No write transaction needed for syncing colors +| * 66e726a1f DRY per CR +| * 3530bf4fe sync configuration off main thread +| * 8a43435df avoid deadlock +| * 61cb19ef6 trigger sync when colors updates +| * d53f583e4 sync colors with group +| * 4d3d5d98e Sync colors with contacts +| * 553a94286 update protobufs to sync group color +|/ +* f1b130754 Merge branch 'charlesmchen/readMessageStatusIcon' +|\ +| * 575d0be6a Apply 'read' message status icon. +|/ +* bfebd1202 Merge branch 'mkirk/date-breaks' +|\ +| * c8b4e879e CR: remove unused font +| * c81799169 CR: intercell spacing dicated by ConversationViewItem +| * 3e1c1ab6c capitalize date breaks +| * 77e9533dc remove hairline +| * f22cb48f8 date break font/color to spec +| * 56e5abb2c Format date breaks to spec +| * 0b2facd36 Only include date in date header (no time) +| * 68ffd8139 Only show breaks between new days +|/ +* 66521d94c Merge branch 'mkirk/white-status-for-calls' +|\ +| * 28abf426f White status bar for call screen +|/ +* bd9c93edb Merge branch 'mkirk/tweak-selected-color' +|\ +| * 998c2f392 CR: inline per code review +| * 834021fe3 tweak selected color for homeview cells +|/ +* 823840626 Merge branch 'mkirk/fix-text-color-for-outgoing-failed' +|\ +| * 10ac7be03 prefer localizedUppercaseString for user facing text +| * d5e15b2a0 FAILED label capitalized to spec +| * 76745bee5 failed background color to spec +|/ +* b0978abd0 use points not pixels when determining how short a device is +* 14741c1dc Merge branch 'charlesmchen/attachmentUpload2' +|\ +| * a9c7e77b8 Respond to CR. +| * c70d33b9e Tweak attachment upload view. +|/ +* 2f12cd997 Merge branch 'charlesmchen/tweakHomeView2' +|\ +| * 0a35cbab1 (origin/charlesmchen/tweakHomeView2) Respond to CR. +| * d0618e373 Apply 'failed' message status icon in home view. +|/ +* a04065a52 Merge branch 'charlesmchen/tweakHomeView' +|\ +| * aac805a43 Respond to CR. +| * 159e6d235 Retweak home view unread indicator. +| * 03d393553 Tweak home view cells. +| * 6bab56220 Tweak home view cells. +|/ +* 9abea3663 (tag: 2.28.0.4) "Bump build to 2.28.0.4." +* d80aa3226 sync translations +* 8595d0fb9 Merge branch 'charlesmchen/retweakBreaks' +|\ +| * b92fc8998 Retweak date and unread messages breaks. +|/ +* 4cedce263 Merge branch 'charlesmchen/relativeTimestamps' +|\ +| * 5e71f3130 Respond to CR. +| * d4fa7e5e6 Tweak relative timestamps. +| * 41e505fb6 Tweak relative timestamps. +| * 712d6d89e Tweak relative timestamps. +|/ +* 418d33287 Merge branch 'charlesmchen/untweakColors' +|\ +| * a28a5251f Respond to CR. +| * cf8d5868e Retweak colors. +| * 4893b0190 Retweak colors. +| * e7e31c5ee Retweak colors. +| * 4b448ed01 Retweak colors. +| * bbd65d643 Retweak colors. +|/ +* dd2c0c3a9 Merge branch 'charlesmchen/conversationColorsFeatureFlag' +|\ +| * db27acf61 (charlesmchen/conversationColorsFeatureFlag) Tweak colors flag. +|/ +* e6e945b78 Merge branch 'charlesmchen/retweakSenderAvatarSizes' +|\ +| * 929615ab0 (charlesmchen/retweakSenderAvatarSizes) Tweak sender avatar sizes. +|/ +* 2763f7bd2 fix corner rounding for outgoing messages too +* 34c47f87c Merge branch 'mkirk/fix-rounding-after-date' +|\ +| * f8f0e4aa9 Fix rounding after date +|/ +* 3e0233ea6 Merge branch 'charlesmchen/tweakCalls' +|\ +| * 57c79fd79 Respond to CR. +| * b26231e43 Tweak calls. +| * 1a9a5016f Tweak calls. +|/ +* 74ce3012c (tag: 2.28.0.3) "Bump build to 2.28.0.3." +* c40c2a632 Merge tag '2.27.1.4' +|\ +| * 46b835b50 (tag: 2.27.1.4, origin/hotfix/2.27.1) "Bump build to 2.27.1.4." +| * 82bb54baa Merge branch 'mkirk/multiple-replies' into hotfix/2.27.1 +| |\ +| | * 3eb7e9271 Fix: second reply from lockscreen doesn't send +| |/ +* | 914b76c36 Merge branch 'mkirk/sharp-corners' +|\ \ +| * | 37c4a802e sharp corners respect RTL +| * | fa89a84da CR: move builder to BubbleView +| * | 0ecc97d5f date header should break cluster +| * | 42da082b0 extract rounded bezier builder +| * | 900abf236 CR: simplify +| * | 287da9c30 fixup quote corners +| * | 68c7abcbb Sharp corners +|/ / +* | f19d3374e Merge branch 'mkirk/fixup-bubble-shape' +|\ \ +| * | 40df1c8c3 CR: simplify +| * | b301dba4b cell height to spec +| * | 1f6668d86 corner radius to spec +| * | 51411f661 circular corners +|/ / +* | fadc6d7dc Merge branch 'mkirk/show-footer-across-clusters' +|\ \ +| * | 0f2c0dcd8 Only collapse footers within a cluster (from the same author) +|/ / +* | e6820499a Merge branch 'mkirk/fix-presentation-corners' +|\ \ +| * | 6e66e4e1f match media corners on dismiss +|/ / +* | 881d4be58 (tag: 2.28.0.2) "Bump build to 2.28.0.2." +* | a1f5512e8 Merge tag '2.27.1.3' +|\ \ +| |/ +| * 394990685 (tag: 2.27.1.3) "Bump build to 2.27.1.3." +| * 5a6e6e779 Merge branch 'mkirk/short-devices' into hotfix/2.27.1 +| |\ +| | * 24e675ff0 Use dismissable text views where cramped on shorter devices +| |/ +* | 2eccdc066 Merge branch 'mkirk/tweak-icons' +|\ \ +| * | 69863c645 remove unused image asset +| * | 0533eb46e tweak attachment icon +|/ / +* | b70e74b57 Merge branch 'charlesmchen/fixContactCells' +|\ \ +| * | c460ff294 Fix contact cell layout. +|/ / +* | b5698d70c Merge branch 'charlesmchen/profileTildes' +|\ \ +| * | 01cc206e8 Tweak styling of phone number + profile name. +|/ / +* | 79f4a984e Merge branch 'charlesmchen/tweakSendFailed' +|\ \ +| * | 5b5ef7e0b Respond to CR. +| * | ba557858e Tweak message send failed indicator. +| * | dd078b106 Tweak message send failed indicator. +| * | 19699fd45 Tweak message send failed indicator. +| * | 5fc16c1d9 Tweak message send failed indicator. +|/ / +* | 015c0bf5c Merge tag '2.27.1.2' +|\ \ +| |/ +| * 958d249ee (tag: 2.27.1.2) "Bump build to 2.27.1.2." +| * 89119e7da Merge branch 'charlesmchen/websocketFailoverToRestVsQueue' into hotfix/2.27.1 +| |\ +| | * 3f4cd15f5 (charlesmchen/websocketFailoverToRestVsQueue) Use sending queue in websocket send failover to REST. +| |/ +* | 0292e1dd3 (tag: 2.28.0.1) "Bump build to 2.28.0.1." +* | 0f34f7661 Merge tag '2.27.1.1' +|\ \ +| |/ +| * 677b898bf (tag: 2.27.1.1, hotfix/2.27.1) "Bump build to 2.27.1.1." +| * 2c1693c94 Revert "Revert "Revert "Disable contact sharing.""" +| * 847fa3cf0 (tag: 2.27.1.0) "Bump build to 2.27.1.0." +| * 5abd35de3 Merge branch 'mkirk/unblock-ipad-register-button' into hotfix/2.27.1 +| |\ +| | * b47062831 Don't block "register" button on iPad registration +| |/ +| * 1448c505d Merge branch 'mkirk/fix-ios10-cant-see-inbox' into hotfix/2.27.1 +| |\ +| | * f48634701 Fixes iOS10 intermittently can't see inbox +| |/ +| * 6a502fcec Merge branch 'mkirk/fix-initial-contact-group-sync' into hotfix/2.27.1 +| |\ +| | * 1e8c7d63b clarify sync logging +| | * 8576de061 Fix: No contacts/groups after initial device link +| |/ +* | 2106bd9e0 sync translations +* | dee825ceb Merge branch 'charlesmchen/contactShareButtons' +|\ \ +| * | 99b76b973 (charlesmchen/contactShareButtons) Respond to CR. +| * | 92332c2b6 Rework contact share buttons. +|/ / +* | a0710febe Merge branch 'mkirk/smaller-icon' +|\ \ +| * | cfd18bf3f smaller swatch icon +|/ / +* | 1f79e1d59 Merge branch 'mkirk/bump-limit' +|\ \ +| * | 9cb25024c bump limit to allow more legit strings through +|/ / +* | dc036496b Merge branch 'mkirk/tweak-sender-bar' +|\ \ +| * | 2b7fc4c94 CR: fixup false->NO +| * | a27ee19f4 Fix scroll offset for iPhoneX now that content is behind toolbar +| * | 83d3f17d4 remove unused code, add comment +| * | 2b588017f round attachment approval toolbar +| * | 94a23e63b resize bar after send +| * | 1d0a25dba cleanup +| * | 17f0400bb vertically align input toolbar items +| * | 1a00690b1 Compose to stack view +| * | 7ef693f1b pure white blur +| * | 84d60f5dc input toolbar layout tweaks +| * | ce0c706f7 icon tint +|/ / +* | b801979fa Merge branch 'mkirk/misc-cleanup' +|\ \ +| * | bd9696fed canary in case we change margins later +| * | 6d5c0cd29 image corner radius is small +| * | 9108c8932 ContactView is now a stackView +|/ / +* | aa70deef7 (tag: 2.28.0.0) fix picker rounding +* | 283556ed0 "Bump build to 2.28.0.0." +* | 6ea3c1373 Merge branch 'charlesmchen/quotedReplyMargins' +|\ \ +| * | 05b1b37ea Respond to CR. +| * | bc527273f Fix quoted reply margin. +|/ / +* | cf38da0d1 Merge branch 'charlesmchen/smallMediaCorners' +|\ \ +| * | fb0ac3217 Respond to CR. +| * | 3b726bbac Small media corners. +|/ / +* | 1d329fbc1 Merge branch 'charlesmchen/tweakCleanup' +|\ \ +| * | db32dcc6a Cleanup. +|/ / +* | 9dd18c46e Revert "Fix quoted reply margin." +* | c76c571d8 Fix quoted reply margin. +* | 170d35caa Merge branch 'charlesmchen/tweakTimestampFormat' +|\ \ +| * | d932748cd Change timestamp format. Ensure we always have a date break between messages on different days. +|/ / +* | 484be57dc Merge branch 'charlesmchen/tweakMessages3' +|\ \ +| * | 8c143f950 Tweak quoted reply layout. +| * | 9a52d4041 Tweak quoted reply layout. +| * | c6f370810 Refine cell sizing. +| * | 7be6fbc24 Refine intra-cell spacing. +|/ / +* | a80eb0911 Merge branch 'charlesmchen/moreColors' +|\ \ +| * | 49d34ff02 Tweak contact offers. +| * | 82e649c50 Tweak colors. +| * | 53c74d84a Tweak colors. +| * | 0c4470bb3 Tweak colors. +| * | 2653ed7e3 Apply conversation colors. +| * | 63fa6f5c0 Tweak read indicator color. +|/ / +* | f81aec936 Merge branch 'charlesmchen/rtl' +|\ \ +| * | 92a9796e9 Respond to CR. +| * | 1412998b4 Rework isRTL. +|/ / +* | 8bbc25148 Merge branch 'charlesmchen/senderNames3' +|\ \ +| * | a6e401514 Tweak profile names. +| * | bb1caaf3c Tweak profile names. +| * | 39eac9129 Respond to CR. +| * | 4dcb8e18b Clean up ahead of PR. +| * | 32f33f6d1 Tweak sender names. +|/ / +* | 3ee16a0e3 Merge branch 'mkirk/tweak-navbar' +|\ \ +| * | 4f94d5c5a default value +| * | 249b0a32b long text view controller +| * | 5719aba91 separate icon vs. title color for toolbars +| * | 33ab3a663 opaque conversation input toolbar +| * | 126d41e54 Fixup "scroll down" button so it doesn't fall behind toolbar +| * | fd22c6cf2 fix warnings in conversation input toolbar +| * | ee898829a fixup white nav +| * | 767f06b09 fixup status bar +| * | 104e63ded remove appearance juggling +| * | d5fa7f9b2 conversation view scrolls behind bars +| * | f8abe32ae more styling to new nav colors +| * | 001aad001 dark status bar +| * | 5d6a98895 WIP navbar +|/ / +* | e67d03b43 Merge branch 'mkirk/fixup-conversation-color' +|\ \ +| * | de56eb9d6 Proper color for compose screen avatars +|/ / +* | 2b293b762 (origin/charlesmchen/genericAttachmentFileExtension) Merge branch 'charlesmchen/removeFooterShadows' +|\ \ +| * | de8cef52b Tweak message contents. +|/ / +* | 600b1aa49 Merge branch 'charlesmchen/tweakQuotedReplies2' +|\ \ +| * | f0121f20b Respond to CR. +| * | bcde04766 Fix layout of quoted replies. +| * | 678881014 Clean up ahead of PR. +| * | 9ead8b55a Tweak design of quoted replies. +| * | d80de4bcc Tweak design of quoted replies. +|/ / +* | 38db7c440 Merge branch 'charlesmchen/genericAttachmentFileExtension' +|\ \ +| * | 7f855aa9e Respond to CR. +| * | 520819b24 Show generic attachment extension. +|/ / +* | ea7ec9948 Merge branch 'mkirk/pick-color' +|\ \ +| * | 16df4f589 conversation colors +|/ / +* | 7d1cf700b Merge branch 'charlesmchen/genericAttachmentSizing' +|\ \ +| * | d8108c5ea Tweak generic attachment view widths. +|/ / +* | 2559b7b8f Merge branch 'charlesmchen/sendingAnimation' +|\ \ +| * | e0f2a76c7 Animate sending icon. +|/ / +* | 06d8e8cb4 Merge branch 'charlesmchen/tweakCells' +|\ \ +| * | 24c4c4c09 Respond to CR. +| * | 23435b690 Tweak message contents. +| * | dd28c0189 Tweak date headers. +| * | fa5bfc25e Tweak system messages and unread indicators. +|/ / +* | 5970db6fd Merge branch 'charlesmchen/downloadingAttachmentView' +|\ \ +| * | d2f2e1cb2 Respond to CR. +| * | 3d5cff1ed Tweak attachment download view. +|/ / +* | 296c7c286 Merge branch 'charlesmchen/tweakBodyMediaSize' +|\ \ +| * | 554606e2a Ensure body media size. +|/ / +* | 288eb0a0d Merge branch 'charlesmchen/mediaGradients' +|\ \ +| * | e80e5ff9c Improve layer view design. +| * | 1e2a49880 Tweak media view gradients. +|/ / +* | 89b4391b4 Merge branch 'charlesmchen/fixBubbleStrokes' +|\ \ +| * | 0613cf3bb Fix bubble strokes. +|/ / +* | e300a0703 Merge branch 'charlesmchen/tweakAudioLayout' +|\ \ +| * | f607eabb7 Fix audio message layout. +|/ / +* | 266469163 Merge tag '2.27.0.7' +|\ \ +| |/ +| * c91811850 (tag: 2.27.0.7, origin/release/2.27.0, release/2.27.0) "Bump build to 2.27.0.7." +| * 57e3d0d5f Revert "Revert "Disable contact sharing."" +| * 66b0a2f1d Merge branch 'mkirk/call-failed-roulette' into release/2.27.0 +| |\ +| | * 2fdb62764 avoid occasional "call failure" after local hangup. +| |/ +* | a0810b197 Merge branch 'charlesmchen/breakSpacing' +|\ \ +| * | d869afc3e Tweak break spacing. +|/ / +* | 2ab7e644c Merge branch 'origin/tweakMessageFooters' +|\ \ +| * | 7d971f1b7 Rework view item configuration. +| * | dc531a86e Tweak message cells. +|/ / +* | 2126e6b87 Merge branch 'charlesmchen/doubleShadows' +|\ \ +| * | 87380894b Tweak message cells. +|/ / +* | 560d5b530 Merge branch 'charlesmchen/disableCompactTextLayout' +|\ \ +| * | 17d4ccc48 Disable compact text layout. +|/ / +* | d9b63076e Merge remote-tracking branch 'origin/charlesmchen/moveConversationStyle' +|\ \ +| * | 35dc34855 Move conversation style. +|/ / +* | 1a7cc3acb Merge branch 'charlesmchen/tweakColors' +|\ \ +| * | af4eb39a2 Respond to CR. +| * | a34719ce6 Tweak color palette. +| * | f2153f888 Tweak color palette. +| * | cbc80abff Tweak color palette. +| * | ce9a9ec92 Tweak color palette. +| * | 8943669d8 Tweak colors. +|/ / +* | bcc088874 Merge branch 'charlesmchen/tweakNonMedia' +|\ \ +| * | 7634e3a44 Respond to CR. +| * | ffb1c3538 Clean up ahead of PRs. +| * | 3beac83a1 Clean up ahead of PRs. +| * | 416a52b74 Tweak contact shares. +| * | 2b457c649 Tweak contact shares. +| * | 3c4d14034 Tweak contact shares. +| * | dc79d302c Tweak audio messages. +| * | a0b612c64 Tweak generic attachments. +|/ / +* | 1623bf91b Merge branch 'charlesmchen/mediaShadows' +|\ \ +| * | 774310396 Clean up ahead of PR. +| * | 5f0908069 Clean up ahead of PR. +| * | 9cc3a3b7b Add body media shadows. +|/ / +* | ec81e1558 Merge branch 'charlesmchen/senderNames' +|\ \ +| * | e9973b209 Respond to CR. +| * | 966e6a115 Tweak sender names. +|/ / +* | 538194aba Merge branch 'charlesmchen/messageCornerRounding' +|\ \ +| * | c744245c4 Fix corner rounding. +|/ / +* | 8362c2648 Merge branch 'charlesmchen/intraCellSpacing' +|\ \ +| * | 227234d8c Respond to CR. +| * | dc86bee5d Respond to CR. +| * | 16a1dcfb7 Respond to CR. +| * | 89523f556 Tweak intra-cell spacing. +|/ / +* | afa003926 Merge branch 'charlesmchen/breaks' +|\ \ +| * | d04ee3521 Respond to CR. +| * | 4fc24540d Breaks: unread indicators and date headers. +| * | a4703cec7 Breaks: unread indicators and date headers. +| * | 4b60037e3 Breaks: unread indicators and date headers. +| * | d34e53a16 Breaks: unread indicators and date headers. +|/ / +* | a55505a7a Merge branch 'charlesmchen/compactLayout' +|\ \ +| * | 572fee617 Respond to CR. +| * | f5239a4fb Compact layout / widow reduction. +|/ / +* | 3bee54dbe Merge tag '2.27.0.6' +|\ \ +| |/ +| * ad351de5c (tag: 2.27.0.6) "Bump build to 2.27.0.6." +| * a16df5cd7 sync translations +| * b4bda29d1 Merge branch 'mkirk/fix-hidden-searchbar' into release/2.27.0 +| |\ +| | * d9d5131e5 FIX: obscured searchbar upon returning +| |/ +| * 00cde6a03 Merge branch 'mkirk/group-search' into release/2.27.0 +| |\ +| | * 1fcf25fab FIX: compose search group cell +| |/ +| * 9c73dbc88 Merge branch 'mkirk/sync-touchups' into release/2.27.0 +| |\ +| | * b5b51eba2 CR: make members private where possible +| |/ +| * 3e4603920 Merge branch 'charlesmchen/searchFinderAssert' into release/2.27.0 +| |\ +| | * a6dbb7704 Remove overzealous assert in search finder. +| |/ +* | cf4847b6f Merge tag '2.27.0.5' +|\ \ +| |/ +| * 05b200c60 (tag: 2.27.0.5) "Bump build to 2.27.0.5." +| * 4576747bb sync translations +| * 89402d0d2 Merge branch 'mkirk/webrtcM67' into release/2.27.0 +| |\ +| | * 38ee3653f (origin/mkirk/webrtcM67) synchronize access to CaptureController state +| | * af603e53c remove more unused state from PCC +| | * 61156656a Only PCC needs to know about the local RTCTrack +| | * afa385fea adapt to capturer abstraction +| | * 0cd1cb80c Compiling, but video sending not working. +| | * 064035f3f WIP M67 - plumb through AVCaptureSession +| | * 51c3a3df6 update to latest webrtc artifact +| |/ +* | ec8db7ee6 Merge branch 'charlesmchen/fixedBubbleSize' +|\ \ +| * | 2232c2548 Ensure bubble sizing. +| * | c7f9575df Ensure bubble sizing. +|/ / +* | 5e676c13d Merge branch 'charlesmchen/footerView' +|\ \ +| * | 3fba10142 Respond to CR. +| * | 18417edbd Introduce message cell footer view. +| * | 7d5ad0e16 Introduce message cell footer view. +| * | 6626e2ecc Introduce message cell footer view. +| * | f363a196f Introduce message cell footer view. +| * | a769499f5 Remove overzealous assert in search finder. +| * | cbacda87c Introduce message cell footer view. +|/ / +* | 538cd4f89 Merge branch 'charlesmchen/refineConversationStyle' +|\ \ +| * | 8cfb6eef1 Refine conversation style. +|/ / +* | ad663ee06 Merge branch 'charlesmchen/conversationStyle' +|\ \ +| * | 33b1628c2 (origin/charlesmchen/conversationStyle) Rename to ConversationStyle. +|/ / +* | 661272750 Merge branch 'charlesmchen/groupSenderAvatars' +|\ \ +| * | a5d52c420 Clean up ahead of PR. +| * | 4effa56d5 Tweak 'group sender' avatars. +|/ / +* | e3a13dfd9 Respond to CR. +* | 92f63cdb1 Merge branch 'charlesmchen/fixCellLayoutBreakage' +|\ \ +| * | a9b6fe597 Respond to CR. +| * | fdd617487 Fix breakage from cell layout changes. +|/ / +* | f29d83c99 Merge branch 'charlesmchen/tweakTextInsets' +|\ \ +| * | 990bb81e4 Respond to CR. +| * | a31bd16d9 Respond to CR. +| * | 7847db7e1 Tweak text insets to reflect dynamic type. +|/ / +* | fa860592c Merge branch 'charlesmchen/tweakMessages1' +|\ \ +| |/ +|/| +| * 4b5d994c3 Respond to CR. +| * fc299b870 Use UI database connection throughout the conversation cells. +| * d40f74dd0 Respond to CR. +| * 196d82c17 Respond to CR. +| * 53b1ae6a3 Fix gutter constants. +| * 0b04397e2 Tweak message cells. +| * d425809fa Tweak message cells. +| * 98ac13f9b Tweak message cells. +| * ac6f78a5f Tweak message cells. +|/ +* 825e3f4ac (tag: 2.27.0.4) "Bump build to 2.27.0.4." +* 0419f5226 sync translations +* 3ac39fcfe Merge branch 'mkirk/main-thread-connection-failure' +|\ +| * e88dc1525 Fix failing assert: only set state on main thread +|/ +* 9cb2b5114 Merge branch 'mkirk/no-unread-status-for-search-results' +|\ +| * 9d56f100a Don't show unread badge/bold for search message +| * 803a58f33 avoid assert +|/ +* c8c89e539 Merge branch 'mkirk/fix-mute-icon' +|\ +| * 489bbe2fc FIX: mute icon corrupted in homeview +|/ +* 20b34185f Merge branch 'mkirk/fix-input-glitch-after-search' +|\ +| * 9b43e3233 FIX: input toolbar not immediately visible when search was active +|/ +* 532e0b894 Merge branch 'mkirk/archive-banner' +|\ +| * 9f06163b7 Fix contacts reminder view +| * 66ebb7b78 Simplify show/hide with stack view +| * 1528f6f70 Fix archive/outage banner. +|/ +* 2af0ba99b Merge branch 'mkirk/fix-margins-in-contact-cell' +|\ +| * cde1c3fb7 Fix: iOS10 was not respecting margins with our homebrew pin method +|/ +* 0c01bfca9 Merge branch 'charlesmchen/deserializationLogs' +|\ +| * 700e9fa49 Improve logging around deserialization exceptions. +|/ +* 676f8fc03 (tag: 2.27.0.3) "Bump build to 2.27.0.3." +* def7e8415 Sync translations +* fca11a18d Merge branch 'charlesmchen/fixMessageDetailsView' +|\ +| * 8cb057c23 Fix 'contact cell vs. message details layout' issue. +| * c8d0a8003 Fix 'contact cell vs. message details layout' issue. +| * 2ecbf1bb6 Fix 'contact cell vs. message details layout' issue. +| * 1a57fe631 Fix 'contact cell vs. message details layout' issue. +| * 0df71e22a Fix message detail view. +|/ +* c1fea2e7f Merge branch 'charlesmchen/appSettingsButton' +|\ +| * 27af2fc32 Improve app settings buttons. +|/ +* b5acc9418 Merge branch 'charlesmchen/deregistrationCopy' +|\ +| * 525fc547b Apply copy change. +|/ +* a7a9eb2a7 (tag: 2.27.0.2) "Bump build to 2.27.0.2." +* 71c63d9fc Remove obsolete assert. +* b75f4596a Remove obsolete assert. +* 3b1e924eb Merge branch 'mkirk/ipad-registration' +|\ +| * cc1bde34c Inform iPad users upon registration +|/ +* 791365ad1 Merge branch 'mkirk/show-legal-link' +|\ +| * 0bc88666c Show legal terms link +|/ +* 9468cadf2 Merge branch 'charlesmchen/searchVsKeyboard' +|\ +| * f516f30c2 Auto-dismiss search keyboard; "cancel search" button. +|/ +* 6933e28e4 update comment +* 3952954b0 Update Localizable.strings for minor copy change to Registration view +* b62b830fd Merge branch 'mkirk/deserialize-unknown-object' +|\ +| * 737598c73 Return unknown object from deserializer +|/ +* 4bd3f8cbf (tag: 2.27.0.1) "Bump build to 2.27.0.1." +* 8c6eb791a Merge branch 'charlesmchen/lazyContact' +|\ +| * fbbb9276b Respond to CR. +| * 63b6276c2 Clear LRUCache in background. +| * ebcc435c9 Clean up ahead of PR. +| * 87ea1dcae Clean up ahead of PR. +| * 08ca4fdb5 Lazy-load contact avatar data and images. Use NSCache for avatar images. +| * af977ca40 Don't cache CNContact. +| * 41a2ea03b Don't cache CNContact. +| * b9e2963f4 Don't cache CNContact. +| * d3d9d2e64 Don't cache CNContact. +| * 83f11ad79 Don't cache CNContact. +| * 12295bd8c Don't cache CNContact. +|/ +* e2de8f6ff Merge branch 'charlesmchen/outageDetection' +|\ +| * 4ef7193dc Update cocoapods. +| * a7d712d1b Respond to CR. +| * 1eb02bfd9 Outage detection. +| * ae50dbe19 Outage detection. +| * 793a868e6 Outage detection. +| * e507256e5 Outage detection. +| * c96e2bb8b Outage detection. +| * 20b1a2606 Outage detection. +|/ +* 37e3f2685 Merge branch 'charlesmchen/unreadVsOffers_' +|\ +| * 776b5abed Handle edge cases around unread indicator & contact offers. +|/ +* e143b7ea2 Merge branch 'charlesmchen/contentTypeVsImageFormat' +|\ +| * 463a32358 Image content types. +| * 1607aa7f5 Image content types. +|/ +* c7714b09a Merge branch 'charlesmchen/databaseViewTypeChecking' +|\ +| * 4abaed0e6 Tidy up type checking in database views. +|/ +* 56dfc6ffa Merge branch 'charlesmchen/deserializationLogging' +|\ +| * b88254244 Respond to CR. +| * 2e6b4899a Remove TSRecipient. +| * 21a9ce3b2 Ensure TSRecipient can be deserialized. +| * f1708c0b3 Improve logging around deserialization failures. +|/ +* 9e2716d5a Merge branch 'charlesmchen/deregistration' +|\ +| * 4ac810097 Respond to CR. +| * 010c10cb0 Show re-registration in app settings. +| * 7f346326f Add re-registration UI. +| * bc6a4ea8d Add re-registration UI. +| * fc4763673 Improve de-registration checks in socket manager. +| * 6331fbb22 Show de-registration nag view. +| * b0646e8bf Track and persist 'is de-registered' state. +| * 985f735f1 Track and persist "is de-registered" state. +|/ +* 9110d5093 Merge branch 'charlesmchen/databaseFiles' +|\ +| * 28047abb6 Tweak database reset. +|/ +* 0b64ecf67 Respond to CR. +* 18a8efe1a Respond to CR. +* 6ca3688cd (tag: 2.27.0.0) "Bump build to 2.27.0.0." +* 32336e38e Merge tag '2.26.0.26' +|\ +| * 9b948141d (tag: 2.26.0.26, private/release/2.26.0, origin/release/2.26.0, release/2.26.0) "Bump build to 2.26.0.26." +| * d6b1c1ef0 Merge branch 'charlesmchen/autoLoadMoreOnAppear' into release/2.26.0 +| |\ +| | * b5a836bf2 (charlesmchen/autoLoadMoreOnAppear) Shared ui db connection v. auto load more. +| |/ +* | 74358b73f Merge branch 'charlesmchen/unifyCellAndAvatarSizes' +|\ \ +| * | 7e1c0102b Unify the cell and avatar sizes. +| * | 647d80d79 Unify the cell and avatar sizes. +| * | 1acf51ea5 Unify the cell and avatar sizes. +| * | 261719e53 Unify the cell and avatar sizes. +|/ / +* | 834db55ef Merge branch 'mkirk/fix-debug-sync' +|\ \ +| * | c48f2404a Fix overzealous assert +| * | a346465db tune down logging +|/ / +* | 18c1f1ef3 Merge branch 'charlesmchen/searchOversizeText' +|\ \ +| * | 40e5bcc23 Respond to CR. +| * | e8d0d9ecc Index oversize text for search. +|/ / +* | a00df83b3 Merge branch 'charlesmchen/autoSizeContactCells' +|\ \ +| * | c1e1a5269 Auto-size contact cells everywhere. +| * | dd49c6225 Auto-size contact cells everywhere. +|/ / +* | f8e785ef7 Merge tag '2.26.0.25' +|\ \ +| |/ +| * 67fe8531c (tag: 2.26.0.25) "Bump build to 2.26.0.25." +| * 72ff5d4c9 Merge branch 'mkirk/update-ui-db-to-latest' into release/2.26.0 +| |\ +| | * a91b6b35e update UI DB to latest before showing CVC +| |/ +* | 8d078e0a1 Merge branch 'charlesmchen/filterIndexText' +|\ \ +| * | c8f2201a3 Respond to CR. +| * | 527e2715d Elaborate the search tests. +| * | 5c42e4c59 Improve search query construction. +| * | 755d30254 Improve search query construction. +| * | 153f3fc0a Improve search query construction. +| * | a51e9b78b Improve search query construction. +| * | f5a5d84ed Filter search index text. +| * | b5e026575 Filter search index text. +|/ / +* | 80bada526 Update the README. +* | 6450b2510 Merge branch 'mkirk/disappear-group' +|\ \ +| * | 0a1724673 Don't use group name in message. +| * | 95b1dced1 add: messages in Book Club will disappear in 1 minute +| * | 0cf751d34 Newly added group members should have expire time +|/ / +* | a9e5d43fc Merge branch 'mkirk/disappear' +|\ \ +| * | 74b741e9d Update timer +|/ / +* | 95ac17bb7 Merge tag '2.26.0.24' +|\ \ +| |/ +| * 84fa95916 (tag: 2.26.0.24) "Bump build to 2.26.0.24." +| * b3308e4d3 Merge branch 'mkirk/callscreen-read' into release/2.26.0 +| |\ +| | * 0dec029a6 Don't mark as read when callscreen is active +| |/ +* | 4e6b84c50 Merge branch 'charlesmchen/syncMessageSendAsserts' +|\ \ +| * | f9f931fc2 Fix assert around failing sync message sends. +|/ / +* | 9be88f74f Merge branch 'mkirk/localize-socket-timeout' +|\ \ +| * | 0f38f8e3e localize socket timeout +|/ / +* | c9064ce05 Merge branch 'charlesmchen/doubleScroll' +|\ \ +| * | f0e37ff3f Avoid double-scrolling. +|/ / +* | c0a521192 Merge branch 'charlesmchen/updateSearchResults' +|\ \ +| * | 2db4c96a1 Respond to CR. +| * | 3c50269db Debounce search result updates. +| * | 91cc902b1 Update search results. +|/ / +* | e7fc9438c Merge branch 'charlesmchen/sskLogging' +|\ \ +| * | 428968564 Update cocoapods. +| * | c8fee4efa Add swift logging to SSK. +|/ / +* | ef0f92616 Merge branch 'charlesmchen/websocketLogging' +|\ \ +| * | d5c738af2 Clean up websocket logging. +|/ / +* | 8ebb10b90 Merge branch 'charlesmchen/styleSearchResults_' +|\ \ +| * | 44b23d44f Respond to CR. +| * | 99677899b Respond to CR. +| * | f0c1805de Strip snippet formatting. +| * | 31443b568 Clean up ahead of PR. +| * | 9639d3cba Clean up ahead of PR. +| * | 3f9f2abcd Style the search results. +| * | f4a559156 Style the search results. +|/ / +* | 5fec9b7c1 Merge branch 'charlesmchen/contactChangesVsAccess' +|\ \ +| * | 646073c92 Check contacts access when notified of contacts changes. +|/ / +* | 27b612554 Merge branch 'charlesmchen/searchResultsOrdering' +|\ \ +| * | ebc5356a9 Respond to CR. +| * | 758913f95 Respond to CR. +| * | a4aba325d Order the search results. +| * | 4abd3f58c Order the search results. +| * | 37d3dfdfb Merge tag '2.26.0.23' +| |\ \ +| | |/ +| | * 7539d34ed (tag: 2.26.0.23) "Bump build to 2.26.0.23." +| | * 971a69e72 Update l10n strings. +| | * 037ca4bcb Merge branch 'mkirk/call-logging' into release/2.26.0 +| | |\ +| | | * 8c88382f3 less call logging +| | |/ +| | * df7c00b7a Merge branch 'mkirk/fix-freeze-after-swipe' into release/2.26.0 +| | |\ +| | | * 72e4de095 Fix unresponsive interface after swipe on root VC +| | |/ +| * | 7bb93e265 Merge branch 'mkirk/fts-sin-country-code' +| |\ \ +| | * | dff8d7bf9 Moving code around +| | * | f57a5dbc7 Match searches for national number format +| | * | d423d3487 (origin/mkirk/fixup-tests) Disable swift optimizations for tests +| | * | c4b02a0ee fix tests - empty contact threads are intentionally excluded +| | * | bcbe5901c cleanup test code +| |/ / +| * | 09138a1e0 Merge branch 'charlesmchen/openSearchResultMessage' +| |\ \ +| | * | 8164b893a Respond to CR. +| | * | 999e8c8e3 Respond to CR. +| | * | 13e9f11b4 Open message search results. +| | * | 27b6a5e5b Open message search results. +| |/ / +| * | 00c2d47a9 fix typo in TRANSLATIONS doc +| * | ec7c09280 Merge branch 'oscarmv/RemoveAMRSupport' +| |\ \ +| | * | 51a984114 https://github.com/signalapp/Signal-iOS/issues/3455: Treat AMR files as generic attachments (AVFoundation doesn't support playback) +| |/ / +| * | 970148dd2 Update translations doc +| * | 741bc9d1a Merge branch 'mkirk/fts-no-results' +| |\ \ +| | * | 549342c70 Show empty results text +| | * | 98983ac8e Localize search bar +| | * | ecdaad06f Handle no results +| |/ / +| * | 91af7d385 Revert "Disable contact sharing." +| * | ade8dcd6a Merge tag '2.26.0.22' +| |\ \ +| | |/ +| | * 0eb653897 (tag: 2.26.0.22) "Bump build to 2.26.0.22." +| | * 7e9d2b00e Merge branch 'charlesmchen/initialScrollState' into release/2.26.0 +| | |\ +| | | * bb266d03e (charlesmchen/initialScrollState) Preserve default scroll state until conversation view is presented. +| | |/ +| | * b61838006 Merge branch 'charlesmchen/saeContextDefaultApplicationState' into release/2.26.0 +| | |\ +| | | * 0ad9e6cac (charlesmchen/saeContextDefaultApplicationState) Default share app context's default application state to active. +| | |/ +| * | ecf9a5689 Merge branch 'mkirk/fts-contacts' +| |\ \ +| | * | fff847415 adapt to rebase conflicts +| | * | f415827da Contact search results +| |/ / +| * | 42263b795 Merge branch 'charlesmchen/searchResultsNavigation' +| |\ \ +| | * | d1a46e596 Respond to CR. +| | * | 897f5b86a Open search results. +| | * | 6b49bb5e1 Open search results. +| |/ / +| * | f118066b3 Merge branch 'mkirk/fts-search-results-controller' +| |\ \ +| | * | 729befa5c CR: Cap max search results +| | * | 6924045d6 CR: rename Chat -> Conversation for consistency +| | * | b3705196b remove unused code/comments +| | * | 0f7dcccd5 Use search results controller +| | * | 21788f5f9 Avatar, label fonts, resignFirstResponder on scroll +| | * | e6b913b13 Fix layout on iOS10 +| | * | 13c43c252 search groups by member name, cleanup tests +| | * | 6b43199ba Full text search pods changes +| | * | 3a03c4f74 WIP: message indexing +| | * | b00e5a4fd Fuzzier search matching +| | * | f360bcfd3 Less confusing class names +| | * | a9e2834d9 WIP: FTS - rudimentary show results +| | * | ffea3a020 WIP: FTS - wired up Search VC +| | * | 429af7854 WIP: Full Text Search +| | * | a6200a560 update layout tests +| |/ / +| * | 1db1d76d9 Merge branch 'mkirk/fix-build-warnings' +| |\ \ +| | |/ +| |/| +| | * 7df158120 Fix build warnings: mark initWithCoder as designated. +| * | 28f71ff6e (tag: 2.26.0.21) "Bump build to 2.26.0.21." +| * | afc2cabe9 Merge remote-tracking branch 'origin/hotfix/2.25.3' +| |\ \ +| | |/ +| |/| +| | * 16cee92ca (tag: 2.25.3.0, origin/hotfix/2.25.3, hotfix/2.25.3) Suppress legal links. +| | * 7cc46a06f Rebuild finder index. +| | * 6da37da42 "Bump build to 2.25.3.0." +| * | 1a3e4c750 Merge branch 'charlesmchen/riCheckIgnores' +| |\ \ +| | * | d8c0f6756 (charlesmchen/riCheckIgnores) Add list of tags to ignore to RI check script. +| |/ / +| * | 348642ebd (tag: 2.26.0.20) "Bump build to 2.26.0.20." +| * | aa8805091 Merge branch 'charlesmchen/suppressLegalLinks' +| |\ \ +| | * | 0dcde9516 (origin/charlesmchen/suppressLegalLinks, charlesmchen/suppressLegalLinks) Suppress legal links. +| |/ / +| * | ec50c9f40 (tag: 2.26.0.19) "Bump build to 2.26.0.19." +| * | 626573a8a Revert "Revert "Disable contact sharing."" +| * | 5b3306724 (tag: 2.26.0.18) sync latest translations +| * | 10c6ad110 "Bump build to 2.26.0.18." +| * | 25becb43b track ruby version +| * | 28cb6575f Better voip-while-locked copy +| * | 05482c086 (tag: 2.26.0.17) "Bump build to 2.26.0.17." +| * | abfdca65c Merge branch 'charlesmchen/callVsBackground' +| |\ \ +| | * | b59140cb3 (origin/charlesmchen/callVsBackground) Revert some of the socket sending logging. +| | * | 31d8db57e "Bump build to 2.26.0.16." +| | * | 3fe63726e Improve logging around socket messages. +| | * | 53dac3282 "Bump build to 2.26.0.15." +| | * | e7ca98fcf Improve logging around socket messages. +| |/ / +| * | 6243db7d0 (tag: 2.26.0.14) "Bump build to 2.26.0.14." +| * | d17c3906e Disable CloudKit; leave iCloud capability enabled for "iCloud documents" service used by document picker. +| * | 4122e59ce Revert "Disable iCloud capability." +|/ / +* | ed7d5cb59 (tag: 2.26.0.13) "Bump build to 2.26.0.13." +* | 5cf2b3905 Disable iCloud capability. +* | 0e2668235 (tag: 2.26.0.12) "Bump build to 2.26.0.12." +* | f15da251c Update l10n strings. +* | a881d57dd (charlesmchen/signalCore) Merge branch 'mkirk/fix-video-layout' +|\ \ +| * | e2eb772ff Fix layout for iOS9,10 +|/ / +* | 7ebad71a7 Merge branch 'mkirk/voip-notice' +|\ \ +| * | cd298c72c notify when receiving voip before first unlock +|/ / +* | c1afbcca4 (tag: 2.26.0.11) "Bump build to 2.26.0.11." +* | 8b3543929 Merge branch 'charlesmchen/reduceJSQ' +|\ \ +| * | 19c9e226f Respond to CR. +| * | 0c6305bfb Revert changes to l10n files. +| * | 221b81b9a Reduce usage of JSQ. +| * | 3964b78ff Reduce usage of JSQ. +|/ / +* | d3ea8582b Merge branch 'charlesmchen/missingInteractions' +|\ \ +| * | 833f6ad51 Skip missing and invalid interactions in conversation view. +| * | 2c0ba1cbd Skip missing and invalid interactions in conversation view. +|/ / +* | aa2480c9a Merge branch 'charlesmchen/registrationViewVsDynamicType' +|\ \ +| * | dc13e32e4 Don't use dynamic type in registration view... yet. +|/ / +* | c1f5d1d55 Merge branch 'charlesmchen/moreWarnings' +|\ \ +| * | 6bc145ce3 Fix more build warnings. +|/ / +* | 97777ffeb (tag: 2.26.0.10) "Bump build to 2.26.0.10." +* | 630e758fb Update l10n strings. +* | 2fc47893d Update l10n strings. +* | aa79b7044 Merge branch 'mkirk/shared-ui-db' +|\ \ +| * | 9aafd8997 Remove unused synthesized ivars +| * | ae1d82be8 Fix: input toolbar disappears when tapping media while edit menu is present +| * | e6c659d0f remove incorrect comment +| * | 6e6a7446d Use global readWrite connection +| * | 468f7524e Revert "separate read/write db connections" +| * | 00f8ea4ff Use a single ui connection to share cache. +| * | ddd39fcd3 separate read/write db connections +| * | d9172cccb Measure time to display +|/ / +* | 5da01c31a Merge branch 'mkirk/update-openssl' +|\ \ +| * | 51747deeb update openssl +|/ / +* | 5f66e1b0f Merge branch 'charlesmchen/buildWarnings' +|\ \ +| * | 6579857a4 Respond to CR. +| * | 879b9d4c7 Respond to CR. +| * | 6f0c1a975 Fix build warnings. +| * | 9a08afae2 Fix build warnings. +| * | 3cd6a33aa Fix build warnings. +|/ / +* | fae57008f Merge branch 'charlesmchen/conversationViewFirstResponderVsPresentedView' +|\ \ +| * | 5ed22ada7 Respond to CR. +| * | e4f7995e4 Ensure conversation view is first responder before presenting another view. +|/ / +* | 5ee33aca7 Merge branch 'charlesmchen/longGroupNameLabels' +|\ \ +| * | 23e2d971e Handle layout of long group name labels. +|/ / +* | b030bfb5b Fix constant in group invite by text warning. +* | d0ca160df Merge branch 'charlesmchen/backgroundCrashes' +|\ \ +| * | 40729dbdd Use background task while downloading profile avatar. +|/ / +* | 58ee518b2 Merge branch 'charlesmchen/callStateEdgeCases' +|\ \ +| * | ed19949d6 Respond to CR. +| * | e949d8156 Fix more call state edge cases. +| * | b2f884b88 Fix call state edge cases. +|/ / +* | 93a4502ee Merge branch 'oscarmv/EmptyHomeViewMargins' +|\ \ +| * | 39e12e1a6 Ensure that home view label wraps by word. +| * | 69b527254 More code review polish. +| * | 4b98352a3 Changes suggested by code review. Added iPhone 4 screen size to iPhoneX test so Signal doesn't blow up in iPad's iPhone compatibility mode. +| * | eedaea7b2 Fixed leading/trailing margins for empty home view label. +|/ / +* | 4fd3cf41c Merge branch 'charlesmchen/contactsPickerSort' +|\ \ +| * | 0498ceb82 Respond to CR. +| * | 1a2d10d2c Fix ordering of contacts picker. +|/ / +* | bef2e7b5c (tag: 2.26.0.9) Update l10n strings. +* | dea173606 "Bump build to 2.26.0.9." +* | 3385e478e Merge branch 'charlesmchen/groupTextWarning' +|\ \ +| * | b7b7a9a84 Respond to CR. +| * | b80d9ddbf Add warning before sending group message invites. +|/ / +* | eabcfbfa2 Merge branch 'charlesmchen/reportedApplicationState' +|\ \ +| * | 9ee572fb2 Respond to CR. +| * | fefc9843b Modify views to observe changes when active, not just foreground. +| * | 812210a63 Modify views to observe changes when active, not just foreground. +| * | d62725d3b Add reported application state. +|/ / +* | 1de5a7b55 Merge branch 'charlesmchen/iRateVsDead10cc2' +|\ \ +| * | f2fc2b900 Avoid 0xdead10cc crashes in iRate. +|/ / +* | fe1277440 Merge branch 'mkirk/loadForTextDisplay' +|\ \ +| * | aa0a31c25 Reduce viewWillAppear by ~5% by optimizing loadForTextDisplay +|/ / +* | 1cad81ee4 Merge branch 'mkirk/load-less-initially' +|\ \ +| * | 97324eaae Load less messages initially +|/ / +* | 9a731027a Merge branch 'mkirk/ignore-adhoc-tags' +|\ \ +| * | ab2ecf2f2 make failure more obvious +| * | eca2af03b Ignore adhoc tags in reverse_integration_check +|/ / +* | df6dbd571 Update cocoapods. +* | ad8a71356 Merge tag '2.25.2.4' +|\ \ +| |/ +| * 382c7333e (tag: 2.25.2.4, hotfix/2.25.2) "Bump build to 2.25.2.4." +| * 5361cd3f2 Fix dismissal issue in invite flow. +| * 9d5ce8474 (tag: 2.25.2.3) "Bump build to 2.25.2.3." +| * 3631935bb Update l10n strings. +| * 2b94de5d2 (tag: 2.25.2.2) "Bump build to 2.25.2.2." +| * 833c35f43 Merge branch 'charlesmchen/inviteFlow' into hotfix/2.25.2 +| |\ +| | * eecc823d8 (charlesmchen/inviteFlow) Fix invite flow. +| | * 63b545b34 Fix invite flow. +| |/ +| * d754228fd (tag: 2.25.2.1) "Bump build to 2.25.2.1." +| * 2ed80eb2d Update cocoapods. +| * 90f068119 (tag: 2.25.2.0) Update legal URL. +* | 2230f01d4 Merge branch 'mkirk/avoid-double-layout' +|\ \ +| * | 4f520646c Avoid double layout in conversation view; but carefully. +| * | 273063e0a ConversationView first load avoids redundant layout +|/ / +* | 82d13f551 (tag: 2.26.0.8) "Bump build to 2.26.0.8." +* | bcd9bd422 "Bump build to 2.26.0.7." +* | f07cb110b "Bump build to 2.26.0.6." +* | f1e8f14a9 Update l10n strings. +* | 0152381fc Update l10n strings. +* | 3d08f1fba Merge branch 'charlesmchen/callNavigationAnimations' +|\ \ +| * | 40879461b Suppress animations in nav bar around call window. +|/ / +* | e142aa43e Merge branch 'charlesmchen/sendWebSocketFailureBodies' +|\ \ +| * | 61ec865b6 Respond to CR. +| * | 4342b04bd Include response data in 'request over websocket' failures. +|/ / +* | 43848a8fe Merge branch 'charlesmchen/contactsAccessRevoked' +|\ \ +| * | 5e166c238 Respond to CR. +| * | 01cf2fc1b Clear the contacts cache if access to the system contacts is revoked. +|/ / +* | 295f720f9 Merge branch 'charlesmchen/swift4' +|\ \ +| * | f7abcc906 Respond to CR. +| * | 62273a60a Respond to CR. +| * | caad6f796 Clean up ahead of PR. +| * | f63d25a17 Migrate to Swift 4. +| * | 4d8c76478 Migrate to Swift 4. +| * | b2b62880c Migrate to Swift 4. +| * | 77b72b6b0 Migrate to Swift 4. +| * | da5ae63bb Migrate to Swift 4. +| * | 28e26e1f7 Migrate to Swift 4. +| * | 916d55c55 Migrate to Swift 4. +| * | 28f7142a5 Auto-migration to Swift 4. +| * | 6b39f73e6 Fix tests. +|/ / +* | 8063886a4 Merge branch 'charlesmchen/callViewButtonsVsAnimations' +|\ \ +| * | 40ef28795 Avoid spurious animation in call view buttons. +|/ / +* | 19ebc0f86 Merge branch 'charlesmchen/updateCocoapods' +|\ \ +| * | 003740d09 Update cocoapods. +|/ / +* | 6363d3109 Merge branch 'charlesmchen/canSendRequests' +|\ \ +| * | 4d498563e Unify the socket manager's 'can send requests' logic. +|/ / +* | c71081c87 Respond to CR. +* | dc4ad2b6d Merge branch 'charlesmchen/limitPartialContactFetchFix' +|\ \ +| * | bbf7ee451 (charlesmchen/limitPartialContactFetchFix) Limit the scope of the 'incomplete contacts fetch' fix. +|/ / +* | 146685232 Revert "Add temporary verbose logging around message creation." +* | 5f593bd73 Revert "Add temporary verbose logging around message creation." +* | 0aa830603 Revert "Add temporary verbose logging around message creation." +* | cc4f82cbf (tag: 2.26.0.5) "Bump build to 2.26.0.5." +* | 5b0d806a6 Add temporary verbose logging around message creation. +* | e8bb55a51 (tag: 2.26.0.4) "Bump build to 2.26.0.4." +* | f26ad5cd3 Add temporary verbose logging around message creation. +* | 0d3ba5ac2 (tag: 2.26.0.3) "Bump build to 2.26.0.3." +* | 7200a8dc4 Add temporary verbose logging around message creation. +* | c4fa6a1bb Merge branch 'charlesmchen/saeFixes' +|\ \ +| * | 21b54bee4 Fix breakage from recents changes in share extension. +|/ / +* | f87b71514 Merge branch 'charlesmchen/pccDeinit' +|\ \ +| * | 2a4ecd42c Fix crashes while deallocating PeerConnectionClient. +| * | 86e038436 Fix crashes while deallocating PeerConnectionClient. +| * | 8d9c81156 Fix crashes while deallocating PeerConnectionClient. +| * | fff9f74a0 Fix crashes while deallocating PeerConnectionClient. +|/ / +* | 08affb440 Merge branch 'hotfix/2.25.2' +|\ \ +| |/ +| * bb44a8bb5 Merge branch 'mkirk/policy-links' into hotfix/2.25.2 +| |\ +| | * 9a34c6804 policy links +| |/ +| * 8cb444088 "Bump build to 2.25.2.0." +| * 4e0ce3dbe (tag: 2.25.1.1) "Bump build to 2.25.1.1." +| * 54cc2142a Merge branch 'mkirk/start-migrated-disappearing-timers' into hotfix/2.25.1 +| |\ +| | * 84776f275 Start timers for migrated messages +| |/ +| * 3a2efb62a (tag: 2.25.1.0) Merge branch 'charlesmchen/legacyOutgoingMessageState' into hotfix/2.25.1 +| |\ +| | * 1343e4bc1 Preserve legacy outgoing message state; special case contact thread messages. +| |/ +| * 8abc3a8c4 "Bump build to 2.25.1.0." +* | 89c15815c Merge branch 'charlesmchen/callViewBackButtonChanges' +|\ \ +| * | fbd03a3fd Apply design for call view back button. +|/ / +* | e0db39b30 Merge branch 'mkirk/time-out-call' +|\ \ +| * | caa9e3ca6 Show missed call when call times out +|/ / +* | c9f4b34d6 Merge branch 'mkirk/resize-call-navbar' +|\ \ +| * | fc34a0643 CR: annotate device constants +| * | 36ee6af62 respond to CR +| * | b8707b6fa WIP: call view changes +| * | 20424d9a7 remove debug code, reorder for clarity +| * | fe62a6ac9 CNContactController needs to be presented in a navcontroller with a translucent navbar. +| * | 2709a91b5 Fixup attachment approval vis-a-vis call banner +| * | 4f8010023 Tapping on status bar returns to call +| * | 4c9808d1a Fix iPhoneX layout show status bar above call banner +| * | 3383c5e80 Fixup for iPhoneX +| * | 778e11c2c cleanup ahead of PR +| * | 7ad5f1544 Restore cancleable back gesture for those VC's that use it +| * | 49c652ad1 Comment cleanup +| * | 1b6071675 Stop worrying about notification order by using delegate pattern +| * | d9d0227ce Align search bar to safe area insets +| * | 319a6ff76 fixup behavior on iOS10 +| * | 6c7af671b call banner above status bar for now +| * | 29d08545e Use OWSNavigationController instead of UINavigationController +| * | 33eb4c38c Centralize translucency configuration +| * | 12c98f434 cleanup and move to OWSNavigationController +| * | a2b179326 initial render is wrong, but settles somewhere nice +| * | 3a9391f4f notes on what didn't work +| * | 4dbd14ac4 WIP navbar resize +| * | 0e87cbe7a WIP navbar resize +| * | ffe17a3fc add guard to avoid redundant show, fix logic in existing guard when hiding. +| * | 2258e18d3 rename for clarity +| * | 91cd1af3f Extract ReturnToCallViewController +| * | a7252544b WIP: custom navbar +| * | 772af10e5 Resizing call banner window +| * | e62fe87b0 show status bar *above* call window +| * | 94323baba tmp - mute hides callscreen +|/ / +* | b5c290afd Merge branch 'michaelkirk/requestIdProtos' +|\ \ +| * | 966b1ac84 Treat `id` as reserved word, use consistent setter style +|/ / +* | a5fd119c1 (tag: 2.26.0.2) "Bump build to 2.26.0.2." +* | fedb5d938 Merge branch 'charlesmchen/callTerminationBug' +|\ \ +| * | a722bcde7 Fix call termination reference. +|/ / +* | 9eb17c3fd (tag: 2.26.0.1) "Bump build to 2.26.0.1." +* | 1afaa9d65 Merge branch 'charlesmchen/websocketProfileGets' +|\ \ +| * | bb19505c6 Make profile gets over websocket. +|/ / +* | 69b6eb9f4 Merge branch 'charlesmchen/weakPeerConnectionClient' +|\ \ +| * | bfb87582f Respond to CR. +| * | 735b4e07b Respond to CR. +| * | 918abb02a Remove capture of self. +| * | 9c0c87a8c Remove capture of self. +| * | 7eab0569b PeerConnectionClient thread safety. +| * | 078da69ee PeerConnectionClient thread safety. +| * | 9075a12ac PeerConnectionClient thread safety. +| * | c2f1a12d9 PeerConnectionClient thread safety. +| * | 88c2ff26e PeerConnectionClient thread safety. +| * | e63a7f8fb PeerConnectionClient thread safety. +| * | c3e8fde24 PeerConnectionClient thread safety. +| * | 1a0347b78 PeerConnectionClient thread safety. +| * | 729769afa PeerConnectionClient thread safety. +| * | a4a5e9953 PeerConnectionClient thread safety. +|/ / +* | d4fe67126 Respond to CR. +* | ebd24feff Merge branch 'charlesmchen/websocketRequests' +|\ \ +| * | 60d472c9b Update cocoapods. +| * | 0a4168437 Respond to CR. +| * | dc36ae134 Respond to CR. +| * | 1a441cc40 Respond to CR. +| * | 6a1bb3f04 Add web sockets protos to proto make file. +| * | b50561a5b Use websocket for sends. +| * | 5ff984ab1 Use websocket for sends. +| * | fa36f2fb1 Use websocket for sends. +| * | 8a76e778b Use websocket for sends. +| * | 5f1682dea Use websocket for sends. +|/ / +* | fb3efe364 Update ISSUE_TEMPLATE.md +* | 57008b7ad Update ISSUE_TEMPLATE.md +* | f33a845f2 Update ISSUE_TEMPLATE.md +* | fbfa5e6de Update MAINTAINING.md +* | 5d312220a Update the contribution guidelines. +* | 9155a82b6 "Bump build to 2.26.0.0." +* | d3d4157c2 Merge branch 'charlesmchen/callLifecycleEdgeCases' +|\ \ +| * | 1d8c64234 Respond to CR. +| * | a5c42ecca Clean up ahead of CR. +| * | f68f3cc53 Call lifecycle edge cases. +| * | 3967a5ab0 Call lifecycle edge cases. +|/ / +* | 6e0d92e03 Revert "Disable contact sharing." +|/ +* ff4c58cd6 (tag: 2.25.0.28) "Bump build to 2.25.0.28." +* efb0769c6 Disable contact sharing. +* 1ce304d05 (tag: 2.25.0.27) "Bump build to 2.25.0.27." +* a7aaa7f6b Merge branch 'charlesmchen/groupAvatarUpdates' +|\ +| * e2d9c1187 Fix "group avatar doesn't update after local change." +|/ +* 2f8b5b8ea Move app state check to main thread. +* 7254d9260 Revert "Disable contact sharing." +* 0b6b80fea (tag: 2.25.0.26) "Bump build to 2.25.0.26." +* cb603d0ba Disable contact sharing. +* 4d2075794 (tag: 2.25.0.25) "Bump build to 2.25.0.25." +* cc1ccb7f9 Update l10n strings. +* be5a80e65 Merge branch 'mkirk/disappearing-10deadcc' +|\ +| * c0ddcc791 Only clean up messages while active +|/ +* 4080545d8 Merge branch 'mkirk/lowercase-contact-field-labels' +|\ +| * b1e06217b Consistently lower-case contact field headers +|/ +* a48cc8d65 Merge branch 'charlesmchen/normalizeImageColorSpace' +|\ +| * 0620cb60d Normalize image colorspace. +|/ +* 946240fb6 Merge branch 'charlesmchen/readVsVisible2' +|\ +| * 692d0a757 Don't mark messages as read if conversation view isn't 100% visible. +| * 78de7a10f Don't mark messages as read if conversation view isn't 100% visible. +|/ +* 18f3bf535 Merge branch 'mkirk/phone-number-display-name' +|\ +| * c72d45dc9 Fall back to phone number for picker cell display name +|/ +* 8d1d62b61 Merge branch 'mkirk/profile-avatar-in-contact-picker' +|\ +| * 2098ec570 Contact picker uses profile pic, when available. +|/ +* 87a25804d Merge branch 'mkirk/fix-send-with-no-number' +|\ +| * f2750d18c Don't send empty contact card with just avatar +|/ +* ddcca73aa Merge branch 'mkirk/fix-localizations' +|\ +| * af8ddf7bf Use raw text when localization fails +|/ +* 7ccb2df33 Merge branch 'charlesmchen/contactShareAvatar' +|\ +| * db1c8fd9f Respond to CR. +| * c800ae381 Make contact share "bubble/card" reflect share contents. +| * f436fc19c Make contact share "bubble/card" reflect share contents. +|/ +* 3cdce13b4 Merge branch 'charlesmchen/sortGroupMembers' +|\ +| * 2edabdbba Sort group members. +|/ +* cbc27f1c3 Revert "Disable contact sharing." +* 762a03dac (tag: 2.25.0.24) "Bump build to 2.25.0.24." +* 2b6b8c2f6 Disable contact sharing. +* 7b7435c3a (tag: 2.25.0.23) "Bump build to 2.25.0.23." +* 73ea9d245 Update l10n strings. +* fb3790ed6 Merge branch 'charlesmchen/asyncNetworkRequests' +|\ +| * 1a3737d5c Respond to CR. +| * 530983c16 Build & enqueue network requests async. +|/ +* 7a37b3d0b Merge branch 'charlesmchen/readVsVisible' +|\ +| * f6106512d Only mark messages read in conversation view if visible. +|/ +* e908413c1 Merge branch 'charlesmchen/peerConnectionClientDelegateCleanup' +|\ +| * 157f7617c Respond to CR. +| * 3d5cbb73f Rework cleanup of peer connection client delegates. +|/ +* 547605885 Merge branch 'mkirk/localize-all-phone-types' +|\ +| * f652ecef9 localize _Main_ and other CN label types +|/ +* a62e86c7a Revert "Disable contact sharing." +* 3f5d8aa9b (tag: 2.25.0.22) "Bump build to 2.25.0.22." +* e27af7a66 Disable contact sharing. +* 5d4b34504 Merge branch 'mkirk/return-navigation-bars' +|\ +| * c3274f4e7 Fix navbar after using message button in contact card +|/ +* 986e3e092 Revert "Disable contact sharing." +* 398865446 (tag: 2.25.0.21) "Bump build to 2.25.0.21." +* e138c73bd Disable contact sharing. +* 443b3c288 Merge branch 'charlesmchen/profileKeyProtos' +|\ +| * b74f545a6 Fix profile key protos. +|/ +* 4ba0fde3e Merge branch 'mkirk/mark-as-read-fix' +|\ +| * 54f737303 Clean up logging, start messages timer regardless of current configuration +|/ +* 68d70da19 (tag: 2.25.0.20) "Bump build to 2.25.0.20." +* c14a021ae Update l10n strings. +* 127224ad2 Merge branch 'mkirk/resume-read-timer-on-activation' +|\ +| * 30cef1f08 start readtimer whenever we become active +|/ +* 90289bbf7 Merge branch 'mkirk/nav-bar-style' +|\ +| * 117d7319d Add contact modally and restore navbar style when dismssing contacts +|/ +* 4949ade27 Revert "Disable contact sharing." +* a376de01e (tag: 2.25.0.19, origin/release/2.25.0) "Bump build to 2.25.0.19." +* bf205c9df Merge branch 'charlesmchen/unregisteredUsers' +|\ +| * e6dceffdb Respond to CR. +| * 5c7b98e5c Improve handling of unregistered users. +|/ +* d81e40069 Update l10n strings. +* e8b41789d Disable contact sharing. +* 51da7ebdf (tag: 2.25.0.18) "Bump build to 2.25.0.18." +* 115e6b4c4 Merge branch 'charlesmchen/sendToSentMarkAsSent' +|\ +| * 8489c55fd Mark send-to-self as sent. +|/ +* 9fbcd790f Merge branch 'mkirk/fix-cancel-add-crash' +|\ +| * 704a6f55a Fix crash after canceling "Add New Contact" +|/ +* ba95034ce Merge branch 'charlesmchen/avatarSeed' +|\ +| * 152e1d798 Respond to CR. +| * ca09d00e2 Use signal id as avatar color seed if possible. +|/ +* 6ccce6754 Merge branch 'charlesmchen/loadViewVsScreenLock' +|\ +| * edabe5067 Respond to CR. +| * a26cba3de Don't show screen block until app is ready. +|/ +* 726da0ca9 Merge branch 'charlesmchen/homeViewFixes' +|\ +| * aa4345f9c Fix edge cases in home view. +|/ +* 53fb8787f Merge branch 'charlesmchen/caseInsensitiveContactSort' +|\ +| * 0b488f1a6 Use case-insensitive comparison when sorting contacts. +|/ +* ed872beda Merge branch 'charlesmchen/noEcho' +|\ +| * 9c2f61913 Don't echo messages sent to self 1:1. +|/ +* ad6908174 (tag: 2.25.0.17) "Bump build to 2.25.0.17." +* 6b643a0c1 Avoid spurious badge animations. +* 2c80866f8 (tag: 2.25.0.16) "Bump build to 2.25.0.16." +* 867b3484d Update l10n strings. +* ca03203b9 Merge branch 'charlesmchen/debugNotifications2' +|\ +| * 81a40909f Respond to CR. +| * 993600363 Respond to CR. +| * 9a4889c4f Simplify debug notifications. +| * 1a170ba48 Simplify debug notifications. +|/ +* b9c852378 Merge branch 'charlesmchen/saeLiveImageCrash' +|\ +| * 73206c08a Respond to CR. +| * 56b91ddeb Clean up ahead of PR. +| * b62d6900d Fix crash converting images in SAE. +|/ +* 744a3b8be (tag: 2.25.0.15) "Bump build to 2.25.0.15." +* 3579621db Improve logging around home view selection. +* f55012e67 Merge branch 'charlesmchen/debugNotifications' +|\ +| * 4a4882ebe (charlesmchen/debugNotifications) Add debug notification. +|/ +* 408b8d01c Merge branch 'charlesmchen/multipleLocalNotifications' +|\ +| * a3c853066 (charlesmchen/multipleLocalNotifications) Respond to CR. +| * f95151ac8 Don't present multiple converastion views ever. +| * 940161e62 Don't process multiple local notifications. +|/ +* b751a3253 (tag: 2.25.0.14) "Bump build to 2.25.0.14." +* faf15e3c8 Update l10n strings. +* ccc64e62b Fix l10n strings. +* 6ab0d81c3 Merge branch 'mkirk/contact-reply' +|\ +| * 2cc3eabdb quote reply to contact share (no avatar) +|/ +* 742492dd3 remove redundant protocol definition +* 5a8000187 Merge branch 'charlesmchen/mergeOrganizationName' +|\ +| * 8cdb75d52 (charlesmchen/mergeOrganizationName) Respond to CR. +| * 8337c3bd6 Refine contact merging. +|/ +* 8eef940ba Merge branch 'charlesmchen/addToContactsAlways' +|\ +| * c05c1ac87 (charlesmchen/addToContactsAlways) Always show 'add to contacts' button. +|/ +* 52b502138 Merge branch 'mkirk/show-avatar-in-approval' +|\ +| * d1c33921b Show avatar in contact approval view +|/ +* 46ce2d6f8 Merge branch 'charlesmchen/shareContactSinglePresentation' +|\ +| * acdc51ba3 Respond to CR. +| * 37b8b368a Show "share contact" flow in single presented navigation controller. +|/ +* 0f535217a Merge branch 'charlesmchen/contactViewStatusBar' +|\ +| * cb7f28ed3 Use dark status bar in contact view. +|/ +* 61343f665 Merge branch 'charlesmchen/contactNames_' +|\ +| * 646049366 Surface organization name in contact view. +| * aa7cc4633 Rework contact names. +|/ +* 6ecaf01b9 Merge branch 'mkirk/contact-sharing-via-sae' +|\ +| * 407ec997a Add comment per CR +| * 763131522 Remove unused code +| * a16040f19 Fix avatar sending in SAE +| * adabf0273 Fix contact sharing (Avatar TODO) +|/ +* e52045199 Merge branch 'mkirk/cleanup-share-avatars' +|\ +| * ed2945126 Remove contact share avatars upon message deletion +|/ +* efa3c81f6 Merge branch 'mkirk/contact-merging' +|\ +| * c15fea4ec merge avatar with existing +| * 95b93115f Code formatting +| * bf37f4116 Move CNContact logic into our system contact adapter +| * 0c469764f re-use contact picker for "add to existing" +| * 609746abe clarify naming +|/ +* 69aeb041b Merge branch 'mkirk/codecleanup-contact-sync' +|\ +| * b1f332451 cleanup contact syncing +|/ +* d0d9d5456 (tag: 2.25.0.13) "Bump build to 2.25.0.13." +* 31bea605f Merge branch 'charlesmchen/contactViewActions' +|\ +| * 65a516685 Fix l10n strings. +| * b4d24f1c7 Refine field actions in contact view. +|/ +* e04e063fc Merge branch 'charlesmchen/contactShareErrors' +|\ +| * 3bb9e922d Surface contact share errors to user. +|/ +* dad3d2b51 Merge branch 'charlesmchen/contactShareAssets2' +|\ +| * 4079cdb60 Apply more contact share assets. +|/ +* b7946fa90 Merge branch 'charlesmchen/contactShareDynamicTypeRTL' +|\ +| * 0b8d9991e Respond to CR. +| * f77731eb7 Fix h margins in "edit contact share name" view. +| * ff3524fb0 Improve contact share message bubble layout with large dynamic type sizes. +|/ +* b4ef8afbf (tag: 2.25.0.12) "Bump build to 2.25.0.12." +* 6d5263689 Merge branch 'mkirk/return-navbar' +|\ +| * ad4e4b0c4 return navbar after tapping message/call buttons +|/ +* f6c5141cb (tag: 2.25.0.11) "Bump build to 2.25.0.11." +* e5258770a Merge branch 'mkirk/cleanup-contact-share-view-helper' +|\ +| * 42109593a Remove `fromViewController` state from ContactShareViewHelper +| * 77bbbad70 Remove `contactShare` state from ContactShareViewHelper +| * 0265787dd (tag: 2.25.0.10) "Bump build to 2.25.0.10." +| * 37da52413 Fix contact share protos: display name, organization name. +| * 0b90c094a (tag: 2.25.0.9) "Bump build to 2.25.0.9." +| * 946cc114e Update l10n strings. +|/ +* 6c84f6eef Merge branch 'charlesmchen/contactActionsAndPhoneNumberParsing' +|\ +| * c2adf624e Respond to CR. +| * 44ceee584 Add contact share actions to conversation view and improve phone number parsing. +|/ +* 445c10a7e Merge branch 'mkirk/first-responder' +|\ +| * 7e22d9e90 Prevent input toolbar from appearing over camera view, contact view or actionsheet +| * 353abfc13 Views presented from ConversationVC must become first responder. +| * 41aa7eafe makeKeyAndVisible restores first responder, so no need to track it ourselves. +|/ +* 882098e9c Merge branch 'charlesmchen/contactShareAssets' +|\ +| * 01bfa8dfc Apply contact share assets. +|/ +* 5a3c37458 Merge branch 'charlesmchen/faceIDUsageDescription' +|\ +| * 9e4922402 Add usage description for Face ID. +|/ +* 4d65646dc Merge branch 'mkirk/no-reply-from-gallery' +|\ +| * fda5d6567 Avoid crash - reply only works from ConversationVC +|/ +* ac458197a Merge branch 'mkirk/fix-spurious-disabled-timer-messages' +|\ +| * 98aa05449 Avoid spurious "Disabled Disappearing Messages" +|/ +* 7ca07d61d (tag: 2.25.0.8) "Bump build to 2.25.0.8." +* e261b6fcd Merge branch 'mkirk/fix-attachment-building' +|\ +| * d3cda951e Fix/Simplify outgoing attachment proto building +|/ +* 73102a996 Merge branch 'charlesmchen/shareContactsFromShareExtension' +|\ +| * 41f4b0866 Respond to CR. +| * bd116f893 Share contacts from share extension. +|/ +* c56362cee (tag: 2.25.0.7) "Bump build to 2.25.0.7." +* d1e2fbd99 Merge branch 'charlesmchen/editContactShareView2' +|\ +| * 7f1cbd927 Respond to CR. +| * 3092e4e3f Update design of 'approve contact share' view. +| * 50c49baca Update design of 'approve contact share' view. +| * b0c4ad7f6 Apply design changes from Myles. +| * 4e0789585 Apply design changes from Myles. +| * 5f1941f6a Apply design changes from Myles. +|/ +* b7634c650 Merge branch 'mkirk/contact-share-avatars' +|\ +| * a10ae1835 respond to code review +| * 45f91ead4 Use actual avatar in ContactViewController +| * 77fc5571f Implement avatar sending +| * eb97e82d1 fixup debug UI +| * 5ba5e9826 Show downloaded contact avatar in thread +| * 48b4791b1 Download avatar attachment stream +|/ +* 8c4a6c174 Merge branch 'mkirk/no-singleton' +|\ +| * 3fdf703a6 PhoneNumberUtil is no longer a singleton +|/ +* d32545fc2 Merge branch 'mkirk/become-consistent-with-timer' +|\ +| * 9e1a3a0da Consider off/on in addition to duration when becoming consistent +|/ +* 4b6239f49 Fix build breakage. +* 5c63f7f25 Merge branch 'charlesmchen/skippedSends' +|\ +| * e7eaa7945 Handle completely skipped message sends. +|/ +* e63014ccf Merge branch 'charlesmchen/phoneParsingThreadSafety' +|\ +| * 043218fb9 Ensure thread safety in phone parsing logic. +|/ +* 4bf08280d Merge branch 'charlesmchen/editContactShareView' +|\ +| * 7c3991ebd (charlesmchen/editContactShareView) Respond to CR. +| * ba74e3857 Clean up ahead of PR. +| * 2c6f18fa6 Clean up ahead of PR. +| * 60c376452 Clean up ahead of PR. +| * fd93bf677 Clean up ahead of PR. +| * 7a9acce50 Add contact share approval view. +| * 6e18d84a1 Add contact share approval view. +| * 0c745dd98 Add contact share approval view. +|/ +* 4fcbfe0e1 Fix merge breakage. +* 8622dba39 Merge branch 'charlesmchen/contactShareDesign' +|\ +| * 1fc401d20 Respond to CR. +| * bff6c8440 Clean up ahead of PR. +| * b37588fc4 Provide default labels for custom contact fields. +| * 72102cd5f No navigation bar in Contact view, custom back button, fix scrolling. +| * 575573ef6 Let users pick recipient id for actions in contact view. +| * 1a1a043b2 Format phone numbers of contacts. +| * dcf7a0598 Use default avatars for contact shares in contact view. +| * 66989b8db Use default avatars for contact shares in conversation view. +|/ +* dbbd35f92 Merge branch 'charlesmchen/queueSystemContactFetch' +|\ +| * f9d5421ed Modify system contacts fetch to use serial queue. +| * bec5a9f42 Revert "oOnly one system contacts fetch at a time." +| * b767996db oOnly one system contacts fetch at a time. +|/ +* e1a078900 (tag: 2.25.0.6) "Bump build to 2.25.0.6." +* 00181479e Update l10n strings. +* 80b1bfacf Merge branch 'mkirk/debug-disappearing' +|\ +| * a01164e8b (private/mkirk/debug-disappearing) Add canary assert +| * ecf767ea5 canary assert +| * 1dd8c4177 Only touch messages which have been read. +| * 24f3362df ensure expirations started +| * ed3db5097 clarify naming +|/ +* 0b8daaba2 Merge branch 'mkirk/fix-info-message-ordering' +|\ +| * 242cc1138 A few lingering places were ordered with their envelope timestamp +|/ +* 3ad0b0ad6 Merge branch 'charlesmchen/sendFakeContacts' +|\ +| * 8e84f8923 Respond to CR. +| * 8dc333346 Send fake contact shares. +| * 390c0bc20 Send fake contact shares. +| * c53b2934a Send fake contact shares. +| * 612df0a02 Send fake contacts. +|/ +* d4bec2d06 Merge branch 'charlesmchen/contactSharingFeatureFlag' +|\ +| * 459101c20 Add feature flag for contact sharing. +| * f4ee68840 Add feature flag for contact sharing. +|/ +* 36abd6ab7 Merge branch 'mkirk/media-title-view' +|\ +| * b32a1d507 Fix media page title view on iOS9/10 +|/ +* ed7fe90e1 Merge branch 'charlesmchen/contactView' +|\ +| * ff6b45abe (charlesmchen/contactView) Respond to CR. +| * 1d56d56ca Clean up ahead of PR. +| * 91d54360b Add contact view. +| * fa5577eec Create contact view. +| * 2738bcbc5 Create contact view. +|/ +* 9c661b220 Merge branch 'mkirk/errant-input-toolbar' +|\ +| * e604437e2 Don't become first responder while presenting +|/ +* fff7b1196 Merge branch 'mkirk/new-loading-screen' +|\ +| * d98341697 format debug stats +| * f782ea97d Use loading screen whenever launch is slow. +|/ +* f2cc8cf9d Merge branch 'charlesmchen/contactSharePreviews' +|\ +| * 00eadd629 (charlesmchen/contactSharePreviews) Text previews for contact shares. +|/ +* 424bcbf83 Merge branch 'mkirk/contact-share' +|\ +| * 5c0c01dea (origin/mkirk/contact-share) Contact picking +|/ +* 0e858bc09 Merge branch 'charlesmchen/contactShareMessageBubble' +|\ +| * 411d5a3b4 (charlesmchen/contactShareMessageBubble) Respond to CR. +| * 783bf5b81 Clean up ahead of PR. +| * 708b44e3c Improve handling of contact display names. +| * 7e35a7e7d Sketch out rendering of contact shares in conversation view. +|/ +* 87abeb80b Merge branch 'ios-flip-camera' +|\ +| * 0ab8fc277 Proper flip asset +|/ +* 6fcbf0529 Merge branch 'mkirk/remove-assert' +|\ +| * d67a3b416 WORKS GREAT +|/ +* fff60e9bd Merge branch 'charlesmchen/contactNormalizationValidation' +|\ +| * d1f6118e6 Rework contact normalization and validation. +|/ +* d7cc7384e (tag: 2.25.0.5) "Bump build to 2.25.0.5." +* 11591416e Merge branch 'charlesmchen/contactShareModel' +|\ +| * 1520422b2 (charlesmchen/contactShareModel) Respond to CR. +| * 0316a98eb Undo renaming of contactShare property of TSMessage. +| * 147368913 Gather all contact conversion logic in OWSContacts. +| * ee9a13cdf Update cocoapods. +| * bd7c8e4a4 Add conversion methods between vcard, system contacts and ows contacts. +| * 0d8cfc540 Rename contact share class to contact. +| * 796958d87 Elaborate contact conversion. +| * e22e9a784 Populate contact share protos. +| * 757234d30 Populate contact share protos. +| * 2a63423c3 Elaborate fake contact shares. +| * c854cc3de Fix fake contact share message creation. +| * 521013a67 Fix contact share property synthesis. +| * 7490a55f6 Sketch out "contact share" model. +| * 4b8a2fa8a Sketch out "contact share" model. +| * 600574785 Update protos to reflect 'share contact'. +|/ +* 46354cdb1 Merge branch 'charlesmchen/noArchivedThreads' +|\ +| * 2fe7596e0 (charlesmchen/noArchivedThreads) Only show archived threads UI if there are archived threads. +| * 6ab48cec9 Only show archived threads UI if there are archived threads. +|/ +* f65757a1e Merge branch 'charlesmchen/outgoingMessageFixes' +|\ +| * bb9645407 More outgoing message fixes. +|/ +* f028627b4 Merge branch 'charlesmchen/systemCellMeasurement' +|\ +| * 2e06ebfe1 Fix system cell layout. +|/ +* 4d100ccb9 Merge remote-tracking branch 'origin/hotfix/2.24.1' +|\ +| * 9cdf489ac (tag: 2.24.1.0, origin/hotfix/2.24.1) Merge branch 'charlesmchen/corruptDatabaseViews' +| * c5e7b10bd Merge branch 'charlesmchen/dbMigrationsVsStorageReadiness' +| * bec7235d5 "Bump build to 2.24.1.0." +* | 7d08bef8a (tag: 2.25.0.4) "Bump build to 2.25.0.4." +* | 479c9f95a Merge branch 'charlesmchen/outgoingMessageStateFixes' +|\ \ +| * | 752bca313 (charlesmchen/outgoingMessageStateFixes) Fix glitches in outgoing messages. +|/ / +* | 2ebd2f65d Merge branch 'charlesmchen/shareContactProtos' +|\ \ +| * | 8dbe4387b (charlesmchen/shareContactProtos) Update protos to reflect 'share contact'. +|/ / +* | 0131b8de2 Update cocoapods. +* | 81ed1ac79 Merge branch 'charlesmchen/homeViewReference' +|\ \ +| * | 371718f72 (charlesmchen/homeViewReference) Fix global reference to 'inbox' home view. +|/ / +* | 91f5460a0 (tag: 2.25.0.3) "Bump build to 2.25.0.3." +* | 8ae956bba Update l10n strings. +* | afeddb3b8 Merge branch 'charlesmchen/outgoingMessageStatusFixes' +|\ \ +| * | f16e9a292 (charlesmchen/outgoingMessageStatusFixes) Fix issues in outgoing messages status changes. +| * | 5c6f9ec08 Fix issues in outgoing messages status changes. +|/ / +* | 945ab7e4a Merge branch 'mkirk/profile-pic-in-conversation' +|\ \ +| * | 45be54f7a (mkirk/profile-pic-in-conversation) Design polish for the "profile pic in conversation view" and "archived conversations in home view." +| * | b70269579 cleanup +| * | 55e19b55b Fix layout for iOS9/10 +| * | 7a1d24a9a Avatar updates when contact/profile/group photo changes +| * | b1bff7114 WIP moving to stackview backed header view in conversation view +| * | 3d766e4cf Replace ConversationHeaderView with stack view in Media Gallery +|/ / +* | 37f653a7f Merge branch 'charlesmchen/fixCallHangupCrashes' +|\ \ +| * | 28063574d (charlesmchen/fixCallHangupCrashes) Fix call hangup crashes. +|/ / +* | 802379b4b (tag: 2.25.0.2) "Bump build to 2.25.0.2." +* | 9e60a0114 Merge branch 'charlesmchen/dynamicTypeFixes' +|\ \ +| * | 251ce29a8 (charlesmchen/dynamicTypeFixes) Fix dynamic type issues in home view cells. +| * | 5a42bf0ff Fix dynamic type issues in home view cells. +| * | fb0c47aa1 Fix dynamic type issues. +|/ / +* | 023d40e23 Merge branch 'charlesmchen/nudgeDatabaseUpgradeWarning' +|\ \ +| * | 323355468 (charlesmchen/nudgeDatabaseUpgradeWarning) Show database upgrade warning while launching v2.25 or later. +|/ / +* | ec180e8b6 Merge branch 'charlesmchen/fixSyncTranscripts' +|\ \ +| * | 8f19622a8 (charlesmchen/fixSyncTranscripts) Fix sync transcripts. +|/ / +* | cf532b9cb (tag: 2.25.0.1) "Bump build to 2.25.0.1." +* | 1efbc26e2 Fix build break. +* | 789595f6c (tag: 2.25.0.0) Update l10n strings. +* | 79ccc015a Fix missing l10n strings. +* | 015a531ab "Bump build to 2.25.0.0." +* | 3291ca66c Merge branch 'charlesmchen/outgoingMessageState' +|\ \ +| * | 5773b4534 (charlesmchen/outgoingMessageState) Respond to CR. +| * | c75c3d5f9 Respond to CR. +| * | 204d37960 Respond to CR. +| * | 55916e84c Respond to CR. +| * | 4de4a4b22 Respond to CR. +| * | 594e12f23 Respond to CR. +| * | 40ac0daa9 Respond to CR. +| * | 6486b9941 Clean up ahead of PR. +| * | 4b83b4afc Rework outgoing message state. +| * | 9e6062f21 Rework outgoing message state. +| * | 9275c6781 Rework outgoing message state. +|/ / +* | 56c53cdff Merge branch 'mkirk/flip-camera' +|\ \ +| * | 1967b5d29 "Reconnecting..." fixup +| * | e5b535ccf Implement camera direction toggle +| * | 6a4aff0b9 Add flip camera button (non-functioning) +|/ / +* | 040e3b88b Merge branch 'charlesmchen/callVsText' +|\ \ +| * | baa6f2713 (charlesmchen/callVsText) Update Cocoapods. +| * | 61cd5805f Improve 'return to call' window layout. +| * | d7ae6fbbf Respond to CR. +| * | 1d94c2da7 Improve comments. +| * | 6786c7723 Update cocoapods. +| * | 882d1ac61 Clean up ahead of PR. +| * | 9e1021f1a Clean up ahead of PR. +| * | f4439f8af Present calls using window manager. +| * | 17fce2fdd Present calls using window manager. +| * | 6a8796ad0 Present calls using window manager. +| * | 7345ab2e4 Add window manager. Move call view to a separate window. +| * | 9364af9b8 Make screen block view first responder. +|/ / +* | 6ccf93e92 Merge branch 'charlesmchen/corruptDatabaseViews' +|\ \ +| * | aa35594ad (charlesmchen/corruptDatabaseViews) Respond to CR. +| * | 67f2d6608 Detect and handle corrupt database views. +| * | 1a4c01ae2 Detect and handle corrupt database views. +| * | 212891c50 Detect and handle corrupt database views. +| * | f70a45ef1 Clean up ahead of PR. +| * | 50a59c907 Detect and handle corrupt database views. +| * | d3b484482 Detect and handle corrupt database views. +|/ / +* | 66459af99 Merge branch 'mkirk/long-text-scroll-margin' +|\ \ +| * | 0dd12f96e scrollbar should be on right edge, while leaving margin between text and superview +|/ / +* | 107a1ff9c Clean up system contacts fetch. +* | d3fb5d321 Fix build break. +* | 0bead4c68 Merge branch 'charlesmchen/corruptMessageNotifications' +|\ \ +| * | 89abe79c7 Respond to CR. +| * | c5981b164 Notify users of corrupt messages. +|/ / +* | 371b247b4 Merge branch 'charlesmchen/contactsCrash' +|\ \ +| * | fa9a4c808 Simplify usage of contacts framework. +|/ / +* | 8428bd81d Merge branch 'charlesmchen/dbMigrationsVsStorageReadiness' +|\ \ +| * | 7f23dfa25 Respond to CR. +| * | eb3569d8f Don't start app version migrations until storage is ready. +| * | 2265ae08a Don't start app version migrations until storage is ready. +|/ / +* | 2c1e63391 Merge branch 'charlesmchen/archivedConversations' +|\ \ +| * | 1395a6c37 Respond to CR. +| * | e252447cf Clean up ahead of PR. +| * | 21ab670fc Clean up ahead of PR. +| * | fe9a61117 Rework archived conversations mode of home view. +| * | 9c7e9b795 Rework archived conversations mode of home view. +| * | af2539f47 Rework archived conversations mode of home view. +|/ / +* | e66e5b0b9 Merge branch 'mkirk/unjank-homescreen' +|\ \ +| * | f5e810e82 CR: rename ThreadModel -> ThreadViewModel +| * | d1230abdc Fix type declaration +| * | 1f63ce02a Increase cache, remove dead code, add debug logging +| * | b3cd6a112 Add OWSJanksUI assertion +| * | 90dda0bf9 SEPARATE: Use non-signal contact's full name +| * | 113cb254d fixup cache +| * | 9c81eb44a Replace remaining UI usage of `interaction.description` +| * | 897d4a925 HomeView caches thread models +| * | 5f2b38c50 Introduce Thread view model +| * | 1fb1b5bbe WIP unjank home screen +|/ / +* | 7912598cc Merge branch 'release/2.24.0' +|\ \ +| |/ +| * f4adea4e3 (tag: 2.24.0.10, private/release/2.24.0, origin/release/2.24.0, release/2.24.0) "Bump build to 2.24.0.10." +| * af418a98b Merge branch 'charlesmchen/iRateCrashes' into release/2.24.0 +| |\ +| | * f3de6b524 (charlesmchen/iRateCrashes) Ensure iRate synchronizes when active. +| | * fe6e79761 Ensure iRate synchronizes when active. +| |/ +| * 661f48c6d Merge branch 'charlesmchen/debugLogUploaderNPE' into release/2.24.0 +| |\ +| | * c1879250d (charlesmchen/debugLogUploaderNPE) Fix NPE in debug log uploader. +| | * b4fc0cddc Fix NPE in debug log uploader. +| |/ +| * 2c60a5749 Update l10n strings. +| * bc5a86254 Update screen lock settings copy. +| * 83a9c1e9e Merge branch 'charlesmchen/saeScreenLock' into release/2.24.0 +| |\ +| | * 08d36aa86 (charlesmchen/saeScreenLock) Add screen lock UI to SAE. +| |/ +| * 9bb2f3855 Merge branch 'mkirk/design-tweaks' into release/2.24.0 +| |\ +| | * 8e5617509 CR: unread badge updates w/ dynamic text change +| | * 8ca62a8d4 Align top row by baseline +| | * 743867859 smaller font for date/unread, per updated spec +| | * bba2bcefe Grow unread badge into pill +| | * 2bc072fe8 Now that snippet is a bit higher, increase max message cell height +| | * ee4d038d2 Top row baseline and badge to spec +| | * c693beb76 dateTime to spec +| | * 91f4f38c0 snippet to spec (subheading: 15pt) +| | * 5ada961ec unread badge to spec (footnote: 13) +| |/ +| * 15891523b Merge branch 'mkirk/group-delivery' into release/2.24.0 +| |\ +| | * eec767897 (origin/mkirk/group-delivery) Group's meta message defaults to "Delivery" +| |/ +* | 3dfcafb2c Merge branch 'mkirk/call-reconnecting' +|\ \ +| * | 0f46834e8 Show "Reconnecting..." on call screen +| * | 830ed884c Only log timeout when call actually times out +|/ / +* | 2c43d20ee Merge tag '2.24.0.9' +|\ \ +| |/ +| * f45970922 (tag: 2.24.0.9) "Bump build to 2.24.0.9." +| * a2028b1ed Merge branch 'charlesmchen/asyncRegistrationCompletion' into release/2.24.0 +| |\ +| | * 35ee8c1a0 (charlesmchen/asyncRegistrationCompletion) Rework flush of registration connection(s). +| | * a26426825 Rework flush of registration connection(s). +| | * e1138df77 Rework flush of registration connection(s). +| | * 5bbce1402 Rework flush of registration connection(s). +| | * 5d627ee89 Rework flush of registration connection(s). +| | * 4f1f1a107 Rework flush of registration connection(s). +| |/ +| * 1b73fb9e6 Merge branch 'charlesmchen/callViewOptionals' into release/2.24.0 +| |\ +| | * cc42e85bd (charlesmchen/callViewOptionals) Avoid race condition in call view controller. +| | * 621d54db1 Revert "Remove usage of ! in call view." +| | * 943b3f031 Revert "Remove usage of ! in call view." +| | * 594ddfaec Revert "Remove usage of ! in call view." +| | * 3cbd49627 Remove usage of ! in call view. +| | * 699bf0a82 Remove usage of ! in call view. +| | * ce197b0ad Remove usage of ! in call view. +| |/ +* | 3950d2c54 Merge branch 'mkirk/disappearing-messages' +|\ \ +| |/ +|/| +| * c88ce07f6 CR: Clean up comments, use property setter instead of ivar +| * eb140a683 Timer info messages *before* the message which changed the timer +| * a9e7c5e87 Cleanup: simplify migration, remove unused code +| * b039fdd27 UI Fix: start with full hourglass on short timer durations +| * 754549adf Start timer for expiring message based on when read receipt was sent +| * dfb2a034a Use explicit transactions. +| * b7625689c Simplify reasoning around disappearing messages +| * 57ae2b173 Clarify existing functionality, but no change in behavior +|/ +* ef95e0538 (tag: 2.24.0.8) "Bump build to 2.24.0.8." +* 499d06842 (tag: 2.24.0.7) "Bump build to 2.24.0.7." +* e2fa797e0 Merge remote-tracking branch 'origin/charlesmchen/fixMessageTaps' +|\ +| * a1386eca8 (charlesmchen/fixMessageTaps) Fix taps in message cells. +|/ +* d3f106e3b (tag: 2.24.0.6) "Bump build to 2.24.0.6." +* 87c335e07 Merge branch 'charlesmchen/fixDateComparators' +|\ +| * e7855c16a Fix date comparators. +| * 3b5ee662d Fix date comparators. +| * 5067dcba5 Fix date comparators. +|/ +* 5a6220a84 (tag: 2.24.0.5) "Bump build to 2.24.0.5." +* 26f8050da Merge tag '2.23.4.2' +|\ +| * e96ad2f97 (tag: 2.23.4.2, origin/hotfix/2.23.4, hotfix/2.23.4) "Bump build to 2.23.4.2." +| * c3b72ac6b Merge branch 'charlesmchen/callViewVsKeyboard_' into hotfix/2.23.4 +| |\ +| | * ae61b44a9 (charlesmchen/callViewVsKeyboard_) Resolve conflict between keyboard and call view. +| |/ +* | 7090a59a3 (tag: 2.24.0.4) "Bump build to 2.24.0.4." +* | 34e99cc42 Update l10n strings. +* | b8b131a1f (tag: 2.24.0.3) "Bump build to 2.24.0.3." +* | eb51ea42e Merge remote-tracking branch 'origin/hotfix/2.23.4' +|\ \ +| |/ +| * bc35a3859 (tag: 2.23.4.1) "Bump build to 2.23.4.1." +| * 5cf6e6532 Fix screen lock alerts. +| * 66f028a3b (tag: 2.23.4.0) Update nullability +| * 7d7981e82 Merge branch 'charlesmchen/mainWindow' into hotfix/2.23.4 +| |\ +| | * 85cb78ddf Add mainWindow property to app context. +| |/ +| * 4e9c653c8 "Bump build to 2.23.4.0." +* | 27935361c Merge branch 'charlesmchen/malformedProtos' +|\ \ +| * | 5ce39337e Handle malformed protos. +|/ / +* | b925f913b Merge branch 'charlesmchen/attachmentTypeAssets' +|\ \ +| * | 284cc8c26 Apply attachment type assets. +| * | 146db1984 Apply attachment type assets. +|/ / +* | f2d5bd48f Merge branch 'mkirk/nullability-fix' +|\ \ +| * | c926ca10a Update nullability +|/ / +* | 4d539ba1c Merge branch 'mkirk/retry-failed-thumbnail-download' +|\ \ +| * | 64ff4cd66 tap-to-retry failed thumbnail downloads +|/ / +* | 8716d6b7a Merge branch 'charlesmchen/homeAndConversationViewDesignTweaks' +|\ \ +| * | f6d5b9197 Respond to CR. +| * | 94e9c72e6 Apply design changes from Myles. +| * | bb9c1fb23 Apply design changes from Myles. +| * | 6a69070ce Apply design changes from Myles. +|/ / +* | aedeca03d Merge branch 'charlesmchen/shapeLayerAnimations' +|\ \ +| * | 6831412e4 Respond to CR. +| * | a5c7bdb98 Don't animate changes to shape layer properties. +|/ / +* | e02bbaeec Merge branch 'charlesmchen/fixBlockScreenAnimation' +|\ \ +| * | 115235d1b (private/charlesmchen/fixBlockScreenAnimation, charlesmchen/fixBlockScreenAnimation) Fix animation glitch in blocking window. +|/ / +* | df685da49 Merge remote-tracking branch 'private/hotfix/2.23.3' +|\ \ +| |/ +| * 2167a28e0 (tag: 2.23.3.2, private/hotfix/2.23.3, hotfix/2.23.3) "Bump build to 2.23.3.2." +| * e48607540 "Bump build to 2.23.3.1." +| * 174b1e360 Merge branch 'charlesmchen/screenLock7' into hotfix/2.23.3 +| |\ +| | * 03e6a5dc7 (private/charlesmchen/screenLock7, charlesmchen/screenLock7) Refine screenlock. +| |/ +| * c31e2fbb6 "Bump build to 2.23.3.0." +* | 76b9564b8 Merge branch 'mkirk/text-caption-size' +|\ \ +| * | f879291f1 Don't underestimate removed space. +| * | 13a432b9d Limit attachment caption length to 2k bytes +|/ / +* | 2a2f0bcad (tag: 2.24.0.2) "Bump build to 2.24.0.2." +* | d821942f0 Merge branch 'charlesmchen/quoteReplyTweaks' +|\ \ +| * | 59a3d736b Respond to CR. +| * | d7ae35f72 Streamline usage of quoted message view. +| * | 195d35737 Streamline usage of quoted message view. +|/ / +* | f8b11c57c Merge branch 'charlesmchen/incompleteAsserts' +|\ \ +| * | daf0f0b22 Fix incomplete asserts. +| * | 9c9309951 Fix incomplete asserts. +|/ / +* | 194ae2dfd Merge branch 'charlesmchen/saeVsMainThread' +|\ \ +| * | 6caa5b87b Add more asserts around thread in SAE. +|/ / +* | 7013cf9b4 Merge branch 'charlesmchen/messageDetailsVsIPhoneX' +|\ \ +| * | a5a2f02ed Respond to CR. +| * | 644e78f19 Respond to CR. +| * | eb400114c Fix message details layout in iPhone X. +|/ / +* | 7f6cdf7e6 Merge branch 'mkirk/use-profile-name' +|\ \ +| * | e554884ab Use profile name in quoted messages, fix "multi account" label +|/ / +* | 6703e1b11 Merge branch 'mkirk/quote-you' +|\ \ +| * | 40879ca3e Distinguish between quoting yourself and someone else quoting you +|/ / +* | 859ecc48d Merge branch 'charlesmchen/reduceServiceLoad' +|\ \ +| * | 829cfd042 (charlesmchen/reduceServiceLoad) Reduce oversize text size. +|/ / +* | 98ed2b49c Merge tag '2.23.2.0' +|\ \ +| |/ +| * 2264edd9d (tag: 2.23.2.0, origin/release/2.23.2, release/2.23.2) "Bump build to 2.23.2.0." +* | 2d9eb2b61 Merge tag '2.23.1.2' +|\ \ +| |/ +| * 8f1cfed5c (tag: 2.23.1.2) "Bump build to 2.23.1.2." +| * 018a35df7 Merge remote-tracking branch 'origin/charlesmchen/screenLockRework_' into release/2.23.2 +| |\ +| | * 2b210c755 (charlesmchen/screenLockRework_) Fix screen lock edge cases. +| | * ad6937378 Fix screen lock edge cases. +| |/ +* | dd32faf8f (tag: 2.24.0.1) "Bump build to 2.24.0.1." +* | 6677aa2c7 Update l10n strings. +* | 81ad95a05 Merge branch 'charlesmchen/backgroundCheckOffMain' +|\ \ +| * | 45892e822 Move 'background' check in message processing logic off main thread. +|/ / +* | 5f56269f9 Merge branch 'mkirk/truncate-tail' +|\ \ +| * | 5774e5769 truncate tail for both preview and message bubble +|/ / +* | 50ce0e6db Merge branch 'mkirk/proto-update' +|\ \ +| * | b2b70258f Make our protos backwards compatible with Signal-Android +|/ / +* | ebb3ee86c Merge branch 'mkirk/fix-spurious-group-updates' +|\ \ +| * | bd8e03fe8 Fix spurious "Group Updated" message +|/ / +* | fa4c67795 Merge branch 'charlesmchen/transparentImages2' +|\ \ +| * | 576f5dee8 Add white background to images in quoted reply view. +|/ / +* | dd121ba83 Merge branch 'charlesmchen/reduce10deadcc' +|\ \ +| * | d95f2bdc6 Respond to CR. +| * | d561ba4c6 Reduce 0xdead10cc crashes. +|/ / +* | f01b7b916 Merge branch 'charlesmchen/quoteReplyToYourself' +|\ \ +| * | c152a4134 Respond to CR. +| * | fc2704cf8 Label quoted replies to yourself as such. +|/ / +* | d0aad5360 Merge branch 'charlesmchen/homeViewDesignChanges2' +|\ \ +| * | 759b2a332 Respond to CR. +| * | c6df55b82 Scale home view cells to reflect dynamic type size. +| * | 3688d57ea Scale home view cells to reflect dynamic type size. +| * | 543c898db Scale home view cells to reflect dynamic type size. +| * | 25e487fcd Scale home view cells to reflect dynamic type size. +| * | c3345a4c4 Scale home view cells to reflect dynamic type size. +|/ / +* | fb27d496e Merge branch 'charlesmchen/longPressQuotedReply' +|\ \ +| * | ea82419a4 Fix long press on quoted reply. +|/ / +* | 30943a1c1 Merge branch 'charlesmchen/quotedMessageOverflow' +|\ \ +| * | 031a1d732 Fix quoted message overflow. +|/ / +* | 8857c4491 Merge branch 'charlesmchen/oversizeTextPreviews' +|\ \ +| * | db6f1326b Fix previews of oversize text messages. +| * | 83a470d44 Fix previews of oversize text messages. +|/ / +* | 84b0f57c1 Merge branch 'charlesmchen/transparentImages' +|\ \ +| * | ae91b03c7 Add white background to images in conversation view. +|/ / +* | 13fdfa2db Merge branch 'mkirk/fix-message-details-media' +|\ \ +| * | 532053673 remove WIP comments +| * | 1780973e6 fix image, video, audio interactions in message details +| * | 7abd51838 Move bubble actions to new bubble delegate +|/ / +* | f6698501d Revert "Label quoted replies to yourself as such." +* | 24d7492f6 Label quoted replies to yourself as such. +* | f91f4dbd0 Merge branch 'charlesmchen/homeViewDesignChanges' +|\ \ +| * | c0578b31f Clean up ahead of CR. +| * | 45cb1ec51 Clean up ahead of PR. +| * | abba24988 Rework how dates are formatted in home view. +| * | b8f8a3017 Apply design changes to home view. +|/ / +* | 0b7c025c5 (tag: 2.24.0.0) "Bump build to 2.24.0.0." +* | 086757191 Update l10n files. +* | db4f75592 Merge branch 'mkirk/limit-attachment-length' +|\ \ +| * | d94709e13 Show label when captioning limit has been reached. +| * | 6b6f4f933 Limit caption length +|/ / +* | 8cfb1e132 Merge branch 'charlesmchen/quotedReplyPrerequisites' +|\ \ +| * | c269add62 Respond to CR. +| * | 9769d482d Respond to CR. +| * | 76995e459 Enforce quoted reply edge cases. +|/ / +* | 4655c7432 Merge branch 'charlesmchen/tapQuotedReplies' +|\ \ +| * | 6ee74eaff Respond to CR. +| * | 6a07599e0 Respond to CR. +| * | f2b416d80 Respond to CR. +| * | 8b060a187 Tap on quoted replies. +| * | 65015e686 Tap on quoted replies. +|/ / +* | d220883b5 Merge branch 'fix-blue-new-message-dot' +|\ \ +| * | ca1f8efda Move 'never clear' view to proper subfolder. +| * | 21e0d1cd3 simplified backgroundColor logic +| * | 3a47422b3 class reference in sources +| * | 2f538b9f5 fixed header formatting +| * | d16bffe6c forget target reference to new class in PR +| * | 8984f659f Keeps original background color of a subview in during row selection +|/ / +* | f9fc88286 Merge branch 'charlesmchen/tweakMessageLayout' +|\ \ +| * | e8ad6bad8 Respond to CR. +| * | ebb89ed1f Tweak message layout. +|/ / +* | 27cc9668c Merge branch 'charlesmchen/noRecycleBiometric' +|\ \ +| * | ca6b952c1 Never recycle biometric auth. +|/ / +* | 149d89224 Merge branch 'mkirk/quote-authoring-redesign' +|\ \ +| * | 314e3cbf0 Drive quote authoring with QuotedMessageView +| * | 520dad25b WIP making OWSQuotedMessageView work with preview +| * | 5287ab8f8 Try 2: no more stack view +| * | 5807ba69c attempt 1: QMV doesn't have intrinsic content size, and requires a fixed width to compute it's size, which we don't currently have. +|/ / +* | a6afa2cc0 Merge branch 'charlesmchen/dynamicTextFixes' +|\ \ +| * | 180cbbcdb Don't use scaledFontForFont. +|/ / +* | 3ba3f1099 Merge branch 'fix-truncation-in-segment-control' +|\ \ +| * | 16014f321 autoresize label in segmentControl to avoid unwanted truncation +|/ / +* | 64fba4308 Merge branch 'charlesmchen/quotedReplyDesignTweaks' +|\ \ +| * | 8fe289fee Tweak design of quoted replies. +|/ / +* | a810fb640 Merge branch 'charlesmchen/smallText' +|\ \ +| * | 8c1362b80 Fix small text usage. +|/ / +* | dc0e5a6b9 Merge branch 'charlesmchen/quotedReplies8' +|\ \ +| * | 3799dce82 Respond to CR. +| * | c106a67a5 Use dynamic type everywhere in conversation view. +| * | ade2ee721 Use dynamic type everywhere in conversation view. +|/ / +* | 37966986f Merge branch 'mkirk/attachment-handling' +|\ \ +| * | b1a87633d update pods +| * | 81b2b5770 CR: add comments, make atomic +| * | 88d6a8395 Add assertion canary so we know to re-test syncing once desktop supports sending quoted replies +| * | 02efbd306 Fix blip where thumbnail is initially missing from outgoing message +| * | 90486aa49 Inline method with one caller, fix formatting +| * | 8e4c6b8af Update protos for voice messages +| * | 941b7ec1b clarify method signature +| * | c56e8acc5 QuotedReplyModel from SSK->SignalMessaging +| * | 1d4c0624b Clarify variable names +| * | a9459757f Lingering var renames QuotedReplyDraft -> QuotedReplyModel +| * | f1714bf25 Handle synced quotes +| * | 622f6bdf2 OrphanDataCleaner vs. QuotedAttachment thumbnails +| * | 4399967e9 Comment cleanup, remove unnecessary includes +| * | fa2e1ba89 Fetch thumbnail when not available locally +| * | 42f454b07 Generate thumbnail when quoted attachment is available locally +| * | 351f9ea26 Simplify attachment processor +| * | 325286672 remove unused params +| * | cb5d3d4f8 Use QuotedReplyModel to access attachment data +| * | 3334f2a06 tentative proto changes +| * | 51a4298c1 WIP: Send attachment info in protobuf (no thumbnails yet) +| * | 55c6d99d9 populate draft toolbar +| * | 253435b27 extract QuotedReplyDraft model +| * | 0b8b3b4f1 WIP: towards avatar attachment streams +| * | 53af41fcc Reusable UploadOperation based on extracted OWSOperation +|/ / +* | f3c511b78 Merge branch 'charlesmchen/quotedReplies7' +|\ \ +| * | 0dfdb8ce8 Elaborate quoted reply variations to include replies with attachments. +| * | de2dc4912 Elaborate quoted reply variations to include replies with attachments. +|/ / +* | 93820e7bc Merge branch 'charlesmchen/quotedReplies6' +|\ \ +| * | 3ee37bd3f Respond to CR. +| * | 2f2d1f81a Clean up ahead of PR. +| * | cf1a7e01d Apply message bubble view to message details view. +| * | 6830d4e8c Apply message bubble view to message details view. +| * | d99a2be00 Apply message bubble view to message details view. +|/ / +* | 076b6ad8d Merge branch 'charlesmchen/quotedReplies5' +|\ \ +| * | 316b55bf9 Respond to CR. +| * | 7067085cd Extract message bubble view. +| * | d05b73af2 Extract message bubble view. +| * | d1060a2a8 Extract message bubble view. +| * | 7f0fa1228 Extract message bubble view. +|/ / +* | 00327986d Merge branch 'mkirk/sync-protos' +|\ \ +| * | 2975d4d5d Sync with android protos +|/ / +* | 0106b1a42 Merge branch 'charlesmchen/quotedReplies4' +|\ \ +| * | c5d8a7cb3 Clean up ahead of PR. +| * | f6aa3f89b Clean up ahead of PR. +| * | ca4757b8d Clean up ahead of PR. +| * | c648812cf Update cocoapods. +| * | 71c5c3a4b Refine appearance of quoted reply message cells. +| * | 8a843f70e Refine the attachments in the quoted reply view. +| * | 214e3a9c4 Refine appearance of quoted reply message cells. +|/ / +* | 7fe83cbc4 Merge branch 'charlesmchen/quotedReplies3' +|\ \ +| * | 822aa64b1 (charlesmchen/quotedReplies3) Respond to CR. +| * | cac85508c Refine appearance of quoted reply message cells. +| * | 7e921b793 Refine appearance of quoted reply message cells. +| * | 08ba3852c Refine appearance of quoted reply message cells. +| * | 5235f6eee Refine appearance of quoted reply message cells. +| * | d6f3df82a Refine appearance of quoted reply message cells. +| * | c70f911f6 Refine appearance of quoted reply message cells. +| * | 617150565 Refine appearance of quoted reply message cells. +| * | 10b4ade55 Refine appearance of quoted reply message cells. +| * | 3343b4ec5 Refine appearance of quoted reply message cells. +|/ / +* | dd36c945e Merge branch 'charlesmchen/attachmentEmojis' +|\ \ +| * | 2b3b08d7c (charlesmchen/attachmentEmojis) Respond to CR. +| * | f230717b6 Modify attachment emojis. +|/ / +* | 2df54a577 Merge branch 'charlesmchen/quotedRepliesVsOversizeText' +|\ \ +| * | 30403be9b (charlesmchen/quotedRepliesVsOversizeText) Respond to CR. +| * | 5a17c5609 Quote reply to oversize text. +|/ / +* | c0cdf0f5b Merge branch 'charlesmchen/fixupInteractions' +|\ \ +| * | 9b5db80f2 (charlesmchen/fixupInteractions) Respond to CR. +| * | a561bf5e2 Fix database conversion tests. +| * | 908560908 Fix interaction initializers and tests. +|/ / +* | a6dbe5bf7 Merge branch 'mkirk/update-pods' +|\ \ +| * | eae2fa27b Update pods +|/ / +* | 6958598d0 Merge tag '2.23.1.1' +|\ \ +| |/ +| * 0a20eec4e (tag: 2.23.1.1, origin/release/2.23.1) "Bump build to 2.23.1.1." +| * a98834cc2 pull latest translations +| * 5b55b9eab Merge branch 'charlesmchen/screenLockFix' into release/2.23.1 +| |\ +| | * c46021f19 (charlesmchen/screenLockFix) Fix screen lock edge case. +| |/ +* | 73dc22cc1 Merge branch 'mkirk/quote-authoring' +|\ \ +| * | b6409dd51 CR: formatting changes +| * | eb16043de simplify emoji, remove iconview +| * | b3b3fa64e Use "You" instead of Author name in quote +| * | 51eee90bb Remove unnecessary changes +| * | 52ea54ae6 Add thumbnail when available +| * | bf401bad9 Send quoted messages +| * | d99054d89 Reply menu item +| * | 6874a9e28 Convert to swift +| * | cfbbeca7a WIP: QuotedMessagePreviewView +|/ / +* | 609e68e8b Merge branch 'charlesmchen/quotedReplies2' +|\ \ +| * | 00a81355d (charlesmchen/quotedReplies2) Respond to CR. +| * | 445d38f72 Modify cells to show quoted messages. +| * | 324afb115 Modify cells to show quoted messages. +| * | 5824cbd2a Modify cells to show quoted messages. +| * | 988b6ffae Modify cells to show quoted messages. +| * | f6f98369a Modify cells to show quoted messages. +| * | 22dc90428 Modify cells to show quoted messages. +| * | 2278cdd58 Modify cells to show quoted messages. +| * | 7cf169012 Elaborate conversation view items around quoted replies. +|/ / +* | e24da5989 Merge branch 'mkirk/dynamic-gallery-text' +|\ \ +| * | e6b0f692c Don't use dynamic text for navbar view +|/ / +* | 756132acf Merge branch 'mkirk/fix-audio-alert-levels' +|\ \ +| * | 5f8b3ff28 Object lifecycle disposes SystemSound +| * | 2580c690c CR: Use LRU Cache for storing system sounds +| * | 3cb53f5f4 Respect system alert volume for notifications while in app +|/ / +* | 363a1ae33 Merge branch 'charlesmchen/quotedRepliesVariations' +|\ \ +| * | c36297a9a Elaborate 'quoted reply' variations in the Debug UI. +|/ / +* | 8e695d960 Merge branch 'charlesmchen/simpleBubbleEdge' +|\ \ +| * | 20387f27e Simplify bubble edge. +| * | d5218cf4d Simplify bubble edge. +|/ / +* | c8b8a989f update crash reporting instructions +* | 7befbfc33 Merge branch 'mkirk/fixup-tests-2' +|\ \ +| * | 00e5e1b0d Fixup some tests +|/ / +* | 448e59d7f Merge tag '2.23.1.0' +|\ \ +| |/ +| * f1b6c51cf (tag: 2.23.1.0) "Bump build to 2.23.1.0." +| * 83a8670f2 Pull latest translations +| * ab2074c73 CR: Avoid unnecessary retain +| * c639a2c14 Fix flush of registration connections. +* | e6c6cabf1 Merge branch 'mkirk/iphonex-fixups' +|\ \ +| * | 86553b62f keyboard pinning vs iPhoneX +| * | af5f549e4 Fix TableView layout for iPhoneX +| * | f441c6211 Format +| * | 6f1608f44 Conventional naming for out custom PureLayout methods. +|/ / +* | 41cfdb153 Merge branch 'charlesmchen/quotedReplies_' +|\ \ +| * | 42ea43bc4 Update pods. +| * | 4240b517d Respond to CR. +| * | fb1f3b557 Rework quoted reply debug UI. +| * | 4915c127c Rework quoted reply debug UI. +| * | 8e4f2ca0e Rework proto schema changes for quoted replies. +|/ / +* | 308fa5997 Merge branch 'charlesmchen/bubbleViewsAssert' +|\ \ +| * | 1bea832fa (charlesmchen/bubbleViewsAssert) Fix assert in bubble views. +|/ / +* | 3139bac99 Merge branch 'charlesmchen/lazyAttachmentRestoreVsDebug' +|\ \ +| * | f7ea1678e (charlesmchen/lazyAttachmentRestoreVsDebug) Only resume lazy attachment restore in debug. +|/ / +* | aa7bf920e Merge branch 'charlesmchen/flushRegistrationConnections_' +|\ \ +| * | 9dfc955ee (charlesmchen/flushRegistrationConnections_) Fix flush of registration connections. +|/ / +* | 684614013 Revert "Fix flush of registration connections." +* | 43e50e33c Merge branch 'charlesmchen/bubbleCollapse' +|\ \ +| * | 52b238c49 Fix flush of registration connections. +| * | f98c45603 Respond to CR. +| * | 31f062ed1 Bubble collapse. +| * | 12bcf887c Bubble collapse. +| * | 4f9085a76 Bubble collapse. +| * | 3ca2c08b0 Bubble collapse. +| * | 578f40d79 Bubble collapse. +| * | c8012d389 Bubble collapse. +| * | 3d07dc7c5 Bubble collapse. +| * | 643c6385b Bubble collapse. +| * | 8d74c68f9 Bubble collapse. +| * | 8a74e1020 Bubble collapse. +| * | e0e8eafb5 Bubble collapse. +| * | 4a4e9d1ce Bubble collapse. +| * | 11819d9b8 Bubble collapse. +| * | e1e660678 Bubble collapse. +| * | cb00b2287 Bubble collapse. +| * | 6525ccdb0 Bubble collapse. +| * | 75177ef00 Bubble collapse. +| * | d0cddfd22 Elaborate debug UI for messages. +| * | 3a5ba15d2 Elaborate debug UI for messages. +| * | 041b28dd7 Elaborate debug UI for messages. +| * | 469fb2644 Elaborate debug UI for messages. +| * | 8542a18f3 Elaborate debug UI for messages. +| * | a13076008 Elaborate debug UI for messages. +| * | 66a454ce4 Elaborate debug UI for messages. +| * | e874503f8 Elaborate debug UI for messages. +| * | 24cc6ec11 Elaborate debug UI for messages. +| * | c2e31540d Elaborate debug UI for messages. +| * | 68f3334e7 Elaborate debug UI for messages. +| * | 0dfa9cac7 Elaborate debug UI for messages. +|/ / +* | 972cbaebf Merge branch 'charlesmchen/incrementalBackup8' +|\ \ +| |/ +|/| +| * cf9a326d5 Update Cocoapods. +| * 4602ad901 Respond to CR. +| * 9f866ab32 Update cocoapods. +| * 8254052bb Lazy restore attachments. +| * cb8ee3536 Lazy restore attachments. +| * 1dced463c Lazy restore attachments. +| * b2ac8f10e Lazy restore attachments. +| * 3406d1562 Add local cache of backup fragment metadata. +| * 61dc2c024 Add local cache of backup fragment metadata. +| * e88f5643f Add local cache of backup fragment metadata. +| * 258cdab2d Don't cull CloudKit records for lazy restoring attachments. +| * d0c691bb7 Lazy attachment restores. +|/ +* 2a31223b1 (tag: 2.23.0.14, origin/release/2.23.0, release/2.23.0) "Bump build to 2.23.0.14." +* ea71493fa pull latest translations +* 0a36f3e64 Merge branch 'mkirk/stop-audio-after-leaving-details' +|\ +| * d7cccd1e8 Fix: Audio stops when leaving MessageDetails VC +|/ +* 1dd7d6799 (tag: 2.23.0.13) "Bump build to 2.23.0.13." +* e59abfdab pull latest translations +* 018b00f69 Merge branch 'mkirk/fix-unlock-obscured' +|\ +| * 4eadd84ab Don't obscure "Unlock" button with keyboard +|/ +* 4890fe630 (tag: 2.23.0.12) "Bump build to 2.23.0.12." +* e793aba04 Merge branch 'mkirk/fix-gallery-crash' +|\ +| * 425b35a2c Crash/UI fix fetching edge case +|/ +* 0b4b42875 (tag: 2.23.0.11) "Bump build to 2.23.0.11." +* b1ac4a7c7 Sync translations +* 9afe9f0b7 Merge branch 'mkirk/reflector-redux' +|\ +| * 875321cec Reflector configuration supports per-country code +|/ +* 123534ea2 Merge branch 'charlesmchen/screenLock8' +|\ +| * 1424149a7 Start screen lock countdown if app is inactive for more than N seconds. +|/ +* 1ae3f77db Merge branch 'charlesmchen/screenLock9' +|\ +| * eb9c65e97 Improve handling of local authentication errors. +|/ +* 760900889 (tag: 2.23.0.10) "Bump build to 2.23.0.10." +* 715248073 Sync translations +* e856de215 Merge branch 'charlesmchen/screenLock7' +|\ +| * 72b602c3d Respond to CR. +| * 930d89242 Clean up ahead of PR. +| * 16af07842 Fix more edge cases in Screen Lock. +| * c85e5b39b Fix more edge cases in Screen Lock. +|/ +* 8bcf62258 (tag: 2.23.0.9) "Bump build to 2.23.0.9." +* 9bb335942 Pull latest translations +* 3373bb60e (tag: 2.23.0.8) "Bump build to 2.23.0.8." +* 1e83cd61b Merge branch 'charlesmchen/screenLockUnavailable' +|\ +| * fe23f79d5 Respond to CR. +| * feb5d68f8 Improve handling of unexpected failures in local authentication. +|/ +* 461af0194 Merge branch 'mkirk/remove-switch' +|\ +| * 9adf79c54 Always remove metadata +|/ +* fbb88729c Merge branch 'mkirk/video-scrubbing' +|\ +| * 1d95cd697 Improve video scrubbing UX in PageView +|/ +* 9a440913e (tag: 2.23.0.7) "Bump build to 2.23.0.7." +* f2b5ad92a Sync translations +* a2aec781c Merge branch 'mkirk/fix-crash-after-delete' +|\ +| * e4530a51b Handle "current page view" deleted from tile +| * 457d6c6d9 Don't scroll to bottom on load, since we scroll to focused when view appears. +| * 405edaa12 End select mode after hitting delete +| * 6e3de94e9 code cleanup +|/ +* 46f8b210a (tag: 2.23.0.6) "Bump build to 2.23.0.6." +* 04515713b Merge branch 'charlesmchen/screenLock6' +|\ +| * 664afdcac Fix edge case in screen lock UI. +|/ +* bf79a0195 Merge branch 'charlesmchen/invalidAuthVsLaunch' +|\ +| * 9962bf56b Fix 'invalid auth can hang on launch' issue. +| * ef34cd5d5 Fix 'invalid auth can hang on launch' issue. +|/ +* 4ca29b06e Remove travis ci badge +* c138c0057 Merge branch 'string-cleanup' +|\ +| * 394cc6637 Backport comments from translations +| * a17db6c2d Update Screen Lock text. Clean up a few other strings and comments. +|/ +* e2ed2de0e (tag: 2.23.0.5) "Bump build to 2.23.0.5." +* 1cc470d75 Merge branch 'charlesmchen/screenLock5' +|\ +| * 063e1ccb6 Fix edge cases around pincode-only unlock. +| * 287daf583 Fix edge cases around pincode-only unlock. +|/ +* 53c7f656e (tag: 2.23.0.4) "Bump build to 2.23.0.4." +* 019ad5ef8 Sync translations +* 67626c35b Merge branch 'mkirk/animations' +|\ +| * 037546a2d Fade toolbars, keeping presentation image sharp +| * 10fe10b98 Fix navbar flicker while media is presented +| * c1de22d86 Avoid white flash while dismissing +|/ +* 8e72ac5ee Merge branch 'mkirk/stop-media-playback' +|\ +| * 13378501b Stop any video on dismiss +|/ +* a30ef6a44 Merge branch 'mkirk/batch-delete' +|\ +| * ae892525d don't fade "selected" badge +| * 2edf8384c iPhoneX layout for gallery +| * 3de923bf6 Update footer items after delete scrolls you to next item in pager view +| * 3058cb873 Batch Delete +|/ +* c13226d6c (tag: 2.23.0.3) sync translations +* 2d57b90bd "Bump build to 2.23.0.3." +* 6d45c38b4 Merge branch 'mkirk/delete-from-gallery' +|\ +| * 6c877403c Fix delete from message details +| * 6e20f5b65 Fix Delete +|/ +* e751bbfbb Merge branch 'charlesmchen/screenLock4' +|\ +| * faea31a8c (charlesmchen/screenLock4) Fix screen lock presentation logic. +| * 0e00428da Fix screen lock presentation logic. +|/ +* 4fe5432ac Merge branch 'charlesmchen/screenLock3' +|\ +| * b012efc12 (charlesmchen/screenLock3) Fix screen lock presentation logic. +| * 19755fa5b Refine 'Screen Lock'. +| * 8899c7abd Refine 'Screen Lock'. +|/ +* 03845d0d9 Revert "Refine 'Screen Lock'." +* 871dca413 Refine 'Screen Lock'. +* 70e95b085 Merge branch 'charlesmchen/screenLock' +|\ +| * 5bc089837 (charlesmchen/screenLock) Respond to CR. +| * 2f39b2c22 Respond to CR. +| * 28ce15885 Refine screen lock. +| * bb596dba9 Add screen lock feature. +| * 2d6d375e8 Add screen lock feature. +| * cf0e6fce0 Add screen lock feature. +| * 1f8289102 Add screen lock feature. +| * b62736d7d Add screen lock feature. +| * 1612642c2 Add screen lock feature. +|/ +* 245769ce2 Merge branch 'charlesmchen/sendErrors' +|\ +| * b067d8101 (charlesmchen/sendErrors) Don't log message send errors. +|/ +* ddf14250d Merge branch 'mkirk/fix-pan-swipe' +|\ +| * 1e59fbafd CR: method args shouldn't shadow properties +| * d94f355c2 properly restore navigation bar after dismissing mid-video +| * 6a4642ed9 Fix subsequent animation after swiping +|/ +* 34a40a639 Merge branch 'charlesmchen/deepDeletion' +|\ +| * 847a0269c (charlesmchen/deepDeletion) Properly cleanup content. +| * 8d689ec09 Properly cleanup content. +|/ +* c5a48edf5 Merge branch 'charlesmchen/incrementalBackup6' +|\ +| * d21549943 (charlesmchen/incrementalBackup6) Show backup UI in release builds if backup is enabled. +|/ +* 2cb9677c9 Merge branch 'charlesmchen/incrementalBackup5' +|\ +| * 6580f9112 (charlesmchen/incrementalBackup5) Respond to CR. +| * 439d7e62e Recycle backup fragments. +| * 5de11d735 Recycle backup fragments. +| * bb07de2a3 Pull out "download and parse manifest" logic. +|/ +* bad416277 (charlesmchen/vanityLock) sync translations +* 0e8db320b update copy +* dd33254d7 (tag: 2.23.0.2) "Bump build to 2.23.0.2." +* 7adc296fb sync translations +* 60de39ab0 Merge branch 'mkirk/handle-empty-gallery' +|\ +| * b5503cc00 Handle empty media gallery +|/ +* 3ad6fbf21 Merge branch 'mkirk/gallery-label' +|\ +| * f261fbcf0 Dynamic gallery label +|/ +* 77b83d5a3 Merge branch 'mkirk/gallery-badges' +|\ +| * 6939b1749 remove gradient per myles +| * 0025661a8 Extract GradientView +| * 7754d3d94 Real assets +| * 021c0db55 WIP: waiting on assets +|/ +* 6b4798734 Merge branch 'mkirk/fix-attachment-sending' +|\ +| * 9c57a1f7e Don't generate thumbnail until attachment has been saved +|/ +* dce6c376c (charlesmchen/incrementalBackup7) Merge branch 'charlesmchen/incrementalBackup4' +|\ +| * e8a716f2b (charlesmchen/incrementalBackup4) Update cocoapods. +| * 34d79265a Respond to CR. +| * 5c3bc74d0 Move backup protos to their own proto schema. +| * ab720a310 Move backup protos to their own proto schema. +| * 08ba7c85e Clean up ahead of PR. +| * 18d39f15f Clean up ahead of PR. +| * 2c680cada Clean up ahead of PR. +| * 610bbacd2 Clean up ahead of PR. +| * 2ebd8668b Fix bugs in new db representation, add batch record deletion, improve memory management. +| * fed524ba1 Rework database snapshot representation, encryption, etc. +| * 0c81d5656 Rework database snapshot representation, encryption, etc. +| * ca7c75a08 Rework database snapshot representation, encryption, etc. +| * 1bbd41f72 Improve perf of database snapshots. +|/ +* 267e85915 Avoid overflow +* 84ed75f60 Fix typo +* 0e7051522 Merge branch 'mkirk/gallery-review' +|\ +| * 2465d6df0 CR: ensure image is safe before generating thumbnail +| * 32bf9d52a CR: Delete thumbnail with directory +| * 8e9eb6d21 CR: Use a less-likely-to-collide thumbnail name for legacy attachments +| * d9a2effff CR: remove "k" from non constant +|/ +* 999b0f0f9 Merge branch 'mkirk/hide-all-media-from-settings-gallery' +|\ +| * 352f5c105 Prefer back button over dismiss +| * 00b531697 Don't show the "All Media" button when viewing the slider from the gallery via settings. +|/ +* 21cb4e892 Merge branch 'charlesmchen/reduceGiphyPageSize' +|\ +| * 40416bcdc (charlesmchen/reduceGiphyPageSize) Reduce Giphy page size. +|/ +* 47afa9917 (tag: 2.23.0.1) "Bump build to 2.23.0.1." +* abaa2939c Merge branch 'mkirk/update-footer' +|\ +| * 2095cbb0c Update footer when returning to details via Tile view +|/ +* 5fdadf5bd Merge branch 'mkirk/ensure-video-stopped-2' +|\ +| * 428802aee Only try to stop video when it *is* a video +|/ +* f037101af Merge branch 'mkirk/avoid-audio-crash' +|\ +| * 2412ab092 Avoid occasional audio crash +|/ +* 803260950 Merge branch 'mkirk/ensure-video-stopped' +|\ +| * 24eb4bf44 Stop any video whenever leaving PageView +|/ +* 5ec3df93f Merge branch 'mkirk/tile-view-perf' +|\ +| * 10ee054d0 Avoid flicker when loading more on top +| * 19988a872 Improve scroll-jank on Gallery Tile View +|/ +* fa6d9bfb3 Merge branch 'mkirk/swipe-perf' +|\ +| * 4c2d30a77 Memory warning clears MediaPageView cache +|/ +* b6e0cb3f3 (tag: 2.23.0.0) Update localizations +* bac2f47a0 "Bump build to 2.23.0.0." +* 592e6b246 Merge branch 'mkirk/media-gallery-all-media' +|\ +| * 13d6d72a6 per myles, use lighter blur +| * 770ce1440 ConversationSettings must retain the gallery view +| * f4e68e0df l10n +| * fb4182c41 Ensure gallery is GC'd +| * ba2923bae remove unused category +| * 96e5a8f4b One time thumbnail generation +| * a0bd2c232 OrphanDataCleaner shouldn't delete active thumbnails +| * ae8dbeb8d Access Media Gallery from conversation settings +| * f733c07d0 comment cleanup +| * 4aeff7ba6 Thumbnail generation +| * dfd628250 Gallery performance +| * 985af76d0 WIP: All Media view +| * e5b1c0c9b Fake media send +|/ +* 966660fa2 update copyright year (#3148) +* 737e6eea4 Merge branch 'charlesmchen/incrementalBackup3' +|\ +| * 24cc95585 (charlesmchen/incrementalBackup3) Respond to CR. +| * 0ba47808a Clean up ahead of PR. +| * 62da17a0c Clean up ahead of PR. +| * 54eecd5b1 Protect backup directories. +| * b0d56dcd5 Clean up ahead of PR. +| * cf13a780e Retry backup failures. +| * 05db8e3f7 Retry backup failures. +| * f164d5e94 Improve backup progress. +| * 0bcbb5918 Improve backup progress. +| * 59fc23212 Backup export needs to verify that we have a valid account. +| * 2915c533b Streamline database configuration and cleanup. +| * 061ce8cb1 Add database validity check. +| * 3c2aae3b9 Backup import clears database contents. +| * fc4a66365 Sketch out backup export UI. +| * 91bf0bdb9 Sketch out backup export UI. +| * 669a3610a Fix attachments. +| * 565743b66 Fix edge cases in migrations. +| * d2f2dd273 Fix edge cases in migrations. +| * 86aae78f1 Include migrations in backup. +|/ +* c62b5f9b5 Fix build break. +* 163c5b487 Fix cocoapods. +* 9bce78572 Merge branch 'mkirk/media-gallery' +|\ +| * 4ac9a1019 Media page view controller +| * 88e138672 Move frame to presentation logic, out of init +|/ +* 168ca76e6 Merge branch 'charlesmchen/incrementalBackup2' +|\ +| * 4746948df (charlesmchen/incrementalBackup2) Respond to CR. +| * f10b54994 Clean up ahead of PR. +| * eb263e265 Clean up ahead of PR. +| * 68ba8976c Clean up ahead of PR. +| * cc10dbf32 Clean up ahead of PR. +| * b3ecc085d Clean up ahead of PR. +| * 76b4deffe Respond to CR. +| * 70d14c84c Clean up backup code. +| * 08149005b Clean up backup code. +| * 3f822e8ce Complete minimal backup MVP. +| * f46ea0e87 Implement backup import logic. +| * 30065493a Implement backup import logic. +| * 5035cb040 Implement backup import logic. +| * 04c527a0f Implement backup import logic. +| * f53f1fb46 Add check for backup in cloud. +| * 6cea2779d Stub out backup private key. +| * 999321c06 Check for manifest in cloud. +| * 90c8f5483 Clean up cloud after successful backup export. +|/ +* aa546a02d Merge remote-tracking branch 'origin/release/2.22.0' +|\ +| * 8f468b613 (tag: 2.22.0.4, origin/release/2.22.0) "Bump build to 2.22.0.4." +| * 56f025bae Sync Translations +| * a6d6d1e75 Merge branch 'mkirk/remove-pin-placeholder' into release/2.22.0 +| |\ +| | * 89f177925 Remove PIN placeholder text +| |/ +| * 5f8c5ccd5 Merge branch 'charlesmchen/backgroundTaskTypo' into release/2.22.0 +| |\ +| | * c1169ce24 Fix typo in background task. +| |/ +* | bdb35c566 Merge branch 'charlesmchen/incrementalBackup' +|\ \ +| * | 37d4c413d (charlesmchen/incrementalBackup) Clean up before merge. +| * | b1ca55034 Clean up ahead of PR. +| * | 0e0628a8d Clean up ahead of PR. +| * | b65cc953e Clean up ahead of PR. +| * | a91eea9a1 Fix rebase breakage. +| * | 202a35fdd Only backup every N hours. +| * | fefba6c63 Don't download files from cloud when testing for their existence. +| * | c2751665c Only backup attachments once. +| * | 20587ba37 Upload attachments to cloud; upsert files to cloud. +| * | 0971bad4b Upload database and manifest files to CloudKit. +| * | c84bf81cf Export database for backup. +| * | b603a8dcb Upload test file to CloudKit. +| * | 593f7da72 Upload test file to CloudKit. +| * | d06ad25d7 Sketch out incremental backup manager and settings view. +| * | b296cfb89 Sketch out incremental backup manager and settings view. +| * | 46a89e89f Sketch out OWSBackupStorage. +| * | 792be8018 Incremental backup. +| * | ceba4e4e6 Rename TSStorageManager to OWSPrimaryStorage. +|/ / +* | a412f00ba Fix typo +* | c5ff9a94a Merge tag '2.22.0.3' +|\ \ +| |/ +| * 44a26342e (tag: 2.22.0.3) "Bump build to 2.22.0.3." +| * da2e6e490 judiciously sync translations +| * 028012836 Merge branch 'mkirk/clearer-reminder' into release/2.22.0 +| |\ +| | * 173008fba Clarify reminder view, touchup layout +| |/ +| * b411db6b0 Pull latest translations +| * b8485b19b Merge tag '2.21.0.15' into release/2.22.0 +| |\ +| | * 9595f1c87 (tag: 2.21.0.15, origin/release/2.21.0) "Bump build to 2.21.0.15." +| | * 58f2c65a1 Fix redundant profile downloads +| | * d5d75ae91 Merge branch 'mkirk/fix-lost-call-transactions' into release/2.21.0 +| | |\ +| | | * c5fc671c3 Fix lost call transactions after rebuilding callUIAdapter +| | |/ +| * | e1992212e (tag: 2.22.0.2) "Bump build to 2.22.0.2." +| * | 319e0d808 Merge tag '2.21.0.14' into release/2.22.0 +| |\ \ +| | |/ +| | * 145a81631 (tag: 2.21.0.14) "Bump build to 2.21.0.14." +| | * 93dab2787 pull latest translations +| | * 218623bbb Merge branch 'mkirk/safer-call-connect-fix' into release/2.21.0 +| | |\ +| | | * 3aebaefc3 A lighter touch for the fix-call connect. +| | |/ +| | * d43af9b73 (tag: 2.21.0.13) "Bump build to 2.21.0.13." +| | * 3aa86d0d8 Merge branch 'mkirk/fix-call-connect' into release/2.21.0 +| | |\ +| | | * bbdcd0c76 Call connection fixups +| | |/ +| * | b903f86f8 Merge branch 'mkirk/fix-avatar-download' into release/2.22.0 +| |\ \ +| | * | 74ccdfdf2 Fix redundant profile downloads +| |/ / +| * | c21255cd8 (tag: 2.22.0.1) "Bump build to 2.22.0.1." +| * | 04bf8c4f8 pull latest translations +| * | c4f89c0a0 Merge branch 'mkirk/fix-2fa-registration-layout' into release/2.22.0 +| |\ \ +| | * | ec9538a3e Fix 2fa registration screen layout +| |/ / +| * | 34a56a56c Merge tag '2.21.0.12' into release/2.22.0 +| |\ \ +| | |/ +| | * f84476ec7 (tag: 2.21.0.12) "Bump build to 2.21.0.12." +| | * 9c62a1569 Pull latest translations +| * | 8f8026d7f Merge branch 'mkirk/fix-first-reminder' into release/2.22.0 +| |\ \ +| | * | a885fb5de Fix first reminder too early, offset bugs. +| |/ / +| * | 90fc094d0 Copy tweak +| * | 900e32c31 Merge tag '2.21.0.11' into release/2.22.0 +| |\ \ +| | |/ +| | * 16b3b9bbc (tag: 2.21.0.11) "Bump build to 2.21.0.11." +| | * 907badd02 Sync translations +| * | 2462ea0a3 Merge tag '2.21.0.10' into release/2.22.0 +| |\ \ +| | |/ +| | * 8e0e0ad40 (tag: 2.21.0.10) "Bump build to 2.21.0.10." +| | * c7871b28d Make sure any new call migration settings take effect on first launch +| * | 35b72bc1b (tag: 2.22.0.0) "Bump build to 2.22.0.0." +* | | d9b8ce26f Merge branch 'collinstuart/strip-exif-data' +|\ \ \ +| |/ / +|/| | +| * | 6f7b4a6e4 Strip media metadata. +|/ / +* | f35fe4946 Merge branch 'mkirk/background-fetch' +|\ \ +| * | 8dfc584c2 Try to keep-alive registration lock w/ bg fetch +|/ / +* | a1de99f1f Merge tag '2.21.0.9' +|\ \ +| |/ +| * bd4857607 (tag: 2.21.0.9) "Bump build to 2.21.0.9." +| * 954e17418 Merge branch 'mkirk/fix-log-uploads' into release/2.21.0 +| |\ +| | * 39b87b702 Fix debuglogs.org integration +| |/ +| * 913cdad74 (tag: 2.21.0.8) "Bump build to 2.21.0.8." +| * b8fc4fce1 Merge branch 'mkirk/show-splash-on-first-launch' into release/2.21.0 +| |\ +| | * f459c9ce6 CR: rename SignalClassic constant +| | * 51ae93655 Ensure the user sees the experience upgrade +| | * 5739f074a Show migration screen at first launch. +| |/ +| * 9afce87dd Merge branch 'mkirk/run-call-settings-migration' into release/2.21.0 +| |\ +| | * 55a4b66ca Run call settings migration +| |/ +| * d12a6ae57 (tag: 2.21.0.7) "Bump build to 2.21.0.7." +| * 982cf971a Merge branch 'mkirk/fix-audio-category-for-notifications' into release/2.21.0 +| |\ +| | * 1ddf3bb4e (origin/mkirk/fix-audio-category-for-notifications) Fix "use ambient" for notifications +| |/ +| * cae40d408 (tag: 2.21.0.6) "Bump build to 2.21.0.6." +| * 126a4cb7c Fix build break +| * 6f3663fdc Merge branch 'mkirk/more-conservative-call-changes' into release/2.21.0 +| |\ +| | * 79ee5ed21 Be more conservative about logging legacy users into "Recents" +| |/ +| * 8d13ed6bb Merge branch 'mkirk-2.21.0/mix-notification-audio' into release/2.21.0 +| |\ +| | * 4e64b09ad Don't set audio to ambient while other audioActivity exists +| | * c2501d8d1 Don't migrate legacy users to use new audio tones +| | * 830e9f1bf Make "Signal Classic" audio stand out more +| | * 788316726 Fix "None" audio for fallback notifications. +| | * d3be2b4a3 Vibrate when playing sound as alert +| | * d7fcac8a5 In-App notifications don't pause background audio +| |/ +* | 2a297ca9e Merge branch 'charlesmchen/renameStorageManager_' +|\ \ +| * | bd8db864f Update cocoapods. +| * | db430d6aa Revert unwanted changes. +| * | 692ef423b Rename TSStorageManager to OWSPrimaryStorage. +| * | d6f4db152 Rename TSStorageManager to OWSPrimaryStorage. +|/ / +* | 09d561823 Merge branch 'charlesmchen/accountAttributesVsPin' +|\ \ +| * | 3435be5ab (charlesmchen/accountAttributesVsPin) Preserve registration lock when updating account attributes. +| * | 0f7b85295 Persist registration lock PIN. +|/ / +* | 80a119481 (origin/mkirk/2fa-registration-style) Merge branch 'mkirk/2fa-registration-style' +|\ \ +| * | 60a1cc568 Make 2FA registration screen look like the rest of registration +|/ / +* | 471a19476 Merge branch 'charlesmchen/registerVsRateLimit' +|\ \ +| * | 9499e684e (charlesmchen/registerVsRateLimit) Handle rate limits in registration flow. +| * | 7543a8285 Handle rate limits in registration flow. +|/ / +* | 3207aedeb Merge branch 'charlesmchen/sharedBackgroundTask' +|\ \ +| * | 4f55079a7 (charlesmchen/sharedBackgroundTask) Respond to CR. +| * | 2d6b9a7c8 Respond to CR. +| * | 9db940956 Share background tasks. +|/ / +* | 07ee3ea84 Merge tag '2.21.0.5' +|\ \ +| |/ +| * b0b012046 (tag: 2.21.0.5) "Bump build to 2.21.0.5." +| * dc3d4553a Merge branch 'mkirk/respect-silent-switch' into release/2.21.0 +| |\ +| | * 6077367e6 Notification sounds should respect silent switch +| |/ +* | d516bcc29 Merge branch 'mkirk/2fa-reminders' +|\ \ +| * | 1d3831ecc Registration Lock reminder view +| * | 54792ff46 Fix overzealous assert. +|/ / +* | e8f4a7bfe Merge tag '2.21.0.4' +|\ \ +| |/ +| * 1c24cf7da (tag: 2.21.0.4) "Bump build to 2.21.0.4." +| * f0cdd0c9e Merge branch 'mkirk/fix-default-sound-for-new-users' into release/2.21.0 +| |\ +| | * 760b77297 Default fallback notification should now be "Note" +| | * 95011bdfe order messageReceived sounds in bundle +| |/ +| * 58d84b6d6 "Bump build to 2.21.0.3." +| * 4d65695bd Fix typo +| * ef6bfaf7b (tag: 2.21.0.2) "Bump build to 2.21.0.2." +| * 73ddab476 Merge branch 'mkirk/fix-splash-presentation' into release/2.21.0 +| |\ +| | * eca164805 Don't "show" upgrade splash when receiving a voip notification +| |/ +* | 1ff2f3f42 Merge tag '2.21.0.1' +|\ \ +| |/ +| * aa82f0aa4 (tag: 2.21.0.1) "Bump build to 2.21.0.1." +| * 91a52cd81 (private/release/2.21.0) Merge branch 'charlesmchen/debuglogs2' into release/2.21.0 +| |\ +| | * fa07b77ad Update cocoapods. +| | * 864f1cc8e Clean up ahead of PR. +| | * 4834a85fb Add share option for debug logs. +| | * 256a30029 Integrate with logs service. +| | * 7b84afaaf Integrate with logs service. +| | * 4bbf0d9e3 Integrate with logs service. +| | * 06d16bdec Revert "Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1"" +| |/ +| * aaed4b6a8 Merge branch 'charlesmchen/profileAvatarDownloads' into release/2.21.0 +| |\ +| | * e89a0f815 Respond to CR. +| | * 5e02032fc Fix profile avatar downloads. +| | * 69c49d4a7 Fix profile avatar downloads. +| | * b62a43217 Fix profile avatar downloads. +| | * 15921fa0b Fix profile avatar downloads. +| | * dfa082238 Fix profile avatar downloads. +| |/ +| * 7f51ada7d Merge branch 'mkirk/fix-sound-migration' into release/2.21.0 +| |\ +| | * 1d7e2e367 Fix migration to work with fallback notifications as well +| |/ +| * 716db9f4c Merge branch 'mkirk/more-prominent-default' into release/2.21.0 +| |\ +| | * 46d944740 Make default audio tone more prominent +| |/ +* | ac8dbf81f Merge branch 'mkirk/ri-check' +|\ \ +| * | 17ed0f610 dedupe git hooks +| * | 72428350c Audit for missing reverse integration upon committing to master +|/ / +* | b023e77d0 Merge branch 'charlesmchen/requestFactory' +|\ \ +| * | 7fa7f9506 Cleanup ahead of PR. +| * | bdee76c8c Update cocoapods. +| * | 3e6db43b2 Clean up ahead of PR. +| * | 2395dbf66 Fix redundant sync sends. +| * | 59c745756 Clean up codebase. +| * | c2f092018 Elaborate request factory. +| * | 3acdd8439 Elaborate request factory. +| * | 004479a2c Elaborate request factory. +| * | c17a81936 Elaborate request factory. +| * | 0ca497846 Elaborate request factory. +|/ / +* | df9cc1d9a Fix Cocoapods. +* | 12bd50c3e Merge branch 'charlesmchen/2faVsRegistration' +|\ \ +| * | a87b79341 Respond to CR. +| * | 288d049ce Update l10n strings. +| * | baf6fcc53 Add 2FA registration view. +|/ / +* | 0dd91ab53 Merge branch 'charlesmchen/redundantSyncSends' +|\ \ +| * | b9458fffe Respond to CR. +| * | dcf7f550a Fix redundant sync sends. +| * | b07f466e0 Fix redundant sync sends. +|/ / +* | 60259a8a1 Merge branch 'release/2.21.0' +|\ \ +| |/ +| * dafde88f8 (tag: 2.21.0.0) Merge branch 'charlesmchen/explicitExpireTimer' into release/2.21.0 +| |\ +| | * 71972ebe2 (charlesmchen/explicitExpireTimer) Be more explicit about expire timer. +| |/ +* | 6ca55790d Cleanup. +* | 743715268 Merge branch 'charlesmchen/2fa' +|\ \ +| |/ +|/| +| * caeb97b46 Respond to CR. +| * a5128273b Clean up ahead of PR. +| * 055061ff5 Clean up ahead of PR. +| * 8c5429791 Sketch out 2FA settings views. +| * 2ebea2911 Sketch out 2FA settings views. +| * 4afedac68 Clean up ahead of PR. +| * ea783a8ad Work on two-factor auth settings UI. +| * e12a1e984 Work on two-factor auth settings UI. +| * 1f6cbd399 Sketch out 2FA feature. +|/ +* 3f9eb603e Merge branch 'mkirk/fix-remote-video' +|\ +| * f0ca957a0 Fix remote video view +|/ +* 05d078133 Merge branch 'mkirk/audio-migration-fixups' +|\ +| * fa37fdd30 Fix legacy sounds for voip pushes +| * e5ab6f101 Clean up audio files +| * a068b8573 Audio splashscreen artwork/copy +|/ +* d0bcd8d6c Merge tag '2.20.2.2' +|\ +| * 2038aff9c (tag: 2.20.2.2, origin/hotfix/2.20.2) "Bump build to 2.20.2.2." +| * 20d759dfe Merge branch 'mkirk/explicit-timer-stop' into hotfix/2.20.2 +| |\ +| | * 28c30bbe5 Be explicit when disappearing messages are disabled +| |/ +* | 13b533621 Merge tag '2.20.2.1' +|\ \ +| |/ +| * e392febb6 (tag: 2.20.2.1) "Bump build to 2.20.2.1." +| * be68e0537 (tag: 2.20.2.0) bump version +| * fd2aaad5a Merge branch 'mkirk/fix-group-timer-sync' into hotfix/2.20.2 +| |\ +| | * b48452a74 Fix group-sync disabling disappearing timer +| |/ +* | a71e00397 Fix build break related to Swift 4.1 syntax. +* | bf48ccd4a Merge remote-tracking branch 'origin/hotfix/2.20.1' +|\ \ +| |/ +| * 85eba0cac (tag: hotfix/2.20.2, tag: 2.20.1.1, origin/hotfix/2.20.1) "Bump build to 2.20.1.1." +| * c8550055d Merge branch 'mkirk/fix-shares' into hotfix/2.20.1 +| |\ +| | * 12d51d9e2 Fix sharing url when text is also present +| |/ +| * b1dd325ce Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1" +| * e4ee3e000 Revert "Respond to CR." +| * 45201d45e Respond to CR. +| * 7bbad0d5a (tag: 2.20.1.0) "Bump build to 2.20.1.0." +| * 8f203f99b Update l10n strings. +| * 3b984bd39 (private/hotfix/2.20.1) Merge branch 'mkirk/perm-thread' into hotfix/2.20.1 +| |\ +| | * 9dfbf6e6b Fix crash presenting settings dialog off main thread +| |/ +| * 815c9af15 Merge branch 'charlesmchen/unsafeFilenameCharacters' into hotfix/2.20.1 +| |\ +| | * 579da1c76 Refine handling of unsafe filename characters. +| | * 47a6d844c Refine handling of unsafe filename characters. +| |/ +| * de5d17a39 Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1 +| |\ +| | * 7e1ae3316 Refine changes to debug logs. +| | * 920c2b1d7 Rework log upload. +| |/ +| * d32e90c3d Fix build break. +| * a471cc32b Merge branch 'charlesmchen/backgroundEdgeCases' into hotfix/2.20.1 +| |\ +| | * 59f480d5c Use background tasks during storage registration and disappearing message jobs. +| |/ +* | d53448409 Merge branch 'mkirk/migration-splash' +|\ \ +| * | 37fdd407d CR: Add translation comment +| * | cf6dfe08b Custom audio notifications upgrade experience +|/ / +* | 87fa553a7 Merge branch 'mkirk/default-audio-fallback-push' +|\ \ +| * | f1f7f8745 Use aifc files for all notification sounds so we can confidently copy them over the statically named "NewMessage.aifc" which is used by fallback notifications +| * | e020b0ff9 Persist default sound so we can use it for fallback notifications +|/ / +* | 75e3516eb Merge branch 'mkirk/callKitPrivacyVsiOS11' +|\ \ +| * | 658b8c322 CR: typos and doc changes +| * | 5959cdf07 Simplify call privacy settings +| * | 5b9ab0cf5 Auto-disable CallKit privacy in iOS 11 and later. +|/ / +* | 775682052 Merge branch 'charlesmchen/customNotificationSounds3' +|\ \ +| * | 8f22facec Respond to CR. +| * | 38ff82ab9 Rebrand OWSAudioPlayer. +| * | a16c2adda Rework conversation settings view. +| * | 306af29d6 Restore "sonar ping" for "call connecting." +| * | 32b87d0e5 Remove custom ringtones. +| * | efeb00643 Add title for the mute section in conversation settings view. +| * | e54cf313e Use quiet versions of the notification sounds in foreground. +| * | 55b9aa408 Preserve 'classic' Signal notification and ringtone for legacy users. +| * | 390cf3c80 Revive the 'classic' Signal notification and ringtone. +| * | ed95eec76 Preview sound settings in app settings and conversation settings views. +| * | 62af7ddc1 Add "none" option for sounds. Use AVPlayer for everything. +|/ / +* | 57ccde44f Merge branch 'charlesmchen/duplicateTimestampFail' +|\ \ +| * | ad78b1ea5 Convert duplicate timestamp fail to log. +|/ / +* | 42e136959 Merge branch 'charlesmchen/iOS9minimum' +|\ \ +| * | 2c1560692 Respond to CR. +| * | 99aedca45 Strip out special casing for pre-iOS 9 users. +| * | 44e38709d Update minimum iOS version to 9.0. +| * | 710d16418 Update minimum iOS version to 9.0. +|/ / +* | f0e1cea27 Merge branch 'mkirk/send-ice-updates-immediately' +|\ \ +| * | 5f305f844 Send ICE updates immediately after sending CallOffer for faster call connection. +|/ / +* | 76aee0581 Merge branch 'mkirk/dont-send-sender-read-receipts-to-self' +|\ \ +| * | b79244aff Don't enqueue sender read receipts from self-sent messages +|/ / +* | c66fb70b2 Merge branch 'mkirk/use-contact-ringtones' +|\ \ +| * | e8c5509f3 Respect system contact ringtones +|/ / +* | f7935bc36 Merge branch 'charlesmchen/customNotificationSounds2' +|\ \ +| * | 6c8a8fa09 Add new "note" audio asset for fallback push notifications. +| * | 0c20f2215 Improve sound settings view. +| * | e0144dab5 Improve sound settings view. +| * | 899799af9 Improve sound settings view. +| * | 5e8f3086d Update call sounds. +| * | a0f4723fa Update call sounds. +| * | a44a11761 Add custom ringtone sounds. +| * | cd3289565 Add UI for editing per-thread notification sounds. +| * | 396fe8270 Add UI for editing per-thread notification sounds. +| * | dc8b8ca0b Add per-thread custom notification sounds. +| * | 9aa02489b Custom notification sounds in local notifications. +| * | a837c5d41 Custom notification sounds. +| * | 60d839d7a Custom notification sounds. +| * | 5c3f6b0ee Custom notification sounds. +|/ / +* | 3d892abc4 "Bump build to 2.21.0.0." +|/ +* 03bea4fd8 (tag: 2.20.0.42, origin/release/2.20.0) "Bump build to 2.20.0.42." +* 9e3aa77fc Update l10n strings. +* cf39181d0 Merge branch 'mkirk/freeze-after-dismiss' +|\ +| * 5af112321 Fix freeze in host app after "dismissing" select thread VC +|/ +* 01cde6740 (tag: 2.20.0.41) "Bump build to 2.20.0.41." +* fbab526b3 Update l10n strings. +* ff88f1173 Update l10n strings. +* ec32d8839 (tag: 2.20.0.40) "Bump build to 2.20.0.40." +* e0793a0ea Merge branch 'charlesmchen/backgroundVsMigration' +|\ +| * 5235f9795 Use background task while migrating. +|/ +* 8ec9540b8 Merge branch 'charlesmchen/handleCaptions' +|\ +| * 10ca369da Respond to CR. +| * 6006d2287 Improve handling of attachments with captions. +| * 8576da791 Improve handling of attachments with captions. +| * 96b5f2279 Improve handling of attachments with captions. +|/ +* d30dd2204 (tag: 2.20.0.39) "Bump build to 2.20.0.39." +* 81629a87d Fix build break. +* 5e88110a0 (tag: 2.20.0.38) "Bump build to 2.20.0.38." +* 8e9261e1b (tag: 2.20.0.37) "Bump build to 2.20.0.37." +* 708ff7efb (tag: 2.20.0.36) "Bump build to 2.20.0.36." +* 1112f7a64 Merge branch 'charlesmchen/conversationViewVsModifiedExternal' +|\ +| * 152c57090 Respond to CR. +| * 03670b486 Rename the view horizon. +| * fabbe4611 Clean up ahead of PR. +| * 4e1e23282 Flush writes from other processes. +| * 1ff4f8524 Improve handling of db modifications while conversation view is not observing. +| * 5444fc73b Improve handling of db modifications while conversation view is not observing. +| * 2ac771677 Improve handling of db modifications while conversation view is not observing. +|/ +* 31d22e3e3 (tag: 2.20.0.35) "Bump build to 2.20.0.35." +* ba31059e4 Merge branch 'mkirk/fix-share-with-caption' +|\ +| * e43d0b1b5 Fix "Share" for attachment with caption +|/ +* 88d8eacc6 (tag: 2.20.0.34) "Bump build to 2.20.0.34." +* e27ab3620 Merge branch 'mkirk/remove-share-menu' +|\ +| * 5ba5d3f52 Remove "Share" from edit menu +|/ +* 9428b5d02 Merge branch 'mkirk/obscure-alert' +|\ +| * d7f8c3e9d Ensure inputAccessory doesn't obscure the SN alert +|/ +* c0d112639 Merge branch 'mkirk/fix-date-formatting-crash' +|\ +| * 7040437ca Handle nil date when formatting +|/ +* 2575d01b9 (tag: 2.20.0.33) "Bump build to 2.20.0.33." +* 26fbe28c4 Merge branch 'charlesmchen/legacyPasswordOnSuccess' +|\ +| * a4855acf4 Don't clear legacy db password until conversion completes. +|/ +* 85e504745 Merge branch 'charlesmchen/filterUnicodeOrderingCharacters' +|\ +| * 1109158b5 Add comment. +| * 70ba1720d Filter unicode ordering letters. +|/ +* 6ddd9d788 Merge branch 'charlesmchen/backgroundTaskVsDBTransactions' +|\ +| * 3bb802189 Use background tasks during db transactions. +|/ +* 2e1dad740 Merge branch 'charlesmchen/robustMigration2' +|\ +| * 706006539 Improve the robustness of the migration logic. +|/ +* cf507487c (tag: 2.20.0.32) "Bump build to 2.20.0.32." +* 4cfb71dc6 Merge branch 'charlesmchen/robustMigration' +|\ +| * d91507d89 Improve the robustness of the migration logic. +|/ +* e8cbba61f (tag: 2.20.0.31) "Bump build to 2.20.0.31." +* 9295a5630 Elaborate logging around storage migration. +* 1fb170715 Merge branch 'charlesmchen/heicHeifFixes' +|\ +| * 7132179c5 Fix handling of HEIF/HEIC when attaching image "as document." +|/ +* 11680958d (tag: 2.20.0.30) "Bump build to 2.20.0.30." +* b1c4dd7b5 Merge branch 'charlesmchen/storageFailureAlert' +|\ +| * 14122dab5 Fix the storage failure alert. +|/ +* 5d949368a (tag: 2.20.0.29) "Bump build to 2.20.0.29." +* e82954193 Merge branch 'charlesmchen/callConnectionGlitches' +|\ +| * 1a0f4bf92 Improve logging around network activity. +|/ +* ef7d5df09 (tag: 2.20.0.28) "Bump build to 2.20.0.28." +* fbbf432a4 Merge branch 'mkirk/file-browser' +|\ +| * 033505afd Remove slow file protection updates from launch path +| * 6eb1ce682 Debug file browser +|/ +* e6cad5dd2 Merge branch 'mkirk/call-audio-fixups' +|\ +| * 8dfe06e3f Ensure audio session is default after call is terminated. +| * 6eb1951ee Don't stop audio until after CallKit audio session is deactivated +|/ +* 9b73ff14b (tag: 2.20.0.27) "Bump build to 2.20.0.27." +* ef40f0821 "Bump build to 2.20.0.26." +* 8fde4a3a6 Merge branch 'mkirk/call-inaudible' +|\ +| * 707ab5f5a Minimize changes around call audio activity +| * 4dd1c7813 Instrument calls to ensure audio session is maintained +| * abb51b565 Don't de-activate audio sesion when other audio activities are happening +|/ +* 22d078f3c Merge branch 'charlesmchen/indicVsSAE' +|\ +| * 283fe1764 Apply Indic script fixes to SAE and master. +|/ +* 934193570 Merge branch 'charlesmchen/notMigratedWarning' +|\ +| * c937aaaf8 Improve handling of the not migrated case. +| * 6935298f6 Improve handling of the not migrated case. +|/ +* 5bc96d437 Merge branch 'charlesmchen/profileConsistency' +|\ +| * 03f6d473a Fix issues around profile updates. +|/ +* 3a2ec950c Merge branch 'charlesmchen/scrollVsAttachmentApproval' +|\ +| * ceaf02844 Always scroll to bottom after sending attachments. +|/ +* 90b8ee484 Merge remote-tracking branch 'origin/hotfix/2.19.7' +|\ +| * 3300e788e (tag: 2.19.7.6, private/hotfix/2.19.7, origin/hotfix/2.19.7) Bump build to 2.19.7.6. +| * 77bf0b66f Fix attachment MIME types. +| * 9c23e2baa (tag: 2.19.7.5) Bump build to 2.19.7.5. +* | d648a258d Merge branch 'hotfix/2.19.7' +|\ \ +| |/ +| * 4c8c40ca2 (tag: 2.19.7.4) Bump build to 2.19.7.4. +| * abfd333a1 Address Indic script crash. +* | a4906b278 Update l10n strings. +* | 950526f31 Merge branch 'charlesmchen/saeNotifications' +|\ \ +| * | 3ab33b997 Respond to CR. +| * | 33cb8b7e4 Revert "Surface error messages in SAE as alerts." +| * | bd51ae164 Surface error messages in SAE as alerts. +|/ / +* | 87233490d (tag: 2.20.0.25) "Bump build to 2.20.0.25." +* | 569728118 Merge branch 'charlesmchen/saeFilenames' +|\ \ +| * | 2e1b8a7b8 Respond to CR. +| * | 7ea1f3d92 Fix handling of file types in SAE. +| * | c2787341a Fix handling of URLs in SAE. +|/ / +* | efbcdb98f Merge branch 'charlesmchen/failedStatusMessage' +|\ \ +| * | 8fdc61c72 Fix failed status messages in message detail view. +|/ / +* | b511d60b3 Merge branch 'charlemschen/signalAppearanceVsSAE' +|\ \ +| * | fdf9b023b Don't apply signal appearance in SAE. +|/ / +* | 53eb9d07e (tag: 2.20.0.24) "Bump build to 2.20.0.24." +* | 394cd5c94 Merge branch 'charlesmchen/refineSAELifecycle' +|\ \ +| * | c29898f43 Refine the SAE lifecycle. +|/ / +* | 1259851f7 (tag: 2.20.0.23) "Bump build to 2.20.0.23." +* | 47aa29db2 Fix build breakage. +* | da8da2921 (tag: 2.20.0.22) "Bump build to 2.20.0.22." +* | 1c69cd3dc Merge branch 'mkirk/missing-messages' +|\ \ +| * | da15f245c CR: fix early return, assert on error +| * | b4359b33d Fix "lose messages received while in background" +|/ / +* | 4262a83e0 (tag: 2.20.0.21) "Bump build to 2.20.0.21." +* | c1a78d1f1 Merge branch 'charlesmchen/saeShutdown' +|\ \ +| * | d13511ca7 Exit SAE when complete. +|/ / +* | d374e6ab8 "Bump build to 2.20.0.20." +* | 7ff99fe76 Merge branch 'mkirk/fixup-readiness-dispatch' +|\ \ +| * | 5c432a2bc Fix crash on launch in debug. +|/ / +* | 0522f33a8 (tag: 2.20.0.19) "Bump build to 2.20.0.19." +* | f8b7c08be Merge branch 'charlesmchen/batchProcessingGlitch' +|\ \ +| * | b7958262b Respond to CR. +| * | 8930110ef Fix glitch in batch processing of incoming messages. +| * | 6f28c7525 Fix glitch in batch processing of incoming messages. +|/ / +* | e48542e1d Merge branch 'charlesmchen/iOS8Nag' +|\ \ +| * | 9508761f0 Respond to CR. +| * | 4b62faf2f Aggressively nag iOS 8 users to upgrade iOS. +|/ / +* | 132bf81c0 Update l10n strings. +* | 09665973a (tag: 2.20.0.18) "Bump build to 2.20.0.18." +* | 508bc72e6 Merge branch 'mkirk/logging-fixups' +|\ \ +| * | 3d5f7e6bf Clean up logging +|/ / +* | 929233c9e Merge branch 'mkirk/media-detail-tap-shift' +|\ \ +| * | c6e5d4369 Don't adjust inset when fully zoomed in. +|/ / +* | e0294b238 Merge branch 'mkirk/fix-redundant-transcript-caption' +|\ \ +| * | 4d0362f9a Don't create redundant caption for sync'd transcripts. +|/ / +* | 337f4a141 Merge branch 'mkirk/fix-details-bubble-layout' +|\ \ +| * | 19eb17b46 Fix bubble layout in message details +|/ / +* | 6c357e822 (tag: 2.20.0.17) "Bump build to 2.20.0.17." +* | 042f32bd2 Merge branch 'charlesmchen/messageSenderDeadlocks' +|\ \ +| * | 81522e4a2 Respond to CR. +| * | 888bf9256 Avoid deadlocks in message sender. +| * | 01496b2db Avoid deadlocks in message sender. +| * | a19882baa Avoid deadlocks in message sender. +|/ / +* | d5e61dac9 Merge branch 'collinstuart/constant-time-compare' +|\ \ +| * | cc94573e9 Constant time compare +|/ / +* | b358a75e3 Merge branch 'mkirk/crash-on-first-message' +|\ \ +| * | ea12ed4c2 Fix dynamic type check which was too restrictive +|/ / +* | f131c71d9 Merge branch 'charlesmchen/messageDateTimes' +|\ \ +| * | 0944c2661 Respond to CR. +| * | 48b6c3daf Refine message date/time formatting. +|/ / +* | 2d7a10ac0 [Pods] remove userdata +* | 286c0133d Update Cocoapods. +* | 3e14e9602 update l10n strings. +* | 3246bcf62 [Pods] remove userdata dir from Pods.xcodeproj +* | b999cd9e6 Merge branch 'mkirk/crash-on-search' +|\ \ +| * | ae2ddb25c CR: add assert +| * | d6b3e191d Fix crash while searching when group somehow has nil members +| * | a23f1b86e nullability annotations for TSGroupModel +|/ / +* | 945c7cd1f Merge branch 'mkirk/fix-notification-percents' +|\ \ +| * | cb8767d19 CR: duplicate comments, DRY +| * | 44678e395 CR: weak capture and clearer comments +| * | debd556e0 Fix notification % escaping, debug UI +| * | 9ad437a04 Merge remote-tracking branch 'jlund/github-updates' +| |\ \ +| | * | e411bd5ee Update cocoapods. +| | * | 2c18a75d1 Update to the new GitHub organization name +| |/ / +| * | f3d0cb49e Merge branch 'charlesmchen/debugLogging' +| |\ \ +|/ / / +| * | e3776015b Respond to CR. +| * | 246a56e92 Respond to CR. +| * | 33686594e Tweak debug logging. +|/ / +* | ab95c501e Merge branch 'charlesmchen/appDelegateHooksVsAppReadiness' +|\ \ +| * | 44cbf142a Respond to CR. +| * | 3e8b08e19 Defer handling app delegate hooks until app is ready. +|/ / +* | 6ed5d814f Merge branch 'charlesmchen/saeTODOs' +|\ \ +| * | ba42ac73d Revisit TODOs in the SAE work. +| * | 9c8178653 Revisit TODOs in the SAE work. +|/ / +* | ebb778cf5 Merge branch 'charlesmchen/saeRefinements' +|\ \ +| * | d54f6aba0 Refine SAE UI. +| * | 114df1837 Refine SAE UI. +|/ / +* | 6feaf0db1 Merge branch 'charlesmchen/appLaunchFailure' +|\ \ +| * | 7c199faf8 Respond to CR. +| * | 98843cd45 Let users submit debug logs if app launch fails. +|/ / +* | 4aaae856d (tag: 2.20.0.16) "Bump build to 2.20.0.16." +* | 4bf453da3 Merge branch 'mkirk/rtl-caption' +|\ \ +| * | 5e95c9060 Fix "caption toolbar not showing" for RTL +|/ / +* | 9b8e2449f Update Carthage for iOS8 compatible WebRTC M63 +* | dc8b5fb97 track pod dependencies publicly +* | 87ef6b1af Merge branch 'mkirk/fix-disappearing-detail' +|\ \ +| * | 5793211a0 Fix "bubble disappears" when receiving read receipt +|/ / +* | 11ad4e788 (tag: 2.20.0.15) "Bump build to 2.20.0.15." +* | 208416f83 Merge branch 'charlesmchen/protocolContext_' +|\ \ +| * | b64528e81 Respond to CR. +| * | 78c4c00ea Respond to CR. +| * | 862172072 Respond to CR. +| * | bd0f60179 Respond to CR. +| * | 38950ae2e Respond to CR. +| * | 6b357f944 Respond to CR. +| * | 43765ef3b Respond to CR. +| * | 51cec20c5 Clean up ahead of PR. +| * | 7d3f79440 Clean up ahead of PR. +| * | c8e7eb903 Add protocol context to protocol kit. +| * | bbd689bfd Add protocol context to protocol kit. +| * | d3e16583e Add protocol context to protocol kit. +| * | 074046b98 Add protocol context to protocol kit. +| * | 7358f3053 Add protocol context to protocol kit. +| * | 218bb15ea Add protocol context to protocol kit. +| * | 39e353503 Add protocol context to protocol kit. +| * | 71782e036 Add protocol context to protocol kit. +| * | 122ef91e5 Add protocol context to protocol kit. +|/ / +* | 169c455d1 Merge branch 'mkirk/open-settings-vs-share-extension' +|\ \ +| * | a1d307370 Cannot open settings from share extension +|/ / +* | bedd1f55f Merge branch 'mkirk/fix-voiceover-rebased' +|\ \ +| * | c646f7633 Garther audio concerns, clean up session when done +|/ / +* | fa9ac5aa4 Merge branch 'mkirk/restrict-pan-gesture' +|\ \ +| * | 7734958ee Make "swipe for info" RTL compatible +| * | 54f7c298b Only initiate "show details" pan gesture when swiping back +| * | 76d1b9dad proper title case +|/ / +* | c82571bd3 Merge branch 'mkirk/fix-receiving-calls' +|\ \ +| * | e3469649f Fix receiving calls +|/ / +* | d3362d5b4 Merge branch 'mkirk/iphonex-vs-sharing' +|\ \ +| * | 0f9dd46b9 Fix attachment approval layout on iPhoneX +|/ / +* | c0bf3d57c (tag: 2.20.0.14) "Bump build to 2.20.0.14." +* | dbf2c6575 Merge branch 'charlesmchen/experienceUpgradesVsIPhoneX' +|\ \ +| * | 11cdd2790 Fix layout of experience upgrade view on iPhone X. +| * | c67c46217 Fix layout of experience upgrade view on iPhone X. +|/ / +* | 94b34e241 Merge branch 'charlesmchen/protoUpdates' +|\ \ +| * | 799949e54 Refine sync messages. +| * | 59ff1561f Set the timestamp property on data messages. +| * | 4218af13d Send image width/height for image and video attachments. +| * | 3a4180214 Send image width/height for image and video attachments. +| * | 43ed8d9a5 Send "disappearing messages" state for groups. +| * | b16a65a4c Sync block state for contacts. +| * | 742d4cabc Send "disappearing messages" state for contacts. +| * | 2dc37d598 Updates service proto schema to latest. +|/ / +* | e39ca59ee Merge tag '2.19.5.0' +|\ \ +| |/ +| * c60422e92 (tag: 2.19.5.0, origin/hotfix/2.19.5) bump version +| * 9ee293227 Merge branch 'mkirk/fix-movie-confirmation-preview' into hotfix/2.19.5 +| |\ +| | * 3a5fa63cd Fix confirmation preview +| |/ +| * 497b8b960 Merge branch 'mkirk/dont-hide-keyboard-when-menu-popped' into hotfix/2.19.5 +| |\ +| | * f41dfa509 Re-aquire first responder when necessary. +| |/ +* | d4c20ad5c Merge branch 'mkirk/keygen-revamp' +|\ \ +| * | 4f8db63fb Ensure keyspec is generated before DB is created +| * | 6f959ff29 CR: be more conservative about deriving key spec, clear old passphrase after deriving key spec. +| * | d22fc664f more granular key access +| * | 426c9baa1 Key material changes +| * | 938b9c85b Don't crash on clean install +| * | 44bbaeef5 fixup test +|/ / +* | 10c503bd3 Merge branch 'charlesmchen/fixSAE' +|\ \ +| * | 5f20d32b4 Fix SAE readiness. +|/ / +* | 9605d80e9 (tag: 2.20.0.13) "Bump build to 2.20.0.13." +* | 419df70e0 Merge branch 'mkirk/fixup-tests' +|\ \ +| * | c4edb0b53 Fixup some tests +|/ / +* | a2b9f9bfc Merge branch 'charlesmchen/asyncDBRegistrations' +|\ \ +| * | 4bfdef520 Respond to CR. +| * | a30170b3b Prefer "app is ready" flag to "storage is ready" flag. +| * | be1fde905 Don't mark app as ready until all version migrations are done. +| * | 3e09143a3 Update YapDatabase to reflect CR. +| * | 1c4b321a9 "Bump build to 2.20.0.12." +| * | 963d0547a Clean up ahead of PR. +| * | 8e427111e Clean up ahead of PR. +| * | ebbe96a5d Clean up ahead of PR. +| * | f9f60bc14 Ensure app delegate hooks are ignored until app is ready. +| * | d46914831 "Bump build to 2.20.0.11." +| * | 6eddfae21 Improve post-migration testing tools. +| * | bb44def8b "Bump build to 2.20.0.10." +| * | 769c1ce24 "Bump build to 2.20.0.9." +| * | 02a972c9d Improve logging in database conversion; disable orphan cleanup. +| * | 8325c3719 Fix build breakage. +| * | 873c78913 Fix build breakage. +| * | b9ec7d96e Register all database views asynchronously. +| * | aeeef4341 Register all database views asynchronously. +| * | b21f79375 Register all database views asynchronously. +| * | eb180ba5c Register all database views asynchronously. +| * | 100adae24 Register all database views asynchronously. +| * | 5cf89a0f3 Register all database views asynchronously. +|/ / +* | 96b7dc516 Update YapDatabase to reflect CR. +* | df240da7e Merge branch 'charlesmchen/photosAsDocuments' +|\ \ +| * | fa76e524c Respond to CR. +| * | 9c84bdb10 Add support for images as documents. +|/ / +* | f4323411d Merge branch 'charlesmchen/debugUIRefinements_' +|\ \ +| * | 7ebeeda5f Clean up ahead of PR. +| * | 3609275c2 Handle malformed row updates. +| * | 6f7f1b3b0 Improve pre-migration testing tools. +| * | 9d101c3f5 Elaborate Debug & Internal UI. +| * | 32b3e89c5 Elaborate Debug & Internal UI. +|/ / +* | 585f15a01 Respond to CR. +* | 115e98af1 Merge branch 'mkirk/block-vs-share' +|\ \ +| * | 456a931b9 Fix block handling for ContactThreads, previously it only worked for recipients without a thread. +|/ / +* | eb440c1c8 "Bump build to 2.20.0.8." +* | 3c2b5e54d Add more logging to database conversion. +* | d9bec1db5 (tag: 2.20.0.7) "Bump build to 2.20.0.7." +* | 639fdb937 (tag: 2.20.0.6) "Bump build to 2.20.0.6." +* | 41b7a8dd7 Fix build breakage. +* | 867451266 (tag: 2.20.0.5) "Bump build to 2.20.0.5." +* | e2fa695fc Fix build break. +* | 2003c6888 (tag: 2.20.0.4) "Bump build to 2.20.0.4." +* | 0ba93a1a0 Merge branch 'charlesmchen/saeVsFileTypes2_' +|\ \ +| * | b3e6278a4 Clean up ahead of PR. +| * | 51fb062af Revert "Revert "Clean up ahead of PR."" +| * | 9d909025c Handle UIImage shares. +| * | 374714c45 Clean up ahead of PR. +| * | 87f5648fc Revert "Clean up ahead of PR." +| * | 79ee6fa31 Add Debug UI around sharing UIImage. +|/ / +* | 0c6639cf5 Merge branch 'charlesmchen/saeVsFileTypes' +|\ \ +| * | 6a7f06f94 Respond to CR. +| * | 74cd37dd7 Clean up ahead of PR. +| * | 56ef293ed Clean up ahead of PR. +| * | f19448226 Clean up ahead of PR. +| * | 0c16f0ad5 Clean up ahead of PR. +| * | b61c716ea Clean up ahead of PR. +| * | 9c3415a91 Clean up ahead of PR. +| * | 30b3463c0 Clean up ahead of PR. +| * | 9b5327cc8 Improve handling of unexpected types. +| * | d1c17167c Don't send text files as text messgaes. +| * | 64e4f054b Add message approval view. +| * | e905098fb Add message approval view. +| * | 069587b15 Add message approval view. +| * | 9845ef6da Add message approval view. +| * | 3cfc77835 Add message approval view. +| * | 2af858c52 Add message approval view. +| * | 979386ee9 Improve handling of text and url shares. +| * | 5770a18b0 Handle text shares like URLs. +| * | 9718387af Send URLs as text messages. +| * | 085975ebe Prepopulate caption field with URL. +| * | 9c4ce3d30 Exclude contacts from SAE. +| * | 2e8a53b4a Don't add captions to text messages. +| * | 992e92614 Unpack oversize text messages if possible. +| * | 6e70c479e Improve handling of contacts. +| * | d85ccd1aa Handle data-based share item providers. +| * | 23c1db5cc Refine filtering of share types. +| * | fc4b0a359 Clean up ahead of PR. +| * | 3f74c488b Clean up ahead of PR. +| * | 03877867f Clean up ahead of PR. +| * | b9bd21e73 Improve presentation of text attachments in attachment approval view. +| * | c0d4c3f1d Fix handling of URL shares. +| * | 112e36943 Fix handling of URL shares. +| * | 6a80db784 Enable support for sharing urls in SAE. +|/ / +* | a14e1e8fd Merge branch 'charlesmchen/unregisterVsSAE' +|\ \ +| * | da0b7df1b Respond to CR. +| * | 482ad0864 Handle unregistration in SAE. +|/ / +* | 8a936dcbd Merge branch 'charlesmchen/removeSpuriousWarning' +|\ \ +| * | 6a81d8e5c Respond to CR. +| * | 7e769de5d Remove spurious warning. +|/ / +* | 1db1768af Merge branch 'charlesmchen/slaveBuildOpenSSL' +|\ \ +| * | 513ba5776 Update OpenSSL build. +|/ / +* | 9dbd907b7 Merge branch 'charlesmchen/internalBuildNumberSuffix' +|\ \ +| * | fd0bc807d Remove suffix for internal build numbers. +|/ / +* | 785cc14ad Merge branch 'charlesmchen/databaseConversion' +|\ \ +| * | 21a010672 Update reference to YapDatabase. +| * | d8f72dbec Clean up ahead of PR. +| * | 0cc7f3e00 Clean up ahead of PR. +| * | 2375cc2f7 Add support for key specs. +| * | 5d422e03d Add support for key specs. +| * | c5079ed3d Add support for key specs. +| * | 224c24e68 Use key spec for databases. +| * | a3e77019e Update storage to use database salts. +| * | 2773fcb5d Clean up ahead of PR. +| * | 149199138 Clean up ahead of PR. +| * | a05acd017 Add protocol context to protocol kit. +| * | d0f1706a4 Modify YapDatabase to read converted database. +| * | 3cd1b2c96 WIP comment +| * | acc97b197 Properly force checkpoint at end of conversion +| * | 468dedf58 Use debug configuration when building Signal for tests +| * | 629713792 Disable optimizations when building tests for SignalMessaging +| * | eadb64b75 Elaborate test suite around database conversion. +| * | 9801689c0 Modify YapDatabase to read converted database. +| * | 0a2439937 cleanup +| * | 45e44ca08 Modify YapDatabase to read converted database, part 3. +| * | d7a43d00d Modify YapDatabase to read converted database, part 2. +| * | 173da64bc Modify YapDatabase to read converted database, part 1. +| * | 3b681aba3 Successfully convert database. +| * | cc15092eb Resolve issues around database conversion. +| * | 11a709a62 WIP: set plaintext header length +| * | 71dc7f55d Copy DB setup / keying from Yap into conversion +| * | 05035e40a Fixup tests +| * | c6cc497ea Don't migrate database until verifying keychain is accessible +| * | 1bff0f2b0 Incomplete commit starting work on loading databases for conversion. +| * | 5ba5b763e Add tests around database conversion. +| * | dc7334257 Convert databases if necessary. +| * | 6b51be75a Revert "Set preprocessor symbols for internal builds." +| * | a91056c5e Set preprocessor symbols for internal builds. +|/ / +* | fcb9c2e64 Merge branch 'mkirk/fix-timer-offset' +|\ \ +| * | 6491bb895 Fix timer offset +|/ / +* | a70a97ae4 Merge branch 'mkirk/disappearing-status' +|\ \ +| * | 886c0174a Rename color per code review +| * | baa312f44 Timer button with duration label +| * | 5c76d4c99 Stopwatch Asset instead of hourglass +| * | 5c2075cdb Show disappearing messages timer in share extension +|/ / +* | e0ea3921f Merge branch 'mkirk/media-permissions' +|\ \ +| * | 3ca5ec272 Ensure media-library permissions when accessing media library +|/ / +* | 4b03482ee Merge branch 'charlesmchen/releaseConfiguration' +|\ \ +| * | c947f6b22 Modify build version script to support --version and --internal switches. +| * | 4e15e9bf2 Add Signal "internal" scheme with DEBUG and INTERNAL flags set for signal project. +| * | a21bc4f4b Convert SAE scheme to a shared scheme. +|/ / +* | c7376d76c Merge branch 'mkirk/fullscreen-approval' +|\ \ +| * | 5dde17d93 Show approval/caption view in app. +|/ / +* | 58558b36d Add clarifying comment. +* | d75b57758 Merge branch 'mkirk/ri-2-19-4' +|\ \ +| * \ 3f3a4bc49 Merge remote-tracking branch 'origin/master' into mkirk/ri-2-19-4 +| |\ \ +| |/ / +|/| | +* | | 6532a3237 Merge branch 'CollinStuart-collinstuart/update-build-documentation' +|\ \ \ +| * | | 225ad5a4a Update build instructions +| * | | f542e0d25 Update build instructions +|/ / / +| * | 94d58b88b Play video inline in approval view +| * | 0c6a42003 clang-format after RI +| * | a423fe8a0 WIP Merge tag '2.19.4.4' +| |\ \ +|/ / / +| | _ +| * 56112e79b (tag: 2.19.4.4, origin/hotfix/2.19.4) bump build +| * 7eb6b1cdd Revert submodule update from "Bump version to 2.19.4." +| * a4cadfecf (tag: 2.19.4.3) bump build +| * 764b81535 (tag: 2.19.4.2) bump build +| * 9c9734f5a Merge branch 'hotfix-2-19-4/fix-zoom' into hotfix/2.19.4 +| |\ +| | * 63c23b77d Cleanup presentation view, feels less blurry +| | * 1ef824029 Fix distorted images +| | * 3582ab42d Fix media detail presentation +| | * 7c2bfdfb1 rename: imageView -> mediaView +| | * 8851413b3 CR: cleanup, remove debug animation time, move constant +| | * e140ffc42 Fullscreen presentation touchups +| |/ +| * d6ea5bad6 Merge branch 'hotfix-2-19-4/fix-content-offset' into hotfix/2.19.4 +| |\ +| | * 74e03aad0 Fix intermittent content offset problem +| |/ +| * 7be8f0083 (tag: 2.19.4.1) Bump build to 2.19.4.1. +| * ea4912e93 Merge branch 'mkirk/fix-keyboard-glitch' into hotfix/2.19.4 +| |\ +| | * 74019b2ae Fix keyboard animation glitch after sending +| |/ +| * e11ac51e3 (tag: 2.19.4.0) Bump version to 2.19.4. +| * 2b81d4553 Merge branch 'mkirk/input-accessory-view' into hotfix/2.19.4 +| |\ +| | * 1ec409ad2 CR: re-enable default keyboard toggle +| | * c91658119 CR: double tap zoom centers on tap location +| | * 8d2934d86 CR: remove unnecessary code, comments +| | * 412fe2735 Rename FullImageViewController -> MediaDetailViewController +| | * 8454e512d Use FullSreen media VC for message details +| | * c7c433c59 iOS8 compatability for video player +| | * 86d61eee3 Custom video player layer to avoid "double present/dismiss" +| | * 918e3f7df Videos play in full-screen media view controller, use modern movie player. +| | * 81268012e Better keyboard management. +| |/ +* | 7947cc0fe Merge branch 'charlesmchen/updateOpenSSL' +|\ \ +| * | 63dc3391b Update OpenSSL to new version, app extension compliant. +|/ / +* | 5aa016add Merge branch 'charlesmchen/sessionEdgeCases_' +|\ \ +| * | 0d5b5bc44 Respond to CR. +| * | 3de9a4ea5 Add debug UI actions around clearing and snapshotting session state. +|/ / +* | a1770ec7f Merge branch 'charlesmchen/robustBackup' +|\ \ +| * | 05b034e92 Clear out NSUserDefaults during backup restore. +| * | 67197ddf1 Rename any existing files and directories in restored directories. +|/ / +* | 09032552c Merge branch 'charlesmchen/dontUseMainApplicationState' +|\ \ +| * | 2b528ad89 Don't use mainApplicationState in business logic. +|/ / +* | b271eab4c Merge branch 'charlesmchen/skipRedundantSyncMessages' +|\ \ +| * | fec2410ac Respond to CR. +| * | 3f2bee838 Respond to CR. +| * | d81d85c38 Respond to CR. +| * | c308e2511 Skip redundant sync messages. +| * | a2b67a17f Skip redundant sync messages. +| * | 41e6eaeaf Skip redundant sync messages. +|/ / +* | de4c5e0b1 Merge branch 'charlesmchen/sessionDatabaseRevert2_' +|\ \ +| * | 76676659f Respond to CR. +| * | 17907dca1 Clean up ahead of PR. +| * | 15b8e5832 Retain changes from session database branch. +|/ / +* | 76a295aaa Merge branch 'charlesmchen/backup' +|\ \ +| * | 59933ce1d Fix rebase breakage. +| * | 5ba8445f0 Fix rebase breakage. +| * | df53033ca Clean up ahead of PR. +| * | 0422e4252 Clean up ahead of PR. +| * | f6296f1fe Clean up ahead of PR. +| * | 16f731757 Complete backup restore/import. +| * | 272a90d26 Add import back up UI. Begin work on import backup logic. +| * | 857ca56ab Rework progress mode of export backup UI. +| * | 980b3d25a Rework "export backup" UI. +| * | cb4b44b8f Lock databases during backup export. +| * | b77382f99 Fix security issues in the backup process. +| * | 2011dae8b Show share UI for backups. +| * | ea945558c Show share UI for backups. +| * | 2789c0f12 Write backup to encrypted zip. +| * | 8769fb07c Write backup to encrypted zip. +|/ / +* | 221a21115 Merge branch 'charlesmchen/saeLookupNonContacts' +|\ \ +| * | 58e925268 Let users send to non-contacts, non-threads in SAE. +| * | 4d6ee9e2d Let users send to non-contacts, non-threads in SAE. +| * | 9e89502fd Let users send to non-contacts, non-threads in SAE. +|/ / +* | 49fc30229 Merge branch 'charlesmchen/sessionDatabaseRevert_' +|\ \ +| * | 89c7ebf74 Respond to CR. +| * | bf3f5dd14 Respond to CR. +| * | 77572bdae Retain changes from session database branch. +| * | 1839b1055 Retain changes from session database branch. +| * | 9ac2383a2 Retain changes from session database branch. +| * | e77c3e671 Retain changes from session database branch. +|/ / +* | b8c6d2917 Merge branch 'charlesmchen/storageReset' +|\ \ +| * | d01ec57f0 Fix storage reset. +|/ / +* | 23693c8ce Merge branch 'charlesmchen/sendDatabase' +|\ \ +| * | 3a9886bb2 Send database action in debug UI. +|/ / +* | eefd66e4a Merge branch 'mkirk/sharing-vs-sn' +|\ \ +| * | 3a6ddd4bf CR: cleanup +| * | 6e2d9c814 identity change vs. share extension +| * | 6b5883dc1 Don't resize attachment view when switching between alerts. +|/ / +* | 697fc4ff4 Merge branch 'mkirk/fix-message-detail-view' +|\ \ +| * | 46930b935 Fix crash when viewing non-attachment message details. +|/ / +* | 3b17c43e8 Merge branch 'mkirk/fix-profile-flicker' +|\ \ +| * | 4e6816ec5 (private/mkirk/fix-profile-flicker) Code cleanup +| * | 14723f3e7 Fix profile avatar flicker +|/ / +* | 34d2df8d6 Merge branch 'mkirk/attachment-progress' +|\ \ +| * | 01fa3c89c CR: cleanup comments, extract callback into method +| * | b87079d4b Sharing attachment shows progress / retry dialog +|/ / +* | 37ee9f0e7 Merge branch 'mkirk/attachment-caption' +|\ \ +| * | 42ea1dfbb CR: more margin, match button size to default text field, fix layout when rotated. +| * | 8141843f2 comment typo +| * | 7907a64df move gradient up with keyboard +| * | 653a272b5 Don't obscure attachment when keyboard is popped. +| * | 38d94952f Shadow for Send button, clean up color accessors +| * | cfa147831 "Done" button for caption toolbar +| * | 9eb4178c6 style for captioning toolbar +| * | 513e33b0f Cleanup before code review +| * | cf091758a Fix oversized text messages +| * | 82aeee301 can delete text messages again +| * | f5b9ae97e fix insets for incoming vs outgoin +| * | eeaea5fa0 better match for corner radius +| * | 0ea3a3655 make sure captioned attachment doesn't grow too large +| * | 2c20cb9e7 make sure mediaview isn't too tall in detail view +| * | 411de65b4 TODO: Show caption in details +| * | 0e9c9a9bb Separate gestures for text/vs media +| * | 92477c78b cleanup before PR +| * | bce18637f render attachments with captions +| * | 3176cb5a6 text sizing correctly +| * | f8866c4e0 Fix some constraints, get other attachment types looking good +| * | 76ca52f33 caption bubble properly sized, but all attachments make space now +| * | 3eb3c268a Towards a caption in message +| * | e20f44024 WIP: Support sending attachment captions +| * | 0964c1641 cleanup, plus ill fated attempt to offset content beyond keyboard height. +| * | 26be69975 cleanup constraint based layout +| * | 3a078c831 lays out in iOS11, but doesn't resize +| * | 03e786a14 input toolbar looks good on iOS9/10, but totally broken on 11 +| * | 96906440a remove height animation, ensure growing text area has content in proper place. +| * | 562e706ec animate height change, but looks goofy +| * | a5c5dd3f9 WIP, extract subclass +| * | 9ee9a0efe resizing input accessory view. +| * | f9524b02e multiline must be textview, not textfield +| * | 57a5e62db WIP - attachment caption +|/ / +* | 76481a86a stabalize sort for same-named SignalAccounts +* | 4e8b836e0 Merge branch 'charlesmchen/sessionDatabase2' +|\ \ +| * | 05100b114 Respond to CR. +| * | 6b0e3508a Respond to CR. +| * | 245304116 Respond to CR. +| * | 085f8a6f6 Clean up ahead of PR. +| * | 70926d7f1 Clean up ahead of PR. +| * | 6b58b4cbd Rework database view registration. +| * | fe67cd924 Rework database view registration. +| * | f88b954ab Clean up TSStorageManager usage. +| * | d3efb2e1c Clean up TSStorageManager usage. +| * | 9258b0883 Clean up TSStorageManager usage. +| * | d52eba739 Clean up TSStorageManager usage. +| * | 85686d314 Continue TSStorageManager refactor. +|/ / +* | b496a1095 Merge branch 'charlesmchen/sessionDatabase_' +|\ \ +| * | 9a990b58e Respond to CR. +| * | 1163e76de Clean up ahead of PR. +| * | 9815bca82 Clean up ahead of PR. +| * | 92b870ca1 Clean up ahead of PR. +| * | 5dcf4b3bb Clean up ahead of PR. +| * | 137fe6fb8 Pull out OWSStorage base class for TSStorageManager. +| * | a29c4ce5d Pull out OWSStorage base class for TSStorageManager. +|/ / +* | 40ec86907 Merge branch 'charlesmchen/attachmentDownloadsVsBackground' +|\ \ +| * | a572285ad Respond to CR. +| * | 2cc375290 Improve background task logic. +| * | c3b6de4f8 Improve background task logic. +| * | f9ce34f55 Improve background task logic. +| * | 5adf98788 Use background task during message processing. +| * | df8ded90b Use background task during attachment downloads. +|/ / +* | 157bf0041 Merge branch 'hotfix/2.19.3' +|\ \ +| |/ +| * ced4e3b78 (tag: 2.19.3.3, origin/hotfix/2.19.3) Bump build to 2.19.3.3. +| * d5762470b (tag: 2.19.3.2) Bump build to 2.19.3.2. +| * b0f9a03e5 Merge branch 'mkirk/replace-cache-for-migration' into hotfix/2.19.3 +| |\ +| | * 1955f3664 CR: clarify names, comments, asserts +| | * 60eac4e0b notify only when SignalAccounts actually change +| | * 27c99cf4d sort SignalAccounts loaded from cache +| | * e78edcde8 Only clear cache when user pulls-to-refresh +| | * 49196f801 Spin activity indicator until contacts are fetched +| | * f4e471e0d SignalAccount cache perf improvments +| |/ +* | bdb9eed88 Merge branch 'charlesmchen/yapDatabaseCrash1' +|\ \ +| * | 3643414da Respond to CR. +| * | e45d63e86 Clean up ahead of PR. +| * | 0c9d9ba67 Fix issues around cross process db changes. +| * | 0be63d293 Add "send to last thread" option in debug logs. +| * | f57c12f34 Update YapDatabase. +| * | 571840b1d Update YapDatabase. +| * | 609536fcb Include build version in logging. +| * | bc7f4623c Update YapDatabase. +| * | c8351cef5 Update YapDatabase. +|/ / +* | 4f0651853 Merge tag '2.19.3.1' +|\ \ +| |/ +| * f18245009 (tag: 2.19.3.1) bump build +| * 162b33ed5 Merge branch 'mkirk-2.19.3/fixup-account-cache' into hotfix/2.19.3 +| |\ +| | * 1f8042685 Show loading cell when contacts are still loading. +| | * c07d7777c Reinstate notification when SignalAccounts change +| |/ +* | 3affb07a1 post-merge formatting fixup +* | 16448e2a0 Merge tag '2.19.3.0' +|\ \ +| |/ +| * 6f7cae691 (tag: 2.19.3.0) Log counts to determine when SignalAccount cache goes missing +| * f272c9088 Merge branch 'mkirk-hotfix-2.19.3/persist-signal-accounts' into hotfix/2.19.3 +| |\ +| | * 64e90d29f CR: extract method, more asserts and annotations +| | * 42dc872c9 use dedicated read connection to pre-populate cache +| | * 336c92dda remove cached display name machinery, cleanup +| | * 7ea4b85a2 Persist signal accounts (and their embedded Contact) +| |/ +| * 9cea6971b (tag: 2.19.2.0, origin/hotfix/2.19.2) bump version +* | a0f44f75e (tag: 2.20.0.3) Bump build to 2.20.0.3. +* | 2b038dfd3 sync translations +* | 481427bf9 Merge branch 'mkirk/share-audio' +|\ \ +| * | 6fb5990fa Don't zoom for audio/generic attachments +| * | 73b215229 Fixup approval view for audio and generic attachments +|/ / +* | 26c76e6a0 Merge branch 'mkirk/convert-video' +|\ \ +| * | f9d22545b Only copy imported video when necessary. +| * | 849388feb CR: clean up loading assets once no longer needed +| * | 03220ffa7 CR: Faster animation from loading -> picker +| * | 813f4e474 Respond to CR +| * | 47e92dbad cleanup +| * | 899674127 DocumentPicker converts to mp4 when necessary +| * | 031e40d09 Use SignalAttachment logic in conversation view too +| * | 7d0acc94f cleanup +| * | 56f1bf030 cleanup +| * | 65f79770a rebase fixup +| * | 90e9b4a4f WIP - send all video types +| * | 4ce2eb3c6 Show ProgressView for video conversion +| * | b1b6dcfbf Simplify loading delay, use loading screen as activity indicator for video conversion +| * | 538b3e5fd Async API for video export +| * | 21fd7b040 Ensure sent video is mp4 +|/ / +* | 3ad409238 Merge branch 'mkirk/approval-view-revamp' +|\ \ +| * | d3e7c99a6 Attachment approval: cancel/confirm to top/bottom toolbars +|/ / +* | fc26c3fdb Merge branch 'charlesmchen/profileManagerConcurrency' +|\ \ +| * | 8642a708e Respond to CR. +| * | b9b3eb054 Clean up ahead of PR. +| * | 429312523 Simplify OWSUserProfile's "apply changes" logic using model diffing. +| * | ee92efd4a Don't emit "user profile changed" notifications if nothing changed. +| * | f684482c5 Don't emit "user profile changed" notifications if nothing changed. +| * | 7b4aa4056 Don't emit "user profile changed" notifications if nothing changed. +| * | 97ce1a667 Rework user profile saves; block SAE if no local user profile key. +| * | 3ea901044 Rework thread safety in profile manager. +| * | 74efcb904 Rework thread safety in profile manager. +| * | ee300590e Rework thread safety in profile manager. +| * | 911c4d380 Rework thread safety in profile manager. +|/ / +* | c1d435c9d Merge branch 'charlesmchen/imageQualityRevisited' +|\ \ +| * | bf09c805b Respond to CR. +| * | c91827959 Convert image attachment thresholds to be based on file size. +| * | 80ae5e0fc Respond to CR. +| * | 11b484853 Respond to CR. +| * | 89db8b3a4 Respond to CR. +| * | 84061cca9 Change image resizing/quality behavior, preferring smaller images in the common case. +| * | 55aa5eef6 Clean up ahead of PR. +| * | 125aabb0a Change image resizing/quality behavior, preferring smaller images in the common case. +|/ / +* | be5ac8527 Merge branch 'mkirk/track-dyload-time' +|\ \ +| * | ddd200482 track dyload time +|/ / +* | b6f3c69f8 Merge branch 'mkirk/fixup-headers' +|\ \ +| * | d9cca77e2 update header references +|/ / +* | 726fde235 Merge branch 'mkirk/affix-searchbar' +|\ \ +| * | 23014f9ea Keep header affixed to navbar. +|/ / +* | b014c236b (tag: 2.20.0.2) bump build number +* | f7dfe23c6 sync translations +* | d6359d655 Update carthage - WebRTC M63 +* | 71f56ef3d Merge branch 'mkirk/dismiss-share-view' +|\ \ +| * | 1c74d8f91 CR: remove reset of BundleDocumentTypes +| * | dd1795e33 fixup rebae +| * | 3ecf0a753 Cancelling dismisses share extension, remove "import with signal" +|/ / +* | 2cd3ce62f Merge branch 'mkirk/conversation-picker-presentation' +|\ \ +| * | ed33663e6 CR: remove redundant isHidden +| * | cd95e1784 avoid race condition in presentation animation +| * | 3bb772f13 Modal conversation picker, hide loading screen when possible +|/ / +* | 6bb9b9cbc Merge branch 'charlesmchen/saeSetupOrder' +|\ \ +| * | d15d5ce3a Respond to CR. +| * | 791743a5f Fix order of operations in SAE setup. +|/ / +* | 03d116594 Merge branch 'charlesmchen/estonianAndTaiwaneseChinese' +|\ \ +| * | 345323fe8 Add Estonian and Taiwanese Chinese localizations. +|/ / +* | 5053b0268 Merge branch 'charlesmchen/logTagProperty' +|\ \ +| * | f7bcf1d04 Fix tests. +| * | 1be828574 Respond to CR. +| * | f148003fb Convert logTag to property. +|/ / +* | c36c4d6ec Merge branch 'charlesmchen/swiftSingletons' +|\ \ +| * | b12f192c6 Respond to CR. +| * | 36703d3bb Add asserts around Swift singletons. +| * | 7a1e47cd2 Add asserts around Swift singletons. +|/ / +* | 26bd1f2e6 Merge branch 'charlesmchen/saeVsStatics' +|\ \ +| * | 8312614cf Respond to CR. +| * | 99f0b9d3e Fix issues around statics. +|/ / +* | 28a55e244 Merge branch 'mkirk/preview' +|\ \ +| * | 0429836ff CR: rename keyWindow -> keyReferenceView, split long line +| * | ca999627e CR: replace, not push VC +| * | c0c71ad76 cleanup +| * | 4aba6e0c9 Present conversation picker when DB is ready +| * | 3f6f881d3 Use assets from duplicated main bundle +| * | eca19e587 Reconcile MediaMessageView zoom behavior with AppExtension +| * | 3036337a5 Include filename, support sharing all other image types +| * | 3eceb8637 Show alert if we fail to build the attachment +| * | 89b9887f1 Make DeviceSleepManager extension compatible +| * | e20072ff2 CR: remove bundle specific image assets +| * | 654d34546 remove null references to moved certificates +| * | c52192295 fixup rebase. move jobs to proper dir +| * | 56fe9d057 Attachment Approval +| * | a58f1f385 Share a photo from photos app +| * | f781199e2 ignore warnings in AFNetworking +|/ / +* | 1a6f21996 Merge branch 'charlesmchen/saeErrorViews' +|\ \ +| * | 3960b8162 Respond to CR. +| * | 848f055da Add SAE error views. +|/ / +* | f1c42a5db Merge branch 'charlesmchen/sendDebugLogToSelf' +|\ \ +| * | 94b5dfb1b Localize the debug log UI. +| * | a617724da Add "send to self" option to debug logs. +|/ / +* | 136a8acae Merge branch 'charlesmchen/environment3' +|\ \ +| * | 6e545c57c Bump build to 2.20.0.1. +| * | 01dfa83be Continue conversion of app setup. +| * | 076844bfe Continue conversion of app setup. +| * | 310cf1330 Continue conversion of app setup. +|/ / +* | 71cfa2802 Merge branch 'charlesmchen/saeVsTests_' +|\ \ +| * | 53f51bcd0 Clean up ahead of PR. +| * | 69e0bcd30 Fix tests. +| * | 9e44a7306 Fix tests vs. SAE. +| * | e7bd33df4 Fix tests broken by SAE. +|/ / +* | aeb6f320d Fix plist value type. +* | fdbe175c0 Merge branch 'charlesmchen/environment2' +|\ \ +| * | 8d014f057 Respond to CR. +| * | f5353fc7d Clean up ahead of PR. +| * | 150f417a5 Clean up ahead of PR. +| * | 022b2f93d Respond to CR. +| * | e94ef01d7 Respond to CR. +| * | 9da165b84 Continue conversion of app setup. +|/ / +* | e56475d92 Merge branch 'charlesmchen/environment' +|\ \ +| * | ce899edf1 Respond to CR. +| * | dc51f92f1 Clean up ahead of PR. +| * | 2eba37165 Clean up ahead of PR. +| * | b4e8df79d Migrate environment to SignalMessaging. +| * | a16058e47 Migrate environment to SignalMessaging. +| * | 6d87df88a Migrate environment to SignalMessaging. +| * | c817aa51b Migrate environment to SignalMessaging. +|/ / +* | 9ea954bec Merge branch 'mkirk/search-profile-names' +|\ \ +| * | e3b0333b9 CR: Separate class files +| * | 27ddf4a35 Cleanup before PR +| * | cd440b839 Consolidate search logic +| * | 766e57996 Share picker searches by profile name +| * | 3ed52b6d5 Fix profile label for share context +| * | 286463bb2 Thread picker adds sections for threads vs other contacts +| * | 71bafcc8f Search SignalAccounts by profile name +| * | 06f52deaf address some additional compiler warnings +|/ / +* | 2cc417daf Merge branch 'mkirk/fix-build-warnings' +|\ \ +| * | 23d3006fd remove unused code +| * | 08c324f94 Fix compiler warnings around ambiguous macro redefinition. +| * | 2af818b3b Make SignalMessaging AppExtension safe +| * | fcb17585b fix compiler warnings +| * | 013877734 New @available syntax avoids compiler warnings +| * | f96b7bc27 CNContact doesn't exist before iOS9 +| * | 0dec643b9 update header to match implementation atomicity +| * | 5e7ca8993 Proper function prototypes +|/ / +* | 5705b256e Merge branch 'charlesmchen/logsVsSAE' +|\ \ +| * | 98eb4613e Enable logging in SAE; rework log file management to include multiple log directories. +| * | bf21d0c0e Enable logging in SAE; rework log file management to include multiple log directories. +|/ / +* | 23f151fa5 Merge branch 'charlesmchen/saeLoading' +|\ \ +| * | 8cc33b3de Refine loading view of share extension. +|/ / +* | eaebec622 Merge branch 'charlesmchen/l10nScriptsVsSAE' +|\ \ +| * | f728f5c09 Incorporate l10n strings from main app into SAE. +| * | 074664f73 Revert "Modify l10n string extraction script to copy strings to SAE." +| * | efe0758e3 Revert "Modify l10n string download script to copy strings to SAE." +| * | 9f31c048a Modify l10n string download script to copy strings to SAE. +| * | c61490c0b Modify l10n string extraction script to copy strings to SAE. +|/ / +* | c82ff5b3c Merge branch 'charlesmchen/customUIForSAE' +|\ \ +| * | e7b32899c Sketch out SAE load screen; make a number of infrastructure changes. +|/ / +* | 43eefd35e Merge branch 'charlesmchen/shareExtensionTypes' +|\ \ +| * | f20196e3f Use dict to specify supported types for SAE. +|/ / +* | aa1ca3410 Merge branch 'charlesmchen/appExtensionContext' +|\ \ +| * | 15e3b5ad7 Add app extension context, bridging header and PCH to app extension. +| * | 61b33b1a4 Make SignalMessaging a build dependency of the share extension. +| * | 2aafdcf57 Add app extension context, bridging header and PCH to app extension. +|/ / +* | 1b65e0c9e Merge branch 'charlesmchen/appExtensionVsBuildNumberScript' +|\ \ +| * | d5f2ebff4 Update "bump build number" script to update share extension. +|/ / +* | bc234d42e Merge branch 'charlesmchen/appExtensionCapabilitiesAndInfo' +|\ \ +| * | f896bf99d Update share extension capabilities. +| * | 8706d8f59 Update share extension capabilities. +|/ / +* | afea3008b Merge branch 'mkirk/use-framework-friendly-openssl' +|\ \ +| * | 7ca314aa2 Use up-to-date framework friendly OpenSSL +|/ / +* | 08ad7bc9c Merge branch 'mkirk/use-chrono' +|\ \ +| * | 336d59a6c restore chrono timestamp +|/ / +* | 14d595062 Merge branch 'charlesmchen/crossProcessDBModifications' +|\ \ +| * | e7df2511a Register CrossProcessNotifier. +| * | 64762eb42 Observe YapDatabaseModifiedExternallyNotification. +|/ / +* | 9aa05733d Merge branch 'charlesmchen/addressSharingExtensionTODOs_' +|\ \ +| * | 62cf9b1dd Respond to CR. +| * | d17ccadea Use AppContext to resolve share extension FIXMEs. +| * | e712e8bfc Use AppContext to resolve share extension FIXMEs. +|/ / +* | 94436f7b0 Merge branch 'charlesmchen/appContext' +|\ \ +| * | 4c31d9949 Respond to CR. +| * | 66fae5bd5 Clean up ahead of PR. +| * | ffa69b350 Add application context class. +|/ / +* | 594544b26 Merge branch 'charlesmchen/appExtensionMigration' +|\ \ +| * | 8d4e9b456 Respond to CR. +| * | 779e89fe7 Clean up ahead of PR. +| * | 7429e1968 Clean up ahead of PR. +| * | edaf65223 Migrate to shared data NSUserDefaults. +| * | cd11ec569 Add app group, share keychain. Take a first pass at file migration to shared data directory. +|/ / +* | 1ccf5132c Merge branch 'mkirk/orphan-cleaner-fixup' +|\ \ +| * | 336aa1352 Avoid overzealous assert +|/ / +* | d458906a6 Merge branch 'mkirk/bubble-factory-perf' +|\ \ +| * | 9ac3ce375 Memoize bubble factory +|/ / +* | fd829ba57 Merge branch 'hotfix/2.19.1' +|\ \ +| |/ +| * 741723c99 (tag: 2.19.1.0, origin/hotfix/2.19.1) pull latest translations +| * a85b14415 Merge branch 'mkirk/proper-file-extensions' into hotfix/2.19.1 +| |\ +| | * 9d1e3dc22 We need to change file extensions when converting data +| |/ +| * b242f6491 Merge branch 'charlesmchen/addPhotoUsageDescription' into hotfix/2.19.1 +| |\ +| | * 1f3cc8752 Fix the add photo permission crash on iOS 11. +| |/ +| * a90210594 Merge branch 'mkirk/ios8-send-crash' into hotfix/2.19.1 +| |\ +| | * 1a99b3491 Fix iOS8 crash on type +| |/ +| * 33f223318 Bump version number to v2.19.1. +* | 2072359a7 add todo +* | 3828edab1 Merge branch 'mkirk/share-spike-framework-friendly' +|\ \ +| * | 2c4cf9651 Some proof of framework integration in the sample share extension +| * | e9796600c disable some asserts for now +| * | 961727814 Move pinning certificates into App +| * | a11d83187 WIP: Framework-friendly - compiles but crashes on launch +| * | c5b0f7cd0 framework compatible CocoaLumberjack import +| * | 7894a5876 FIXME: Changes to get share extension compiling +| * | b56f0e0d2 Pod setup for SignalMessaging framework +| * | de028404b Shared framework between app and extension +| * | d96eb8932 ShareExtension template +|/ / +* | 2685eae12 Merge branch 'charlesmchen/fakeLargeAttachments' +|\ \ +| * | 40b2ecf58 Add debug UI for hallucinating lots of large attachments to stress shared data migration. +| * | bfc144567 Add debug UI for hallucinating lots of large attachments to stress shared data migration. +|/ / +* | 42e972ef7 Merge branch 'charlesmchen/signalServiceConcurrency' +|\ \ +| * | 829464baa Remove concurrency limitations from signal service. +|/ / +* | 8d790ffb9 Update contributing.ms to use signal.org URLs; remove Bithub references (#2806) +|/ +* f4f2ff883 (tag: 2.19.0.22) Bump build to 2.19.0.22. +* 8b93c4aa2 Merge branch 'charlesmchen/unreadIndicatorAssert' +|\ +| * 8acce3b5b Simplify the unread indicator logic. +|/ +* a03a96693 Merge branch 'mkirk/archive-after-reset' +|\ +| * 43092ee6a CR: be extra paranoid about archiving the reset session +| * 47926418b Prevent subsequent "No valid session" errors from the recipient of an EndSession message. +|/ +* 443ef5837 (tag: 2.19.0.21) Bump build to 2.19.0.21. +* 97efc359f Merge branch 'mkirk/center-loading-more' +|\ +| * a542471bb center "Loading More Messages" label +* | bd6cb2225 Update l10n strings. +|/ +* 6f90786ac Merge branch 'charlesmchen/layoutEdgeCases' +|\ +| * f9f0f1c27 Revert "Force conversation view cells to update layout immediately." +| * 35bdc86ab Reload adjacent rows using original indices, not final indices. +|/ +* 0029b6854 Merge branch 'charlesmchen/unreadLayoutEdgeCases' +|\ +| * 71f5ef594 Improve handling of unread indicator edge cases. +|/ +* e0e0a512e Merge branch 'charlesmchen/identityTransactions' +|\ +| * ba88da60c Use dedicated db connection for recipient identities. +|/ +* 2ec1e7e92 Respond to CR. +* f07cbeef7 (tag: 2.19.0.20) Bump build to 2.19.0.20. +* 61666351c Update l10n strings. +* 5f9f63d89 Merge branch 'charlesmchen/unreadEdgeCases' +|\ +| * 2d241623b Improve handling of edge cases around unread indicator delimiting deleted message(s). +|/ +* 368ad922d Merge branch 'charlesmchen/unreadVsConversationUI' +|\ +| * 5ef9d53c9 Update conversation view UI to reflect unread state. +|/ +* b3d936396 Merge branch 'charlesmchen/forceConversationCellLayout' +|\ +| * ef820a371 Force conversation view cells to update layout immediately. +|/ +* 0cda3661f Merge branch 'charlesmchen/unknownCountry' +|\ +| * 9b4ac4073 Improve robustness around unknown country codes. +|/ +* 73655de3d (tag: 2.19.0.19) bump build +* 7d6f37b0e Sync translations +* e1c50103b Merge branch 'mkirk/insert-unread-indicator' +|\ +| * 370364c93 Scroll down button scrolls to unread +|/ +* ed0e0fadc Merge branch 'charlesmchen/scrollDownButtonVsRTL' +|\ +| * b0c9add29 Update layout of "scroll down button" to reflect RTL. +|/ +* ce9e2fb19 Merge branch 'charlesmchen/contactsSyncDeadlock' +|\ +| * d9fcfdeeb Fix deadlock when responding to contacts sync messages. +| * 9b197fad0 Fix deadlock when responding to contacts sync messages. +|/ +* 93927801e Merge branch 'charlesmchen/swipeTransitionVsRTL' +|\ +| * 92ef50781 Make swipe-for-details RTL-safe. +|/ +* 596206557 (tag: 2.19.0.18) bump build +* 358612542 pull translations +* 74f98067f (tag: 2.19.0.17) bump build +* 7c0d372aa Merge branch 'charlesmchen/autoDismissKeyboardVsPanSettle' +|\ +| * a07e1e0cf For most views, only try to dismiss keyboard when scroll drag starts. +|/ +* 4ca2e10dd Merge branch 'charlesmchen/conversationScrollEdgeCase' +|\ +| * aea2bf3e0 Fix scroll state insets in conversation view. +|/ +* 28fe073c5 Merge branch 'mkirk/update-outgoing-call' +|\ +| * 5cfa7e35f Respond to CR. +| * 34811a635 Fixes: "connected call" showing as "unconnected outgoing" call. +|/ +* 3ab9337bf Merge branch 'charlesmchen/logTags' +|\ +| * b76d9a4e6 Remove redundant logTag methods. +| * a4879f6bb Remove redundant logTag methods. +|/ +* 1fa9deca6 Merge branch 'charlemschen/noCentroidNoPeace' +|\ +| * 8eb4e682d Revert "Show menu controller from centroid of message cells." +|/ +* 86d839d87 Merge branch 'charlesmchen/tweakJumbomoji' +|\ +| * cebeea918 Reduce extremes of Jumbomoji behavior. +|/ +* 72fba8774 Merge branch 'charlesmchen/conversationUpdateEdgeCases_' +|\ +| * d8ae5841d Respond to CR. +| * b3d17ea19 Improving handling of edge cases in conversation view. +| * 45c7d80d9 Improving handling of edge cases in conversation view. +| * 6d4a05bbe Improving handling of edge cases in conversation view. +| * 658746093 Use finalIndex in row changes. +|/ +* bb22adbeb Merge branch 'mkirk/calling-edgecases' +|\ +| * 86c1a3d08 CR: use weak capture +| * 30b50e148 Activate audio at the proper time +| * 81f097c1f Don't drop critical data messages +| * 2e75e9df5 Don't ignore critical errors +| * 91f25bec3 Remove overzealous assert +|/ +* 2ed80249c Merge branch 'mkirk/pop-keyboard-on-compose' +|\ +| * 8ee030bea Don't dismiss keyboard when view appears +|/ +* df8204ac1 Merge branch 'charlesmchen/pushTokensAbout' +|\ +| * ceac36f91 Respond to CR. +| * 6e60d99ec Show push tokens in about view. +|/ +* 9b14c7777 Merge branch 'charlesmchen/contentInset2' +|\ +| * e9bace34b Fix "sliding tables" issue in linked devices view. +|/ +* 115fefdbe Merge branch 'mkirk/replace-missing-call-icon' +|\ +| * abb57f2a1 App icon for system call screen +|/ +* af1fb5444 Merge branch 'mkirk/contact-perms' +|\ +| * 7fd3d665d Request contacts as necessary when app is brought back to the foreground +| * 01e1d10c3 Only show contact nag if we've denied contact access +|/ +* bae0e294d Merge branch 'charlesmchen/endEditingLeaveConversation' +|\ +| * 7b1a846f7 Dismiss keyboard when leaving conversation view. +|/ +* 46b3540d8 Merge branch 'charlesmchen/fixGroupCreation' +|\ +| * 2642f6fce Fix group creation. +|/ +* f61233763 Merge branch 'charlesmchen/fixTableViewLayout' +|\ +| * e79613184 Respond to CR. +| * 089e4a4a0 Fix layout of table views vs. nav bar. +|/ +* 334cecf5a Merge branch 'charlesmchen/dynamicJumbomoji' +|\ +| * 572de1176 Apply dynamic type sizing to Jumbomoji. +|/ +* cc32e52de (tag: 2.19.0.16) Bump build to 2.19.0.16. +* 0ffa79df6 Bump build to 2.19.0.15. +* a5c98ca27 Merge branch 'charlesmchen/skipAnimationsInConversations' +|\ +| * 937ac5830 Skip animations in conversation view. +| * b67179b45 Skip animations in conversation view. +|/ +* 7862345ec Merge branch 'charlesmchen/backButtonRevisited_' +|\ +| * 0ccddb696 Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons. +|/ +* 12aa31192 Merge branch 'charlesmchen/loadMoreFontSize' +|\ +| * 96274a60a Respond to CR. +| * 7aae47b02 Reduce font size of "load more" indicator. +|/ +* 56addee70 Merge branch 'charlesmchen/maxTextLength' +|\ +| * dffd776ac Increase the max text message length. +|/ +* a2642ccc0 Merge branch 'mkirk/show-failed' +|\ +| * 228e350e2 message details shows failed bubble when appropriate +|/ +* b55d647e8 Merge branch 'charlesmchen/menuControllerReuseCell' +|\ +| * 6b8f4c7dd Dismiss menu controller if message cell is hidden or recycled. +|/ +* a755c7e3c Merge branch 'charlesmchen/refineMenuControllerLocation' +|\ +| * 08bb1c909 Show menu controller from centroid of message cells. +|/ +* 307c8595c (tag: 2.19.0.14) Bump build to 2.19.0.14. +* 9d4ec557d Update l10n strings; add Persian l10n. +* 6299fdc67 Merge branch 'mkirk/push-registration' +|\ +| * 607a5cb08 Fix typo in re-registration flow +| * e84fcd7c9 Registration bug also affects other versions of iOS +|/ +* aad93d2d8 Fix broken assert in conversation view item. +* 114de70f3 Merge branch 'charlesmchen/viewItemAttachmentsVsDBConnection' +|\ +| * ddf4bf28c Load attachments for conversation view items using long-lived db connection. +|/ +* 5d5f7f015 Merge branch 'charlesmchen/disappearingMessagesChanges' +|\ +| * df5aa5ef6 Update UI to reflect changes to disappearing messages configuration. +|/ +* 3380ecdbf (tag: 2.19.0.13) Bump build to 2.19.0.13. +* 11e4f08be Merge branch 'charlesmchen/delayNotificaitonsLikeAndroid' +|\ +| * 21e9f57cb Imitate Android's behavior of delaying local notifications based on incoming sync messages. +|/ +* 7730b78d8 Merge branch 'charlesmchen/dontBackupFiles' +|\ +| * 2d8a7b03d Respond to CR. +| * d7b0424c7 Don't back up profile pics, attachments or gifs. +|/ +* f7c2cf0f2 Merge branch 'charlesmchen/slidingTableContent' +|\ +| * 81f37e991 Respond to CR. +| * e65010d51 Fix "sliding table content" issue on iOS 11. +|/ +* 61ee93c77 (tag: 2.19.0.12) Bump build to 2.19.0.12. +* cbcccf273 Merge branch 'charlesmchen/fixCalling' +|\ +| * 2f84e0c42 Fix calling; be explicit about which messages should be saved. +|/ +* 20355521f Merge branch 'mkirk/message-focuse' +|\ +| * 9675cbb1e Scroll only as far as necessary +|/ +* 15a407de1 (tag: 2.19.0.11) Bump build to 2.19.0.11. +* 5fa6e3a32 Merge branch 'charlesmchen/conversationViewFixes' +|\ +| * cc90f4cb8 Respond to CR. +| * 86fdd6dea Fix edge cases in conversation view. +|/ +* 9aeaa00f6 Merge branch 'charlesmchen/randomMessageActions' +|\ +| * 451dc44e8 Add script to make random changes. +| * bfde1aef5 Add script to make random changes. +|/ +* 88ae3fbed (tag: 2.19.0.10) Bump build to 2.19.0.10. +* 25263bb10 Merge branch 'charlesmchen/evacuateViewItemCache' +|\ +| * 6413bc8e4 Evacuate the view item cache. +|/ +* adca3f5d1 Merge branch 'charlesmchen/dontResurrectZombies' +|\ +| * 19ba564f8 Respond to CR. +| * 00feb14b1 Respond to CR. +| * 5eea0347b Rework the "update with..." methods to avoid re-saving deleted models. +| * 94b59c326 Rework the "update with..." methods to avoid re-saving deleted models. +| * c6160a5a1 Rework the "update with..." methods to avoid re-saving deleted models. +| * 69fa80b89 Don't resurrect zombies. +| * fce52841f Don't resurrect zombies. +|/ +* 8f3304ff9 (tag: 2.19.0.6) Bump build to 2.19.0.6. +* 87b5b8514 Merge branch 'mkirk/iphone-x' +|\ +| * a27b03409 Fix GIF picker footer for iPhoneX +| * e5263dcf0 Clarify comment +| * b40d2afc0 Scanner view for iPhoneX +| * 8c69e00a3 Adapt ConversationViewController to iPhoneX +| * a3153d29d Fix callscreen for iPhoneX +| * b0ce60a38 Fix layout of registration page for iPhoneX +|/ +* 1fa0dda58 Merge branch 'charlesmchen/tapVsLinkVsKeyboard' +|\ +| * c3b6c9055 Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. +| * 3da1d8c63 Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. +| * c91dda43e Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. +| * c3087cf3d Don't dismiss keyboard when tapping in the conversation view. +|/ +* 1944df7a0 (tag: 2.19.0.5) Bump build to 2.19.0.5. +* bf0f33e4b Temporarily alter animations in conversation view. +* af6a7c103 Add a comment. +* 049370f52 (tag: 2.19.0.4) Bump build to 2.19.0.4. +* 42a70e0de Revert "Temporarily make logging around conversation view row updates more verbose." +* ab7522c47 Merge branch 'charlesmchen/backgroundVsContactsPermission' +|\ +| * 5c90bc72d Never request contacts permission if app is in the background. +|/ +* 05fc966af (tag: 2.19.0.3) Bump build to 2.19.0.3. +* f0a8e08df Temporarily alter animations in conversation view. +* 906620a13 Merge branch 'charlesmchen/attachmentEdgeCases' +|\ +| * cc0e58365 Respond to CR. +| * 0abdbffe1 Improve handling of attachment edge cases. +|/ +* a9dca831d Fix method extraction. +* 64938b782 Merge branch 'charlesmchen/firstSendVsLinkedDevices' +|\ +| * bac3bd4b6 Respond to CR. +| * 518f15155 Respond to CR. +| * efcd42012 Respond to CR. +| * 071dbd441 Respond to CR. +| * 8b6524661 Respond to CR. +| * e1b32315d Fix assert after registration. +|/ +* 308ecd9cc (tag: 2.19.0.2) Bump build to 2.19.0.2. +* b5f7a4746 Temporarily alter animations in conversation view. +* 84d7596f4 Merge branch 'charlesmchen/attachmentButtonInsets' +|\ +| * 381446459 Increase content insets of attachment button. +|/ +* 82627c302 (tag: 2.19.0.1) Bump build to 2.19.0.1. +* 105b03376 Temporarily make logging around conversation view row updates more verbose. +* 8e87bd334 Merge branch 'charlesmchen/forceCellLayout' +|\ +| * c72f39e64 Layout cell content when presenting the cell. +|/ +* 9f3c20850 Merge branch 'charlesmchen/scrollFixes' +|\ +| * 87b0692af Fixes for scrolling in conversation view. +|/ +* b6ca9a8ce Merge branch 'charlesmchen/permissionsVsInactive' +|\ +| * fc07c7c04 Respond to CR. +| * 593c684fc Don't ask for camera permissions if app is not active. +| * 5cc292fb6 Don't ask for camera permissions if app is not active. +| * 5e61307ce Don't ask for microphone permissions if app is not active. +| * f86882b5f Don't ask for camera permissions if app is not active. +|/ +* f757b7dcb Merge branch 'charlesmchen/xcode91' +|\ +| * 5541be784 Fix build warnings from XCode 9. +| * 6e840ff95 Fix build warnings from XCode 9. +| * a6bfc0a60 Fix build warnings from XCode 9. +| * 2d21e2ae2 Fix build warnings from XCode 9. +|/ +* 48df161eb Merge branch 'mkirk/re-register-push-tokens' +|\ +| * c0bcc40a6 Ensure we re-upload push tokens after re-registering. +|/ +* 2c5389d03 Merge branch 'mkirk/cdn-fail-xcode9' +|\ +| * f29746571 (private/mkirk/cdn-fail-xcode9) Whitelist *.signal.org from ATS. +|/ +* cc0c914ad Merge branch 'mkirk/fix-contact-offer' +|\ +| * 90dad7544 CR: remove unnecessary property +| * 1f5603760 Fix contact offer +|/ +* e38535cbe update OpenSSL pod +* 34abb4246 (tag: 2.19.0.0) Update build versions to v2.19.0. +* f9fc23660 Merge tag '2.18.2.1' +|\ +| * 40d2e003a (tag: 2.18.2.1, origin/release/2.18.2) Bump build to 2.18.2.1. +| * 00752c17a Merge branch 'charlesmchen/approveGIFs' into release/2.18.2 +| |\ +| | * 1f35a1d29 Show attachment approval for GIFs. +| |/ +| * 957c2e396 Merge branch 'charlesmchen/attachmentApprovalCrash' into release/2.18.2 +| |\ +| | * 167a171ca Fix crashes in attachment approval view. +| |/ +| * 511ff83ed (tag: 2.18.2.0) Bumped version numbers for hotfix v2.18.2. +* | d16848583 Merge branch 'mkirk/update-carthage' +|\ \ +| * | 28cb7751d Update dependencies via Carthage +|/ / +* | f59f90893 Merge branch 'charlesmchen/burmese' +|\ \ +| * | 3952f717a Add Burmese l10n. +|/ / +* | da7338580 Merge tag '2.18.1.0' +|\ \ +| |/ +| * 9c9c63db8 (tag: 2.18.1.0, origin/release/2.18.1) Bumped version numbers for hotfix v2.18.1. +| * bdc43ac11 Merge branch 'mkirk/group-sync-deadlock' into release/2.18.1 +| |\ +| | * e82a3f3dd respond to CR +| | * 8ef9e96b9 Avoid group-sync deadlock by making post-upload save async +| | * 98fd15fae Avoid groupsync deadlock - pass in transaction +| |/ +* | e4d608c61 Merge branch 'charlesmchen/inputToolbarEdge' +|\ \ +| * | e3f7947da Emphasize borders of input toolbar. +|/ / +* | 6297663d3 Merge branch 'charlesmchen/multipleLocalNotifications' +|\ \ +| * | 204902c11 Respond to CR. +| * | 03241128f Respond to CR. +| * | 1ea413ad4 Be more defensive about handling local notifications. +|/ / +* | ee4906b95 Merge branch 'charlesmchen/maxTextCellHeight' +|\ \ +| * | a5c4140a1 Reduce max text message bubble size. +| * | ea0b6065e Revert "Constrain the max text cell height to the height of the screen." +| * | 608cd2781 Constrain the max text cell height to the height of the screen. +|/ / +* | 0cd49e597 Merge branch 'charlesmchen/ensureAttachmentContentType' +|\ \ +| * | 8b6265f1b Respond to CR. +| * | 4d5740236 Ensure attachments always have a valid content type. +|/ / +* | 5548030bd Merge branch 'charlesmchen/messageStatusBias' +|\ \ +| * | 2b8fc59a8 Respond to CR. +| * | 74854dd78 Tweak biases of the message status logic. +| * | 365e984b7 Tweak biases of the message status logic. +|/ / +* | e07a240ee Merge tag '2.18.0.9' +|\ \ +| |/ +| * 384d3b201 (tag: 2.18.0.9, origin/release/2.18.0) Bump build to 2.18.0.9. +| * 7fc960fef Merge branch 'mkirk/re-redux-pki' into release/2.18.0 +| |\ +| | * 81cff837a (private/mkirk/re-redux-pki) Include root certs from pki.goog +| |/ +| * 92557bf3e (tag: 2.18.0.8) Bump build to 2.18.0.8. +| * 80f91dcf5 (private/release/2.18.0) Merge branch 'mkirk/censorship-circumvention-redux' into release/2.18.0 +| |\ +| | * 6c13d46be use manually specified censorship host +| | * 39e3e9b44 use .com when in US +| | * 11e07370a more logging +| | * a30533e7b Add GTSGIAG3 to censorship circumvention trust store +| |/ +* | 4037e2ee3 Merge tag '2.18.0.7' +|\ \ +| |/ +| * 6037477c4 (tag: 2.18.0.7) Bump build to 2.18.0.7. +| * 3db87d74c Merge branch 'mkirk/reduce-debounce-time' into release/2.18.0 +| |\ +| | * ad8c1db68 Reduce progressive search delay +| |/ +* | ef80b53ff Merge branch 'mkirk/debug-reregister' +|\ \ +| * | 295646e5f Rebase cleanup +| * | 0706edf42 Generate new registrationId on re-register +| * | 58d4c9536 Re-register without losing your messages in Debug-UI +|/ / +* | 83357a0fe Merge branch 'charlesmchen/messageDetailBubbleSizing' +|\ \ +| * | 93ee029cf Respond to CR. +| * | ae48cf1de Fix sizing of text bubbles in message detail view. +|/ / +* | 5a82d349c Merge branch 'charlesmchen/fixTextMessageLinks' +|\ \ +| * | 7fd5b00d8 Fix text message links in conversation view. +|/ / +* | 1014f27f4 Merge branch 'charlesmchen/redundantSyncMessages' +|\ \ +| * | 1fa75ead5 Respond to CR. +| * | 74096fc2c Don't send sync messages to self if no linked devices. +|/ / +* | 602775f3e Merge branch 'mkirk-2.18.0/call-audio' +|\ \ +| * | b77e33173 Unify Mute/Hold audio handling +| * | c7642cc62 Fix volume burst when call connects +| * | 402d4157c Uniform volume when ringing on speakerphone vs video +| * | a63a767bf connecting ping quieter, ringer is louder +| * | 36a39caad Remove overzealous assert +|/ / +* | aa5eb0561 Merge branch 'charlesmchen/dontAnimateMessageSends' +|\ \ +| * | af5489952 Don't animate message sends. +| * | 40e04ffb9 Respond to CR. +| * | 5df4ac92b Don't animate message sends. +|/ / +* | 5daba7aea Merge branch 'charlesmchen/digitsAintJumbomoji' +|\ \ +| * | f823ba8c1 Respond to CR. +| * | 05e57cf8b Don't treat digits 0..9 as Jumbomoji. +|/ / +* | 3f772c16a Merge branch 'charlesmchen/modiferReturnToSend' +|\ \ +| * | 5d4316755 Respond to CR. +| * | d52b19a69 Let users with external keyboards send messages using modifier-return (shift, command, option). +|/ / +* | 24b82b61f Merge branch 'charlesmchen/logVoiceMemoSizes' +|\ \ +| * | 0c92850d3 Log voice memo durations. +|/ / +* | c6738c477 Merge branch 'charlesmchen/gifVsDraft' +|\ \ +| * | 89dbcb0fe Respond to CR. +| * | f95e599c5 Don't overwrite draft after GIF send. +|/ / +* | 569e6808a Update podfile.lock. +* | db8a38196 Merge remote-tracking branch 'origin/release/2.18.0' +|\ \ +| |/ +| * a08bd0980 (tag: 2.18.0.6) Bump build to 2.18.0.6. +| * b0629fb6d Update l10n strings. +| * 5b1c89c13 Merge branch 'charlesmchen/splitgifs2' into release/2.18.0 +| |\ +| | * a3600d8e8 Avoid stalls in GIF downloader. +| | * 94f3601d3 Avoid stalls in GIF downloader. +| | * b3e39e658 Avoid stalls in GIF downloader. +| |/ +| * 5a6e73911 (tag: 2.18.0.5) pull latest translations +| * af82b02e4 bump version +| * 1a6cb7da1 Merge branch 'charlesmchen/splitGifs' into release/2.18.0 +| |\ +| | * 7041f976d Use HTTP pipelining in Giphy asset requests. +| | * 98af9bcc6 Use HTTP pipelining in Giphy asset requests. +| | * c2a17920b Respond to CR. +| | * 004c9e480 Respond to CR. +| | * f37e7f26d Respond to CR. +| | * 487bd0675 Respond to CR. +| | * cfb2a720d Respond to CR. +| | * 89a04852d Respond to CR. +| | * 12de1aa90 Split up GIF requests. +| | * 55d53ae22 Split up GIF requests. +| | * c83090a46 Split up GIF requests. +| | * e4602f2a1 Split up GIF requests. +| | * 2dfea2524 Split up GIF requests. +| | * 84406b5fe Split up GIF requests. +| |/ +| * cca33f02b Sync translations +| * aee6b3c0c Merge branch 'mkirk-2.18.0/handle-padded-attachments' into release/2.18.0 +| |\ +| | * cf9874302 Remove unecessary subdata for unpadded attachment +| | * ce51d2da3 Example (disabled) padding strategy for attachment sender +| | * cbbb37686 Handle receiving padded attachments +| |/ +| * 81386eae0 Merge branch 'mkirk-2.18.0/require-attachment-checksum' into release/2.18.0 +| |\ +| | * 259695a9f Attachments require digest or show explanatory error. +| |/ +| * 334a04c43 Merge branch 'mkirk-2.18.0/attachment-size' into release/2.18.0 +| |\ +| | * 6eeb78157 Include size in attachment pointer +| |/ +* | 0eb9242f7 Merge branch 'charlesmchen/cocoapodsWarnings' +|\ \ +| * | bb4d94fd1 Respond to CR. +| * | aec6d67df Respond to CR. +| * | 73ae5b298 Suppress build warnings for Cocoapods dependencies. +|/ / +* | 82bcffe77 Merge branch 'charlesmchen/streamlineRelayout' +|\ \ +| * | a0ddb2a06 Respond to CR. +| * | 9053d038a Remove extra logging. +| * | 5ac2f16eb Skip redundant relayout. +|/ / +* | 03df001d7 Merge branch 'charlesmchen/jumbomoji' +|\ \ +| * | e3d8421b9 Respond to CR. +| * | 0a926567e Respond to CR. +| * | c6047b72b Respond to CR. +| * | 563eed6c6 Respond to CR. +| * | 530b70d70 Respond to CR. +| * | 841a2333e Respond to CR. +| * | eb3ca4325 Jumbomoji. +|/ / +* | 06938208c Merge branch 'charlesmchen/hideMIMEtypes' +|\ \ +| * | 997665a90 Hide MIME types in production builds. +|/ / +* | 1d3faec43 Merge branch 'charlesmchen/failedMessageSends' +|\ \ +| * | bee70fa02 Respond to CR. +| * | 5e1c6c02a Add "failed message send" badges. +|/ / +* | 1e7d15841 Merge branch 'charles/longTextMessageDetails' +|\ \ +| * | 8cb3e5d35 Fix edge cases around oversize test messages. +|/ / +* | e1526876a Merge branch 'charlesmchen/jsqRewriteOversizeText' +|\ \ +| * | 9cc4521d0 Respond to CR. +| * | bcf83a4c8 Rework handling of oversize text messages. +|/ / +* | 97bab48a9 Merge branch 'charlesmchen/oneSystemContactsFetchAtATime' +|\ \ +| * | 5af6b6f21 Respond to CR. +| * | 1b3b5fc9e Respond to CR. +| * | d1141581d Only one system contacts fetch at a time. +| * | 878fd3d84 Only one system contacts fetch at a time. +| * | 8c1dfe7ee Only one system contacts fetch at a time. +|/ / +* | 445045b80 Merge branch 'mkirk/show-disappearing-button-dynamically' +|\ \ +| * | 8f9311a6a Show timer in navbar without reload +|/ / +* | ec840340e Merge branch 'mkirk/fix-crash-slide-animation' +|\ \ +| * | 709010499 remove overzealous assert +|/ / +* | 3065b22bb Merge branch 'charlesmchen/jsqRewriteVsTests' +|\ \ +| * | c8c09ec19 Respond to CR. +| * | 7e585b72a Fix tests broken by the JSQ rewrite. +| * | 3927815a3 Fix tests broken by the JSQ rewrite. +|/ / +* | 418fef335 Merge branch 'mkirk/wider-bubbles' +|\ \ +| * | 2d7deff83 Make message bubbles a bit wider. +|/ / +* | 9dd99123f Merge branch 'mkirk/fix-stutter' +|\ \ +| * | cd291e19f We conceivably want to to initiate calls more than once without leaving the conversation view. e.g. from Contacts.app +| * | 4000760cf Fix "back button count" flash. Only call once. +|/ / +* | 103a61d36 Merge branch 'charlesmchen/jsqRewriteVsRTL' +|\ \ +| * | df7d40ed4 Respond to CR. +| * | a23b8b717 RTL fixes for JSQ rewrite. +|/ / +* | a3b698730 Merge branch 'mkirk/swipe-left-2' +|\ \ +| * | 43dd3abf6 clamp value per CR +| * | 59b125c3f Add clarifying comment per CR +| * | d87f00005 Interactive/Cancelable slide left for details +|/ / +* | ac8d59bb7 Merge branch 'charlesmchen/changeMediaPreviewSizes' +|\ \ +| * | 6b2f7e484 Respond to CR. +| * | fb3bb852c Tap image attachment preview to view full screen. +| * | 722fc4d7a Fix size of message previews. +|/ / +* | 9ff157740 Merge branch 'charlesmchen/keyboardLayout' +|\ \ +| * | be0149ccf Update layout of views to reflect keyboard. +|/ / +* | d7c112014 Merge branch 'charlesmchen/dontSendWithReturn' +|\ \ +| * | 0eafbd8fe Respond to CR. +| * | 188b733d5 Don't send with return key. +|/ / +* | fdeac3a79 Merge branch 'charlesmchen/hebrew' +|\ \ +| * | 1e2091e1e Add Hebrew l10n. +| * | 5cde74f50 Add Hebrew l10n. +|/ / +* | 56e756612 Merge branch 'charlesmchen/scrollDismissKeyboard' +|\ \ +| * | 27af31023 Auto-dismiss keyboard if user scrolls away from bottom of the conversation. +|/ / +* | 1237d762e Merge branch 'charlesmchen/inputToolbarFixes' +|\ \ +| * | 3fa2f22be Fixes for input toolbar. +|/ / +* | 2895da504 Merge branch 'charlesmchen/dateHeaderSpacing' +|\ \ +| * | c9e385920 Fix spacing around date headers. +|/ / +* | 3a4167bd6 Merge branch 'charlesmchen/fixAttachmentUploads' +|\ \ +| * | 429f83391 Center the progress bar within the bubble mask. +| * | 658c3c559 Only show attachment upload UI for not-yet-uploaded attachments. +| * | 067b16903 Fix attachment uploads. +|/ / +* | 9b57df67e Fix broken build. +* | 39c6b5fd7 Merge branch 'charlesmchen/refineAttachmentApproval' +|\ \ +| * | c1f35a0ea Respond to CR. +| * | bf8d694eb Rework attachment approval UI. +| * | 2fa3cf1bc Rework attachment approval UI. +| * | cbb0030b1 Rework attachment approval UI. +| * | d04f9111d Rework attachment approval UI. +|/ / +* | 1fee5d97e Merge branch 'release/2.18.0' +|\ \ +| |/ +| * efd58022d (tag: 2.18.0.4) bump version +| * 288b975a1 Pull latest translations +| * f3f0d591e Revert "Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons." +| * 66ab4e254 Merge tag '2.16.2.0' into release/2.18.0 +| |\ +| | * f4ab65b37 (tag: 2.16.2.0, origin/hotfix/2.16.2) bump version +| | * bfaa7f2e0 On iOS11 doc picker requires system appearance. +| | * f8182cd3c fix desktop linking for some users +| | * b663a09c8 helpful tools for building ios11 +| * | 2d10080c3 Merge tag '2.17.1.1' into release/2.18.0 +| |\ \ +| | * | 866be0743 (tag: 2.17.1.1, origin/hotfix/2.17.1) Bump build to 2.17.1.1. +| | * | 1967e2aa6 Merge branch 'charlesmchen/backButtonVsiOS11.1Beta' into hotfix/2.17.1 +| | |\ \ +| | | * | 7c82f6d44 Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons. +| | |/ / +* | | | 688f77b7d Merge branch 'charlesmchen/fixAudioAndGenericMessageLayout' +|\ \ \ \ +| * | | | a1d8c7765 Respond to CR. +| * | | | 54c56f1c4 Fix layout of generic and audio messages. +|/ / / / +* | | | 92883c3a9 Merge branch 'charlesmchen/jsqRewriteGlitches' +|\ \ \ \ +| * | | | a16197f19 Respond to CR. +| * | | | b1b0ddbf2 Fix layout glitches in JSQ rewrite. +|/ / / / +* | | | 2067b395b Merge branch 'mkirk/show-failed-footer' +|\ \ \ \ +| * | | | 21df2dc04 Never hide "failed to send" footer +|/ / / / +* | | | 46dd30e63 Merge branch 'dastmetz-accessibilityCallScreen' +|\ \ \ \ +| * | | | e8f92ede6 added accessibility labels for call screen controls FREEBIE +|/ / / / +* | | | 1a9186410 Merge branch 'mkirk/use-failed-color' +|\ \ \ \ +| * | | | bd4b4f004 Use proper color when messages fail to send. +|/ / / / +* | | | 8b1bea8d1 Merge branch 'mkirk/cleanup-after-db-registration' +|\ \ \ \ +| * | | | c5244e175 orphan cleanup shouldn't happen until DB is registered +|/ / / / +* | | | 68e755ade Merge branch 'release/2.18.0' +|\ \ \ \ +| |/ / / +| * | | e427d25c5 (tag: 2.18.0.3) Bump build to 2.18.0.3. +| * | | 8fdc980ca Update l10n strings. +| * | | bdb289080 Merge branch 'charlesmchen/gifProxy' into release/2.18.0 +| |\ \ \ +| | * | | c11b82ba3 Respond to CR. +| | * | | 9274d7fd9 Fix proxying of Giphy requests. +| |/ / / +| * | | 0cd56d4bc On iOS11 doc picker requires system appearance. +| * | | b6c9a2a67 Merge branch 'mkirk/gif-data' into release/2.18.0 +| |\ \ \ +| | * | | 64c7c40b8 CR: add shadow to activity indicator +| | * | | 2af99eb71 Allow canceling GIF download +| | * | | 891cc6ee0 CR: better method names +| | * | | 6eaa49593 preview vs. sending have independent resolution min +| | * | | 688810c26 CR: Enforce "one time only" with a bool, not a cell ref +| | * | | 591cba646 fix comment typos +| | * | | a01de4491 Fix intermittent crash +| | * | | 6db589526 dismiss keyboard when scrolling after auto-search +| | * | | be51776d8 Fix mask appearing partially above search bar +| | * | | 37177de7c Make sure user knows what they're picking +| | * | | e4ad169d7 Show retryable error alert when fetching GIF fails +| | * | | 3939e8a6a Download picked GIF faster: cancel pending request +| | * | | b8ce636af Show loading screen while selected GIF downloads +| | * | | ddf2fe21a Download smaller GIF for previews. +| | * | | 2a4c6506f log giphy data usage in debug +| |/ / / +| * | | 4dabb7181 Fix "can't send same GIF twice" issue. +| * | | 9eb490918 (tag: 2.18.0.2) bump build +| * | | a7195e404 (tag: 2.18.0.1) Merge branch 'charlesmchen/refineGifSearch' into release/2.18.0 +| |\ \ \ +| | * | | a386ac568 Respond to CR. +| | * | | b90e9fcd6 Skip redundant GIF searches. +| | * | | 33d3c4123 Progressive GIF search shouldn't dismiss keyboard. +| |/ / / +| * | | 2716f5039 (tag: 2.18.0.0) Bump version +| * | | 6e12b9c89 Fix trailing edge of group member listing +* | | | bfde3142c Merge branch 'charlesmchen/fixMarkAsRead' +|\ \ \ \ +| * | | | 7fa7d5d52 Fix "mark as read." +|/ / / / +* | | | 21cdaeed0 Merge branch 'charlesmchen/cleanupConversationView' +|\ \ \ \ +| * | | | b0aa84e42 Clean up conversation view. +|/ / / / +* | | | bc6b5d088 Merge branch 'charlesmchen/reloadAndLayoutChurn' +|\ \ \ \ +| * | | | d355b45ba Reduce relayout and reload churn; respond to dynamic type changes. +| * | | | c2608785e Reduce relayout and reload churn; respond to dynamic type changes. +|/ / / / +* | | | 385d7c0c7 Merge branch 'charlesmchen/textInputVsLeaveConversationView' +|\ \ \ \ +| * | | | 4dc6934fc End text editing if we leave conversation view. +|/ / / / +* | | | 27d8af694 Merge branch 'charlesmchen/linkifyTextMessages' +|\ \ \ \ +| * | | | bd5639baa Linkify text messages. +|/ / / / +* | | | 98433272b Merge branch 'charlesmchen/fixMessageCellLayout' +|\ \ \ \ +| * | | | bf80e6dd3 Fix broken message cell layout. +|/ / / / +* | | | 990fd1cca Merge branch 'charlesmchen/autoLoadMore' +|\ \ \ \ +| * | | | 45ba79d29 Auto-load more message if user scrolls near the top of the conversation. +|/ / / / +* | | | 7249a04a8 Merge branch 'charlesmchen/fixMessageInjection' +|\ \ \ \ +| * | | | 1ad3add1d Fix message injection. +|/ / / / +* | | | 1529ded43 Merge branch 'charlesmchen/resetKeyboardAfterSend' +|\ \ \ \ +| * | | | c7097db93 Respond to CR. +| * | | | f28abbc2a Revert from numeric to default keyboard after message send. +|/ / / / +* | | | 31941de1b Merge branch 'charlesmchen/sendGifTwice' +|\ \ \ \ +| * | | | fb4d43d54 Fix "can't send same GIF twice" issue. +|/ / / / +* | | | fb360cd41 Merge branch 'charlesmchen/attachmentApprovalInInputToolbar' +|\ \ \ \ +| * | | | f3102e276 Fix presentation animation of new "attachment approval" state of input toolbar. +| * | | | 0fe76aaab Move "attachment approval" into input toolbar. +|/ / / / +* | | | 7e41489d8 Merge branch 'charlesmchen/menuController' +|\ \ \ \ +| * | | | 298a4aa10 Simplify and fix edge cases around menu controller. +| * | | | 06eb794db Simplify and fix edge cases around long pressing on system message cells. +|/ / / / +* | | | 6cba186d8 Merge branch 'charlesmchen/inputPlaceholder' +|\ \ \ \ +| * | | | 37841d9b6 Respond to CR. +| * | | | 4a94d039e Restore the input toolbar's placeholder text. +|/ / / / +* | | | 7d3df0bf0 Merge branch 'charlesmchen/conversationCellPerf' +|\ \ \ \ +| * | | | c47573334 Respond to CR. +| * | | | 3b945a9da Respond to CR. +| * | | | 88c874e4e Clean up ahead of PR. +| * | | | 257f8249b Cull cached cell media outside a load window. +| * | | | 65efa7f83 Lazy load, eagerly unload & cache cell media. +| * | | | e77292c2a Add contentWidth property to ConversationViewCell. +|/ / / / +* | | | d7f24e480 Increase profile disclosure compression resistance +* | | | 9818fc774 Merge branch 'charlesmchen/reworkConversationInputToolbar' +|\ \ \ \ +| * | | | b269c72ac Respond to CR. +| * | | | f36ecbdfa Button locations in input toolbar should reflect RTL. +| * | | | cec614706 Button locations in input toolbar should reflect RTL. +| * | | | 2ec852235 Fix the input toolbar. +|/ / / / +* | | | 741ef123f Merge branch 'charlesmchen/restoreLoadMoreMessages' +|\ \ \ \ +| * | | | b9f6bbb36 Clean up ahead of PR. +| * | | | 163e66dd4 Restore "load more messages" functionality. +|/ / / / +* | | | 78bf4fb57 Merge branch 'charlesmchen/injectFakeIncomingMessages' +|\ \ \ \ +| * | | | ccb37bfac Respond to CR. +| * | | | ae550fa96 Add actions to debug UI to inject fake incoming messages. +|/ / / / +* | | | 88ca1279e Merge branch 'charlesmchen/verticalScrollIndicatorConversationView' +|\ \ \ \ +| * | | | ed350f8ea Add vertical scroll indicator to conversation view. +|/ / / / +* | | | 9395fe058 Merge branch 'charlesmchen/socketProcessOffMainThread' +|\ \ \ \ +| * | | | e3868df69 Move write of incoming messages off main thread. +|/ / / / +* | | | fe87015bb Merge branch 'charlesmchen/incomingAttachmentsVsExpiration' +|\ \ \ \ +| * | | | 8704722f9 Don't start expiration of incoming messages until attachments are downloaded. +|/ / / / +* | | | 5e7ca0a75 Merge branch 'charlesmchen/rewriteConversationView2_' +|\ \ \ \ +| * | | | 032ec59d1 Respond to CR. +| * | | | 01691b7ad Ensure attachment masking is updated to reflect cell relayout. +| * | | | 212d5dd11 Clean up ahead of PR. +| * | | | ae27d062f Clamp content aspect ratio. +| * | | | b6a61afd5 Clean up ahead of PR. +| * | | | 46dc0acdf Fix media cropping. +| * | | | 132d5b340 Clean up ahead of PR. +| * | | | e91599d98 Restore message cell footers. +| * | | | 3723a4845 Restore message cell footers. +| * | | | c2f07bb3d Restore message cell footers. +| * | | | 227fd5280 Resize conversation view cells as necessary. +| * | | | f7bd813c9 Restore the date headers to the conversation view cells. +|/ / / / +* | | | 603a7d263 Merge branch 'release/2.18.0' +|\ \ \ \ +| |/ / / +| * | | 90468135c Merge branch 'mkirk/compose-cr-fixups' into release/2.18.0 +| |\ \ \ +| | * | | ab05bd32e compose search cleanup per code review +| |/ / / +* | | | 0f859d6b2 Merge branch 'release/2.18.0' +|\ \ \ \ +| |/ / / +| * | | a76b1f52b Merge branch 'mkirk/show-entire-message' into release/2.18.0 +| |\ \ \ +| | * | | 9ae4a26eb Message details shows entire message +| |/ / / +| * | | 0a19e0715 Merge branch 'mkirk/fix-invite-sms' into release/2.18.0 +| |\ \ \ +| | * | | 038ca0d6a Fix invite via SMS in search +| |/ / / +| * | | 69ee9cbcf Merge branch 'mkirk/pull-to-refresh-inbox' into release/2.18.0 +| |\ \ \ +| | * | | 6a65ee6de Pull to refresh on homeview fetches messages. +| |/ / / +| * | | e47d15d08 Merge branch 'mkirk/revamp-compose' into release/2.18.0 +| |\ \ \ +| | * | | 3080cb512 Compose View: collation index and group search +| |/ / / +* | | | d8b9fcf05 Merge branch 'charlesmchen/rewriteConversationView_' +|\ \ \ \ +| |/ / / +|/| | | +| * | | 49501a5d1 Respond to CR. +| * | | b1624d681 Respond to CR. +| * | | b833976b7 Clean up ahead of PR. +| * | | 5621fe893 Clean up ahead of PR. +| * | | fb408f980 Remove JSQ. +|/ / / +* | | 796be18c5 enable gif picker +* | | 12b674ffb Merge branch 'mkirk/log-sent-timestamps' +|\ \ \ +| * | | b2efb722d Log timestamp of sent messages +|/ / / +* | | af4a4c436 Merge branch 'mkirk/call-timeout' +|\ \ \ +| * | | dd5a19d1f Suspend while answering shows "Missed Call" +|/ / / +* | | a434a381f Merge branch 'hotfix/2.17.1' +|\ \ \ +| |/ / +| * | 23b8560b7 (tag: 2.17.1.0) sync translations +| * | 2cc59dc16 bump version +| * | 875297f1a Merge branch 'charlesmchen/profileSaveDeadlock' into hotfix/2.17.1 +| |\ \ +| | * | 44051bd7e Avoid deadlock in profile manager. +| |/ / +| * | b2ee64e70 Merge branch 'mkirk/fix-registration-layout' into hotfix/2.17.1 +| |\ \ +| | * | f314b2e50 Fix registration screen layout +| |/ / +* | | 97d99e5c2 Merge branch 'mkirk/push-notification-fixups' +|\ \ \ +| * | | 9a7e3cb9d Register for manual message fetching when unable to obtain push tokens +| * | | df15c904b Rework push registration +|/ / / +* | | b916e14ab Merge branch 'mkirk/silent-group-info-request' +|\ \ \ +| * | | 703d4df9e Avoid phantom notifications for group info requests +|/ / / +* | | 0431d1813 Merge branch 'charlesmchen/giphyAPIKey' +|\ \ \ +| * | | b0e1904f9 Respond to CR. +| * | | 7923eafe7 Use separate Giphy API key for Signal iOS. +|/ / / +* | | ede89a740 Merge branch 'mkirk/background-push-notifications' +|\ \ \ +| * | | b5258be9b respond to code review +| * | | 876521f4c Fetch messages sooner when launched from background +| * | | c7cfe188e Sync push tokens on background launch as well +|/ / / +* | | abcf421ef Merge branch 'charlesmchen/gifs3' +|\ \ \ +| * | | 7d9c2825d Add progressive search to Gif picker. +|/ / / +* | | 0f58a528a Merge branch 'charlesmchen/removeFLAnimatedImage' +|\ \ \ +| * | | 5999178e7 Remove FLAnimatedImage. +|/ / / +* | | e4b563bcd Merge branch 'mkirk/update-deps' +|\ \ \ +| * | | 2e196e21c update third party dependencies +|/ / / +* | | e5205ea31 Merge branch 'charlesmchen/gifs2' +|\ \ \ +| * | | fd28e5413 Respond to CR. +| * | | 52a8fb4b8 Add loading background to gif cells, refactor gif cells. +| * | | 334396dac Add activity indicator, "error", "no results" and retry to gif picker. +| * | | 6fb9af636 Rework gif picker background & giphy logo. +|/ / / +* | | 61373a194 Fix build by including missing newly added WebRTC framework headers +* | | 098906882 Merge branch 'mkirk/webrtc-mtl-view' +|\ \ \ +| |/ / +|/| | +| * | fe8c6346a Update carthage to use oak-built WebRTC.framework M61+Signal +| * | 4c797151e Avoid divide by 0 error +| * | 3864880a6 CR: ensure view doesn't grow indefinitely +| * | 3d3af2179 CR: clarify comment, proper linewrap +| * | 580e82bea CR: clamp reasonable aspect ratio +| * | 14b6f3163 position video view below status bar +| * | 15f613563 Fix AspectRatio on legacy video view +| * | c3dc8508a pre-PR cleanup +| * | f837a4624 Fix post call crash on iOS8 +| * | 39e5875a3 remove overzealous assert +| * | 2a4e113c8 Cleanup +| * | 9b33bb0b6 fix layout on MetalKit view +| * | ff2f9ebaf fix compiling on 32bit. +| * | f171c5648 Video calls use MetalKit when available +| * | 7e39e58fc WebRTC M61 +|/ / +* | 4ab0ae273 (tag: 2.17.0.8) pull translations +* | 7b50a0c7d bump build +* | a28dfd7c5 Merge branch 'qatar-censorship-circumvention' +|\ \ +| * | 8ff14a3f6 Enable censorship circumvention in Qatar. +|/ / +* | f46747179 Merge branch 'charlesmchen/ignoreGroupInfoRequest' +|\ \ +| * | 0c46b770e Ignore group info requests if sender and recipient aren't both known group members. +|/ / +* | a5023aada Merge branch 'charlesmchen/groupSafety' +|\ \ +| * | 13a665799 Respond to CR. +| * | 2a5a0929e Create & access groups more carefully. +| * | 380ed0f82 Create & access groups more carefully. +|/ / +* | 87c5a6c5f Merge branch 'charlesmchen/respondToSyncBlocklistRequest' +|\ \ +| * | a31b1aeea Respond to "sync block list" request. +|/ / +* | 4e30ec1ae (tag: 2.17.0.7) bump build +* | b21731526 Merge branch 'mkirk/fix-readreceipt-pref' +|\ \ +| * | 462a6e445 Persist read receipts to proper collection +|/ / +* | 7636f41b1 (tag: 2.17.0.6) sync translations +* | ba15f7775 Merge branch 'charlesmchen/tweakScrollDownButtonMargins' +|\ \ +| * | cef1f9186 Fix the scroll down button margins. +|/ / +* | b938ec6ed bump build +* | 8dd3e47d8 Merge branch 'mkirk/send-config-sync-on-change' +|\ \ +| * | 2125dbe72 CR: Avoid potential transaction nesting +| * | 5d62741a3 Sync read receipt configuration upon set +|/ / +* | e22db2adb Shorter string fits button better on small devices +* | 6fd638539 (tag: 2.17.0.5) sync translations +* | d5f8c7933 bump build +* | 2292f20c9 Merge branch 'charlesmchen/fixIsContactTest' +|\ \ +| * | 9f5454a4c Fix the "is contact" test. +| * | 10c00501f Fix the "is contact" test. +| * | 50ec55c31 Fix the "is contact" test. +|/ / +* | 2ddde6617 Merge branch 'mkirk/sync-settings-req' +|\ \ +| * | ab5b09033 Sync read receipt config to linked devices +| * | be197621a Add read receipts field/configuration protos +|/ / +* | 25d75363f Merge branch 'charlesmchen/gifs' +|\ \ +| * | 8b7d34e51 Respond to CR. +| * | fd9188415 Respond to CR. +| * | a0c9a8439 Clean up ahead of PR. +| * | d73a1a02a Tweak GIF cells. +| * | 801734a93 Clean up ahead of PR. +| * | e4556967b Ensure gif cells reload when app becomes active or network becomes available. +| * | 5b7011620 Unify the "message was sent" logic in conversation view. Ensure "message sent" sounds are played after sending attachments. +| * | 3bfb91d0c Ignore obsolete GIF requests. +| * | c32945b57 Clean up ahead of PR. +| * | 56e30d954 Clean up ahead of PR. +| * | e0194fd60 Allow multiple simultaneous GIF downloads. +| * | d9658ab9d Clean up ahead of PR. +| * | a65a4b133 Clean up ahead of PR. +| * | 48e6cea20 Replace FLAnimatedImage with YYImage. +| * | aa43fd69f Improving parsing of stills. +| * | 6a5e07eee Use proper LRU cache for giphy assets. +| * | 4f77a2a50 Load GIFs progressively using stills. +| * | 2dfd7aa0e Actually send GIFs. +| * | c50ccf3ee Fix gif download cancellation. +| * | 789cea118 Pull out GifDownloader class. +| * | e9885af97 Sketch out the GIF picker. +| * | 424200182 Sketch out the GIF picker. +| * | ee9101eb1 Sketch out the GIF picker. +| * | 3b9726a4f Sketch out the GIF picker. +| * | 206f96c9a Sketch out GIF picker. +| * | 62ba5701f Sketch out GIF picker. +| * | 27e5a2f1b Sketch out GIF picker. +| * | 30a77c597 Parse Giphy API responses. +| * | b4d29bd5d Parse Giphy API responses. +| * | 9710964e3 Sketch out the GIF manager. +|/ / +* | ac649a474 (tag: 2.17.0.4) Bump build to 2.17.0.4. +* | 0263dbb00 Update l10n strings. +* | c9ef7176d Merge branch 'charlesmchen/fixScrollDownButton2' +|\ \ +| * | dbe2c6aa7 Fix scroll down button. +|/ / +* | c093cf083 (tag: 2.17.0.3) sync latest translations +* | 9983cfa02 bump build +* | 3812fe54a Merge pull request #2599 from WhisperSystems/charlesmchen/contactChangesVsOffers +|\ \ +| * | f99ce23e6 Fix wrongful "add to contacts offer" issue. +|/ / +* | 87e1409b4 Merge branch 'mkirk/read-receipts-splash' +|\ \ +| * | 175474e0d Read receipt update screen +|/ / +* | 2c25c25c2 Merge branch 'mkirk/attachments-unknown' +|\ \ +| * | a2421d5b3 Fix "unknown attachment" notifications +|/ / +* | 9d5874025 Merge branch 'charlesmchen/scrollDownHotArea' +|\ \ +| * | 6abc4bed9 Increase hot area of scroll down button. +|/ / +* | 1e07ae11c Merge branch 'charlesmchen/biggerMessageBatches' +|\ \ +| * | 08e560f96 Respond to CR. +| * | 0a081f7dc Use longer delay when batch processing incoming messages. +| * | 69c9a5a49 Use longer delay when batch processing incoming messages. +|/ / +* | 5cc7aadb6 Merge branch 'charlesmchen/tweakReadReceipts' +|\ \ +| * | 46d2b7a89 Refine read receipt processing cycle. +| * | 6b3c0377c Refine read receipt processing cycle. +|/ / +* | 502b41eba Merge branch 'charlesmchen/tweakMessageMetadata' +|\ \ +| * | 34218feec Disable contact cells in message metadata view. +| * | 256b5ab44 Don't show recipient status group titles for 1:1 threads. +|/ / +* | 3eb427493 Merge branch 'charlesmchen/capButtonTextSize' +|\ \ +| * | ffea39abd Cap the flat button text size. +|/ / +* | e5387a397 Update l10n strings. +* | d6d528d6f Merge branch 'charlesmchen/listGroupMembers' +|\ \ +| * | b3da6a977 Change the "group members" item name. +|/ / +* | 791613a3e (tag: 2.17.0.2) bump build +* | 5706683dd sync translations +* | 251d4968a Merge branch 'charlesmchen/moreThreadSafety' +|\ \ +| * | c3dca21a6 More thread safety fixes. +|/ / +* | 8fbc996bc Merge branch 'mkirk/fix-rtl-bubbles' +|\ \ +| * | e2445e6ed Fix RTL bubbles in conversation and message detail view +|/ / +* | b2a38323b Merge branch 'mkirk/stricter-l10n-script' +|\ \ +| * | 09a457ee6 Check all preconditions up front +|/ / +* | 2b05326d7 (tag: 2.17.0.1) bump build +* | 549c39c6c sync latest translations +* | 70f28d048 Merge branch 'mkirk/bubble-metadata-view' +|\ \ +| * | c3bb8a019 on main thread, per CR +| * | 5704bf176 message bubbles for message detail view controller +|/ / +* | 0b73018c0 Merge branch 'mkirk/fix-notification-launch' +|\ \ +| * | 344903fa5 Show proper thread from notification +|/ / +* | 36d55fb7a Merge branch 'charlesmchen/fixMarkAsReadFromLinkedDevice' +|\ \ +| * | 65957c932 Respond to CR. +| * | 8b15dba4e Fix "mark as read on linked device". +|/ / +* | 08e3c6cc0 regenerate source l10n, replace lost JSQMVC strings +* | b34076eea Merge branch 'charlesmchen/offMainThread' +|\ \ +| * | facbc5606 Move more work off the main thread. +| * | 9573e0e16 Move more work off the main thread. +|/ / +* | 80ae95271 Merge branch 'mkirk/fix-assert' +|\ \ +| * | e77a7e09b Fix assert for empty thread +|/ / +* | 5faeed4d5 Fix breakage. +* | f0021bb35 Merge branch 'charlesmchen/readReceiptsCopy' +|\ \ +| * | 3566ed8de Update read receipts setting copy. +|/ / +* | 147f99f1b Merge branch 'charlesmchen/reworkMessageMetadataView' +|\ \ +| * | 2dce0e9b1 Respond to CR. +| * | 26c8c4e1f Rework message metadata view. +| * | de29b5a6e Rework message metadata view. +| * | 29c405904 Rework message metadata view. +|/ / +* | ca76af1fe Merge branch 'mkirk/remove-already-registered-button' +|\ \ +| * | 655598d0a remove existing account button +|/ / +* | cdd17c769 Merge branch 'charlesmchen/outgoingMessagesFromLinkedDevices' +|\ \ +| * | 1df1144e4 Respond to CR. +| * | 33376f66d Simplify processing of messages from linked devices. +|/ / +* | 1a3b3b2c0 Merge branch 'charlesmchen/contactCellsInMessageMetadata' +|\ \ +| * | a231834a7 Use contact cells in message metadata view. +|/ / +* | 0b60b521c Merge branch 'charlesmchen/tweakReadReceiptsSetting' +|\ \ +| * | d6e884924 Rework "send read receipts" setting. +|/ / +* | 6aec89177 Merge branch 'charlesmchen/silentMessages' +|\ \ +| * | 9b5affb39 Send silent messages where appropriate. +|/ / +* | cc2d08d03 Merge branch 'charlesmchen/messageDetailViewChanges_' +|\ \ +| * | d28a014e2 Respond to CR. +| * | cf4aeac0e Modify message metadata view to observe DB changes. +|/ / +* | 745e9978d Merge branch 'charlesmchen/messageDates' +|\ \ +| * | b3ab6d060 Respond to CR. +| * | 3a39a1ba5 Format message statuses with date if possible. +| * | d557817bb Format message statuses with date if possible. +|/ / +* | 0b535ae81 (tag: 2.17.0.0) sync translations +* | 3485ff8d2 bump version +* | 8088318db Merge branch 'charlesmchen/migrateDecryptJobs' +|\ \ +| * | 834ad3f8e Respond to CR. +| * | 01bda556c Fix class rename. +| * | 6b8c9b6bc Iterate the names of the incoming message queue extensions. +| * | eec0efa3c Fix class rename. +|/ / +* | eec2e5c76 Merge branch 'charlesmchen/deliveryReceipts' +|\ \ +| * | a4d285f50 Respond to CR. +| * | aa7329013 Handle new-style delivery receipts. +| * | 25c40ea3c Handle new-style delivery receipts. +|/ / +* | 60738b450 Merge branch 'charlesmchen/refactorLinkedDeviceReadReceipts' +|\ \ +| * | ee13084d5 Respond to CR. +| * | ffe44e68b Refactor linked device read receipts. +|/ / +* | 289291e03 Merge branch 'charlesmchen/profileDeadlock_' +|\ \ +| * | 16d4256e9 Address deadlocks in profile manager. +|/ / +* | 1fe905f0f Merge branch 'charlesmchen/npeCanPerformAction' +|\ \ +| * | af7fd60d7 Fix NPE in conversation view. +|/ / +* | e617ae910 Merge branch 'mkirk/no-sync-profile' +|\ \ +| * | 4777335ff Don't attempt to sync profile until registered. +|/ / +* | c38fd51fb Merge branch 'charlesmchen/profileDeadlock2' +|\ \ +| * | 9dcc7e1ea Respond to CR. +| * | 57b5ccdc3 Address deadlocks in profile manager. +| * | cb365d0a5 Address deadlocks in profile manager. +|/ / +* | 907ddd4d3 Merge branch 'charlesmchen/messageDetailView' +|\ \ +| * | 19e010645 Respond to CR. +| * | 9f9ac746d Sketch out message metadata view. +|/ / +* | 3bb8f4aad Merge branch 'charlesmchen/tweakReadReceipts' +|\ \ +| * | f001e8c22 Respond to CR. +| * | 315c1d7dc Hide all read receipts in UI if not enabled. +|/ / +* | 8f92421cc Merge branch 'mkirk/fix-desktop-linking' +|\ \ +| * | ce2a4422e fix desktop linking for some users +|/ / +* | b4312a561 Merge remote-tracking branch 'origin/hotfix/2.16.1' +|\ \ +| |/ +| * 612615a2b (tag: 2.16.1.3, origin/hotfix/2.16.1) bump build +| * cfa99f253 update l10n +| * 6271cbaf5 Merge branch 'mkirk-hotfix-2.16.1/launch-from-notification-crash-fix' into hotfix/2.16.1 +| |\ +| | * 73bdae336 Fix 1-time crash when launching 2.16 from notification +| |/ +| * bfb5fac87 Make "database view registration complete" check thread-safe. +* | 442ab102b Merge branch 'charlesmchen/showRecipientReadReceipts2' +|\ \ +| * | b74da07f7 Respond to CR. +| * | 825503210 Remove extraneous database view. +| * | 11cadf420 Send, receive & show read receipts to senders/from receivers. +|/ / +* | 29dae9bb9 Merge branch 'charlesmchen/stress' +|\ \ +| * | f2d19ffe0 Respond to CR. +| * | c92c6de7b Add stress group to debug UI. +| * | 7268bde50 Add stress group to debug UI. +| * | bd416176a Add stress group to debug UI. +|/ / +* | 77e0c9664 Respond to CR. +* | d40862fd7 Merge branch 'charlesmchen/fixMessageProcessingEdgeCases' +|\ \ +| * | edd63164d Fix build breaks. +| * | 874ebf703 Use private queues in message decrypter and batch processor. +| * | 077b74a0a Fix handling of edge cases around groups. +| * | 2b0b49b7f Don't batch message decryption. +| * | bfb03c0db Fix message processing edge cases. +|/ / +* | d5ff2cae6 Merge branch 'charlesmchen/asyncNotifications' +|\ \ +| * | 445f6dc6f Respond to CR. +| * | 35a2470cb Post notifications asynchronously. +|/ / +* | 1382270c6 Merge branch 'charlesmchen/readReceiptsManager' +|\ \ +| * | 1c8dbcd22 Respond to CR. +| * | 3eaeb4e0e Add read receipts manager. +|/ / +* | 2cfa24ba7 Respond to CR. +* | 5a843e714 Merge branch 'charlesmchen/refactorMessageProcessing' +|\ \ +| * | b28c4b74b Pull out TSMessageDecrypter class. +|/ / +* | 46c4f4e44 Merge branch 'charlesmchen/precommitIncludesAndClasses' +|\ \ +| * | f1b7d895e Modify precommit script to clean up includes and forward declarations. +|/ / +* | 83479a505 clarify translations procedure +* | e1c8d38f3 update translations doc +* | c4b368340 Merge branch 'charlesmchen/batchMessageProcessing' +|\ \ +| * | 993df25f3 Respond to CR. +| * | 46f17a02c DRY up decryption logic. +| * | e39b9169b Decrypt and process messages in batches. +| * | 9987ebb3c Decrypt and process messages in batches. +| * | 023c804a6 Decrypt and process messages in batches. +| * | fa353259c Process messages in a single transaction (wherever possible). +| * | 6fce2c26b Process messages in a single transaction (wherever possible). +| * | afc753e7e Add batch message processor. +| * | c498e4b35 Decouple message decryption and processing. +|/ / +* | 3abcbdf98 Merge branch 'charlesmchen/databaseViewRegistrationCheckVsConcurrency' +|\ \ +| * | bfd50a9e0 Make "database view registration complete" check thread-safe. +|/ / +* | 3d3f3bb59 Merge branch 'charlesmchen/readReceiptPreferencesCR' +|\ \ +| * | 8a4d67a6e (origin/charlesmchen/readReceiptPreferencesCR) Respond to CR. +| * | 183f0f1cc Respond to CR. +|/ / +* | bd360262c Merge branch 'charlesmchen/readReceiptPreferences' +|\ \ +| * | 83c21c615 Add setting for read receipts in app settings. +| * | 65732af3d New users opt-out of read receipts; legacy users opt-in. +| * | 40d728e02 Add read receipts preference. +| * | 80e5f281c Rename app preferences class. +|/ / +* | c7fab5b92 Merge branch 'charlesmchen/readReceiptsProtos_' +|\ \ +| * | 74b2f3052 Revert "Modify read receipt photos to support sending read receipts to both linked devices and senders." +| * | a7546aee6 Modify read receipt photos to support sending read receipts to both linked devices and senders. +| * | 39a961e37 Rework incoming read receipts handling. +| * | 737503549 Rework incoming read receipts handling. +| * | 2b1ea1996 Modify read receipt photos to support sending read receipts to both linked devices and senders. +| * | 0e7eaf7c6 Modify read receipt photos to support sending read receipts to both linked devices and senders. +|/ / +* | 3367292ba Merge branch 'hotfix/2.16.1' +|\ \ +| |/ +| * 8f2eb7adf Merge branch 'charlesmchen/improveStartupLogging' into hotfix/2.16.1 +| |\ +| | * f92b221e6 Startup logging. +| | * 70602e3bc Startup logging. +| |/ +| * 7101d4aa3 (tag: 2.16.1.2) bump build +| * 7f6c27863 pull latest translations +| * 3ead1c0d8 Merge pull request #2553 from WhisperSystems/mkirk-hotfix-2.16.1/pick-any-profile-photo +| |\ +| | * 5e878b486 Show album organizer for profile picker +| |/ +| * 92a2fd6b6 Avoid NPEs when entering conversation view. +| * 95c5a907f (tag: 2.16.1.1) Bump build to 2.16.1.1. +| * f1d8d7ac7 Update l10n strings. +| * 07c579c34 Merge branch 'mkirk/callscreen-uses-profile-name' into hotfix/2.16.1 +| |\ +| | * e11a3bd18 change animation to linear +| | * 643f583fa Disable name marquee scrolling whenever local video is open +| | * 0ec2ac862 Marquee label for callview controller +| | * bd6387d1d fit more of profile name on call screen +| | * c4139b0f3 Callkit ringer uses profile name +| |/ +| * 509ed8dc6 Update l10n strings. +| * 13ebc9a64 Merge branch 'mkirk/khmer-l10n' into hotfix/2.16.1 +| |\ +| | * ad76155bd audit/fix up supported l10ns (added km and lt) +| |/ +| * fd4287c55 Bump version to 2.16.1.0. +* | 05cc84ee1 Merge branch 'charlesmchen/flatButtonCR' +|\ \ +| * | 2affcd934 Respond to CR. +|/ / +* | 8ceca7645 Merge branch 'charlesmchen/modalActivityIndicatorCR' +|\ \ +| * | c0f5bda2b Respond to CR. +|/ / +* | 90eebb3d7 Merge branch 'charlesmchen/lazyLoadAttachmentsCR' +|\ \ +| * | a5ece18e6 Fix build break. +| * | 400f536e3 Respond to CR. +| * | 872ce17dd Clean up data source temp files when complete. +|/ / +* | cf246a41c Merge branch 'charlesmchen/profileNotificationsVsConversationView' +|\ \ +| * | 541966aaf Fix NPEs when profiles change while entering conversation view. +|/ / +* | 9f803fa44 Merge branch 'charlesmchen/conversationPresentation' +|\ \ +| * | 2c68b0641 Respond to CR. +| * | e222b9df6 Normalize conversation presentation logic. +| * | 04d452b07 Normalize conversation presentation logic. +| * | b6d782046 Normalize conversation presentation logic. +|/ / +* | f3fa107e4 Merge branch 'charlesmchen/callsVsPermissionsCrashes' +|\ \ +| * | 7b1b532b1 Respond to CR. +| * | 43370ffc3 Fix assert during calls without camera permission. +| * | e8daf9a8d Fix assert when missing camera permission during calls. +|/ / +* | 9ee25fd60 Merge branch 'charlesmchen/pullToRefreshContacts' +|\ \ +| * | 563753a4c Force contacts intersection in pull-to-refresh from new thread view. +| * | 3aa90451f Restore pull-to-refresh in the "new contact thread" view. +|/ / +* | 28219008b Merge branch 'charlesmchen/linkedDeviceSendVsScrollState' +|\ \ +| * | 05b181887 Don't "scroll to bottom" when messages are sent from desktop. +| * | 48121e5ea Don't "scroll to bottom" when messages are sent from desktop. +|/ / +* | 894c7b3da Merge branch 'mkirk/update-support-url' +|\ \ +| * | 4997b4e33 update to new support URL +|/ / +* | 2824892b6 Merge branch 'charlesmchen/postRegistration' +|\ \ +| * | 0b772b3a3 Move post-registration work from view to app delegate. +|/ / +* | b39aa3b91 Merge branch 'charlesmchen/flatButton' +|\ \ +| * | 9ee72756a Create Flat UI rounded button class. +| * | 46d00383f Create Flat UI rounded button class. +| * | 3993035d9 Create Flat UI rounded button class. +| * | 5be2014ec Create Flat UI rounded button class. +|/ / +* | c95ff44ea Merge branch 'charlesmchen/modalActivityIndicator' +|\ \ +| * | ab00342d6 Add modal activity indicator view. +|/ / +* | b0186754b Merge branch 'charlesmchen/lazyLoadAttachments' +|\ \ +| * | bb2a822f3 Clean up the data source class. +| * | d3ad0950b Clean up the data source class. +| * | b8573d732 Apply OWSFail() in more places. +| * | 9dfebb2d4 Apply OWSFail() in more places. +| * | c21a7673c Rework preservation of attachment filenames. +| * | 0746b1300 Apply DataSource to message sender. +| * | b95b5f69d Apply DataSource to message sender. +| * | 20e5013aa Convert DataSource to Objective-C. +| * | 69816cdf0 Convert DataSource to Objective-C. +| * | 2282733fa Add data source class. +|/ / +* | 94f02c0d1 Merge branch 'charlesmchen/contactsAndProfilesVsDebugUI' +|\ \ +| * | 0c281cab9 Add "log user profiles" debug UI action. +| * | d8d3f3607 Add "delete all contacts" debug UI action. +|/ / +* | 948da2afb Merge remote-tracking branch 'origin/release/2.16.0' +|\ \ +| |/ +| * 43a2b9ebe (tag: 2.16.0.20, origin/release/2.16.0) Bump build to 2.16.0.20. +| * 5d58f4383 More profile logging +| * 3d5836a76 (tag: 2.16.0.19) Bump build to 2.16.0.19. +| * 066cc411f Merge branch 'mkirk-2.16.0/fix-no-profile-crash' into release/2.16.0 +| |\ +| | * 04bf548a7 Fix one-time crash when opening thread without having a local profile +| |/ +| * 2bd50a7bf (tag: 2.16.0.18) Bump build to 2.16.0.18. +| * 60ab8bd04 Update l10n strings. +| * 628dd8055 Merge branch 'mkirk-2.16.0/fix-nav-controller' into release/2.16.0 +| |\ +| | * 25a2646c8 Always present settings from OWSNavigationController +| |/ +* | 7d5377875 Merge branch 'charlesmchen/conversationBackButtonHotArea' +|\ \ +| * | df2bf6338 Fix back button width on iOS 11. +| * | 26a6e76f3 Rework conversation view header. +| * | b626fb5bf Rework conversation view header. +| * | 644f435b1 Rework conversation view header. +|/ / +* | daa8c409e Merge branch 'charlesmchen/renameViews' +|\ \ +| |/ +|/| +| * c106794fe Rename conversation view. +| * 928525c31 Rename home view. +| * fd4f00fa4 (origin/charlesmchen/renameNewContactThreadView) Rename new contact thread view. +|/ +* 29848835f (tag: 2.16.0.17) Bump build to 2.16.0.17. +* e6d14db2f Merge branch 'charlesmchen/pushNotificationsVsConcurency' +|\ +| * fc92293da Fix build break. +| * 6911c8047 validate push settings on main thread +|/ +* 58e6ab60d Update l10n strings. +* ddb4d9743 (tag: 2.16.0.16) Bump build to 2.16.0.16. +* 77760b8ad Merge branch 'mkirk/ios11-images' +|\ +| * 2d13c4922 [iOS11] Support sending .heif filesS +| * 83ca34edb Fix sending images taken on iOS11 camera. +|/ +* 454a7c295 Merge branch 'mkirk/jsq-ios11' +|\ +| * ecf8ca093 [JSQMVC] iOS11 compatability +|/ +* 5170fe09b (tag: 2.16.0.15) Bump build to 2.16.0.15. +* 8d4850657 Merge branch 'mkirk/avatar-cropper' +|\ +| * d827453f4 copy tweak +| * 0d04cf251 Ensure the crop view is WYSIWIG. +| * 4e93bec23 black masking style for avatar cropper +|/ +* 79f0c14e2 Merge branch 'mkirk/upgrade-experience' +|\ +| * 809a9c3d1 copy tweak +| * 59eb782d5 Optimize layout for profile upgrade, remove other upgrade screens +| * 0244a8203 code cleanup for clarity +| * 90b1db9eb new upgrade layout +| * b7cc1e9f5 top margin iphone5c +| * 73a441a28 introducing profiles +|/ +* e1e8d05ed Merge branch 'charlesmchen/groupVsUserProfileWhitelist' +|\ +| * 16dcc73b2 Respond to CR. +| * 2ce66527f Add group members individual to profile whitelist when adding group. +|/ +* 605ba90bc Merge branch 'charlesmchen/initialConversationRangeSize' +|\ +| * 6a2d14ad2 Refine message view's initial range size. +| * a1cb2c015 Refine message view's initial range size. +|/ +* 2cd72d64c (tag: 2.16.0.13) Fix commit messages written by build number script. +* 3be347ed2 Bump build from to 2.16.0.13. +* 85c07da43 Merge branch 'mkirk/icon-cleanup' +|\ +| * cd4cfb50d clean up avatar icon +|/ +* 13640db20 Merge branch 'mkirk/enforce-name-limit' +|\ +| * ae174d4a8 proper handling for multibyte characters +| * 362b38378 Length-limit profile name field +|/ +* b648165db Merge branch 'charlesmchen/skipProfileUpgradeNag' +|\ +| * 3d0300242 Use "skip" not "stop" in profile upgrade nag. +|/ +* 43db34c99 Merge branch 'charlesmchen/fixFakeContacts' +|\ +| * 94daccc78 Fix fake contacts. +| * a35a21d5c Batch the creation of fake contacts. +|/ +* 49147a499 Merge branch 'mkirk/fix-view-load' +|\ +| * 1cd51a8df Use existing isViewLoaded var +|/ +* 7f5975f02 Merge branch 'mkirk/prod-crashes' +|\ +| * 3b85c5e49 crashfix: production crash when notification fired before view loaded +| * 2cd2596dd crashfix: thread.uniqueId is sometimes nil in production +| * bb8f6c1b7 crashfix: crash while accessing image property +| * 2eaaba908 crashfix: on addObject, presumably it's nil. +|/ +* 274fa25e6 (tag: 2.16.0.12) Bump build from to 2.16.0.12. +* b8802729b Merge branch 'charlesmchen/layoutGlitches' +|\ +| * 1be49e485 Update JSQMessagesViewController pod. +| * 95eaa2c3b Preserve scroll state across conversation view layout changes, if possible. +| * b2c8ad2d2 Restore scroll state after resetting the conversation view's mapping. +| * 7d3249196 Preserve scroll state across conversation view layout changes, if possible. +|/ +* eaa1f4f31 (tag: 2.16.0.11) Bump build from to 2.16.0.11. +* 894ba2802 Merge branch 'charlesmchen/isScrolledToBottom' +|\ +| * fce2ad279 Refine the "is scrolled to bottom" logic to better handle new conversations. +|/ +* 4884473ea Merge branch 'charlesmchen/gifOfDeath' +|\ +| * bb1681f96 Respond to CR. +| * cc048b397 Respond to CR. +| * ef21c6d50 Ignore "GIF of death." +| * 7f15228ab Ignore "GIF of death." +| * 5fcf89dff Ignore "GIF of death." +|/ +* 6a76fed3c Merge branch 'charlesmchen/keyboardShowVsScrollState' +|\ +| * b9908997c Remain scrolled to bottom after presenting the keyboard in messages view. +|/ +* 045d7efb2 Merge branch 'charlesmchen/debugVsProduction' +|\ +| * d03233947 Modify debug builds to use production service. +|/ +* 6156fcb24 Merge branch 'mkirk/fix-provisioning-cipher' +|\ +| * 01d0117f9 provisioning cipher: Fix memory leak, handle failure +| * 1f7b6f61c Regression test for provisioning cipher +|/ +* 59f2c4674 (tag: 2.16.0.10) Bump build from to 2.16.0.10. +* d7b0b6a25 Fix build break in production builds. +* 43dddf931 (tag: 2.16.0.9) Bump build from to 2.16.0.9. +* 1e31eb6cd Merge branch 'mkirk/sync-whitelist' +|\ +| * bdb75fa59 infer when group has been whitelisted on linked device +|/ +* e97de3599 Merge branch 'charlesmchen/dontIgnoreAttachments' +|\ +| * b00db33d1 Don't ignore attachments. +|/ +* 0cc169e60 Merge branch 'charlesmchen/syncLocalProfile' +|\ +| * 3c90c3361 Respond to CR. +| * 71d7490e3 Re-sync local profile state with service if necessary. +|/ +* cf7f9dabf Merge branch 'charlesmchen/rtlVsSystemMessages' +|\ +| * ac3743f81 Fix RTL layout of system message cells. +|/ +* de98d3c15 Merge branch 'charlesmchen/messageViewScrollStateAgain' +|\ +| * 92a0fbe01 Fix yet another edge case around message view scroll state. +|/ +* 4a2ca15b7 Fix build break around parameter name. +* 70cbfb9ec Merge branch 'charlesmchen/messageViewScrollStateRevisited' +|\ +| * 44f071bdf Respond to CR. +| * 6f5437ee0 Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. +| * 997cd2ef2 Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. +| * 7f717c0ca Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. +|/ +* 3ffb321e2 fix assert +* 18bc7cb0a Merge branch 'mkirk/sync-local-profile-earlier' +|\ +| * 4c51f1810 sync local profile as soon as it's created +|/ +* 1aeccc6a4 Merge branch 'mkirk/profile-key-flag' +|\ +| * ab84cbd67 use messageSender property now that the class relies on it in multiple places. +| * 42934e5fd remove retry logic per code review +| * d71b7684a cleanup logging +| * 55d0db8c4 Disable profile-key sending with feature flag +| * ec0cf36ab Don't print empty bubbles. +| * 69e8ca8ea Handle receiving profile key messages +| * 4382f3361 Send blank PROFILE_MESSAGE after whitelisting someone +| * 6c63009e9 Dedicated "Profile" debug section +| * 9c5666061 profile key flag and debug action +|/ +* fb42077db Merge branch 'mkirk/profile-key-sync' +|\ +| * d8aa9b4a3 better comment per CR +| * 0feb966a1 comment cleanup / code formatting +| * 6cde79c56 Assert profile key length on sending/receiving +| * 6235e7fe5 Don't send profile key with every sync message since we explicitly sync upon update/create. +| * 526d5e33b Sync profile key to sibling devices when updating contact +| * 46919e470 Add own profile key to multidevice provisioning message +| * 1f3d2d1ed Send any profile key in contact sync +| * f0a57edde proto update: multiDevice profileKey sync +|/ +* ce92cc632 Merge branch 'charlesmchen/fixScrollDownButton' +|\ +| * d3d9e5dab Fix scroll down button state. +|/ +* 4f8508050 Merge branch 'charlesmchen/localProfileVsUploadForm' +|\ +| * cdfdb80fd Respond to CR. +| * 7e4859241 Clear the local profile avatar immediately when we request upload form. +|/ +* 47ae4bd90 Merge branch 'charlesmchen/clearProfileAvatars' +|\ +| * 0fa19b526 Clear own avatar on service if necessary when updating local profile. Clear others' avatar when appropriate. +| * 50a8d0f16 Clear own avatar on service if necessary when updating local profile. Clear others' avatar when appropriate. +|/ +* 65eb5c725 Bump build from to 2.16.0.8. +* 5ec9b40f1 Merge branch 'mkirk/profile-censorship' +|\ +| * 1e51bf489 extract event names +| * 251e206b6 profiles vs. censorship circumvention +|/ +* c630a1ecc Merge branch 'charlesmchen/messageViewTweaks' +|\ +| * f2ae73e15 Remove obsolete "scrollLaterTimer" hack in messages view. +| * 8794880db Unbound message bubble cache size and DRY up cache logic. +|/ +* d4879a5f5 Update JSQMessageView. +* c08d81e45 Merge branch 'charlesmchen/cropAndScaleAvatar' +|\ +| * c90ca331e Respond to CR. +| * 2aaa9155d Add view to Crop and scale avatar. +| * 6b8e189f4 Add view to Crop and scale avatar. +| * 728028563 Add double-tap to zoom out. +| * e7b32f9fd Add double-tap to zoom out. +| * 2b50eb5ac Add view to Crop and scale avatar. +| * 2c301feeb Add view to Crop and scale avatar. +|/ +* 428edb617 Merge branch 'charlesmchen/profileNameLengthError' +|\ +| * 374a59e93 Remove an old TODO. +| * e8a6ca1c2 Show an error when profile name is too long. +|/ +* 3cccf9275 Merge branch 'mkirk/profile-name-for-avatar' +|\ +| * bde40a1f9 Ensure avatar upates right after profile change. +| * f6720f9af properly clear all cached avatar images +| * b579ea591 Use profile name when building avatar if contact name is unavailable +|/ +* 0812e73fd Merge branch 'charlesmchen/groupProfileWhitelistCache' +|\ +| * 89bacf5cc Respond to CR. +| * 65db75a91 Fix group profile whitelist check. +|/ +* 1944979ac Merge branch 'charlesmchen/noAvatarInNewContacts' +|\ +| * 9bf80a215 Don't add avatar to new contacts. +|/ +* 7dbf372f7 Merge branch 'mkirk/remove-profile-key-debug' +|\ +| * 903d792af Debug action to clobber local profile and key +|/ +* 75ceb62f2 Merge branch 'mkirk/more-name' +|\ +| * 041c5a4a1 CR: setNeedsLayout +| * f49e12256 listen for profile names change notifications +| * 96f0ab215 wip +| * fd9935467 profile name vs. verified in ContactTableViewCell +| * e54e1d11c show profile name snippet in inbox and conversation settings +|/ +* b22a8f51b (tag: 2.16.0.7) Bump build from to 2.16.0.7. +* f8000d86b Merge branch 'mkirk/fix-whitelist' +|\ +| * 279eb8902 Fix whitelist +|/ +* 6d6ffd6d3 (tag: 2.16.0.6) Bump build from to 2.16.0.6. +* 5593cd2ee Merge branch 'charlesmchen/messageViewTruncateRange' +|\ +| * b28a6bab2 Respond to CR. +| * 57b76b341 Ensure message view range is properly truncated with view is configured. +|/ +* 51d11cdcc Merge branch 'charlesmchen/profileViewTweaks2' +|\ +| * 15d2fd23d Rework save/cancel buttons in profile view. +| * 68309eb00 Rework save/cancel buttons in profile view. +|/ +* afd530af1 Merge branch 'mkirk/fix-boot-crash' +|\ +| * 0a57e7db0 Fix slow start crash after upgrade to 2.16 +|/ +* cda5157b9 Merge branch 'charlesmchen/writeTransactionsVsSyncDBRegistration' +|\ +| * 703b34809 Respond to CR. +| * a9b55675c Add assert to ensure that we don't use write transactions before sync database view registration is complete. +|/ +* 9a045054e Merge branch 'charlesmchen/stagingServiceVsProduction' +|\ +| * 97f74ca5b Only use staging service in debug builds. +|/ +* 828cfb5fa Merge branch 'charlesmchen/groupOffers' +|\ +| * 5e6f5804c Respond to CR. +| * 584ddab0b Show "share profile with group" banner. +| * ae1908c40 Show "share profile with group" banner. +|/ +* 673c44e13 Merge branch 'charlesmchen/padEmptyProfileName' +|\ +| * 68ee56174 Pad empty profile names instead of nil. +|/ +* 3d6bf273d (tag: 2.16.0.5) Bump build from to 2.16.0.5. +* 7eeb32686 Fix minor build error. +* ec3f099af (tag: 2.16.0.4) Bump build from to 2.16.0.4. +* 42b5da2db Merge branch 'charlesmchen/reworkProfileView' +|\ +| * 6dda535f2 Rework the profile view. +| * 313d06b31 Rework the profile view. +| * 020d2c567 Rework the profile view. +| * 3181ee788 Rework the profile view. +|/ +* d27708497 Merge branch 'charlesmchen/observeProfileChanges' +|\ +| * 9dfeb132c Respond to CR. +| * 1e43e9337 Observe profile changes in conversation view. +|/ +* 9a70aef99 (tag: 2.16.0.3) Bump build from to 2.16.0.3. +* 72c983e4a Merge branch 'charlesmchen/contactOffers' +|\ +| * 14d472781 Respond to CR. +| * a340c9ebd Clean up ahead of CR. +| * 4578a72ab Reorder where contact offers appear. +| * 02c96b7b0 Rework the contact offers. +| * 9e02524b0 Rework the contact offers. +| * c2f9d7dcb Rework the contact offers. +| * 265bdce0b Start reworking the contact offers. +| * a825fad47 Start reworking the contact offers. +| * 98eb4693c Rework the contact offers. +| * 5f2f8ec6d Start reworking the contact offers. +|/ +* 7ede899a7 Merge branch 'mkirk/openssl' +|\ +| * 0ab958f03 cleanup per codereview +| * 0f9f26a57 handle remote user's profile key has changed +| * 72fbb0202 aes-gcm via openssl +| * d6d403ce6 fix some tests +|/ +* 636790c99 Merge branch 'charlesmchen/profileForNewAndOldUsers' +|\ +| * 27e496ad0 Respond to CR. +| * 1b055c485 Rework "cancel navigate back" logic. +| * 25b0f7961 Rework "cancel navigate back" logic. +| * 08347478a Implement alternative approach to veto-able back buttons. +| * 9d8c39684 Add profile view to upgrade/nag workflow. +| * ffb4b3f9d Add profile view to registration workflow. +|/ +* 26f9c7ad0 Merge branch 'mkirk/clarify-profile-name-use' +|\ +| * 7c386b1d1 CR: RTL, trim profile names, ensure not empty +| * 4511b4015 Clarify where we use the profile name +|/ +* c536f4d4b Merge branch 'charlesmchen/newContactConversationsVsProfileWhitelist' +|\ +| * 164bf19b4 Respond to CR. +| * 622c0c3f5 * Add debug UI tools for clearing and logging the profile whitelist. * Auto-add new contact threads to profile whitelist when local user sends first message to that thread. * Ensure dynamic interactions have a non-negative timestamp even if the conversation was empty. * Only call updateMessageMappingRangeOptions _after_ beginLongLivedReadTransaction and updating messageMappings. * Improve documentation around how to avoid corrupt mappings in conversation view. * Fix edge cases around large initial range sizes. * Always treat dynamic interactions as read. * Rebuild the “unseen” database views to remove dynamic interactions (see above). +| * d476bc286 * Add debug UI tools for clearing and logging the profile whitelist. * Auto-add new contact threads to profile whitelist when local user sends first message to that thread. * Ensure dynamic interactions have a non-negative timestamp even if the conversation was empty. * Only call updateMessageMappingRangeOptions _after_ beginLongLivedReadTransaction and updating messageMappings. * Improve documentation around how to avoid corrupt mappings in conversation view. * Fix edge cases around large initial range sizes. * Always treat dynamic interactions as read. * Rebuild the “unseen” database views to remove dynamic interactions (see above). +| * 0b14f8757 Improve comments about mapping consistency in conversation view. +|/ +* 58a4993b2 Merge branch 'mkirk/fix-send-jank' +|\ +| * e08fa4bce Fix jolting animation after sending a message +|/ +* 92ecf0cdc Merge branch 'mkirk/push-registration-blocks-signal-registration' +|\ +| * 2e8364332 Don't consider registration complete until user registers their push notification tokens. +|/ +* d41a9fd4d Merge branch 'charlesmchen/increaseConversationRangeSize' +|\ +| * 6c3662b94 Increase max conversation range length. +|/ +* 2f2902a76 (tag: 2.16.0.2) Bump build from to 2.16.0.2. +* 34a0f9810 Merge branch 'charlesmchen/profileViewTweaks' +|\ +| * ddd8c9ff5 Respond to CR. +| * 3ecd415b8 Show activity indicator during profile update; trim whitespace from profile names. +|/ +* 14b6fbcb0 Merge branch 'charlesmchen/profilesVsEncoding' +|\ +| * 943945b4b Fix “profiles not encoded” bug. +|/ +* 7a03ab4e7 (tag: 2.16.0.1) Bump build from to 2.16.0.1. +* 83f400c16 Merge branch 'charlesmchen/profileManagerConcurrency' +|\ +| * 46d27cef3 Respond to CR. +| * 1dd75a05f Tweak concurrency in profile manager. +| * 02f8b13f4 Rework concurrency in the profile manager. +|/ +* 8dce481ea Merge branch 'charlesmchen/layoutGlitch' +|\ +| * b2360ace6 Fix layout glitch in messages view. +|/ +* 34cf56fb3 Merge branch 'charlesmchen/profileVsAppSettingsHeader' +|\ +| * f618f8782 Respond to CR. +| * 90f959d0a Respond to CR. +| * cdb181ead Sketch out profile header in app settings view. +| * 13aea6687 Sketch out profile header in app settings view. +|/ +* fde0ca6ed (tag: 2.16.0.0) Update l10n strings. +* 80951349e Bump version to 2.16.0.0. +* 00860e898 Merge branch 'mkirk/scale-avatar' +|\ +| * abec53672 simplify check for max file size per CR +| * 2c3e99c37 better var name per code review +| * fd02644ca resize profile avatar +|/ +* 6bb102783 Merge branch 'mkirk/save-profile-to-contact' +|\ +| * 9f72db44a Avoid lossy re-encoding of profile image +| * 0290f176c Use profile name/avatar when creating new contact +|/ +* 9f45ddd39 Merge branch 'mkirk/gcm-verification' +|\ +| * 97afa4d48 verification on decrypt +|/ +* b3ddd73ce Merge branch 'mkirk/new-profile-service-scheme' +|\ +| * 135243e38 CR: variable rename, better comments, fix up tests +| * 7499b3aaf Avatar API integration / WIP crypto scheme +| * 283d36c55 remove avatar digest. +| * fc3f9ae39 Replace server sent avatar URL with hardcoded +|/ +* 391928443 Merge branch 'mkirk/call-debugging' +|\ +| * 3d9796db7 Debug actions for calling +|/ +* a90f11490 (origin/mkirk/fix-profile-crash) Merge branch 'mkirk/fix-profile-crash' +|\ +| * 9fdc3202a White listing must happen on main thread +|/ +* 69b75942f Merge commit '2.15.3.2' +|\ +| * d29dd5c2b (tag: 2.15.3.2) Bumping build. +* | 1ee27996e Merge branch 'hotfix/2.15.3.1' +|\ \ +| |/ +| * 8da3108b5 (tag: 2.15.3.1, origin/hotfix/2.15.3.1) Drop stale EndCall/BusyCall messages +* | 370ce5ba0 Merge branch 'hotfix/2.15.3' +|\ \ +| |/ +| * 4cf860cfe (tag: 2.15.3.0, origin/hotfix/2.15.3) pull latest translations +| * 46e5240f8 bump version +| * 93d2baa09 [JSQMVC] Fix scrolling crashes +| * 0e241299d Discard GroupInfoRequest from unknown group +* | 4f6d91ce6 Merge branch 'mkirk/fixup-tests' +|\ \ +| * | 40b99a15e (origin/mkirk/fetch-profile-avatars) Fix up some tests +|/ / +* | 620550a46 Merge branch 'mkirk/upload-profile-avatar' +|\ \ +| * | a3ae22c84 Upload profile avatar to service +| * | 45a1f534b Rename method to make way for new method. +|/ / +* | 388b778a0 Merge branch 'mkirk/unknown-group-info-request' +|\ \ +| * | 72b3f3779 (origin/mkirk/unknown-group-info-request) Discard GroupInfoRequest from unknown group +|/ / +* | a8bfa45f1 Merge branch 'mkirk/use-profile-data' +|\ \ +| * | 16c646a93 Use profile name/image when available. +|/ / +* | 8f54df0ff Merge branch 'mkirk/whitelist-on-main' +|\ \ +| * | ee613e488 Can only set whitelist on main thread +|/ / +* | e07ed5017 define avatar form URL +* | 71be024fd [SPK] more asserts/logging +* | 98e668530 Merge branch 'charlesmchen/profile10a' +|\ \ +| * | e01fbc247 Refine profile logic. +| * | 09e65a674 Incomplete work to upload avatars. +| * | f6668d24c Download profile avatars. +| * | 9266c3a4f Clear profile state when a user’s profile key changes. +| * | 8b9749202 Load local user profile avatar if necessary. +| * | 21304c18a Once we've shared our profile key with a user (perhaps due to being a member of a whitelisted group), make sure they're whitelisted. +|/ / +* | fa1678f94 Merge branch 'charlesmchen/profiles9a' +|\ \ +| * | 98def4178 Respond to CR. +| * | 823927685 Update profile on service. +| * | 83d01eed7 Don’t encrypt/decrypt avatar URL or digest. +|/ / +* | cc789c7df Merge branch 'charlesmchen/profiles8' +|\ \ +| * | f6bcff542 Fix rebase breakage. +| * | 83e2fbe28 Rework where profile key is attached in photos. +| * | b5fdc05b9 Move profile key to data, call, sync and null protos. +| * | 37ce388eb Add “add to profile whitelist” offer. +|/ / +* | 9f6ca3d84 Merge branch 'mkirk/precache-localnumber' +|\ \ +| * | ed4de7e8a Simplify code / pre-cache localNumber +|/ / +* | f99d4e9df Merge branch 'hotfix/2.15.2' +|\ \ +| |/ +| * 783686778 (tag: 2.15.2.2, origin/hotfix/2.15.2) pull latest translations +| * b29d87cb3 bump build +| * df94337a0 Merge branch 'mkirk/improve-asserts' into hotfix/2.15.2 +| |\ +| | * 3856f3dfb (private/mkirk/improve-asserts) Improve asserts/logging +| |/ +* | 219580827 Merge branch 'mkirk/fix-tests' +|\ \ +| * | 52bd68256 fix some recently broken tests +|/ / +* | b18f3bc08 Merge branch 'charlesmchen/unregisterVsProfileCache' +|\ \ +| * | 03774216a Respond to CR. +| * | 6ac4d8e97 Delete profile avatars on disk when unregistering. +|/ / +* | 50a379096 Merge branch 'charlesmchen/profileWhitelistVsOwnGroups' +|\ \ +| * | ddf3929be Auto-add groups to profile whitelist groups when you make them. +|/ / +* | e74e7f7cc Merge branch 'charlesmchen/profiles7' +|\ \ +| * | ba506bf09 Respond to CR. +| * | 49e65ba1b Update user profile update date on successful update. +| * | 9c0f94f1c Fetch profiles from profile manager. Update profile manager with profile fetch results. +| * | 6ec756de4 Move profile manager to Signal. +| * | 540a0a8e4 Refine UserProfile class. Move local user properties to UserProfile. +|/ / +* | 6bc20ea97 Merge branch 'charlesmchen/showThreadsSync' +|\ \ +| * | a70bd3307 Show threads if possible. +|/ / +* | aa5c441ae Merge branch 'mkirk/cache-local-number' +|\ \ +| * | 935b51aa1 Fixup tests +| * | 01e808feb localNumber persistance from Category -> TSAccountManager +| * | 8a4712bf4 Only access localNumber on AccountManager and cache it +|/ / +* | e0aae5058 Merge branch 'mkirk/random-avatar-builder' +|\ \ +| * | 357eb6250 [DEBUG-UI] Add avatar to (some) fake contacts +|/ / +* | 43b3abe32 Merge branch 'hotfix/2.15.2' +|\ \ +| |/ +| * 96faa080c (tag: 2.15.2.1, private/hotfix/2.15.2) Merge branch 'charlesmchen/callViewDelay' into hotfix/2.15.2 +| |\ +| | * d9bc3ac80 Respond to CR. +| | * 9c5934359 Don’t dismiss call view controller to present other view. +| | * 138301975 Don’t dismiss call view controller to present other view. +| | * 791e27057 Terminate call if call view presentation is delayed. +| | * 634617b7d Terminate call if call view presentation is delayed. +| |/ +| * 2da8741df Merge branch 'mkirk/call-screen-timer' into hotfix/2.15.2 +| |\ +| | * 81d7f2825 Timer to ensure call screen shown +| | * c6069376d more logging +| |/ +| * f8e153fb7 Bump build from to 2.15.2.1. +| * 639fcac21 (tag: 2.15.2.0) Merge branch 'charlesmchen/hideThreadsVsDisappearingMessages' into hotfix/2.15.2 +| |\ +| | * 6f03c2d92 Don’t hide threads if they are a group thread, or if they have _ever_ had a message. +| |/ +| * 5c4019b9c Bump version to 2.15.2.0. +* | a1411ff81 Merge branch 'charlesmchen/profiles6' +|\ \ +| * | 539490ee1 Respond to CR. +| * | c603a2651 Rework how user profiles are updated and persisted. Persist other user’s profiles. Load and cache other user’s profile avatars. +| * | d7f275ce7 Add accessor for other users’ profile names. +| * | 4a54f1a99 DRY up and refine the logic to attach the local profile key to outgoing messages. +| * | aa6312b58 DRY up and refine the logic to attach the local profile key to outgoing messages. +| * | 282ac4bb2 Add “share profile” row to conversation settings. +| * | 1c1e173c5 Add support for adding groups to the profile whitelist. +| * | 26b668cce Add profile key to proto schema. Send and receive profile keys. Cache profile manager state. +| * | e58358ce5 Add profile key to content proto schema. +| * | 202724cdc Persist profile whitelist and known profile keys. +|/ / +* | ec6283fac Merge branch 'charlesmchen/yapDatabaseConnectionCategory' +|\ \ +| * | 2993ac002 Clean up database convenience methods and add assertions. +| * | a3b16812e Add convenience category for YapDatabaseConnection. +| * | 4be706caf Add convenience category for YapDatabaseConnection. +| * | 7692a393c Add convenience category for YapDatabaseConnection. +|/ / +* | 92e84ea21 Merge branch 'charlesmchen/profileView3' +|\ \ +| * | a748987d7 Add option to clear profile avatar. +|/ / +* | 83a02536a Merge branch 'charlesmchen/profileView2' +|\ \ +| * | 03a4ebc4d Respond to CR. +| * | 8a8f3d81f Clean up ahead of PR. +| * | c331788c0 Modify the profile view to update profile manager state. +| * | 0f3a3d190 Sketch out profile upload. +| * | 0bd23345a Sketch out the profile view. +| * | 873f5208c Sketch out the profile view. +| * | 72ea09697 Sketch out the profile view. +|/ / +* | b62ab3f66 Merge remote-tracking branch 'origin/hotfix/2.15.1' +|\ \ +| |/ +| * 868d19972 (tag: 2.15.1.0, tag: 2.15.1, origin/hotfix/2.15.1) Merge branch 'charlesmchen/ios8vsLayout' into hotfix/2.15.1 +| |\ +| | * 99c948568 Remove iOS 9-only APIs from layout code. +| |/ +| * 66cda35a8 Merge branch 'mkirk/fix-privacy-switch' into hotfix/2.15.1 +| |\ +| | * 249a3fcab Show proper setting for CallKitPrivacy +| |/ +| * 845c286b4 bump version +* | 5884d5d23 Merge branch 'mkirk/avatar-flash' +|\ \ +| * | 742f8cf90 Avoid unnecessariy flashing avatars +| * | 092578045 [DEBUG-UI] create fake contact threads +| * | bdd31fc77 Merge branch 'charlesmchen/profileManager' +| |\ \ +| | * | 63e20cd8b Sketch out profile manager. +| |/ / +| * | 7b2bab2ab Merge branch 'charlesmchen/l10nScriptVsSSK' +| |\ \ +|/ / / +| * | 74009a320 Modify l10n string extraction script to reflect SSK move. +|/ / +* | 4bf407a24 fix some compiler warnings +* | efcbd3b3a Merge branch 'charlesmchen/registrationCleanup' +|\ \ +| * | 3c3bd3c91 Tweaks to registration views. +|/ / +* | d809a30fa fix tests +|/ +* 1e002f7ef (tag: hotfix/2.15.1, tag: 2.15.0.4) Bump build from to 2.15.0.4. +* cb53d27e5 Merge branch 'charlesmchen/messageMappingsGrowth' +|\ +| * a0eead37c Ensure size of message mappings range increases monotonically. +|/ +* 2a6df19e0 Merge branch 'mkirk/drain-queue-perf' +|\ +| * a19669342 Make sure DB views are ready before kicking processing job +| * 0b38b4668 remove unnecessary dispatch +| * 6a5c6a9fc didBecomeActive kicks the processing queue +| * 106608998 Fix thread explosion +|/ +* 00fc1299d Merge branch 'charlesmchen/messageFooterAlignment' +|\ +| * 31d65c3d7 Fix RTL alignment of message footers. +|/ +* a9c07e88b Merge branch 'mkirk/fix-spinner-layout' +|\ +| * feb1061c0 Fix spinner layout on iphone5 +|/ +* 020bd4849 Fix tests +* 43f451e23 Remove errant assert. +* b6cecd44a Merge branch 'charlesmchen/fixWarningsInAnalyticsMacros' +|\ +| * bdb50552d Fix asserts in analytics macros. +|/ +* 240b8adbd Merge branch 'charlesmchen/debugUIVsManualCensorshipCircumvention' +|\ +| * 5acb3714e Add debug UI to enable manual censorship circumvention. +| * 75c7cc4ab Add debug UI to enable manual censorship circumvention. +|/ +* 964eb28f1 Merge branch 'charlesmchen/debugGroupsVsLocalNumber' +|\ +| * d22e29ec0 Include local number when creating debug groups. +|/ +* fe7ad9cc8 Merge branch 'charlesmchen/debugCreateGroups' +|\ +| * 8f17730d9 Modify “create groups” debug UI to use current 1:1 contact. +| * 653f7faca Add debug UI for creating groups. +|/ +* 1c3dd8cac (tag: 2.15.0.3) Bump build from to 2.15.0.3. +* 2bd113f14 Merge branch 'charlesmchen/hideEmptyConversations' +|\ +| * e74ef14ae Revert accidental change to Carthage. +| * 678db31c1 Hide empty conversations in home view. +| * c042a96aa Hide empty conversations in home view. +| * c6e21e83a Hide empty conversations in home view. +| * 8e628a629 Hide empty conversations in home view. +| * 189003916 Hide empty conversations in home view. +| * 103a7fab3 Hide empty conversations in home view. +|/ +* 6dff283de Update l10n strings. +* 75fb55e01 Merge tag '2.14.1.2' +|\ +| * 18ff07276 (tag: 2.14.1.2) bump build +| * 0b43b9448 revert WebRTC to fix iOS8 crashes +| * be731b7b2 (tag: 2.14.1.1) sync translations +| * 3cbab3fe3 bump build +| * 84e9c33f1 Optionally link Metal/MetalKit frameworks used by WebRTC +* | bca736a2b Merge tag '2.13.4.0' +|\ \ +| * \ 79aa5e279 (tag: 2.13.4.0, origin/hotfix/2.13.4.0) Merge branch 'charlesmchen/showUpgradeLabel' into hotfix/2.13.4.0 +| |\ \ +| | * | 9aa54cad6 Fix missing “database upgrade” label on launch screen. +| | * | ab9770c17 Fix missing “database upgrade” label on launch screen. +| | * | 503874481 Fix missing “database upgrade” label on launch screen. +| |/ / +| * | 1e99c55e8 Merge branch 'charlesmchen/moreDebugMessages' into hotfix/2.13.4.0 +| |\ \ +| | * | d94ee7ab1 Add options to send 3k debug messages. +| |/ / +| * | ac48b1388 Bump version number to 2.13.4.0. +| * | 2e5ba529a [SSK] Update SSK to hotfix/2.13.4.0. +* | | 3f805d31d (tag: 2.15.0.2) Bump build from to 2.15.0.2. +* | | 07ee0db80 Merge branch 'charlesmchen/moreCallServiceAnalytics' +|\ \ \ +| * | | dd13119f1 Add more instrumentation to CallService. +| * | | 904515994 Add more instrumentation to CallService. +* | | | 5c50aa74c Merge branch 'charlesmchen/crashDeletingThreads' +|\ \ \ \ +| |/ / / +|/| | | +| * | | e16d0e326 Avoid crash when deleting threads - and improve perf. +|/ / / +* | | 842e1503b Merge branch 'charlesmchen/gatherAnalyticsEventNames' +|\ \ \ +| * | | e5c0fa89d Respond to CR. +| * | | 465711c2c Add script to extract and gather analytics event names. +| * | | f1807cd70 Add script to extract and gather analytics event names. +| * | | 0cf9c01af Add script to extract and gather analytics event names. +| * | | 8aff95c44 Add script to extract and gather analytics event names. +| * | | b4f348ad1 Add script to extract and gather analytics event names. +| * | | 31ab9a00d Add script to extract and gather analytics event names. +|/ / / +* | | e9cf39a4c Merge branch 'charlesmchen/fixConversationViewTitle' +|\ \ \ +| * | | 6858a1e94 Fix assert in conversation view around nil title. +| * | | 803e91c3c Fix assert in conversation view around nil title. +|/ / / +* | | 898f122d2 Merge branch 'mkirk/drop-oversized-envelopes' +|\ \ \ +| * | | 91ad2ec32 Properly handle too-large messages +|/ / / +* | | 0113bb2c1 Merge branch 'charlesmchen/instrumentRegistrationFunnel' +|\ \ \ +| * | | 4ac7600c0 Respond to CR. +| * | | d4af62adc Instrument registration happy path with analytics. +|/ / / +* | | 0189f601c Merge branch 'charlesmchen/streamlineAnalyticsProperties' +|\ \ \ +| * | | 531489a82 Streamline analytics properties. +| * | | f973af5a8 Streamline analytics properties. +| * | | 013bf62f7 Streamline analytics properties. +|/ / / +* | | 8d796cc26 Merge branch 'mkirk/fix-crash-on-nil-key' +|\ \ \ +| * | | 3f4dcecf1 ensure blocking keychange message has identityKey before proceeding +|/ / / +* | | 8b724c5d7 Merge branch 'mkirk/durable-store' +|\ \ \ +| * | | eafc370bb CR: move property to method to clearly avoid Mantle serialization +| * | | 4d8429186 Store undecrypted envelopes before doing any processing. +|/ / / +* | | f4fc6de6e (tag: 2.15.0.1) Bump build from to 2.15.0.1. +* | | 1009b1ba7 Fix tests. +* | | 1486ef858 Merge branch 'charlesmchen/databaseObservation' +|\ \ \ +| * | | d80f470c2 Respond to CR. +| * | | 2e7fe5cfd Rework database observation in home and message views. +| * | | 1f1a68118 Rework database observation in home and message views. +|/ / / +* | | c41037a4f Merge branch 'charlesmchen/leakedViewControllers' +|\ \ \ +| * | | c1139a3a2 Fix many leaks in the view controllers. +| * | | f0cecfad1 Surface memory leaks by logging the deallocation of view controllers. +|/ / / +* | | d72c4a21c Fix missing variable type. +* | | 171eec25c Merge branch 'charlesmchen/easyTapGroupName' +|\ \ \ +| * | | 511cbbeaa Make it easier to tap-to-edit group names in new group and update group vies. +|/ / / +* | | 92f053e7a Merge branch 'charlesmchen/analytics6' +|\ \ \ +| * | | 863fd27ab Respond to CR. +| * | | 7cbdde7b1 Rework handling of critical errors, e.g. errors while initializing TSStorageManager. +| * | | 8e51b5ade Clean up ahead of PR. +| * | | 958a8b4c8 Instrument CallService. +|/ / / +* | | 90945609e (tag: 2.15.0.0) Bump version to 2.15.0.0. +* | | 8236f0545 Merge branch 'charlesmchen/analytics5' +|\ \ \ +| * | | ef4b1cf47 Respond to CR. +| * | | fa7a2407b Respond to CR. +| * | | b17a7c575 Review NSError usage. +| * | | 11f52757b Use background task when sending analytics events. +| * | | 543c05b2c Add a “critical” severity level for analytics events. +|/ / / +* | | 9962c936c Merge branch 'charlesmchen/analytics3' +|\ \ \ +| * | | 2418baec1 Respond to CR. +| * | | 9587aab37 Instrument network errors. +| * | | 117bca7c4 Instrument errors in app delegate. +| * | | 7da5df594 Instrument errors in storage manager. +| * | | 19c0a7ad7 Instrument errors in message sender. +| * | | e168db79a Instrument errors in message manager. +|/ / / +* | | bf82d2e2e Merge branch 'mkirk/atomic-registration' +|\ \ \ +| * | | c74a5c074 CR: strong reference to migration job, clarify variable +| * | | 6e19c1aae Don't crash when messaging user with malformed profile +| * | | a5f067936 migration to fix any half-registered users +| * | | 7c2880544 Don't consider yourself registered until you've uploaded your prekeys +|/ / / +* | | 078a1312f Merge branch 'charlesmchen/gifVsUrl' +|\ \ \ +| * | | 97772a32f Respond to CR. +| * | | 9eaeba9af Address yet another edge cases around pasteboards that contain both textual and non-textual content, e.g. a gif and the URL of that gif. +|/ / / +* | | aa5730dc1 Merge branch 'charlesmchen/alwaysReloadTableWhenChangingGrouping' +|\ \ \ +| * | | ceb243b30 Always reload home view table when changing grouping. +|/ / / +* | | d244731ce Merge branch 'mkirk/ssk-install' +|\ \ \ +| * | | 6ef9d568f Instructions, how to use SignalServiceKit +|/ / / +* | | de8a1b429 Merge branch 'mkirk/update-build-instructions' +|\ \ \ +| * | | 9560af493 clarify build instructions +|/ / / +* | | dc211afd5 Merge branch 'charlesmchen/nationalPrefixes' +|\ \ \ +| * | | 128c40a26 Respond to CR. +| * | | c8b2e22a3 [SSK] Migrating changes from obsolete SSK repo. +| * | | 03aacbd68 [SSK] Try applying national prefixes when parsing phone numbers. +|/ / / +* | | 3db5c777c Merge branch 'charlesmchen/analytics2' +|\ \ \ +| * | | 4059c3417 [SSK] Migrating changes from obsolete SSK repo. +| * | | 64a99c63b [SSK] Migrating changes from obsolete SSK repo. +| * | | fdac0305c Update analytics macros. +|/ / / +* | | 04cf1c8cb Merge branch 'charlesmchen/rightToLeft' +|\ \ \ +| * | | 4f5b2993b [SSK] Migrating changes from obsolete SSK repo. +| * | | 14621e128 Respond to CR. +| * | | 34f7cd1a4 Clean up ahead of PR. +| * | | 02c510691 Adapt number formatting to RTL. +| * | | 5edec99fd Adapt number formatting to RTL. +| * | | 04fb3642b Remove .xib for home view cells; adapter home view to RTL. +| * | | eaacac9d8 DRY up common table cell patterns. +| * | | 96fd5e11e Adapt more UI elements to RTL. +| * | | c799e18c7 Adapt voice messages UI to RTL. +| * | | 8005cf022 Adapt conversation settings view to RTL. +| * | | d4e62efce Adapt call view to RTL. +| * | | e2125978d Adapt "new group" and "update group" views to RTL. +| * | | 693e74e86 Adapt conversation settings view to RTL. +| * | | 656cc47de Adapt registration views to RTL. +| * | | d4f012fbb Fix contact table cell and “add to block list” view. +| * | | e15432720 Add arabic translation; begin work on right-to-left layout. +|/ / / +* | | b48225859 Merge branch 'mkirk/localize-jsqmvc-within-signal' +|\ \ \ +| * | | e52248fe3 Localize JSQMessagesViewController within Signal +|/ / / +* | | 45d74e4a9 Merge branch 'mkirk/intern-ssk-2' +|\ \ \ +| * | | 1b8efb525 CI runs SSK tests +| * | | 00fede422 Consolidate Gemfile w/ SSK, update fastlane +| * | | 4b69126d1 Use interned SSK +| * | | ccb4a8874 Import SSK (and history) into Signal-iOS +| |\ \ \ +|/ / / / +| * | | d98c07ecf Merge branch 'charlesmchen/countryNameVsiOS8' +| |\ \ \ +| | * | | 493aaca24 Avoid nil country names on iOS 8. +| |/ / / +| * | | e20d63240 Merge branch 'mkirk/cleanup-with-transaction' +| |\ \ \ +| | * | | faeb7100b use existing transaction in cleanup +| |/ / / +| * | | fe0f01dae Merge branch 'charlesmchen/pasteVoiceMessages' +| |\ \ \ +| | * | | c25550495 Fix copy and paste of voice messages. +| |/ / / +| * | | 640ec13b2 Merge branch 'charlesmchen/orphanCleanup' +| |\ \ \ +| | * | | 6fa3fac4a Fix broken tests. +| | * | | 7a50d6b99 Fix broken tests. +| | * | | 762f91517 Respond to CR. +| | * | | 96da091e9 Run orphan cleanup on startup. +| |/ / / +| * | | 9115a1f97 Merge branch 'mkirk/update-ci-gems' +| |\ \ \ +| | * | | 57b90e146 update ci gems +| |/ / / +| * | | e0f805f80 Merge branch 'mkirk/fix-persistence-upgrade' +| |\ \ \ +| | * | | ab6c1fb3b Fix persist view for upgrade scenarios +| |/ / / +| * | | 9d3175b5c Merge branch 'mkirk/cleanup-logging' +| |\ \ \ +| | * | | 957979585 remove unhelpful logging +| |/ / / +| * | | 8361ffb81 Merge branch 'mkirk/persist-thread-view' +| |\ \ \ +| | * | | ea681a61e persist thread view +| |/ / / +| * | | c1e1247ef Merge branch 'charlesmchen/identityManagerVsStartup' +| |\ \ \ +| | * | | 92276157d Don’t sync verification state until app has finished becoming active. +| |/ / / +| * | | 2216c2d41 Merge pull request #295 from WhisperSystems/mkirk/fix-tests +| |\ \ \ +| | * | | a23b4871e fix tests +| |/ / / +| * | | 72e893d5f Merge commit 'e24f18320d3aefe87d2532c9f0520348c4598cb2' +| |\ \ \ +| | * \ \ e24f18320 Merge branch 'charlesmchen/modelConnection' into hotfix/2.13.3.0 +| | |\ \ \ +| | | * | | 58fb86b8e Use a dedicated connection for model reads & writes. +| | |/ / / +| | * | | 065017caf Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0 +| | |\ \ \ +| | | * | | daae31d30 Modify TSStorageManager to use separate shared read and write connections. +| | |/ / / +| * | | | 8714a8f37 Merge branch 'mkirk/no-sync-to-unregistered-number' +| |\ \ \ \ +| | * | | | deff1fa4e FIX: verifiying unregistered user prints "no longer registered" error on every launch +| |/ / / / +| * | | | 1fc5f7728 Merge branch 'mkirk/declined-call-notification' +| |\ \ \ \ +| | |/ / / +| |/| | | +| | * | | fd625dff5 remove default case for better compiler warnings +| | * | | 89f86c4fd call type for declined call +| |/ / / +| * | | 04ef06ce9 Merge branch 'mkirk/fix-unread-badge' +| |\ \ \ +| | * | | f59779c11 message manager updates badge count +| |/ / / +| * | | 85fe68d3c Fix typo after rename +| * | | d6c5497f6 Merge branch 'mkirk/fix-tests' +| |\ \ \ +| | * | | 0b33ef616 try fastlane scan, since build is timing out. +| | * | | acf31db4b bump travis image to 8.3 +| | * | | a8ea2428c gemfile for consistent build on dev/CI +| | * | | 605db6b78 Fix up deleteAttachments method since making attachmentFolder dispatchOnce +| | * | | 1d71ca5e5 Fix some more tests. +| | * | | 8f9af85cc prefer hacks in test to hacks in code. +| | * | | 1b9aae2ea CR: renaming var to be more general +| | * | | e652dff4b Allow override of singleton enforcement in test app +| | * | | edf5852e8 set-expiration dispatches *sync* so we can test it. +| | * | | 1fb9fa79d Fix up some more tests. +| | * | | 13c5bdb8c fix disappearing messages test +| | * | | 2addb9e81 Fixed test build. Some tests still failing. +| |/ / / +| * | | c711b4a66 Merge branch 'mkirk/key-version' +| |\ \ \ +| | * | | b2f9abbc7 transmit key version byte +| |/ / / +| * | | 14c64239a Merge branch 'charlesmchen/archiveSessionsOnSSQ' +| |\ \ \ +| | * | | e9219743f Archive sessions on the 'session store' queue. +| |/ / / +| * | | 793a7449b Merge branch 'mkirk/archive-sessions-on-id-change' +| |\ \ \ +| | * | | 5da7dc1fd Archive sessions upon identity change. +| |/ / / +| * | | 07e029137 Merge branch 'charlesmchen/diskUsage' +| |\ \ \ +| | * | | e8e7b6bcb Add creation timestamp to attachment streams. +| |/ / / +| * | | 8fda18a8e Merge branch 'mkirk/verification-sync' +| |\ \ \ +| | * | | 5a2169fa7 Don't sync verification until NullMessage succeeds. This better mirrors existing sync message behavior +| | * | | 4c22f371a better comment on strange padding +| | * | | 6dea4c9fe fix padding calculation +| | * | | a5660f4db cleanup ahead of PR +| | * | | d927cba5c don't sync verified state when we have never recorded the recipients identity +| | * | | badaa5432 sync all verification states with contact sync +| | * | | 12bfae10e All sync messages should have 1-512 random padding +| | * | | 35ee92f38 send null message when syncing verification state +| | * | | 99cd8fc27 Log when receiving null message +| | * | | f653bc36a sync verification state with contacts +| | * | | 48b3f498a WIP: adapt to verification proto changes +| | * | | f526a372c proto update +| | * | | 6566ea694 no need to send sync messages when only 1 device +| |/ / / +| * | | 8b04e2a88 Merge branch 'charlesmchen/logOverflow' +| |\ \ \ +| | * | | ed369436f Reduce chattiness of logs; increase log file sizes. +| | * | | b946badd9 [SSK] Reduce chattiness of logs; increase log file sizes. +| |/ / / +| * | | 4609c508e Merge branch 'charlesmchen/fixCFail' +| |\ \ \ +| | * | | 30961cf2a Fix OWSCFail() macro. +| |/ / / +| * | | 4eacfe768 Merge branch 'charlesmchen/verificationSyncVsUI' +| |\ \ \ +| | * | | d8b34f630 Ensure verification UI is updated to reflect incoming verification state sync messages. +| |/ / / +| * | | 2315ab79d Merge branch 'charlesmchen/attachmentStreamUpgradePerf' +| |\ \ \ +| | * | | e86e175ce Respond to CR. +| | * | | beb4ed71e Respond to CR. +| | * | | cf65cc3be Improve perf of attachment stream file path upgrade. +| |/ / / +| * | | ed249840c Merge branch 'charlesmchen/slowLaunchRelease' +| |\ \ \ +| | * | | 27e5c836b Refine observation of async registration completion. +| |/ / / +| * | | 7af758bc6 Merge branch 'charlesmchen/enableVerificationStateSync' +| |\ \ \ +| | * | | 07bec72f6 Enable verification state sync. +| |/ / / +| * | | 5110c5892 Merge branch 'mkirk/verification-key-length' +| |\ \ \ +| | * | | e746c6b7e append/remove key type as necessary to fix verification syncing +| |/ / / +| * | | 2059bb496 Merge branch 'WhisperSystems-mkirk/fix-verification-crash' +| |\ \ \ +| | * | | 742e0d3c9 message sending must be on main thread +| |/ / / +| * | | c0cb153f2 Merge branch 'charlesmchen/holidayCodeReviewOmnibus' +| |\ \ \ +| | * | | 5d7c012b5 Respond to CR. +| | * | | d80e42e0a Respond to post-holiday code reviews. +| | * | | 18e6a1b1c Respond to post-holiday code reviews. +| |/ / / +| * | | a9bac8bce Merge branch 'charlesmchen/syncVerificationRedux' +| |\ \ \ +| | * | | 498c0ef68 Respond to CR. +| | * | | 44e1f4a14 Rework verification state sync per latest proto schema. +| |/ / / +| * | | 26e6aab07 Merge branch 'charlesmchen/lastAppLaunchCompletedVersion' +| |\ \ \ +| | * | | 8ef118f5d Cache the attachments folder in TSAttachmentStream. +| | * | | b9f9b6a0c Add isFirstLaunch method to AppVersion. +| | * | | 32e4eb2a4 Add a “last app completed launch” version. +| |/ / / +| * | | 7379e6a67 Merge branch 'charlesmchen/attachmentStreamUpgradesVsSerialQueue' +| |\ \ \ +| | * | | 470cee0e1 Upgrade attachment streams on a serial queue. +| |/ / / +| * | | 09513fc1c Merge branch 'charlesmchen/databaseViewsVsStartupTime' +| |\ \ \ +| | * | | 22109d719 Respond to CR. +| | * | | 0f9634105 Avoid crashing on startup due to database view creation. +| | * | | bbc7c44c9 Use transactions in the jobs. +| |/ / / +| * | | 96dc0e4fd Merge branch 'charlesmchen/removeBlockingPref' +| |\ \ \ +| | * | | d53db1744 Remove “block on safety number changes” setting in preferences. +| |/ / / +| * | | f999c4abb Merge branch 'charlesmchen/databaseViewsVsPerf2' +| |\ \ \ +| | * | | 0c503c379 Reduce number of database views. +| |/ / / +| * | | d8199a444 Merge branch 'charlesmchen/databaseViewsVsPerf' +| |\ \ \ +| | * | | bf07a8401 Remove an unnecessary database view. +| |/ / / +| * | | 1f1410ffa Merge branch 'charlesmchen/groupCreationErrors' +| |\ \ \ +| | * | | 3598cc18f Ensure message sends only succeed or fail once. +| | * | | e1439a54d Add “group creation failed” error message. +| |/ / / +| * | | 857fb535d Merge branch 'charlesmchen/expirationVsCalls' +| |\ \ \ +| | * | | 26836a572 Skip expiration for calls. +| |/ / / +| * | | 7052b97c7 Merge branch 'charlesmchen/callsStuckOnConnecting' +| |\ \ \ +| | * | | 42cef65de Improve logging around incoming messages. +| |/ / / +| * | | 916851205 Merge branch 'charlesmchen/readReceiptsVsOlderMessages2' +| |\ \ \ +| | * | | dfab38b94 Rework how messages are marked read. +| |/ / / +| * | | 5d1a33b5f Merge branch 'charlesmchen/readReceiptsVsOlderMessages' +| |\ \ \ +| | * | | 4a028d32b Filter messages shown in the home view. +| | * | | dcbb72d85 Filter messages shown in the home view. +| | * | | 5e5071141 Don’t update expiration for messages twice. +| | * | | dc9a2253d Rework how messages are marked read. +| | * | | c5c464378 Rework how messages are marked read. +| |/ / / +| * | | 49f118043 Merge branch 'mkirk/remove-legacy-message-sending' +| |\ \ \ +| | * | | c29549c21 remove legacy message sending +| |/ / / +| * | | 13a119b4b Merge branch 'charlesmchen/refineVerification' +| |\ \ \ +| | * | | f32432788 Don’t update home view sort order in response to dynamic interactions or verification state changes. +| | * | | 1052915c1 We only want to create change messages in response to user activity, on any of their devices. +| |/ / / +| * | | 12aed7a4a Merge branch 'charlesmchen/defaultVerificationMessageDescription' +| |\ \ \ +| | * | | fbc1bad88 Add a default description for verification state messages. +| |/ / / +| * | | 8bd028125 Merge branch 'mkirk/archive-not-delete' +| |\ \ \ +| | * | | 0df5ea3ee CR: continue to delete session when receiving an EndSession +| | * | | cfd9b84e6 Remove redundant missing-session check. +| | * | | 1db9c8b34 prefer archiving vs deleting sessions. +| |/ / / +| * | | f2f654af1 Merge branch 'charlesmchen/verificationStateChangeMessages' +| |\ \ \ +| | * | | ca04d912d Don't actually transmit any verification state sync messages until we finalize the proto schema changes. +| | * | | 841271dc6 Respond to CR. +| | * | | fdd172bda Add verification state change messages. +| | * | | eed637791 Add verification state change messages. +| |/ / / +| * | | fba94754a Merge branch 'mkirk/redundant-sn-changes' +| |\ \ \ +| | * | | 7fc73e2ba include recipient name in error message +| | * | | 94fb7d50e CR: add comment +| | * | | dfd0f8073 When failing to send to new identity, save it. +| |/ / / +| * | | edc6578b9 Merge branch 'charlesmchen/syncVerificationState' +| |\ \ \ +| | * | | 0e1156682 Respond to CR. +| | * | | e27e55ca9 Fix a typo. +| | * | | 5acb20942 Sync verification state. +| | * | | 3c2835d31 Sync verification state. +| | * | | 07ac17fd3 Sync verification state. +| | * | | 90d671924 Sync verification state. +| | * | | 89b1da766 Sync verification state. +| | * | | b2425ddf9 Sync verification state. +| |/ / / +| * | | 33df1fb6c Merge branch 'mkirk/create-missed-call-notification-in-thread' +| |\ \ \ +| | * | | 90087c34f Create an interaction when missing a call due to identity change +| |/ / / +| * | | 435f13f2f Merge branch 'mkirk/avoid-deadlock-on-unknown-session' +| |\ \ \ +| | * | | 0c2a1ff89 avoid deadlock on unknown session +| |/ / / +| * | | d475c5834 Merge branch 'mkirk/identityManager' +| |\ \ \ +| | * | | 81d36a465 code cleanup per code review +| | * | | 4a73ab285 trust matching first known key, regardless of how old it is +| | * | | 1603e8bfb more specific asserts, clean up logging +| | * | | e408250ef Fix crash when messaging user for the first time +| | * | | 167961a45 restore call-back for changed identities +| | * | | 12b5c2c26 Sync verification state. +| | * | | 8a2688387 Fix crash. +| | * | | fcc17ca86 Respond to CR. +| | * | | ecf7ef61f update identity manager names +| | * | | d9acaced2 Clean up ahead of PR. +| | * | | f1d85c2a9 Clean up ahead of PR. +| | * | | 559c389f9 Sketch out OWSIdentityManager. +| | * | | 702f7677c Sketch out OWSIdentityManager. +| | * | | 0fcd0afd1 Sketch out OWSVerificationManager. +| | * | | 9154cc46f Sketch out OWSVerificationManager. +| |/ / / +| * | | 43d1aa49d Merge branch 'charlesmchen/formatFailMessages' +| |\ \ \ +| | * | | 69e40cdf1 Format fail messages. +| |/ / / +| * | | 72fb925af Merge branch 'charlesmchen/reworkSystemMessages' +| |\ \ \ +| | * | | f63c85f5d Rework and unify the system messages. +| |/ / / +| * | | 0ad794dfd Merge branch 'mkirk/better-envelope-logging' +| |\ \ \ +| | * | | ab378f79b better message receipt logging +| |/ / / +| * | | 01f291146 Merge branch 'charlesmchen/obsoleteNotification' +| |\ \ \ +| | * | | 7c78d62a0 Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. +| |/ / / +| * | | 05a96008e Merge branch 'mkirk/reject-unseen-id-calls' +| |\ \ \ +| | * | | ebd4800e2 return unseen identity rather than bool +| | * | | e10cc0c18 determine if recipient identity change is unseen +| |/ / / +| * | | cd7a172b9 Revert "Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification." +| * | | f2fb2cb9d Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. +| * | | 0c46288cf Merge branch 'mkirk/dedicated-session-connection' +| |\ \ \ +| | * | | 806a64ee5 Store session as Immutable to be clear about when it's mutated. +| | * | | 29e86901e Do not cache session objects +| |/ / / +| * | | 07b54039b Merge branch 'charlesmchen/incomingAndOutgoingDatabaseViews' +| |\ \ \ +| | * | | 32d97bc6c Respond to CR. +| | * | | 09f7a9df4 Add incoming and outgoing message database views. +| |/ / / +| * | | 888943a04 Merge branch 'charlesmchen/cleanupTimerUsage' +| |\ \ \ +| | * | | 2b197197b Clean up timer usage. +| |/ / / +| * | | 0a3e75ee8 Merge branch 'charlesmchen/fixMarkAsRead' +| |\ \ \ +| | * | | e889f49e3 Fix “mark as read” logic. +| |/ / / +| * | | 6acfab6a5 Merge branch 'charlesmchen/refineUnseenIndicator' +| |\ \ \ +| | * | | a5bebaf86 Respond to CR. +| | * | | 0eff3625c Respond to CR. +| | * | | 31e216519 Respond to CR. +| | * | | 7c5a11b22 Changes for unseen indicator. +| | * | | 32d5e5214 DRY up the creation of database views. +| | * | | 6e94b3ccc Add a database view for dynamic interactions. +| |/ / / +| * | | c7cc02354 Merge branch 'charlesmchen/cacheAccountNames' +| |\ \ \ +| | * | | 66927f206 Cache display names for accounts. +| |/ / / +| * | | 33a2b05dc Merge branch 'mkirk/remove-unnecessary-notifications' +| |\ \ \ +| | * | | 42b35bb89 Don't notify for some error messages +| |/ / / +| * | | 0eef7ccb8 Merge branch 'mkirk/confirm-send' +| |\ \ \ +| | * | | 09d7d8c02 Given a recipient id, returns any unconfirmed identity +| |/ / / +| * | | 0201fa34c Merge branch 'mkirk/profile-request' +| |\ \ \ +| | * | | 5df67c8e5 move constant per code review +| | * | | fe075d2f7 Support for profile fetching so we can display SN changes upon entering a thread +| | * | | b89d16ea9 Merge branch 'charlesmchen/messageViewPerf2_' +| | |\ \ \ +| |/ / / / +| | * | | ef9303dd0 Rename audio duration and image size methods in TSAttachmentStream. +| |/ / / +| * | | 12c45b8a4 Merge branch 'mkirk/log-error-on-send-failure' +| |\ \ \ +| | * | | 3be70e971 log error on failure +| |/ / / +| * | | d782904d1 Merge branch 'mkirk/safety-numbers' +| |\ \ \ +| | * | | 4a6a02c00 Ensure updates don't clobber +| | * | | 8ee57d913 save identity to legacy identity store so we can switch versions while testing +| | * | | 0001b6c49 Code style per code review, no functional changes +| | * | | f2f3acb89 IdentityKeyStore changes +| |/ / / +| * | | 0a8c4203e Merge branch 'charlesmchen/socketManagerAssert' +| |\ \ \ +| | * | | 07bf3b9af Remove invalid assert in socket manager. +| |/ / / +| * | | 289fd4f0c Merge branch 'charlesmchen/messageViewPerf2' +| |\ \ \ +| | * | | fe796d6c5 Cache image size and audio duration on attachments. +| |/ / / +| * | | d61235825 Merge branch 'charlesmchen/manualCensorshipCircumvention' +| |\ \ \ +| | * | | 58edbdfbd Let users manually specify the domain fronting country. +| | * | | 98ff7e5ab Add support for manually activating censorship circumvention. +| | * | | d3fc5e4ab Rework how the views observe socket state. +| | * | | 45b947dc0 Rework how the views observe socket state. +| | * | | 2171cd1d9 Add support for manually activating censorship circumvention. +| |/ / / +| * | | cbeafac20 Merge branch 'charlesmchen/addToContactsOffer' +| |\ \ \ +| | * | | 66b8d5401 “Add to contacts” offer. +| |/ / / +| * | | 485af7e81 Merge branch 'charlesmchen/localPhoneNumberCountryVsContactParsing' +| |\ \ \ +| | * | | fcc7eb656 Try the country code for the local phone number when parsing phone numbers. +| |/ / / +| * | | dd1451035 Merge branch 'charlesmchen/pinYapDatabase' +| |\ \ \ +| | * | | 4837a9d37 Pin YapDatabase to v2.9.3 to avoid v.3.x. +| |/ / / +| * | | 2439752c2 Merge branch 'charlesmchen/attachmentFilenames' +| |\ \ \ +| | * | | df17403ec Respond to CR. +| | * | | c955b189f Respond to CR. +| | * | | 9fb1012c6 Persist attachment file paths. +| | * | | c75769d40 Rename attachment source filename property. +| |/ / / +| * | | 52097864f Merge branch 'mkirk/show-name-in-sn-change' +| |\ \ \ +| | * | | 92d72b3fc make nonatomic per code review +| | * | | 47b1c31b5 Contact Name in SN changed notifications +| |/ / / +| * | | e212fdf2c Merge branch 'mkirk/group-sn-changes' +| |\ \ \ +| | * | | fcbfde387 nonblocking SN change notifications don't percolate group threads to the top unless there is a message in that thread. +| | * | | 4becd4397 "Bob's SN changed" displayed in every group containing Bob +| |/ / / +| * | | 2f7e76f82 Merge branch 'charlesmchen/searchLocalCallingCode' +| |\ \ \ +| | * | | 5bf3a8093 Honor the local calling code in select recipient view. +| |/ / / +| * | | cd4cb1709 Merge branch 'charlesmchen/retryPushTokenRegistration' +| |\ \ \ +| | * | | 09712f0b7 Retry push token registration. +| |/ / / +| * | | 145b4ee57 Merge branch 'mkirk/faster-contact-parsing' +| |\ \ \ +| | * | | e585b9052 remove checks for other country codes since it's expensive +| |/ / / +| * | | 57a799ef9 Merge branch 'mkirk/cache-phone-number-parsing' +| |\ \ \ +| | * | | 52be0e2ff dont cache when parsing fails with error +| | * | | 1ee30023b Reduce time between editing contacts and seeing those changes in the app +| |/ / / +| * | | e6ff79c12 Revert "Merge branch 'charlesmchen/autoMarkAsRead'" +| * | | f1f5c443f Merge branch 'mkirk/voice-message-snippet' +| |\ \ \ +| | * | | 3cc982e65 use mic for voice message snippet +| |/ / / +| * | | 492aee79e Merge branch 'charlesmchen/onlyReplyToGroupInfoRequester' +| |\ \ \ +| | * | | 0936dd936 Don’t reply to “request group info” messages from non-members of the group in question. +| | * | | 8d10d19f8 Only reply to group info requester. +| |/ / / +| * | | 85ccf2db7 Merge branch 'charlesmchen/voiceMessagesUI' +| |\ \ \ +| | * | | a0c13490c Clean up ahead of PR. +| | * | | f3ed7697d Move filename property to TSAttachment. +| |/ / / +| * | | dd1591689 Merge branch 'mkirk/polite-intersection' +| |\ \ \ +| | * | | 772b3a6ba thumbnail hash without allocating big string. +| | * | | 873d8ff2b include emails in contat hash +| | * | | 5ac08dfeb hashable method to detect when contact has changed +| |/ / / +| * | | 2dc7c7cf2 Merge branch 'charlesmchen/examplePhoneNumbers' +| |\ \ \ +| | * | | 150c166a6 Show example phone numbers. +| | * | | fb3e2557e Show example phone numbers. +| |/ / / +| * | | 2bb745930 Merge branch 'charlesmchen/phoneNumberParsing' +| |\ \ \ +| | * | | 587d03501 Don’t ignore “unnamed” phone numbers. +| |/ / / +| * | | 279e25c1d Merge branch 'charlesmchen/disappearingMessages' +| |\ \ \ +| | * | | 77dbf6480 Respond to CR. +| | * | | c89b9fb0b Disable “disappearing messages” job when inactive. +| | * | | 6e52009ff Rework the “disappearing messages” logic. +| |/ / / +| * | | 9f569d376 Merge branch 'charlesmchen/autoRejoinGroups' +| |\ \ \ +| | * | | d5118273b Respond to CR. +| | * | | 315775ff2 Auto-rejoin groups by emitting and responding to “request group info” messages. +| |/ / / +| * | | 311206918 Merge branch 'mkirk/safer-key-delete' +| |\ \ \ +| | * | | e9c0c46a2 Always keep at least 3 old signed prekeys (accepted or otherwise). +| |/ / / +| * | | 4e08b8092 Merge branch 'charlesmchen/flagVoiceMessages' +| |\ \ \ +| | * | | e56e9434a Respond to CR. +| | * | | b84653235 Flag voice messages as such in protos. +| |/ / / +| * | | 92de9a5e7 Merge branch 'charlesmchen/attachmentMimeTypes' +| |\ \ \ +| | * | | 3e9fbb1be Prefer to deduce the MIME type from the file extension using lookup, not the UTI type. +| | * | | cb6de93a8 Try to deduce attachment MIME type from the file extension if possible. +| |/ / / +| * | | 955c4d8a0 Merge branch 'charlesmchen/phoneNumberParsingPerf' +| |\ \ \ +| | * | | 6c2de6ed5 Fix a hotspot in the phone number parsing logic. +| |/ / / +| * | | 71a304f84 Merge branch 'charlesmchen/multipleAccounts' +| |\ \ \ +| | * | | 1b93cd29c Rework handling of phone number names. +| |/ / / +| * | | d82afb8bb Merge branch 'charlesmchen/contactsSync' +| |\ \ \ +| | * | | 9bfcc8e38 Add “is complete” flag to contacts sync proto. +| | * | | 41e564db4 Use SignalAccount class to sync contacts. +| | * | | 741e5c02a Add “is complete” flag to contacts sync proto. +| |/ / / +| * | | f078f8adc Merge branch 'mkirk/compiler-warnings' +| |\ \ \ +| | * | | ad31c75e8 fix more compiler warnings +| | * | | 50df5b682 nullability annotations for TSInteraction +| | * | | c9f397d59 nullability audit for MimeTypeUtil +| | * | | 1754ad25d nullability annotations +| |/ / / +| * | | 24c84cbba Merge branch 'mkirk/better-send-logs' +| |\ \ \ +| | * | | a92129a0e better sending logs +| |/ / / +| * | | e336e0b34 Merge branch 'mkirk/delay-contact-access' +| |\ \ \ +| | * | | 4338c5935 disambiguate contact param +| |/ / / +| * | | d25a93403 Merge branch 'charlesmchen/cleanup' +| |\ \ \ +| | * | | 9b8d6bd87 Minor cleanup. +| |/ / / +| * | | 25e086c22 Merge branch 'charlesmchen/autoMarkAsRead' +| |\ \ \ +| | * | | 2a64ff29e Temporary change to improve read receipt logging. +| |/ / / +| * | | 77833e727 Merge pull request #196 from WhisperSystems/mkirk/contact-fixup +| |\ \ \ +| | * | | f4dd01e30 Properly handle "work", "home", and "other" labels +| |/ / / +| * | | 4431fa335 Merge branch 'charlesmchen/signalAccount' +| |\ \ \ +| | * | | 5058eb837 Add SignalAccount class. +| | * | | cd9e1fb57 Add SignalAccount class. +| | * | | e3c959812 Extract labels for phone numbers. +| | * | | 9dc601485 Extract labels for phone numbers. +| |/ / / +| * | | 608852898 Merge branch 'mkirk/debug-call-messages' +| |\ \ \ +| | * | | 52b19a911 better debug messages about what *kind* of encrypted message we received +| |/ / / +| * | | c47e766c1 Merge branch 'mkirk/debug-spk' +| |\ \ \ +| | * | | bf6f01315 debug tool: print signed prekey report +| |/ / / +| * | | cc055f034 Merge branch 'charlesmchen/genericAttachmentAppearance' +| |\ \ \ +| | * | | b986db808 Add filename to attachment streams. +| |/ / / +| * | | 5d4b96924 Merge branch 'charlesmchen/utiTypeForFileExtension' +| |\ \ \ +| | * | | 19754bacb Add a "UTI type for file extension" method. +| |/ / / +| * | | c77ad7f77 Merge branch 'charlesmchen/whitespaceVsContactCells' +| |\ \ \ +| | * | | 72730c06a Improve handling of whitespace in contacts. +| |/ / / +| * | | 476047e24 Merge branch 'charlesmchen/ignoreOversizeMessages' +| |\ \ \ +| | * | | 6686167cc Ignore oversize messages. +| |/ / / +| * | | 8251f1e67 Merge branch 'mkirk/sync-session-reset' +| |\ \ \ +| | * | | e1055c26a Sync EndSession messages to linked devices +| | * | | a21108db5 Log message type in prod +| |/ / / +| * | | 0bbe73e11 Merge branch 'charlesmchen/messageSendFatalErrors' +| |\ \ \ +| | * | | b40ec508b Do not retry fatal message send errors. +| |/ / / +| * | | 1fe093074 Merge branch 'mkirk/download-progress' +| |\ \ \ +| | * | | 68476a51d Download service emits progress notifications +| |/ / / +| * | | 1032588da Merge branch 'charlesmchen/groupMessagesVsSafetyNumberChanges' +| |\ \ \ +| | * | | 9b24ad7f1 Do not try to resend unsaved outgoing messages when accepting a safety number change. +| |/ / / +| * | | b9eeb408c Merge branch 'charlesmchen/muteThreads' +| |\ \ \ +| | * | | f0ca46883 Respond to CR. +| | * | | 0e9da39c6 Add muting of threads. +| |/ / / +| * | | 51689b334 Merge branch 'charlesmchen/fixMessagesFromLinkedDevices' +| |\ \ \ +| | * | | a3db112c5 Fix outgoing message status for messages sent from linked devices. +| |/ / / +| * | | bb24ffc91 Merge branch 'charlesmchen/outgoingMessageState' +| |\ \ \ +| | * | | 6341905c9 Respond to CR. +| | * | | ced9d6f46 Retry group sends if any of its errors are re-tryable. +| | * | | f191d6b09 Respond to CR. +| | * | | aa70ada39 Refine error handling for outgoing group messages. +| | * | | db051b3b3 Consider group send a failure if sending to any member in the group fails. +| | * | | 1023eeb8a Rework outgoing message state. +| | * | | 1404d0d7e Rework outgoing message state. +| | * | | bf18b1f28 Rework outgoing message state. +| | * | | 654ef8904 Rework outgoing message state. +| | * | | 04dc930e0 Rework outgoing message state. +| | * | | 0ab6bcd08 Rework outgoing message state. +| |/ / / +| * | | 91aeddf38 Merge branch 'charlesmchen/lostMessages' +| |\ \ \ +| | * | | 42e005a49 Avoid lost messages by acknowledges message receipt after the message is processed. +| |/ / / +| * | | 2367ab743 Merge branch 'charlesmchen/prekeyDoubleUpdate_' +| |\ \ \ +| | * | | 406e2d862 De-bounce the prekey checks. +| | * | | 0224af746 De-bounce the prekey checks. +| |/ / / +| * | | a715ed079 Merge branch 'mkirk/mark-as-accepted' +| |\ \ \ +| | * | | 522c191fd Persist when signed pre key was 'acceptedByService' +| |/ / / +| * | | 238fd0d9f Merge branch 'charlesmchen/honorAttachmentFilenames' +| |\ \ \ +| | * | | fa2ff8158 Respond to CR. +| | * | | 40dcc7c87 Honor attachment filenames. +| | * | | bc10aea20 Honor attachment filenames. +| | * | | b09f7e5e5 Honor attachment filenames. +| |/ / / +| * | | 173823e3a Merge branch 'feature/contactsIntersectionAudit' +| |\ \ \ +| | * | | 715e9e85f Respond to CR. +| | * | | 00f1b53e6 Reduce usage of contacts intersection endpoint. +| |/ / / +| * | | 1d946ccfe Merge branch 'charlesmchen/arbitraryAttachments' +| |\ \ \ +| | * | | 06a56cced Update SignalAttachment to allow arbitrary attachments. +| |/ / / +| * | | 5e40162fd Merge pull request #176 from WhisperSystems/mkirk/protobuf-docs +| |\ \ \ +| | * | | 9c8350701 up to date protobuf building documentation +| * | | | 6649b1a12 Merge branch 'charlesmchen/socketLifecycle' +| |\ \ \ \ +| | |/ / / +| |/| | | +| | * | | aa3402b53 Respond to CR. +| | * | | 04b3166b8 Rework socket manager. +| | * | | b7e24c664 Rework socket manager. +| | * | | 3d46f8e83 Rework socket manager. +| |/ / / +| * | | f94021df9 Merge branch 'mkirk/multiple-recipient' +| |\ \ \ +| | * | | edc556b10 Fix multiple match for SignalRecipient +| |/ / / +| * | | 0ee09323f Merge branch 'charlesmchen/blockOffer' +| |\ \ \ +| | * | | daa832bbc Respond to CR. +| | * | | 17b751d22 Create block offer when non-contacts send you a message. +| |/ / / +| * | | adee71ba9 Merge branch 'charlesmchen/voiceAndWebrtcDefaults' +| |\ \ \ +| | * | | d89d4dea8 Remove the properties related to Redphone and WebRTC support. +| |/ / / +| * | | 59a7b02de Merge branch 'charlesmchen/refineUploadIndicator' +| |\ \ \ +| | * | | e28a81e6a Improve attachment upload progress indicator. +| |/ / / +| * | | 74ade2817 Merge branch 'charlesmchen/license' +| |\ \ \ +| | * | | 009dac0b5 Update license. +| |/ / / +| * | | 1beac5698 Merge branch 'charlesmchen/fixArbitraryAttachmentDownloads' +| |\ \ \ +| | * | | f08d779f4 Fix file extensions for arbitrary file types. +| |/ / / +| * | | 7f2ce6142 Merge branch 'charlesmchen/fixAudioPlayback' +| |\ \ \ +| | * | | e6cd3d071 Fix audio playback. +| |/ / / +| * | | d4e0c49ff Merge branch 'charlesmchen/attachmentRetryVsFailure' +| |\ \ \ +| | * | | 004a952bc Respond to CR. +| | * | | 8258f26ae Don’t mark messages as failed until all retries are exhausted. +| |/ / / +| * | | 19d8a3202 Merge pull request #163 from WhisperSystems/mkirk/debug-asserts +| |\ \ \ +| | * | | 97f93eef7 only assert queues in debug +| |/ / / +| * | | 45b8dc9c9 Merge pull request #162 from WhisperSystems/mkirk/session-corruption +| |\ \ \ +| | * | | 513c27510 Log when we delete sessions +| | * | | bb38fce54 Ensure that deleting sessions happens on session queue +| | * | | 2d93b8c6e Handle mismatched/stale devices on session queue +| | * | | 773b09b01 Inspect session store on serial queue +| | * | | 9e74f3809 deprecate unused method +| | * | | 9a444f428 Assert that session mutation occurs on serial queue +| | * | | 7578176e3 rename sessionCipher to sessionStoreQueue +| | * | | 60dcadb0d Move iOS Versions from Signal-iOS +| |/ / / +| * | | 4f9e05324 Merge branch 'mkirk/consistent-copy' +| |\ \ \ +| | * | | fcf271f08 Block list is two words +| |/ / / +| * | | 694088ee9 Merge branch 'mkirk/terminal-sending-failures' +| |\ \ \ +| | * | | fa9e28989 Don't retry some failures +| |/ / / +| * | | bb1a749c4 Merge branch 'charlesmchen/dontBlockOutgoingGroupMessages' +| |\ \ \ +| | * | | b12e93076 Don’t block outgoing group messages. +| |/ / / +| * | | e4ec72984 Merge branch 'charlesmchen/blocking4' +| |\ \ \ +| | * | | 723174e14 Respond to CR. +| | * | | d47ddd112 Filter outgoing messages using the blacklist. +| | * | | af4faaa60 Filter incoming messages using the blacklist. +| |/ / / +| * | | d1189e5b0 Merge branch 'charlesmchen/singletonAssert' +| |\ \ \ +| | * | | f1e770fa0 Respond to CR. +| | * | | e038d2410 Apply assert to ensure singletons are only created once. +| | * | | cd4134c9d Apply assert to ensure singletons are only created once. +| |/ / / +| * | | ec7a796b7 Merge branch 'charlesmchen/blocking1' +| |\ \ \ +| | * | | 02004a75f Respond to CR. +| | * | | 2a2ad7d67 Improve logging in TSBlockingManager. +| | * | | a40c09e26 Improve comments in TSBlockingManager. +| | * | | f036d75fc Avoid redundant "block list changed" sync messages in TSBlockingManager. +| | * | | f5237ef5d Add TSBlockingManager. +| |/ / / +| * | | 8b5f82eb6 Merge branch 'mkirk/mark-unfresh' +| |\ \ \ +| | * | | 2dbcfed3b Mark a stored session as unfresh +| | * | | f4dfd6584 Debug method to print stored sessions +| |/ / / +| * | | bdd0241a9 Merge pull request #155 from WhisperSystems/mkirk/enforce-singleton +| |\ \ \ +| | * | | 61fe71f0c MessageSender should be accessed as singleton +| | * | | 4b0c01c96 MessagesManager should only be accessible via it's shared singleton +| |/ / / +| * | | 718164fbe Merge branch 'charlesmchen/sharingOfOversizeTextMessages' +| |\ \ \ +| | * | | e9d6a3747 Fix sharing of oversize text messages. +| |/ / / +| * | | 80266856e Merge branch 'charlesmchen/arbitraryAttachments2' +| |\ \ \ +| | * | | 12635c65c Improve support for arbitrary attachments. +| |/ / / +| * | | da3c4bbac Merge branch 'feature/acceptArbitraryIncomingAttachments' +| |\ \ \ +| | * | | 53623adae Accept arbitrary incoming attachments. +| |/ / / +| * | | 7bbbd2fb9 Merge branch 'charlesmchen/failedAttachmentDownloads' +| |\ \ \ +| | * | | 49a24a4e6 Improve handling of incomplete and failed attachment downloads. +| | * | | bdde3c73c Improve handling of incomplete and failed attachment downloads. +| |/ / / +| * | | fbd3859a8 Merge branch 'charlesmchen/removeRedPhoneCode' +| |\ \ \ +| | * | | 36485c946 Remove RedPhone code. +| |/ / / +| * | | 968066eff Merge pull request #151 from WhisperSystems/mkirk/freebie-check-script +| |\ \ \ +| | * | | 708dca282 post commit which double checks for freebie presence +| |/ / / +| * | | 9e0f77755 Merge branch 'charlesmchen/oversizeTextMessages' +| |\ \ \ +| | * | | 75fabe5c2 Add support for oversize text messages sent as attachments. +| |/ / / +| * | | 334912a48 Merge branch 'charlesmchen/filterCountryCodes' +| |\ \ \ +| | * | | d38f6fbfd Filter out country codes properly. +| |/ / / +| * | | 28e2639dc Merge branch 'charlesmchen/swiftDataWriteCrash' +| |\ \ \ +| | * | | f005b66fa code review: move unnecessary __block allocation +| | * | | a73038142 Fix crash writing a "swift" NSData on iOS 9. +| |/ / / +| * | | 97a66f30f Merge branch 'charlesmchen/messageSenderDeadlock' +| |\ \ \ +| | * | | 607dd9a2f Avoid YapDatabase deadlock in OWSMessageSender. +| |/ / / +| * | | 63cc0328b Merge branch 'mkirk/better-envelope-logging' +| |\ \ \ +| | * | | b73594b23 Better envelop logging. +| |/ / / +| * | | 1fd7627da Merge branch 'charlesmchen/sendQueuePerConvo' +| |\ \ \ +| | * | | 5739f71bd Respond to CR. +| | * | | c3d2ea7ab Use a separate sending queue for each conversation. +| |/ / / +| * | | 289d0df06 Merge branch 'charlesmchen/sendToSelfVsIncompleteOperation' +| |\ \ \ +| | * | | 62d52ce9a Fix “send to self operations never complete” issue. +| |/ / / +| * | | d31cfe6fd Ensure existing sessions are invalidated when saving new identity +| * | | 4dc18f2f0 Merge branch 'charlesmchen/phoneNumberParsingTweaks' +| |\ \ \ +| | * | | 584613197 Further refinements to phone number parsing. +| |/ / / +| * | | 5dc493874 Merge branch 'charlesmchen/decryptionExceptionLogging' +| |\ \ \ +| | * | | 7f681e964 Improve logging around decryption exceptions. +| |/ / / +| * | | cdef86e27 Merge branch 'charlesmchen/websocketEdgeCases' +| |\ \ \ +| | * | | a1e501937 Respond to CR. +| | * | | e92d40a12 Fix edge cases around the websocket lifecycle. +| | * | | 0f47dc620 Fix edge cases around the websocket lifecycle. +| |/ / / +| * | | 5cbaafe38 Merge branch 'charlesmchen/maxIncomingAttachmentFileSize' +| |\ \ \ +| | * | | 04a3e4323 Respond to CR. +| | * | | 8231f7997 Don’t check content length header until we’ve received at least one byte of the attachment download. +| | * | | 2c6194353 Abort attachment downloads of excessive size. +| |/ / / +| * | | d3af0d3a2 Merge pull request #135 from WhisperSystems/mkirk/fix-attachment-dispatch +| |\ \ \ +| | * | | 29a0597b0 Only call sendMessage on main thread. +| |/ / / +| * | | ca5bcaf3c Merge branch 'mkirk/refactor_country_code_search' +| |\ \ \ +| | * | | c8fa47d9c Added some tests per CR +| | * | | d3ecbba0e Keep unit tests with their class files +| | * | | 478b5b247 Remove convoluted dependency +| |/ / / +| * | | 778d3dd2b Merge branch 'mkirk/background-sending' +| |\ \ \ +| | * | | 58829e216 ensure we don't interrupt sending by being backgrounded +| |/ / / +| * | | 15f5c078a Merge branch 'mkirk/nsoperation-sending-queue' +| |\ \ \ +| | * | | e68ee28e5 Add clarifying asserts per code review +| | * | | db15ff5e8 Save message before sending starts. +| | * | | df51523a8 Serialize message sending and generalized retry logic. +| |/ / / +| * | | d6af5028c Fix receiving attachments from old clients +| * | | 312f398dd Merge branch 'charlesmchen/nonUSNonContactSearch' +| |\ \ \ +| | * | | 332833da7 Respond to CR. +| | * | | 60e0ddfb9 Fix non-contact lookup for non-US users. +| | * | | e12bd4773 Fix non-contact lookup for non-US users. +| |/ / / +| * | | 7368c5f75 Merge branch 'charlesmchen/fixFilterCallingCodes' +| |\ \ \ +| | * | | d63a519c4 Fix filtering of country codes in registration flow. +| |/ / / +| * | | ca81e139b Merge branch 'charlesmchen/attachmentDownloadErrors' +| |\ \ \ +| | * | | c8efd83c3 Respond to CR. +| | * | | 88f343a0a Attempt to fix the "frequent attachment download errors with low server ids". +| |/ / / +| * | | 7867ce27a Merge branch 'charlesmchen/messageStateIndicators' +| |\ \ \ +| | * | | 25ab52caf Respond to CR. +| | * | | 865d9d7b9 Add "is uploaded" property to attachment streams. +| |/ / / +| * | | 27fb0dd34 Merge branch 'charlesmchen/websocketState' +| |\ \ \ +| | * | | e4636e833 Respond to CR. +| | * | | 958dbd199 Minor clean up. +| | * | | f40629ffa Improve alignment between socket state and socket manager state. +| |/ / / +| * | | b21c628d5 Merge branch 'mkirk/attachment-digest' +| |\ \ \ +| | * | | 8f1412d50 comment constant time compare per code review +| | * | | 452110b68 Include digest in attachments +| |/ / / +| * | | 32ac0fb7c Merge branch 'charlesmchen/paste' +| |\ \ \ +| | * | | e05b68743 Respond to CR. +| | * | | 270a10a62 Add UTIType methods to MIMETypeUtil. +| |/ / / +| * | | 1e6925ebc Fix crash-on-launch for older installs +| * | | 0393e4f0b fix tests +| * | | 168639597 Merge branch 'mkirk/dedupe-incoming-messages' +| |\ \ \ +| | * | | a92158ef1 CR: fix register `async` where specified +| | * | | b389bb3bb Code cleanup. +| | * | | 975726e02 Dedupe incoming messags +| |/ / / +| * | | d6e1e81a8 Merge branch 'charlesmchen/callkitPrivacy' +| |\ \ \ +| | * | | 52bb939fc Respond to CR. +| | * | | 71b804ba5 Add and honor the “CallKit Privacy” setting. +| |/ / / +| * | | 286f72d27 Merge branch 'charlesmchen/webrtcByDefault' +| |\ \ \ +| | * | | 2741fd4bd Enable WebRTC-based audio and video calls by default. +| | * | | 254a247ba Revert "Add WebRTC setting." +| |/ / / +| * | | 14a104b1b fix tests, and off by one in keeping old, accepted keys +| * | | c72e8f8e2 Merge remote-tracking branch 'origin/release/2.7.1' +| |\ \ \ +| | * | | f97470639 Clean up the prekeys. +| | * | | 8acc496a3 Clean up the prekeys. +| | * | | 54736426f Avoid crashes when signed prekey lookup fails. +| * | | | 427f225df Merge branch 'feature/messageSortingRevisited' +| |\ \ \ \ +| | * | | | 686fe679b Respond to CR. +| | * | | | 7bd4d2653 Add “received at” timestamp to all TSMessages so that they may be sorted properly. +| |/ / / / +| * | | | 5ed95c478 Merge branch 'charlesmchen/prekey2' +| |\ \ \ \ +| | * | | | 351a010fe Clean up prekey usage. +| |/ / / / +| * | | | 7c55d559d Merge branch 'charlesmchen/markUnsentMessages' +| |\ \ \ \ +| | * | | | 821c96cc6 Mark "attempting out" messages as "unsent" on app launch. +| |/ / / / +| * | | | 12027152f Merge branch 'charlesmchen/rateLimitingErrorMessage' +| |\ \ \ \ +| | |/ / / +| |/| | | +| | * | | df4b0616e Improve rate-limiting error message in registration and code verification views. +| |/ / / +| * | | 93219e4d2 Merge branch 'charlesmchen/prekey_' +| |\ \ \ +| | * | | e0688e16a Clean up prekey logic. +| |/ / / +| * | | e1949893f Avoid deadlock when marking self-sent messages as read. +| * | | 4d055757d Fix the .pch used by this pod to reflect the changes from the last PR. +| * | | 025279773 Merge branch 'charlesmchen/callStatusMessages' +| |\ \ \ +| | * | | 284212b3f Move OWSDispatch.h to the PCH. +| | * | | 90b85c060 Improve the call status messages in conversation view. +| |/ / / +| * | | bc1af8073 Log when we mark a message as read locally +| * | | 311d80fb2 Missed calls increment unread counter/badge +| * | | 653727ae9 Merge branch 'charlesmchen/messagesFromMeAreAlreadyAutoRead' +| |\ \ \ +| | * | | df1b3418d Respond to CR. +| | * | | 6d356e4b6 Automatically mark as read any messages sent by current user from another device. +| |/ / / +| * | | 4e8ab21c4 Merge pull request #105 from WhisperSystems/mkirk/webrtc +| |\ \ \ +| | * | | 92a69e8e6 Repsond to CR w/ @cmchen. +| | * | | 80fb58231 Merge remote-tracking branch 'origin/master' into mkirk/webrtc +| | |\ \ \ +| | |/ / / +| |/| | | +| * | | | 104645f97 Safely pass exception across dispatch bounds +| * | | | fe3ec457f Disable resetting unreadable storage +| | * | | c68073fdb proper error code for NOTFOUND +| | * | | 7b1b706e2 Include reusable localized text in recipient-not-found error +| | * | | 7ca1d5e8a Merge branch 'charlesmchen/webrtc/threadSafety' into mkirk/webrtc +| | |\ \ \ +| | | * | | 18e144f8b Respond to CR. +| | | * | | ddbc4819f Rework concurrency in the signaling logic. +| | |/ / / +| | * | | 6521a80c4 Lookup methods yield SignalRecipient (#102) +| | * | | 9fdbbb7f8 Merge branch 'charlesmchen/webrtc/video2' into mkirk/webrtc +| | |\ \ \ +| | | * | | 5da4b3d12 Add assert macro that can be used in free functions. +| | |/ / / +| | * | | cf6f107f1 Merge remote-tracking branch 'origin/master' into mkirk/webrtc +| | |\ \ \ +| | |/ / / +| |/| | | +| * | | | 32aad85a7 Merge pull request #98 from WhisperSystems/mkirk/session-corruption +| |\ \ \ \ +| | * | | | 5d863418e Narrow the scope of code run on SessionCipher queue And run all non-cipher code on the main thread. +| | * | | | 3216fd371 Prevent session corruption by using same queue for encrypt vs. decrypt +| |/ / / / +| | * | | f4a46fce0 Merge remote-tracking branch 'origin/master' into mkirk/webrtc +| | |\ \ \ +| | |/ / / +| |/| | | +| * | | | a11293027 Merge branch 'mkirk/dont-reset-storage-before-first-unlock' +| |\ \ \ \ +| | * | | | b5429595a Better logging per CR +| | * | | | a45ab9fe4 We need to know if the DB password is accessible *before* we init the db +| | * | | | dd1aa2682 Prevent destroying user database after resetting device. +| |/ / / / +| * | | | 8f8101573 Remove Cuba from domain fronting. +| * | | | 45391cadd Merge branch 'feature/fixWebsocket2' +| |\ \ \ \ +| | | * | | 275a0dc62 Fix typo. +| | | * | | d640a4155 Merge branch 'feature/swallowSwiftLintErrors' into mkirk/webrtc +| | | |\ \ \ +| | | | * | | 65128d5f5 Swallow errors returned by swift lint. +| | | |/ / / +| | | * | | 7c62097d0 Fix up tests +| | | * | | 305541d03 Merge branch 'feature/fixWebsocket2' into mkirk/webrtc +| | | |\ \ \ +| | | |/ / / +| | |/| | | +| | * | | | 79095ecfb Fix web socket issue. +| |/ / / / +| | * | | 25695677d Merge branch 'charlesmchen/webrtcSetting2' into mkirk/webrtc +| | |\ \ \ +| | | * | | ffb199bcd Respond to CR. +| | | * | | 08ba42c56 Update SignalRecipient with “is WebRTC enabled” property from service. +| | |/ / / +| | * | | 6791875eb Merge branch 'feature/precommitClangFormatSwiftLint2' into mkirk/webrtc +| | |\ \ \ +| | | * | | 6e9ae615c Tweak commit script. +| | |/ / / +| | * | | db27f22c6 Merge branch 'feature/precommitClangFormatSwiftLint' into mkirk/webrtc +| | |\ \ \ +| | | * | | b1c86d1a3 Modify precommit script to "swiftlint" and "git clang-format" files. +| | |/ / / +| | * | | 0f3391ad0 Merge branch 'feature/webrtcSetting' into mkirk/webrtc +| | |\ \ \ +| | | * | | 0f45f292a Add WebRTC setting. +| | |/ / / +| | * | | d1aa253f8 WebRTC calling +| | * | | d7149c60d unique error code for rate-limit +| |/ / / +| * | | 7b7b33807 Merge branch 'feature/databaseErrors' +| |\ \ \ +| | * | | c5cf79c39 Detect, warn about and try to recover from database password retrieval and database load errors. +| |/ / / +| * | | 87719a3bf Merge branch 'charlesmchen/analyticsStub' +| |\ \ \ +| | * | | 2a55075e6 Add stub for analytics. +| |/ / / +| * | | ed98cf262 Merge branch 'charlesmchen/iranVsDomainFronting' +| |\ \ \ +| | * | | 619235172 Remove Iran from censorship circumvention. Current approach isn't sufficient. +| |/ / / +| * | | 4e123e41d Merge branch 'charlesmchen/appVersion' +| |\ \ \ +| | * | | c22085c1a Add class to track app version. +| |/ / / +| * | | 19e4b2c3a Revert "Remove Iran from censorship circumvention. Current approach isn't sufficient." +| * | | 374b45146 Remove Iran from censorship circumvention. Current approach isn't sufficient. +| * | | 7bee4523c Merge branch 'charlesmchen/assertsVsPch' +| |\ \ \ +| | * | | f47097943 Add asserts to .pch. +| |/ / / +| * | | a9340b06f Merge branch 'charlesmchen/censorship-circumvention-2' +| |\ \ \ +| | * | | 5b87af9bc Respond to CR, fix build break. +| | * | | c3af5bc74 Fix the UAE Google domain. +| | * | | cc78978be Update fronting to use country-specific Google domains. +| | * | | 566c6e15d Add asserts header. +| | * | | 2438bd16c Add Iran, Oman, Cuba to censorship list. +| |/ / / +| * | | 52762a1be Clean up. +| * | | 78515377b Censorship circumvention in Egypt and UAE +| * | | b1ebfa987 Revert "WIP: Censorship circumvention in Egypt and UAE" +| * | | f1ade83c3 WIP: Censorship circumvention in Egypt and UAE +| * | | 5ccbd4ca6 Bail if we can't build a database. +| * | | f8bb46c46 check for errors in the keychain password retrieval +| * | | 3eeb6c55d Use correct recipient ID when using sync message even if no contact thread with self exists. +| * | | 4c2a062fb provide custom copy for unauthorized messages +| * | | edebd14d4 Ignore messages with unknown Envelope.Contents +| * | | 745a5a276 return immutable identifiers +| * | | 7036c6339 Compatible with libphonenumber 0.9.1 +| * | | 712502815 Rename an OWSContactsManager method +| * | | 34ffce89f Only calculate fullName once, & sortable fullnames (#67) +| * | | 3083e2929 OWSContact from CNContact +| * | | df756423f Ignore unknown group messages +| * | | 1ba082356 Explicitly include newlines in numeric fingerprint +| * | | e53422f76 Configurable safety number blocking enabled by default +| * | | 60a39f93c Remove phone numbers from scannable QR Code +| * | | 70e536ca8 Privacy preferences for blocking identity change +| * | | 725153307 Add some nullability annotations (#62) +| * | | b0343ee1d Only fetch PreKey once. +| * | | 1ebb82f98 Contacts don't have safety numbers until they've exchanged keys. +| * | | 2e06bb148 Send group message so long as at least one recipient is found +| * | | ebeae2608 Fix crash on messaging unregistered user +| * | | 027fa1073 Only dispatch async at top level. +| * | | b4c504f61 EndSessionMessage notifies remote side of reset session +| * | | 47cad611e Fix register w/o background fetch & stale push tokens +| * | | 03f05f217 Prevent session corruption +| * | | 9c426e0a4 again: Don't send empty message to self after changing disappearing (#54) +| * | | b6676fb02 Better error messages when failure to send due to: +| * | | 3e10a4925 Fix disappearing messages don't become consistent after reinstall (#52) +| * | | 31bd1d07a Handle group keychange error (#50) +| * | | 4ba1e86ec Explain send failures for text and media messages +| * | | d4c55d694 Maps numbers to names in TSGroupModel +| * | | 556dca650 Check return value of malloc +| * | | 91fcd0163 Don't send empty message to self after changing disappearing timer +| * | | f83f80898 Fix ci for xcode 8 +| * | | a32a18ac6 Fix set timer updates in group thread. +| * | | 23854dc72 Report info message type for timer duration changes +| * | | 8fed13f9b Don't start expiration timer until message is sent. +| * | | 0b4d81002 Fix attachment deleting for outgoing messages +| * | | 34868b9b0 fix captions in groups and sync messages (#42) +| * | | 40cdc7f22 disappearing messages +| * | | c1ade86a8 New fingerprint format +| * | | ce1aa04b6 Fix device listing (#38) +| * | | cf035a597 Merge pull request #37 from WhisperSystems/mkirk/more-resilient-db-setup +| |\ \ \ +| | * | | ff9729f42 Avoid blocking app launch +| | * | | f25661763 If we can't find a class definition, don't explode, just log. +| |/ / / +| * | | 5b06b4351 Fix timeout on launch for some users (#36) +| * | | 06538f6b4 Not an error. Don't log it as such. (#35) +| * | | c5edc9997 Production log level to INFO (#34) +| * | | 1098bc203 Fix crash on boot (#33) +| * | | 2dba7d141 Fix contact/group sync messages. (#32) +| * | | 1824af533 Fixes: "unsupported attachment" when group is missing avatar (#31) +| * | | a0df56a68 Fix multiple keychange errors (#29) +| * | | 9821e0c0d Merge pull request #28 from WhisperSystems/desktop-integration +| |\ \ \ +| | * | | 27dfb59a0 Emit notification when message is read. +| | * | | 800e2a954 Log exception rather than crash upon failed deserialization +| | * | | 65e677803 log network manager requests +| | * | | af155bf9e Avoid deadlock when receiving read receipt before incoming message +| | * | | eb96f846a Send user agent to desktop so they can pick a theme for us +| * | | | d80291860 Merge pull request #26 from WhisperSystems/read-voice-messages +| |\ \ \ \ +| | * | | | 3e5af16dc Don't explode when attachment support revoked. +| | * | | | 1df99c581 fix voice messages for iOS +| |/ / / / +| * | | | 7d70f6e77 Merge pull request #25 from WhisperSystems/dt +| |\ \ \ \ +| | |/ / / +| | * | | 0933b9212 Fix race condition with read receipts before incoming message +| | * | | 2de692745 Remove sync data files after sync +| | * | | c8a5f5076 Fixup DevicesManager +| | * | | c39e8b0bc extract constant for image/png +| | * | | acb89f0b0 Outgoing Read Receipts +| | * | | 580781e3e Incoming Read Receipts +| | * | | a99fde4d3 Device manager +| | * | | d48fd158b Build contact/group exports with data streams +| | * | | fb9f0f9a4 Some nullability annotations +| | * | | 8526f018e fixup group sync +| | * | | 69da0b3c2 Sync Groups with Desktop +| | * | | 36d3691c7 gather up device syncing classes +| | * | | 98d1c59bf Sync Contacts with Desktop +| | * | | fe7171dd9 Sync messages with your other devices +| | * | | 9093be2b0 Device provisioning +| | * | | 6ec21ade9 TSContactThread doesn't need to know protobufs +| | * | | f4d90688b Replace compiler warning with logging message +| | * | | 4d52d28e0 Use non-deprecated method for sending data. +| | * | | c1a0b8823 Don't crash when contact lookup is given nil contact +| | * | | 5ae271787 Simplify deviceMessages method +| | * | | 9fe0ca000 bump version +| |/ / / +| * | | 1d0b645fc Update to new protocol (#23) +| * | | f3a91c262 Avoid collision with iOS10 SSKeychain framework (#24) +| * | | 01ab8d132 Handle animated content type in TSAttachment:description: (#19) +| * | | 9aa88f6ce Merge pull request #21 from WhisperSystems/fix-delete-attachments +| |\ \ \ +| | * | | baf564db2 Fixup e61c81 by migrating old schema +| |/ / / +| * | | c14e4bb7b Merge pull request #20 from WhisperSystems/fix-delete-attachments +| |\ \ \ +| | * | | 28281ccfd Delete lingering group avatar attachments +| | * | | e61c81873 Clarify message.attachments -> attachmentIds +| | * | | 0f9a3334c Ensure interactions removed when thread is deleted +| | * | | 2858694ee style changes // fix compiler warnings +| | * | | 5458a73ce Fix travis build +| |/ / / +| * | | 36cab4691 Accepting keychange only resends to single recipient (#18) +| * | | d66c8bd42 Avoid deadlock while accepting new key (#17) +| * | | f537b6f19 Fix (and test) description for corrupted attachments (#16) +| * | | 664162fe2 Use SocketRocket pluggable policies (#15) +| * | | 80671b247 Extract phone formatting method (#14) +| * | | f5aac9610 Fix compiler warning (#13) +| * | | 9ab38efe9 There is no longer a distinction between redphone/text secure users. (#12) +| * | | 8058951b0 Adapt to updated SocketRocket pod refactorings. (#11) +| * | | ba0de5739 update to cocoapods 1.0.1 (#10) +| * | | 32a7d49fa Fix avatar for single contact thread (#9) +| * | | d25045e6b contributing.md referencing Signal-iOS coding guidelines. Inlined legal. (#8) +| * | | 302422565 Get tests + ci running +| * | | a0c147722 Delete last message updates thread preview (signal ios#833) (#3) +| * | | a49d36d66 Renaming to SignalServiceKit. +| * | | 30fff8e42 Upgrading for latest YapDatabase API. +| * | | b5a8cf0f0 Merge pull request #1 from kunickiaj/yapfix +| |\ \ \ +| | * | | 94ef0e30f Fix YapDatabase API change from string based filePath to NSURL +| |/ / / +| * | | f6f613349 Adding completion blocks to media message sends. +| * | | 8d6ce0b57 Notifications Protocol cleanup. +| * | | 5d91a5bd4 Init Commit +| * | | 27e63c37f Initial commit +| / / +* | | 1600b1f44 [SSK] Avoid nil country names on iOS 8. +* | | 0ff7d3f59 Merge branch 'charlesmchen/refineCallService' +|\ \ \ +| * | | a9ce1cde2 Simplify CallViewController. +| * | | 149c64ce4 Refine call service. +|/ / / +* | | 86072d5ff Merge branch 'mkirk/unregistered-user-add-to-contact' +|\ \ \ +| * | | 46ddaa9ca fix: unregistered user shows "add to contacts" +|/ / / +* | | e03936387 Merge branch 'mkirk/remove-verification-debug-ui' +|\ \ \ +| * | | 17b1b7072 Remove verification debug UI +|/ / / +* | | 8066c192b Merge branch 'mkirk/mapping-asserts' +|\ \ \ +| * | | df0cf7660 Assert that mapping is set whenever accessing +|/ / / +* | | 7adf5e81f Merge branch 'mkirk/add-to-existing-requires-contacts' +|\ \ \ +| * | | 1c9ce5eaf CR: Don't just build, but present, alert controller +| * | | 5c66e5584 Adding to existing contact requires contact access +|/ / / +* | | 555264955 Merge branch 'charlesmchen/moreOWSTables' +|\ \ \ +| |_|/ +|/| | +| * | 8b6076562 Respond to CR. +| * | 81a4ebdaf Apply OWSTableViewController to more views. +| * | dc3f07cb5 Apply OWSTableViewController to more views. +|/ / +* | 878806aa5 [JSQMVC] Add Croatian translations +* | 7c6d90031 (tag: 2.14.1.0) sync translations +* | 33e9f2e62 bump version +* | f027d400b (tag: 2.14.0.4) Bump build +* | 50d6e2ccb rebuild WebRTC.framework on oak +* | 2d23e365c sync translations +* | df79c003f Merge branch 'mkirk/fix-audio-route' +|\ \ +| * | 9287b8560 clean up comments per code review +| * | fb5c17a6b minimize sound overlap +| * | e3faddedb Disallow bluetooth when user has opted for local receiver +| * | 524ba80b7 WIP: have ensureAudioSession set preferred input +| * | 220cd345f add comments +| * | ba97ff3f5 Label tweaks for device listing +|/ / +* | be3001e4f Merge branch 'charlesmchen/emptyHomeView' +|\ \ +| * | d36e60b0e Respond to CR. +| * | b6264383d Add possible fixes for the ‘empty home view’ issue. +| * | 90dabe1c8 Add possible fixes for the ‘empty home view’ issue. +| * | f52814bb7 Add possible fixes for the ‘empty home view’ issue. +| * | 3f805cd4c Add possible fixes for the ‘empty home view’ issue. +|/ / +* | 5e58079e1 Update l10n strings. +* | 563398226 (tag: 2.14.0.3) Bump build from to 2.14.0.3. +* | 914d2936a Merge branch 'mkirk/fix-unnecessary-session-changes' +|\ \ +| * | b8ec353d7 Use recommended approach for speakerphone mode +|/ / +* | 847a0ff8b Merge branch 'mkirk/disappear-from-lock-screen' +|\ \ +| * | fa42b4a45 Respect disappearing message timer from lockscreen +|/ / +* | 235a84213 [SSK] Use existing transaction in cleanup. +* | ab7c1698c Merge branch 'charlesmchen/anotherCallLeak' +|\ \ +| * | 6c61e6040 Fix another call view leak. +|/ / +* | 90ad83d49 (tag: 2.14.0.2) Bump build from to 2.14.0.2. +* | 8884cb5a2 [SSK] Fix copy and paste of voice messages. +* | 77fb1dbf4 Merge branch 'mkirk/bt-audio-2' +|\ \ +| * | 90c2324f9 pixel cleanup in bluetooth speaker image +| * | b495b2342 more cleanup and commenting +| * | 03f1bbca6 Move state from CallViewController -> Call +| * | 4e11e90eb cleanup +| * | a59eb25ae extract dismiss string -> CommonStrings.dismissButton +| * | 20a8e7219 disable audio source images until we have icons +| * | 9bd68ed49 WIP: bluetooth shows audio route button instead of speakerphone +| * | 109cb6cdb rename for clarity +|/ / +* | ce048e21d (tag: 2.14.0.1) Bump build from to 2.14.0.1. +* | 3527df7ba Merge branch 'charlesmchen/leakCallView' +|\ \ +| * | ac616d693 Reject the “call connected” promise immediately when clearing a call. +| * | a58c71f4b Fix leak of call view. +|/ / +* | 55ddce79b Merge branch 'mkirk/call-connectivity-fixes' +|\ \ +| * | d9dfc3d7c update fastlane ci +| * | b82aedc3a Assertion failures for unexpected promise state +| * | 438635393 Don't send ICE updates until after the CallOffer has been sent. +| * | d910da015 Partial revert of: Send ICE updates immediately - 2dcfb4e3b8b07bb2b5419cad6fa324e5e585c3da +|/ / +* | 3769ce833 Merge branch 'mkirk/scrub-log-data' +|\ \ +| * | 2067697ed Add comment and clearer tests per CR +| * | 4f1ee9848 scrub any data that slips through to logs +|/ / +* | 86d494bec Merge branch 'charlesmchen/addToExistingContact' +|\ \ +| * | b7c2512ea Respond to CR. +| * | 81555d122 Add “new contact” and “add to existing contact” buttons in 1:1 conversation settings view. +|/ / +* | 1e67bb52e Respond to CR. +* | 990978ac3 Merge branch 'charlesmchen/orphanCleanup' +|\ \ +| * | 0357081cc [SSK] Run orphan cleanup on startup. +| * | 2202fe70f Fix broken tests. +| * | f584c4b43 Fix broken tests. +| * | 0b28285de Fix broken tests. +| * | 69ba2811d Run orphan cleanup on startup. +|/ / +* | 4b7924cc7 [SSK] update CI gems +* | c0aa45571 fix tests +* | 195f124af Merge branch 'mkirk/fix-tests-again' +|\ \ +| * | f4d675e95 update ci to use latest XCode / fastlane +| * | d15da6e6d fix bubble calculator tests +| * | 3eb90ba38 Disable singleton assert for tests +| * | 82180f6a9 fix compilation problems +|/ / +* | fa09ce08f Merge branch 'charlesmchen/owsFailSwift' +|\ \ +| * | c9355630c Respond to CR. +| * | d639d6557 Add owsFail free function for swift. +|/ / +* | 800071415 Merge branch 'charlesmchen/archiveViewIndicator' +|\ \ +| * | 669e0644e Respond to CR. +| * | 5cf0441f5 Add a reminder that you are in archive view. +| * | 54a5b960c Add a reminder that you are in archive view. +| * | 8f3b837a6 Add a reminder that you are in archive view. +| * | 2e727a24b Convert home view to programmatic layout. +|/ / +* | cc31d88f2 [SSK] Fix persist view for upgrade scenario +* | f61980e37 [SSK] remove unhelpful logging +* | 3162160b5 Merge branch 'mkirk/respect-contact-sort-pref' +|\ \ +| * | 522310456 respect system sort order for contacts +|/ / +* | b19dd648d (tag: 2.14.0.0) Bump build number to v2.14.0.0. +* | dbf023597 [SSK] persist thread view +* | 2d8e4232a Merge branch 'mkirk/trickle-ice-2' +|\ \ +| * | 2dcfb4e3b Send ICE updates immediately. +|/ / +* | 0698d1161 Merge branch 'charlesmchen/doubleBusyRace' +|\ \ +| * | 1a400f841 Respond to CR. +| * | b6531a8b5 If two users call each other at the same time, ensure they both see “busy”. +|/ / +* | eb9b6bffd Merge branch 'mkirk/update-webrtc' +|\ \ +| * | 961576448 Update WebRTC to M59 + signal patches +|/ / +* | fbb58c95b Merge branch 'mkirk/log-code-cleanup' +|\ \ +| * | f681712ea Code Cleanup +|/ / +* | 53d00e61c Merge branch 'mkirk/update-copy-tweaks' +|\ \ +| * | e584f4d1e copy tweaks +|/ / +* | c5e42b667 Merge branch 'dermaaarkus-feature/fixWarnings' +|\ \ +| * | 422336db3 fixes compiler warnings FREEBIE +|/ / +* | 84a5a73b5 Merge branch 'charlesmchen/timerLeaks' +|\ \ +| * | c817346ee Fix “timer circular reference” leaks. +|/ / +* | afe6f9ca7 Merge branch 'mkirk/bluetooth' +|\ \ +| * | d8330a2c4 Fix bluetooth audio for calls +|/ / +* | 9a84aa93e Merge branch 'charlesmchen/headzDontSleep' +|\ \ +| * | e3f2583b4 Respond to CR. +| * | 9cbc1e6a1 Block device from sleeping while Debug UI is visible and during database upgrades. +| * | 0244e134f Block device from sleeping during certain activities. +|/ / +* | 700f3229b Merge branch 'charlesmchen/lastRegisteredVsKeychain' +|\ \ +| * | bfd04088b Persist registration view’s “last registered” values in keychain so that they persist across clean installs. +|/ / +* | 340728f16 Merge branch 'mkirk/status-not-tappable' +|\ \ +| * | 1afc6525e selecting network status does not highlight +|/ / +* | 3e11c10c9 [SSK] Don’t sync verification state until app has finished becoming active. +* | e2197848b Merge branch 'charlesmchen/appUpdateNag' +|\ \ +| * | 9e5447f1d Respond to CR. +| * | b400c0a32 Don’t show app upgrade nag unless we are at rest in home view or registration view. +| * | 944cd7bee Show app update nag on launch if necessary. +|/ / +* | 8e891eb35 Merge branch 'hotfix/2.13.3.0' +|\ \ +| |/ +| * e0ee4e42f (tag: 2.13.3.0) [SSK] Modify TSStorageManager to use separate shared read and write connections. +| * 134936092 Merge branch 'charlesmchen/afterDidBecomeActive' into hotfix/2.13.3.0 +| |\ +| | * c5bf85d0b Respond to CR. +| | * ab3aa9d0c Respond to CR. +| | * 97169f521 Move more initialization until after didBecomeActive is complete to avoid the “bad food” crash. +| |/ +| * 32beec611 Merge branch 'charlesmchen/crashOnLaunch' into hotfix/2.13.3.0 +| |\ +| | * 73869b1ef Fix possible cause of crash on launch. +| |/ +| * 7869d1409 Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0 +| |\ +| | * dc1453264 [SSK] Modify TSStorageManager to use separate shared read and write connections. +| | * 7135895c1 Modify TSStorageManager to use separate shared read and write connections. +| |/ +| * 906b307e1 remove unneccessary hack +| * dcf3de2ae Bump version to 2.13.3.0. +* | 7b04823aa [SSK] FIX: verifiying unregistered user prints "no longer registered" error on every launch +* | 438dcb6cc Merge branch 'mkirk/clearer-comment' +|\ \ +| * | 174706817 clearer comment +|/ / +* | 12d8ecfdf Copy tweak: "Incomplete" -> "Unanswered" outgoing call // FREEBIE +* | bf5934897 Merge branch 'mkirk/declined-call-notification' +|\ \ +| * | 1f9f066fa print call record when declining a call +|/ / +* | 88d34b6c4 Merge branch 'mkirk/fix-non-callkit-ringer' +|\ \ +| * | 1e0cf89f7 Explanatory comment +| * | 43a3a4afa play *after* stop +| * | 8abde1dff Non-Callkit adapter plays audio from notification when app is in background +|/ / +* | ed5e86c6e Merge branch 'mkirk/fixup-group-info-messages' +|\ \ +| * | ff10f5277 remove unneccessary hack +|/ / +* | 7f2232553 Merge branch 'mkirk/missed-call-audible-notification' +|\ \ +| * | c1881c02c constantize file name per CR +| * | 9b1695f28 Play audible alert for missed call +|/ / +* | 1d6ab0064 Merge branch 'mkirk/zero-badge-count' +|\ \ +| * | 89260e843 Unregistered users should have 0 badge count +|/ / +* | bf948f54f Merge branch 'mkirk/request-contacts-before-checking' +|\ \ +| * | 633578256 Make sure we're requesting access for contacts before checking access +|/ / +* | 99526f402 Merge branch 'charlesmchen/diskUsage' +|\ \ +| * | 1552c6477 Add “delete old messages” and “save all attachments” debug commands. +| * | 72faa5f82 Add clean up command to the “orphan audit” debug UI. +| * | feb32fdf8 Find orphan and missing attachment stream files. +| * | 284d55ef6 Rework the debug UI. +|/ / +* | 6fd717fe1 Merge branch 'charlesmchen/scrollToButtonGlitch' +|\ \ +| |/ +|/| +| * 07c8eb54b Prevent "scroll to button" button from blipping. +|/ +* 2d8ad30ef (tag: 2.13.2.0) Bump version to 2.13.2.0. +* 3e87d4171 Update l10n strings. +* 6e31713c8 Merge branch 'mkirk/show-timestamp-after-unread' +|\ +| * c6cd0bbca Always show timestamp after unread indicator +| * bef3a56e5 DebugUI: create fake unread messages +|/ +* 7ffb0d98e Merge branch 'mkirk/log-when-stating-token-sync' +|\ +| * 964e55813 log when starting token sync in prod +|/ +* 6719008ed (tag: 2.13.1.0) bump version +* 2fc2c74fb Merge branch 'mkirk/fix-unread-badge' +|\ +| * dbad3b4f8 [SSK] MessagesManager observes for badge count +| * d0d4e6761 update badge count when app is in background +|/ +* 544dec1af [SSK] Fix typo in assert +* 46bf05182 [SSK][SPK] fix upstream tests +* 226b7354d (tag: 2.13.0.16) Bump build from to 2.13.0.16. +* 132348c44 Update l10n strings. +* 1e8c24cba (tag: 2.13.0.15) Bump build from to 2.13.0.15. +* ab40bc724 [SSK] sync key version +* 1aacf3595 Merge branch 'charlesmchen/dontReplyToNoLongerVerified' +|\ +| * e48d51d08 Respond to CR. +| * a462cba45 Don’t reply to “no longer verified”. +|/ +* af67f33e3 Merge branch 'charlesmchen/moreFakeContacts' +|\ +| * db3407853 Refine fake contact creation. +|/ +* 10fb3286c Merge branch 'charlesmchen/removePhoneNumberLengthLimit' +|\ +| * 791c5bb89 Revise phone number length limit in registration view. +| * 351c8c00f Remove phone number length limit in registration view. +|/ +* 96f833473 Merge branch 'charlesmchen/bumpBuildNumberScript' +|\ +| * 0486cfe7e Add script to bump build numbers. +|/ +* 4133673d7 (tag: 2.13.0.14) Bump build number to 2.13.0.14. +* 1eff5513b [SSK] Archive sessions upon identity change. +* 67d60ff01 (tag: 2.13.0.13) Bump build number to 2.13.0.13. +* 4cbba496e Merge branch 'mkirk/archive-sibling-state' +|\ +| * 3e43eef53 [SSK][SPK] Archive all recipient's sessions on identity change. +|/ +* ad17c444f [SSK] Add creation timestamp to attachment streams. +* ff89cbabc (tag: 2.13.0.12) Bump build number to 2.13.0.12. +* 84d8fb085 Update l10n strings. +* 55bc6868f Merge branch 'mkirk/verification-sync' +|\ +| * 140625b2a [SSK] verification sync +| * a933fbf21 (origin/mkirk/verification-sync) sync verifications with contact syncing +| * 37b7bf18e clarify code and clean up code formatting +|/ +* b7307ecfa Merge branch 'charlesmchen/crashManualCircumvention' +|\ +| * e814ae129 Fix crash in manual censorship circumvention logic on iOS 9. +|/ +* d00928902 Merge branch 'charlesmchen/moreScrollDownButton' +|\ +| * f7c81bae9 Show the “scroll down” button if user scrolls up, even if there are no unread messages. +|/ +* 89c252a42 Merge branch 'charlesmchen/logOverflow' +|\ +| * e6aacf0bc [SSK] Reduce chattiness of logs; increase log file sizes. +| * eff1974ee [SSK] Reduce chattiness of logs; increase log file sizes. +|/ +* 1ae7f0710 Merge branch 'charlesmchen/keychainVsRegistrationDebug' +|\ +| * 15ecb0347 Respond to CR. +| * 7726c6804 Persist registration values in the keychain for debug builds only. +|/ +* 06baf5128 (tag: 2.13.0.11) Bump build number to 2.13.0.11. +* c60ca915d Merge branch 'charlesmchen/callServiceLogging' +|\ +| * 3d0811c03 Respond to CR. +| * 029da7e0c Hang up current call if we receive a call offer from the same user. +| * 9fc92990f Improve logging in CallService. +|/ +* 12e083b4e [SSK] Fix OWSCFail() macro. +* c7d923652 [SSK] Ensure verification UI is updated to reflect incoming verification state sync messages. +* 6fa20d62b Merge branch 'charlesmchen/groupsVsNoLongerVerified' +|\ +| * 0855faabb Respond to CR. +| * efbda7076 Improve UX for multiple “no longer verified” members of a group. +| * afb83cfaa Improve UX for multiple “no longer verified” members of a group. +| * f1e5be4c1 Improve UX for multiple “no longer verified” members of a group. +| * a039aac36 Improve UX for multiple “no longer verified” members of a group. +|/ +* 509d2d0aa Merge branch 'charlesmchen/attachmentStreamUpgradePerf' +|\ +| * f3f832557 Respond to CR. +| * 6a1f76665 [SSK] Improve perf of attachment stream file path upgrade. +| * ec077235b Respond to CR. +| * 6a5fe94d5 Improve perf of attachment stream file path upgrade. +|/ +* f6f5d3d45 Merge branch 'charlesmchen/invalidateMessageAdapterCache' +|\ +| * b39c4905c Invalid message adapter cache when app becomes visible. +|/ +* 4f0b5838e (tag: 2.13.0.10) Bump build number to 2.13.0.10. +* ae9a5acf6 Merge branch 'charlesmchen/upgradeLaunchScreenAndPerf' +|\ +| * 0738568b9 Fix upgrade launch screen. +|/ +* 949a38c4d Merge branch 'mkirk/fix-dismiss-kb-after-send' +|\ +| * 11fa08470 [JSQ] Fix: can't dismiss keyboard after sending +|/ +* f305b2c30 Merge branch 'mkirk/delete-system-messages' +|\ +| * 8898f4a6d CR: future proof view placement if we change hierarchy +| * da7dae816 CR: rename longpress->longPress +| * c70b1e968 Make system messages deletable +| * fbba2f5dd colocate CollectionViewDelegate methods +|/ +* 7a2ad9194 Merge branch 'mkirk/fix-cold-call-from-contacts' +|\ +| * 39563ab8c present from signalsViewController so users don't get confused by being dropped into a different thread when the call is over. +| * 982433c2b update call screen avatar when contacts change +| * 36c09aeb8 cleanup ahead of PR +| * ff93732ed WIP: fix call from contacts when signal hasn't been launched yet +|/ +* 59d3e9ed5 (tag: 2.13.0.9) Bump build number to 2.13.0.9. +* 3939dbba2 Merge branch 'charlesmchen/slowLaunchRelease' +|\ +| * eb17a7b18 [SSK] Refine observation of async registration completion. +| * 5ae4b99f8 Refine observation of async registration completion. +|/ +* f5387efba Merge branch 'charlesmchen/maxUnreadCounts' +|\ +| * de453b296 Respond to CR. +| * 5796bbd85 Max out the unread count at 99. +|/ +* dc69034b6 Merge branch 'mkirk/remove-explanatory-alert' +|\ +| * bee4b118e remove unneccessary explanation of UI +|/ +* 7c107a13e Merge branch 'mkirk/keyboard-hides-last-messages' +|\ +| * 0419d35f1 CR: rename method +| * 8fc228915 prefer becomeFirstResponder +| * b4d3e8e74 Fix: tapping input obscures last messages +|/ +* d603e587f (tag: 2.13.0.8) Bump build number to 2.13.0.8. +* 8948a54e2 Enable verification state sync. +* 988ec86fb (tag: 2.13.0.7) Bump build number to 2.13.0.7. +* 7b51c4317 Merge branch 'charlesmchen/staleMapping' +|\ +| * d01a52758 Respond to CR. +| * 0d07e0222 Avoid stale mapping in conversation view. +| * 331a1e90e Avoid stale mapping in conversation view. +| * f6f08891e Avoid stale mapping in conversation view. +| * d4a6a35ee Avoid stale mapping in conversation view. +|/ +* 8d4f30d19 Merge branch 'charlesmchen/asyncDatabaseViewRegistrationVsExportWithSignal' +|\ +| * 9f2a2d1ee Don’t show “export with Signal” UI until async database view registration is complete. +|/ +* 66a71d724 (tag: 2.13.0.6) Bump build number to 2.13.0.6. +* 301e925cc Update l10n strings. +* 62c096aa1 [SSK] append/remove key type as necessary to fix verification syncing +* 41065e692 [SSK] fix crash while syncing verifications +* 98f2245ff Merge branch 'mkirk/view-sn-before-sending' +|\ +| * b404fa3c2 Save identity from profile fetch even if there's no pre-existing identity. +|/ +* c73c01538 Merge branch 'charlesmchen/fingerprintViewLayoutJumps' +|\ +| * fa5897768 Prevent layout from jumping around in fingerprint view. +|/ +* 8b06a007b Merge branch 'mkirk/system-info-timestamp' +|\ +| * 4f3278db1 Fix layout of timestamp for system messages +| * 1125e2ac9 System messsages can show timestamp +|/ +* c95203607 (tag: 2.13.0.5) Bump build to 2.13.0.5. +* 7a50c688f Merge branch 'charlesmchen/messageMappingVsBackground' +|\ +| * 104a548eb Ensure message mapping is up-to-date when app returns from background. +|/ +* fabc0301c Merge branch 'charlesmchen/registrationFontSize' +|\ +| * dc134a991 Tweak font size on fingerprint view. +| * 57c1519b1 Tweak font size on registration view. +|/ +* 50c306e21 Merge branch 'charlesmchen/autoScrollPastUnreadMessages' +|\ +| * e14b9b511 Respond to CR. +| * 8649b2603 Don’t auto-scroll after “loading more messages” unless we have “more unseen messages”. +|/ +* c68f38eb8 Merge branch 'charlesmchen/aboutViewFullAppVersion' +|\ +| * 4d0b15f58 Show long-form app version in about view. +|/ +* dc567e9e8 Merge branch 'charlesmchen/invalidMediaAttachmentsCrash' +|\ +| * 119f1f342 Respond to CR. +| * 6276dcb34 Fix “Invalid media attachments” crash. +|/ +* c758f85cc Merge branch 'charlesmchen/holidayCodeReviewOmnibus' +|\ +| * b53ab8a85 [SSK] Respond to post-holiday code reviews. +| * ab95b04e5 Respond to CR. +| * 3c59678b7 Respond to CR. +| * 90c4ba27b Respond to post-holiday code reviews. +| * bd440f087 Respond to post-holiday code reviews. +|/ +* f4ae0dbba [SSK] Rework verification state sync per latest proto schema. +* b4ceab21c Merge branch 'mkirk/tap-legacy-nonblocking' +|\ +| * 1661e8dc3 (origin/mkirk/tap-legacy-nonblocking) assume contact in 1:1 thread +| * a41b10a69 ignore tap on legacy non-blocking SN change message +|/ +* 79c55eaf8 Merge branch 'charlesmchen/betterFakeMessagesAndUpgradeScreen' +|\ +| * 6444754cb [SSK] Cache the attachments folder in TSAttachmentStream. Add isFirstLaunch method to AppVersion. Add a “last app completed launch” version. +| * 3c28f15db Respond to CR. +| * d340c3262 Tweak the database upgrade copy. +| * 3e3896759 Do not show database upgrade screen for unregistered users. +| * f9fcbad1a Add a “last app completed launch” version. +| * cf3101226 Improve the upgrade screen. +| * 75ccff0e4 Improve debug tools for creating “fake” and “tiny attachment” messages. +|/ +* 70aa46b2d Merge branch 'mkirk/sn-copy-changes' +|\ +| * 60e87bb16 clearer copy for SN changes +|/ +* f098df905 [SSK] Upgrade attachment streams on a serial queue. +* 631a2bbb1 (tag: 2.13.0.4) Bump build number. +* 173cb54b6 Merge branch 'charlesmchen/readVsWriteConnection' +|\ +| * 35d68c618 Fix "writes on long-lived read connection" issue. +|/ +* da55f45af (tag: 2.13.0.3) Bump build number. +* 9eb769fe9 Merge branch 'charlesmchen/loadingRootViewController' +|\ +| * 16dd87a40 Use launch screen as root view controller while database views are loading. +|/ +* 12df7fae8 Update l10n strings. +* 7805119c0 (tag: 2.13.0.2) Bump build number. +* 72ad65e27 Merge branch 'charlesmchen/busyVsUntrusted' +|\ +| * 3bc73bea2 Don't return busy signal to untrusted callers. +|/ +* e50a9e40f Merge branch 'charlesmchen/databaseViewsVsStartupTime' +|\ +| * 42bf2106b [SSK] Avoid crashing on startup due to database view creation. Use transactions in the jobs. +| * f71f33c2a Respond to CR. +| * c7426f934 Avoid crashing on startup due to database view creation. +|/ +* 7b47cd880 Merge branch 'charlesmchen/offersVsSelf' +|\ +| * b18e7cde3 Don’t show offers in conversation with self. +|/ +* 9fa1b295a (tag: 2.13.0.1) Bump build number. +* f47873f78 Merge branch 'charlesmchen/removeBlockingPref' +|\ +| * 7c1d3fe23 [SSK] Remove “block on safety number changes” setting in preferences. +| * 05e316381 Remove “block on safety number changes” setting in preferences. +|/ +* ce99a7462 Merge branch 'charlesmchen/fakeMessages2' +|\ +| * d0791bf51 Add debug UI to create fake messages. +|/ +* 8d828af4f Merge branch 'charlesmchen/databaseViewsVsPerf' +|\ +| * cf0319f02 [SSK] Reduce number of database views. +| * 575d63112 Reduce number of database views. +|/ +* d1097c361 [SSK] Remove an unnecessary database view. +* 678ddcacb Merge branch 'charlesmchen/cullDependencies' +|\ +| * 35879046c Remove OpenSSL pod. +|/ +* 731f090f6 (tag: 2.13.0.0) Merge branch 'charlesmchen/fixOpenSSL' +|\ +| * 1057e4000 Fix OpenSSL cocoapod. +|/ +* a0ffe2bd1 Merge branch 'charlesmchen/groupCreationErrors' +|\ +| * 1818aea62 [SSK] Ensure message sends only succeed or fail once. Add “group creation failed” error message. +| * 6f1f1fac8 Improve handling of group creation failures. +|/ +* f4a77f730 Merge branch 'charlesmchen/notificationSoundsVsConcurrency' +|\ +| * bdfa43573 Allow notification sound check from any thread. +|/ +* e8a0cc08e Merge branch 'charlesmchen/callsStuckOnConnecting' +|\ +| * ab043cea5 [SSK] Improve logging around incoming messages. +| * f5f506d06 Investigate “call stuck on connecting” issue. +|/ +* 24c0e296e Merge branch 'charlesmchen/useReferenceCellsForMeasurement' +|\ +| * 55b86eba2 Use reference cells for measurement. +| * 83b03c004 Use reference cells for measurement. +| * 91af4f93e Use reference cells for measurement. +|/ +* de56c77f3 Merge branch 'charlesmchen/fixBuildWarnings' +|\ +| * 389305e2b Fix build warnings. +|/ +* 07fca2b5d Merge branch 'charlesmchen/throttleNotifications' +|\ +| * 5e993e72c Throttle notification sounds. +|/ +* d01412ae9 Merge branch 'charlesmchen/tweakVerificationUI' +|\ +| * a73c6ede6 Tweak verification UI. +| * 935244843 Tweak verification UI. +|/ +* e9ed91fb0 Update l10n strings. +* 1f82dc9a6 Merge branch 'charlesmchen/readReceiptsVsOlderMessages' +|\ +| * 5ecf38117 [SSK] Rework how messages are marked read. +| * c18a670d6 Don’t update expiration for messages twice. +| * 027cd8cb3 Rework how messages are marked read. +|/ +* 48e8c1825 Merge branch 'charlesmchen/tweakProfileFetch2' +|\ +| * 65d84fd04 Throttle profile fetch and retry on failure. +|/ +* b694dea1b Merge branch 'charlesmchen/tweakProfileFetch' +|\ +| * f8f4e5ee6 Throttle profile fetch and retry on failure. +|/ +* 3c7d47f56 [SSK] Remove legacy message sending. +* 1d27fc62d Bump version and build number to v2.13.0.0. +* df21e616d [SSK] Don’t update home view sort order in response to dynamic interactions or verification state changes. We only want to create change messages in response to user activity, on any of their devices. +* 3a374b4d1 Merge branch 'charlesmchen/fingerprints6' +|\ +| * b68b18837 Use shield instead of checkmark in conversation settings view when users is not verified. +| * 7d7b6689c Tweak verification state messages. +|/ +* 9262c0707 Merge branch 'charlesmchen/fingerprints5' +|\ +| * 7da28bd5d Multiple refinements around verification. +| * 11ca51c95 Show verification state banner. Show verification state in conversation settings view. +|/ +* 8db75e86a Merge branch 'charlesmchen/fingerprints4' +|\ +| * 471e307ec Use checkmark to indicate verification status in conversation view header subtitle, fingerprint view, and in conversation settings row icon. +|/ +* 449e98934 Merge branch 'charlesmchen/fingerprintView3' +|\ +| * a7269a9a5 Clean up ahead of PR. +| * 128e147c1 Show verification state in fingerprint view and let user change that state. +| * 10f3f7fe1 Add “learn link”. Move “scan” button into QR code. +| * 8b9a1e41b DRY up safety number success and failure handling. +|/ +* cc5e81021 [SSK] Add a default description for verification state messages. +* 2dbf305a7 Merge branch 'charlesmchen/fingerprintView2' +|\ +| * 051b00558 Move QR code scanning to a separate view. +| * 526460210 Move QR code scanning to a separate view. +| * 5a867e3f6 Respond to CR. +| * 58ebebc97 Move QR code scanning to a separate view. +|/ +* bc95d4e9e Merge branch 'mkirk/archive-not-delete' +|\ +| * 0a55b965b [SSK][SPK] Archive sessions when fetching profile +| * 6d3d06bd1 CR: continue to delete sessions for EndSession +| * 6715e76c9 Prefer archiving, to deleting old sessions for better handling of out of order decryption. +|/ +* c51b762ec Merge branch 'mkirk/fix-build' +|\ +| * a139bd73e Remove deprecated info message from debug UI +|/ +* 03d35884d Merge branch 'charlesmchen/fingerprintView1' +|\ +| * fe0ddb53d Clean up ahead of PR. +| * 93a587c89 Convert FingerprintViewController to programmatic layout. +| * 3508feaec Convert FingerprintViewController to programmatic layout. +|/ +* 1ed0b1604 Merge branch 'charlesmchen/verificationStateChangeMessages' +|\ +| * 869cdfd12 Add verification state change messages. +| * bc63a72c2 Add verification state change messages. +|/ +* 7335fc4d0 Merge branch 'mkirk/redundant-sn-changes' +|\ +| * 64efa2b3c [SSK] remove redundant SN changes when sending to new identity +| * 75bab75dc Show no redundant error when failing to send due to changed identity +|/ +* 894893ceb Merge branch 'charlesmchen/syncVerificationState' +|\ +| * 1ef9ba065 Clea up usage of fail macro. +|/ +* 4d370130b Merge branch 'charlesmchen/pasteTextFragments' +|\ +| * c3edbd9aa Fix paste of text fragments. +|/ +* 640b210f1 Merge branch 'mkirk/block-file-sharing' +|\ +| * 842baa307 CR: use weak self +| * f7468acad Properly dismiss file view after proceeding with share to no-longer verified identity +| * 4e995b76f Don't try to share file to untrusted identity +|/ +* a1d3e360d [SSK] Sync verification state. +* 3531dda2d Merge branch 'mkirk/create-missed-call-notification-in-thread' +|\ +| * 9ec6ec5e4 [SSK] create missed call notification in threads +| * 1a3204bf4 create interaction in thread when missing call due to changed identity +|/ +* c8a444d93 Merge branch 'mkirk/debug-toggle-verification' +|\ +| * 022292e2e CR: extract method for readability +| * 5b2428c8a debug toggle verification state +|/ +* 32d05bbe0 [SSK] avoid deadlock on unknown session +* 1e6098a9d Merge branch 'mkirk/debug-sn-numbers' +|\ +| * 4000908f4 clarify assert per code review +| * bae91d97d clearer code style +| * d77addc01 extract session state debug utils into section +| * 54865e43e debug item to locally simulate a SN change +|/ +* 34f59d661 Merge branch 'mkirk/identityManager' +|\ +| * 269297716 (origin/mkirk/identityManager) [SSK] New identity manager +| * 8c592a373 log error on assertion failure +| * f74c3a0e8 remove unused code +| * c8d547a08 Only allow callback for identities that were not previously verified +| * 112755304 restore "confirm and callback" functionality +| * 146031e4d update copy / remove some unused "unseen" tracking +| * 41a34e572 Update Safety Number alerts to work with verification +| * c7c243cfe Clean up ahead of PR. +| * b6ddea9ea Sketch out OWSIdentityManager. +| * ceb210748 Sketch out OWSIdentityManager. +|/ +* 847f9e50b Merge branch 'charlesmchen/censorshipCircumventionIndicator' +|\ +| * 1dffdb5ca Indicate if censorship circumvention is active in the main app settings view. +|/ +* 320dfd89e Merge branch 'charlesmchen/moreSystemMessages' +|\ +| * 15074cdb8 Clean up system message cells, make them tappable, etc. +|/ +* 6a6d71db6 Merge branch 'charlesmchen/reworkSystemMessages' +|\ +| * 2d76f2beb Respond to CR. +| * 301c8c51a Clean up ahead of PR. +| * eb53958ae Clean up ahead of PR. +| * efa40dbdb Rework icons in conversation settings view. +| * b3c42f0c3 Rework and unify the system messages. +| * a013a7206 Rework and unify the system messages. +| * 459c6c6ed Rework and unify the system messages. +| * 9cdf907e2 Rework and unify the system messages. +| * 2cbf1e1d0 Rework and unify the system messages. +|/ +* f5caf3704 Merge branch 'mkirk/fix-migration' +|\ +| * 177800c64 (origin/mkirk/fix-migration) only run migration once +|/ +* e80a00a6b [SSK] Format fail messages. +* 58f360b62 [SSK] Rework and unify the system messages. +* ca527951f Merge branch 'charlesmchen/unreadIndicatorAppearance2' +|\ +| * 74209561c Clean up ahead of PR. +| * 713d31ea6 Rework appearance of the unread indicator. +| * c8fc47c08 Rework appearance of the unread indicator. +| * a847a5c86 Fix layout of unread indicator cell subtitle. +| * dab8ddb37 Rework appearance of the unread indicator. +|/ +* 1bbae071f Merge branch 'charlesmchen/unreadChanges' +|\ +| * 90cdb6fcc Only show unread indicator if there is more than one message in the thread. +| * 165de573c Fix edge cases in the unseen indicator. +| * 84d5ee8e4 Clean up ahead of PR. +| * a69c6cce4 Decompose MessagesViewController, add “scroll to bottom button”, improve scrolling behavior. +|/ +* 05fb7dcb3 [SSK] Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. +* bee0d095f Merge branch 'charlesmchen/pasteVsMultipleUTITypes' +|\ +| * 831046338 Respond to CR. +| * e48bf6534 Fix “can’t paste GIF from iMessage” issue. +| * 5dcdace26 Fix “can’t paste GIF from iMessage” issue. +|/ +* 5897ca1b6 Merge branch 'charlesmchen/streamlineHomeView' +|\ +| * 5fad3304a Streamline observation of database modifications in home view. +|/ +* a564c960f Merge branch 'charlesmchen/scrollToBottom' +|\ +| * b5f559977 Fix edge cases in the unseen indicator. +| * 226a97585 Clean up ahead of PR. +| * 22fc69bbb Decompose MessagesViewController, add “scroll to bottom button”, improve scrolling behavior. +|/ +* 6db853103 Merge branch 'mkirk/reject-unseen-id-calls' +|\ +| * eea0d7be7 [SSK] update to merged +| * 1059cc062 replace FOUNDATION_EXPORT with extern per code review +| * 295ba5c85 update copy "safety number" is not uppercased +| * 5b12f4afa Prevent outgoing calls started from various places unless have been seen +| * 130aa132a Reject incoming calls from an unseen changed identity +|/ +* 6b4a5398e [SPK] Improve logging around updating and using prekeys. +* 76a0f88f7 [SSK] dont cache session store +* c0753152d [SPK] Improve logging around updating and using prekeys. +* d1212deab Merge branch 'charlesmchen/incomingAndOutgoingDatabaseViews' +|\ +| * d752a9b03 [SSK] Add incoming and outgoing message database views. +| * b31ef7231 Respond to CR. +| * f49309bf6 Add incoming and outgoing message database views. +|/ +* 19a2a1539 [SSK] Clean up timer usage. +* cdda0d4f0 [SSK] Fix “mark as read” logic. +* 7b9eb2c2d Merge branch 'charlesmchen/messagesViewInitialLayout' +|\ +| * 78982f237 Fix issues around initial layout of messages view. +|/ +* 5485f5d55 Merge branch 'charlesmchen/unreadIndicatorVsBackground' +|\ +| * 76df8431a Reset the unread indicator state if possible while app is in the background. +|/ +* 95c17afe7 Merge branch 'charlesmchen/permissiveSendMessageButton' +|\ +| * 0bccd5821 Make “send message” button easier to tap. +|/ +* ffd16d29a Merge branch 'mkirk/interstitial-call-action' +|\ +| * 9a2f218bf show SN confirmation before adding to group +| * 2d7f03a1c interstitial SN confirmation for attachments/voicenotes +| * 47783a9df request confirmation when calling changed SN +|/ +* ced912530 Merge branch 'mkirk/bordered-avatar' +|\ +| * 76fafbce5 not using ibdesignable and it sometimes crashes interface builder. =/ +| * ea08faa55 remove default avatar image, we should always specify +| * c55f7044a Use avatar view in group views +| * 52aa8a374 require explicit avatar diameter +| * 19d74d91e Build higher res avatar for call screen +| * b11f8affa Use AvatarImageView +|/ +* 68d500b8f Merge branch 'charlesmchen/refineUnseenIndicator' +|\ +| * 85d54798f [SSK] Changes for unseen indicator. +| * 746d131a8 Respond to CR. +| * 8a6ca8c01 Fix glitch around downloading attachments. +| * 02df277d1 Respond to CR. +| * 7afcad81c Fix data type issue around losing millisecond precision in message expiration times. +| * 19390abc4 Refine the unseen indicators. +| * b2fa93e2a Skip redundant layout pass in messages view. +| * bd7b7f3d1 Cache the displayable text for messages. +| * ada4880dc Add a database view for dynamic interactions. +|/ +* e3527b408 Merge branch 'charlesmchen/cacheAccountNames' +|\ +| * 63f014fab [SSK] Cache display names for accounts. +| * c871e2de3 Respond to CR. +| * 616041c0f Respond to CR. +| * 86fb08307 Rationalize the attributed and unattributed display name formatting and caching. +| * dd3394be1 Cache display names for accounts. +|/ +* 2f79e624c Merge branch 'charlesmchen/tweakRegistration' +|\ +| * 3a83f9309 Tweak appearance of registration views. +|/ +* 8bf3fb4bc Merge branch 'charlesmchen/socketStatusVsCensorshipCircumvention' +|\ +| * d065c9527 Hide the socket status view when censorship circumvention is active. +|/ +* 680b2c20d Merge branch 'mkirk/fix-reply' +|\ +| * fe54f4319 fix reply-from lockscreen on larger devices +|/ +* 85d0d2750 [SSK] remove some redundant error notifications +* 6395f3c88 Merge branch 'mkirk/confirm-send' +|\ +| * 37e0b1a00 Sending to unconfirmed idnetity presents confirmation +|/ +* 643301eae Fix tag typo +* 30f4fdd5c Merge branch 'mkirk/profile-request' +|\ +| * 1a03be8ae Fetch safety number upon entering thread +|/ +* 22b608c8e Merge branch 'mkirk/screen-protection-cleanup' +|\ +| * 2c7ccbe5d Make sure screen protection is applied before ending bg task +|/ +* ab9b9833d Merge branch 'charlesmchen/messageViewPerf2_' +|\ +| * 1d792d187 Rename audio duration and image size methods in TSAttachmentStream. +|/ +* fc37e251d [SSK] log error on failure +* b97e4931a Merge branch 'mkirk/safety-numbers' +|\ +| * 4700294c2 [SSK][SPK] Safety Number Updates +| * 4b8544d5f ensure atomic write to wasSeen property +| * 6d00aac04 style cleanup, no functional changes +| * bb25d2beb IdentityKeyStore changes +|/ +* 4851e4304 Merge branch 'charlesmchen/removeRegistrationStoryboard' +|\ +| * 247540625 Respond to CR. +| * 4680a2465 Remove registration storyboard. +|/ +* f30cd7c7f [SSK] Remove invalid assert in socket manager. +* 497d15d8a Merge branch 'charlesmchen/messageViewPerf2' +|\ +| * d8ade3288 [SSK] Cache image size and audio duration on attachments. +| * 78f443374 Respond to CR. +| * 964e6f1ad Improve asserts and logging in attachment adapters. +| * b1f7cf0d6 Cache image size and audio duration on attachments. +|/ +* b0fad7ed5 Merge branch 'charlesmchen/registrationView2' +|\ +| * 9577038f1 Respond to CR. +| * 7547d03a7 Clean up ahead of PR. +| * 2fc683dd9 Add example phone number to registration view and make layout responsive. +| * 070395e8b Rewrite registration view. +|/ +* 1f68f3af7 Merge branch 'charlesmchen/appSettingsSegue' +|\ +| * eeb510b90 Respond to CR. +| * 4ac78d9b4 Replace app settings segue. +|/ +* 07f35d9ba Merge branch 'charlesmchen/fixMessageSizeCache' +|\ +| * 632cb7875 Respond to CR. +| * db097ab8d Fix caching of message bubble sizes. +|/ +* d8d4d7522 Merge branch 'charlesmchen/manualCensorshipCircumvention' +|\ +| * b0005ea93 Respond to CR. +| * bc501b16f Let users manually specify the domain fronting country. +| * 98c5e7d69 Add support for manually activating censorship circumvention. +| * c07f28565 Revise manual censorship circumvention. +| * e746636c7 Expose manual censorship circumvention setting. +| * db10cbaee Convert AdvancedSettingsTableViewController to OWSTableView. +| * 7f3d76d8b Convert the app settings view to OWSTableView. +| * 4bb702fe0 Add support for manually activating censorship circumvention. +| * 2e36f4183 Add support for manually activating censorship circumvention. +|/ +* ac5749efd Merge branch 'charlesmchen/unreadIndicator3' +|\ +| * 6550680f6 Fix glitch in unread indicator layout. +|/ +* ed0340fe6 Merge branch 'charlesmchen/registrationView' +|\ +| * dac5483fd Clean up CountryCodeViewController delegates. +| * 61de84a20 Clean up CountryCodeViewController delegates. +| * 867eb7d74 Convert CountryCodeViewController. +| * ea9dc3fe7 Rationalize the segues between registration view and country code view. +|/ +* 157baa1f9 Merge branch 'charlesmchen/stressTesting2' +|\ +| * a37b194dc Add debug functions for sending media messages. +|/ +* 6a1cf5535 Merge branch 'charlesmchen/addToContactsOffer' +|\ +| * d28467aac Respond to CR. +| * df2ee6ba5 “Add to contacts” offer. +| * bc63389d2 “Add to contacts” offer. +| * 7b70fe674 “Add to contacts” offer. +|/ +* 4223766e6 [SSK] Try the country code for the local phone number when parsing phone numbers. +* 62dab31f5 Merge branch 'charlesmchen/unreadIndicator2' +|\ +| * ac0c6e21d Respond to CR. +| * 14ebc58d5 Revise scrolling behavior of messages view. +| * c639926f2 Revise scrolling behavior of messages view. +| * 4e1dda275 Revise scrolling behavior of messages view. +|/ +* 25232596f Merge branch 'charlesmchen/generateAndDeleteRandomContacts' +|\ +| * 55dab36ce Respond to CR. +| * b3948f27d Add debug functions to generate and delete random contacts. +|/ +* e7de25ab0 [SSK] Pin YapDatabase to v2.9.3 to avoid v.3.x. +* 089c3a5bb Merge branch 'charlesmchen/attachmentFilenames' +|\ +| * cab9e3d3d [SSK] Persist attachment file paths. +| * 7db19df74 Respond to CR. +| * c70487be8 Respond to CR. +| * db07ea8a8 Persist attachment file paths. +| * e4f31b5e4 Rename attachment source filename property. +|/ +* 7e031b730 [SSK] Show SN changes in groups, and include name +* 873aab5cd Merge branch 'charlesmchen/unreadIndicator' +|\ +| * f201ddbba Respond to CR. +| * 16549bee1 Clean up ahead of PR. +| * 0983448c7 Add unread indicator. +| * 6164f65f0 Add unread indicator. +| * ac458cc7a Add unread indicator. +|/ +* 745172a6d Merge branch 'charlesmchen/attachmentPerf' +|\ +| * ebf500d80 Respond to CR. +| * 670439699 Lazy load attachments in messages view, etc. +|/ +* 4a3366251 Merge branch 'mkirk/fix-unregistered-display-name' +|\ +| * 35a6dc763 (tag: 2.12.2.0, origin/mkirk/fix-unregistered-display-name) Show Contact name, not number, of unregistered user +|/ +* a210caed3 bump version +* dfd438e5f revert Yap update until next release +* 70d8f4af3 Merge branch 'charlesmchen/iOSUpgradeNag' +|\ +| * 0ec095f21 Nag users on iOS 8 to upgrade. +|/ +* e80d40d7f Update l10n strings. +* 92466aaf8 Merge branch 'mkirk/ios8-contacts' +|\ +| * 14b6294d6 code cleanup pre CR +| * 4adaaa605 Hide contact editing features on iOS8 +| * 05d70a76d iOS8 contact store adaptee +| * 889ad0bc6 Extract code incompatible with iOS8 into adapter +| * 557488bc7 return iOS8 support in project files +|/ +* 7655226a4 Merge branch 'charlesmchen/emptyRegistrationView' +|\ +| * 54faff2db Show alerts for missing or invalid phone numbers in registration view. +|/ +* 1ab8fb29b Merge branch 'charlesmchen/searchLocalCallingCode' +|\ +| * 07cc8baa6 [SSK] Honor the local calling code in select recipient view. +| * 37a601d76 Honor the local calling code in select recipient view. +|/ +* 69a709f93 (origin/release/2.12.2) Merge branch 'charlesmchen/voiceMessagesEdgeCases' +|\ +| * 14fed91ea Fix edge cases in voice message recording. +| * 5c8956f97 Dismiss keyboard before showing the “too short voice message” alert. +|/ +* 6833fb718 [SSK] Retry push token registration. +* b8e10b0d7 Merge branch 'charlesmchen/missingLocalNotifications' +|\ +| * 5fd93eace Fix missing notifications. +| * fc7dec04a Fix missing notifications. +|/ +* 4b655a701 Merge branch 'mkirk/remove-phone-data-detector' +|\ +| * f87696cc6 do not use phone data detectors +|/ +* d211e6238 Merge branch 'mkirk/fix-no-contacts-flicker' +|\ +| * c31fd0dfc Fix flicker of "no contacts" screen on message compose +|/ +* 74a0e285a Merge branch 'charlesmchen/graySettingsButtons' +|\ +| * 9dc1847ca Change conversation settings buttons to gray. +|/ +* ce002c228 (tag: 2.12.1.2) bump build +* 17cff1a26 Revert "Merge branch 'charlesmchen/bluetoothAudio'" +* b76c3fb1c (tag: 2.12.1.1) bump build +* 48a2005aa Merge branch 'charlesmchen/bluetoothAudio' +|\ +| * 6c9f44b99 Clean up ahead of PR. +| * 54bf10350 Fix Bluetooth audio when recording voice messages. +| * 7e18052c4 Fix Bluetooth audio in calls. +|/ +* de1332479 (tag: 2.12.1.0) bump version +* ef1dc359f Merge branch 'mkirk/mic-perms' +|\ +| * e727c0a77 update mic perm copy +| * 16032b9c6 strongSelf per CR +| * c56ff7532 Fix confusing double permission request on new install when sending voice notes +| * 7861af4fc mention voice notes in mic permission request +|/ +* b136c5f74 pull latest translations +* 72168e288 [SSK] faster contact parsing +* 3ca2d0cbe Merge branch 'mkirk/no-signal-accounts' +|\ +| * e2b1cbb15 Don't show "no signal accounts" until contact intersection has completed at least once +|/ +* d2911dfc3 Merge branch 'charlesmchen/voiceMessageMimeTypes' +|\ +| * fc5176819 Work around m4a vs. mp4 issue for voice messages in legacy iOS clients. +|/ +* ab94eaed4 Merge pull request #2118 from WhisperSystems/mkirk/disclosure-icon +|\ +| * cb1c84397 Fix disclosure icon direction on iOS9 +|/ +* 44eed9899 (tag: 2.12.0.2) sync translations +* 285a2f64d bump build 2.12.0.2 +* 20ad9114e [SSK] Reduce time between editing contacts and seeing those changes in the app +* 45339a9f9 Merge branch 'charlesmchen/newNonContactConversationVsBlocking' +|\ +| * c1a1ea7f3 Let users start new 1:1 conversations with blocked non-contacts found by phone number. +|/ +* 8a69edb34 Merge branch 'charlesmchen/keyboardVsVoiceMessages' +|\ +| * 2048b330a Don't hide keyboard when recording a voice message. +|/ +* 14689f025 (tag: 2.12.0.1) Merge branch 'charlesmchen/genericAttachmentsAppearance2' +|\ +| * 00d972db4 Rework appearance of audio and generic attachment messages. +| * b8b2ae10a Rework appearance of generic attachment messages. +| * 2c31a0bdb Rework appearance of audio messages. +|/ +* ea1a1b101 bump build +* a92538ab9 Sync translations +* ef8662907 Merge branch 'mkirk/clearer-settings-heading' +|\ +| * abcc51034 "Conversation Settings" -> "Contact/Group Info" +|/ +* 33dc4d3d8 [SSK] Show Voice Message snippet +* 09f8a20ac [SSK] Revert "Merge branch 'charlesmchen/autoMarkAsRead'" +* 625b1d020 [SSK] Only reply to group info requester & Don’t reply to “request group info” messages from non-members of the group in question. +* da58eb18a partial revert of previous pod update +* 7f2b1c03a Merge branch 'charlesmchen/voiceMessageAppearance2' +|\ +| * 02843958f Rework appearance of audio messages. +|/ +* c27800c12 Merge branch 'charlesmchen/largerAudioWidth' +|\ +| * bcc700781 Respond to CR. +| * e1fba208a Align photo and audio bubble widths. +|/ +* 94210960a Merge branch 'charlesmchen/duplicatesInNewConversationView' +|\ +| * ad9c715bf Deduplicate items in new conversation view and try to show “phone number” results as signal accounts if possible. +|/ +* f3f4514f0 Merge branch 'charlesmchen/ignoreTapsOnOutgoingMessages' +|\ +| * 12e45eaf8 Ignore taps on outgoing messages while they are being sent. +|/ +* 13f4b0ac6 Merge branch 'charlesmchen/contactHelperDelegate' +|\ +| * 1a593e5f3 Respond to CR. +| * 5afe9bca6 Respond to CR. +| * b316e18cf Ensure contact delegate helper is set during initialization. +|/ +* 4814e64c4 Merge branch 'charlesmchen/trimGroupName' +|\ +| * 4a2a3ffa5 Trim whitespace from group names. +| * 782e3d42b Trim whitespace from group names. +|/ +* 8e694d263 Merge branch 'charlesmchen/invalidAudioFiles' +|\ +| * 3e8b4225b Show alert when user tries to play an invalid audio file. +|/ +* 07c39d924 Merge pull request #2105 from WhisperSystems/mkirk/contact-perf +|\ +| * 90de4edee return contact parsing to background thread +* | 4d04ebedf Merge branch 'charlesmchen/keyboardDimissNoContacts' +|\ \ +| |/ +|/| +| * 6ec167e7e Disable scrolling if no contacts in “select recipient” views. +|/ +* 354d46e3f Merge branch 'mkirk/polite-intersection' +|\ +| * 0a7996ffb Perform contact intersection ~every 6 hours even if no contacts changed +| * 9131cd83f update contacts only when changed +|/ +* a67c6cd36 Merge branch 'charlesmchen/voiceMessagesUI' +|\ +| * 67c3bca91 [SSK] Move filename property to TSAttachment. +| * a7cf00feb Respond to CR. +| * 1b99fd1df Respond to CR. +| * 46b6a59d6 Clean up ahead of PR. +| * a15d11c3e Rework appearance of voice messages and audio attachments. +| * ea34cec0d Clean up ahead of PR. +| * 96e155c75 Rework appearance of voice messages and audio attachments. +|/ +* 9f2414b37 Merge branch 'charlesmchen/blockedUsersVsNewGroups' +|\ +| * 0ff3e5e6a Don’t add blocked users to new groups and handle block alert results correctly. +|/ +* 5a69917cf Merge branch 'charlesmchen/textSendVsVoiceMessageButton' +|\ +| * f10d53041 After sending a text message, the "send" button should revert to mic. +|/ +* 7f83c6f16 Merge branch 'charlesmchen/voiceMessageExtraPeriod' +|\ +| * 37278c22d Remove extra period in voice message file names. +|/ +* 722736d26 translation spellcheck =/ +* 8a0ff276c copy tweak +* 8e2493772 Update translations +* cf1010498 (tag: 2.12.0.0) bump version +* d3a96725a fix block scoping. I'm not even sure how this compiled before. +* 755d5dc4e resolve push-token changes from RI of hotfix/2.11.4 +* 929ba0626 Merge branch 'hotfix/2.11.4' into mkirk/fix-push-sync-job +|\ +| * 708690303 (tag: 2.11.4.1, origin/hotfix/2.11.4) bump build +| * 2cffe78c2 Sync push tokens to service after every app upgrade. +| * 73db16e06 (tag: 2.11.4.0) Improve logging around push token sync. +| * 5a7ed605e Bump version number. +* | 82503db38 sync translations +* | 78b52b691 Merge branch 'charlesmchen/examplePhoneNumbers' +|\ \ +| * | c7777bcb1 [SSK] Show example phone numbers. +| * | 73f79f05e Format example phone numbers. +| * | c81eed74c Show example phone numbers. +|/ / +* | 23558ea87 Merge branch 'charlesmchen/phoneNumberParsing' +|\ \ +| * | 0bab5ed40 Always honor filtering in contact-related views. +|/ / +* | fdbc1663f Merge branch 'charlesmchen/disappearingMessages' +|\ \ +| * | 033ce90dd Respond to CR. +| * | eabda5ad9 Clean up ahead of PR. +| * | 19b80d1f4 Rework the “disappearing messages” logic. +|/ / +* | 0adcd157d [SSK] Don’t ignore “unnamed” phone numbers. +* | eb385f1e9 [SSK] Rework the “disappearing messages” logic. +* | 8fae185ab Merge branch 'mkirk/more-call-logging' +|\ \ +| * | 7bdd73287 remove contact name from production log +| * | 20fc733bd Clearer call logging +|/ / +* | a25573cf2 Merge branch 'mkirk/edit-1-1-contact' +|\ \ +| * | 737a5932c tapping contact label shows contact edit view +| * | bd343f697 clean up some animations +| * | aabd56b23 Clean up comments per CR +| * | 9dc9813de fix layout for long named contacts +| * | 3754b6f26 Edit 1:1 contact details +|/ / +* | 8871331cf [SPK] Update license. +* | 387f1018f [SSK] Auto-rejoin groups by emitting and responding to “request group info” messages. +* | d2ef3c38c Merge branch 'charlesmchen/fixScreenProtection' +|\ \ +| * | b2fba060d Fix edge case where screen protection is not removed. +|/ / +* | e295f9294 [SSK] Safer SignedPreKey deletion policy +* | a4b26dda0 Merge branch 'mkirk/contact-editing' +|\ \ +| * | e95b579d9 TODONE +| * | 41deab12d Fix “two table views” bug in “show group members” view. +| * | 073c0d663 Add/Edit contacts in group list +|/ / +* | 279439843 Merge pull request #2089 from WhisperSystems/mkirk/no-name-contacts +|\ \ +| * | 8411d13ef show number for no-name contacts +|/ / +* | bfc4ff6f0 Merge branch 'mkirk/missing-contacts-compose' +|\ \ +| * | 3040c4a34 include missing return +| * | fee47efbe Avoid repaint by requestng contacts before Compose +| * | dc75e592c ensure contact callback on proper thread +| * | 64bcc9458 Instead of alert we're providing in context reminders - no need for these TODOs +| * | 04878bf22 rename method to better reflect new role +| * | 03727a27f compose w/o contact access -> "..by phone number" +| * | 0b6962cdd contacts reminder in compose view +| * | bf5b6d1e6 Invite Flow when "no contact" +| * | 40dead89e don't crash invite flow when contacts disabled +|/ / +* | 94ec38dd0 Merge branch 'charlesmchen/flagVoiceMessages' +|\ \ +| * | d535ce315 [SSK] Flag voice messages as such in protos. +| * | e85aa045e Flag voice messages as such in protos. +|/ / +* | 714b35277 Merge branch 'charlesmchen/clearMessageDrafts' +|\ \ +| * | 29dd62a19 Always clear message drafts after sending a text message. +|/ / +* | 50b1f420b Merge branch 'charlesmchen/attachmentMimeTypes' +|\ \ +| * | 560122067 [SSK] Prefer to deduce the MIME type from the file extension using lookup, not the UTI type. [SSK] Try to deduce attachment MIME type from the file extension if possible. +| * | 4506064aa Prefer to determine an attachment’s file extension for its file name if possible. +| * | 0137e01af Try to deduce attachment MIME type from the file extension if possible. +|/ / +* | 18498eeda Merge branch 'charlesmchen/syncPushTokensOnLaunch' +|\ \ +| * | 2f3831e04 Respond to CR. +| * | dd3d63623 Pull logging into SyncPushTokensJob. +| * | 716aa772f Always sync and log push tokens. Apply OWSAlerts in more places. +|/ / +* | d0e68a825 Merge branch 'charlesmchen/logPushTokensJob' +|\ \ +| * | aba29ac5c Improve logging around SyncPushTokensJob. +|/ / +* | ad3a1a671 Merge remote-tracking branch 'origin/hotfix/2.11.3' +|\ \ +| |/ +| * 41d911c04 (tag: 2.11.3.0, origin/hotfix/2.11.3) pull latest translations +| * 66fe80d77 Merge pull request #2068 from WhisperSystems/mkirk/call-audit +| |\ +| | * 6beee7c01 verify peerconnection at proper time +| | * 2ec893d31 Ensure we're retaining all promises to completion +| |/ +| * dd3d33896 Bump version. +| * 11a3d76ef Merge remote-tracking branch 'origin/charlesmchen/mutingVsConnected' into hotfix/2.11.3 +| |\ +| | * e36c3aaed Reconcile audio and video enabling with call state. +| |/ +* | 6a4a08d3e Merge branch 'charlesmchen/voiceMemos' +|\ \ +| * | b47337c0b Respond to CR. +| * | 34a7f9cba Respond to CR. +| * | b21e5c324 Respond to CR. +| * | 7f92b5a96 Respond to CR. +| * | 7a37de28e Clean up ahead of PR. +| * | bf6d8ec14 Clean up ahead of PR. +| * | 8ecdc8a2e Move voice memo button to send button. +| * | c34d61b93 Add cancel-by-swipe of voice memo recording. +| * | 608cb70a3 Add voice memo recording. +| * | 45c8695ab Sketch out the voice memo UI. +|/ / +* | be504a7e4 Merge branch 'mkirk/missing-contacts-inbox' +|\ \ +| * | fbcda4040 rename class, extract color +| * | a58a71f8f no contacts banner -> system settings +|/ / +* | f76bb8397 Merge branch 'charlesmchen/searchVsNonSignalContacts' +|\ \ +| * | 9f4b8d3b0 Slightly reduce the non-contact cell heights in “new 1:1 conversation” view. +| * | d0e26a58c Show “invite by SMS” offer for matching non-Signal contacts when searching in “new 1:1: conversation” view. +|/ / +* | 791b0d78a Merge branch 'charlesmchen/conversationSettingsAssert' +|\ \ +| * | 1e6fd385b Fix assert in conversation settings view. +|/ / +* | c7d25a66a Merge branch 'charlesmchen/contactParsingPerf' +|\ \ +| * | 3f7d23e04 Fix two hotspots in contact parsing and contact syncing. +|/ / +* | bbf099894 [SSK] Fix a hotspot in the phone number parsing logic. +* | 3671b3aeb Merge branch 'charlesmchen/multipleAccounts' +|\ \ +| * | 057bb76e6 [SSK] Rework handling of phone number names. +| * | 535fc566a Rework handling of phone number names. +|/ / +* | 4032f40a3 Merge branch 'charlesmchen/contactsSync' +|\ \ +| * | 0c4351a90 Use SignalAccount class to sync contacts. +|/ / +* | dd95b13d3 Merge branch 'mkirk/compiler-warnings' +|\ \ +| * | 835ab3dd9 [SSK] fix some compiler warnings +| * | d7c7fff67 Fix some compiler warnings +| * | ce2ee759f Update to latest recommended xcode.proj settings +|/ / +* | fb4ee8ffb Merge branch 'charlesmchen/newConversationView' +|\ \ +| * | 45ae8fb06 Respond to CR. +| * | 2bc1d44cd Respond to CR. +| * | 1b99671e0 Clean up ahead of PR. +| * | 325134c6e Clean up ahead of PR. +| * | 363d84fd2 Update “new conversation” view to use OWSTableView, contacts view helper, etc. +|/ / +* | 4b9ee2dcf Merge branch 'charlesmchen/orderedWebRTCDataChannel' +|\ \ +| * | dcdfcb0a6 Insist upon an "ordered" TCP data channel for delivery reliability. +|/ / +* | 1444cfc63 Merge remote-tracking branch 'origin/hotfix/2.11.2' +|\ \ +| |/ +| * fb7a9e39a (tag: 2.11.2.1, origin/hotfix/2.11.2) bump build +| * ee7adca03 Merge branch 'hotfix/display-text-crash' into hotfix/2.11.2 +| |\ +| | * 2f05dcc2c fix crash when viewing undisplayable text +| |/ +| * 572c1e3d8 (tag: 2.11.2.0) pull latest translations +| * b5b4eb456 bump build +| * 836f6bb67 Merge pull request #2061 from WhisperSystems/charlesmchen/speakerPhoneVsWebRTC +| |\ +| | * 0f85284b8 Fix speakerphone vs. WebRTC AND Fix CallService edge cases. +| |/ +| * 1b66e0ba2 Fix crash when placing call +* | 83a089f42 [SSK] better sender logs +* | a794fe835 Merge branch 'mkirk/delay-contact-access' +|\ \ +| * | a056c1e05 Check for signalContact vs. AB setup. +| * | 364f416a6 Block editing contact if user has denied contact permissions +| * | b24cf2918 don't request contacts until necessary +|/ / +* | 931b6b420 [SSK] Minor cleanup. +* | 563ccf671 [SSK] Temporary change to improve read receipt logging. +* | b801b2cfe Merge branch 'charlesmchen/audioPlayer3' +|\ \ +| * | 33415eaa0 Respond to CR. +| * | ae7934c11 Update appearance of audio and generic attachment adapters. +| * | c2cdeb3bc Remove SCWaveformView. +| * | 800715a5e Remove waveform from audio message bubbles. +|/ / +* | 61523a14a Merge branch 'mkirk/contact-fixups' +|\ \ +| * | 93801e8d2 only show count when there is more than 1 of the same type +| * | 4b6bfa4c4 "home", "other" and "work" instead of "Unknown" phone label +|/ / +* | c7931aa2c Merge branch 'charlesmchen/contactsDatabaseDeadlock' +|\ \ +| * | 147107d76 Fix database deadlock in contacts manager. +|/ / +* | 5b9978b07 Merge branch 'charlesmchen/groupAvatarScaling' +|\ \ +| * | 4bc98dba5 Rework the scaling and cropping of group avatars. +|/ / +* | cb293f286 [SSK] Add SignalAccount class, Extract labels for phone numbers. +* | 97010c590 Merge branch 'charlesmchen/groupsVsNonContacts_' +|\ \ +| * | 8eef4c634 Respond to CR. +| * | 26f69b006 Respond to CR. +| * | f71ec9f7c Respond to CR. +| * | 2bec1db54 Respond to CR. +| * | ad11c50c1 Reworking observation of Contact and SignalAccount changes. +| * | 994aec0d8 Add SignalAccount class. +| * | 6801963a1 Add SignalAccount class. +| * | 93700f104 Extract labels for phone numbers. +| * | 42768294e Extract labels for phone numbers. +| * | cb9d96be0 Clean up ahead of PR. +| * | da7dd1b12 Clean up debug scaffolding. +| * | f5cd39ea3 Apply ContactsViewHelper to SelectThreadViewController. +| * | 61f59067b Improve contact-related views. +|/ / +* | 8a2f1e3ee Merge branch 'mkirk/remove-overzealous-assert' +|\ \ +| * | a1eef6fde Remove invalid assert in case of legitimately stacking unicode +|/ / +* | c6d253d90 Merge branch 'mkirk/fix-init-call-crash' +|\ \ +| * | faa797c74 Fix crash when placing call +|/ / +* | d7352fa84 Merge branch 'charlesmchen/callServiceCautiousUnwrap' +|\ \ +| * | d06f358a2 Don't unwrap with ! in CallService. +|/ / +* | a68d76168 Merge branch 'charlesmchen/cameraVsAttachmentApproval' +|\ \ +| * | 6ae3a5395 Skip attachment approval dialog for image and video shot by camera. +|/ / +* | 700bd6e08 Fix build, remove unnecessary return +* | 27e55d290 Merge branch 'mkirk/crashing-call-service' +|\ \ +| * | 3a0f84cf3 Avoid crash in CallService +|/ / +* | e1162fa64 [SSK] Better debugging information +|/ +* b9a56fe81 (tag: 2.11.1.5) bump build +* d68c5c249 sync translations +* 79a2a7b67 Merge branch 'mkirk/fix-contact-refresh-backoff' +|\ +| * 94b95367f Actually *use* the delay time to enqueu the retry +|/ +* bff1fedaf Merge branch 'mkirk/unregistered_user' +|\ +| * adbc6eb71 style cleanup +| * 4d5d80867 Ensure push token update job runs to completion +|/ +* 549b7d5a9 (tag: 2.11.1.4) bump build +* d408fab7b Sync translations +* 4fe9931a0 Merge branch 'mkirk/import-arbitrary-files' +|\ +| * 48971478d Allow importing of any file that's not a directory +| * 30b12083f Merge branch 'charlesmchen/ongoingCallVsOpenWithSignal' +| |\ +| | * 1b61c3b0c (origin/mkirk/ongoingCallVsOpenWithSignal) fix attachment-import error alert presentation +| | * 2cc3232c0 Fix presentation of “open with Signal” errors. +| | * c08e6e0fc Ignore “open with Signal” if there is an ongoing call. +| |/ +| * c4e90089d Merge branch 'charlesmchen/exportWithSignalErrors' +| |\ +|/ / +| * 782140d36 Respond to CR. +| * 791fee347 Improve errors in the 'export with Signal' feature. +|/ +* b66c0df7f Merge branch 'charlesmchen/exportWithSignalTweaks' +|\ +| * 89c5f93aa Tweak appearance of "export with Signal" UI. +|/ +* 7901b6e68 (tag: 2.11.1.3) sync translations +* 9964e9cb2 bump build +* dcb237bf3 must include name for file types +* d0ff13c51 (tag: 2.11.1.2) sync translations +* 4acdddf1d bump build +* 14f956f3b Merge branch 'mkirk/support-random-extensions' +|\ +| * 822f5c841 support sending all files +| * 93fe12232 display error if user picks directory/bundle e.g. .pxm +|/ +* babe024ea Merge branch 'mkirk/truncate-filenames-in-preview' +|\ +| * 1d9144167 truncate really long file names in the middle +|/ +* 8c1c38b30 Merge branch 'charlesmchen/bundleDocumentTypes' +|\ +| * 8a8b10b68 Respond to CR. +| * d081df9de Respond to CR. +| * c84da982a Respond to CR. +| * 93eed7353 Respond to CR. +| * 5c0c9b533 Respond to CR. +| * e75ed5e47 Respond to CR. +| * 6e36ce97a Let users share imported files to a thread or contact of their choice. +| * 3c7574a90 Register Signal to handle a wide variety of common document types. +|/ +* 54c1a38d5 Merge branch 'charlesmchen/genericAttachmentAppearance' +|\ +| * 788ec4ce0 Respond to CR. +| * d42588b95 Improve appearance of generic attachments and the attachment approval dialog. +|/ +* 7f1019af6 (tag: 2.11.1.1) bump build +* 0197e1d23 Merge branch 'mkirk/limit-document-size' +|\ +| * 66e858a35 Validate all picked attachments/ show preview +| * 4d15fbf2d cherry-pick (rebased) charlesmchen/stressTesting/Signal/src/ViewControllers/SignalAttachment.swift +|/ +* fe6ea0d91 (tag: 2.11.1.0) Merge pull request #2031 from WhisperSystems/mkirk/default-filenames +|\ +| * 203009d4e fix compiler warning / idiomatic optional unwrapping +| * 26b94bf94 Always send a filename +|/ +* 1aa8e35f5 sync translations +* 20a9fa602 bump version +* 0ccc1a69b Merge branch 'mkirk/fix-downloading-group-attachments-view' +|\ +| * 077038b6c Fix squashed "downloading" bubbles in groups +|/ +* 6672886ed Merge branch 'charlesmchen/navigationBarAppearance' +|\ +| * b99984f9d Fix the “message view subtitle mis-sized after muting” issue. +| * 89de68680 Fix the “navigation titles are black after sharing” issue. +|/ +* 444018341 translation comment for "group name" field +* 0cd71b3b2 (tag: 2.11.0.3) sync latest translations +* 0386e8cff bump build +* a05fc7ac9 Merge branch 'mkirk/crop-mask-around-attachments' +|\ +| * 1d65d6dc4 clip upload mask to bounds of generic file bubble +|/ +* b5b6f060c Merge branch 'charlesmchen/editMenuConflicts2' +|\ +| * a0a930aac Resolve the menu item conflicts between message view and media view. +|/ +* b5a2c1752 Merge branch 'charlesmchen/attachmentActionSheetIcons' +|\ +| * 866493c8e Add icons to attachment action sheet. +|/ +* 718109bca Merge branch 'mkirk/doc-picker-fixups' +|\ +| * ea7c74316 capitalize *all* letters of file extension +| * 474a6d325 document picker uses approval dialog +|/ +* 42dcb7fa8 Merge branch 'charlesmchen/editGroupShortcut' +|\ +| * 1acb2d749 Respond to CR. +| * 9779527cf Let users edit group name and avatar by tapping on them in group settings view. +|/ +* 8e332395d Merge branch 'charlesmchen/editMenuConflicts' +|\ +| * 5cbbf5005 Respond to CR. +| * a59f49cea Resolve the menu item conflicts between message view and media view. +|/ +* ea3e6d48f Merge branch 'charlesmchen/crashVsMediaMethod' +|\ +| * 62e6c9a12 Fix crash unsafely accessing optional media method. +|/ +* ba3f964d5 Merge branch 'charlesmchen/onlyLastCellClearsAdapterViews' +|\ +| * 210802994 Respond to CR. +| * 03a97cdd7 Only the last cell associated with a media adapter should clear its views. +|/ +* 50b65f051 Merge branch 'charlesmchen/stretchedImages' +|\ +| * ef92d5e3b Fix distorted images in messages view. +| * 226dffff7 Fix distorted images in messages view. +|/ +* 8bf4cb83a [SSK] Improve handling of whitespace in contacts. +* 16cde883f Merge branch 'charlesmchen/increaseLocalNotificationDelay' +|\ +| * 552eecfd0 Increase local notification delay. +|/ +* 0331244b5 (tag: 2.11.0.2) bump version +* b2e597219 Sync translations +* b6a30cb7f Merge branch 'mkirk/document-picker' +|\ +| * 70d235a67 Choose arbitrary attachments from iCloud/GDrive/Dropbox/etc +|/ +* b1ea340c3 Callscreen fills buttons to show active state +* 4468b465d Merge branch 'charlesmchen/timerRetainCycle' +|\ +| * a4709c921 Respond to CR. +| * eb23252c6 Fix timer retain cycle. +|/ +* d248f6117 [SSK] Ignore oversize messages. +* 52ab0df3f Merge branch 'charlesmchen/audioPlayer2' +|\ +| * 4b2bdd9b5 Use audio attachment player in attachment preview dialog. +| * 041badd29 Decouple the audio attachment player from the video attachment adapter. +|/ +* 13f408908 Merge branch 'charlesmchen/audioPlayer' +|\ +| * b90b71351 Respond to CR. +| * 980d726a4 Add audio attachment player. +|/ +* 61d72f8e9 (tag: 2.11.0.1) bump build +* b3fc16b0b [SSK] handle synced reset-session messages +* 5c39d623a tweaked copy per @RiseT +* 0ff24d18a (tag: 2.11.0.0) bump version +* ed0d3a03a sync translations +* 5bbcc23da [SSK] Do not retry fatal message send errors. +* d9e3e8773 New downloading progress view (#2006) +* 67e94e2b5 [SSK] Do not try to resend unsaved outgoing messages when accepting a safety number change. +* 218e65de3 Merge branch 'charlesmchen/showMuteStatusInHomeView' +|\ +| * 2b09033dd Show mute status in home view. +|/ +* d02c3e278 Merge branch 'charlesmchen/fixMuteUntilDateFormat' +|\ +| * b2dd458f1 Fix “muted until” date format. +|/ +* 0603ab72d Merge branch 'charlesmchen/pauseMediaAdapters' +|\ +| * d65e39845 Respond to CR. +| * b2664158b Pause animated gifs when offscreen; clean up media views more aggressively. +|/ +* 4045d3bda Merge branch 'charlesmchen/improveGroupMembersView' +|\ +| * ee765df4b Respond to CR. +| * e36b5a460 Improve group members view. +|/ +* 9f3e5561f Merge branch 'charlesmchen/fixConversationSettingsSegues' +|\ +| * 06f9affc0 Fix segues in conversation settings view. +|/ +* c81206ca7 Merge branch 'charlesmchen/syncContactsEagerly' +|\ +| * a29809e67 Respond to CR. +| * bfd29cd99 Send contacts sync messages whenever the contacts change. +|/ +* bd261f16c Merge branch 'charlesmchen/fixPasteText' +|\ +| * 2a9ac8756 Fix paste of text. +|/ +* 4451a3a41 Merge branch 'charlesmchen/callServiceEdgeCases' +|\ +| * 791dba924 Respond to CR. +| * 3368659d8 Improve handling of call service edge cases. +| * b4464f91a Improve handling of call service edge cases. +| * 3c4955840 Improve handling of call service edge cases. +| * f920300f2 Improve handling of call service edge cases. +|/ +* 603d51473 Merge branch 'charlesmchen/muteThreads' +|\ +| * 3c8635c35 [SSK] Add muting of threads. +| * 499c8d0bc Add muting of threads. +| * d968c899b Add muting of threads. +| * 2ca122f57 Add muting of threads. +| * 2c286c8b5 Add muting of threads. +| * c8466912f Add muting of threads. +|/ +* ea848f31e [SSK] Fix outgoing message status for messages sent from linked devices. +* b54508bb2 when generating strings verify that SSK is on master +* 20ea6b8d3 Merge branch 'charlesmchen/justOnceContactStore' +|\ +| * 3ccee7ffd Don’t load contact store twice. +|/ +* 5713a0e30 Merge branch 'charlesmchen/fixCalling' +|\ +| * 1fa037527 Fix calling by using actual session descriptions. +|/ +* f0727b541 Merge branch 'charlesmchen/outgoingMessageState' +|\ +| * dd807f676 [SSK] Rework outgoing message state & refine error handling for outgoing group messages. +| * d61407379 Respond to CR. +| * e025b86e7 Rework outgoing message state. +| * cc766bcc5 Rework outgoing message state. +| * 66d1a3785 Rework outgoing message state. +|/ +* 2c46220eb Merge branch 'charlesmchen/notificationsVsConcurrency' +|\ +| * 3e5360500 Improve thread safety in PushManager and NotificationsManager. +|/ +* dca3fa500 Merge branch 'charlesmchen/lostMessages' +|\ +| * f41762c31 [SSK] Avoid lost messages. +| * 1558d8c6c Avoid lost messages by acknowledges message receipt after the message is processed. +|/ +* f9b51c01f [SSK] De-bounce the prekey checks. +* fa5bb7ad9 Make it easier to track local users registration ID in debug log +* 074372278 [SSK] ensure accepted SPKs are marked +* d911b6a99 Merge branch 'call-permissions' +|\ +| * da8596c1b Check microphone permissions: Clean up +| * 70efb5e9e Check microphone permissions before starting a call +|/ +* 528b7296d Merge branch 'charlesmchen/hardwareRingerVsPlayback' +|\ +| * 5c20a8597 Respond to CR. +| * bf9ae552a Ignore hardware mute switch during video playback in attachment approval view. +| * d9ef27d80 Ignore hardware mute switch during video playback in messages view. +|/ +* 1cf45a26d Merge remote-tracking branch 'origin/hotfix/2.10.1' +|\ +| * 2f28441a5 (tag: 2.10.1.2, origin/hotfix/2.10.1) bump build +| * 99c218f2d [SSK] Fix file extensions for arbitrary file types. +| * eb3526b52 (tag: 2.10.1.1) bump build +| * 622a757ec Merge branch 'charlesmchen/fixAudioPlayback' into hotfix/2.10.1 +| |\ +| | * 847a61064 [SSK] Fix audio playback. +| | * 79a2612db Fix audio playback. +| | * 8458fb69a Fix audio playback. +| |/ +| * 99f49dfff (tag: 2.10.1.0) Pull latest translations +| * 4788d0b14 [SSK] Don't mark messages as failed prematurely +| * 207b29e7f bump version +* | 3e7ecf335 Merge branch 'charlesmchen/honorAttachmentFilenames' +|\ \ +| * | 9c6f76253 [SSK] Honor attachment filenames. +| * | 193d9421c Respond to CR. +| * | 0018d0040 Honor attachment filenames. +| * | dd3250a9e Honor attachment filenames. +|/ / +* | aab897abb Merge branch 'feature/contactsIntersectionAudit' +|\ \ +| * | dc3a382c2 Respond to CR. +| * | 2e653afff Reduce usage of contacts intersection endpoint. +| * | 2ede3f334 Reduce usage of contacts intersection endpoint. +| * | 5b4e3a242 Reduce usage of contacts intersection endpoint. +|/ / +* | f38f3d888 [SSK] Update SignalAttachment to allow arbitrary attachments. +* | c1f2ae61b Merge branch 'charlesmchen/arbitraryAttachments' +|\ \ +| * | 70ac0acc6 Respond to CR. +| * | 54d2d85eb Update SignalAttachment to allow arbitrary attachments. +|/ / +* | 72eb63287 Merge branch 'charlesmchen/sendOversizeTextMessages' +|\ \ +| * | da13506db Respond to CR. +| * | db7cb8d38 Send oversize text messages as attachments. +|/ / +* | 9882eeea9 Merge branch 'charlesmchen/improveAttachmentApprovalView' +|\ \ +| * | ebde76916 Respond to CR. +| * | 7f5847d2d Improve file size formatting in attachment approval dialog. +| * | de735dcf3 Add stubs for audio preview to attachment approval dialog. +| * | fc33b0083 Add animated image preview to attachment approval dialog. +| * | 5d79f4397 Add video preview to attachment approval dialog. +|/ / +* | 4d091b470 Merge branch 'charlesmchen/socketLifecycle' +|\ \ +| * | 33593921f [SSK] Rework socket manager. +| * | 625a44890 Respond to CR. +| * | effa88561 Rework socket manager. +|/ / +* | 195d721aa Merge branch 'charlesmchen/homeViewBlockIndicator' +|\ \ +| * | 267462c58 Show block indicator in home view. +|/ / +* | 1d9de0942 [SSK] Make sure we can return multiple recipients matches +* | 1e47f14bd Merge branch 'mkirk/update-linter-script' +|\ \ +| * | 4149cba6d use updated localizable strings linter +|/ / +* | 88d99b7ad Merge branch 'mkirk/fix-edit-menu-positioning' +|\ \ +| * | 5d604a796 [JSQMVC] Fixes "floating" edit menu for narrow media items +|/ / +* | bf02bd2cc Merge branch 'charlesmchen/deferNotifications' +|\ \ +| * | 2a369273c Respond to CR. +| * | b7b5dbb56 Do not present local notifications if a read receipt arrives immediately after. +|/ / +* | 0115eb847 Merge branch 'charlesmchen/blockOffer' +|\ \ +| * | 1d2e5d218 [SSK] Create block offer when non-contacts send you a message. +| * | 55706e9bb Respond to CR. +| * | 878704cb1 Create block offer when non-contacts send you a message. +|/ / +* | f6baf1f51 Merge branch 'charlesmchen/approveAllAttachments' +|\ \ +| * | c2e94f57e Respond to CR. +| * | 660e4dd4c Show attachment approval dialog for all attachments. +|/ / +* | 255b3023f Merge branch 'charlesmchen/messageViewGlitches2' +|\ \ +| * | 5bc5e0015 Add debug UI action to send 1,000 messages so we can “load test” message view’s perf. +| * | 1ac487835 Reload data and invalidate layout whenever message view returns from background. +|/ / +* | 5af43580b Merge branch 'charlesmchen/license' +|\ \ +| * | 25d97a130 Update license. +|/ / +* | 21f5bc2fc Merge branch 'charlesmchen/editMenuVsAttachmentUpload' +|\ \ +| * | 435a42bb3 Hide the edit menu for attachment until they are uploaded. +|/ / +* | f36316c60 Merge branch 'charlesmchen/blockWarningMessages' +|\ \ +| * | 0a8c9e562 Respond to CR. +| * | 4e3fbac10 Add explanation messages to the “block user alert” and the block section of the 1:1 conversation settings view. +|/ / +* | 61c865a78 Merge branch 'charlesmchen/preserveScrolledToBottom' +|\ \ +| * | f503d7f93 Stay scrolled to the bottom during in conversation view during updates. +|/ / +* | 6bc979cbc Merge branch 'charlesmchen/refineUploadIndicator' +|\ \ +| * | ec129ea21 (origin/charlesmchen/refineUploadIndicator) Improve attachment upload progress indicator. +|/ / +* | 8490be6ed [SSK] Remove the properties related to Redphone and WebRTC support. +* | 2fd8a13a3 [SSK] Improve attachment upload progress indicator. +* | 37d408cc7 Merge branch 'mkirk/fix-share' +|\ \ +| * | 032cf0d95 sharing via message view is legible +| * | 811a4ac4b add some missing asserts +|/ / +* | 2a7a4aa34 Merge branch 'mkirk/clarify-verification' +|\ \ +| * | ca768d071 repeat phone number in header, next to back button +| * | fb53a3258 clarify what to do on the verification screen +|/ / +* | 4a128e69a Merge branch 'mkirk/sync-unread-count' +|\ \ +| * | 91fc6b4d0 Stretch to fit wider message counts +| * | 9bd2ff057 Don't repaint back-button unread badge +|/ / +* | 6b0eb7f9b Use numeric pad for verifiation code entry +* | 7fb8b493f bail on scripts whenever an error is encountered +* | dfd4ff5d2 Merge branch 'charlesmchen/messageViewGlitches' +|\ \ +| |/ +|/| +| * 6fde2852b Respond to CR. +| * dc78e32bb Reload data and invalidate layout whenever message view will appear. +|/ +* 0039f4b69 (tag: 2.10.0.3) sync translations +* 1849c8531 bump build +* 2af89c9a2 [SSK][SPK] only assert dispatch in DEBUG +* a93aad512 Respond to CR. +* a15e8b2d9 Merge branch 'charlesmchen/cantBlockSelf' +|\ +| * 4cd1684de Don’t let user block themselves. +| * 372d6b9bf Don’t let user block themselves. +|/ +* df58a0133 Revert "Fix i18n key." +* e3fb0c598 Merge branch 'charlesmchen/multipleItemsInPasteboard' +|\ +| * 1ab441768 Fix paste when pasteboard has multiple items. +|/ +* d3bcc4e4d Merge branch 'charlesmchen/roundAvatarIcons' +|\ +| * 27aeb425e Round avatar icons. +|/ +* 7fb795491 Merge branch 'charlesmchen/fingerprintViewVsKeyboard' +|\ +| * 3ac1e75b5 Ensure keyboard doesn't hide "safety numbers changed" interaction. +|/ +* 0bc8a0f37 Merge branch 'charlesmchen/reformatPhoneNumberVsCountryCodeChange' +|\ +| * 5feca4282 Reformat phone number if user changes country code. +|/ +* df381cf4b Merge branch 'mkirk/session-cleanup' +|\ +| * 6ba5e5cc6 Clean up session-reset logging +|/ +* 0ba81588e Fix i18n key. +* 8c5ceffe1 (tag: 2.10.0.2) sync translations +* 24adac289 bump version +* e8056fcbb Merge branch 'mkirk/fix-session-reset' +|\ +| * d8ae94173 Delete session *before* sending EndSession message +| * 9d0c76ca5 debug action to reset session +| * 033591aec Remove unused code +|/ +* acad91ebc Merge branch 'mkirk/session-corruption' +|\ +| * 87845525b [SSK] serialize all read/write to sessionStore +| * caabae002 Add new debug method to delete session +| * 398ee22f5 [SSK] rename cipher queue to sessionStoreQueue +| * a951d11d9 [SSK] move iOSVersion to SSK +|/ +* 80696e257 Merge branch 'charlesmchen/newConversationScrollVsKeyboard' +|\ +| * 554125aee Dismiss keyboard if user scrolls in “new 1:1 conversation” view. +|/ +* dc174ad6f Merge branch 'charlesmchen/blocking10' +|\ +| * cc16b9c89 CR nit: add assert +| * 19d8f6cf0 Improvements around contact cells. +|/ +* ff6f38346 Merge branch 'charlesmchen/fixTableAssert' +|\ +| * 74820d9ba Respond to CR. +| * a1bd2f66f Fix invalid assert in the OWS table views. +|/ +* c597bacdc Merge branch 'charlesmchen/blocking9' +|\ +| * fd86495e2 Respond to CR. +| * 8823b2884 Refine the “block list” view. +| * b5562fa12 Update “new 1:1 conversation” view. +| * 8867b2882 Tweak appearance of contact cell. +| * b6f944f3d Tweak appearance of “add to block list” view. +|/ +* 42b6ac671 (tag: 2.10.0.1) bump build +* 300251171 Sync translations +* c36bb7203 Merge branch 'mkirk/copy-updates' +|\ +| * 4494a95a6 Block list is two words. Update code/comments/constants +|/ +* e94cc1826 Merge branch 'mkirk/blocking8' +|\ +| * 78705d3ac right align blocked indicator +|/ +* 1a73b439d Merge remote-tracking branch 'origin/charlesmchen/blocking8' +|\ +| * e0c7457ec Refine appearance of “add to block list” view. +| * b3d6a82c4 Show blocked users in “add to block list” view. +|/ +* 4349f00cd Merge branch 'charlesmchen/blocking6' +|\ +| * f56227ce2 Respond to CR. +| * af6e51f83 Make local copy of contact list. +| * 54e6d4400 Multiple improvements around contacts and the blocklist. +|/ +* 68d2ea2fd Merge branch 'charlesmchen/blocking7' +|\ +| * 7273e6faa Respond to CR. +| * 99a1b4e9f Revert unintended l10n changes. +| * 7f21a1bf6 Dismiss “block state indicator” if user scrolls message view. +| * c500e7890 Improve completion handling of block actions. +| * 9c9060203 Block actions in message view for blocked group conversations. +| * 8c347699b Block actions in message view for blocked contact conversations. +|/ +* f46080519 [SSK] Don't retry terminal sending failures +* 353751826 [SSK] Don’t block outgoing group messages. +* d640aaa9d Merge branch 'charlesmchen/blocking5' +|\ +| * 71007cc3d Respond to CR. +| * 253776d65 Respond to CR. +| * dcb7eef3f Respond to CR. +| * 54cd8cfa3 Add blacklist controls to 1:1 conversation view. +|/ +* 80ddc1a2c (tag: 2.10.0.0) sync translations +* 127e7f738 bump release target +* d001a5b51 Merge branch 'charlesmchen/blocking3' +|\ +| * 5fa1a3630 Respond to CR. +| * 8dadc3ba2 Don’t update contacts in the blacklist views. +| * 6c1d46c4d Use contact names where possible in the block list view. +| * a7296db1f Add contacts list to “add blocked number” view. +|/ +* d84f052b2 Merge branch 'charlesmchen/blocking4' +|\ +| * 5a234e34d Filter incoming and outgoing messages using the blacklist. +|/ +* 06ad8733b Merge branch 'charlesmchen/blocking2' +|\ +| * 2e0c95c37 Respond to CR. +| * db3145432 Respond to CR. +| * 89e244ee0 Update to reflect changes to SSK. +| * 8578390ee Clean up blocklist views. +| * 922d48904 Refine BlockListViewController and AddToBlockListViewController. +| * 271cc6f07 Sketch out BlockListViewController and AddToBlockListViewController. +| * a155df161 Pull out OWSTableViewController. +|/ +* 176c1f872 Merge branch 'hotfix/2.9.2' +|\ +| * 1a25367b0 (tag: 2.9.2.1, origin/hotfix/2.9.2) bump version +| * 0a806f499 (tag: 2.9.2.0) Fix crash when viewing changed safety numbers +* | eb68746b6 Merge branch 'charlesmchen/singletonAssert' +|\ \ +| * | f604cfb55 Apply assert to ensure singletons are only created once & filter incoming messages using the blacklist. +| * | 5ff454fd9 Fix double creation of NotificationsManager singleton. +| * | 8374ca149 Apply assert to ensure singletons are only created once. +| * | d00c89215 Apply assert to ensure singletons are only created once. +|/ / +* | afcb08c10 Merge branch 'mkirk/crashing-fingerprint' +|\ \ +| * | 9eb746a7a Fix crash when viewing changed safety numbers +|/ / +* | e82800154 Merge branch 'mkirk/debug-stores' +|\ \ +| * | d2732751a New debug action: print sessions +|/ / +* | febc04ca4 Merge branch 'charlesmchen/registrationViewCallingCode' +|\ \ +| * | 7306803ae Add explicit calling code state to registration view. +|/ / +* | 715399492 [SSK] [SPK] Update SignalProtocolKit and SignalServiceKit +* | 3ed4c4856 Merge branch 'charlesmchen/spacesInPaths' +|\ \ +| * | d12a582ee Rename source directories with a space in their name. +|/ / +* | 3d6c153ca Merge branch 'mkirk/enforce-singleton' +|\ \ +| * | 7f239c804 [SSK] + Enforce singleton access for MessagesManager and MessageSender +|/ / +* | eaf7b6503 Merge branch 'charlesmchen/maxGifSize25mb' +|\ \ +| * | 7058a58d2 Bump maximum animated GIF file size to 25mb. +|/ / +* | 4c0242ee1 [spk] Update SignalProtocolKit +* | 5138539d9 [SSK] Fix sharing of oversize text messages. +* | 9af19645e Merge pull request #1913 from WhisperSystems/mkirk/remove-redphone +|\ \ +| * | 0b4903717 Remove some more RP related code +|/ / +* | 3765d28da Respond to CR. +* | 2f40e3734 Merge branch 'charlesmchen/oversizeTextMessageView' +|\ \ +| * | 4649fcfd2 Add "oversize test message" view. +|/ / +* | 7ff98a0d8 Merge branch 'charlesmchen/countryCodeViewVsKeyboard' +|\ \ +| * | 5a2d4ce62 Hide keyboard when scrolling in country code view. +|/ / +* | 2e49b77f6 Merge branch 'charlesmchen/imageViewVsShare' +|\ \ +| * | a9f2382e8 Change alignment of image view’s share button. +| * | bc2e292a6 Add share button to image view. +|/ / +* | f682ebbbc Merge branch 'charlesmchen/arbitraryAttachments2' +|\ \ +| * | d85dfb8a4 Improve support for arbitrary attachments. +|/ / +* | 306895ea6 [SSK] Improve support for arbitrary attachments. +* | 7c9c4668f Fix typo that causes crash. +* | c656cdfef Merge branch 'charlesmchen/oversizeTextMessagesAndArbitraryAttachments' +|\ \ +| * | 7b8401925 Respond to CR. +| * | 3d451846a Fix build break. +| * | b0aa71fd4 Apply DisplayableTextFilter to oversize text messages. +| * | 80fbc093d Handle oversize text messages and arbitrary attachments. +|/ / +* | bf1a79037 Merge branch 'charlesmchen/refineNewConversationView' +|\ \ +| * | 0dfe02099 Hide new group button if user has no contacts. +| * | 47ae6ccf7 Don't show the "no contacts" mode of new conversation view again after it has been dismissed. +| * | ff89d07dd Fix presentation animation of "no contacts" mode of new conversation view. +| * | b8a7204cd Remove "refresh contacts" button; always show "new group conversation" button. +| * | 4694ae845 Ensure "close new conversation view" always works. +|/ / +* | 630fcedff [SSK] Accept arbitrary incoming attachments. +* | 3114ea32d Merge branch 'charlesmchen/keyboardVsAddContactToGroup' +|\ \ +| * | 210bd704e Hide keyboard when scrolling the contacts list in new/edit group view. +|/ / +* | 3f110dc82 Merge branch 'charlesmchen/debugUI' +|\ \ +| * | 77a775bbc Respond to CR. +| * | 6b8d4ea7a Sketch out debug UI. +|/ / +* | 00e88fefb Merge branch 'charlesmchen/failedAttachmentDownloads' +|\ \ +| * | 32d856ff2 [SSK] Improve handling of incomplete and failed attachment downloads. +| * | 3cb02fcd6 Improve handling of incomplete and failed attachment downloads. +| * | 8a9206d7e Improve handling of incomplete and failed attachment downloads. +|/ / +* | 5250d327e [SSK] Remove RedPhone code. +* | 5993f680c Merge branch 'charlesmchen/removeRedPhoneCode' +|\ \ +| * | faf75e25c [SSK] Remove RedPhone code. +| * | 74f939b52 Remove RedPhone code. +| * | 9db33a965 Remove RedPhone code. +|/ / +* | 919795559 Merge pull request #1908 from WhisperSystems/mkirk/fix-test +|\ \ +| |/ +|/| +| * 4b52a90c8 Fix test +|/ +* 3957020e0 (tag: 2.9.1.0) bump version +* d87492bf6 sync translations +* 8ad36cf7f Merge branch 'charlesmchen/alreadyHaveAnAccountL10N' +|\ +| * 06ed55225 Fix translation of “already have an account?” button. +|/ +* 1862ef441 Merge branch 'charlesmchen/sharpAppIcon' +|\ +| * 90038e928 Sharpen the app icon. +| * 3cb545eb0 Sharpen the app icon. +|/ +* 325ede770 Merge branch 'charlesmchen/noCallKitPrivacyOniOS9' +|\ +| * 3fcdffb91 Only enforce CallKit privacy for missed calls if CallKit is present. +|/ +* e11381ffd Merge branch 'charlesmchen/uploadProgressTweaks' +|\ +| * 36ea27347 Slightly tweak the appearance of the attachment upload progress bar. +| * 26371499d Slightly tweak the appearance of the attachment upload progress bar. +|/ +* 778d76b84 Merge branch 'charlesmchen/imageAttachmentQuality' +|\ +| * e5024cfe7 Raise max GIF file size and default image upload quality. +|/ +* d8851ee52 Merge branch 'charlesmchen/copyImagesOniOS9' +|\ +| * e031e3c38 Respond to CR. +| * 7aef297a2 Cleanup copy to pasteboard of video and audio. +| * 86abb43c3 Copy images to pasteboard as data, not UIImage. +|/ +* 7a7cc34cd Merge branch 'charlesmchen/attachmentErrors' +|\ +| * 21766732d Respond to CR. +| * b90416f47 Show alerts with relevant error messages when attachment-related errors occur. +|/ +* 00a29dea4 [SSK] Filter out country codes properly. +* 3050fe794 Merge branch 'charlesmchen/countryViewsInRegistrationView' +|\ +| * 1246fcd99 Rework country views in registration view. +|/ +* 23dbb7338 Merge branch 'charlesmchen/logSubmissionOfDebugLogs' +|\ +| * ca1467ef2 Respond to CR. +| * 5cab3be67 Log submission of logs. +|/ +* 8b75bd727 (tag: 2.9.0.5) bump build +* ea62e2161 [SSK] fix attachment crash on iOS9 +* f9e1b3f2e (tag: 2.9.0.4) bump build +* f29ca7851 Move PureLayout back to cocoapods for now +* 55a44c8c4 (tag: 2.9.0.3) Bump build +* f2728d461 Remember to copy PureLayout.framework +* 0c8da2865 (tag: 2.9.0.2) Fix search/replace +* 730d6419b Bump build +* 0d52a1845 Update dependencies +* 4f51dcf2e (tag: 2.9.0.1) bump build +* 84bc5b1e6 Pull latest translations +* a4fd42789 Merge branch 'charlesmchen/animatedGifUTITypes' +|\ +| * f68e40f7d Add animated gif UTI types to attachment. +|/ +* 8066cdfe6 Merge branch 'charlesmchen/incomingVideoPlayButton' +|\ +| * d320cef1a Fix play button for incoming video attachments. +|/ +* eb8d4388c [SSK] Avoid YapDatabase deadlock in OWSMessageSender. +* a61e82653 Merge branch 'mkirk/better-envelope-logging' +|\ +| * 6466e9f41 [SSK] Better logging for envelopes +|/ +* fe18cb9a3 [SSK] Use a separate sending queue for each conversation & Fix “send to self operations never complete” issue. +* 0196257ab Merge branch 'charlesmchen/stopButtons' +|\ +| * 58eb77e07 Use “stop” not “cancel” buttons. +|/ +* 2564f5306 (tag: 2.9.0.0) sync translations +* 6a573b87d bump release target +* 34831ea10 [SPK][SSK] Ensure old sessions removed when identity changes +* cebfc479f Fixup acf3a6e syntax +* acf3a6e02 Merge branch 'mkirk/fix-swipe-back' +|\ +| * ab2bfb3a6 Fix spacing of custom back button +| * c182a0596 Fix swipe-back-to-pop gesture. +| * 0a09330d3 Delete unused code +|/ +* b0b4771d6 Merge branch 'charlesmchen/removeRedPhoneCalls' +|\ +| * e724acc97 Respond to CR. +| * c6a280e00 Only initiate WebRTC calls, not RedPhone calls. +| * 814c6d250 Only initiate WebRTC calls, not RedPhone calls. +|/ +* 60ad74b47 Merge pull request #1877 from WhisperSystems/mkirk/fix-settings-not-sticking +|\ +| * 8973881d3 Fix switches for those who like to "slide" +|/ +* d76d04b8e Fixup 4814edf3d38e52051d8dd5a86d0f8ac124b8370e +* 4814edf3d Merge branch 'mkirk/filtering-high-glyph-chars' +|\ +| * 0b8152359 Clearer logging and added an assert per CR +| * 6036e2007 Filter high diacritical text, regardless of length +|/ +* 78b98a5a9 Merge pull request #1863 from WhisperSystems/mkirk/fix-end-call-freeze-and-fail +|\ +| * eb0399f04 Fix "Call failed" due to deadlock when immediately terminating call +|/ +* 11ca9b098 reference "help wanted" label +* 949a7cd9a [SSK] Further refinements to phone number parsing. +* 95de36d67 [SSK] Improve logging around decryption exceptions. +* 876485783 Merge branch 'charlesmchen/disableNewMessageAnimation' +|\ +| * 81ed04571 Disable the "scroll to new message" animation. +|/ +* fcbc709b9 Merge branch 'charlesmchen/honorPrivacyInCallNotifications' +|\ +| * b9b81ca8e Honor call privacy settings in call notifications. +|/ +* 50ad6e4f6 [SSK] Update SSK pod to reflect websocket lifecycle edge cases. +* 5797cb109 [SSK] Update SSK to reflect cancel oversize attachment downloads. +* 49da1aea1 [SSK] Only send messages on main thread +* 0a150b9bb Merge branch 'mkirk/refactor_country_code_search' +|\ +| * da32570dc [SSK] remove convoluted dependency +|/ +* 8ed10c3a9 [SSK] Don't suspend app until message sending completes. +* 55063fec6 [SSK] Serialize message sending +* 0ecbbfaef [SSK] backwards compatible attachment digests +* c39a26659 Merge pull request #1860 from WhisperSystems/mkirk/intern-pastelog +|\ +| * 42975e44e better debug log copy +| * 8adba61b3 intern Pastelog back into Signal. +* | 612339670 Merge branch 'charlesmchen/messageStateIndicators' +|\ \ +| * | 97210b407 Respond to CR. +| * | bf2db32f8 Respond to CR. +| * | 539e66558 Respond to CR. +| * | f0e7e635f Respond to CR. +| * | 9ae047a1d Add progress & disable media views while uploading attachments. +| * | 3dc7f2528 Align the message state indicators with the behavior on Android and desktop. +| * | 029ae00bb Align the message state indicators with the behavior on Android and desktop. +| * | 442546fba Align the message state indicators with the behavior on Android and desktop. +|/ / +* | 1820fdbde Merge remote-tracking branch 'origin/hotfix/2.8.3' +|\ \ +| |/ +|/| +| * 47df77f38 (tag: 2.8.3.0, origin/hotfix/2.8.3) Only run "enable video calling" migration if user is registered. +| * e00449172 bump build +| * 8c81b4c82 (tag: 2.8.2.0) update translations +| * fed756936 bump build +| * aa268e36c This constructor can return nil +| * 3ee1d5568 Migrate existing users to RTC calling +| * dc422f7b0 Convert "is logging enabled" methods to class methods so that they can safely be used before Environment has been initialized. +* | c88f275c9 Merge branch 'charlesmchen/fixCameraAttachments' +|\ \ +| * | b9705cfe0 Fix sending attachments from the camera. +|/ / +* | 1e3f0fffe Invert logging condition. (#1855) +* | 22aa1d535 Merge branch 'feature/fixFilterCallingCodes' +|\ \ +| * | a264d9aa9 Responding to CR. +| * | a226a4a1b Respond to CR. +| * | e5fdaa132 Fix filtering of country codes in registration flow. +|/ / +* | be36d2ebf Merge branch 'charlesmchen/limitOutgoingMessageSize' +|\ \ +| * | 344074617 Respond to CR. +| * | e6e4290fa Limit size of outgoing text messages. +|/ / +* | 04a112aac Merge branch 'charlesmchen/nonUSNonContactSearch' +|\ \ +| * | 099386037 [SSK] Update SSK pod to reflect corresponding changes. +| * | 82179c6d4 Respond to CR. +| * | 3048a0146 Fix non-contact lookup for non-US users. +|/ / +* | 3413bcce2 Merge pull request #1853 from WhisperSystems/mkirk/zxing-framework +|\ \ +| * | 6a4c6915a Update build instructions +| * | 99c982fbb change ZXing to framework for faster incremental compiles in xcode +|/ / +* | c68bfac71 [SSK] Update SSK pod to fix build break. +* | 3db786797 update dependencies +* | 62073a14a Maintain AR when scaling avatar +* | 861e074c1 clarify call integration copy +* | 04034df1f Merge branch 'charlesmchen/videoAttachmentUploadAssert' +|\ \ +| * | 19aac08be Fix thread-safety assert when sending video attachments. +|/ / +* | e7639bbdb Merge branch 'charlesmchen/groupNameUpdates' +|\ \ +| * | 5a130703f Update conversation view title when group name changes. +| * | 081956c2b Update conversation view title when group name changes. +|/ / +* | ec06cf76e Merge branch 'charlesmchen/paste' +|\ \ +| * | 1c95eb5d5 Respond to CR. +| * | 43857a4c7 Respond to CR. +| * | 68838dbaa Respond to CR. +| * | bcf43683f Respond to CR. +| * | 58e273b1a Respond to CR. +| * | bdc729ad2 Respond to CR. +| * | 164db41c2 Move TSImageQuality enum. +| * | 27b515ea4 Add AttachmentApprovalViewController. +| * | cd928cd9b Update MessagesViewController to use SignalAttachment. +| * | 7f2810af3 Update MessagesViewController to use SignalAttachment. +| * | ec595f53d Gather attachment-related logic in SignalAttachment class. +|/ / +* | 58f1a71ce Separate safety number camera image into a separate image view so it can be properly centered. +* | bc1b2fe47 Restrict default avatars to alphanumeric initials (#1519) (#1563) +* | 9178b69f9 Issue1602 + small bug fix FREEBIE (#1799) +* | 153d4addb requestAccessForMediaType completionHandler to be called in UI thread. This leads to inconsistent behaviour once the permission is given +* | ad4ffae16 Merge branch 'mkirk/attachment-digest' +|\ \ +| * | d8c4558c8 [SSK] Attachment digests +|/ / +* | afbbe769a Merge branch 'charlesmchen/fixLoggingPreference' +|\ \ +| |/ +|/| +| * 15e14a9b5 Convert "is logging enabled" methods to class methods so that they can safely be used before Environment has been initialized. +|/ +* fb474a2a1 (tag: 2.8.1.0) Bump version +* 3b1c5214c (tag: 2.8.0.6) pull latest translations +* 28bcf0fc3 bump build +* 3e651fb8d filter undisplayable text +* a9b722ae1 (tag: 2.8.0.5) bump build +* 6e4657162 Fix type error, cast to proper type +* 5ec8a24d3 Turn off screen when held to ear +* 61a3765cf (tag: 2.8.0.4) bump build +* e3eca4db7 stop videoCapture until video track is enabled to save some battery +* 337c40881 (tag: 2.8.0.3) pull latest translations +* 3cfcdb8ab Bump build +* a26afdbca Refine icons and spacing. +* f9cb5d424 (tag: 2.8.0.2) bump build +* 8f7e0a8a5 [SSK] Fix crash-on-launch for older installs +* 505aaa379 tweak copy +* bb9d96efc pull latest translations +* 28af9d33a (tag: 2.8.0.1) bump build +* 9f3bd84d0 Merge branch 'mkirk/upgrade-notes' +|\ +| * 9b2eb8039 Code review on new-features +| * 6aa6f4895 Combine callkit sections +| * b371e627c one-time carousel of changes +|/ +* 4983853dd Merge branch 'charlesmchen/fixCallingCodes' +|\ +| * d49d6077d Respond to CR. +| * 5db7a7935 Fix calling codes in registration flow. +|/ +* af22eb0ff Merge pull request #1817 from WhisperSystems/mkirk/fix-tests +|\ +| * f37b8bac0 Fix test to use updated PeerConnectionClient API +| * dc1e7263f Fix tests on CI +|/ +* a35efd3c6 Merge branch 'charlesmchen/callSettingsNag' +|\ +| * e96692d70 Respond to CR. +| * 012dd3d19 Add “nag” to call settings view that prods the user to change their privacy settings after calls. +|/ +* 90b6789b2 Merge branch 'charlesmchen/fixNewConversationBackButton' +|\ +| * ad3b3f924 Respond to CR. +| * 5d60b7caa Fix back button in “new conversation” view. +|/ +* f65f9c318 Merge branch 'charlesmchen/fixBuildBreak' +|\ +| * c1aea91d1 Fix build break. +|/ +* b5403175f Call sounds - connecting, outgoing ring, busy sound. +* f1adfb4dc Merge branch 'charlesmchen/callkitPrivacy' +|\ +| * 4515b7fbc Respond to CR. +| * a20a21867 Respond to CR. +| * c35c118dc Respond to CR. +| * 01d258207 Add and honor the “CallKit Privacy” setting. +| * f5004b27a Add and honor the “CallKit Privacy” setting. +| * 065d383c1 Add and honor the “CallKit Privacy” setting. +|/ +* 8104ffa12 [SSK] Dedupe incoming messages by timestamp/device +* 4b8a5f8cc TURN-only option, and for unknown caller +* 7a3da3fa6 (tag: 2.8.0.0) Bump release target +* be9725c7c [SSK] lost changes needed to fixup 'charlesmchen/webrtcByDefault' +* fa2e3a2d4 Merge branch 'charlesmchen/webrtcByDefault' +|\ +| * f4453eb99 Enable WebRTC-based audio and video calls by default. +|/ +* 4c6a23d64 Merge branch 'charlesmchen/simplifyPreKeyCheck' +|\ +| * 165e5238c Simplify the prekey check on app launch and activation. +|/ +* c2061cda9 Merge branch 'Label' +|\ +| * bf3a67344 Add accessibility labels for the Create New Group and Settings navigation bar buttons. FREEBIE. +|/ +* c46dd6b7f Merge branch 'patch-1' +|\ +| * 8fbe1d667 Fix typo in Maintaining doc - FREEBIE +|/ +* e5c6d0db9 fix potential deadlock +* 5cd1d1705 Merge branch 'charlesmchen/messagesViewNavBar' +|\ +| * a4093a5f7 Respond to CR. +| * b1744c2b4 Refine the settings button of the home view. +| * 29b30099a Refine icons sizes and layout again. +| * 353fa5754 Rework messages view's navigation bar. +|/ +* 4f02e893e Merge branch 'feature/refineRegistrationAndVerification' +|\ +| * daa87974d Respond to CR. +| * 57c60deda Further refine the registration and verification views. +|/ +* 199c56417 Merge branch 'feature/improveImageScaling' +|\ +| * 04409e0cd Improve image scaling quality. +|/ +* 2fb89ae8b Merge remote-tracking branch 'origin/release/2.7.1' +|\ +| * 927eed7a1 (tag: 2.7.1.2) Remove “beta” copy from WebRTC calling setting UI. +| * 6b2af9ca8 Bump build number to 2.7.1.2. +| * ca19cbe7e (tag: 2.7.1.1) [SSK][SPK] Avoid crashes when signed prekey lookup fails. +| * 3b5a48914 [SSK] Avoid crashes when signed prekey lookup fails. +| * 34d4d6520 Bump build number. +| * c7d08fba4 Avoid checking prekeys twice on app launch. +| * ca85fe168 (tag: 2.7.1.0) [SSK] Avoid crashes when signed prekey lookup fails. +| * cfecb0396 Update translations +| * 2b15deaa7 (origin/charlesmchen/missingPrekeys) Flush logs before submitting logs. +| * 89c7bc74c Bump version and build number. +* | 92509169a [SSK] Update SSK pod to reflect release/2.7.1. +* | c61c75112 Merge branch 'charlesmchen/sharing' +|\ \ +| * | ed0c16855 Respond to CR. +| * | 5bd44673e Add sharing of attachments. +|/ / +* | 92a56b3a8 Merge branch 'feature/messageSortingRevisited' +|\ \ +| * | 701b26418 [libPhoneNumber-iOS] update pod. +| * | 82c4ca04c [SPK] Release 2.7.1 and prekey cleanup. +| * | e27475f8a [SSK] Add “received at” timestamp to all TSMessages so that they may be sorted properly. +|/ / +* | b72a780e5 Merge branch 'charlesmchen/updatePodsAndCarthage' +|\ \ +| * | e4c3fe378 Update Cocoapods and Carthage submodule. +|/ / +* | 56df9f924 Merge branch 'charlesmchen/webRTCSettingVsDismiss' +|\ \ +| * | 5d48b126e Don’t ignore WebRTC setting changes if user dismisses settings before success. +|/ / +* | 6d4945986 Update build script path (#1768) +* | 17ed77331 Merge branch 'charlesmchen/flushLogsVsExit' +|\ \ +| * | 49ba0ff94 Flush logs before exiting the app. +|/ / +* | 8da1e1399 Merge branch 'charlesmchen/flushLogsVsSubmitLogs' +|\ \ +| * | dde8132f0 Flush logs before submitting logs. +|/ / +* | dfcfbe702 Merge branch 'charlesmchen/verificationCodeAutoFormatting' +|\ \ +| * | 6b3fabc0c Respond to CR. +| * | 1a7425d63 Fix auto-formatting and filtering issues in code verification view. +|/ / +* | 2cf3275e7 Merge branch 'charlesmchen/prekey2' +|\ \ +| * | 3c3f782e7 Clean up prekey usage. +|/ / +* | f493e0260 Merge branch 'charlesmchen/markUnsentMessages' +|\ \ +| * | c0f52d1de [SSK] Mark "attempting out" messages as "unsent" on app launch +| * | 21e55d3be Mark "attempting out" messages as "unsent" on app launch. +|/ / +* | b1f554093 Merge branch 'charlesmchen/attachmentViews' +|\ \ +| * | a52771e28 Respond to CR. +| * | e48efe01c Improve formatting of message view controller. +| * | 3b1cc0dfa Fix present & dismiss animations for video attachment view & ensure this view is cleaned up. +| * | 593c3d53d Clean up present & dismiss animations for image attachment view. +| * | 6a3b46254 Add save/copy menu to the image attachment view. +|/ / +* | df509f2d5 Merge branch 'charlesmchen/rateLimitingErrorMessage' +|\ \ +| * | fcf1d7af9 Respond to CR. +| * | 2b64d94ba Update SignalServiceKit pod. +| * | 6cf454b3b Improve rate-limiting error message in registration and code verification views. +|/ / +* | 18b8afa20 Merge branch 'feature/verifyCodeView' +|\ \ +| * | ef8735e23 Respond to CR. +| * | cf828dc1c Rework “verify code” view. +|/ / +* | 1824fd0b7 Merge branch 'charlesmchen/buildInstructions' +|\ \ +| |/ +|/| +| * 9e7ca5d87 Refine Carthage instructions. +| * f02d32595 Update the Carthage submodule. +| * 12dabd004 Refine Carthage instructions. +| * 602fbcfb8 Slightly revise Carthage build instructions. +| * 98a57d69c Revert "Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md." +| * 13647bab3 Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md. +|/ +* 2791b9551 (tag: 2.7.0.10) bump build +* 4a8cfde6b Sync translations +* 2789edbdb Merge branch 'feature/prekeys_' +|\ +| * 97001018a Clean up prekey logic. +|/ +* 35728b283 Merge commit '8b3b2836128a7244822fe4204a0e26139f8b140a' +|\ +| * 8b3b28361 Update Carthage submodule. +|/ +* 2675a724c (tag: 2.7.0.9) [SSK] avoid intermittent YAP deadlock when receiving message +* da2cb228a bump build +* b3ce70554 (tag: 2.7.0.8) sync translations +* 447590ac0 bump build +* e79896430 Update SignalServiceKit pod. +* 84d988a01 Merge branch 'charlesmchen/callStatusMessages' +|\ +| * dea37b422 Respond to CR. +| * 06a775b41 Improve the call status messages in conversation view. +|/ +* 8e2ac368a Update SignalServiceKit pod. +* 3ab65a2c8 Prevent CallKit timeout when placing outgoing call +* 6cdf13ea5 Only time out the intended call +* 6d757d3a5 Merge branch 'charlesmchen/contactsViewsVsContactsUpdates' +|\ +| * 192264e45 Respond to CR. +| * adfbcc3e2 Update views that show contacts to reflect updates. +|/ +* c087c56b0 Fix call timeout +* 31378d4d9 (tag: 2.7.0.7) sync translations +* b82584f22 bump build +* 420d71758 [SSK] log when messages are marked as read locally +* 34e4650c4 Merge branch 'mkirk/timeout-outgoing-call' +|\ +| * 2f6bf0e55 Code cleanup per CR +| * 108720c2e End outgoing call with "No Answer" after 2 minutes +| * 59059bc06 Remove unused code +|/ +* bf1ed9a27 Don't show callkit description pre-iOS10 (#1722) +* 633e4a157 (tag: 2.7.0.6) sync latest translations +* c3971934f bump build +* 4bc4fc457 Merge branch 'charlesmchen/intersitialCallView' +|\ +| * 734dec12e Respond to CR. +| * c43063e1d Add “interstitial call view” that is shown during lengthy “webrtc supported” check. +|/ +* ea57b4849 Merge branch 'charlesmchen/inboxUnreadCountLayout' +|\ +| * fc6035e3f Fix layout issue with inbox unread count on home view. +|/ +* c621e3a00 [SSK] Missed calls increment unread counter +* dc9ffe40e Better translation comments +* 3349ac9a1 Merge branch 'charlesmchen/preventDeviceLockDuringCall' +|\ +| * ce9d9befb Prevent device lock during calls. +|/ +* d1683acdd Merge branch 'charlesmchen/fixRemoteVideoBadFrames' +|\ +| * 7eeac0c6f Fix bad frames in remote video. +|/ +* 6e7c18bbd (tag: 2.7.0.5) sync translations +* 31abe1178 bump build +* 730cc5053 Merge branch 'charlesmchen/refineCallIcons' +|\ +| * c6a55ee2a Refine video icons. +|/ +* 52a191b15 Merge branch 'charlesmchen/messagesFromMeAreAlreadyAutoRead' +|\ +| * 72ef6e600 Update SSK to reflect charlesmchen/messagesFromMeAreAlreadyAutoRead. +|/ +* b8711f9ab contact can be nil for outgoing redphone call +* 82a7ec128 Merge branch 'charlesmchen/labelSignalCallsAsSuch' +|\ +| * 80963d88f Respond to CR. Remove colon from call view status prefix. +| * 9a08449d8 Add “signal” copy to call view. +|/ +* 167e94e57 Merge branch 'charlesmchen/threadSafety5' +|\ +| * 217866c58 Respond to CR. +| * 228b0e7dc Synchronize access to remoteVideoTrack. +|/ +* 828771b13 Merge branch 'charlesmchen/callThreadSafety4_' +|\ +| * ca76ec6f3 Respond to CR. +| * 6f3a45ff8 Avoid crashes when deallocating remote video tracks. +| * 4ae786d0a Ignore CallService events related to obsolete calls. +| * d9bcd563b Avoid possible deadlock in PeerConnectionClient. +|/ +* b7fd7d768 (tag: 2.7.0.4) bump build +* 47fdc1f87 Merge branch 'charlesmchen/fixBusyLogic' +|\ +| * 8f6483e9b Fix bug in the busy logic. +|/ +* ef3df49fd (tag: 2.7.0.3) bump build +* dafa52533 Merge branch 'charlesmchen/callAudioObservation' +|\ +| * 17fe3f66c Ensure audio service observation of call is always correctly wired up. +|/ +* 007d9aca7 (tag: 2.7.0.2) Latest translations +* ed5e4d3c8 bump build +* e55a5b667 Merge branch 'charlesmchen/unhideCallViewOnActivation' +|\ +| * b883b5c54 Show hidden call view controls when app reactivates. +|/ +* ef5c2c541 Only show CallKit footer when showing the CallKit cell +* 90388ebd6 Coordinate "busy" state across redphone and webrtc +* c4a677a0b Fix: Second call fails +* 091052185 Merge branch 'charlesmchen/systemGesturesVsVideoControls' +|\ +| * e34d52962 Prevent system edge swipe gestures from showing/hiding call controls. +|/ +* 61e35f121 Merge branch 'charlesmchen/callKitVsWebRTC' +|\ +| * 53cb36e53 Callkit option should only be visible when "Video Call (Beta)" is enabled. +|/ +* 05f123c5e Fix ongoing call check in OutboundCallInitiator. +* cff3daa82 Merge branch 'feature/handleINStartVideoCallIntent' +|\ +| * d7e434eb0 Modify OutboundCallInitiator to abort if there is an ongoing RedPhone or WebRTC call. +| * d7138b6c8 Respond to CR. +| * 660ff056e Modify handling of INStartVideoCallIntent and INStartAudioCallIntent if there already is an ongoing WebRTC or RedPhone call. +|/ +* a38a3318a Merge branch 'charlesmchen/simulataneousCalls2' +|\ +| * 581ba937f Respond to CR. +| * 52ba5c132 Don’t assert when two devices call each other simultaneously. +|/ +* 2d6851743 Merge branch 'charlesmchen/callThreadSafety3' +|\ +| * 6e390d40b Respond to CR. +| * 732144c9e Respond to CR. +| * 98caeb6a0 Be even more cautious when tearing down a PeerConnectionClient. +|/ +* a328759f0 Don't crash when incoming call on NonCallKit iOS10 +* 43e7defa2 Stop any lingering audio session if provider resets. +* 2216dc8d3 Revert "revert WebRTC related changes to AppAudioManager" +* 8b45ac223 Merge branch 'feature/nonContactConversations' +|\ +| * 4f9ce0c0e Respond to CR. +| * f9c20a36a Clean up ahead of PR. +| * 26b3be4ec Improve "new conversation" view. +| * 3ae85ce2d Add button to start a new conversation with non-contact based on phone number in search field. +|/ +* 0a95dac61 (tag: 2.7.0.1) pull latest translations +* 158fe78ae bump build +* a6b555591 fixup, return nil, not 0 +* 2a9aa4c85 users can opt out of CallKit +* d8df4b9e3 Can receive calls while in settings +* f864207d4 Merge branch 'feature/simultaneousCalls' +|\ +| * 568792551 Prevent simultaneous incoming and outgoing calls from leaving CallService in a bad state. +|/ +* 19aa4b5b8 Merge branch 'charlesmchen/webrtc/busySignal' +|\ +| * 089393048 Handle “busy signal” appropriately. +|/ +* 90c5d4d23 Merge pull request #1686 from WhisperSystems/release/2.7.0 +|\ +| * 08425853c re-use shared call strings +| * a339f5256 Only touch mutable dict only main thread +| * 5d0d1b725 Already on the main thread +| * 947d34583 SSK update to include latest master (which now includes CallKit) +| * 6b4dedfef revert WebRTC related changes to AppAudioManager +| * b6f098bfa Log when receiving unknown call datachannel message +| * b868f07c3 Merge remote-tracking branch 'origin/feature/webrtc' into release/2.7.0 +| |\ +| | * a4c130366 Merge branch 'charlesmchen/webrtc/threadSafety2' into feature/webrtc +| | |\ +| | | * 36356fbff Avoid crashes when closing peer connection client. +| | | * dacb2840f Avoid crashes when closing peer connection client. +| | | * f81feca2d Avoid crashes when closing peer connection client. +| | | * 535770a92 Avoid crashes when closing peer connection client. +| | | * 4dec1e2de Avoid crashes when closing peer connection client. +| | |/ +| * | 736141827 (tag: 2.7.0.0) Merge remote-tracking branch 'origin/master' into feature/webrtc +| |\ \ +| |/ / +|/| | +* | | feb5a9ed3 (tag: 2.6.15.0) [SSK] fix crash when messaging newly unregistered +* | | f9497240e bump release target +* | | 20e037ad8 (tag: 2.6.14.1) bump build +* | | ff7ae4f81 [SSK] Disable resetting unreadable storage (#1643) +| * | e272684ea Merge branch 'mkirk/webrtc/call-activity-2' into feature/webrtc +| |\ \ +| | |/ +| |/| +| | * cd36123bf rename method to better reflect how its used +| | * 7e825648e Show alert when trying to call a non-signal contact from Contacts. +| | * b35c20a06 Don't handle intents pre iOS10. +| | * 17b89f44a share global callUIAdapter, outboundCallInitiator +| | * bbfd9ba74 Place Signal/Redphone calls from system contacts +| |/ +| * 724a1c9b2 Merge branch 'charlesmchen/webrtc/threadSafety_' into feature/webrtc +| |\ +| | * d4ba4c446 Respond to CR. +| | * b415b6142 Respond to CR, mainly by fixing broken tests. +| | * 49bb3d942 Clean up ahead of PR. +| | * d294557bd Rework concurrency in the signaling logic. +| | * dd374afda Rework concurrency in the signaling logic. +| | * d6c849eab Revert whitespace changes. +| | * af289145b Rework concurrency in the signaling logic. +| |/ +| * 592906129 Merge branch 'charlesmchen/webrtc/audioMode' into feature/webrtc +| |\ +| | * d0b2aaac2 Specify AVAudioSession modes for calls. +| |/ +| * f1d843486 More space for non-callkit incoming call buttons (#1660) +| * 9e3f32a39 Merge branch 'charlesmchen/webrtc/logReconnect' into feature/webrtc +| |\ +| | * 8454c7dc2 Log reconnect events as such. +| |/ +| * 60c67793a Merge branch 'charlesmchen/webrtc/connectedSpeakerphone' into feature/webrtc +| |\ +| | * 5dd465567 Ensure audio state when call connects. +| |/ +| * 10eb4beb0 Merge branch 'feature/hardResetGitScript' into feature/webrtc +| |\ +| | * a5cb9b11e Hard reset git script. +| |/ +| * faf1946ba Merge branch 'charlesmchen/webrtc/webrtcVsCarthage' into feature/webrtc +| |\ +| | * 5232899b1 Update Carthage to reflect WebRTC release build. +| |/ +| * 47c2b0380 Merge branch 'charlesmchen/webrtc/textShadows' into feature/webrtc +| |\ +| | * b5aab6098 Respond to CR. +| | * e947276f7 Add drop shadows to text in call view. +| |/ +| * 8aca1b87d Merge branch 'charlesmchen/webrtc/disableLocalVideoInBackground' into feature/webrtc +| |\ +| | * 40b3d038d Disable local video in background. +| |/ +| * ae1a97196 Merge pull request #1658 from WhisperSystems/mkirk/webrtc/call-mux +| |\ +| | * 141a1bd17 Disable half-working call-holding feature all together +| | * 969b73cad Implement call holding (call swapping still broken). +| | * e425d351c WIP: incoming non-signal call while in outgoing signal call +| |/ +| * 08a0853bd Merge branch 'charlesmchen/webrtc/videoRefinements_' into feature/webrtc +| |\ +| | * c8e588408 Respond to CR. +| | * 9a0a7bb6b Show alert when user tries to activate local video without camera permissions. +| | * da53368bc Show alert when user tries to activate local video without camera permissions. +| | * 2ef80e569 Improve thread safety in call ui adapter and adatapees. +| | * 50addfa4e Remove camera constraints. +| | * 6ce33381a Prevent screen from dimming or device from locking during video call. +| |/ +| * 410d5fbf7 Merge branch 'charlesmchen/webrtc/reworkVideoControls' into feature/webrtc +| |\ +| | * 40d794412 Respond to CR. +| | * 9e34f87f0 Fix issues around how remote/local video states affect call view. +| |/ +| * 344692306 Merge branch 'feature/hideVideoControls' into feature/webrtc +| |\ +| | * 699b364ec Show/hide call view controls in remote video mode if user taps screen. +| |/ +| * 459d0d601 Working around a bizarre crash on iOS 9 +| * fff061ff3 Make sure WebRTC preferences are synced *every* call +| * a29e3674c Merge branch 'charlesmchen/webrtc/video5' into feature/webrtc +| |\ +| | * fe140b0da Updated the button icons in the call view’s “remote video” mode. +| |/ +| * 2a4170a32 Merge branch 'charlesmchen/webrtc/video4' into feature/webrtc +| |\ +| | * bc00b8778 Reply to CR. +| | * 9c3ecbc77 Clean up ahead of PR. +| | * d560aa022 Reworked call view’s remote video mode. +| |/ +| * e2d6c574d Fix guard syntax. +| * bba1f05dc Merge branch 'charlesmchen/webrtc/video3' into feature/webrtc +| |\ +| | * 204aeab69 Respond to CR. +| | * ec1f77c63 Polish video calls. +| |/ +| * 8bdf03fa7 Merge branch 'charlesmchen/webrtc/video2_' into feature/webrtc +| |\ +| | * 48ca4fe86 Respond to CR. +| | * 0c7f183ac Respond to CR. +| | * a65d3b7c4 Add video-related views. +| |/ +| * e556a369b Include missing files to fix tests +| * 814aec6cd Recover CallKit state when remote client fails to hangup +| * 6c14f2f50 Fix "Answer" from iOS9 notification doesn't init audio +| * d3e674749 Merge remote-tracking branch 'origin/master' into feature/webrtc +| |\ +| |/ +|/| +* | 1de5a51fe (tag: 2.6.14.0) Pull latest translations +* | 4e72ab92c Prevent session corruption by using a single serial queue for encrypt and decrypt +* | c4eecb24d bump release target +| * 5856e351a Respect WebRTC calling preference (#1640) +| * a6029f254 Merge remote-tracking branch 'origin/master' into feature/webrtc +| |\ +| |/ +|/| +* | 6af933c17 Merge branch 'release/2.6.13' +|\ \ +| * | c2fae986f (tag: 2.6.13.1) [SSK] better logging when we fail to get DB keys +| * | d6f2fa92a remove negative notification +| * | 907e122d6 Migrate legacy db stored logging preferences to NSUserDefaults +| * | 2355c7417 fixup condition +| * | 870fb960a Start logging earlier in app setup. +| * | d9cfb3885 bump build +| * | 9516ab110 Bail on startup if DB password is inaccessible +* | | 7ca8c0f28 Merge branch 'feature/improveAppDelegateLogging' +|\ \ \ +| |/ / +|/| | +| * | 698b91404 Elaborate logging in app delegate. +|/ / +* | 0e7083ed4 (tag: 2.6.13.0) [SSK] remove Cuba from domain fronting +* | 415593b41 (tag: 2.6.12.0) Bump version +* | be0afaf97 (tag: 2.6.11.2) bump build +* | 1645663f8 pull latest translations +* | 44c4d7744 Merge branch 'charlesmchen/fixWebsocket' +|\ \ +| | * cabd85c85 Merge branch 'mkirk/webrtc/fix-non-callkit-ringer' into feature/webrtc +| | |\ +| | | * 333fb6c60 assert on main thread +| | | * b2091431d Fix retain cycle +| | | * 87ed66211 Persist AudioService if CallViewController is dismissed +| | | * 3ee94d57d Only NonCallKit adaptee uses manual ringing +| | | * 4c23b5e23 Remove dependency on AppAudioManager +| | | * 4374e431a Respect silent switch in and out of app. +| | | * a89bde933 Respect silent-switch pre-CallKit +| | |/ +| | * e3a545108 Merge branch 'feature/disableCallKitButtons' into feature/webrtc +| | |\ +| | | * d4dbe7f44 Disable unused CallKit buttons. +| | |/ +| | * 863947149 Merge branch 'charlesmchen/webrtc/video' into feature/webrtc +| | |\ +| | | * 229d95ecb Respond to CR. +| | | * 9e739433c Start work on video. +| | |/ +| | * dbb29d7d7 Don't require recording permissions until call is ringing. +| | * ca218ebb6 update call signatures for test fakes +| | * 0797df19b Only update label on timer +| | * 7b33cbb93 Merge pull request #1600 from WhisperSystems/mkirk/webrtc/unit-test-peerconnectionclient +| | |\ +| | | * 0072ee303 Ensure a stale peerConnectionClient doesn't call any methods on the CallService +| | | * 32789bd96 Move RTCDataChannelDelegate to PeerConnectionClient +| | | * 8998853af Move RTCPeerConnectionDelegate to PeerConnectionClient +| | | * bd65dc6ba Fallback TURN servers if we can't get them from the server for some reason +| | |/ +| | * 1898b9fa1 Merge branch 'charlesmchen/fixWebsocket' into feature/webrtc +| | |\ +| | |/ +| |/| +| * | ec1601638 Update to reflect merged SSK branch. +| * | a023d02ae Respond to CR. +| * | 9c4eda54f Respond to CR. +| * | cb3f56444 Fix web socket issue. +|/ / +* | 7e715052d latest translations +* | c4581dab2 (tag: 2.6.11.1) Bump build +| * ada6da950 Fix merge. +| * ca27d10cd Merge branch 'charlesmchen/webrtc/callView4' into feature/webrtc +| |\ +| | * 1e80946a9 Add call duration to call view. +| |/ +| * 433ac2cf1 Merge branch 'charlesmchen/webrtcSetting' into feature/webrtc +| |\ +| | * 773080b11 Update SSK pod to reflect merge of corresponding charlesmchen/webrtcSetting2 branch into mkirk/webrtc. +| | * 654bdb1a8 Add WebRTC setting. +| |/ +| * 0c8893e91 Merge branch 'charlesmchen/webrtc/callView3' into feature/webrtc +| |\ +| | * 071fc4ddc Improve buttons in call view. +| |/ +| * 8be987de1 Respond to CR. +| * 1c4ebf6f6 Merge branch 'charlesmchen/webrtc/callView2' into feature/webrtc +| |\ +| | * 19633a9f6 Respond to CR. +| | * 9df5cebfc Update the call view icons and refine the layout. +| | * 92eb2f614 Update the call view icons and refine the layout. +| |/ +| * 8f8c92d65 Merge branch 'charlesmchen/webrtc/callView' into feature/webrtc +| |\ +| | * ee5682165 Respond to CR. +| | * 09c2e27e4 Respond to CR. +| | * c6de67601 Respond to CR. +| | * 4a65a8851 Rework new call view. +| |/ +| * 2119f33f8 Merge pull request #1587 from WhisperSystems/mkirk/webrtc/call-kit-mute +| |\ +| | * 469bff573 Make call delegate weak +| | * 1ed39976e make public protocol method implementations public +| | * f6e6e6b78 CallViewController only accesses CallService via the CallUIAdapter +| | * fc6da0525 remove some dead code +| | * 947a63766 Sync "mute" controls between CallKit +| |/ +| * 33db2715f Merge branch 'charlesmchen/webrtc/fontLookup' into feature/webrtc +| |\ +| | * 98e087a47 Fix font lookup on iOS before 8.2. +| |/ +| * 26a6e391b Fix pod. +| * 33eed88ec Merge branch 'charlesmchen/webrtc/flushLogs' into feature/webrtc +| |\ +| | * 740aa643b Add method to flush logs. +| |/ +| * 9265870b9 Merge branch 'charlesmchen/webrtc/buildingWebRTC' into feature/webrtc +| |\ +| | * 692429480 Respond to CR. +| | * 74ca54d78 Improve instructions on how to build WebRTC. +| |/ +| * 8d7352b42 Merge branch 'mkirk/webrtc/fix-tests' into feature/webrtc +| |\ +| | * a17873291 Fix up tests +| | * 02d36e6e6 Include built WebRTC.framework in Carthage dependencies +| |/ +| * c7449db28 remove stubbed audio manager implementation until it's clear what to do with it. +| * 9e248168b merge CallKitProviderDelegate into CallKitCallUIAdaptee +| * ce3780e44 Wip smashign providerdelgate into UIAdaptee +| * 6eecef99b Promise aware Message sender +| * f9b44c889 Added CallService documentation +| * 602a5953f respect silence switch for incoming ringing +| * 57ad7a280 cleanup +| * 647b2b37e WIP: WebRTC calling +|/ +* f01c5a198 Merge branch 'charlesmchen/databaseErrors' +|\ +| * ee63e9116 Update to reflect changes in SSK https://github.com/WhisperSystems/SignalServiceKit/pull/85. +| * 6106326b3 Update to reflect changes in SSK https://github.com/WhisperSystems/SignalServiceKit/pull/85. +|/ +* d7b27a402 Refactor ContactsPicker to show a clean search bar +* a70d5f88b Fix build break related to SignalServiceKit pod. +* 4ad4eb211 Merge branch 'charlesmchen/censorship-circumvention-2' +|\ +| * 2ce4d39f9 Respond to CR. +| * d28b73cfa Add asserts to Signal iOS .pch. +| * 2dac6c888 Update SignalServiceKit pod. +|/ +* b89e1617a (tag: 2.6.11.0) Bump release target +* 063163962 (tag: 2.6.10.2) bump build +* 9f6b26a78 pull latest translations +* a636f0b6a Redphone works on ipv6 only network +* ce18be228 (tag: 2.6.10.1) pull latest translations +* 105e9ce6d (tag: 2.6.10.0) Bump release +* 90daf60c5 Fix travis build +* ba4569f5b delete unused code +* ddba843d4 (tag: 2.6.9.4) Censorship circumvention in Egypt and UAE +* bcd371b96 (tag: 2.6.9.1) Bump build +* c4baf5a62 [SSK] Avoid bricking signal if a key is temporarily unreadable +* 94d37d9c5 Warn user about re-registering existing signal number +* c3a22d7da [SSK] Fix contact sync when no thread to self exists +* 32a05dabc [SPK] Update SignalProtocolKit (AxolotlKit) (#1549) +* 1b50f1d84 (tag: 2.6.9.0) Bump version +* 495628834 Bump up launch screen logo size on iPhone6 and larger +* 84e35bd08 (tag: 2.6.8.0) Update translations +* 727fb7080 Fix show error message when download fails +* 97500d55e Prevent iRate mechanism when handling local notifications +* 490795ea3 Make disappearing messages button visible in German (#1536) +* e7bc2e86d Show email as name when contact has no name +* 76d01863d [Invite Flow] Use email address to collate contacts when no given or family name is provided +* 89730f2b8 Improve accessibility a bit +* e2d725a04 [SSK] Ignore messages with unknown Content +* c1ab36576 Fix crash when attaching media +* 6b67dc4ef bump release target +* 359deb933 (tag: 2.6.7.4) Bump version +* 243ff190b Fix crash in group listing / new group views +* a8f37ef5c (tag: 2.6.7.3) Bump build +* 103f0450a Build avatar from contact initials even if they don't have a phone number +* 8211d4584 Don't explode when missing first name +* 753c445bf [SSK] Update libphonenumber +* e7126f8c6 Less confusing "#" avatar for unknown Contact instead of "+" +* fb508470d (tag: 2.6.7.2) Bump build +* 1dcd1830e Fix crash in group member listing +* 273b3a3ac (tag: 2.6.7.1) Update translations +* a84bff3c6 bump build +* e58de07af Prevent going to the "Background Notifications" when tapping "Notification Sounds" +* e6f0130f3 Fix peek from inbox (#1509) +* f29a0fe49 Change safety number strings to be singular +* 942353cba Fix crash on "show safety numbers" in group thread +* 5a0141003 "No Contacts" screen uses new invite flow +* 81e1ec4b9 Compare both first and last names when sorting (#1487) +* d6e974595 (tag: 2.6.7.0) Bump version +* f0461891e Convert Localizable.strings tools to UTF-8 (#1420) +* 896dd026d Remove DJWActionSheet +* f686fc9a8 Style refactor to reduce rightward drift +* ed29b154b (tag: 2.6.6.7) update translations +* f30c733ef (tag: 2.6.6.6) Custom contact picker for invite flow +* f9a60b622 (tag: 2.6.6.5) Use cleaner signal link in invite email +* 7120ca119 (tag: 2.6.6.4) Make sure we're laying out contact cell after assigning avatar +* 2bac3e428 Better fit for "delete account" button on iPhone5 +* 0aa226f3d (tag: 2.6.6.1) [SSK] If a new message type is introduced, ignore it +* 06ca3c929 Mail and Message invite flow +* bed525039 remove redunant method +* c0c71fe26 Switch back to the default keyboard after sending +* 584118a9f compare safety numbers with clipboard (#1475) +* de7752ab2 Revert 50abf4d02d2c95b11fe2248e57a571c6389f7317 +* a0dc5950f Automatically adjust message bubble text size on dynamic text changes. (#1469) +* 40c3a01b3 Update README with link to development guide +* e67af9d52 (tag: 2.6.6.0) Make settings modal. +* f1b4bd772 Prevent bogus message emission on group deletion +* 087f75397 Voiceover fix- Do not read "no messages" text when it's hidden (#1437) FREEBIE +* b40f6acd0 Voiceover fix: Message author read as thread name (#1437) FREEBIE +* 89451013d Bump build target +* 5213822e7 Update BUILDING.md +* 88d9ef987 (tag: 2.6.5.9) Share dialog for Safety Numbers +* 9b2c03793 (tag: 2.6.5.7) [SSK] explicit newlines in safety numbers +* d76f26e43 (tag: 2.6.5.6) Bump version. +* ee29fff0d (tag: 2.6.5.4) [SSK] Default to blocking changed Safety Numbers +* eb995cb38 revert to tracking longform build +* 7cae80421 (tag: 2.6.5.3) Update translations, bump build. +* f8da3132f (tag: 2.6.5.2) Bump build +* c5be8f2d8 Don't include phone number in scannable safety number QR code +* d3c2f44ae Exclude extra data detectors. +* fbcf5fbf0 Properly assign global contacts updater to environment +* ddeadafc3 Don't show own addressbook info in settings +* 7bcf5190b Address some lingering emoji cropping +* 01a3ef015 Don't show permissions pop-up until user has seen contact disclaimer (#1456) +* 3bbdd13fb (tag: 2.6.5.1) Bump version +* c2aa17e36 Changed Safety numbers no longer block communication +* 28a2a4610 Fix compiler warnings. +* 1da7b3b2c (tag: 2.6.4.14) bump build +* 368db7e55 [SSK] Only need to fetch prekey once +* 4c5bc1ed6 Fix fingerprint Label copying +* 96c5ab011 (tag: 2.6.4.12) Bump build +* 49e5b1948 Update translations +* c7a2fd30c (tag: 2.6.4.11) Bump build +* 23c80748e Hide safety numbers until you've exchanged keys +* 225c5ecfb Merge branch 'jaropawlak/master' (#1408) +|\ +| * b8fc4001e Camera permission fixup +| * c152c1c83 asking for camera permissions #1363 +|/ +* 1912fbde7 (tag: 2.6.4.10) [SSK] Send group messages as long as one recipient is found +* c401f764e (tag: 2.6.4.9) [SSK] Fix crash on messaging unregistered user +* fd8945881 Adds comment on running carthage, which is neccessary to build the project. // FREEBIE +* 79d5cf9e9 (tag: 2.6.4.7) bump version +* 1bf77e826 dismiss keyboard when showing corrupted message actionsheet +* 21d37a92e Fix crash on nil image. +* 82c903b5d (tag: 2.6.4.6) bump build +* ddf089040 Fix crash on nil message +* 157b5ef15 (tag: 2.6.4.5) Bump build +* c6a2fbff2 Tapping corrupted message opens "session reset" activity +* bd370f1de (tag: 2.6.4.4) Fix cropped Chinese/Japanese messages +* 62f9606bf Merge branch 'mkirk/fix-registration-without-background-modes#1329' +|\ +| * 78d9c97d7 Bump build and properly set version. +| * 1dd06a5e6 Fix registration flow / Keep push tokens in sync +| * f98e57e16 WIP: Fix hanging registration when background modes disabled +| * bae050480 Debug logging around call init crash. +| * 4fc526024 Don't prompt for feedback if user hasn't completed registration +* | ac996db25 Merge pull request #1407 from mdouglass/fix-issue-1270 +|\ \ +| |/ +|/| +| * baf0ea96d Fixes [UIDevice isiPhoneVersionSixOrMore] +| * 09d377f7e Unifies bubble sizes for media bubbles +| * c958c7909 Unifies bubble sizes for media bubbles +* | cc8c8d61b [SSK] Update to prevent session corruption +* | 7c6b84c46 Outgoing message sound respects Settings toggle (#1373) +* | 431a91a48 (tag: 2.6.3.15) Convert to non-decimal build numbers. +* | 61fa5756a (tag: 2.6.3.14) bump build. +* | 21ebe0db9 (tag: 2.6.3.13) bump build +* | 1eb234e8b (tag: 2.6.3.12) Attempt to fix intermittent crash in messages view controller +* | e206afdc5 (tag: 2.6.3.11) Bump build +* | 50abf4d02 [JSQMVC] Fix crash on delete when under load. +* | eded20f1f (tag: 2.6.3.10) [SSK] Don't send empty message to self after changing disappearing timer +* | f2ee006d5 (tag: 2.6.3.9) Update translations +* | 541ca3915 Partial revert of 33f6a9552058747d016a788f7de29144e598788e (#1421) +|/ +* bbfffdf79 Scanning an invalid QR code shows an error dialog +* 40d6550fc Update translations +* 560b37751 Fix intermittent crash on network status change +* 66f0f8cc9 [SSK] Better error messages when failing to send +* 84e560697 [SSK] Fix disappearing messages don't become consistent after reinstall +* 689df1be3 Handle key change in group send +* 0e345dbba Update translations +* 33f6a9552 Explain send failures for text and media messages +* 7c32259a9 We aren't using ErrorMessage/InfoMessage. (#1412) +* 722c3a5e7 Create TSOutgoingMessage with info on group change +* 802d2bfdf Revert "Create TSOutgoingMessage with info on group change" +* 8242c9e38 Create TSOutgoingMessage with info on group change +* 876b360e0 Merge pull request #1411 from WhisperSystems/update-translations +|\ +| * 15dcbbb06 re-pull translations after updating source +| * b9945b7e3 pull latest translations before updating source +| * 16a30f289 translate untranslated strings +| * 8c062f93a Refresh Localizable.strings with auto-genstrings +| * 64f4eb73c Allow autogenstrings to find all strings +| * 722356db5 script to generate and merge global .strings file +|/ +* 89ee74f13 Update SSL to 1.0.2j (#1409) +* 8bf4acd78 early boot the simulator to avoid false travis failures +* 49de77299 (tag: 2.6.2.0) Fix slow reloading conversation view. (#1397) +* 50ce28358 (tag: 2.6.1.3) Fix empty bubble when setting disappearing message timer in a thread to yourself. +* 5b0197646 (tag: 2.6.1.2) Fix hidden incoming audio +* bc9154f18 (tag: 2.6.1.1) Bump version / update translations +* 1e417ea93 (tag: 2.6.1.0) Longpress to copy safety numbers +* da82c01f6 Restart timer animation when returning from background +* 04f5c3ce2 Slow the timer animation down a bit. +* 6a4fc3168 Fix delivery shown for undelieverd disappearing messages. +* ddc8db6ac bump build +* 607262df6 Remove observers on dealloc (#1379) +* ca5ca9d0c code verification: show complete phone number +* f63cfdac7 Fixing travis +* a04b35145 Fix set timer in group thread. (#1375) +* 7661b7f40 Consistent copy with other platforms +* 185cb2493 Update translations +* 85beb93e8 Style timer changes less alarmingly. +* 89df8ddb3 Group updates can be deleted +* 07ab1bd93 Call notifications appear immediately after call +* 7106eee4a Call notifications are deletable +* 405990a7d Don't select or copy info message text. +* dc95d328c Don't expire messages until they are sent. +* 2b2ebbe09 Tweak settings design +* dc0807297 Update translations +* c0f37f812 Fix sync messages expirations in SSK +* 023e62e6a fix reused cell starts blinking too early +* 94a23021f Size error messages correctly. +* b95112356 iOS 8 Fixups +* 2edd2b8f8 set launch state correctly +* a28fea838 Fix emoji message truncation on iOS10 +* 9a9f24d8d Fix travis build +* 43a2eb9da Fix occasional crash when sending after deleting messages +* ee0cce75e Disappearing Messages +* 48336b6c5 Resetting session returns you to messages view with an indicator that your session was reset. +* 11a586a83 New Fingerprint Format +* cc2a25b18 (tag: 2.5.3.4) update translations +* 2f33e8726 Update socket rocket to get an upstream crash fix +* 8d2b38f02 Fix device listing +* 3e7e67e27 (tag: 2.5.3.3) Async migrations framework +* 3b687da0e Upgrade SSK to setup db async where possible +* 2ab695596 More logging, scrub phone numbers from file logs (#1357) +* 1433ee265 (tag: 2.5.2.2) Fix crash on boot =/ (#1349) +* 14570cb6c (tag: 2.5.1.0) bumping minor version +* 0c4f1d41b (tag: 2.5.0.20) Fix contact sync in SSK (#1345) +* 891acb163 (tag: 2.5.0.19) Bump version +* be0556f68 fix "last active" date +* 5372173c4 (tag: 2.5.0.17) Fix groups breaking without avatar (#1336) +* 720b167b3 (tag: 2.5.0.16) Fix multiple keychange errors (#1334) +* ed0655556 Merge branch 'release/2.5.0' into release/2.5.0-with-master +|\ +| * 197933817 Fix height of network status on iphone5. +| * 63513bed1 Apple now requires camera permission explanation +| * f753cfeed Fix XCode8 code signing +| * 7c6e9e07b Read receipts remove lockscreen notifications +| * f7198d5ea Don't crash when receiving read receipts after message +| * d8be0b5d2 New translations +| * 0a6402274 Must specify team for XCode 8 build +| * 90dab190f (tag: 2.5.0.8) Update SSK to send useragent upon provisioning +* | b59a0e47d Disable group header interaction (#1328) +* | 50cd4f54f verification code field: improved user experience (#1325) +* | c7ee43079 Support for receiving voice messages from android (aac) (#1321) +* | a03e1e717 Merge pull request #1320 from WhisperSystems/dt +|\ \ +| |/ +| * 5200cccbe (tag: 2.5.0.7) Update translations +| * 6bd2453d7 Fix choppy paperclip icon on iphone6 +| * 33f63e76d Fix devices icon intermittently showing +| * a595cb932 (tag: 2.5.0.5) Desktop Integration Fixups +| * 019310f28 Deselect table rows when swiping back in table views +| * 7e67fb193 Some style for the QR code scanner. +| * f28400146 (tag: 2.5.0.4) bump build +| * 7c3a07960 (tag: 2.5.0.3, tag: 2.5.0.2) Device manager fixes +| * dee26e6e0 Use PNG constant +| * 9006ff604 Multi device read receipts. +| * 428f7fca1 Adapt to nullability annotations in SignalServiceKit +| * 92290a5d4 Fix: Inbox count not updating while viewing archive +| * ef6784ed9 Device Manager +| * 84156698c Provision device from QRCode. +| * 654516119 thread is set during notification callback. +|/ +* eef200222 (tag: 2.4.2.0) Clean up settings (#1316) +* cc2d47fbd Update protocol (#1315) +* e56d41edc Otherwise we'll never run future migrations. (#1314) +* bff6e5613 Avoid collision with iOS10 SSKeychain framework (#1308) +* f8a0be4c7 Return immutable data from generateSecureRandomData:length and use OSStatus to check the status of SecRandomCopyBytes. (#1306) +* b29174a37 Merge pull request #1305 from WhisperSystems/default-screen-security +|\ +| * 9a86ca76c screen security is enabled by default +| * 58548c68c code cleanup +|/ +* 006c4ba95 Update dependencies. (#1304) +* 52861a6ef Fix incorrect GIF message bubble sizing (#1300) +* 6120bd9e8 (tag: 2.4.1.1) Orphan-data cleanup no longer causes timeout (#1303) +* 547cd9797 Improve audio waveform scrolling performance (#1292) +* 92b3ea5d2 (tag: 2.4.1.0) Re-enable attachment cleanup migration after fixing it in SSK (#1298) +* 000a5941f Delete attachment cleanup migration. +* 9f2bb5d2c Fixes lingering interactions after removing thread (#1297) +* f09af989b (tag: 2.4.0.4) 2.4 update translations (#1291) +* 73856c3e4 bump release target to 2.4.0.4 +* 147cc1510 (tag: 2.4.0.3) Input toolbar fits text size (#1290) +* bb3bda236 bump build 2.4.0.3 +* 86f06593d Fix "can't reattach saved GIF" (and others) (#1288) +* 3c2846274 Prevent crash when copying corrupted image attachment. (#1287) +* 06618c99b Merge pull request #1285 from WhisperSystems/network_error_desc +|\ +| * c4209e793 Don't use "we" in error message copy. +| * c5f6b7b7b Improved error message when network doesn’t allow to access Signal port. +|/ +* 583d3e82a Alternative solution for requiring direct taps for launching media view (#1235) (#1261) +* 29769b4b7 Don't highlight text bubble when long pressing adjacent to text bubble (#1281) +* e7affecc1 FIX: Leaving group should dismiss keyboard #1274 (#1278) +* 0455f0361 Fixes Call Error message text should adapt size to fit localized texts (#1164) (#1178) +* 97fdabf9a (tag: 2.4.0.2) Narrow the bubbles a bit. (#1269) +* 835021b0d Fix extra tall error messages by rendering timestamp (#1268) +* f205ff19f (tag: 2.4.0.1) new translations (#1265) +* b22eafc25 (tag: 2.4.0.0) Merge pull request #1264 from WhisperSystems/fix-audio-notification +|\ +| * f899cff12 Fix in-app audio +| * df63c8624 fix compiler warnings +|/ +* 68b36f707 Fix double sends in group thread when accepting keychange (#1263) +* e7d476371 Must tap directly on bubble to launch fullscreen media view (#1260) +* bd1e99026 Merge pull request #1105 from michaelkirk/fix-cannot-delete-media-messages#704 +|\ +| * 9db3b0db2 (michaelkirk/fix-cannot-delete-media-messages#704) Consistent and efficient media Delete/Copy/Save UX +| * 70197fb48 bump version to 2.4.0 +|/ +* cca4bc451 Merge pull request #1255 from WhisperSystems/update-jsqmvc +|\ +| * db3b2d443 Use upstream corner radius +| * 4ccb295db Send button disabled color and dynamically sized +| * f8d65ab0f Post JSQMVC code cleanup +| * b7dd51438 Move colors into style class +| * 1a4b38e34 Modernize init, dealloc, dicts +| * f7f1b6877 Remove unused call thumbnail code +| * e930574b1 rename our custom JSQ classes to OWS so it's clear what is/not our code. +| * 933281f23 format objc. +| * 4d320d601 Unfork JSQMessagesViewController +|/ +* 987ce5f83 bump release target to 2.3.6.0 (#1256) +* d24d54d4f small IOS9 Fixes (#1253) +* 992dbe586 (tag: 2.3.5.0) Fix crash on unknown attachment (#1249) +* cc47a6df7 Merge pull request #1248 from WhisperSystems/release-target-2.3.5 +|\ +| * 01b00e381 bump release target to 2.3.5.0 +|/ +* 385126027 Merge pull request #1247 from WhisperSystems/ios10-crash-on-attaching-media +|\ +| * 1f1920b64 Fix crash on iOS10 when attaching media +| * d4f2c0f24 ensure picker source available to prevent crash +|/ +* 1e43e139f (tag: 2.3.4.0) Get back on upstream SocketRocket (#1241) +* 2fed645c0 Merge pull request #1239 from WhisperSystems/update-translations +|\ +| * b83bcdab8 updated french and japanese translations +|/ +* e3d94db17 Merge pull request #1238 from WhisperSystems/missing-call-button +|\ +| * a181d218c extract and test contact searcher +| * 8c6bf3cba prefer properties per style +| * 1f31015d5 find phone number regardless of punctuation used in search. +| * 26f541850 Remove distinction between TS and RP users +| * 62633ff7f remove unused code +| * 1e0f0157c namespace ContactsManager -> OWSContactsManager +|/ +* b3bb4c745 Set explicit height for all media types. Audio is the only special case. (#1237) +* 87d2fe113 bump release target to 2.3.4 +* a2862757a crash reporting instructions in issue template (#1235) +* aa9908d43 Large media attachments should be compressed (#1232) +* 76352bf47 (tag: 2.3.3.0) Code Cleanup (#1229) +* 7c84c4569 Only call UI modifying observers when UI is present (#1226) +* bee7c71df Prevent freeze when swiping back twice. (#1224) +* 4a1c53f62 Access contacts atomically to avoid corruption (PR #1223) +* 8f04f863b (tag: 2.3.2.1) hide UI element must happen on main thread (#1220) +* 7fef6aeab Fix crash after deleting message (#1219) +* 965261f46 (tag: 2.3.2.0) attempt to fix intermittent SEGFAULT in SocketRocket (Maybe Fixes #1196) (#1217) +* e7f3092f0 CocoaPods 1.0 update and Travis-CI compatibility (#1216) +* 78a5355b0 (tag: 2.3.1.0) Initialize latestContacts to empty dict (#1207) +* 2565801c3 Fix new localizations (#1206) +* 50d0cd608 Improve debug log hint in issue template (#1204) +* a736e8de6 (tag: 2.3.0.7) Fixes avatar not showing for single contact thread (#1202) +* 83de0d75b (tag: 2.3.0.6) New translations (#1193) +* d7c48578a Fix invite crashing without sms (#1192) +* 9bacc3de7 (tag: 2.3.0.5) Reset compose view on thread switch (#1187) +* da6597118 Fix unable to send invite via sms (#1188) +* 4537324fe (tag: 2.3.0.4) Mark encryption as exempt, per Moxie's instruction. (#1173) +* 496f8117f Update translations (#1172) +* 7f022404d [UI] smaller group action menu icon, revert edit divider to neutral color (#1169) +* b7813bdc9 OpenSSL dependency update. (#1167) +* 5286c032c reset "Load Earlier Messages" when switching threads (#1163) +* f05429b59 (tag: 2.3.0.3) Prevent skewed group image (fixes #756) (#1159) +* 752b0feca Bloom filter migration: check for file before deleting (#1147) +* 9f572881f * Cache cleaning uses YAP notificationsThis way we don't have to worry about cleaning the cache explicitlywhen we do destructive actions.// FREEBIE +* 95ab3d677 must *always* be in main thread when dismissing view controller. (#1114) +* 5869fb8e0 Fix ability to attach photos from camera (#1112) +* c0bb704d2 Cache instantiated interactions (#1152) +* 7d8292fd5 show alert must happen in main thread (#1119) +* 9d4befd08 bump up travis timeout for pod install (#1148) +* fc494d735 Merge pull request #1140 from michaelkirk/fix-screen-protection-image +* 288ee04a1 Merge pull request #1139 from WhisperSystems/backlog +|\ +| * 199ce4926 Fix smooshed launch image on iphone 6 by using storyboard instead of static launch image +| * 721ed066f Fixes This class is not key value coding-compliant for the key "keyPath" +| * 4f38e70a0 Add templates for issues and pull requests +| * 72e1180e1 Removing unused didReceiveMemoryWarning methods from view controllers. +| * 6f1ae778b Update README.md +|/ +* 8abfc3e2b Merge pull request #1138 from WhisperSystems/test_branch +|\ +| * 4034baedb Adapting to renaming. +| * 5ff06afe1 Update dependencies. +| * f44393bb7 Re-introduces the delete action. +| * 91d7ca2f5 Remove reference to + button, which was removed in #950. Fixes #1080 Closes #1092 //FREEBIE +| * b80989032 Fix unused_string.py uses python interpreter. +|/ +* bd377e65a Network Signal and deactivate account row don't highlight. Related #1026 +* 2c83046ff Closes #990. +* 1b02e186f Fixes #146 #147. +* 975cda312 Adding missing queue test. +* a7ec383a7 Fixes #984 Fixes #948. +* 0c1a97a74 Some nits & add corner rounding to the message text box. +* da97349d4 Add subtitle to Screen Security setting to explain its function. +* 489407c46 Closes #1021 #977 #980 +* 3acc47d6a Fixes #832 +* c6d44e59e TextSecureKit Refactoring - Using same clang format file for old and new files. - Moving out all TextSecure code to allow other clients (OS X, iOS) to integrate easily TextSecure functionality. - Use TextSecure API to signup. +* 37b582bed Adding support for animated gifs +* 25293fd40 Fixes #957. +* 53793e3c0 Fixes #950 +* 26f9207ca Bye Bye Bloomfilters +* ab8690799 Merge pull request #900 from big-r81/master +|\ +| * 0c9da220b Showing BitHub price in README.md +* | 861e3d626 (tag: 2.2) Fixes #930 +* | b70be4d55 Fixing bug with reused label appearing bold. +* | 5e4a76622 Fixing Travis configuration. +* | d33c80ddd Pulling in latest translations. +* | 777e7e16f 3D Touch: Quick Compose +* | 0fd9acfb2 Phone emoji +* | c4dcb5f80 Fixes #907 +* | 087b7c38d S3 ATS Policy +* | a29eb5470 Attachment type in notification and description. +* | ef6e658c3 Performance updates & smarter layout (2 lines) +* | 047262b95 Fixing typo in restrictions string. +* | 3d4d4123f Removing APNavigation as a dependency. +* | 8189e593e Fixes glitching of inbox label when coming back from background. +* | 1affdbb32 Closes #891 +* | e98a6217f TLS 1.2 on signaling tcp. +* | 0ad55853f Adding staging environment. +* | bbde7cd2a iOS 9 Support +* | 33428d45f Supporting diffing of localizablestrings. +|/ +* eb94a1114 Fixing issue with message ordering. +* f2e58de16 (tag: 2.1.3) Bump up version number & fetch latest translations. +* c95f19014 Require AddressBook permission. +* 0090030f3 Adding rating code +* 2d5d8db72 Fixes #871 +* ada07351e Support for `supportsVOIP` attribute. +* f0eada265 Merge pull request #877 from orta/stop_spinner +|\ +| * 0ab32b80d Stop the spinner when registration fails on a RegistrationVC +|/ +* c4bf4a8f5 Preliminary iOS9 support and upgrading to CocoaLumberjack 2.0 +* f6c0625c2 Removing unused imported classes. +* e7328bd67 Upgrading cert pinning & flagging release. +* 07abcaf7d Register extra keying material at registration. +* 28dae649d Upgrading OpenSSL to 1.0.2d. //FREEBIE +* 040e4c750 Removing literals and self within block. +* 485748068 Checking the result of SecRandomCopyBytes +* 02560f8b2 (tag: 2.1.1) Flagging release. +* 2fc20702d Fixing crash on responding to phone call. +* 7acd8fff2 Fixing memory issue with allocation of the socket status view. +* 4c96ea1c9 Fixes crash on launch for unregistered users who updated. +* a4014c6ad Upgrading AxolotlKit +* b329062e0 Open SSL 1.0.2c //FREEBIE +* fd3e75b51 (tag: 2.1) Bumping up version number & pulling localizations +* 08e3b31ee Recipient's name in group key conflict on send. +* 912b617a1 Support for Mismatched Devices. +* cd0fb8bc5 Fixing graphical glitch in tread with images. +* 57f86008d UX and Notifications fixes - Removes large confusing UX bar and related assets. Replaced with UISwitch. - Enhanced user experience for missed calls. - Fixes issue where missed call would appear as incoming call in call log. - Fixing issues where PushKit handler not called on launch. +* 93de0a432 UX improvements in how failed messages can be resent. +* ab824b469 Fixing Travis now that it supports SDK8.3 More information at http://blog.travis-ci.com/2015-05-26-xcode-63-beta-general-availability/ +* d347df9a4 App Icon: shift speech bubble up to improve visual alignment +* b1b936e43 Bumping up version number - Upgrading dependencies. - Fetching latest localizations. +* bb1a4c180 Addressing issues with managing socket connections in background. +* 0f04132b8 Bumping up version number +* 0f4529422 Reliability enhancements for notifications. +* 0f57804ee Enable data selectors. +* 61ab11d45 Fixes #775. +* 1550c6121 Addressing issues with background decryption. - Simplifying background timeout strategy for reliabilty. - Adding Notifications settings. - Dropping support for VOIP Push < 8.2 because buggy. +* 2d41a3e25 Permissions dialog description. +* 9652584ad Upgrading dependencies. +* e47e9759e Fixing leaky caches. +* 89dd9efe0 Fixing call message errors. +* 13448bdb2 Notifications enhancements. +* 80b1f2cbc Update CONTRIBUTING.md +* abc63eca2 Fixes issues with registration in iOS simulator. +* dceb1c997 Bump up version number, pull localizations and dependencies +* c6cdbea89 Fixes #761 +* d12c5b308 Fixes #680 +* 8e8ad7668 (tag: 2.0.2) Bump up version number and new localizations +* 788aa8cb4 Dropping some required permissions. Smarter microphone permission. +* 7a5f9f141 Remove initialization on MIMETypeUtil +* 1f61291e0 Addresses some performance issues on loading from database. +* 82a9029c3 Fixes #713 +* fa1791a4d Show phone number instead of "Unknown Caller" in call view. +* 0c93679a3 Fixes #709 +* 5dd8c4747 Fixes #578 +* 9bf5518f6 Fixes #724 +* 099bea05b OpenSSL 1.0.2a +* 8e48c596b Fixes #244 +* e8ea00d71 Perform contact intersection on AddressBook change. +* 0d97edf7a Fixes #673 +* 9c611fad7 Fixes #725 +* ea3789484 Fixes #708 +* a1d0b6b1a Lets user select country by country code. +* ff82f60e0 Fixes #674 +* b3a4a2021 (tag: 2.0.1) Tuning WebSocket heart beat to 30s. +* 5aa560c0e Updating translations for 2.0.1-2 release. +* b6ef5f0b7 Bloomfilter moves to Cache folder +* 50fa491c7 Fixes #620 +* 4873b9538 Bumping up release number to 2.0.1 +* a2f20de41 Code cleanup. +* ee62cbdf2 Fixes #404 +* daac2c0db Fixes #566 +* 7aad5c597 Fixing UX issue with unsynchronized clocks. +* 456d1c479 Fixes #530 +* 212f0d435 Fixes #611 +* 763d56c5d Fixes #613 +* d4e7096e8 Fixes #609 +* c1a2f006b (tag: 2.0) Fixes bug spotted by @jlund with the unread count. +* 24616735e Fixing issue when migration closed and re-opened. +* 311a758d2 Preparing release +* 3ade70804 Fixes based on corbett and abolishme's feedback +* 796882105 Fixing Storyboard warnings. +* 9872bed42 Addressing some storage related fixes. +* 1ede61f27 Localizing the TextSecure component of Signal. +* ae5410fa6 Making sure that registrationID > 0. +* b37683c0e Fixed positioning of "+" on group create screen. +* c5970bfa3 Updating licenses of dependencies. +* 19ca10d43 Allows retry of failed downloads. +* 9569a9b9c Multiple visual enhancements and repo cleanup. +* 23187ec73 New Conversation icon should be a plus (see new_conversation_icon). +* 1befa9861 Should use new Inbox and Archive icons +* be6c412cd Navigation bar hidden upon connection completed. +* d912471a9 Settings and Empty States of the 98 issues list. +* 720177f92 New ringtone. +* 414c44df8 Closes #590 - New Conversation Iconography. +* 667cc983e Closes #589 - Enhancements conversation view. +* 3112bd9a1 Design enhancements, part of #577 +* d70a9403b Empty states. +* 70248837e New avatar placeholders. +* dfdd0a197 Support for `remoteRegistrationId`. +* cbc7a59a5 Tapping signal icon should return user to last conversations mode. Closes #580. +* b80f99b8a Cleanup iconography & fixes #582 +* d6fd2ff61 Fixes #584 #585 #586 +* 5118575d3 Fixing issue with provisioning profiles. +* bbc4e3648 Closes #575 +* 724268046 (tag: 2.0_beta_31_01_2015) Contact ordering and graying out RedPhone-only users. +* 8a5c5efd7 Group avatar relationship for deletion. +* 585079de2 Fixes #553 +* 4833487e9 Removing call recorder + contacts refresh +* 3f81385c2 Resetting status bar to white. +* a6976bac1 Migrations from 1.0.x and 2.0 beta. +* b7d65ce92 Designing the empty state during contact refresh. +* af3cf2520 Support for various screen sizes. +* 0e201939b Updated iTunes artwork +* 6a1a78570 Fixed spacing on inbox number in icon +* 1d1a140d6 Addressing UI issues. +* 1bbfbd428 Replacing Twitter icon with brand guidelines one. +* cf4a12618 Better phone number parsing for SMS. +* 5e92fdbbb Pinning upstream cert. +* 797492fc1 Various enhancements to the groups. +* f0ac231b7 Setting status bars to white as completion of all modal presentations. +* f5848365f Deliberate handling of MIME types for video, audio, and images. +* 994c9d1c5 Attachment with caption fixes. +* 019550701 Removing unused ContactsTableViewController. +* a389344e0 Fixing issue with identity key change messages deletion. +* 499cdfa56 Re-enables user interaction with navbar when view appears. +* 826b73051 Multiple constraints updates & addressing warnings. +* 553a38288 Archiving and correctly sorting empty threads. +* aca02221b Various design and UI consistency improvements. +* 6278152ad New round of iconography. +* 884c96079 Closes #319 +* fb0281fd6 Exclude Signal files from backup & encrypt when possible. +* bcd98f90e Closes #263 +* 529c1346f Closes #303 +* 638dfae66 messaging view and group creation fixes: +* d84ac5a49 New iconography +* 8fa1be362 Contacts table view reloading on contact refresh complete. +* 7f97d84eb Delivery receipts working +* 6d2acb70f in message view compose, ability to call +* 2d6b15333 Replaced all iconography and added new icons +* 91591545a Support for calls & groups in new blue styled format. +* a9ad6643a Close #509 +* 5ccbc4131 Closes #315 +* 478110dc8 Allows unregistering of RedPhone. +* 349d84c87 Vectorial Signal header icon. +* 7d5154b10 Dismiss search bar when new group is created. +* bfe0e44cd Audio attachments: Prevent progress to be set to NaN. +* 0e1a51e88 Fixed empty group avatar issue. +* bf11775e1 Fullscreen image attachment menu. +* 86c524ddb Fixing crashes when deleting single messages. +* 1eef08628 Audio attachments UI +* d740f801c Swipe to delete implemented +* b494b71db Audio farts. +* ccdc4b5d1 Redesign implementation. +* bfd710a9e Upgrading to OpenSSL 1.0.2. +* 84dbc6a45 Closes issue #277 - Fixed speakerphone bug. +* 4f506e670 Merge pull request #382 from jackflips/contributing +|\ +| * 9e3bc8199 added optout message +| * de844446f Merge pull request #381 from joyceyan/my_feature +| |\ +| |/ +|/| +* | 314424d02 modified contributing.md to add git best practices link +|/ +* 7c658b287 Enhancements in build configuration. +* 60fbfd129 Fixes crashes & edge cases for initials string. +* 14164d985 Closes #359 +* 9e8ba9130 Settings refactoring. +* 96dc676bf Addresses multiples UI issues. +* 3a43145c2 Closes #282 - Avatar initials placeholder. +* b954ff244 Closes #261 - Signal 1.0 to 2.0 utility. +* 71320a690 Bypass ratchet and network to discuss with self. +* 07c539c84 Groups: Showing members joining/leaving. +* 5d6ac1f8b Session Warning Label: Renaming the Secure session ended. +* 34ba5efe1 Closes #291 +* b9a71445d End error message sentences with a dot. +* bf8f2bb26 Closes #270 #271 #273 +* f3f3eb55c Fixes crash (since ee07490) on loading empty MessagesVC +* 1784fcf90 Group avatar: Set default one locally if not selected. +* c9c4a9371 Members of groups selection +* ee07490d3 MessagesVC: Paging and fix scrolling bug. +* 9ae4a435a Show name for unregistered contact in threads. +* 2d850021a Fixing bug causing outgoing calls to be cancelled. Closes #264 +* fc6b4b554 New wire format +* 86aea62b8 Groups: Fixes issue discussed in #248 +* 0d7de05a1 Adding building instructions + TextSecure in README +* ffd68d30c Adding support for iPad icons. Closes #255 +* 4c0dbeb98 Group avatar fixes +* 7a1a2c205 Closes #234 +* eff589af9 Closes #236 +* 4cb3231bb Settings: Share fingerprint in tweet (close #210) +* 5cf96b2b0 Incoming call when app closed: updates contact label when available. +* 0266621ce Phone calls in MessageView. +* 2082c2ada Bugfix: Caused private message to not be processed correctly +* af9f8579b Showing name of contact on outgoing phone call +* 9b4afebbd Preventing "null" notifications on group updates and attachments +* c69ce8ad2 Actions on messages notification for replying. +* 5961c635e MessagesVC: Scrolls to bottom and fixes jumpiness +* a93b11145 Groups: Name of leaving user + outgoing message layout. +* e58f9bf96 Groups: Update messages, avatars and bug fixes +* 3c568f704 Bugfix: messages shown as delivered since 312423a +* 93c571dae Removing keying material and wiping messages. +* 402df7230 Attachments handling +* f2217cacd Setting for Image Compression. +* 224cea777 Fixing "jump" on loading MessagesViewController +* 333c920e0 Group functionality +* c74899661 Removing logging statement. +* 8334adb4d Attachments: Sending and receiving +* 9683451ed Rename to 'attachment' +* f8db90014 Attachements: Fixing UI issues +* db74e1756 Fixing crash on notification style setting +* eb8c3e57e Adding Clang Format file +* 3dc21ba65 Receiving and displaying attachements +* 71ad9beeb Fingerprint verification instructions +* 29b8fb6ea Settings: Let user pick notification style +* 03073a9c0 Signup: remove unused segue +* a55b00552 Removing keyboard when proposing new fingerprint. +* e269bd62e Bugfix: Fixes crash on multiple update. +* 80a8c3921 Debug: Logging new password creation. +* c11c4361e Bugfix: Fixing ordering for compose view. +* 6b4f339d7 Identity Key QR verification +* f67e0d13f Support for MITM/key change interface. +* d90d27995 Error handling messages and Info Messages +* dde6fc0a7 Bug fixes in MessageViewController +* daa6bfd65 Fixing crash in MessagesViewController. +* 6868e2234 Messages view fixes +* 32f1cb375 Archive/Inbox: Unread layout and other enhancements +* 708075578 Signup enhancements. +* 5b0914c03 Signup flow: request call. +* 83cc102f9 Immediate feedback on send + unread count badges. +* b5ba841c6 Support for Archiving. (Closes #213) +* 2d722d499 Multiple UI enhancements. +* 5ddb85b6c Modal presentation of the setup view. +* 52d84ae00 LaunchScreens and Screen Security. +* 8435a800d WebSocket Public Key Pinning. +* 54dae0639 Messages: Fix delivered label +* e70fd6391 General: Screenshot protection (closes #216) +* 67a1a4133 Display fingerprints. +* 901640507 Removing developer-specific junk. +* 91e0b6642 Addresses multiple UI issues. - New Contact spacing to let user tap call/message icons - Handeling error messages, delivery receipts, timestamps +* d4f5675a5 Supporting alert on unregistered users + bug fixes. +* 35a2762c5 Starting background fetching of messages. +* 6446c6fbe Socket Management +* 9b5379b3e Messages: Add a failed outgoing message cell +* 211e20aaf Signup: Locking UI while async requests +* 1eff2b3ad Rewriting outgoing pipeline with GCD. +* 851483603 Integrating call and messaging buttons. +* fbbeff70e Handling delivery receipts. +* b22579d8f Settings and thread fixes. +* f1c92b229 Registering by tapping SMS link. +* bf9084a7c WebSocket reconnect. Casting issues. +* 1e3dd3d94 Integration work - thread view +* b58d2fb86 Integrating deletion of threads. +* d73e42bef Integrating Message View. +* 84e12a39c ContactDetail: Link notes +* b3d2544b1 Signals: Fix mistake in removing observer for Socket Notifications +* 0c88202f7 Adapting to changes to SubProtocol and InboxView +* 121ef0439 Integrating the TextSecure Contact Discovery. +* 60ceaab70 Fix error not being shown when failing to verify SMS code +* e48ea5292 ContactDetail: Fix crash on parsedPhoneNumbers +* 60f50e521 ContactDetail: Remove Favourite button +* 756777fd0 InCall: remove blue outline on mute and speaker buttons +* faa447310 SubProto support for WebSocket messages +* 336eb1fa0 Enables Auto-layout on larger screen sizes. +* ad5bb9200 Integrating socket status indicator and remove favorites. +* 8b6ac1359 Fixes InCallViewController & contacts not displayed +* c9056662e Fixing issues with merge +* 6dd04a49f Refactoring signup flow, storage, contacts. +* d876d8a15 Registration refactoring - wip. +* 95c14ddef General: Unused views cleanup +* 64ab73bae General: Unused View controller clean up +* 6524b08ff FullImage: Base of pinching, double tapping & zooming +* e174215b2 Fix Scale: Set Launch Screen +* c3dff810a Registration refactoring - wip. +* 9ca103744 Pods for textSecure fork CI +* b9907b9a3 Laying ground for signup flow refactoring +* 43af8c18e Merging UI code with some basic TextSecureKit code. +* a60bc8be9 Initial Message UI +* 7e555c6c2 Merge pull request #203 from gitter-badger/gitter-badge +|\ +| * af89ae83c Added Gitter badge +|/ +* bb04f27aa Updated Travis configuration and categories guidelines. +* f65d552f6 Prefix NSArray categories. +* 135f139da Merge pull request #200 from Strilanc/warning_fix_235 +|\ +| * abb0486ec Fixed a warning in PriorityQueueTest, and some dot syntax //FREEBIE - Also simplified the comparators +|/ +* 5b64b1815 Merge pull request #197 from gavia/bugfix +|\ +| * 3ddfd9159 phone/ related bug fixes +|/ +* d7bd62ca7 Addressing issues with empty contact names +* 36a24c544 Rate Limiting Message was never displayed. +* 30a6da31c Merge pull request #191 from Strilanc/patch-1 +|\ +| * 867402afa Update doc comment in ZrptManager.h // FREEBIE +|/ +* 26d2c2ac4 Merge pull request #187 from WhisperSystems/gavia-master +|\ +| * 9fac4209b Vibrations and minor fix in audio interrupts +| * 40c7adfda Bump up version number of release. +| * 24ee727d6 Closes #181 +| * 7d4fb1ae1 Updating Pods & translations for release +| * 3031d6852 More advanced fixes for push notifications on iOS7 +| * f771487aa Fixing singleton initialization +| * 6951fd1fb Fixed issue #139. +* | fbd7813c3 (tag: 1.0.8) Bump up version number of release. +* | eed0dad4a Closes #181 +* | 3072e85b0 Updating Pods & translations for release +* | 5091c53aa More advanced fixes for push notifications on iOS7 +* | f8d201fc5 Fixing singleton initialization +|/ +* efdda2f07 Update Building to note non-operational. //FREEBIE +* 5854eed86 (tag: 1.0.7) Updating localizations +* c572132c9 Fixing iOS 7 push notification issue +* 7b388da35 Closes #174 +* 356bf0b0b Merge pull request #161 from Strilanc/partial_uint_parse_fix +|\ +| * a060bea69 Found a method to parse NSUInteger exactly and precisely //FREEBIE +| * 00ea396ff Merge branch 'master' of https://github.com/WhisperSystems/Signal-iOS into partial_uint_parse_fix +| |\ +| |/ +|/| +* | 1cf6efb47 Updating Travis for iOS 8.0 support +* | cbdbcb2a1 (tag: 1.0.6.2) Fixing build & signing settings for contributors +* | 8d30498b6 (tag: 1.0.6) Fetching translations from Transifex +* | 43ca8b511 Fixing registration issues +* | 953d4d80f Syntax fixes from #172 +* | d05791e69 Moving away from custom HTTP stack +* | 510831d70 Auto-layout enhancements + Submit Debug Logs +* | 779e9d1b3 Multiple fixes +* | 002909f74 Merge pull request #165 from abcdev/unuglify-icon +|\ \ +| * | 46efc484f Removed wrong/unnecessary/ugly black border. Removed 512x512 version. Since it is supported by iTunes Connect anymore. +| * | a3cf2ed30 Rerendered Icon in iOS 7 and iOS 8 style. It was rendered with a wrong and useless border before. +|/ / +* | 3c28bb952 Enabling new screen sizes +| * f98d661ea Removed size-assuming NSUInteger parsing tests +|/ +* 06a459785 Fixed RecentCall unconditionally setting userNotified, even for missed calls //FREEBIE +* b9cf163b1 Same fixes applied to unit test code signing //FREEBIE +* 44a19a5d7 Attempting to fix code signing issues - Changed run scheme back to "Debug" from ad-hoc distribution - Reset provisioning profile build settings to automatic - Reset code signing identity build settings to just iOS Distribution / iOS Developer - Reset Development Team to "None" (it seemed to be forcing the automatically chosen debugging cert to be one from whisper systems) FREEBIE +* cd0bda710 (tag: 1.0.5) iOS 8 Support +* 8b42036f1 Reverting timestamp RTP field +* 854046d97 Typo fix FREEBIE +* f1de95ab0 Recursively added dot syntax, translating more terms when they were encountered in the dif FREEBIE +* f582dd7a2 Merge pull request #150 from Strilanc/speex_warnings_ignore +|\ +| * 99b61c4a3 Disabled warnings that were firing in the sub-project for the third-party speex code. +|/ +* 476d9a0d9 Merge pull request #148 from Strilanc/modernate_1 +|\ +| * baaef7832 Using dot syntax for local*, all*, full*, first*, last*, to*, encodedAs*, copy* FREEBIE +|/ +* 54043cd80 Merge pull request #145 from Strilanc/audio_stampery +|\ +| * 97e2285b2 Setting timestamp based on number of samples sent - Added timeStamp property to EncodedAudioPacket - Added timeStamp parameter to rtpPackageWithDefaults constructor - Added nextTimeStamp to AudioPacker with random initial value and sample length increases - AudioSocket forwards timeStamp - Added generateSecureRandomUInt32 to CryptoTools - Updated tests FREEBIE +|/ +* 611f5c5f0 Closes #138 +* ae5039529 Fixed single-character cuts being mistaken for backspace presses //FREEBIE +* 03ce3635c Improved the phone number editing during registration - Fixed a crash where an offset wrapped around when deleting the opening bracket - Backspacing now skips over formatting characters - Cursor position is maintained more accurately when reformatting - Added a few utility methods - Also fixed a test not having "test" as a prefix, causing it not to run //FREEBIE +* e9f8881bd Checking error codes and cleaning up when errors occur in EvpKeyAgreement - Added a test to actually exercise the DH agreement path //FREEBIE +* 4dd8df804 Updating dependencies +* 5401056d3 Checked indentation, future source results, directory layout, thenTry vs then, dependencies +* ced4fc894 Initial work to depend on external futures library instead of internal implementation +* 5d31f76f3 Fixed packEcCoordinatesFromEcPoint having variable-sized output, prevent reconstruction of public key +* 4cd30f32e Using getter syntax for shared*, is*, and has* +* 1793d41b8 Merge pull request #116 from Strilanc/modern_0 +|\ +| * a3b438b04 Retry build +| * 9e3687264 Using dot syntax for count and length +* | 8bd42de61 (tag: 1.0.4-2) Pulling new translations +* | dc4e4689e (tag: 1.0.4-1) Checks and extra logging for login issues +* | c52c6c624 Clearing notifications from notification center +|/ +* 84eb87ac6 Manually refactored cases the refactoring to Modern Objective-C was complaining about //FREEBIE +* 1e9a3e9a4 Ran "Edit -> Refactor -> Convert to Modern Objective-C Syntax" - dictionaryWithObject -> @{key: val} - objectAtIndex -> a[i] - numberWithBool/Int/etc -> @1, @(val) - Reverted friendly fire on ProtocolBuffers - Did not do ANY other changes (including changes to make more refactorings succeed) //FREEBIE +* 6fd78ef14 Added canary test to notify future maintainers when safety pads can be removed from spandsp usage //FREEBIE +* 76b94c80d (tag: 1.0.4) Updating Pods +* 491bb2f8c Updating translations +* 5b53e33cc Revert "Updating to spandsp-0.0.6" +* ecea5d6e5 Updating to spandsp-0.0.6 +* 50e1b8012 Fixing localization and performance issues +* 619b53cb0 Screen security feature. Closes #31 +* f5bbf9d48 Enhancements to certificate pinning +* aca4733ac Multiple fixes +* 2a0b0cbff Updating OpenSSL +* 56b3d5475 Fix link to travis build status in README.md //FREEBIE +* 9051045b9 Fixes for Travis setup +* bf8f60bf0 Adding submodule +* 6c027c2ed Removing dependencies +* 9240a095a Travis CI-support and iOS8 push notifications +* 0d7e2d2f2 Caching ressources for Travis +* dd73eafe4 Preparing tests for Travis +* db1927373 Xcode project file fix +* 2031a9509 UInt16 variance test //FREEBIE +* 60e3b1459 Updating translations +* a4eb34b23 (tag: 1.0.3) Only display contacts that have a phone number +* 5ac7acfbc Enhancements in the verification flow +* 7ab15a580 Updating translations //FREEBIE +* da3819b1c Merge branch 'testingBranch' +|\ +| * 9c31b9ab6 Logging migration errors +| * 1519bba1e Merge branch 'master' into testingBranch +| |\ +| |/ +|/| +* | c2d78bba1 Migration scheme +* | 17571b6c5 Closes #52 +* | 120c50f2e Merge pull request #81 from abcdev/patch-issue-70 +|\ \ +| * | df89f4e00 Closes #70 +* | | 60fb869ba Closes #80 #37 +|/ / +* | 3113665f0 Removing some test headers +* | cb0c7ff60 Merge branch 'postLaunchFixes' of github.com:WhisperSystems/Signal-iOS into postLaunchFixes +|\ \ +| * | 91dadcc48 Add translation link +| * | 004030946 Adding App Store Link +| * | afd5be4c3 Closes #75 +| * | b21c1ee1f Closes #67 +| * | a588f27c6 Transitioning off custom preference files +* | | c33e38e92 Merging various bug fixes +* | | 1bc219368 Add translation link +* | | 3a8acb7f8 Adding App Store Link +* | | 7ec22427c Closes #75 +* | | 755bc5961 Closes #67 +* | | 9465423c7 Transitioning off custom preference files +* | | 021468ff4 Fix case of openssl/ includes for case-sensitive build environments. +* | | 65e9b4782 Class comment in the header. +* | | e48bea1a3 Final removal of the CryptoUtils class name, replaced with CryptoTools. +* | | eabb5f43f Handshake HMAC Authentication success/failure test. Random uint16 generation variance testing for full CryptoTools test coverage. Removal of stub tests. +* | | 88a3886bd Merge pull request #32 from ygini/hotfix/ReadMe_TypoInProjectName +|\ \ \ +| |/ / +|/| | +| * | 849219c61 Fix the project name (who was TextSecure iOS instead of Signal iOS). +|/ / +* | 19ff47e27 Closes #27 +* | 0ff4ceb5f Closes #25 +* | 9b97b8a4c (tag: 1.3, tag: 1.2, tag: 1.0.2) Bump up version number for App Store release +* | 0941d485c New wording for support features +* | 5c124c647 Using PastelogKit +* | a6bac7cbf Merge branch 'AdvancedNetworkLogging' +|\ \ +| * \ e61a8c2aa Merge branch 'master' into AdvancedNetworkLogging +| |\ \ +* | | | cc0075eba Fixing typo in strings +* | | | 44bd921db Changes for arm64 and Clang redefined-types +* | | | 675956f79 Goodbye OCTest, Hello XCTest +| |/ / +|/| | +* | | ad6ff2361 Merge branch 'AdvancedNetworkLogging' +|\ \ \ +| |/ / +| * | c839f05c1 Cleaning environment prefs +| * | 05fe10612 Advanced network logging +|/ / +* | 4acd43a09 Fixing NSNumber to BOOL conversion +* | 8fb14356e Merge branch 'Keychain-store' +|\ \ +| * | 4a6d80765 Fixing #18 +| * | cfbcdc5a5 Re-registering, generating new server passwords +| * | 021da47a9 Bug fixes + Keychain store +|/ / +* | a813ecbff Fixing localization bug +* | 09b6fdea1 Adding more logging to address the initialization issues +* | 120fc196b Bumping up version number +* | e93c27e22 Additional call anonymous logging +* | bdf6f957a NSComparator for unit tests +* | 930a601fb Localized challenge alertview +* | 766174016 Localized sign up messages and gist log upload +* | 6efa1cd35 Removing non-used debug environment +* | c69747e48 (tag: 0.1) Production logging & sign up error handling +* | 6c2f33a6d Updating OpenSSL to 1.0.1h +* | c1f797aeb Merge pull request #10 from mcginty/phone-icons +|\ \ +| * | 7aef8b7d4 updated phone icon +* | | 8d98e22d2 Fixing name in repo +|/ / +* | bd1741e94 Merge pull request #4 from jazzz/hotfix/callerid +|\ \ +* | | 5ca65914a Update CONTRIBUTING.md +| | * db33d636e Migration scheme +| | * 68f96d562 Closes #52 +| | * 46b869628 Closes #80 #37 +| | * 5812f80d4 Closes #70 +| | * 9703e601b slight refactoring to fit code style +| | * bde62ed7c do not reposition cursor to end of number on change +| | * d8ee13f04 respect cursor position for insert and delte +| | * 6890ac3b4 Removing some test headers +| | * 3f8f7d6a9 Merge branch 'postLaunchFixes' of github.com:WhisperSystems/Signal-iOS into postLaunchFixes +| | |\ +| | | * c1aa5346f Add translation link +| | | * 3a691d178 Adding App Store Link +| | | * db9c29f50 Closes #75 +| | | * 70865f3eb Closes #67 +| | | * 6ee267a5f Transitioning off custom preference files +| | * | a470b6eef Merging various bug fixes +| | * | 4c3943673 Add translation link +| | * | 645846c41 Adding App Store Link +| | * | defa69308 Closes #75 +| | * | 19eb620fb Closes #67 +| | * | c73e6b65e Transitioning off custom preference files +| | * | 583373ba7 Fix case of openssl/ includes for case-sensitive build environments. +| | * | c15115c5f Class comment in the header. +| | * | bba541806 Final removal of the CryptoUtils class name, replaced with CryptoTools. +| | * | 6e48eba05 Handshake HMAC Authentication success/failure test. Random uint16 generation variance testing for full CryptoTools test coverage. Removal of stub tests. +| | * | c0a9e8092 Merge pull request #32 from ygini/hotfix/ReadMe_TypoInProjectName +| | |\ \ +| | | |/ +| | |/| +| | | * b41d50681 Fix the project name (who was TextSecure iOS instead of Signal iOS). +| | |/ +| | * f317c76a8 Closes #27 +| | * 29bd2f078 Closes #25 +| | * f4212284e Bump up version number for App Store release +| | * 9260116fa New wording for support features +| | * b574fcda5 Using PastelogKit +| | * e965a1234 Merge branch 'AdvancedNetworkLogging' +| | |\ +| | | * 750f64f85 Merge branch 'master' into AdvancedNetworkLogging +| | | |\ +| | * | | 3428c724b Fixing typo in strings +| | * | | 556769cff Changes for arm64 and Clang redefined-types +| | * | | adf81b4ae Goodbye OCTest, Hello XCTest +| | | |/ +| | |/| +| | * | 14e7ce623 Merge branch 'AdvancedNetworkLogging' +| | |\ \ +| | | |/ +| | | * 4b2acd62f Cleaning environment prefs +| | | * 3031ae741 Advanced network logging +| | |/ +| | * 24b09ccc2 Fixing NSNumber to BOOL conversion +| | * d4855cea1 Merge branch 'Keychain-store' +| | |\ +| | | * 5e9285ef6 Fixing #18 +| | | * 196d63fee Re-registering, generating new server passwords +| | | * 2cdb05754 Bug fixes + Keychain store +| | |/ +| | * 09fcf2ff0 Fixing localization bug +| | * fe41d3379 Adding more logging to address the initialization issues +| | * e8b9a831d Bumping up version number +| | * 407c64f6e Additional call anonymous logging +| | * 61264a480 NSComparator for unit tests +| | * 6d76b8b27 Localized challenge alertview +| | * 2a58c03b9 Localized sign up messages and gist log upload +| | * dca3c74bc Removing non-used debug environment +| | * 9d6ca82e8 Production logging & sign up error handling +| | * febb719c6 Updating OpenSSL to 1.0.1h +| | * 3488752d4 Merge pull request #10 from mcginty/phone-icons +| | |\ +| | | * 56509dc17 updated phone icon +| | * | 45b8c1564 Fixing name in repo +| | |/ +| | * 3c3436643 Merge pull request #4 from jazzz/hotfix/callerid +| | |\ +| | |/ +| |/| +| * | 08b68abb5 properly update callerid for incoming calls +|/ / +| * b9e80b263 Update CONTRIBUTING.md +|/ +* 109ecb36b Cleaning up unnecessary headers +* a6bf14385 (tag: 1.0) Cleaner Keychain storage +* 637350710 initial commit From a8e9b87f0391d6f5c007ebb48b842c4645991bc0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Mar 2019 11:24:09 -0400 Subject: [PATCH 330/493] Rework menu actions focus item layout. --- .../ConversationViewController.m | 211 +- .../ConversationView/ConversationViewModel.h | 3 - .../ConversationView/ConversationViewModel.m | 6 - .../MenuActionsViewController.swift | 85 +- temp.txt | 16486 ---------------- 5 files changed, 190 insertions(+), 16601 deletions(-) delete mode 100644 temp.txt diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 3cec015f0..c0b18ad11 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -211,6 +211,8 @@ typedef enum : NSUInteger { @property (nonatomic, readonly) ConversationSearchController *searchController; @property (nonatomic, nullable) NSString *lastSearchedText; @property (nonatomic) BOOL isShowingSearchUI; +@property (nonatomic, nullable) MenuActionsViewController *menuActionsViewController; +@property (nonatomic) CGFloat contentInsetPadding; @end @@ -746,6 +748,8 @@ typedef enum : NSUInteger { // We want to set the initial scroll state the first time we enter the view. if (!self.viewHasEverAppeared) { [self scrollToDefaultPosition]; + } else if (self.menuActionsViewController != nil) { + [self scrollToFocusInteraction:NO]; } [self updateLastVisibleSortId]; @@ -1257,7 +1261,7 @@ typedef enum : NSUInteger { self.isViewCompletelyAppeared = NO; - [[OWSWindowManager sharedManager] hideMenuActionsWindow]; + [self dismissMenuActions]; } - (void)viewDidDisappear:(BOOL)animated @@ -1965,61 +1969,156 @@ typedef enum : NSUInteger { #pragma mark - MenuActionsViewControllerDelegate -- (void)menuActionsDidHide:(MenuActionsViewController *)menuActionsViewController +- (void)menuActionsWillPresent:(MenuActionsViewController *)menuActionsViewController { + OWSLogVerbose(@""); + + // While the menu actions are presented, temporarily use extra content + // inset padding so that interactions near the top or bottom of the + // collection view can be scrolled anywhere within the viewport. + // + // e.g. In a new conversation, there might be only a single message + // which we might want to scroll to the bottom of the screen to + // pin above the menu actions popup. + CGSize mainScreenSize = UIScreen.mainScreen.bounds.size; + self.contentInsetPadding = MAX(mainScreenSize.width, mainScreenSize.height); + + UIEdgeInsets contentInset = self.collectionView.contentInset; + contentInset.top += self.contentInsetPadding; + contentInset.bottom += self.contentInsetPadding; + self.collectionView.contentInset = contentInset; + + self.menuActionsViewController = menuActionsViewController; +} + +- (void)menuActionsIsPresenting:(MenuActionsViewController *)menuActionsViewController +{ + OWSLogVerbose(@""); + + // Changes made in this "is presenting" callback are animated by the caller. + [self scrollToFocusInteraction:NO]; +} + +- (void)menuActionsDidPresent:(MenuActionsViewController *)menuActionsViewController +{ + OWSLogVerbose(@""); + + [self scrollToFocusInteraction:NO]; +} + +- (void)menuActionsIsDismissing:(MenuActionsViewController *)menuActionsViewController +{ + OWSLogVerbose(@""); + + // Changes made in this "is dismissing" callback are animated by the caller. + [self clearMenuActionsState]; +} + +- (void)menuActionsDidDismiss:(MenuActionsViewController *)menuActionsViewController +{ + OWSLogVerbose(@""); + + [self dismissMenuActions]; +} + +- (void)dismissMenuActions +{ + OWSLogVerbose(@""); + + [self clearMenuActionsState]; [[OWSWindowManager sharedManager] hideMenuActionsWindow]; } -- (void)menuActions:(MenuActionsViewController *)menuActionsViewController - isPresentingWithVerticalFocusChange:(CGFloat)verticalChange +- (void)clearMenuActionsState { - UIEdgeInsets oldInset = self.collectionView.contentInset; - CGPoint oldOffset = self.collectionView.contentOffset; + OWSLogVerbose(@""); - UIEdgeInsets newInset = oldInset; - CGPoint newOffset = oldOffset; + if (self.menuActionsViewController == nil) { + return; + } - // In case the message is at the very top or bottom edge of the conversation we have to have these additional - // insets to be sure we can sufficiently scroll the contentOffset. - newInset.top += verticalChange; - newInset.bottom -= verticalChange; - newOffset.y -= verticalChange; + UIEdgeInsets contentInset = self.collectionView.contentInset; + contentInset.top -= self.contentInsetPadding; + contentInset.bottom -= self.contentInsetPadding; + self.collectionView.contentInset = contentInset; - OWSLogDebug(@"verticalChange: %f, insets: %@ -> %@", - verticalChange, - NSStringFromUIEdgeInsets(oldInset), - NSStringFromUIEdgeInsets(newInset)); - - // Because we're in the context of the frame-changing animation, these adjustments should happen - // in lockstep with the messageActions frame change. - self.collectionView.contentOffset = newOffset; - self.collectionView.contentInset = newInset; + self.menuActionsViewController = nil; + self.contentInsetPadding = 0; } -- (void)menuActions:(MenuActionsViewController *)menuActionsViewController - isDismissingWithVerticalFocusChange:(CGFloat)verticalChange +- (void)scrollToFocusInteractionIfNecessary { - UIEdgeInsets oldInset = self.collectionView.contentInset; - CGPoint oldOffset = self.collectionView.contentOffset; + if (self.menuActionsViewController != nil) { + [self scrollToFocusInteraction:NO]; + } +} - UIEdgeInsets newInset = oldInset; - CGPoint newOffset = oldOffset; +- (void)scrollToFocusInteraction:(BOOL)animated +{ + NSValue *_Nullable contentOffset = [self contentOffsetForFocusInteraction]; + if (contentOffset == nil) { + OWSFailDebug(@"Missing contentOffset."); + return; + } + [self.collectionView setContentOffset:contentOffset.CGPointValue animated:animated]; +} - // In case the message is at the very top or bottom edge of the conversation we have to have these additional - // insets to be sure we can sufficiently scroll the contentOffset. - newInset.top -= verticalChange; - newInset.bottom += verticalChange; - newOffset.y += verticalChange; +- (nullable NSValue *)contentOffsetForFocusInteraction +{ + NSString *_Nullable focusedInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; + if (focusedInteractionId == nil) { + // This is expected if there is no focus interaction. + return nil; + } + CGPoint modalTopWindow = [self.menuActionsViewController.focusUI convertPoint:CGPointZero toView:nil]; + CGPoint modalTopLocal = [self.view convertPoint:modalTopWindow fromView:nil]; + CGPoint offset = modalTopLocal; + CGFloat focusTop = offset.y - self.menuActionsViewController.vSpacing; - OWSLogDebug(@"verticalChange: %f, insets: %@ -> %@", - verticalChange, - NSStringFromUIEdgeInsets(oldInset), - NSStringFromUIEdgeInsets(newInset)); + NSIndexPath *_Nullable indexPath = nil; + for (NSUInteger i = 0; i < self.viewItems.count; i++) { + id viewItem = self.viewItems[i]; + if ([viewItem.interaction.uniqueId isEqualToString:focusedInteractionId]) { + indexPath = [NSIndexPath indexPathForRow:(NSInteger)i inSection:0]; + break; + } + } + if (indexPath == nil) { + // This is expected if the focus interaction is being deleted. + return nil; + } + UICollectionViewLayoutAttributes *_Nullable layoutAttributes = + [self.layout layoutAttributesForItemAtIndexPath:indexPath]; + if (layoutAttributes == nil) { + OWSFailDebug(@"Missing layoutAttributes."); + return nil; + } + CGRect cellFrame = layoutAttributes.frame; + return [NSValue valueWithCGPoint:CGPointMake(0, CGRectGetMaxY(cellFrame) - focusTop)]; +} - // Because we're in the context of the frame-changing animation, these adjustments should happen - // in lockstep with the messageActions frame change. - self.collectionView.contentOffset = newOffset; - self.collectionView.contentInset = newInset; +- (void)dismissMenuActionsIfNecessary +{ + if (self.shouldDismissMenuActions) { + [self dismissMenuActions]; + } +} + +- (BOOL)shouldDismissMenuActions +{ + if (!OWSWindowManager.sharedManager.isPresentingMenuActions) { + return NO; + } + NSString *_Nullable focusedInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; + if (focusedInteractionId == nil) { + return NO; + } + for (id viewItem in self.viewItems) { + if ([viewItem.interaction.uniqueId isEqualToString:focusedInteractionId]) { + return NO; + } + } + return YES; } #pragma mark - ConversationViewCellDelegate @@ -2068,11 +2167,12 @@ typedef enum : NSUInteger { - (void)presentMessageActions:(NSArray *)messageActions withFocusedCell:(ConversationViewCell *)cell { MenuActionsViewController *menuActionsViewController = - [[MenuActionsViewController alloc] initWithFocusedView:cell actions:messageActions]; + [[MenuActionsViewController alloc] initWithFocusedInteraction:cell.viewItem.interaction + focusedView:cell + actions:messageActions]; menuActionsViewController.delegate = self; - self.conversationViewModel.mostRecentMenuActionsViewItem = cell.viewItem; [[OWSWindowManager sharedManager] showMenuActionsWindow:menuActionsViewController]; } @@ -3754,8 +3854,12 @@ typedef enum : NSUInteger { // // Always reserve room for the input accessory, which we display even // if the keyboard is not active. + newInsets.top = 0; newInsets.bottom = MAX(0, self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y); + newInsets.top += self.contentInsetPadding; + newInsets.bottom += self.contentInsetPadding; + BOOL wasScrolledToBottom = [self isScrolledToBottom]; void (^adjustInsets)(void) = ^(void) { @@ -4410,6 +4514,13 @@ typedef enum : NSUInteger { - (CGPoint)collectionView:(UICollectionView *)collectionView targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset { + if (self.menuActionsViewController != nil) { + NSValue *_Nullable contentOffset = [self contentOffsetForFocusInteraction]; + if (contentOffset != nil) { + return contentOffset.CGPointValue; + } + } + if (self.scrollContinuity == kScrollContinuityBottom && self.lastKnownDistanceFromBottom) { NSValue *_Nullable contentOffset = [self contentOffsetForLastKnownDistanceFromBottom:self.lastKnownDistanceFromBottom.floatValue]; @@ -4659,6 +4770,7 @@ typedef enum : NSUInteger { [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; + [self dismissMenuActionsIfNecessary]; if (self.isGroupConversation) { [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { @@ -4866,13 +4978,6 @@ typedef enum : NSUInteger { [self scrollToBottomAnimated:NO]; } -- (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem -{ - OWSAssertIsOnMainThread(); - - [[OWSWindowManager sharedManager] hideMenuActionsWindow]; -} - #pragma mark - Orientation - (void)viewWillTransitionToSize:(CGSize)size @@ -4886,7 +4991,7 @@ typedef enum : NSUInteger { // in the content of this view. It's easier to dismiss the // "message actions" window when the device changes orientation // than to try to ensure this works in that case. - [[OWSWindowManager sharedManager] hideMenuActionsWindow]; + [self dismissMenuActions]; // Snapshot the "last visible row". NSIndexPath *_Nullable lastVisibleIndexPath = self.lastVisibleIndexPath; @@ -4912,7 +5017,9 @@ typedef enum : NSUInteger { [strongSelf updateInputToolbarLayout]; - if (lastVisibleIndexPath) { + if (self.menuActionsViewController != nil) { + [self scrollToFocusInteraction:NO]; + } else if (lastVisibleIndexPath) { [strongSelf.collectionView scrollToItemAtIndexPath:lastVisibleIndexPath atScrollPosition:UICollectionViewScrollPositionBottom animated:NO]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index 382548f8b..b9fafcd2f 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -74,8 +74,6 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { // to prod the view to reset its scroll state, etc. - (void)conversationViewModelDidReset; -- (void)conversationViewModelDidDeleteMostRecentMenuActionsViewItem; - - (ConversationStyle *)conversationStyle; @end @@ -87,7 +85,6 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { @property (nonatomic, readonly) NSArray> *viewItems; @property (nonatomic, nullable) NSString *focusMessageIdOnOpen; @property (nonatomic, readonly, nullable) ThreadDynamicInteractions *dynamicInteractions; -@property (nonatomic, nullable) id mostRecentMenuActionsViewItem; - (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithThread:(TSThread *)thread diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 3a23a3e31..2bb7925a9 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -587,12 +587,6 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } - NSString *_Nullable mostRecentMenuActionsInterationId = self.mostRecentMenuActionsViewItem.interaction.uniqueId; - if (mostRecentMenuActionsInterationId != nil && - [diff.removedItemIds containsObject:mostRecentMenuActionsInterationId]) { - [self.delegate conversationViewModelDidDeleteMostRecentMenuActionsViewItem]; - } - NSMutableSet *diffAddedItemIds = [diff.addedItemIds mutableCopy]; NSMutableSet *diffRemovedItemIds = [diff.removedItemIds mutableCopy]; NSMutableSet *diffUpdatedItemIds = [diff.updatedItemIds mutableCopy]; diff --git a/Signal/src/ViewControllers/MenuActionsViewController.swift b/Signal/src/ViewControllers/MenuActionsViewController.swift index 285268c25..c54dc0546 100644 --- a/Signal/src/ViewControllers/MenuActionsViewController.swift +++ b/Signal/src/ViewControllers/MenuActionsViewController.swift @@ -21,9 +21,12 @@ public class MenuAction: NSObject { @objc protocol MenuActionsViewControllerDelegate: class { - func menuActionsDidHide(_ menuActionsViewController: MenuActionsViewController) - func menuActions(_ menuActionsViewController: MenuActionsViewController, isPresentingWithVerticalFocusChange: CGFloat) - func menuActions(_ menuActionsViewController: MenuActionsViewController, isDismissingWithVerticalFocusChange: CGFloat) + func menuActionsWillPresent(_ menuActionsViewController: MenuActionsViewController) + func menuActionsIsPresenting(_ menuActionsViewController: MenuActionsViewController) + func menuActionsDidPresent(_ menuActionsViewController: MenuActionsViewController) + + func menuActionsIsDismissing(_ menuActionsViewController: MenuActionsViewController) + func menuActionsDidDismiss(_ menuActionsViewController: MenuActionsViewController) } @objc @@ -32,18 +35,20 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { @objc weak var delegate: MenuActionsViewControllerDelegate? + @objc + public let focusedInteraction: TSInteraction? + private let focusedView: UIView private let actionSheetView: MenuActionSheetView deinit { Logger.verbose("") - assert(didInformDelegateOfDismissalAnimation) - assert(didInformDelegateThatDisappearenceCompleted) } @objc - required init(focusedView: UIView, actions: [MenuAction]) { + required init(focusedInteraction: TSInteraction?, focusedView: UIView, actions: [MenuAction]) { self.focusedView = focusedView + self.focusedInteraction = focusedInteraction self.actionSheetView = MenuActionSheetView(actions: actions) super.init(nibName: nil, bundle: nil) @@ -86,8 +91,7 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { // When the user has manually dismissed the menu, we do a nice animation // but if the view otherwise disappears (e.g. due to resigning active), // we still want to give the delegate the information it needs to restore it's UI. - ensureDelegateIsInformedOfDismissalAnimation() - ensureDelegateIsInformedThatDisappearenceCompleted() + delegate?.menuActionsDidDismiss(self) } // MARK: Orientation @@ -98,7 +102,6 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { // MARK: Present / Dismiss animations - var presentationFocusOffset: CGFloat? var snapshotView: UIView? private func addSnapshotFocusedView() -> UIView? { @@ -150,6 +153,7 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { let oldFocusFrame = self.view.convert(focusedView.frame, from: focusedViewSuperview) NSLayoutConstraint.deactivate([actionSheetViewVerticalConstraint]) self.actionSheetViewVerticalConstraint = self.actionSheetView.autoPinEdge(toSuperviewEdge: .bottom) + self.delegate?.menuActionsWillPresent(self) UIView.animate(withDuration: 0.2, delay: backgroundDuration, options: .curveEaseOut, @@ -160,35 +164,36 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { var newFocusFrame = oldFocusFrame // Position focused item just over the action sheet. - let padding: CGFloat = 10 - let overlap: CGFloat = (oldFocusFrame.maxY + padding) - newSheetFrame.minY + let overlap: CGFloat = (oldFocusFrame.maxY + self.vSpacing) - newSheetFrame.minY newFocusFrame.origin.y = oldFocusFrame.origin.y - overlap snapshotView.frame = newFocusFrame - let offset = -overlap - self.presentationFocusOffset = offset - self.delegate?.menuActions(self, isPresentingWithVerticalFocusChange: offset) + self.delegate?.menuActionsIsPresenting(self) }, - completion: nil) + completion: { (_) in + self.delegate?.menuActionsDidPresent(self) + }) + } + + @objc + public let vSpacing: CGFloat = 10 + + @objc + public func focusUI() -> UIView { + return actionSheetView } private func animateDismiss(action: MenuAction?) { guard let actionSheetViewVerticalConstraint = self.actionSheetViewVerticalConstraint else { owsFailDebug("actionSheetVerticalConstraint was unexpectedly nil") - self.delegate?.menuActionsDidHide(self) + delegate?.menuActionsDidDismiss(self) return } guard let snapshotView = self.snapshotView else { owsFailDebug("snapshotView was unexpectedly nil") - self.delegate?.menuActionsDidHide(self) - return - } - - guard let presentationFocusOffset = self.presentationFocusOffset else { - owsFailDebug("presentationFocusOffset was unexpectedly nil") - self.delegate?.menuActionsDidHide(self) + delegate?.menuActionsDidDismiss(self) return } @@ -203,48 +208,20 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { animations: { self.view.backgroundColor = UIColor.clear self.actionSheetView.superview?.layoutIfNeeded() - snapshotView.frame.origin.y -= presentationFocusOffset // this helps when focused view is above navbars, etc. snapshotView.alpha = 0 - self.ensureDelegateIsInformedOfDismissalAnimation() + + self.delegate?.menuActionsIsDismissing(self) }, completion: { _ in self.view.isHidden = true - self.ensureDelegateIsInformedThatDisappearenceCompleted() + self.delegate?.menuActionsDidDismiss(self) if let action = action { action.block(action) } }) } - var didInformDelegateThatDisappearenceCompleted = false - func ensureDelegateIsInformedThatDisappearenceCompleted() { - guard !didInformDelegateThatDisappearenceCompleted else { - Logger.debug("ignoring redundant 'disappeared' notification") - return - } - didInformDelegateThatDisappearenceCompleted = true - - self.delegate?.menuActionsDidHide(self) - } - - var didInformDelegateOfDismissalAnimation = false - func ensureDelegateIsInformedOfDismissalAnimation() { - guard !didInformDelegateOfDismissalAnimation else { - Logger.debug("ignoring redundant 'dismissal' notification") - return - } - didInformDelegateOfDismissalAnimation = true - - guard let presentationFocusOffset = self.presentationFocusOffset else { - owsFailDebug("presentationFocusOffset was unexpectedly nil") - self.delegate?.menuActionsDidHide(self) - return - } - - self.delegate?.menuActions(self, isDismissingWithVerticalFocusChange: presentationFocusOffset) - } - // MARK: Actions @objc diff --git a/temp.txt b/temp.txt deleted file mode 100644 index 3b074b043..000000000 --- a/temp.txt +++ /dev/null @@ -1,16486 +0,0 @@ -* c37f425d5 (HEAD -> charlesmchen/reduceLogging, private/charlesmchen/reduceLogging) Reduce logging. -* 6c6e516a3 (tag: 2.38.0.4, private/master, master) "Bump build to 2.38.0.4." -* 3795fd138 Enable image editor in production. -* 89dce9498 (tag: 2.38.0.3) "Bump build to 2.38.0.3." -* 19d205719 Merge branch 'mkirk/recording-button-design-changes' -|\ -| * 9d5d120e6 recording button design changes -| * d26c47ceb grow button as recording starts -|/ -* 29cea4b7c Merge branch 'charlesmchen/imageEditorDesign13' -|\ -| * 441c78414 (charlesmchen/imageEditorDesign13) Add preview view to the color palette control. -|/ -* 283741364 Merge branch 'charlesmchen/scrollDownButtonLayout' -|\ -| * 3b008ad96 (charlesmchen/scrollDownButtonLayout) Fix conversation view content offset and scroll down button layout. -|/ -* f50ec0724 Merge branch 'mkirk/photo-capture' -|\ -| * 284357137 Photo/Movie Capture -|/ -* 95b11ddf8 Merge tag '2.37.2.0' -|\ -| * 256d308e3 (tag: 2.37.2.0, private/release/2.37.2) pull latest translations -| * 83a9d386c Merge branch 'mkirk/notification-none-tone' into release/2.37.2 -| |\ -| | * a34266094 (private/mkirk/notification-none-tone) fix "none" notification tone -| |/ -| * d5664dae4 Change to non-crashing assert -| * cadb9ea9a Merge branch 'mkirk/ios9-crash' into release/2.37.2 -| |\ -| | * 72ab6507e (private/mkirk/ios9-crash) fix crash when presenting alerts on iOS9 -| |/ -| * 6d6d1de78 "Bump build to 2.37.2.0." -* | 152a4a8c5 Merge branch 'charlesmchen/imageEditorDesign12' -|\ \ -| * | 684cebf2d (charlesmchen/imageEditorDesign12) Respond to CR. -| * | b7d3a99f3 Update "crop lock" assets. -| * | a48c3d8d2 Ensure attachment approval becomes first responder if app returns from background. -| * | f9445359d Fix layout glitch related to attachment approval input accessory background. -| * | a559b6105 Fix keyboard return behavior in attachment approval. -| * | 660f35147 Hide status bar in image editor modals. -| * | 25e7818f5 Ensure proper z-ordering of item layers. -|/ / -* | 4176d9a15 Merge branch 'charlesmchen/imageEditorDesign11' -|\ \ -| * | d824c49c0 (private/charlesmchen/imageEditorDesign11, charlesmchen/imageEditorDesign11) Respond to CR. -| * | d80f086f3 Rework attachment captioning. -| * | 625656deb Pull out attachment text toolbar and text view classes. -|/ / -* | 48dfdae0c Merge branch 'mkirk/fix-overzealous-assert-2' -|\ \ -| * | 91ec9ebf9 Fix overzealous assert -|/ / -* | 6ad5faad1 Merge branch 'mkirk/fix-overzealous-assert' -|\ \ -| * | 268dd33e7 (private/mkirk/fix-overzealous-assert) Change to non-crashing assert -|/ / -* | f4ba7d211 Merge branch 'charlesmchen/imageEditorDesign10' -|\ \ -| * | 581d0a7bf (charlesmchen/imageEditorDesign10) Respond to CR. -| * | 4fd16a761 Remove top gradient from attachment approval. -| * | 745ec2adb Remove top gradient from attachment approval. -|/ / -* | 102eed8ba Merge branch 'charlesmchen/imageEditorDesign9' -|\ \ -| * | 082686452 (charlesmchen/imageEditorDesign9) Decompose attachment approval into multiple source files. -|/ / -* | fdf3da8b0 Merge branch 'charlesmchen/imageEditorDesign8' -|\ \ -| * | c315c1c9e (charlesmchen/imageEditorDesign8) Fix translation normalization of the image editor transform. -|/ / -* | 2ce057bcd Merge branch 'charlesmchen/imageEditorDesign7' -|\ \ -| * | 88c07fc53 (charlesmchen/imageEditorDesign7) Pinch to change text size in image editor text tool. -|/ / -* | b86ff1425 Merge branch 'charlesmchen/imageEditorDesign6' -|\ \ -| * | d6c91c275 (charlesmchen/imageEditorDesign6) Respond to CR. -| * | fedbe3a5d Fix shadow on palette view. -| * | 75cfd979b Modify brush stroke width to reflect current scale. -| * | c0ca55b1e Fix shadow on palette view. -| * | 337e32a90 Fix a shadow. -| * | 66efcb463 Update rail icons. -| * | 2f7880af8 Fix hit testing of text layers. -|/ / -* | 575de76a4 Merge branch 'charlesmchen/imageEditorDesign5' -|\ \ -| * | 7521b3a14 (charlesmchen/imageEditorDesign5) Update "attachment has caption" indicator. -| * | dd16986d7 Avoid layout changes due to selection changes in media rail. -| * | e63b1169a Hide controls while moving text items. -| * | 9e636b0fc Hide controls during stroke. -| * | c77835926 Tap to create new text item. -| * | fb6631df5 Remove cancel button from attachment caption view. -| * | cea361705 Update asset for "add more images to album" button. -| * | 5aaa66792 Modify the image editor's crop tool to render the cropped and uncropped content. -| * | 0a6ad365d Refine the image editor crop tool's gestures. -| * | e9a4ae7ad Fix image editor navigation bar button shadows. -| * | eff929dd1 Add border and shadow to image editor's palette view. -| * | 6f44167e5 Tweak navigation bar button spacing. -| * | e2d54d082 Modify attachment approval back button to not have "back" text. -| * | 7a67a7b6b Hide the status bar in the image picker / attachment approval. -| * | 6e492927d Prevent users from selecting additional images while processing images in the image picker. -|/ / -* | 863c96c62 Merge tag '2.37.1.0' -|\ \ -| |/ -| * 3f6080765 (tag: 2.37.1.0, private/release/2.37.1, origin/release/2.37.1, origin/master, origin/HEAD) "Bump build to 2.37.1.0." -| * 0a5f8b7a4 Merge branch 'mkirk/update-settings' into release/2.37.1 -| |\ -| | * 2a151dbf6 (private/mkirk/update-settings) update settings key -| |/ -* | 29b875e05 Merge branch 'charlesmchen/tioli' -|\ \ -| * | 10383783e Respond to CR. -| * | d84e0eead Respond to TIOLI feedback from https://trello.com/c/ntO5hBbl/4161-prs-for-michael-to-review -|/ / -* | fc7d118cd Merge branch 'charlesmchen/scrollDownButtonLayout' -|\ \ -| * | 0aebac0d0 Fix layout of the 'scroll down' button. -|/ / -* | e19408c1c Merge branch 'charlesmchen/messageActionsVsOrientationChange' -|\ \ -| * | 0a1947c96 Dismiss message actions UI on orientation change. -| * | 41a2a954f Dismiss message actions UI on orientation change. -|/ / -* | ef3f36ad4 Merge branch 'charlesmchen/bottomViewAnimations' -|\ \ -| * | ff0891920 Respond to CR. -| * | 6fe3ce6d8 Deconflict "bottom view" layout and keyboard animations. -| * | 6e7c13534 Ensure onboarding views never reclaim layout space from dismissed keyboard. -| * | d72c26796 Ensure onboarding views never reclaim layout space from dismissed keyboard. -| * | 53802d1a4 Deconflict "bottom view" layout and keyboard animations. -| * | 97603e64c Deconflict "bottom view" layout and keyboard animations. -|/ / -* | 26237c058 Merge branch 'mkirk/large-contacts' -|\ \ -| * | b36a0061e contact picker perf for contact with many phone numbers -|/ / -* | 348cd6c48 Merge branch 'mkirk/snappier-message-clearing' -|\ \ -| * | 1c78350f9 Clear input bar UI earlier in send process for snappier send animation. -|/ / -* | 60bfa7e85 Only fetch contacts if already authorized -* | e2fd2c917 CR: return immutable array -* | bf4b9fa70 Merge tag '2.37.0.9' -|\ \ -| |/ -| * c5da7c67d (tag: 2.37.0.9, private/release/2.37.0, origin/release/2.37.0) "Bump build to 2.37.0.9." -| * 32150fa7f pull translations -| * 1ad3e64e1 Merge branch 'mkirk/show-suggested-contacts-initially' into release/2.37.0 -| |\ -| | * 913ae2b80 Show suggested contacts upon first entry into HomeView. -| |/ -| * 5fd6ca99a Merge branch 'mkirk/no-self-in-contact-suggestion' into release/2.37.0 -| |\ -| | * 9fa0308d9 exclude self from "suggested contacts" -| |/ -| * 62b4a1583 Merge branch 'mkirk/fixup-tests-3' into release/2.37.0 -| |\ -| | * 932d02b93 fixup tests -| |/ -| * e8dffb4a0 update translations -* | be523d5fe Merge branch 'release/2.37.0' -|\ \ -| |/ -| * 22c78f917 (tag: 2.37.0.8) Bump build to 2.37.0.8. -| * 8527283d6 (tag: 2.37.0.7) "Bump build to 2.37.0.7." -| * 42e6b76a9 sync translations -| * 2c71f9b8a Merge branch 'mkirk/errant-missed-call-notification' into release/2.37.0 -| |\ -| | * 2850266d0 Only show "missed call" notification for incoming calls -| |/ -| * e647ba1d2 Merge branch 'charlesmchen/onboardingFixes' into release/2.37.0 -| |\ -| | * 70a163f3f Respond to CR. -| | * d006f4a29 Improve cramped layouts in onboarding views. -| | * 4fac50be6 Remove spurious error in onboarding verification process. -| | * e992ff3bc Fix glitch in presentation animations for onboarding views. -| | * 2112f04ab Fix layout of "first conversation" prompt. -| | * 14c5c2118 Fix size of "empty home view" image. -| | * 7912c338a Update onboarding splash copy. -| |/ -| * 77b1a2a72 (tag: 2.37.0.6) "Bump build to 2.37.0.6." -| * d44a824a3 sync translations -| * f9b780ff4 Merge branch 'mkirk/fixup-longtext-audio' into release/2.37.0 -| |\ -| | * 72e0d2c20 Only render visual media as album -| |/ -| * 1c255969f Merge branch 'mkirk/lanscape-flicker' into release/2.37.0 -| |\ -| | * 3be41e8c2 Unless you're on a call, all windows respect the orientation mask of the primary app visible VC. -| |/ -* | 6cae61bf1 Revert "Temporarily enable image editor." -* | aba6eb329 (tag: 2.38.0.2) "Bump build to 2.38.0.2." -* | 49685c52b Temporarily enable image editor. -* | 0ad6b2685 Merge branch 'charlesmchen/imageEditorNormalizedImage' -|\ \ -| * | 3209ce6cd Normalize images in the image editor. -|/ / -* | 22626bdff Revert "Temporarily enable image editor." -* | 9a6c36229 (tag: 2.38.0.1) "Bump build to 2.38.0.1." -* | 1078756bc Temporarily enable image editor. -* | 6052ce477 Revert "Temporarily enable image editor." -* | 3b56b2fb4 (tag: 2.38.0.0) "Bump build to 2.38.0.0." -* | 66c041913 Temporarily enable image editor. -* | 258a5beaa Merge branch 'charlesmchen/imageEditorDesign4' -|\ \ -| * | ddbef4e31 Respond to CR. -| * | c31d46965 Improve new text item continuity. -| * | 371c12bd4 Show caption indicators in attachment approval media rail. -| * | 80d297c10 Render strokes behind text. -|/ / -* | b2968d2be Merge branch 'charlesmchen/imageEditorDesign3' -|\ \ -| * | 871dceac3 (charlesmchen/imageEditorDesign3) Improve palette interactions. -| * | 1a159d4d7 Clean up brush stroke gesture usage. -| * | 3d96cd488 Improve color continuity in the image editor. -| * | 93cb0e3a1 Fix bar button layout on iOS 9. -| * | 65ead451c (charlesmchen/imageEditorDesign3_) Don't enable undo in stroke view for items created before stroke view. -|/ / -* | 5091587ed Merge branch 'charlesmchen/imageEditorDesign2' -|\ \ -| * | 9be84fc91 (private/charlesmchen/imageEditorDesign2, charlesmchen/imageEditorDesign2) Respond to CR. -| * | 919e886eb (charlesmchen/imageEditorDesign2_) Ensure brush strokes include the entire gesture. -| * | 65ee1dbd7 Hide the current text item while the text item editor is open. -| * | d15f5b581 Tweak how image editor overlays are presented. -| * | 7ee38f808 Show "add attachment caption" button for non-media attachments; only show if more than one attachment. -|/ / -* | 0813ebe16 Merge branch 'charlesmchen/imageEditorCaptions' -|\ \ -| * | 82f18d8e4 (charlesmchen/imageEditorCaptions) Respond to CR. -| * | 63637af24 Clean up ahead of PR. -| * | dc4e174e8 Clean up ahead of PR. -| * | 7c486d909 Clean up image editor. -| * | fa08b18fd Clean up image editor. -| * | b64be3aa7 Clean up image editor. -| * | 97660e0a1 Clean up image editor. -| * | bc31c8fcf Add brush view controller. -| * | 00aa5be55 Use navigation bar for image editor buttons. -| * | e47ceab41 Use navigation bar for image editor buttons. -| * | a630974e7 Use navigation bar for image editor buttons. -| * | 87646b179 Replace old caption view with new caption view. -|/ / -* | 504416f79 Merge branch 'mkirk/conversation-search' -|\ \ -| * | 71dd4eb15 in-conversation search -|/ / -* | 6095500f8 Merge branch 'charlesmchen/imageEditorDesign1' -|\ \ -| * | be26c135e (charlesmchen/imageEditorDesign1) Rework image editor buttons, modes, etc. -| * | d08445969 Generate gradient for color picker. -| * | fac123eeb Add "crop lock" button and feature. -| * | e01f39e8e Apply image editor design. -|/ / -* | 0e806ea63 Merge branch 'charlesmchen/imageEditorPalette' -|\ \ -| |/ -|/| -| * d419709eb (charlesmchen/imageEditorPalette) Respond to CR. -| * de27ed872 Add color palette to image editor. -|/ -* 530a07f8c (tag: 2.37.0.5) sync translations -* 117411009 Add public keyword to fix compilation for framework integration -* c48679abf "Bump build to 2.37.0.5." -* ee168e9a0 Merge branch 'mkirk/longtext-dismiss' -|\ -| * b11308b2f Return to conversation after deleting long text -|/ -* 05cc3c00f Merge branch 'charlesmchen/imageEditorFlip' -|\ -| * dd2b47bd7 (charlesmchen/imageEditorFlip) Add "flip horizontal" feature. -|/ -* 7caa29e47 Merge branch 'charlesmchen/imageEditorCrop3' -|\ -| * 0ce84b792 (charlesmchen/imageEditorCrop3) Respond to CR. -| * 69635fafa Update crop view to reflect design. -| * 4db09b45b Update crop view to reflect design. -| * c07a74d02 Update crop view to reflect design. -|/ -* 42a92bd03 Merge branch 'charlesmchen/imageEditorNormalizeTranslation' -|\ -| * ac1e89ce1 (charlesmchen/imageEditorNormalizeTranslation) Respond to CR. -| * cc20182ec Normalize translation in image editor. -| * 0d26caced Normalize translation in image editor. -| * f01fe8e56 Normalize translation in image editor. -|/ -* 5361720b1 log token in debug -* 5bd3cec6d Merge tag '2.36.1.0' -|\ -| * 91e83da44 (tag: 2.36.1.0, private/release/2.36.1) reflect new build params in plist -| * 2c961380c update translations -| * 72082edad Fix a visual bug that would sometimes occur while rendering settings switches. Thanks to Gunnar C. Pope for the bug report. -| * c15084c6f "Bump build to 2.36.1.0." -* | e6ad6c85b Merge branch 'mkirk/long-text-nondurable' -|\ \ -| * | 870caaa84 simplify completion checking - make nonnull -| * | 13154fb82 allow long text with non-durable sends (SAE) -|/ / -* | bb8dd0561 Merge branch 'charlesmchen/conversationSnapshot2' -|\ \ -| * | 7711ee92a (charlesmchen/conversationSnapshot2) Revert "Conversation view always observes view model." -| * | 6ed4045fb Conversation view always observes view model. -| * | 56e5feca4 Introduce ConversationSnapshot. -| * | 586b362b8 Introduce ConversationSnapshot. -|/ / -* | aaac445c5 Merge branch 'charlesmchen/proxiedContentChanges' -|\ \ -| * | fff93f8bb (charlesmchen/proxiedContentChanges) Use content proxy to configure all proxied content requests. -| * | ad90a8e0c Use content proxy to configure all proxied content requests. -| * | 5eaeeff83 Use content proxy to configure all proxied content requests. -|/ / -* | a2d48aa02 Merge branch 'charlesmchen/imageEditorTranslation' -|\ \ -| * | 2bc5ac14c (charlesmchen/imageEditorTranslation) Respond to CR. -| * | 7130895e3 Fix translation in all of editor view's gestures. -| * | 674cf2e01 Render stroke and text items in image coordinates, not canvas coordinates. -| * | 7aa826748 Fix translation in crop editor's pinch gesture. -| * | 4022ba1a1 Fix translation in crop editor's pan gesture. -|/ / -* | d1d99bc64 Merge branch 'mkirk/disappearing-menu-bar' -|\ \ -| * | 233bc3858 dismiss menu actions when selected item is deleted -|/ / -* | 504d5f89b Merge branch 'mkirk/fix-tests-1' -|\ \ -| * | a7e8f9713 Try to account for variability in network backed tests -| * | 7b174e9b0 correct constants. -|/ / -* | 0bd113e5d Merge branch 'mkirk/long-text' -|\ \ -| * | cc94d6946 update pods -| * | f1623b603 missing nullability text -| * | c6a3772a5 clearer constant names -| * | 7e5256856 render media+longText message -| * | b7989e938 feature flag approval sending -| * | bc4260b44 Send long-text with other attachments -| * | a218d6c46 Send first chars of longtext in protobuf -|/ / -* | d0287b28b Merge branch 'charlesmchen/proxiedRequestPaddingHeader' -|\ \ -| * | 0f98d6336 Tweak name of proxied request padding header. -|/ / -* | 59cd14047 (tag: 2.37.0.4) "Bump build to 2.37.0.4." -* | ce7ff58f9 Merge branch 'mkirk/input-bar-lanscape' -|\ \ -| * | 680b844f3 Allow all windows to do landscape, fixes: -|/ / -* | 4e3af534d Merge branch 'mkirk/read-pool' -|\ \ -| * | 645a26cbd use connection pool for reads -|/ / -* | 2d8612732 Merge branch 'mkirk/slow-launch' -|\ \ -| * | 7a4041cdd Cache dark theme preference -|/ / -* | 4f43c2485 Merge branch 'mkirk/disappearing-cleanup' -|\ \ -| * | fabd3996c pop view if message is deleted -|/ / -* | 1afc25140 Merge branch 'charlesmchen/userAgentForProxiedRequests' -|\ \ -| * | 20d22f639 Add user agent for proxied requests. -|/ / -* | 1b5227529 Merge branch 'charlesmchen/onboardingCameraAsset' -|\ \ -| * | d14386430 Update camera asset in onboarding profile view. -|/ / -* | c0ec9bfaf Merge branch 'charlesmchen/sentUpdates' -|\ \ -| * | 5f0de5c36 Respond to CR. -| * | 6ef65ad9d Send and process 'recipient update' sync messages. -| * | bb7d32826 Send and process 'recipient update' sync messages. -| * | e27e27cc3 Send and process 'recipient update' sync messages. -| * | 01b1df537 Add 'is update' flag to 'sent message' transcript proto schema. -| * | f19915fb7 Add 'is update' flag to 'sent message' transcript proto schema. -| * | 5f3a03a06 Add 'sent update' transcripts to proto schema. -| * | 4f19d03bd Send 'sent update' sync messages. -| * | 6ce84e7f9 Process 'sent update' transcripts. -| * | ccc1bd333 Process 'sent update' transcripts. -| * | 304c28554 Add 'sent update' transcripts to proto schema. -| * | b53243da3 Add 'sent update' transcripts to proto schema. -| * | 907159f3f Process 'sent update' transcripts. -| * | f36373e3c Add 'sent update' transcripts to proto schema. -|/ / -* | 63235ec1f Merge branch 'charlesmchen/proxiedRequestPadding' -|\ \ -| * | 32965a0c1 Respond to CR. -| * | 40768825c Pad proxied request sizes. -|/ / -* | daa58c2ac Merge branch 'charlesmchen/headlessProxy' -|\ \ -| * | a47930f61 Skip HEAD for proxied content downloads. -| * | f006972c3 Skip HEAD for proxied content downloads. -| * | 089eec413 Skip HEAD for proxied content downloads. -|/ / -* | 2dc5d8a2a Merge branch 'charlesmchen/onboardingDesignFeedback' -|\ \ -| * | 9402e088b Apply design feedback from Myles. -| * | 93e09be18 Apply design feedback from Myles. -|/ / -* | 1ec1a9aa6 Merge branch 'charlesmchen/onboardingRemoveOldViews' -|\ \ -| * | aa8fd9e69 (charlesmchen/onboardingRemoveOldViews) Remove old registration views. -|/ / -* | 88dcd8385 Merge branch 'charlesmchen/conversationSnapshotBuild' -|\ \ -| * | 67632a48e Revert "Introduce ConversationSnapshot." -| * | 3f1312da6 Revert "Introduce ConversationSnapshot." -| * | 01cc5cb36 (tag: 2.37.0.3, private/charlesmchen/conversationSnapshotBuild) "Bump build to 2.37.0.3." -| * | 8b3d08c7e Introduce ConversationSnapshot. -| * | 9471f24cf Introduce ConversationSnapshot. -* | | 8237a43d8 Merge branch 'mkirk/link-preview-restrictions' -|\ \ \ -| * | | cdb8663c8 fix up selecting after url case -| * | | 6d6d076c0 Use correct cache for LinkPreviewDraft, add stricter typing to help avoid similar issues. -| * | | 467dde2bc Try to avoid generating link previews while user is actively editing the URL -|/ / / -* | | f0e4c9f9b Merge branch 'charlesmchen/firstConversationCueVisibility' -|\ \ \ -| |/ / -|/| | -| * | dd1d02593 Fix "first conversation cue" visibility. -|/ / -* | a6ee64fe7 (tag: 2.37.0.2) "Bump build to 2.37.0.2." -* | 29b49d6f4 Enable new onboarding in production. -* | e68faf9ab Merge branch 'mkirk/increase-retries' -|\ \ -| * | 34585bdeb Increase message retries -|/ / -* | 41fb19df6 Merge branch 'nancy/uiAutomation1' -|\ \ -| * | 8ecad8867 Move the accessibility identifier macros into UIUtil.h. -| * | d0e4e081e added accessibility ids to HomeViewController and ProfileViewController -| * | a02531d22 Add accessibility identifiers to registration view. -|/ / -* | 0dc0ef644 (tag: 2.37.0.1) "Bump build to 2.37.0.1." -* | b9615bb53 Merge branch 'mkirk/fix-release-build' -|\ \ -| * | a01cb04d8 FIX: Onboarding controller sets phoneNumberAwaitingForVerification -|/ / -* | 247eab22c (tag: 2.37.0.0) reenable UNUserNotifications -* | 4b38653ee "Bump build to 2.37.0.0." -* | d26c095fe Merge remote-tracking branch 'origin/release/2.36.0' -|\ \ -| |/ -| * 35f79c1e9 (tag: 2.36.0.7, private/release/2.36.0, private/hotfix/2.36.1, origin/release/2.36.0) "Bump build to 2.36.0.7." -| * 4aaac90d3 sync translations -| * 0d5f9e010 Disable UserNotifications for this release -| * 1d409ef80 Merge branch 'mkirk/reply-marks-as-read' into release/2.36.0 -| |\ -| | * 1844bdbeb update pods -| | * 6c08f98fb replying to notification marks thread as read -| |/ -| * 1e0504e8f (tag: 2.36.0.6, release/2.36.0) "Bump build to 2.36.0.6." -| * 6287bd8f1 Merge branch 'mkirk/fix-crashes' into release/2.36.0 -| |\ -| | * 38da911d4 Don't crash when user has 0 saved photos -| | * db2294888 Fix crash after deleting message w/ link preview -| |/ -| * eae341a72 sync translations -| * d65353874 Merge branch 'mkirk/clear-notifications' into release/2.36.0 -| |\ -| | * 5e0c10a1a remove any lingering legacy notifications in modern notification adapter -| | * cb3a36ba3 Platform specific notification clearing -| |/ -| * cd13be64f Merge branch 'mkirk/cds-feedback-specifics' into release/2.36.0 -| |\ -| | * 0d5d5c693 limit reason length -| | * 62784a477 fix staging url -| | * 1de0ede52 (private/mkirk/cds-feedback-specifics) Specific CDS feedback -| |/ -* | b74e2309f Merge branch 'charlesmchen/onboardingPhoneNumberFormatting' -|\ \ -| * | 4d4b84078 Respond to CR. -| * | ef5cd5344 Fix the auto-format of phone numbers in the onboarding views. -|/ / -* | 1c832a04e Merge branch 'charlesmchen/onboardingCleanup2' -|\ \ -| * | f7d659bde Clean up onboarding changes. -| * | 850b36907 Clean up onboarding changes. -|/ / -* | 8d4cea0c2 Merge branch 'charlesmchen/onboardingHome' -|\ \ -| * | 3bb49e7d7 Respond to CR. -| * | d5944b4b9 Add first conversation prompt. -| * | c4cc5f574 Rework 'empty inbox' state of home view. -| * | edf09c92f Rework "empty inbox" state. -|/ / -* | 91aa9fcce Merge branch 'charlesmchen/onboarding2FA' -|\ \ -| * | 0b55ecc68 Sketch out the 'onboarding 2FA' view. -|/ / -* | 9d0813d7b Merge branch 'charlesmchen/onboardingProfile' -|\ \ -| * | 3ac77e5b0 Sketch out the 'onboarding profile' view. -| * | ab3b79cfe Sketch out the 'onboarding profile' view. -| * | afcacbb55 Sketch out the 'onboarding profile' view. -|/ / -* | d81e9d41f Merge branch 'charlesmchen/onboardingVerification2' -|\ \ -| * | e3946e577 Sketch out the 'onboarding code verification' view. -|/ / -* | 260d3253f Merge branch 'charlesmchen/onboardingVerification' -|\ \ -| * | e1dc534fe Respond to CR. -| * | b4aec5879 Sketch out the 'onboarding code verification' view. -| * | 854a75ae6 Sketch out the 'onboarding code verification' view. -| * | c2b2d38f2 Sketch out the 'onboarding code verification' view. -| * | efe5513c4 Sketch out the 'onboarding code verification' view. -| * | 1f922aa47 Sketch out the 'onboarding code verification' view. -| * | d193eec37 Sketch out the 'onboarding code verification' view. -|/ / -* | 0e6251454 Merge branch 'charlesmchen/onboardingCleanup' -|\ \ -| * | ead71d436 Clean up ahead of PR. -| * | ee200aaed Add validation warnings to 'onboarding phone number' view. -| * | 05d63fd6b Update font sizes in onboarding views. -| * | 8cfe768e8 Update font sizes in onboarding views. -| * | 6bc46fad6 Update permissions view. -| * | 8bdbe24bd Update permissions view. -| * | 78ea3e565 Update splash view. -| * | f6d6dd767 Update splash asset. -|/ / -* | 91834454a Respond to CR. -* | 4d72e0d5d Merge branch 'charlesmchen/onboardingCaptcha' -|\ \ -| * | b9d94e77f Respond to CR. -| * | 413d3cdbd Sketch out CAPTCHA onboarding view. -| * | 58abf7624 Sketch out CAPTCHA onboarding view. -| * | df12f71b7 Sketch out CAPTCHA onboarding view. -| * | 9381220d8 Sketch out CAPTCHA onboarding view. -| * | 8a97503b1 Sketch out CAPTCHA onboarding view. -|/ / -* | c54c25c1c Merge branch 'charlesmchen/onboardingPhoneNumber' -|\ \ -| * | 57394f001 Respond to CR. -| * | 21b618396 Fix rebase breakage. -| * | 1411148c7 Sketch out the 'onboarding phone number' view. -| * | b65886631 Sketch out the 'onboarding phone number' view. -| * | 2a4b9426c Sketch out the 'onboarding phone number' view. -|/ / -* | f25e54f58 Merge branch 'charlesmchen/imageEditorCrop2' -|\ \ -| * | c0f907c44 Respond to CR. -| * | 69c5492fc Clean up ahead of PR. -| * | 331a013f8 Clean up ahead of PR. -| * | 922f787ff Clean up ahead of PR. -| * | 618a3b1d4 Sketch out crop tool. -| * | 080732519 First draft of image editor's text tool. -|/ / -* | 8eb760421 Merge branch 'charlesmchen/callSetupTimeLogging' -|\ \ -| * | d62fa19cb Respond to CR. -| * | ed30b15fd Add call setup time logging. -|/ / -* | d9b23a9ad Merge branch 'charlesmchen/onboardingSplash' -|\ \ -| * | 54c8c1f35 (private/charlesmchen/onboardingSplash) Sketch out the onboarding splash view. -|/ / -* | 9fb08c117 Merge branch 'charlesmchen/onboarding' -|\ \ -| * | d6826b94e Respond to CR. -| * | 407571c9d Sketch out the onboarding permissions view. -| * | 29e65a93a Sketch out the onboarding permissions view. -| * | 18c4ed4a2 Sketch out the onboarding permissions view. -| * | 193c3dd96 Sketch out the onboarding permissions view. -| * | 2c0aa7a22 Sketch out the onboarding permissions view. -|/ / -* | bb64dc1bc Merge branch 'mkirk/main-thread-registration-update' -|\ \ -| * | af475aa1e update registration state on main thread -|/ / -* | 1a24102a4 Merge branch 'mkirk/fix-sort' -|\ \ -| * | a1b412c70 Fix "missed calls" not sorting threads -|/ / -* | 273974880 Update Signal info plist. -* | 9c93a03d2 Merge branch 'charlesmchen/imageEditorText' -|\ \ -| |/ -|/| -| * 73b36c540 Respond to CR. -| * 2f00cbdfe First draft of image editor's text tool. -| * 6ac2dd7ea First draft of image editor's text tool. -| * 3f8ea271b First draft of image editor's text tool. -|/ -* 4e172fe8b (tag: 2.36.0.5) "Bump build to 2.36.0.5." -* 44ea962c3 Merge branch 'mkirk/fix-call-back-action' -|\ -| * b0254fddd Fix call-back action, which requires phone number -|/ -* b22348f86 sync translations -* eb2db19ea Merge branch 'mkirk/fixup-lock' -|\ -| * 2c59b1bf1 fix iPhoneX layout -|/ -* 8746055e1 Merge branch 'mkirk/note-to-self-avatar-2' -|\ -| * cc2e062b8 CR: clean up graphics context code -| * 2323cc21f note-to-self avatar -|/ -* 56d3b2a3c (tag: 2.36.0.4) update plist -* 86babb49e "Bump build to 2.36.0.4." -* ce5478520 move nb_NO -> nb -* 8453df436 sync translations -* 182ddf737 update starscream -* 285ba14df Merge branch 'mkirk/voice-note-lock2' -|\ -| * d29ce740c Voice Note Lock -|/ -* a566145d5 Merge branch 'mkirk/missing-protocol-error' -|\ -| * 8cda3c887 (private/mkirk/missing-protocol-error) error when missing required protocol methods -|/ -* d59ebae39 Merge tag '2.35.0.13' -|\ -| * d14fdb7e1 (tag: 2.35.0.13, private/release/2.35.0) "Bump build to 2.35.0.13." -| * 25422bcdf Update l10n strings. -* | ae60ba9d1 (tag: 2.36.0.3) "Bump build to 2.36.0.3." -* | ea547fa46 Merge tag '2.35.0.12' -|\ \ -| |/ -| * 4afcb34c4 (tag: 2.35.0.12) "Bump build to 2.35.0.12." -| * 0acac9a60 Merge branch 'charlesmchen/instaCDn' into release/2.35.0 -| |\ -| | * f575c0f10 Add fbcdn.net to link previews media whitelist. -| |/ -| * 2e150d32e Merge branch 'mkirk/webrtc-m72' into release/2.35.0 -| |\ -| | * a573bd4d3 update WebRTC artifact to M72 -| |/ -| * 312cae9c3 (tag: 2.35.0.11) "Bump build to 2.35.0.11." -| * 94089f1d5 Merge branch 'charlesmchen/linkNewDeviceVsOrientation' into release/2.35.0 -| |\ -| | * 4cbe3236e Respond to CR. -| | * 6bfe0f041 Ensure 'link new device' view is portrait. -| | * bf685776b Ensure 'link new device' view is portrait. -| | * 7a990ed1f Ensure 'link new device' view is portrait. -| |/ -* | f94796b6d Merge branch 'mkirk/notification-title' -|\ \ -| * | fe4e416da filter notification text -| * | d88ffc477 Notification titles for iOS10+ -|/ / -* | 1dbb9849c Remove 'message receipt ordering' logging. -* | 7d5057f54 (tag: 2.36.0.2) "Bump build to 2.36.0.2." -* | bb4672089 Add logging around socket ordering. -* | d920b2551 Merge branch 'charlesmchen/sessionManagerPools' -|\ \ -| * | 2cdb7bb0e Respond to CR. -| * | 928b0a163 Add session manager pools. -| * | e2b92ed42 Add session manager pools. -| * | 280b9378b Add session manager pools. -|/ / -* | 5fd6b52eb Merge branch 'mkirk/notifications' -|\ \ -| * | b02e57e59 update pods -| * | a6a7616fd move notification action handlers to environment -| * | c2aee429b move ContactsManager to local dependency -| * | fe84275cc Respect audio preferences/throttling -| * | 1bfe69189 In app notifications for iOS10+ -| * | 312384201 rename CallNotificationsAdapter.swift -> NotificationsAdapter.swift -| * | c01284f84 beef up notifications DebugUI -| * | 11afc967d move NotificationsManager behind NotificationsAdapter -| * | ac3bbe26b rename CallNotificationsAdapter->NotificationsAdapter -|/ / -* | 18df5e43e (tag: 2.36.0.1) "Bump build to 2.36.0.1." -* | 501e883cc Merge tag '2.35.0.10' -|\ \ -| |/ -| * feebd551e (tag: 2.35.0.10) "Bump build to 2.35.0.10." -| * fb62ffbd4 Merge branch 'charlesmchen/inputToolbarBorder' into release/2.35.0 -| |\ -| | * dd506430d Fix the input toolbar border. -| |/ -| * 0a522b8f0 Merge branch 'mkirk/ios9-cds' into release/2.35.0 -| |\ -| | * 5f5962325 fix CDS for iOS9 -| |/ -| * 4a56c1c05 (tag: 2.35.0.9) "Bump build to 2.35.0.9." -| * 808b6d2cb Merge branch 'charlesmchen/launchIntoPortrait' into release/2.35.0 -| |\ -| | * 2d55ff096 Require app to launch in portrait orientation. -| |/ -| * 7df69f84d (tag: 2.35.0.8) "Bump build to 2.35.0.8." -* | 83e2c7671 Merge branch 'charlesmchen/outOfOrderLogging' -|\ \ -| * | 63a5de185 Add logging around socket ordering. -|/ / -* | 229450bc4 Enable 'note to self' feature flag. -* | 690eaa4d2 (tag: 2.36.0.0) "Bump build to 2.36.0.0." -* | 817328844 "Bump build to 2.35.1.0." -* | 4fdb18f50 Merge branch 'charlesmchen/callSetup' -|\ \ -| |/ -|/| -| * 867efb62f Respond to CR. -| * 41b7205b0 Clean up ahead of PR. -| * 6b3fe0453 Use connection property for errors in message receiver. -| * bb1759297 Fail call if ICE updates fail to send. -| * 70185dd87 Batch outgoing ICE updates. -| * 5bb78cba2 Tune concurrency in call service. -| * 6b5952abd Move work off main thread. -| * 4feb0011d Reduce logging. -|/ -* 9ea398afd Merge branch 'charlesmchen/maxBodyMediaWidth' -|\ -| * 6a132a065 Add upper bound on body media size. -| * 4827de5d8 Add upper bound on body media size. -|/ -* 10e674a22 Merge branch 'charlesmchen/linkPreviewsInputBackground2' -|\ -| * f71483a20 Fix input toolbar background in dark mode. -| * a222a12fa Fix input toolbar background in dark mode. -|/ -* 1f99b5780 (tag: 2.35.0.7) "Bump build to 2.35.0.7." -* 3b9fe50b4 Merge branch 'charlesmchen/linkPreviewsInputBackground' -|\ -| * 230612f02 Fix input toolbar background in dark mode. -|/ -* 41922dfd2 Merge branch 'charlesmchen/orientationVsBackgroundScreenshot' -|\ -| * 12e57ecd2 Improve background screenshots v. orientation. -|/ -* 67c32490b Merge branch 'charlesmchen/linkPreviewsFixOmnibus3' -|\ -| * 6fa4e52a8 Fix link preview activity indicator in dark theme. -| * 445daed60 Update splash asset. -|/ -* 94a377b4f (tag: 2.35.0.6) "Bump build to 2.35.0.6." -* 9e132400c Merge branch 'charlesmchen/linkPreviewsSplash2' -|\ -| * 1023d18c4 Add link previews splash. -|/ -* ef363ddf5 Merge branch 'charlesmchen/linkPreviewsSplash' -|\ -| * f5e35eca4 Add link previews splash. -|/ -* 938353c14 Update reverse integration check. -* e53dfa86c Update localization. -* 2c71cd92e (tag: 2.35.0.5) "Bump build to 2.35.0.5." -* cf93949b4 Merge branch 'charlesmchen/syncLinkPreviewsSetting' -|\ -| * 4be302bbe Update link previews setting behavior. -| * 77396e11f Send sync messages with link previews preference. -| * b1cce5ef7 Add link previews preference to configuration protos. -|/ -* 4c9b3a3ed Merge branch 'charlesmchen/fixNavigateToQuotedReply' -|\ -| * 3d1b930e0 Fix navigation to quoted replies outside load window. -|/ -* ef62bcd00 Disable 'Note to Self.' -* 60163c2ce Merge branch 'charlesmchen/linkPreviewsUserAgent' -|\ -| * 6d967cb31 Fix 'link preview prefs taint cache' issue. -| * 890dfdcc0 Fix reset of 'link preview cancelled' state. -| * f2d580cae Update user agent for proxied content downloads. -|/ -* 4de09bc7b Merge branch 'charlesmchen/linkPreviewsMigration' -|\ -| * 910df7069 Link previews migration. -| * 7f2ca6061 Link previews migration. -|/ -* a4873123f Merge branch 'charlesmchen/linkPreviewsStyle' -|\ -| * 2b71c433a Update appearance of draft quoted replies. -| * 25fd43d64 Update appearance of draft quoted replies. -| * ccb174120 Tweak conversation input toolbar layout. -|/ -* 32d0433ee (tag: 2.35.0.4) "Bump build to 2.35.0.4." -* 26de1beb1 Merge branch 'charlesmchen/removeSafeAreaInsetsHack' -|\ -| * 57a9f464d Revert "Remove safe area insets hack in conversation input toolbar." -| * 67a8e90f3 (tag: 2.35.0.3) "Bump build to 2.35.0.3." -| * 70775e785 Remove safe area insets hack in conversation input toolbar. -|/ -* 70359b184 Merge branch 'charlesmchen/doubleActivation' -|\ -| * 39de96ac2 Re-enable landscape orientation; fix 'double activation' issue. -| * c31938a33 Enabled landscape. -|/ -* 5311847c6 Merge branch 'charlesmchen/noSonarPing' -|\ -| * c359f2b70 Replace "connecting/sonar ping" with "outbound ringing." -|/ -* 3c0235d57 Enable 'note to self' feature flag. -* 8857f3214 Merge remote-tracking branch 'private/charlesmchen/linkPreviewsFixOmnibus2' -|\ -| * b0704074b Rework quoted attachments. -| * 56dfdaf6e Align draft view of link preview and draft view of quoted reply. -|/ -* 024d8f752 (tag: 2.35.0.2) "Bump build to 2.35.0.2." -* b614d33a2 Merge remote-tracking branch 'private/charlesmchen/linkPreviewsFixOmnibus' -|\ -| * 5830c6240 Fix quoted reply image aspect ratio. -| * 75e017b2c Align draft view of link preview and draft view of quoted reply. -| * c02d63327 Align draft view of link preview and draft view of quoted reply. -| * bba679eae Add user-agent for media downloads. -| * 0cc667d12 Fix spacing between quoted replies and link previews in sent message bubbles. -| * e4d11eb15 Fix conversation text input background color. -| * 0ce9d1a85 Always re-encode link preview images as JPEG even if they don't need to be resized. -| * 9c806d59d Safely ignore invalid link preview images. -|/ -* 673588a98 Merge branch 'charlesmchen/linkPreviewVsTitleNewlines' -|\ -| * c68eee5bf Accept newlines in link preview titles. -|/ -* fdb696f97 (tag: 2.35.0.1) "Bump build to 2.35.0.1." -* 569ebfb3a Merge branch 'charlesmchen/linkPreviewMoreRefinements2' -|\ -| * 957a73383 Yet more link preview refinements. -|/ -* 98faed28e Merge branch 'charlesmchen/linkPreviewsReviseWhitelists' -|\ -| * b48d5fbcf Revise link preview domain whitelists. -|/ -* cf4c83341 Merge branch 'charlesmchen/linkPreviewsCleanup' -|\ -| * f174d5be6 Clean up link previews. -|/ -* 473f1e6ee Merge branch 'charlesmchen/flushDBChanges' -|\ -| * c6387e7c6 Simplify the logic to flush database changes. -| * e7b9f7da9 Flush multi-process writes more aggressively. -|/ -* f9bbbbd0c Merge branch 'charlesmchen/linkPreviewTests2' -|\ -| * 4c5b9001c Elaborate the link preview tests. -|/ -* fdefb2ff4 Merge branch 'charlesmchen/linkPreviewTests' -|\ -| * 2e9f2e615 Elaborate the link preview tests. -|/ -* 4e1098475 Merge branch 'charlesmchen/linkPreviewDataDetector' -|\ -| * 090dd1f52 Use NSDataDetector to extract URLs for link previews. -|/ -* b29808065 Merge branch 'charlesmchen/fixLinkPreviewTests' -|\ -| * 744d3074a Fix link preview tests. -|/ -* aff7d8320 (tag: 2.35.0.0) "Bump build to 2.35.0.0." -* 9ae817d94 Merge branch 'charlesmchen/linkPreviewImageMaxSize' -|\ -| * b5cf497ff Update Cocoapods. -| * e4d5926b3 Resize link preview images if necessary. -| * 9149282e9 Resize link preview images if necessary. -| * 9b33d70d7 Constrain max size of link preview image. -|/ -* e35c6eaf6 Merge branch 'charlesmchen/conversationViewInvalidation_' -|\ -| * 9efe1377a Refine invalidation of conversation view layout. -|/ -* 096e54da6 Merge branch 'charlesmchen/fakeProfileManagerWarnings' -|\ -| * c4274d63c Fix build warnings in fake profile manager. -|/ -* b14006e08 Merge branch 'charlesmchen/linkPreviewsComposeCancel' -|\ -| * 1df8b9203 Update cancel button asset for link previews. -|/ -* cad5ab387 Merge branch 'charlesmchen/linkPreviewsPrefCopy' -|\ -| * b20172e44 Update the copy for the link previews preference. -|/ -* 3541be18c Merge branch 'charlesmchen/linkPreviewsRefinements2' -|\ -| * 019ddb241 Fix measurement of link previews. -|/ -* f6e6142f8 Merge branch 'charlesmchen/linkPreviewsRefinements3' -|\ -| * e172eeff0 Link preview preference should only affect outgoing link previews. -|/ -* 5b645db73 Merge branch 'charlesmchen/linkPreviewsSegmentedDownloads' -|\ -| * d0cc0dbfc Update Cocoapods. -| * 23980152f Segment proxied content downloads. -| * db15ff9a2 Segment proxied content downloads. -| * 4e7dbc486 Segment proxied content downloads. -|/ -* bf4c43f06 Merge branch 'charlesmchen/linkPreviewsRefinements' -|\ -| * 635b5740a Add missing domain to link preview whitelist. -| * e2747dc70 Fix glitch in link loading. -| * d2347f2b0 Add missing stroke to loading state of link preview view. -| * 82ceb044e Use link preview image when quote replying. -| * b002c0c9e Refine link parsing and validation logic. -|/ -* 8153926bb Merge branch 'charlesmchen/fixBuildWarningsNullability' -|\ -| * a7d848ef7 Add missing nullability annotations. -| * becd72329 Fix build warnings about nullability. -|/ -* 772e73a8d Merge branch 'charlesmchen/linkPreviewsApprovalLayout' -|\ -| * eb7c6ff44 Respond to CR. -| * 9b7ae86a6 Rework layout of conversation input toolbar. -| * 6ff6ee2e2 Rework layout of conversation input toolbar. -|/ -* 8a8d1f43f update pods -* 62023659a Revert PromiseKit update for now -* 06f26eca4 Merge branch 'mkirk/update-pods-2' -|\ -| * dfc1df838 update pods -|/ -* 88301cbc2 Merge branch 'charlesmchen/linkPreviewsAttachmentCleanup' -|\ -| * 7e9c3b2da Clean up all message attachments. -|/ -* 1ab5a7ed6 Merge branch 'charlesmchen/linkPreviewsVsIncomingAttachments' -|\ -| * 7d4e89daa Discard link previews if incoming message has attachments. -|/ -* aa1f90757 Merge branch 'charlesmchen/linkPreviewsOpen' -|\ -| * 8452f5e74 Open link preview URLs when tapped. -|/ -* 00f0d4490 Merge branch 'charlesmchen/linkPreviewsSentView' -|\ -| * a51182321 Respond to CR. -| * 3d757b492 Add link previews to conversation message bubbles. -| * ca8a4b375 Make LinkPreviewView reusable. -| * c7053aa36 Add link previews to converastion view items. -|/ -* f62e48f4b Merge branch 'charlesmchen/linkPreviewsTempFiles' -|\ -| * 0569ed3f5 Respond to CR. -| * f73f10071 Link preview temp files. -|/ -* 186e4e14d Merge branch 'charlesmchen/linkPreviewsPreference' -|\ -| * feaf5253a Update Cocoapods. -| * 1b87e3165 Add link previews setting. -| * c57b0d98c Add link previews setting. -|/ -* 8c7c9b27a Merge tag '2.34.0.26' -|\ -| * bdd7d53c7 (tag: 2.34.0.26, private/release/2.34.0) "Bump build to 2.34.0.26." -| * 7ed79c2ed Update l10n strings. -| * f822ee737 (release/2.34.0) Merge branch 'charlesmchen/shareAllMediaInAlbum' into release/2.34.0 -| |\ -| | * 79000d5fb Save and share all items in album. -| | * 8dc6ea0c0 Revert "Save and share all items in album" -| | * 4fda1be3f Save and share all items in album -| |/ -| * baa42dc91 Merge branch 'mkirk/ios9-10-picker' into release/2.34.0 -| |\ -| | * 293da74c5 Fix title view for iOS9/10 -| |/ -| * 131945a64 Merge branch 'mkirk/body-text-limit' into release/2.34.0 -| |\ -| | * 896a9f78f limit media message body to 2k chars -| |/ -| * 7f47fd251 allow batch deselection when at attachment limit -| * 14436da2e Merge branch 'mkirk/pan-select' into release/2.34.0 -| |\ -| | * 34d11dda4 bulk deselect -| | * 599a57e3a (private/mkirk/pan-select) Pan horizontal to bulk select images -| |/ -| * 3ac9732b6 Merge branch 'mkirk/fix-miscolored-status-bar' into release/2.34.0 -| |\ -| | * f1e508cb6 (private/mkirk/fix-miscolored-status-bar) Recover status bar style when canceling PhotoPicker -| |/ -| * df4e5eb73 Merge branch 'mkirk/max-attachment-toast' into release/2.34.0 -| |\ -| | * 169581f12 (private/mkirk/max-attachment-toast) show toast when selecting too many items -| |/ -| * f5be0d545 Merge branch 'mkirk/fix-offset' into release/2.34.0 -| |\ -| | * 870a7f292 Fix scroll offset for non-iPhoneX devices -| |/ -* | b5596dcdb Merge branch 'charlesmchen/linkPreviews5b' -|\ \ -| * | a7144abf9 Respond to CR. -| * | 416aa2b34 Add rough draft of link preview view to composer. -|/ / -* | 977ee9ffe Merge remote-tracking branch 'private/release/2.34.0' -|\ \ -| |/ -| * 710b80e56 Merge branch 'charlesmchen/noteToSelfFeatureFlag' into release/2.34.0 -| |\ -| | * 7878c0fac Add feature flag for 'note to self'. -| |/ -| * 7f1c6a84c (tag: 2.34.0.25) "Bump build to 2.34.0.25." -| * 3d3928691 Update l10n strings. -| * cf2371222 Merge branch 'mkirk/fix-must-reselect' into release/2.34.0 -| |\ -| | * 066b40059 Honor selection with "Add More" -| |/ -| * bd5148d27 (tag: 2.34.0.24) "Bump build to 2.34.0.24." -| * 99478047c Merge branch 'mkirk/fix-missing-retry' into release/2.34.0 -| |\ -| | * 343c7d8ec Remove timer queue. -| | * 323249baa NSRunLoop methods should only be accessed on it's corresponding thread. -| | * 64cdaae02 schedule retry timer on main run loop -| |/ -| * a479e4162 Merge branch 'charlesmchen/sortIdMigrationRobustness' into release/2.34.0 -| |\ -| | * debf2e7a9 Fix 'mutation during enumeration' and 'bad ordering' crashes. -| |/ -| * fc36fe4fc Merge branch 'charlesmchen/convoLoadMore' into release/2.34.0 -| |\ -| | * 127ccccb8 Tweak conversation view's "load more" behavior. -| |/ -| * 70f4d69fb Merge branch 'mkirk/fix-missing-captionview' into release/2.34.0 -| |\ -| | * 3c0982e0f Fix missing captionView when navigating via RailView -| |/ -| * c5d568de5 (tag: 2.34.0.23) "Bump build to 2.34.0.23." -| * b23a8b75d Merge branch 'charlesmchen/landscapeOrientationFeatureFlag' into release/2.34.0 -| |\ -| | * be714399c Add feature flag for landscape orientation. -| | * eab3599ce Add feature flag for landscape orientation. -| |/ -| * cef28eb10 (tag: 2.34.0.22) "Bump build to 2.34.0.22." -| * acab31bb6 Merge branch 'charlesmchen/syncDeviceOrientation' into release/2.34.0 -| |\ -| | * 9d020e490 Respond to CR. -| | * 48fda586c Sync device orientation when conversation view and home view appear. -| |/ -| * a5d9a40c8 Merge branch 'charlesmchen/shareExtensionNavbar' into release/2.34.0 -| |\ -| | * 635a644e2 Fix safe area insets in SAE. -| | * 50f9a089b Fix navbar layout in share extension. -| |/ -| * 4f0c26d5c Merge branch 'charlesmchen/unlinkDeviceName' into release/2.34.0 -| |\ -| | * db30ffb75 Decrypt device name in unlink confirmation alert. -| |/ -| * 83309616b (tag: 2.34.0.21) "Bump build to 2.34.0.21." -| * a372e00ab Merge branch 'charlesmchen/tapAlbumWithFailedImage2' into release/2.34.0 -| |\ -| | * e91195385 Respond to CR. -| | * 04a300784 Respond to CR. -| | * 42762ad90 Allow taps in albums with failed images. -| |/ -| * b6e28adfe Merge branch 'charlesmchen/inputToolbarMarginsVsRotation3' into release/2.34.0 -| |\ -| | * b8e2cb626 Respond to CR. -| | * 18c890bb9 Fix input toolbar margins issue. -| |/ -| * 8d8744998 Merge branch 'mkirk/eagerly-load-rail' into release/2.34.0 -| |\ -| | * 7fddb3571 eagerly load entire album to populate rail -| |/ -| * 101d17cfe Merge branch 'mkirk/video-select' into release/2.34.0 -| |\ -| | * a497e44ce (private/mkirk/video-select) Fix iCloud download -| | * 59e037986 Show error when image request fails -| |/ -* | 6ce673626 Merge branch 'charlesmchen/linkPreviews5a' -|\ \ -| * | d6a51a2a4 Fix merge breakage. -| * | f37aacca8 Respond to CR. -| * | 2dcc79fbc Fix issues around link previews. -|/ / -* | dd7ff1360 Merge branch 'charlesmchen/linkPreviews4' -|\ \ -| * | e819f777d Update Cocoapods. -| * | 6e044675a Respond to CR. -| * | 8e44bf554 Respond to CR. -| * | d775a70a8 Build link previews. -| * | 31ea64bda Build link previews. -|/ / -* | d87fc27e7 Merge branch 'mkirk/faster-contact-search' -|\ \ -| * | 721f33029 warm non-signal accounts cache in the background -|/ / -* | 168c77c6f Merge branch 'mkirk/unblock-reads' -|\ \ -| * | 0fb6dab02 avoid blocking write connection with long running read when building sync message -|/ / -* | 2233957b8 Merge branch 'mkirk/contact-search' -|\ \ -| * | 0c1b2e9f4 CR: remove unnecessary param, clearer code, comment typo -| * | 6e50a5353 rename for clarity -| * | b4908e71e Use FTS for compose picker search -|/ / -* | 1d24fa7c5 Fixup WebSocket -* | e4bb34542 Merge branch 'mkirk/websocket-swift' -|\ \ -| * | 16c8a1a76 replace SocketRocket with Starscream -|/ / -* | 4b3c43eed Merge branch 'charlesmchen/linkPreviews3' -|\ \ -| * | 55d634d40 Update Cocoapods. -| * | f13c1de73 Respond to Cr. -| * | 55376975f Add link preview parsing and validation logic. -|/ / -* | 74ccee26a Merge branch 'charlesmchen/linkPreviews2' -|\ \ -| * | 45b93cc4b (private/charlesmchen/linkPreviews2) Respond to CR. -| * | a477e01a4 Apply LinkPreview model. -| * | 4eb05e369 Add LinkPreview model. -|/ / -* | 631de58b0 Merge branch 'charlesmchen/linkPreviews1' -|\ \ -| |/ -|/| -| * aa916965d Update protos to reflect link previews. -| * 5a529567a Update protos to reflect link previews. -| * 76f410b2b Update protos to reflect link previews. -|/ -* 623c2574d Merge branch 'mkirk/dont-select-unless-batch' -|\ -| * 5fdb88ddf Don't add to selection unless in batch select mode -|/ -* 2df6ae2cf Merge branch 'mkirk/scroll-to-bottom-when-switching-albums' -|\ -| * 924b8b18b Scroll to bottom when switching albums -|/ -* ff2fdcb7e Merge branch 'mkirk/fix-conversion' -|\ -| * 119f30978 Fixup database conversion vis a vis SQLCipher4 -|/ -* 96fffb92c Merge tag '2.33.1.0' -|\ -| * 5568482e4 (tag: 2.33.1.0, private/hotfix/2.33.1, origin/hotfix/2.33.1, origin/charlesmchen/uiAutomation, charlesmchen/uiAutomation) "Bump build to 2.33.1.0." -| * cc4d85a91 Encrypted device names. -* | ed15e5cc4 Update YapDB to fix DB conversion logic -* | 433ef0823 (tag: 2.34.0.14) "Bump build to 2.34.0.14." -* | fba26653c "Bump build to 2.34.0.13." -* | a8ba8b668 Merge branch 'charlesmchen/imagePickingFixes' -|\ \ -| * | 63aa71c31 Respond to CR. -| * | 6c38f8d14 Only complete media loads once. -| * | 6b100e80e Only enter batch select mode if user uses "add more" button. -|/ / -* | 3e36dcf91 Merge branch 'charlesmchen/conversationRotationVsScrollContinuity' -|\ \ -| * | d32372ec2 Respond to CR. -| * | 9dda2fa8c Improve scroll state continuity during conversation view rotations. -|/ / -* | 1fc90974f (private/mkirk/remain-landscape-after-media-dismiss) Merge branch 'charlesmchen/honorAlbumSelectionOrder' -|\ \ -| * | 9051191ba Honor album selection order. -|/ / -* | af81404e4 Merge branch 'mkirk/remain-landscape-after-media-dismiss' -|\ \ -| * | 0f85e52ec Remain landscape after media dismiss -|/ / -* | c5cd52db0 Merge branch 'charlesmchen/cullUnknownMigrations' -|\ \ -| * | efd1be30c Cull unknown migrations. -|/ / -* | 162a4894e Merge branch 'mkirk/remove-feature-flag' -|\ \ -| * | 371ff08d4 remove legal terms feature flag -|/ / -* | 145a94cf3 Merge branch 'mkirk/ci-label-branches' -|\ \ -| * | 0795fc911 ci labels PRs with GH title -|/ / -* | d58ffed11 Merge branch 'mkirk/bump-migration' -|\ \ -| * | 0e78f9912 bump migration version -|/ / -* | 6fccd76cd update pods -* | 444c2af65 Merge branch 'mkirk/clientside-registration-validation' -|\ \ -| * | eb71c4979 registration validator -|/ / -* | cd70f9d0c move to yapdb@signal-release -* | 73f622db6 (tag: 2.34.0.5) "Bump build to 2.34.0.5." -* | 7fb2f2dc1 (tag: 2.34.0.4) "Bump build to 2.34.0.4." -* | 1440998cb Merge branch 'mkirk/sqlcipher4' -|\ \ -| * | 5708754d3 update to sqlcipher4 -|/ / -* | 7e3ccad22 Merge branch 'mkirk/area-code-inference' -|\ \ -| * | 60f816c74 Area code inference for US and Brazil -| * | 5d9e03ba4 convert to guard statements for readability -| * | ea76ea949 fix phone number parsing test -|/ / -* | f5a36ad5b Merge branch 'charlesmchen/landscapeOrientation6' -|\ \ -| * | cb228bdd2 Fix conversation view keyboard. -| * | bf0d92acf Landscape layout in gif picker. -|/ / -* | 8577221b5 Merge branch 'charlesmchen/landscapeOrientation7' -|\ \ -| * | ec16860e4 Fix "device won't rotate after calls" issue. -|/ / -* | 34833b8cb (tag: 2.34.0.3) "Bump build to 2.34.0.3." -* | fe00781ce Merge branch 'charlesmchen/landscapeOrientation4' -|\ \ -| * | 4ab0c8fe5 Landscape orientation. -| * | 2ddde368e Landscape orientation. -| * | b668237e8 Landscape orientation. -|/ / -* | d4d72448d Merge branch 'charlesmchen/landscapeOrientation2' -|\ \ -| * | 82d151746 Landscape orientation. -| * | ff24e826c Landscape orientation. -| * | 7654d0541 Landscape orientation. -|/ / -* | a0bf2717a Merge branch 'charlesmchen/landscapeOrientation3' -|\ \ -| * | 18a1d49b4 Landscape orientation. -| * | 721cab788 Landscape orientation. -| * | 9497a38d7 Landscape orientation. -| * | b5d5822b7 Landscape orientation. -| * | 5adcbac5e Landscape orientation. -| * | aefe0eabe Landscape orientation. -| * | 045b11272 Landscape orientation. -|/ / -* | 5fc88789b Merge branch 'charlesmchen/landscapeOrientation1' -|\ \ -| * | 460f160cb Landscape orientation. -|/ / -* | feac8d264 Merge branch 'mkirk/enable-multisend' -|\ \ -| * | 099b9f60c enable multisend -|/ / -* | fe5997970 Merge branch 'mkirk/multisend-delete-icon' -|\ \ -| * | 0ab326da9 Only show delete button on selected rail item -|/ / -* | 268d1c4b6 (tag: 2.34.0.2) "Bump build to 2.34.0.2." -* | c76bc6dba Merge branch 'charlesmchen/fixRegistration' -|\ \ -| * | 63260ee94 Fix registration. -|/ / -* | 736d0c421 Merge branch 'charlesmchen/removeLockInteractionController' -|\ \ -| * | c0922fc2c Remove LockInteractionController. -|/ / -* | 517458dc6 Merge tag '2.33.0.12' -|\ \ -| |/ -| * 74274e58d (tag: 2.33.0.12, private/release/2.33.0) "Bump build to 2.33.0.12." -* | d873ac278 Merge branch 'mkirk/fix-ios9-crash' -|\ \ -| * | 014cf9c50 fix crash on iOS9 -|/ / -* | 76c7ea8f7 Merge branch 'mkirk/fix-image-editor-swipe' -|\ \ -| * | 265552ae0 enable multisend in debug -| * | c690ac271 allow deselecting tool -| * | a8200d6f4 Fix swipe between multi-images -|/ / -* | 5cc02501f Merge branch 'charlesmchen/conversationViewModelAssert' -|\ \ -| * | c30f15522 Fix overzealous assert. -|/ / -* | 3f4ff2321 (tag: 2.34.0.1) "Bump build to 2.34.0.1." -* | 8dddea3c6 Merge branch 'charlesmchen/conversationScrollRefinements' -|\ \ -| * | 7df17251a Fix edge cases in conversation view scroll continuity. -| * | b92051c88 Fix edge cases in conversation view scroll continuity. -| * | 6b881b9ef Fix edge cases in conversation view scroll continuity. -|/ / -* | c92e0959c Update info.plist to reflect WebRTC update. -* | 4daf764bd Merge branch 'mkirk/ci' -|\ \ -| * | edab44b89 include url in status message -| * | b95dcd4ae fix broken test -| * | 2233d4c72 Add jenkinsfile -| * | 2a2f30e2a update fastlane -| * | 5fe26b4ba bump ruby version -|/ / -* | b09ad7bf9 Merge branch 'charlesmchen/conversationViewMapping' -|\ \ -| * | f90e49226 Respond to CR. -| * | 46b0cdb87 Caution around group avatars. -| * | 73f5d9237 Avoid overflow. -| * | f32edc93e Tweak conversation view animations. -| * | 435379926 Introduce conversation view mapping; rework conversation view scrolling. -| * | c5b0c7305 Introduce conversation view mapping; rework conversation view scrolling. -| * | c775dbcd6 Introduce conversation view mapping; rework conversation view scrolling. -|/ / -* | 371a6a6f1 Merge branch 'mkirk/m71' -|\ \ -| * | e09155160 Fix: subsequent video calls fail to transmit video -| * | 91cf02271 WebRTC M71 -|/ / -* | befe37a8d Merge branch 'charlesmchen/signalingKey' -|\ \ -| * | 951f0dab2 Respond to CR. -| * | 3a5de59dc Try to update account attributes every time we upgrade. -| * | ed25f4748 Deprecate 'signaling key'. -|/ / -* | b29f55b99 Merge branch 'charlesmchen/noSearchResultsSeparators' -|\ \ -| * | 858e47b9b Remove unsightly separators from 'no search results' state. -|/ / -* | aabb468bf Merge branch 'charlesmchen/noSessionForTransientMessages' -|\ \ -| * | 78d0685cb Discard transient messages if there is no session. -|/ / -* | 27bc569fb Merge branch 'charlesmchen/unseenVsUnreadViews' -|\ \ -| * | 1934b5d58 Tweak unseen database view accessor. -|/ / -* | 4011ee025 Merge branch 'charlesmchen/imageEditorFeatureFlag' -|\ \ -| * | 5e3de84fd Add feature flag for image editor. -|/ / -* | 8d8469d1c Merge branch 'charlesmchen/noteToSelf2' -|\ \ -| * | 9ab8bec2b Fix searching for 'note to self'. -|/ / -* | f68c1e179 Update Cocoapods. -* | 914d12eda Merge branch 'mkirk/fix-timer-update-message' -|\ \ -| * | 432af13b6 Fix timer update message. -|/ / -* | 5ec28406e (tag: 2.34.0.0) "Bump build to 2.34.0.0." -* | de8abe269 Merge branch 'charlesmchen/noteToSelf' -|\ \ -| * | 449633e0d Respond to CR. -| * | a7909c9c2 Note to Self. -| * | fc8fbebd9 Note to Self. -| * | 1d13a0292 Note to Self. -| * | e52feb3c3 Note to Self. -|/ / -* | f2e44487a Merge branch 'charlesmchen/imageEditor6' -|\ \ -| * | fcedd1d10 Revert "Revert "Revert "Debug scaffolding.""" -| * | 8aa68327e Add primitive color picker. -| * | e6d499a35 Revert "Revert "Debug scaffolding."" -|/ / -* | 58cb02bc9 Merge branch 'charlesmchen/imageEditor5' -|\ \ -| * | a440f692c Clean up image editor temp files. -| * | b24e8e4f8 Use autoreleasepool when rendering image editor output. -| * | 2b25d875b Don't select a tool by default in image editor view. -|/ / -* | 8736db96a Merge branch 'charlesmchen/imageEditor4' -|\ \ -| * | 5dcde4448 Image editor fixes. -| * | 17c3ba058 Image editor fixes. -| * | a6bc32877 Revert "Revert "Revert "Debug scaffolding.""" -| * | 5ac6d97bc Revert "Revert "Debug scaffolding."" -|/ / -* | ab8122d9a Merge branch 'charlesmchen/attachmentCrash' -|\ \ -| * | dc6dadad4 Respond to CR. -| * | 1260e7459 Add asserts around attachment crash. -|/ / -* | 4a84a19d0 Merge tag '2.33.0.11' -|\ \ -| |/ -| * 3cd31c6c5 (tag: 2.33.0.11) "Bump build to 2.33.0.11." -| * 43527ac73 Merge branch 'mkirk/fix-view-model-update' into release/2.33.0 -| |\ -| | * 049b85812 Fix crash when update corresponds to a move. -| |/ -| * badc959e6 Update l10n. -| * 3d6b9e1dc Fix build warning. -* | 9f67d181b Merge branch 'release/2.33.0' -|\ \ -| |/ -| * 00f5e4d3e Merge tag '2.32.2.0' into release/2.33.0 -| |\ -| | * b0318f59d (tag: 2.32.2.0, private/hotfix/2.32.2) Merge branch 'mkirk/sae-crash' into hotfix/2.32.2 -| | |\ -| | | * f27d0ef99 Fix SAE crash -| | |/ -| | * 9da8d1ac3 "Bump build to 2.32.2.0." -* | | 38d5db965 remove unnecessary logging -* | | a1a5fd4b9 Update Cocoapods. -* | | d47a5e2dc Merge branch 'mkirk/string-extensions' -|\ \ \ -| * | | b6f52ef12 update pods -| * | | 260002b02 move extension methods to SCK -| * | | 3151e6e1a move string extensions up -| * | | e73591638 move all possible methods into String+OWS in SCK -| * | | df79fc9ed Move String+OWS into SSK -|/ / / -* | | 6edf9e585 Merge branch 'charlesmchen/deviceNames' -|\ \ \ -| * | | 7eeec34aa Update Cocoapods. -| * | | 1d905119a Fix issues from integration testing. -| * | | cd194af31 Respond to CR. -| * | | bf2edf248 Update comments. -| * | | 2d3314751 Clean up ahead of PR. -| * | | 0005a33d3 Decrypt device names in linked devices views. -| * | | c113c8e96 Add DeviceNamesTest. -| * | | d59e2bb61 Add decryption to DeviceNames. -| * | | 0d20ebc62 Add encryption to DeviceNames. -| * | | 79375e20b Update proto schema. -|/ / / -* | | 4a26952f5 Merge branch 'mkirk/orm-perf' -|\ \ \ -| * | | d8fda8a7a (private/mkirk/orm-perf) Update pods with perf improvements -| * | | 7bc535739 [PERF] optimize search normalization saves 2.5% on large migration -| * | | 0cb702b37 [PERF] save 2% on large migrations -| * | | a0770c14c baseline perf test for migration -| * | | ca5b3c8ec make factory methods public -| * | | 40470ec42 fixup test fixes -| * | | 3be856389 fixup broken tests -|/ / / -* | | 686d6e498 Merge branch 'mkirk/fix-sort-id-rebased' -|\ \ \ -| * | | fc7a71361 CR: use existing transaction rather than open sneaky one -| * | | e0c9b590c CR: fix comment typo -| * | | af7ee5e1d address compiler breakage after rebase -| * | | 0db3f240d keep legacy properties around just in case... -| * | | 45e572e82 assert monotonic order for migration -| * | | 9d5753bd8 fix sortId comparison -| * | | 5671fd252 Revert "Revert 'new sort id'." -|/ / / -* | | 11b881927 Merge branch 'charlesmchen/l10nVoiceCodes' -|\ \ \ -| * | | 8949a49f6 Localize voice verification codes. -| * | | 2df70aba6 Localize voice verification codes. -|/ / / -* | | a1dbb2f04 Merge branch 'charlesmchen/imageEditor3' -|\ \ \ -| * | | 35b6f6cf1 Respond to CR. -| * | | 18f07d12b Revert "Revert "Revert "Debug scaffolding.""" -| * | | db8bc58b6 Implement crop. -| * | | 57f888a44 Add crop gesture. -| * | | 03cbeb5fe Start working on crop. -| * | | ce6a40e7c Revert "Revert "Debug scaffolding."" -|/ / / -* | | 3c68e2983 Merge branch 'charlesmchen/imageEditor2' -|\ \ \ -| * | | fe02575b6 Revert "Revert "Revert "Debug scaffolding.""" -| * | | 2f95413bc Use narrow change events in image editor. -| * | | f224c2130 Suppress undo during strokes. -| * | | cf1763e79 Suppress undo during strokes. -| * | | 3d67c6574 Suppress undo during strokes. -| * | | 9378ab219 Add undo/redo buttons to image editor. -| * | | 967da78f2 Revert "Revert "Debug scaffolding."" -|/ / / -* | | dfb985f46 Merge tag '2.33.0.10' -|\ \ \ -| |/ / -| * | 21a910d93 (tag: 2.33.0.10, origin/release/2.33.0, release/2.33.0) "Bump build to 2.33.0.10." -| * | c4e21c641 Sync translations -| * | 6fe33ab80 Merge branch 'charlesmchen/typingIndicatorsVsBlockAndLeftGroup' into release/2.33.0 -| |\ \ -| | * | 4e0cfac91 (charlesmchen/typingIndicatorsVsBlockAndLeftGroup) Respond to CR. -| | * | 07fef1615 Discard typing indicators for blocked and left groups. -| |/ / -| * | 1f6b18413 Merge branch 'charlesmchen/mpgVideo' into release/2.33.0 -| |\ \ -| | * | fa9af6c92 (charlesmchen/mpgVideo) Try to play .mpg videos. -| |/ / -* | | 8b6386b64 Merge branch 'charlesmchen/alwaysMessageActions' -|\ \ \ -| * | | 039755c0d Respond to CR. -| * | | dd836ef58 Respond to CR. -| * | | f2d585f43 Always allow long-press for message actions. -|/ / / -* | | f4dbc22d0 Merge remote-tracking branch 'release/2.33.0' -|\ \ \ -| |/ / -| * | 19d0119c6 Merge branch 'mkirk/fix-photo-picker-ios10' into release/2.33.0 -| |\ \ -| | * | fcea9f07b Fix hang on iOS10. -| |/ / -| * | e4d924d28 Merge tag '2.32.1.0' into release/2.33.0 -| |\ \ -| | |/ -| | * 31a1fe10c (tag: 2.32.1.0, private/hotfix/2.32.1, origin/hotfix/2.32.1) "Bump build to 2.32.1.0." -| | * 1a7127a75 Merge branch 'mkirk/fix-caption' into hotfix/2.32.1 -| | |\ -| | | * cf48fb307 Don't use caption field -| | |/ -* | | 3489668ad Merge branch 'charlesmchen/purgeDynamicInteractions' -|\ \ \ -| * | | bd40aacd5 Purge dynamic interactions from database. -|/ / / -* | | 98137e9dd Merge branch 'charlesmchen/imageEditor' -|\ \ \ -| * | | d1cf942f7 Respond to CR. -| * | | 825826aa0 Reduce jitter with smoothing. -| * | | b8775006b Clean up ahead of PR. -| * | | 794241963 Clean up ahead of PR. -| * | | e3d4523bc Revert "Debug scaffolding." -| * | | da13dc1d2 Clean up ahead of PR. -| * | | bf734d595 Clean up ahead of PR. -| * | | 04cd6c349 Clean up ahead of PR. -| * | | 639dac4e2 Add stroke drawing to the image editor. -| * | | b0e0c6e8c Replace edited attachments when sending. -| * | | 2f7e99de4 Smooth stroke rendering. -| * | | e2afe27f5 Add trivial test interaction to image editor. -| * | | 0d81139be Debug scaffolding. -| * | | 4752cb94f Add ImageEditorView. -| * | | 04440ed1e Add ImageEditorStrokeItem. -| * | | 8704ffe93 Sketch out image editor undo/redo. -| * | | 57232683f Sketch out image editor undo/redo. -| * | | f95526bff Start sketching out image editor. -| * | | 26a25f861 Start sketching out image editor. -|/ / / -* | | 7245307c9 Merge branch 'mkirk/perf-tweaks' -|\ \ \ -| * | | fd6a56b3a (private/mkirk/perf-tweaks) format bench in ms -| * | | f51416b2d save a few ms on send, hoist async dispatch to caller, and use it for clearing draft -|/ / / -* | | 6764d3e75 Merge branch 'mkirk/send-perf' -|\ \ \ -| * | | 6232b1ef6 CR: add debug asserts -| * | | 81bc357bb more robust handling of unsaved outgoing messages -| * | | 62cf05cd8 assert only trivial unsaved messages are appended to the view model -| * | | 087e32003 Track 'persisted' viewItems separately -| * | | e3610d436 Apply other requisite ViewItem attributes -| * | | 0ae482195 always put typing indicator last -| * | | 668cc22af Perf: Insert outgoing message into conversation before save completes. -|/ / / -* | | 176543d2a Merge branch 'mkirk/fix-compiler-warnings2' -|\ \ \ -| * | | 67cc1027c Fix compiler warnings -|/ / / -* | | f9ff1b22c Merge branch 'mkirk/input-bar-async' -|\ \ \ -| * | | 4b84583de reload input bar async -| * | | ac2c9cc52 Benchmark Events by ID -|/ / / -* | | 6e07999b8 Merge branch 'charlesmchen/settleConversationLoadWindow' -|\ \ \ -| * | | 9c46ce866 Re-enable prefetching a bit sooner. -| * | | 6797d4351 Auto-extend conversation load window size. -| * | | 8a6f30518 Auto-extend conversation load window size. -|/ / / -* | | 2b36cfed9 Merge branch 'charlesmchen/morePerfTweaks' -|\ \ \ -| * | | 6bc8f6d3a More perf tweaks for conversation view. -| * | | 2bf0c55ab More perf tweaks for conversation view. -|/ / / -* | | 91c246cf5 Merge branch 'charlesmchen/preheatUIDBViews2' -|\ \ \ -| * | | ca129bf36 Preheat more UI DB views. -|/ / / -* | | e08b725d9 Merge branch 'charlesmchen/moreCVMPerf' -|\ \ \ -| * | | be8a61b55 Refine contact offers logic. -| * | | 19a2bfeaa More conversation viewmodel perf improvements. -|/ / / -* | | 5087feb55 Merge branch 'charlesmchen/preheatUIDBViews' -|\ \ \ -| * | | 5f637f24e Preheat UI DB views. -|/ / / -* | | e453d19c1 Merge branch 'charlesmchen/legacyBuildSystem' -|\ \ \ -| * | | 7703155bb Enable legacy build system. -|/ / / -* | | 87ef86186 Merge branch 'charlesmchen/reverseDispatchQueue' -|\ \ \ -| * | | d32088db9 (private/charlesmchen/reverseDispatchQueue) Update Cocoapods. -| * | | b0295b736 Add ReverseDispatchQueue. -|/ / / -* | | 9f04e7c5d Merge branch 'charlesmchen/refineViewModelDiffs' -|\ \ \ -| * | | 85f6d05e0 Refine view model diffing. -| * | | 90d8fb3d1 Refine view model diffing. -|/ / / -* | | 99c45cde1 Merge branch 'charlesmchen/asyncConversationMedia' -|\ \ \ -| * | | 9db50bd9e Reduce priority of media loads. -| * | | 21ab3fbbc Respond to CR. -| * | | 962c1acc9 Fix "blinking" regression media views. -| * | | 047afe21a Fix typo. -| * | | b9404938c Respond to CR. -| * | | 358d97bf5 Always load conversation media async. -| * | | ddd6732f7 Revert "Always load conversation media async." -| * | | 5cb319a9c Always load conversation media async. -| * | | 956859244 Always load conversation media async. -| * | | c1578b4b0 Always load conversation media async. -|/ / / -* | | d5dbef6af Merge branch 'charlesmchen/contactOffersVsVM' -|\ \ \ -| * | | fea40d571 Move contact offers to Conversation view model. -|/ / / -* | | 98210e92d Merge branch 'charlesmchen/reduceInitialConversationLoadWindowSize' -|\ \ \ -| * | | 15826cec5 Reduce initial conversation load window size. -|/ / / -* | | 1f3e24ae4 Merge branch 'charlesmchen/profileFetchConcurrency' -|\ \ \ -| * | | d717ee541 Parse and apply profile fetches off main thread. -|/ / / -* | | 6239c5313 Merge branch 'charlesmchen/vmSortInteractions' -|\ \ \ -| * | | 9017c16e7 Sort interactions in CVM. -|/ / / -* | | c04c7e646 Merge branch 'charlesmchen/persistMediaValidityCache' -|\ \ \ -| |/ / -|/| | -| * | bd318a84a Fix typo. -| * | a96c6ed3b Persist the media validity cache. -|/ / -* | f9c083c69 (tag: 2.33.0.9) "Bump build to 2.33.0.9." -* | 3ee1c078f Merge branch 'charlesmchen/dbConnForOrphanDataCleaner' -|\ \ -| * | 95bc7a23f Use dedicated db connection in orphan data cleaner. -|/ / -* | ada1f1ae1 (tag: 2.33.0.8) "Bump build to 2.33.0.8." -* | 6ece45a2e toggle multisend feature flag -* | a6a51813e (tag: 2.33.0.7) "Bump build to 2.33.0.7." -* | 1bc81ad76 Merge branch 'mkirk/group-soft-delete' -|\ \ -| * | 425bdd7a4 guard against edge case -| * | c8c932033 add proper nullability annotation -| * | beb02afce Soft delete group threads -| * | c0cb7df10 rename hasEverHadMessage -> shouldThreadBeVisible -|/ / -* | 4ac93276c (tag: 2.33.0.6) sync translations -* | 70f826799 "Bump build to 2.33.0.6." -* | 823a6d9e0 Merge branch 'charlesmchen/finalizeOrphanCleanup' -|\ \ -| * | af3cff339 Prep orphan data cleaner. -| * | 8ba747916 Prep orphan data cleaner. -|/ / -* | 585ed0c31 Merge branch 'mkirk/moreRetainUntilComplete' -|\ \ -| * | b7ab036c0 (private/mkirk/moreRetainUntilComplete) warn_unused_result on AnyPromise methods -|/ / -* | a29db6cb5 Merge branch 'charlesmchen/moreRetainUntilComplete' -|\ \ -| * | acd97602c Respond to CR. -| * | 48bd0cfa0 Add missing retains to promises. -|/ / -* | 222e07c5b Merge branch 'charlesmchen/moreBackupFeatureFlag' -|\ \ -| * | 15653498b (charlesmchen/moreBackupFeatureFlag) Apply backup feature flag. -|/ / -* | f68c410bc (tag: 2.33.0.5) "Bump build to 2.33.0.5." -* | af2522516 Merge branch 'mkirk/order-photo-collections' -|\ \ -| * | ff4507021 Optimize album ordering - remove unnecessary albums -* | | 7f1791b2f Sync translations -|/ / -* | a50541009 Merge branch 'mkirk/album-design-tweaks' -|\ \ -| * | 1ab0daeb9 just a bit faster -| * | ed12a74cc album picker design tweaks -|/ / -* | 1fecdd132 Merge branch 'mkirk/collection-presentation' -|\ \ -| * | 3e032f55c clear selectedIds in sync with deselection -| * | d85350bf8 remain in "multiselect" mode after switching PhotoCollection -| * | e776a2410 update comment per code review -| * | 6556a3173 Don't extend PhotoCollection picker beneath navbar -| * | 2eb2c2856 fix conversation input appearing over image picker -| * | 6a61d660b Don't show "selected" badge unless in batch mode (per myles) -| * | ac7e2f76d Properly handle external library changes, avoid overzealous deselect -| * | 82d49350e properly deselect items when switching collections -| * | 635401dc5 Hide "Select" button while album chooser presented -| * | 5490f07bb Animate title chevron -| * | caf002069 Present CollectionPicker as child view -| * | 083d587ef WIP: Present CollectionPicker as child view -| * | 0e1a65446 WIP: Present CollectionPicker as child view -|/ / -* | f3b52945f Merge branch 'mkirk/video-thumbnails' -|\ \ -| * | 858ba6ef3 fix missing video thumbnails in approval view -|/ / -* | d77d968bf Merge branch 'mkirk/remove-overzealous-assert' -|\ \ -| * | 78e963404 remove overzealous assert, since we now sometimes post notification without threadId -|/ / -* | d29763acf Merge branch 'mirk/attachment-approval-placeholder' -|\ \ -| * | 3e48ed105 keyboard is always dark in attachment approval -| * | 2f92995cd Add placeholder text to message input field -|/ / -* | 800994f10 Merge branch 'mkirk/fix-draft-scrolling' -|\ \ -| * | 52e21be65 fix draft scrolling -|/ / -* | 19d76ac95 Merge branch 'charlesmchen/conversationViewScrollDown' -|\ \ -| * | 00c6ed2f3 (charlesmchen/conversationViewScrollDown) Tweak scroll down animation behavior in conversation view. -|/ / -* | 6f6ce86ab Merge branch 'charlesmchen/cloudKitNotificationThreadSafety' -|\ \ -| * | 734cc22cb (charlesmchen/cloudKitNotificationThreadSafety) Fix thread safety around CloudKit notifications. -|/ / -* | d5b2b2cdd Merge branch 'charlesmchen/lazyRestoreVsAppReadiness' -|\ \ -| * | c646dbc56 (charlesmchen/lazyRestoreVsAppReadiness) Deconflict lazy restore and app readiness. -|/ / -* | 0b03f275e Merge branch 'charlesmchen/refineConversationDeleteAndArchive' -|\ \ -| * | 02c7a52a6 (charlesmchen/refineConversationDeleteAndArchive) Refine conversation delete/archive. -|/ / -* | 9eb0c5e77 Merge branch 'release/2.32.0' -|\ \ -| |/ -| * d0f68177f (tag: 2.32.0.23, private/release/2.32.0, origin/release/2.32.0) "Bump build to 2.32.0.23." -| * 1328191a1 log transcript timestamp -* | eb96eec94 Merge branch 'release/2.32.0' -|\ \ -| |/ -| * 973390099 (tag: 2.32.0.22) "Bump build to 2.32.0.22." -| * 870f0903f Merge branch 'mkirk/landscape-bug' into release/2.32.0 -| |\ -| | * e83455064 ensure layout invalidated after leaving media landscape -| |/ -| * 2d3e34030 Merge branch 'mkirk/fix-settings-accessibility' into release/2.32.0 -| |\ -| | * 34737567c fix voice over for settings bar button item -| |/ -| * 7845b26d7 Merge branch 'mkirk/logging' into release/2.32.0 -| |\ -| | * 542360739 debug logging -| |/ -| * 3d9e27ff6 (tag: 2.32.0.21) "Bump build to 2.32.0.21." -| * b0bd0ecb3 "Bump build to 2.32.0.20." -| * ac012ac59 (tag: 2.32.0.20) Merge branch 'charlesmchen/typingIndicatorsBug2' into release/2.32.0 -| |\ -| | * 4f0fa23c4 Don't ever show TI when they are disabled. -| |/ -| * eda7d6b45 Update 'tags to ignore.' -* | faa6b3e4a Merge branch 'charlesmchen/timerIcons' -|\ \ -| * | 92ed5f54a Update timer icons. -|/ / -* | d48cc0823 Merge branch 'charlesmchen/darkThemeVsMediaDownloads' -|\ \ -| * | b88416a93 Apply dark theme changes to media downloads. -|/ / -* | 694b9ef7e Merge tag '2.32.0.20' -|\ \ -| * | e5f99b9d6 "Bump build to 2.32.0.20." -| |/ -| * 9921a6fe4 Merge branch 'charlesmchen/typingIndicatorsBug' into release/2.32.0 -| |\ -| | * 6e457e43c Clear typing indicators when they are disabled. -| |/ -* | eb613c87c Merge branch 'mkirk/limit-attachments' -|\ \ -| * | f8e073f09 enforce attachment limit in photo picker -| * | de73c220d increment version canary -| * | 1a5c47df2 Fix SAE, limit max attachments -|/ / -* | f7e0448f1 Merge branch 'charlesmchen/batchBackupTransfers' -|\ \ -| * | 304f0824f Respond to CR. -| * | 8811c61d2 Respond to CR. -| * | 855cba3c4 Batch backup exports. -| * | 57205facb Batch backup exports. -| * | c1ac5c187 Batch backup exports. -| * | 163c46748 Fix incremental backup exports. -|/ / -* | 607620911 Merge branch 'charlesmchen/lazyRestoreVsBackupImport' -|\ \ -| * | 019a4d580 Respond to CR. -| * | e45b27bb2 Stop lazy attachment restore during backup import. -| * | cafc732dc Fix incremental backup exports. -|/ / -* | ada0ea999 Merge branch 'charlesmchen/ignoreLocalProfileRestoreFailures' -|\ \ -| * | e8ddc041d Respond to CR. -| * | 0a4f00493 Ignore local profile restore failures. -| * | c3704931e Fix incremental backup exports. -|/ / -* | a1bb5fa43 Merge branch 'charlesmchen/fixIncrementalBackups' -|\ \ -| * | 7506d93ea Respond to CR. -| * | f6b5a9eec Fix incremental backup exports. -| * | e26eb5459 Fix incremental backup exports. -| * | 9a123d8ce Fix incremental backup exports. -| * | fe8259bf0 Fix incremental backup exports. -|/ / -* | d70aa4418 Merge branch 'release/2.32.0' -|\ \ -| |/ -| * 151b33933 Merge branch 'charlesmchen/explicitBackupFeatureFlag' into release/2.32.0 -| |\ -| | * 4ea920e89 Add explicit feature flag for backup. -| |/ -| * 58b36d18a Merge branch 'charlesmchen/tweakProfilesDebugUI' into release/2.32.0 -| |\ -| | * aa4fea64c Improve Profiles Debug UI. -| |/ -* | c8cf5e01a Merge branch 'charlesmchen/attachmentRestore' -|\ \ -| * | 52f52a94a Respond to CR. -| * | cb349ad0f Fix local profile restore. -| * | 894fd1379 Fix spurious assert. -| * | ee74691e8 Activate lazy restore of attachments. -| * | 998c079e6 Account for local profile avatar item in backup cleanup. -| * | 02150efa2 Fix assert in backup import. -| * | f7842dd2a Rework lazy attachment restore. -| * | 3bff89c7e Fix cancel in backup restore view. -| * | 7e77a69f8 Improve backup logging. -|/ / -* | e0f20bc8d (tag: 2.33.0.4) "Bump build to 2.33.0.4." -* | 96c472cfc update info.plist -* | 92dd77779 Merge tag '2.32.0.19' -|\ \ -| |/ -| * db3c0c631 (tag: 2.32.0.19) "Bump build to 2.32.0.19." -| * 22ae227da pull latest translations -| * 9eeed9970 fix formatting after merge -| * 156302acc Merge tag '2.31.2.0' into release/2.32.0 -| |\ -| | * 250bb8dc2 (tag: 2.31.2.0, private/hotfix/2.31.2) "Bump build to 2.31.2.0." -| | * e92512f65 Merge branch 'charlesmchen/envelopes' into hotfix/2.31.2 -| | |\ -| | | * 0955ab866 Refine envelope processing. -| | |/ -| * | f8299a212 (tag: 2.32.0.18, release/2.32.0) "Bump build to 2.32.0.18." -| * | 21d762f70 sync translations -| * | 46a44f68f Merge branch 'charlesmchen/quotedReplyVsAlbums' into release/2.32.0 -| |\ \ -| | * | ab9e2c4e1 (origin/charlesmchen/quotedReplyVsAlbums) Ensure quoted replies with attachments are handled properly. -| |/ / -| * | 68b939d89 Merge branch 'mkirk/splash-screen-changes' into release/2.32.0 -| |\ \ -| | * | 1ab4ed9ae enable typing indicators directly from splash -| | * | 13da4bc7d rename to "primary button" -| |/ / -* | | 036c6dca4 Merge branch 'release/2.32.0' -|\ \ \ -| |/ / -| * | 973afd041 Merge branch 'hotfix/2.31.1' into release/2.32.0 -| |\ \ -| | |/ -| | * f9bdf574f (tag: 2.31.1.3, private/hotfix/2.31.1, origin/hotfix/2.31.1) "Bump build to 2.31.1.3." -| | * 189f3c4c1 Merge branch 'mkirk/empty-message' into hotfix/2.31.1 -| | |\ -| | | * 2b43fe31e verify serialzed message exists -| | |/ -| | * 4ab37a0f3 Update Cocoapods. -| | * 5ce4f4a18 (tag: 2.31.1.2) "Bump build to 2.31.1.2." -| | * eb101e758 Merge branch 'charlesmchen/udIndicators' into hotfix/2.31.1 -| | |\ -| | | * a2dfcd028 Respond to CR. -| | | * c183aeca8 Refine asserts around message sending. -| | | * a6cef1c4c Update UD indicators. -| | |/ -| | * d6b107ec1 (tag: 2.31.1.1) "Bump build to 2.31.1.1." -| | * d78371be7 Don't use UD for "self" profile fetches. -| | * de2917c66 Merge branch 'charlesmchen/ccHeaders' into hotfix/2.31.1 -| | |\ -| | | * b290c9a89 Fix headers for censorship circumvention. -| | |/ -| | * b083d6a94 Merge branch 'charlesmchen/tweakFailover' into hotfix/2.31.1 -| | |\ -| | | * 4d1c38cc4 Never failover message sends. -| | |/ -* | | 8868e0a55 Merge branch 'charlesmchen/backupRestoreFlow' -|\ \ \ -| * | | 26c337d7b Add RegistrationController. -| * | | 782fbe656 Add RegistrationController. -| * | | e9bdc4c2c Rework backup restore flow. -|/ / / -* | | d821bd8e0 Merge branch 'charlesmchen/backupFixes' -|\ \ \ -| * | | 7624b01d1 Respond to CR. -| * | | 0a6d54e8b Clean up ahead of CR. -| * | | 4b7b7c19b Clean up. -| * | | 08de701d6 Clean up ahead of CR. -| * | | ca6532571 Don't send messages with restoring attachments. -| * | | 15dc7b2c7 Enable backup after successful backup restore. -|/ / / -* | | 08cd514e6 Merge branch 'charlesmchen/backupLocalProfile' -|\ \ \ -| * | | d085520c3 Respond to CR. -| * | | 9774b5d62 Backup local profile. -| * | | c9c76c650 Backup local profile. -| * | | 3acfa707d Backup local profile. -| * | | d6ca969c6 Backup local profile. -|/ / / -* | | 033044c1f Merge branch 'charlesmchen/backupPromises' -|\ \ \ -| * | | 8bd21fd02 Respond to CR. -| * | | 44d0ad34f Convert backup logic to use promises. -| * | | af477d3bf Convert backup logic to use promises. -| * | | 6d8fa7802 Convert backup logic to use promises. -| * | | a9120906f Convert backup logic to use promises. -| * | | e19b457cb Handle iCloud status. -| * | | c7f504705 Handle iCloud status. -|/ / / -* | | 3ad89e404 (tag: 2.33.0.3) "Bump build to 2.33.0.3." -* | | 39c8a153d fixup 2.32.0 RI -* | | 0b1907794 (tag: 2.33.0.2) "Bump build to 2.33.0.2." -* | | 128bb9be8 Merge tag '2.32.0.17' -|\ \ \ -| |/ / -| * | a247701cc (tag: 2.32.0.17) "Bump build to 2.32.0.17." -| * | b6e336a07 Merge tag '2.31.1.0' into release/2.32.0 -| |\ \ -| | |/ -| | * 9713c5870 (tag: 2.31.1.0) "Bump build to 2.31.1.0." -| | * 24a19eaac update REST endpoint ack url -| * | 74e6eddf0 Merge branch 'charlesmchen/moreUdTweaks' into release/2.32.0 -| |\ \ -| | * | 4126b35a2 Respond to CR. -| | * | 4ce0b68a8 Discard sender certificates after 24 hours. -| | * | 3edf3ed19 Don't use UD for "self" profile fetches. -| |/ / -* | | 5cfcee9d2 Merge tag '2.32.0.3' -|\ \ \ -| * | | d94392f02 (tag: 2.32.0.3) "Bump build to 2.32.0.3." -* | | | 79b774174 sync translations -* | | | 11592a6ae Merge branch 'mkirk/fix-caption-visibility' -|\ \ \ \ -| * | | | 71ab5817e fix captionview visibility -|/ / / / -* | | | 076281109 (tag: 2.33.0.1) "Bump build to 2.33.0.1." -* | | | 87109b44b add missing translation -* | | | 3d25ba09b Merge branch 'mkirk/fix-multiple-done' -|\ \ \ \ -| * | | | ee228794b Only press Done once -|/ / / / -* | | | ac9025bad Merge branch 'mkirk/update-infoscript' -|\ \ \ \ -| * | | | d66221d46 update BuildDetails -| * | | | d0a5bcd5c remove gem version logging from, since the canonical version is in the Gemfile.lock -| * | | | db6357c53 use bundle to report accurate cocoapods -| * | | | 63553a782 fail on any error -| * | | | 5213fbe21 make runnable from command line -| * | | | 4b5c4fae1 extract script to external file for more readable version control -|/ / / / -* | | | 7eaab544b Merge branch 'mkirk/fix-album-picker-background-color' -|\ \ \ \ -| * | | | cf2cdb4b9 Dark background for album picker in light theme too -|/ / / / -* | | | a4435f075 Merge branch 'mkirk/fix-missing-album-thumbnail' -|\ \ \ \ -| * | | | 53101a3fc Fix missing album thumbnails -|/ / / / -* | | | 6cbfc66eb Merge branch 'mkirk/album-picker-designs' -|\ \ \ \ -| * | | | 46102e57b AlbumPicker cells to spec -| * | | | 58eda67a7 show *most recent* thumbnail in album picker -| * | | | 87d133841 remove unused code -| * | | | ca1119e48 extract method for clarity -|/ / / / -* | | | e37a35858 Merge branch 'charlesmchen/backupMoreCollections' -|\ \ \ \ -| * | | | c3ad65af1 Respond to CR. -| * | | | 437e5605a Backup misc collections. -| * | | | c5744321b Backup misc collections. -| * | | | 95e1f840c Backup misc collections. -| * | | | 7e39bf97e Backup misc collections. -|/ / / / -* | | | 6d014f449 Merge branch 'charlesmchen/cleanupMigrations' -|\ \ \ \ -| * | | | 455602556 Update migrations. -|/ / / / -* | | | 86b18ddac Merge branch 'mkirk/dont-show-caption-for-single' -|\ \ \ \ -| * | | | 61758dcf0 Only show caption for multiple images -| * | | | 0ac8f13c0 remove redunant method, consolidate naming, adding array getter -| * | | | 6fdd5d100 dont initializer pagerScrollView as sideEffect -|/ / / / -* | | | f9b1b2f36 Merge branch 'mkirk/photo-picker-scroll-to-bottom' -|\ \ \ \ -| * | | | 69e8b187a only scroll down once -| * | | | 1a43498c2 update masks for "always dark" media views -| * | | | 83c156f9e Scroll photo-picker to bottom -|/ / / / -* | | | e9ab2a811 Merge branch 'mkirk/spurious-crash-logs' -|\ \ \ \ -| * | | | 7aad3a9e7 Avoid spurious crash reporting -|/ / / / -* | | | 2c344f6a5 Merge branch 'mkirk/photopicker-design' -|\ \ \ \ -| * | | | 9bcc6a6c5 show navbar for photo/album picker, not approval -|/ / / / -* | | | 753c88437 Merge branch 'charlesmchen/iCloudVsMultipleBackups' -|\ \ \ \ -| * | | | 1c012e9a2 Respond to CR. -| * | | | e23773ed2 Support multiple backups in single iCloud account. -| * | | | c86518e44 Support multiple backups in single iCloud account. -|/ / / / -* | | | df25301d5 Merge branch 'charlesmchen/longLivedBackup' -|\ \ \ \ -| * | | | 7fab42abf Use long-lived operations for CK backup. -| * | | | 0eafb8dc3 Use long-lived operations for CK backup. -| * | | | ba3a1863d Use long-lived operations for CK backup. -|/ / / / -* | | | 018fe6cb4 Merge branch 'charlesmchen/backupRestoreView' -|\ \ \ \ -| * | | | e3363ab9a Add isRegisteredAndReady to TSAccountManager. -| * | | | 8ad58e335 Respond to CR. -| * | | | dcaaff7ea Add isRegisteredAndReady to TSAccountManager. -| * | | | 70b2280aa Add isRegisteredAndReady to TSAccountManager. -| * | | | 8110e0c76 Clean up usage of TSAccountManager. -| * | | | d44a8f999 Sketch out the backup restore view. -| * | | | 156aa8419 Clean up ahead of PR. -| * | | | 4ee095838 Sketch out the backup restore view. -| * | | | 56fe3663e Fix retain cycle in settings views. -| * | | | f40b81ca4 Sketch out the backup restore view. -| * | | | 03f598a13 Sketch out the backup restore view. -| * | | | 332f202a5 Sketch out the backup restore view. -| * | | | 5010b027b Sketch out the backup restore view. -| * | | | 5c0d98b83 Show 'restore backup' view after registration. -|/ / / / -* | | | b2d75eb1a (tag: 2.33.0.0) "Bump build to 2.33.0.0." -* | | | d7f94b6d1 Merge branch 'mkirk/fix-resign-animation' -|\ \ \ \ -| * | | | 26ca47b51 Avoid CaptionTextView animation glitch while dismissing MessageTextView -|/ / / / -* | | | 78c74d87b Merge tag '2.32.0.16' -|\ \ \ \ -| | |/ / -| |/| | -| * | | dd6faa647 (tag: 2.32.0.16) "Bump build to 2.32.0.16." -| * | | 31782af2f dark theme section headers in tile gallery -* | | | d9942aa5e Merge branch 'mkirk/multisend-design' -|\ \ \ \ -| * | | | 9317ee9c9 (private/mkirk/multisend-design) design comment -| * | | | e3120a5b8 cleanup keyboard animation code -| * | | | 0562619ca smaller margins between rail images, avoid choppy change as the margin updates are not being animated smoothly. -| * | | | 55807f9a4 iPhoneX compatible keyboard animations -| * | | | 279694e70 keyboard animation cleanup -| * | | | 080845839 fix caption dismiss animation/placeholder for multiline message body -| * | | | 4f1f09f23 Use snapshot view to avoid momentary missing bottomToolbar while switching firstResponder from CaptionView to AttachmentApprovalViewController. -| * | | | 3bfda7ea8 Smooth kbd dismiss: avoid bouncing CaptionView due to quick transition of firstResponder -| * | | | b108f284b WIP: hide caption keyboard -| * | | | 838012d1e Caption length limit and label -| * | | | e0f7513df white tint for attachment approval textview cursors -| * | | | a946ec005 new icon assets per design -| * | | | 8776dd190 New "add caption" and "done" assets -| * | | | feb5a0c44 fix initial CaptionView layout glitch -| * | | | e65eeff0f Keyboard should cover _Caption_ TextView when _Message_ TextView becomes first responder. -| * | | | 33750baf6 finally got dismiss-before-swipe -| * | | | dd82803a1 second abandoned attempt to require dismiss before page -| * | | | b98b3d1fd WIP: require dismiss before swipe -| * | | | 706dd3d0c initial layout of keyboard is correct across pages -| * | | | 280664c76 WIP: keyboard -| * | | | eed255805 Avoid glitch in keyboard dismiss. -| * | | | 8b5d1d9e6 Only add delete button once -|/ / / / -* | | | 31637656f Merge branch 'mkirk/separate-caption-and-body' -|\ \ \ \ -| * | | | 28f8fc591 per cr, avoid unnecessary -| * | | | fcc4b516a fix typo in logging -| * | | | 4f0092615 Support captions *and* independent message body -| * | | | cd88ef2be CaptionView text field per page -| * | | | 79995cc52 rename captioning -> messageText -| * | | | 47affb81c Move gallery rail into input accessory view -|/ / / / -* | | | f65708c36 Merge branch 'charlesmchen/registrationEdgeCases' -|\ \ \ \ -| * | | | fa8095bf2 Respond to CR. -| * | | | 544bdbd7f Fix edge cases around registration. -|/ / / / -* | | | 6cdef57e2 Merge tag '2.32.0.15' -|\ \ \ \ -| |/ / / -| * | | 8ebe860ff (tag: 2.32.0.15) pull latest translations -| * | | 894ffa484 "Bump build to 2.32.0.15." -| * | | 7a3de0beb Merge branch 'mkirk/fix-sync-processing' into release/2.32.0 -| |\ \ \ -| | * | | 4a70f8dc0 only process attachments if they exist -| |/ / / -| * | | 18766280f fix crash when non-registered user upgrades -| * | | a5dec2321 (tag: 2.32.0.14) "Bump build to 2.32.0.14." -| * | | c29224e4e sync translations -| * | | 68a7a6da0 Merge branch 'mkirk/fix-tap-crash-on-iOS10' into release/2.32.0 -| |\ \ \ -| | * | | dbe8e5706 avoid crash on iOS9/10 -| |/ / / -| * | | 9483566ef Merge branch 'mkirk/fix-video-play-button-in-gallery' into release/2.32.0 -| |\ \ \ -| | * | | 343e58595 fix pause/play functionality -| |/ / / -* | | | af61418b0 Merge branch 'charlesmchen/restoreWithAttachmentPointers' -|\ \ \ \ -| * | | | de6c058ac Update Cocoapods. -| * | | | 5f8755f2e Respond to CR. -| * | | | f5ba8048b Clean up ahead of PR. -| * | | | d76bdf3a5 Use attachment pointers to restore attachments from backup. -| * | | | e72dafb08 Use attachment pointers to restore attachments from backup. -| * | | | 90e7df551 Use attachment pointers to restore attachments from backup. -|/ / / / -* | | | 7425f7f41 Merge branch 'charlesmchen/rekindleBackup' -|\ \ \ \ -| * | | | dae80ad4c Reorganize util code. -|/ / / / -* | | | 88026be42 Merge branch 'release/2.32.0' -|\ \ \ \ -| |/ / / -| * | | bfbf9d39a Update Cocoapods. -| * | | f7df229fc Merge tag '2.31.0.39' into release/2.32.0 -| |\ \ \ -| | | |/ -| | |/| -| | * | 221d280e4 (tag: 2.31.0.39, private/release/2.31.0, origin/release/2.31.0) "Bump build to 2.31.0.39." -| | * | 128ec6648 Merge branch 'charlesmchen/unregisteredAccountAttributesUpdate' into release/2.31.0 -| | |\ \ -| | | * | 4d2bbfc54 Fix crash around account attributes update when unregistered. -| | |/ / -* | | | 80f611c4d Merge branch 'mkirk/remove-message-author-id' -|\ \ \ \ -| * | | | 0d0359ee1 (origin/mkirk/remove-message-author-id) Fix crash due to empty authorId on old messages -|/ / / / -* | | | 7b3bf8636 Merge branch 'mkirk/simplify-dependency-documentation' -|\ \ \ \ -| * | | | f6d78d04b (origin/mkirk/simplify-dependency-documentation) removed outdated build instructions. -|/ / / / -* | | | 1df55c70f Merge branch 'mkirk/update-deps' -|\ \ \ \ -| * | | | e28eb330e (origin/mkirk/update-deps) bundle update -| * | | | 4db5df4bf pod update -|/ / / / -* | | | b87b2522e Merge tag '2.32.0.13' -|\ \ \ \ -| |/ / / -| * | | dc3cc3f40 (tag: 2.32.0.13) "Bump build to 2.32.0.13." -| * | | 8932c4a3f Sync translations -| * | | 6935761ab Merge tag '2.31.0.38' into release/2.32.0 -| |\ \ \ -| | |/ / -| | * | 9a7f08b70 (tag: 2.31.0.38) "Bump build to 2.31.0.38." -| | * | eb85684ba Merge branch 'mkirk/ud-error-handling' into release/2.31.0 -| | |\ \ -| | | * | f52a58e31 (origin/mkirk/ud-error-handling) Handle known sender -| | | * | 6c2dbbc7c verify envelope source before proceeding with error handling -| | |/ / -| * | | dc09d1473 (tag: 2.32.0.12) "Bump build to 2.32.0.12." -| * | | 715c9f19d Merge remote-tracking branch 'origin/charlesmchen/multipleLoadMore' into release/2.32.0 -| |\ \ \ -| | * | | 0bbfd3eb2 (origin/charlesmchen/multipleLoadMore) "Auto load more" async while scrolling. -| | * | | 910b24911 "Auto load more" async while scrolling. -| |/ / / -| * | | 6c9c8eb65 Fix build breaks. -| * | | 377e0f0f8 (tag: 2.32.0.11) "Bump build to 2.32.0.11." -| * | | 5e1423085 Merge branch 'mkirk/dark-theme-splash' into release/2.32.0 -| |\ \ \ -| | * | | 12aa76855 dark theme typing splash -| |/ / / -| * | | 8acc13e44 (tag: 2.32.0.10) "Bump build to 2.32.0.10." -| * | | 8ba028073 update pods -| * | | a94ce9855 Merge branch 'mkirk/fix-delete-share' into release/2.32.0 -| |\ \ \ -| | * | | bf21e9425 fix delete/share button -| | * | | f5de076c6 fix remove from rail when deleted -| |/ / / -| * | | 078799c87 update translations -| * | | 20be554a7 Update Cocoapods. -| * | | 391f901d1 Merge branch 'charlesmchen/fixSAE' into release/2.32.0 -| |\ \ \ -| | * | | 08a135a3f Respond to CR. -| | * | | 81f234f6a Fix breakage in share extension. -| |/ / / -| * | | 0efb96032 (tag: 2.32.0.9) "Bump build to 2.32.0.9." -* | | | d325d02d7 Merge branch 'charlesmchen/imagePickerAddMore' -|\ \ \ \ -| * | | | 8eb2550e0 Respond to CR. -| * | | | 8b24fba09 Add "add more" button to image picker. Provide caption editing continuity. -|/ / / / -* | | | 2efbf1f43 Merge branch 'mkirk/sender-rail' -|\ \ \ \ -| * | | | 87bfdbb72 (origin/mkirk/sender-rail) Sender Rail -|/ / / / -* | | | 1b759719e Merge branch 'charlesmchen/collectionPicker' -|\ \ \ \ -| * | | | 800ef06cd (origin/charlesmchen/collectionPicker) Update Cocoapods. -| * | | | 86d006ba1 Respond to CR. -| * | | | 2919e8d78 Respond to CR. -| * | | | ea080eda7 Sketch out the photo collection picker. -|/ / / / -* | | | 9641edbfd Fix build breakage. -* | | | 80585126d update pods -* | | | 92135af8b Merge branch 'release/2.32.0' -|\ \ \ \ -| |/ / / -| * | | 12b916ad3 Merge tag '2.31.0.37' into release/2.32.0 -| |\ \ \ -| | |/ / -| | * | 5c02f8d34 (tag: 2.31.0.37) "Bump build to 2.31.0.37." -| | * | b38a1030d Merge branch 'charlesmchen/socketCleanup' into release/2.31.0 -| | |\ \ -| | | * | dacccccf7 Remove UD websocket. -| | |/ / -| | * | 99d41256a (tag: 2.31.0.36) "Bump build to 2.31.0.36." -| | * | 534b0da73 Merge branch 'charlesmchen/messageFetchACK' into release/2.31.0 -| | |\ \ -| | | * | 210da5086 Rework ACK of messages fetched via REST. -| | |/ / -| | * | f6df3b01e (tag: 2.31.0.35) "Bump build to 2.31.0.35." -| | * | c2cc74f38 Fix build break. -| | * | 71aa42031 (tag: 2.31.0.34) "Bump build to 2.31.0.34." -| | * | 2296d2256 Merge branch 'charlesmchen/udVsPersistentConnection' into release/2.31.0 -| | |\ \ -| | | * | 949225d52 Respond to CR. -| | | * | bbdeeffc7 Use persistent HTTP connection for UD requests. -| | | * | c0e57bb35 Use persistent HTTP connection for UD requests. -| | | * | 11f8fcc80 Use persistent HTTP connection for UD requests. -| | |/ / -| | * | 2eff3cb55 (tag: 2.31.0.33) "Bump build to 2.31.0.33." -| | * | 2b33c2a15 Merge branch 'charlesmchen/udVsWebsocket' into release/2.31.0 -| | |\ \ -| | | * | b865b9114 Use REST for UD requests. -| | |/ / -| | * | 16aec33e2 Merge branch 'charlesmchen/clearMayHaveLinkedDevices' into release/2.31.0 -| | |\ \ -| | | * | b583e96a0 (origin/charlesmchen/clearMayHaveLinkedDevices) Tweak clearMayHaveLinkedDevices. -| | |/ / -| | * | d71a4c6ff Revert "Randomly fail half of all websocket requests." -| * | | a27b04613 CR: simplify scroll check -| * | | a60dc2bfe Merge branch 'mkirk/pager-rail-style' into release/2.32.0 -| |\ \ \ -| | * | | ff63c31da (origin/mkirk/pager-rail-style) CR: rename colors -| | * | | 47a711431 Gallery pager style changes -| |/ / / -| * | | c5bcba45b Merge branch 'mkirk/fix-all-media-view' into release/2.32.0 -| |\ \ \ -| | * | | f6e9fce0d fix All Media button from conversation settings -| | * | | 542d5826d fix a million retain cycles in conversation settings -| |/ / / -| * | | 8eff8966b Merge branch 'mkirk/pager-rail' into release/2.32.0 -| |\ \ \ -| | * | | 84879b991 Album rail in Gallery -| |/ / / -| * | | fd424f389 Revert accidental schema changes. -| * | | b120995dc Merge branch 'charlesmchen/mediaViewGlitches' into release/2.32.0 -| |\ \ \ -| | * | | 2e50cc1f2 Respond to CR. -| | * | | 84d6f61d5 Fix glitches in conversation media view. -| |/ / / -* | | | 3ccf0a3c9 Merge branch 'charlesmchen/multiSendSAE' -|\ \ \ \ -| * | | | 19d4834e7 Update Cocoapods. -| * | | | 3135e6f6f Respond to CR. -| * | | | aeadea67e Send multiple attachments from the share extension. -| * | | | 2bad0c20b Only fetch profiles in the main app. -| * | | | 7f89c90f1 Fix bug when sending non-body attachments (e.g. group avatars). -| * | | | 901f58c7e Fix bug when sending non-body attachments (e.g. group avatars). -| * | | | f7e7477f5 Add sharing scenarios to Debug UI. -| * | | | 860eb44ed Fix breakage in share extension. -|/ / / / -* | | | 24745570d Merge tag '2.32.0.8' -|\ \ \ \ -| |/ / / -| * | | f9e2c8172 (tag: 2.32.0.8) "Bump build to 2.32.0.8." -| * | | 27f9f6647 Merge branch 'mkirk/self-recipient' into release/2.32.0 -| |\ \ \ -| | * | | b25a70403 Fix: Compose thread picker doesn't show self -| | * | | 7eaaab7be restrict self device id in message building, not in recipient data model -| |/ / / -| * | | 6749eccaa (tag: 2.32.0.7) "Bump build to 2.32.0.7." -| * | | b19cfbc55 Fixup AppReadiness vis a vis RI -| * | | c6cead7bb (tag: 2.32.0.6) "Bump build to 2.32.0.6." -| * | | 3faa700d6 Merge tag '2.31.0.31' into release/2.32.0 -| |\ \ \ -| * \ \ \ 3c9be9c3d Merge branch 'mkirk/image-picker' into release/2.32.0 -| |\ \ \ \ -| | * | | | fa82d43e6 (origin/mkirk/image-picker) put custom image picker behind feature flag -| |/ / / / -* | | | | 0e749d552 Fix build break. -* | | | | be784d14d Revert "Disable the orphan data cleaner." -* | | | | 04064779d Revert "Randomly fail half of all websocket requests." -* | | | | 49c8e6db7 Merge remote-tracking branch 'origin/release/2.31.0' -|\ \ \ \ \ -| |/ / / / -|/| | / / -| | |/ / -| |/| | -| * | | 220fdfc14 (tag: 2.31.0.32) "Bump build to 2.31.0.32." -| * | | cae430bac Randomly fail half of all websocket requests. -| |/ / -| * | 38f551e22 (tag: 2.31.0.31) "Bump build to 2.31.0.31." -| * | fc3780c24 Merge branch 'mkirk/fix-disable-earpiece' into release/2.31.0 -| |\ \ -| | * | 4b213df95 Fix race in ProximityMonitoringManager. -| | * | 0d7e94f2f Fix: Voice Messages don't restore audio to speaker when held up to the ear past the voice notes duration. -| |/ / -| * | eafc3719a Merge branch 'mkirk/fix-missing-profile-after-rotation' into release/2.31.0 -| |\ \ -| | * | ae63e399b (origin/mkirk/fix-missing-profile-after-rotation) use new key to verify local profile -| |/ / -| * | fd482da42 Merge branch 'mkirk/overzealous-profile-key-rotation' into release/2.31.0 -| |\ \ -| | * | 5ed123d86 (origin/mkirk/overzealous-profile-key-rotation) Fix overzealous profile key rotation -| |/ / -| * | 6d55f707f Merge branch 'mkirk/dont-whitelist-blocked-contact' into release/2.31.0 -| |\ \ -| | * | 0aca0c15c specify recipient when profile download fails -| | * | 209e79ce3 Don't add blocked contact to your profile whitelist -| |/ / -| * | 6a1673862 (tag: 2.31.0.30) "Bump build to 2.31.0.30." -| * | 1692a28fc Update l10n. -| * | 7c47fe6b4 Disable the orphan data cleaner. -* | | 2241c1b13 Merge branch 'mkirk/fix-compiler-warnings' -|\ \ \ -| * | | 27f66f9f2 (origin/mkirk/fix-compiler-warnings) explicitly discard result -| * | | 2bd3e5ef2 cast to same integer signedness for comparison -| * | | 3c450eeea degrade from crashing to debug assert, upon failure we return a fully (overly) redacted string -| * | | 54059532f remove unused strong capture -| * | | 97e9871f1 remove unnecessary implicitly unwrapped optional -| * | | 2a1c62f6f remove unused delegate method declaration -| * | | 24f97f122 compiler warning: discard result explicitly -| * | | b79860ae0 fix compiler doc warning -| * | | c50b8dd0d fix compiler warning -|/ / / -* | | 46ebe52a2 update pods -* | | 5ba757999 Merge branch 'mkirk/fixup-tests-2' -|\ \ \ -| * | | f30e7cf54 (origin/mkirk/fixup-tests-2) update pods -| * | | 10af14d96 Remove legacy built in test runner from SSK. -| * | | 7cba367c0 reconcile jobqueue tests with NSTimer based retry -| * | | 4971be5c2 Fix DESIGNATED_INITIALIZER syntax -| * | | 2f3d875dc fixup ud manager tests -| * | | 79bed93b2 reconcile jobqueue with new readiness based setup -| * | | 2c44cbccf avoid assertion when deliberately testing for failure -| * | | 24668fa79 update to reflect id assignment on build -| * | | 4b0fc5193 update test to reflect correct behavior -| * | | e2ad9d81b attachment factory -| * | | 4d860bb9c fixup job queue test -| * | | 24f57cedd add missing method to FakeContactsManager, convert to Swift to avoid missing protocol methods in the future. -| * | | ca58bb00f fixup tests from throws_ audit -| * | | d49281666 Fixup certificate parsing tests -|/ / / -* | | 197f06af7 Merge branch 'mkirk/fix-tests' -|\ \ \ -| * | | 47a47afa0 (origin/mkirk/fix-tests) update pods -| * | | f45908c89 fixup spk deletion test -| * | | 06b763dfc Remove unused methods/tests -| * | | 8472801c4 fix link error when launching SSK tests -| * | | 59d3699e1 remove invalid test - non-optional argument triggers debug assert -| * | | dd9bd1c1b remove unused header for DatabaseConverter test -| * | | c710b7f8f Fixup certificate parsing tests -|/ / / -* | | caba577f2 (tag: 2.32.0.5) "Bump build to 2.32.0.5." -* | | a3a31c7f9 Merge branch 'charlesmchen/missingAlbumMessageId' -|\ \ \ -| * | | da4f41def Fix missing albumMessageId. -|/ / / -* | | 8acca4d56 Merge branch 'charlesmchen/tapOnAlbumItem' -|\ \ \ -| * | | 6f64a809f Tap on album item. -|/ / / -* | | 08a6be23a Update Cocoapods. -* | | 8b0e4f902 Merge branch 'mkirk/gallery-pager-fixups' -|\ \ \ -| * | | d805246cb (origin/mkirk/gallery-pager-fixups) update caption after deleting item -| * | | ca30a9645 Increase caption height -| * | | 78b1c9a8b caption should not be selectable/editable -| * | | 43489a655 remove gradient when viewing attachment with no caption -|/ / / -* | | 7b421ad4d Format tags_to_ignore -* | | 96c546d6b Update pods -* | | 5da525ce2 Merge remote-tracking branch 'origin/release/2.31.0' -|\ \ \ -| |/ / -| * | a431829a7 (tag: 2.31.0.29) "Bump build to 2.31.0.29." -| * | ec3061489 Merge branch 'charlesmchen/manualMessageFetchVsUD_' into release/2.31.0 -| |\ \ -| | * | 1ac74cfb8 Modify MessageFetcherJob to handle incoming UD messages. -| |/ / -| * | 745abb672 Merge branch 'charlesmchen/unregisteredVsReceipts' into release/2.31.0 -| |\ \ -| | * | c9c9d35d1 Discard receipts for unregistered users. -| |/ / -| * | dfdaf9340 (tag: 2.31.0.28) "Bump build to 2.31.0.28." -| * | 54e68a39d Merge branch 'charlesmchen/websocketVs409410' into release/2.31.0 -| |\ \ -| | * | 2b5a79f12 Cycle websocket after learning of new linked devices via 409/410. -| |/ / -| * | 13defe79b Merge branch 'charlesmchen/requestMakerFailureLogging' into release/2.31.0 -| |\ \ -| | * | f6322cb08 Fix logging in request maker. -| |/ / -| * | d64b0388e Merge branch 'charlesmchen/noUDSync' into release/2.31.0 -| |\ \ -| | * | 47022377c Respond to CR. -| | * | 954f32b77 Never use UD for sync messages. -| | * | 8ff8f17b2 Never use UD for sync messages. -| | * | 3a46a344a Never use UD for sync messages. -| |/ / -| * | 4c98a200d Merge branch 'charlesmchen/signalRecipientReloads' into release/2.31.0 -| |\ \ -| | * | 1c21c31c2 Fix failed reloads in SignalRecipient. -| |/ / -| * | 1e5a228c5 (tag: 2.31.0.27) "Bump build to 2.31.0.27." -| * | 6d2c34884 Merge branch 'mkirk/update-translations-2' into release/2.31.0 -| |\ \ -| | * | 62e9f51c0 (origin/mkirk/update-translations-2) sync translations -| | * | 18343e1af l10n tr_TR -> tr -| | * | 3585e111b l10n th_TH -> th -| | * | a726fef89 l10n sv_SE -> sv -| | * | 735331dc9 l10n ja_JP -> ja -| | * | 6d052f137 l10n it_IT -> it -| | * | c01475836 l10n el_GR -> el -| | * | f8207c6d2 l10n az_AZ -> az -| | * | 3cfbc75f6 l10n ko_KR -> ko -| | * | 0d0659030 update existing translations -| |/ / -* | | d99777248 use https:// url for gitmodules -* | | adcd089f8 Merge branch 'charlesmchen/longVersionString' -|\ \ \ -| * | | 1be757788 Prevent long version strings from being scrubbed in the logs. -|/ / / -* | | cc068b0b7 Merge branch 'mkirk/media-gallery-shows-captions' -|\ \ \ -| * | | 11fece2f3 move category method to be shared -| * | | 74b25c14f filter caption strings for display -| * | | 3b53ee08b Long captions use ScrollView rather than resizing -| * | | cfd2e8d9d Show captions in gallery page view -|/ / / -* | | 1da59dd9b (tag: 2.32.0.4) "Bump build to 2.32.0.4." -* | | 29b470231 Fix build break. -* | | f3f7f9924 Update Cocoapods. -* | | 71e97229d Merge branch 'mkirk/interaction-uuid' -|\ \ \ -| * | | 366b228c0 use UUID for TSInteractions.uniqueId -|/ / / -* | | 65cef9f98 Merge branch 'charlesmchen/appSettingsButtonAccessibility' -|\ \ \ -| * | | 52af57f8a Fix accessibility for app settings button. -|/ / / -* | | 14b20db7c Merge branch 'charlesmchen/invalidAndRetryAssets' -|\ \ \ -| * | | b475695f5 Respond to CR. -| * | | 34b4ea377 Revise media progress views. -| * | | 15c42642e Apply invalid and rety assets. -|/ / / -* | | 934164cd1 Merge branch 'charlesmchen/newCaptionAsset' -|\ \ \ -| * | | 9d1579a48 Update caption indicator asset. -|/ / / -* | | b7e6f1d42 Merge branch 'charlesmchen/allMediaAreAlbums' -|\ \ \ -| * | | cd224a159 Render single media as albums. -|/ / / -* | | 1b49fa294 Merge branch 'charlesmchen/albumProgress' -|\ \ \ -| * | | 82fb766c2 (origin/charlesmchen/albumProgress) Respond to CR. -| * | | c7582b6bd Update Cocoapods. -| * | | 654325c6d Add download progress indicators. -| * | | a26086b30 Show attachment upload progress indicators. -| * | | c1a5e1e25 Rename to media album. -|/ / / -* | | 6a3ecb3d0 Merge branch 'charlesmchen/attachmentDownloads' -|\ \ \ -| * | | 04e627cdc (origin/charlesmchen/attachmentDownloads) Update Cocoapods. -| * | | 3daf7d474 Add OWSAttachmentDownloads. -|/ / / -* | | b25f17a27 Merge branch 'mkirk/album-gallery-view' -|\ \ \ -| * | | 03aba9398 CR: use id for hashvalue, make clearer that we don't expect to use incrementing ID's for uniqueId -| * | | 7cf53293d restore Share/Delete functionality to gallery items in the post multi-attachment world -| * | | 42bf26760 fixup plumbing for incoming messages/synced transcripts -| * | | e096406e5 migrate existing attachments to album-compatible gallery schema -| * | | 57681bd6f Gallery supports album messages -| * | | 27cb91e9c Plumb through messageAlbumId so an Attachment knows what album (if any) it belongs to. -|/ / / -* | | 6b796579d Merge branch 'charlesmchen/typingIndicatorsFooter' -|\ \ \ -| * | | f37c4f71a Add footer to 'typing indicators' setting. -|/ / / -* | | fade52344 Merge branch 'charlesmchen/typingIndicatorTiming' -|\ \ \ -| * | | 8b5a99369 Tweak timing of typing indicators. -|/ / / -* | | 2f8b25b4b Merge branch 'charlesmchen/albumStrokes' -|\ \ \ -| * | | 02a9cc918 Remove stroke on album items. -|/ / / -* | | 00adefa51 "Bump build to 2.32.0.3." -* | | 272678ca9 Merge branch 'charlesmchen/reduceTypingIndicators' -|\ \ \ -| |_|/ -|/| | -| * | 9a44f24bc Reduce typing indicators. -|/ / -* | f382cd770 Fix build break. -* | 2c50e3460 Merge branch 'charlesmchen/mediaAlbumRename' -|\ \ -| * | 777e2b925 Rename to media album. -| * | 2dfd4b2c0 Rename to media album. -|/ / -* | dd0f642ff Fix build break. -* | 3ff3779f1 CR: remove unnecessary assert -* | 195c42b9c Merge branch 'charlesmchen/captionIndicators' -|\ \ -| * | c7c02f03d Display caption indicators for media albums in conversation view. -|/ / -* | db3e5f608 Merge branch 'mkirk/multi-image-approval' -|\ \ -| * | 7cef41f8e (origin/mkirk/multi-image-approval) Multi-approval -|/ / -* | b519baf37 Merge branch 'charlesmchen/typingIndicatorsVsSelf' -|\ \ -| * | b7fd48ec4 Respond to CR. -| * | 9cdf8d06f Ignore typing indicators from self. -|/ / -* | af85c0960 Merge branch 'charlesmchen/mediaGalleryCells4' -|\ \ -| * | 57de08911 Add support for album captions to models. -| * | 3816cb4bf Update proto schema to reflect album captions. -|/ / -* | 268c456d5 Merge branch 'charlesmchen/mediaGalleryCellsDebug' -|\ \ -| * | 60c5a84dd Fix issues in media gallery cells; Improve debug galleries. -|/ / -* | 88a1186e4 Restore XCode 9 compatability. -* | ada4bf595 Merge branch 'charlesmchen/typingIndicatorFixes' -|\ \ -| * | cdfd2779a Fix a couple small bugs in the typing indicators. -|/ / -* | 3f135e9f7 Merge branch 'charlesmchen/mediaGalleryCells' -|\ \ -| * | 5aa6467d2 Fix issues in media gallery cells. -| * | f45693ec3 Respond to CR. -| * | 736d7c735 Fix media gallery cell edge cases. -| * | d53830163 Fix media gallery cell edge cases. -| * | 34e85dd90 Fix media gallery cell edge cases. -| * | ee3bdca33 Fix media gallery cell edge cases. -| * | cfcb6cb15 Clean up ahead of PR. -| * | 0c76e1c02 Use ConversationMediaView to simplify media rendering in conversation view cells. -| * | f2c0a6f7d Clean up ahead of PR. -| * | c89bdd2a1 Modify MediaGalleryCellView to handle animated images and videos. -| * | 2c9a55678 Remove overzealous assert in ConversationViewModel. -| * | cf057e3af Modify MediaGalleryCellView to handle still images. -| * | ec6de40bd Modify MessageBubbleView to support media galleries. -| * | 0341f5dc2 Modify ConversationViewItem to support media galleries. -| * | f2c098590 Add 'is valid media?' method. -|/ / -* | a5c4d1b9e Merge branch 'mkirk/multi-image-send' -|\ \ -| * | 4c5d46e8f Custom photo picker, respects theme/call banner -|/ / -* | c8ac66ff8 (tag: 2.32.0.2) "Bump build to 2.32.0.2." -* | dfc7b032b Merge branch 'charlesmchen/incrementalDiffOrdering' -|\ \ -| * | 2ca32fddc Preserve ordering in incremental diffs. -| * | aa5e6b456 Preserve ordering in incremental diffs. -|/ / -* | 5d6ff608c (tag: 2.32.0.1) "Bump build to 2.32.0.1." -* | 43eda866e Merge branch 'charlesmchen/appWillBecomeReady_' -|\ \ -| * | 1c7add2b8 Respond to CR. -| * | 39c820b86 Distinguish 'app will/did become ready' events. -| * | eb2e16872 Distinguish 'app will/did become ready' events. -|/ / -* | d338e00b1 Merge branch 'charlesmchen/conversationViewModelStartupRace' -|\ \ -| * | af249de68 Fix race in CVM startup. -|/ / -* | 269fae21a Merge branch 'mkirk/bundle-update' -|\ \ -| * | e9ac38b90 bundle update -|/ / -* | 65776cdae (tag: 2.32.0.0) "Bump build to 2.32.0.0." -* | 1e31e6aec Merge branch 'charlesmchen/debugUIMultiImageSends' -|\ \ -| * | c7d427029 Respond to CR. -| * | 47fda2e37 Add debug UI for multi-image sends. -| * | ecba67b51 Add debug UI for multi-image sends. -| * | f6591fac2 Add debug UI for multi-image sends. -| * | d04f1e6e3 Add debug UI for multi-image sends. -|/ / -* | 078503ff2 Merge branch 'charlesmchen/unregisteredGroup' -|\ \ -| * | f89398046 Add debug UI function to make group with unregistered users. -|/ / -* | b0bf8ed29 Merge branch 'charlesmchen/infoPlistOrdering' -|\ \ -| * | 58856748d Update info plist to reflect PlistBuddy ordering. -|/ / -* | 7c65a9806 Fix breakage from typing indicators. -* | b90fee08b Merge remote-tracking branch 'origin/release/2.31.0' -|\ \ -| |/ -| * 78987445e (tag: 2.31.0.26) "Bump build to 2.31.0.26." -| * 3d8a2a7f8 Merge branch 'charlesmchen/unregisteredUsersCache_' into release/2.31.0 -| |\ -| | * 3eab5b82c Respond to CR. -| | * 3011175ce Fix "413 on prekey fetch" errors. -| | * e89d8b40d Fix "413 on prekey fetch" errors. -| | * 3cc1988f2 Fix "413 on prekey fetch" errors. -| | * 97e234f78 Fix "413 on prekey fetch" errors. -| |/ -| * 9e7c25af1 Merge branch 'charlesmchen/informLinkedDevicesOfProfileChanges' into release/2.31.0 -| |\ -| | * ac051fc89 Inform linked devices about profile changes. -| |/ -* | 5b0962c01 Merge branch 'charlesmchen/typingIndicators7' -|\ \ -| * | 58f36fba4 (origin/charlesmchen/typingIndicators7) Disable typing indicators by default for legacy users. -|/ / -* | cc63c5307 Merge branch 'charlesmchen/typingIndicators5_' -|\ \ -| * | b8e9cd6b5 Respond to CR. -| * | 22c922bf5 Respond to CR. -| * | 650469c6a Respond to CR. -| * | 4088bebe0 Clean up ahead of PR. -| * | 94eaed002 Fix rebase breakage. -| * | f8a5a4141 Apply dark theme to typing indicator. -| * | 37ae4ef36 Add typing indicator animation. -| * | 63d88ef5c Sketch out TypingIndicatorCell. -| * | eedc9f9a2 Sketch out "typing indicators" interaction and cell. -| * | 50381cc94 Add typing indicators in home view. -| * | b063a49d5 Rework typing indicators API. -| * | a113271b5 Merge branch 'mkirk/splash-screen' -| |\ \ -| | * | d9a4c6e83 typing indicator upgrade screen -| |/ / -* | | 994081093 typing indicator upgrade screen -|/ / -* | 13ab75fea Merge branch 'charlesmchen/typingIndicators6' -|\ \ -| * | 1db5a157c Respond to CR. -| * | a5ebe394d Include typing indicators in configuration sync messages; emit when that value changes. -| * | 33f5398ba Update proto schema for configuration messages to reflect typing indicators setting. -|/ / -* | 6b1b2ddae Merge branch 'mkirk/whitelist-staging-cds' -|\ \ -| * | aa22f9a55 whitelist staging cds domain -|/ / -* | 2a7ee15ea Merge branch 'mkirk/media-gallery-call-banner' -|\ \ -| * | 77bd9b885 Extract most Gallery functionality from the gallery NavigationController. -| * | 6d8a7ed80 things working -| * | 1af750363 fix media-gallery doesn't respect call banner -|/ / -* | cdafeb838 Merge branch 'charlesmchen/conversationViewModel1' -|\ \ -| * | 834bba888 Respond to CR. -| * | 32d3eed7b Add ConversationViewModel. -|/ / -* | 10868c9f9 Merge branch 'charlesmchen/typingIndicators3' -|\ \ -| * | ea734ad17 Respond to CR. -| * | a09cb16e7 Add typing indicators setting. -|/ / -* | 5f7eee92d Merge branch 'mkirk/orientation-changes' -|\ \ -| * | f24ef7a0e separate title view for landscape -| * | 432fcc016 Gallery tile landscape -| * | 85a4fc7b6 restore calling banner -| * | 19f2d0db4 WIP: Media Landscape Mode -|/ / -* | 85f85d9c3 fix debug crash -* | fe15a260e Merge branch 'release/2.31.0' -|\ \ -| |/ -| * 338364eff Merge branch 'charlesmchen/profileFetchConcurrency' into release/2.31.0 -| |\ -| | * 372939850 Request profile fetches on main thread. -| |/ -* | d620c36a5 Merge branch 'charlesmchen/typingIndicators1' -|\ \ -| * | 3d0e7386a Respond to CR. -| * | a98c82645 Start work on typing indicators. -|/ / -* | 40aa78e00 Merge remote-tracking branch 'origin/release/2.31.0' -|\ \ -| |/ -| * ec2478645 (tag: 2.31.0.25, release/2.31.0) "Bump build to 2.31.0.25." -| * 82d64405d fixup blogpost url -| * b5bf3761a (tag: 2.31.0.24) "Bump build to 2.31.0.24." -| * 08befe914 Merge branch 'charlesmchen/udRefinements' into release/2.31.0 -| |\ -| | * 698e48f2d Respond to security review. -| | * 7d8b20d09 Apply refinements to UD logic. -| | * 44f677439 Apply refinements to UD logic. -| | * c28d131f9 Respond to CR. -| | * e11d43d1f Respond to CR. -| | * ee87f1b48 Fix test breakage. -| | * c5f471159 Apply refinements to UD logic. -| | * 2541be161 Apply refinements to UD logic. -| |/ -| * e94e4d0a9 Merge branch 'mkirk/wrap-exceptions' into release/2.31.0 -| |\ -| | * 86066a37d update pods for exception wrapping -| | * 1dea927a3 Remove some usage of throwswrapped_ in udmanager since we don't need to propogate the wrapped exception anyway. -| | * 3d9cd4f4e CR: comments and code clarity -| | * 3bef78335 find -E . -type f -regex ".*\.(m|h|swift)" -exec sed -i "" -e "s/trywrapped_/throwswrapped_/g" {} \; -| | * cb9aa6304 find -E . -type f -regex ".*\.(m|h)" -exec sed -i "" -e "s/try_/throws_/" {} \; -| | * e09a18144 SQUASHME review podfile changes -| | * 8544c8642 Swift Exception wrap HKDFKit -| | * c4f897530 Swift Exception wrap Curve25519 -| | * c686e766b Exception audit, fail directly where intended -| | * 9d2731c9b exception auditing OWSRaiseException -| | * 3a6aafc45 Swift Exception wrap NSData+keyVersionByte -| | * 5f5ec9b82 ExceptionWrap loadPreKey -| | * b622b3a02 Exception wrap TSDerivedSecrets for Swift -| | * 8d823193f Exception wrap WhisperMessage for Swift -| | * 1482c600b Exception wrap PreKeyWhisperMessage for Swift -| | * 60769a3d1 Exception wrap SessionCipher for Swift -| |/ -| * 0d7d83f27 Update carthage version in Info.plist. -| * 5535abd01 Update "sealed sender" blog post URL. -| * d24dce758 (tag: 2.31.0.23) Bump build to 2.31.0.23. -| * 1c6bfb454 (tag: 2.31.0.18) "Bump build to 2.31.0.18." -| * 9417bdeaa Merge branch 'charlesmchen/networkManagerErrors' into release/2.31.0 -| |\ -| | * a5f715eca Fix network manager error wrapping. -| |/ -| * 6e386b75c Merge branch 'charlesmchen/reregistrationVsProfile' into release/2.31.0 -| |\ -| | * 9fa16cc66 Fix small bug in the re-registration flow. -| |/ -| * af9a264c9 Merge branch 'charlesmchen/fixUDManagerTests' into release/2.31.0 -| |\ -| | * deafc749d Fix UD manager tests. -| |/ -| * 29ba1bd34 Merge branch 'mkirk/more-logging' into release/2.31.0 -| |\ -| | * ccd30e0e1 more logging -| |/ -| * 8a98a8abb Merge branch 'mkirk/minimize-prekey-checks' into release/2.31.0 -| |\ -| | * e26db74fc only check prekeys when decrypting a PKWM -| |/ -| * db60083dd Merge branch 'mkirk/persist-devices' into release/2.31.0 -| |\ -| | * af3102441 ensure device updates are persisted -| |/ -| * ef25b9c19 Merge branch 'mkirk/fixup-test-build' into release/2.31.0 -| |\ -| | * 90500475f fixup searcher test -| | * 159c546d1 update test environment -| | * af1940517 update carthage build path for tests -| |/ -| * faa556163 (tag: 2.31.0.17) "Bump build to 2.31.0.17." -| * 2e3a32e7d Merge branch 'mkirk/disable-proximity' into release/2.31.0 -| |\ -| | * 6968dbab1 Update UIDevice on main thread -| | * b0a6d1857 leave proximity enabled as long as CallViewController exists -| | * 5632bd2d8 Use reference counting to disable proximity monitoring after audio message -| |/ -| * 7f37400f1 Merge branch 'mkirk/fix-missing-own-avatar-after-key-rotation' into release/2.31.0 -| |\ -| | * 68353631d copy avatar file when rotating, since updating avatarURL entails removing the underlying file -| |/ -| * 9a65c8326 Merge branch 'charlesmchen/smallUDTweaks' into release/2.31.0 -| |\ -| | * 33f0a32e5 Improve UD logging. -| | * 302da6601 Fix UD access logic. -| |/ -| * 514c7b603 (tag: 2.31.0.16) "Bump build to 2.31.0.16." -| * c556d0c72 Merge branch 'charlesmchen/unrestrictedRandomProfileGets' into release/2.31.0 -| |\ -| | * 15e6916ba Update Cocoapods. -| | * 737f64b76 Improve UD logging. -| | * ad59b2f6d Move "ud access for sends" logic into UD manager. -| | * 3f10ce740 Tweak profile fetch auth behavior in unknown mode case. -| | * 36f39d9a3 Remove SSKUnidentifiedAccess. -| | * 7de289f6b Remove SSKUnidentifiedAccess. -| | * 5d18497ad Try random UD access keys in profile gets. -| | * dbe635f72 Try random UD access keys in profile gets. -| |/ -| * b65d515ac Update cocoapods. -| * 0cf24e39a Merge branch 'charlesmchen/avatarIconQuality' into release/2.31.0 -| |\ -| | * 408008d3e Use different contact avatar assets depending on size of output. -| | * 4ea6d7200 Improve default avatar quality. -| |/ -| * a602a807f Merge branch 'charlesmchen/moreStartupLogging' into release/2.31.0 -| |\ -| | * bf1f9e706 Exclude date/time and Xcode version info in debug builds to avoid churn. -| | * ed4fa2e8c Respond to CR. -| | * 38f3321e9 Improve startup logging. -| |/ -| * c879878d6 Merge branch 'charlesmchen/contactManagerDeadlocks' into release/2.31.0 -| |\ -| | * 70f274598 Avoid deadlocks in contact manager. -| | * f26241ebd Avoid deadlocks in contact manager. -| |/ -| * bf140971e Merge branch 'charlesmchen/consistentAvatarColors' into release/2.31.0 -| |\ -| | * 5b339a642 Respond to CR. -| | * 25ed886e7 Update home and group cells' dependencies. -| | * 763acae15 Use thread to ensure consistent colors in contact cells. -| | * 28f37a7a3 Update contacts cells' dependencies. -| |/ -| * 08518c66b Merge branch 'charlesmchen/groupAvatarUpdateAsserts' into release/2.31.0 -| |\ -| | * 278c61fd1 Remove assert around group avatar updates. -| |/ -| * cc97090ef Merge branch 'charlesmchen/logWebRTCVersion' into release/2.31.0 -| |\ -| | * 8e1103c28 Log WebRTC version. -| |/ -| * 8cb62e7f8 (tag: 2.31.0.15) "Bump build to 2.31.0.15." -| * 81d6b60ad Fix icon layout in privacy settings. -| * 7868bed2a Merge branch 'charlesmchen/syncMessagesForSuccess' into release/2.31.0 -| |\ -| | * 9df94b847 Rework sync transcript sending. -| |/ -| * 6f6612048 (tag: 2.31.0.14) "Bump build to 2.31.0.14." -| * 0270423a1 Merge branch 'mkirk/voicenote-earpiece' into release/2.31.0 -| |\ -| | * ce9ca1bda audio player type -| | * 4b4b18c62 Proximity playsback through earpiece -| | * 3b4188f34 hoist audio session singleton to Environment -| | * 3d022adf4 WIP: audio activities -| |/ -| * 14f2b8936 Merge branch 'mkirk/m70' into release/2.31.0 -| |\ -| | * 9708a1aed update WebRTC to M70 -| |/ -| * c8c63c18d (tag: 2.31.0.13) "Bump build to 2.31.0.13." -| * 6a91f021a Update l10n for UD. -| * 11c5257a4 (tag: 2.31.0.12) "Bump build to 2.31.0.12." -* | c4677c9d4 CR: add some reachability asserts -* | 9ad77399c Merge branch 'mkirk/durable-queue-reachability' into master -|\ \ -| * | 0c2bb439f kick-queue upon reachability -| * | 54c63c7a2 Reachability Singleton -| * | b8e4bfff8 shuffle isReady->isSetup, centralize starting workStep -|/ / -* | c9d6ccc48 Merge branch 'mkirk/durable-queue' into master -|\ \ -| |/ -|/| -| * 751b6e568 documentation for MessageSenderJobQueue -| * 037bdebfa clarify backoff delay examples -| * 86a0efedc Don't delete session upon starting retry -| * d35b735d7 Log message type in message sender -| * 3560f3be5 Durable send operation -| * e20df022c always show footer for in-progress sending -| * 25af0f4c1 more factories -| * 3a1769c81 unrelated swift fix -| * 456b2c083 Avoid crash during test runs -|/ -* cc9dad02a Merge branch 'charlesmchen/deviceChangeVsWebsocket' -|\ -| * 21cf467bb Don't use websocket after 409/410. -|/ -* 0ccda03a2 Merge branch 'charlesmchen/udCopy' -|\ -| * 55ab6c39d Rework UD settings. -| * f765c6c1b Update UD settings copy. -|/ -* 8194409f5 Merge branch 'mkirk/webrtc-repo' into master -|\ -| * 91eba4dbf Move WebRTC to separate submodule -|/ -* 0441d1fe7 (tag: 2.31.0.11) "Bump build to 2.31.0.11." -* 910fa11ad Merge branch 'charlesmchen/testsVsNSUserDefaults' -|\ -| * 1a53005e0 Respond to CR. -| * a9aabf763 Use temporary user defaults in tests. -|/ -* 196542fd9 Merge branch 'charlesmchen/udVsLinkedDevices2' -|\ -| * b003049d9 Improve UD logging. -| * b33886366 Always disable UD for users without verifier. -|/ -* 639f38571 Merge branch 'charlesmchen/udVsLinkedDevices' -|\ -| * 8c8b3a95b Respond to CR. -| * 00d79900e Fix edge cases around UD v. linked devices. -| * b83299888 Fix edge cases around UD v. linked devices. -| * 8fec73dda Fix edge cases around UD v. linked devices. -| * d656ae101 Fix edge cases around UD v. linked devices. -|/ -* 24e3dbbe4 (tag: 2.31.0.10) "Bump build to 2.31.0.10." -* 81830ee0f Merge branch 'charlesmchen/udIFFSync' -|\ -| * 64aa43edb Only enable UD if UD is supported by all linked devices. -|/ -* bdf6ba15d (tag: 2.31.0.9) "Bump build to 2.31.0.9." -* 060be88e8 Merge branch 'charlesmchen/lazyTranscripts' -|\ -| * 86e22edcb Send "sent message transcript" sync messages at the _end_ of a send, not after the first recipient is sent. -|/ -* 9cb7f1a4f Merge branch 'charlesmchen/udSyncVsDeviceLinking' -|\ -| * 9c161e913 Respond to CR; handle device changes in SignalRecipient as well. -| * 55369a1ca Only send 'sent message transcript' sync messages using UD. -| * 94c7b7236 Only send "sent message transcript" sync messages using UD. -|/ -* 991cf5148 Merge branch 'charlesmchen/requestMaker' -|\ -| * 553d1ac3b Respond to CR. -| * 2894db0d6 Add request maker. -|/ -* b5ed4e8ea Merge branch 'charlesmchen/prekeyFetchViaWebSocket' -|\ -| * ab6c4a4c3 Try prekey fetches via websocket. -|/ -* b7920fef8 Remove obsolete TODO. -* 72903105c Merge branch 'charlesmchen/syncVsProfileKeyRotation' -|\ -| * 99d0495ec Respond to CR. -| * 5809d026d Clean up ahead of PR. -| * bbcbbafaa Sync local profile key after rotating it. -|/ -* e803f2bfb (tag: 2.31.0.8) "Bump build to 2.31.0.8." -* c86733ab9 Merge branch 'charlesmchen/debugLogEmailTemplate' -|\ -| * a74687439 Improve the debug logs email template. -|/ -* 693b3e13a Revert "Sync local profile key after rotating it." -* ddbd20e70 Sync local profile key after rotating it. -* 855615d76 Merge branch 'charlesmchen/udProduction' -|\ -| * 7115d45d0 Changes for UD in production. -|/ -* 4a5c1b6b1 Merge branch 'charlesmchen/udSendCleanup' -|\ -| * d44e414b5 Clean up message sender. -|/ -* c7fc7ade0 Merge branch 'charlesmchen/linkedDeviceUDState' -|\ -| * 6d075747c Update local profile after registration and profile key rotation. -| * 932244288 Don't assume all linked devices support UD. -|/ -* d9e5e9ddc Merge branch 'charlesmchen/udFixes2' -|\ -| * 353f91db6 Respond to CR. -| * 9519e7961 Rework recipient device updates. -| * a00ebdf4a Fix UD auth edge cases. -| * 2f4094e80 Fix UD auth edge cases. -| * 4d89670f1 Fix UD auth edge cases. -|/ -* 398e72c69 Merge branch 'charlesmchen/udProdTrustRoot' -|\ -| * de8b5b55c Update production trust root. -|/ -* 7f1377472 Merge branch 'charlesmchen/groupIdLength' -|\ -| * 6d3f62453 Add asserts around group id length. -|/ -* ca2ab587a Merge branch 'charlesmchen/codeVerificationPromise' -|\ -| * a9b4b06c8 Retain code verification promise. -|/ -* 34bd61870 (tag: 2.31.0.7) "Bump build to 2.31.0.7." -* c7029ddb8 Merge branch 'charlesmchen/syncUDIndicatorSetting' -|\ -| * 0add39c2a Respond to CR. -| * 275414cbd Respond to CR. -| * 7c1f1882d Sync "show UD indicators" setting. -| * 43960aadd Update proto schema. -|/ -* 87c89d414 Merge branch 'mkirk/fix-factory' -|\ -| * aff35329b make factory Swift 4.1 compatible -|/ -* cccd24612 Revert "Revert Factories." -* 44b951fdf Merge branch 'charlesmchen/migrationCompletion' -|\ -| * 2b8c70ef9 Fix UD attributes migration completion. -|/ -* 2e4a655b7 Merge branch 'charlesmchen/pasteLogUpdates' -|\ -| * 92b55b945 Revert copy change. -| * 866338fba Refine debug logs UI. -|/ -* d5aa72a22 Merge branch 'charlesmchen/singletonAgain' -|\ -| * c6ef7f18e Improve test logging. -| * 79ed05133 Move db connections to environments. -| * f1646b6cb Move db connections to environments. -| * 829851bd7 Hang PushManager on AppEnvironment. -|/ -* fa89e487a Merge branch 'charlesmchen/udThreadlessErrors' -|\ -| * 9d7c3afda Show (threadless) error notifications for UD decrypt failures. -|/ -* 10309faf5 (tag: 2.31.0.6) "Bump build to 2.31.0.6." -* b1e52c30b Fix build breakage. -* 3cf13ee15 (tag: 2.31.0.5) "Bump build to 2.31.0.5." -* 7aabb821b Revert Factories. -* d5bf17e59 (tag: 2.31.0.4) "Bump build to 2.31.0.4." -* 92f21e96b Update Cocoapods. -* ce8b18274 (tag: 2.31.0.3) "Bump build to 2.31.0.3." -* 0a56b8258 Merge branch 'mkirk/fix-testutils-breakage' into master -|\ -| * d6cbdddc4 Fix test build, rename src/Test/ ->src/TestUtils/ to avoid confusion with the existing test/ directory -|/ -* db09a4dae Merge branch 'mkirk/test-factories' into master -|\ -| * ac7f9f62d factories for tests -|/ -* 59551ddab Merge branch 'charlesmchen/enableOrphanDataCleaner' -|\ -| * 72d21f511 Enable orphan data cleaner. -|/ -* f92ef8447 Merge branch 'charlesmchen/buildBreakage3' -|\ -| * 48c4576c0 Fix failing test. -| * 8830f0a59 Clean up ahead of PR. -| * 0b4ed1175 Create AppEnvironment. -| * d7e52367f Create AppEnvironment. -|/ -* dbaa49d2f Merge branch 'charlesmchen/buildBreakage' -|\ -| * bc4ac8cd1 Respond to CR. -| * df6fe05d0 Get tests running. -| * 53466386f Get tests running. -| * 32cf68bec Get all tests building. -|/ -* 814921935 Merge remote-tracking branch 'origin/release/2.30.2' -|\ -| * 0767dd66a (tag: 2.30.2.16, origin/release/2.30.2) "Bump build to 2.30.2.16." -| * 1a1bf38ff update translations -| * 3d3454ceb "Bump build to 2.30.2.15." -| * d2ac64b30 update carthage -* | 88c96f3c2 Update Cocoapods. -* | ab9e95961 Merge branch 'mkirk/call-missing-retain' into master -|\ \ -| * | 5b8d712ad add missing retain in peer connection client -|/ / -* | 5a6c2d32f Merge branch 'charlesmchen/smEnvironment' -|\ \ -| * | 603e3bf0b Move SM singletons to Environment. -|/ / -* | b9d592ed1 Merge branch 'mkirk/upgrade-promisekit' into master -|\ \ -| * | 0cfa5c07f (private/mkirk/upgrade-promisekit) update pods -| * | d6a6024f3 Update PromiseKit -|/ / -* | f578ab1df Merge branch 'mkirk/dev-fixups' into private-master -|\ \ -| * | 92e8b117f fixup debug contacts -|/ / -* | 9b6d2be37 (tag: 2.31.0.2) "Bump build to 2.31.0.2." -* | c9abd5a6e Merge branch 'mkirk/fix-new-account-registration' into master -|\ \ -| * | c425aa949 dont rotate profile keys for unregistered user -|/ / -* | b44a5e9d2 (tag: 2.31.0.1) "Bump build to 2.31.0.1." -* | f4db5e6bb Merge branch 'charlesmchen/accountAttributeUpdates' -|\ \ -| * | c9922cda3 Respond to CR. -| * | 8fdf6009f Sync contacts after rotating profile key. -| * | eb7abdfc6 Account attributes updates. -|/ / -* | f1d93d447 Merge remote-tracking branch 'origin/release/2.30.2' -|\ \ -| |/ -| * c995c838d (tag: 2.30.2.14, private/release/2.30.2) "Bump build to 2.30.2.14." -| * 97d6ac370 Merge branch 'mkirk/blue-group' into release/2.30.2 -| |\ -| | * d5f69e4bb feature flag for group avatar color -| |/ -| * ebd356054 (tag: 2.30.2.13) "Bump build to 2.30.2.13." -| * 76b305034 Merge branch 'mkirk/cds-failures' into release/2.30.2 -| |\ -| | * 5edf2e426 Only report attestation failure if we *received* the attestion. -| | * c4550ebc9 don't submit feedback for connectivity errors -| | * e22ad8ba6 include underlying error in wrapped TSNetworkErrors -| | * e7170dc6e conventional error structure for connectivity error -| | * 54b184bc9 Whitelist cds domain -| |/ -| * 51699ebc0 (tag: 2.30.2.12) "Bump build to 2.30.2.12." -| * d3d5dd71a Merge branch 'mkirk/dark-theme-toggle' into release/2.30.2 -| |\ -| | * 4435d16f9 dark theme toggle in app settings -| |/ -| * c39cec413 Merge branch 'charlesmchen/bumpRuby' into release/2.30.2 -| |\ -| | * b88cbef1f Bump ruby version to v2.5.0. -| |/ -| * 501f4641a (tag: 2.30.2.11) "Bump build to 2.30.2.11." -| * 770c9c08b Merge branch 'charlesmchen/convoBubbleColors' into release/2.30.2 -| |\ -| | * 17541a888 Change conversation bubble colors. -| |/ -| * 5344766ef (tag: 2.30.2.10) "Bump build to 2.30.2.10." -| * 6104fb675 Merge branch 'mkirk/archive-stack' into release/2.30.2 -| |\ -| | * ac1216962 Keep home view controller in the navigation stack when entering an archived conversation. -| |/ -| * f78198c07 Merge branch 'charlesmchen/settingsButtonGlitch' into release/2.30.2 -| |\ -| | * acdd7f280 Fix settings button glitch on iOS 10. -| |/ -| * 0cb6a5765 (tag: 2.30.2.9) "Bump build to 2.30.2.9." -| * af236f57e Merge branch 'mkirk/sync-modern-colors' into release/2.30.2 -| |\ -| | * 2b805e4ea Constantize ConversationColorName, map previous incorrect values -| | * d59e21e7f Nothing outside of TSThread should know about legacy colors -| |/ -| * b612533d4 (tag: 2.30.2.8) "Bump build to 2.30.2.8." -| * b02f3eec1 update translations -| * 54c061fb9 Merge branch 'mkirk/fixup-color-for-new-conversation' into release/2.30.2 -| |\ -| | * 405cc31a3 Apply new colors to new conversation -| |/ -| * 6b21849b8 (tag: 2.30.2.7) "Bump build to 2.30.2.7." -| * e18af5a47 sync translations -| * b797ac83c Merge branch 'mkirk/attachment-download-failures-2' into release/2.30.2 -| |\ -| | * f243914fe NSTemporaryDirectory -> OWSTemporaryDirectory/AccessibleAfterFirstAuth -| | * e1e355bfe fixup filebrowser -| |/ -| * 2d3bd87de (tag: 2.30.2.6) sync translations -| * 9f7cdc3f8 "Bump build to 2.30.2.6." -| * 91c129a13 update pods -| * a065c391d (tag: 2.30.2.5) "Bump build to 2.30.2.5." -| * 049fd63f4 Merge branch 'mkirk/attachment-download-failures' into release/2.30.2 -| |\ -| | * 656035837 Fix failed attachment downloads in beta -| |/ -| * 1fb4ca999 Merge branch 'mkirk/color-picker-tweaks' into release/2.30.2 -| |\ -| | * dcb65854e More scaleable across device sizes. -| | * bdb5bd559 minimize diff -| | * 375c8bee0 Use stand accessoryView mechanics -| | * 5127352f7 update color picker cell per design -| | * 8faf8668b lighter sheetview handle for dark theme -| | * bbbc5bbb8 update copy per myles -| | * 043b0c835 swipe to dismiss sheet view -| |/ -| * 17ad905f2 Merge branch 'mkirk/fix-multiple-review-requests' into release/2.30.2 -| |\ -| | * 7805e0044 work around multiple review's appearing -| |/ -| * eac0c8e35 (origin/mkirk/color-update-delay) Merge branch 'mkirk/color-update-delay' into release/2.30.2 -| |\ -| | * 006021ea4 Fix: group color change doesn't immediately apply -| |/ -* | 6fe05a61b Merge branch 'charlesmchen/sendDeliveryReceipts' -|\ \ -| * | 5e0bc1bc1 Respond to CR. -| * | 3e85c8c02 clang-format branch changes -| * | b53cb9e61 Clean up ahead of PR. -| * | 5cf8909a2 Modify OWSOutgoingReceiptManager to handle read receipts. -| * | 010ce1f6c Rename to OWSOutgoingReceiptManager. -| * | 2b45a8348 Clean up ahead of PR. -| * | f5591ef7b Clean up ahead of PR. -| * | 62d1fd202 Clean up ahead of PR. -| * | 45d6250ae Send delivery receipts. -| * | de7bffa59 Send delivery receipts. -| * | 13373db3b Send delivery receipts. -|/ / -* | b5f6670de Merge branch 'charlesmchen/obsoleteCDSConstant' -|\ \ -| * | 9ef0f35d2 Remove obsolete CDS constant. -|/ / -* | 45119d7ef Merge branch 'charlesmchen/udStatusSync' -|\ \ -| * | c5f52cc0b Respond to CR. -| * | fd9ee4c9f Fix small bug. -| * | 7e7fcc169 Apply UD status from transcripts. -| * | 0c6c506a3 Send UD status in sync messages. -| * | 994e95a64 Update protos. -|/ / -* | 4820af8ea Merge branch 'mkirk/ud-ui-2' into master -|\ \ -| * | 43884af19 remove redundant "failed to download" method -| * | efe07e1dd Secret sender icon in message details -|/ / -* | 2054bdc69 (tag: 2.31.0.0) "Bump build to 2.31.0.0." -* | aa04608e7 Merge branch 'charlesmchen/blockListVsProfileWhitelist' -|\ \ -| * | 794914353 Respond to CR. -| * | f00f60883 Respond to CR. -| * | f7827cda7 Respond to CR. -| * | 0ce2e4d4d Rotate profile key if blocklist intersects profile whitelist. -| * | c907721a1 Rotate profile key if blocklist intersects profile whitelist. -|/ / -* | d8a0baf9e Merge branch 'charlesmchen/udFixes' -|\ \ -| * | 1f37980a0 Suppress UD against production service to avoid de-registration. -| * | f2a1df4e9 Update device message auditing to reflect UD behavior. -| * | 960b4f537 Suppress UD against production service to avoid de-registration. -|/ / -* | a5655649d Merge branch 'mkirk/ud-ui' into master -|\ \ -| * | 1544f8db4 Optionally show UD status in message details -| * | 221ce513f extract dependencies, no change in behavior -| * | c68090864 add toggle for unrestricted access -|/ / -* | 9323e411f Revert AppReadiness singleton. -* | 27700ef78 Revert AppVersion singleton. -* | 09db42bf9 Merge branch 'charlesmchen/moreSingletons' -|\ \ -| * | f24ccb3ce (private/charlesmchen/moreSingletons) Hang more singletons on SSKEnv. -|/ / -* | 409673612 Merge branch 'charlesmchen/udManagerBreakage' -|\ \ -| * | 8bd97aaaa Respond to CR. -| * | 03f23b5f7 Fix breakage in UD manager; add UD manager test, hang TSAccountManager on SSKEnv, fix bugs in tests. -| * | 1f2bfe8df Fix breakage in UD manager. -|/ / -* | d6762a264 Merge branch 'charlesmchen/udProperties' into private-master -|\ \ -| * | bda6fdf44 Respond to CR. -| * | a6eed3012 Add 'is ud' property to outgoing messages. -| * | cba8c6798 Add 'is ud' property to incoming messages. -|/ / -* | 68f1c75f3 Merge branch 'charlesmchen/udWebSocketFailures' -|\ \ -| * | 0d588346f Fix rebase breakage. -| * | a4cdc5272 Handle UD auth errors in websocket sends. -|/ / -* | 92f182762 Merge branch 'mkirk/unidentified-profile-fetch' into private-master -|\ \ -| * | a5db222c7 move ud auth to request factory -| * | fb2abdcd1 UD auth for profile fetching -| * | 0be1f8cca Move UD auth into request initializers -| * | 39ba41343 Track UD mode enum instead of two booleans -|/ / -* | 1b9420745 Merge branch 'charlesmchen/selfSync' -|\ \ -| * | fab79e267 Respond to CR. -| * | 75e59bbc6 Discard self-sent messages during the decryption process. -| * | e47b69e0a Send sync messages to self via UD (only); discard self-sent sync messages. -| * | 283cb1828 Re-run UD attributes migration. -| * | 7ef39bf25 Clean up proto utils. -| * | d9c8a218b Use local profile data for the local phone number. -| * | 5e253f1c2 Always include "local user" in contacts sync messages. -|/ / -* | 1319116a6 Merge branch 'charlesmchen/themeConcurrency' -|\ \ -| * | 23088e412 Remove overzealous assert in theme. -|/ / -* | 396a17af3 Merge branch 'charlesmchen/udAccessVerifier' -|\ \ -| * | 624ffdf9b Update cocoapods. -| * | 01f63792f Respond to CR. -| * | 7cb015833 Apply UD access verifier. -|/ / -* | a81a89871 Merge branch 'charlesmchen/removeServerGUID' -|\ \ -| * | 21b383f4e Remove server GUID from TSIncomingMessage. -|/ / -* | 5beff56ce Merge branch 'charlesmchen/missingServerTimestamps' -|\ \ -| * | d5ec4daa6 Update Cocoapods. -| * | 7441c565b Fix missing server timestamps. -| * | f4148edf9 Fix missing server timestamps. -| * | ad56be27c Fix missing server timestamps. -|/ / -* | b60fa3cc9 Merge branch 'charlesmchen/udWebSocket' -|\ \ -| * | 337453b2f Update Cocoapods. -| * | 01ca416f4 Fix rebase breakage. -| * | 2f2b6b071 UD sends over web sockets; update web socket auth for UD. -| * | 3b06434d4 Split out second web socket. -| * | c137e95ae Move socket manager to hang on SSKEnvironment. -|/ / -* | 0567a3d24 Merge branch 'charlesmchen/ud9' -|\ \ -| * | fbfda5b9d Respond to CR. -| * | 1a23186ec Fix 'info message for group events'. -| * | 61a99c3f8 Further sender cleanup. -|/ / -* | fbf0c51e7 Merge branch 'charlesmchen/ud8' -|\ \ -| * | 51bce77cd Update Cocoapods. -| * | f2a9c10c2 Respond to CR. -| * | a69707227 Respond to CR. -| * | f9e90215b Respond to CR. -| * | ccb67f49a Fix issues in UD send & receive. -| * | 0b41e5e24 Rework profile fetch to reflect UD changes. -| * | 2eeba2d79 Fix spurious assert in orphan data clenaer. -| * | 1e10a8663 UD send via REST. -| * | 24b0eed1f UD send via REST. -| * | d08479980 UD send via REST. -|/ / -* | c856859fb Fix build breakage. -* | bebabdd26 Merge branch 'charlesmchen/ud7' -|\ \ -| * | 1b25a18e5 Respond to CR. -| * | f0b16186c Respond to CR. -| * | b8c5e1475 Apply UD trust root value for staging. -| * | 0c0d2a702 Decrypt incoming UD messages. -|/ / -* | bfbd418cb Merge branch 'charlesmchen/ud6' -|\ \ -| * | cec8df422 Respond to CR. -| * | 3eb84ed0e Move message processing singletons to SSKEnvironment. -|/ / -* | f37fce2df Merge branch 'charlesmchen/ud5' -|\ \ -| * | 580d0486b Respond to CR. -| * | 9f2a15925 Add new envelope properties for UD. -|/ / -* | a266fc359 Merge branch 'charlesmchen/ud3' -|\ \ -| * | 4ab281346 Respond to CR. -| * | 39f1be65f Respond to CR. -| * | 95387dd22 Fix rebase breakage. -| * | 1b1312c45 Clean up ahead of CR. -| * | 1d40cbfb4 Rework account attributes; persist manual message fetch; add "unrestricted UD" setting. -|/ / -* | 12c8eaf06 Merge branch 'charlesmchen/ud2' -|\ \ -| * | d4fab97a7 Fix build breakage. -| * | b808c2b33 Respond to CR. -| * | 5da4f7bb5 Update podfile. -| * | dca46e019 Respond to CR. -| * | e98c57215 Sketch out sender certificate validation. -| * | 45233ec86 Revert UD server certificate parsing. -| * | f7379deb6 Add setup method to UD manager. Try to verify server certificate expiration. -| * | 7fd15d2fd Add server certificate methods to UD manager. -| * | b714e528f Add UDManager. -|/ / -* | 8deaf652e Merge branch 'charlesmchen/ud' -|\ \ -| * | 21177e84d Fix or disable tests broken by recent merges. -| * | 71da31233 Post-SMK ud changes. -|/ / -* | 935aaa420 Merge branch 'charlesmchen/sck' -|\ \ -| * | 2c4c096d9 Fix typo in swift names. -| * | db487705c Fix breakage in the tests. -| * | a22440187 Respond to CR. -| * | 24d7a9761 Fix rebase breakage. -| * | f4c2b5e47 Update cocoapods. -| * | 7d727b7ac Modify proto wrapper builders to require required fields. -| * | 74e456f90 Modify proto wrapper builders to require required fields. -| * | 0da5a7395 Clean up ahead of PR. -| * | 04db4ca95 Get SMK tests building and passing. -| * | 8f5e21c7c Fix build breakage from SMK. -| * | 3738155c8 Fix build breakage from SMK. -| * | 8ae200ac2 Fix build breakage around SignalCoreKit. -| * | b77528ca0 Fix asserts & logging. -| * | 0125535d4 Pull out SignalCoreKit. -|/ / -* | f0f25aa41 Merge remote-tracking branch 'origin/release/2.30.2' -|\ \ -| |/ -| * 5fc21bce9 (tag: 2.30.2.4) "Bump build to 2.30.2.4." -| * 39a73abce update pods -| * 26fadaf10 Merge branch 'charlesmchen/iOS9CustomBarButton' into release/2.30.2 -| |\ -| | * 9474a1bfc Fix "broken settings button layout in iOS 9" issue. -| |/ -| * ea0aba1f9 Merge branch 'charlesmchen/unreadBadgeRound' into release/2.30.2 -| |\ -| | * 908d6dfd7 Ensure unread badges in home view are always at least a circle. -| |/ -| * b07de266c (tag: 2.30.2.3) "Bump build to 2.30.2.3." -| * c07147210 Merge branch 'mkirk/picker-bubble-preview' into release/2.30.2 -| |\ -| | * 56387f357 demo conversation colors when selecting -| | * 06eae47e0 ConversationViewItem -> protocol -| |/ -| * f56ac96d3 (tag: 2.30.2.2) "Bump build to 2.30.2.2." -| * ebae75af0 Revert 'new sort id'. -| * 673dae83d (tag: 2.30.2.1) Bump build to 2.30.2.1. -|/ -* 69b805c39 "Bump build to 2.30.1.1." -* 64007e7d7 Merge branch 'charlesmchen/swiftExit' -|\ -| * b076f1496 Swift exit(). -| * 3c22d0b0c Swift exit(). -|/ -* 90e7d9fbb Update AxolotlKit. -* 2629f0114 Update tags_to_ignore. -* 1e82caed0 Remove dark theme feature flag. -* fbeb07d2e Fix build break. -* 2f1f7a8e2 Update cocoapods. -* 99766fe07 Update l10n strings. -* 6f9c99f99 Merge branch 'mkirk/color-picker' -|\ -| * acd042c35 Sort conversation colors -| * 4765ed9a0 Color picker -| * 95a6df649 Generic SheetViewController -|/ -* 6b9133e5e Merge branch 'strings-audit' -|\ -| * 97d0543ce String cleanup: -|/ -* 57047e67e Merge branch 'mkirk/fix-hang-on-entry' -|\ -| * e3e6c3161 fix hang on conversation load -|/ -* c05f9a4de update pods -* 79add78d5 Merge branch 'release/2.30.1' -|\ -| * 58103060e (origin/release/2.30.1) Merge branch 'mkirk/wip-sort-id' into release/2.30.1 -| |\ -| | * 3518d37c3 use autorelease pool in migration to avoid accumulating memory -| | * 04a52980a fixup migration -| | * fe7d69e9c Update thread's sorting order based on whatever the currently last message is -| | * 02692e42b remove addressed TODO's -| | * c2f87c738 trivial replace of timestampForSorting -> sortId in some logging -| | * c21020d7e Use received date for footer-collapse supression -| | * 6f8eddc95 unread indicator uses sortId -| | * 3240e0d9d Be explicit about receivedAt time -| | * 6bfd0f29e mark self-sent messages as read as soon as it was created -| | * c0c973de1 Sort gallery finder by sortId -| | * 2eb3ec6d0 benchmark migration -| | * b281b3763 replace thread.lastMessageDate/archivalDate -> thread.lastSortId, thread.archivedAsOfSortId -| | * c27d35f8f sort search results by sortId -| | * 1459fad01 sort media gallery by sortId -| | * 90aa593dc sortId vs. Read status -| | * 089c4f09e bump all views which rely on message sorting -| | * d6d6c4fca ConversationVC - lastSeenSortId -| | * ab55e8530 step 1: timestampForSorting audit, change signature -| | * e1a46d85f investigation shows we don't use this timestamp for call error messages -| | * df6131649 minimize diff senderTimestamp -> timestamp -| | * 00d0d1e00 Remove legacy Error backdating - no changes in functionality -| | * 550e7ba63 Create disappearing message update info messages before messages they affect -| | * eef1368ad Timestamp audit step1: change signature -| | * 6c5fbc6de Update existing contact offers in place -| | * a60d8eb16 WIP: migration / autoincrement logic -| | * ae668ceca include sequence number in fake messages -| |/ -| * 87509df26 Merge branch 'mkirk/fix-release-compile' into release/2.30.1 -| |\ -| | * bccb633b6 fix release compile -| |/ -| * 4b9d720b9 ignore RI check for unreleased 2.30 tags -| * 306c6ade7 "Bump build to 2.30.1.0." -* | 0298c3584 Merge branch 'charlesmchen/productionizeCDS2' -|\ \ -| * | bb5c9ff10 Respond to CR. -| * | c0f425459 Mark CDS feature flag for removal. -| * | 0884598a3 Fix CDS cookie handling. -| * | c368aabf9 Fix the "de-register" logic. -| * | b10bf441c Add note about curl cookie support. -| * | 370c96af5 Enable CDS in contact intersection. -| * | 43d0b9b9b Fix misnamed method. -| * | b6a14ea01 Fix the CDS version checking. -| * | bcb882f5a Update CDS URLs. -|/ / -* | 7b056d624 Merge branch 'charlesmchen/crashAppGesture' -|\ \ -| * | 2ef878bfc Add crash gesture to about view. -|/ / -* | 469bb3fee Merge branch 'charlesmchen/conversationColorsClass' -|\ \ -| * | 2b75c4034 Pull out OWSConversationColor to its own file. -| * | 5a99cd347 Pull out OWSConversationColor to its own file. -|/ / -* | c90c12702 Merge branch 'charlesmchen/conversationColorsFixBubbleSecondaryColor' -|\ \ -| * | 43dc362fc Fix secondary color within message bubbles. -|/ / -* | 4003e3185 Merge branch 'charlesmchen/conversationColorsDefaultContactAvatarAsset' -|\ \ -| * | 0e5f42def Use new asset for default contact avatars. -|/ / -* | 1c1d305a7 Respond to CR. -* | 8c6a396bd Merge branch 'charlesmchen/conversationColorsMapLegacyColors' -|\ \ -| * | 857cdf436 Map the legacy conversation color names. -|/ / -* | 3c8639b8a Merge branch 'charlesmchen/conversationColorsDefaultAvatarTextSize' -|\ \ -| * | ec0206ff0 Adapt text size of default avatars to avatar size. -|/ / -* | 05d4836c7 Merge branch 'charlesmchen/conversationColorsDefaultProfileAvatars' -|\ \ -| * | 6d14a1b47 Local profile default avatars should use steel background. -| * | 27488f078 Replace old "default profile avatar" icon with default avatar for local user. -|/ / -* | e4ab36071 Respond to CR. -* | 2cb9de5ea Merge branch 'charlesmchen/converationColorsAppSettingsAvatar' -|\ \ -| * | b5c5d1c3e Use local avatar as app settings button. -|/ / -* | 307a7ebf8 Merge branch 'charlesmchen/conversationColorsMediaShadows' -|\ \ -| * | cbaf40d4c Respond to CR. -| * | d161e5ff3 Add inner shadows to media thumbnails. -|/ / -* | ade88966c Merge branch 'charlesmchen/conversationColorsProfileShadows' -|\ \ -| * | 547724b5c Add inner shadows to profile pics. -| * | 352777765 Add inner shadows to profile pics. -|/ / -* | 228964905 Merge branch 'charlesmchen/conversationColorsVsText' -|\ \ -| * | ff6feafe8 Update text colors. -|/ / -* | b5dd8d0c7 Merge branch 'charlesmchen/converationColorsVsBubbles' -|\ \ -| * | 6715e3d1a (origin/charlesmchen/converationColorsVsBubbles) Respond to CR. -| * | b20cd5738 Rename OWSConversationColor. -| * | 3adc03fa2 Rework conversation message bubble colors; add "conversation colors" class. -| * | b3ad6e27d Rework conversation message bubble colors; add "conversation colors" class. -| * | 26a2d568d Add "conversation color mode" enum. -| * | e5150267c Rework the conversation color constants. -|/ / -* | 5471e1ba9 Merge branch 'charlesmchen/converationColorsGroupAvatars' -|\ \ -| * | da6373144 Respond to CR. -| * | 8db4595bd Rework group avatars to reflect conversation colors. -| * | 1c920c6be Rework group avatars to reflect conversation colors. -| * | 25d56b30c Rework group avatars to reflect conversation colors. -|/ / -* | 7ab76551c Merge branch 'charlesmchen/converationColorsVsAvatars' -|\ \ -| * | 2f9eae5ca Respond to CR. -| * | 72562920e Fix author conversation colors. -| * | 4186ce9a7 Respond to CR. -| * | 7b2dd19fb Respond to CR. -| * | 8910f1f65 Enable conversation colors. -| * | ae84528dc Update avatar colors; add shaded conversation color constants, modify color picker to be color-name-based, not color-based, use shaded conversation colors, remove JSQ. -|/ / -* | c89033591 Merge branch 'charlesmchen/converationColorsMessageStatusLayout' -|\ \ -| * | a5628c420 Rework layout of message status in home view. -|/ / -* | f0155c529 (origin/charlesmchen/converationColorsUnreadBadges) Merge branch 'charlesmchen/converationColorsUnreadBadges' -|\ \ -| * | 0701d2465 Replace shadow with stroke. -| * | 810615878 Move unread badge on home view; propose shadow. -|/ / -* | 4b5021d8f Merge branch 'charlesmchen/darkThemeReminders' -|\ \ -| * | d13624897 Fix reminder changes in home view. -| * | 0eb13dd82 Fix nag reminder v. dark theme. -|/ / -* | a02a5160f Merge branch 'charlesmchen/offerButtonMargins' -|\ \ -| * | b30bfec21 Fix contact offer button margins. -|/ / -* | 9c6902d17 Merge branch 'charlesmchen/contactUtils' -|\ \ -| |/ -|/| -| * 0b7d26901 Rename DebugContactsUtils. -| * bcee59f5e Add contact utils class. -|/ -* 6a5935c6e Merge branch 'charlesmchen/fix-ssk-tests-o' -|\ -| * be7626710 Update cocoapods. -| * 98630cca5 Respond to CR; add db utility methods to test base classes. -| * 559c496ae Clean up. -| * 66fc389fb Get SSK tests building and running. -|/ -* c87eea2ab Merge branch 'charlesmchen/fix-ssk-tests-n' -|\ -| * 87836f506 Move more singletons to SSKEnvironment. -|/ -* 6e3462c13 Merge branch 'charlesmchen/fixProtoStreamTest' -|\ -| * b881bb467 Fix proto stream test. -|/ -* 52c27005e Merge branch 'charlesmchen/logCurl' -|\ -| * 39ebdf092 Log curl command for failed requests in debug builds. -|/ -* 562d516a7 Merge branch 'charlesmchen/newGrayscalePalette' -|\ -| * 6a712366a Tweak gray 95. -| * 922c50555 Respond to CR. -| * ef6689410 Design feedback from Myles. -| * 8cf5f3e58 New grayscale palette. -|/ -* c7eb80700 Fix memory leak in Curve25519Kit. -* e7b7fb929 Merge branch 'charlesmchen/corruptThreadView' -|\ -| * 15b52db8b Respond to CR. -| * 29bb69032 DRY up the debounce of db extension version increment. -| * 20de08744 Repair corrupt thread view. -|/ -* a0a48431c Merge branch 'charlesmchen/fix-ssk-tests-l' -|\ -| * 6563c829e Update cocoapods. -| * e8186a700 Fix rebase breakage. Make environment properties mutable in tests. -| * 3b2c5bfc7 Modify mock environments to register all db views. -| * 83e648415 Respond to CR. Rework how OWSUploadOperation's networkManager property. -| * a7a05e9bb Respond to CR. Rework how CallNotificationsAdapter adaptee is populated. -| * edcedd284 Remove selfRecipient method. -| * e1db60c1c Rework creation of singletons. -|/ -* 27023c9d8 Merge branch 'charlesmchen/brokenSignalTests' -|\ -| * 0c6f6cdaf Fix compilation errors in Signal tests. -|/ -* 313a58c4d Merge branch 'mkirk/new-phones' -|\ -| * 21e67e9a1 New resolutions for call banner, rename to accommodate multiple X devices. -|/ -* 14aa86f16 Update cocoapods. -* 687be6b79 Merge branch 'charlesmchen/assertReview' -|\ -| * 4ad7ca79b Respond to CR. -| * e8eac9f30 Clean up ahead of PR. -| * b883209f9 Refine logging. -|/ -* 03f10b723 Merge branch 'delete-legacy-passphrase-fix' -|\ -| * 69290f7ec Improve logging around failied keychain deletion. -| * d25579e47 Treat failure to delete a non-existent password as success -|/ -* ec019f286 Merge branch 'mkirk/fix-test-run' -|\ -| * 25bec8632 update pods -| * 60a6128af Remove SSK tests from Signal-iOS xcode test run -| * 13856acb0 remove wrong import -|/ -* e9f0c31d4 Merge branch 'mkirk/debounce-prekey-checks2' -|\ -| * ec77b83c3 (private/mkirk/debounce-prekey-checks2) update pods -| * e1f131f09 restore save after marking item as uploaded -| * cb55ba57f CR: rename classes, no functional changes -| * 9f35b9364 CR: clarify comment -| * f5efa9ee9 update pods -| * 9bca1c8e5 Add some missing nullability annotations -| * b3d3c27f3 CR: Split operations into separate files (no changes in functionality) -| * ff3e9bcdd cr: add comment about operation queue -| * bfd8eb63c Add some comments/nullability annotations for clarity -| * c9218b59c CR: add operation queue name -| * 5a7d7634b store keys before uploading to avoid race condition with service -| * 1853e79c3 Don't retry send until SPK has been rotated -| * 5e1306aaa Restore check debounce -| * 8e488b5c3 remove unused code -| * 85d35b52d restore PreKey upload failure tracking -| * 39b691b69 Fix operations not being de-alloced -| * 619597cd6 ensure operations run to completion on the PreKey operation queue -| * 3df0e72ed Extract SPK rotation and CreatePreKey operations -| * 286d3c8ce Serialize RefreshKeyOperation -| * 01811a489 fix swift method signature -| * b11bd6ea4 extract convenience intitializer for param parser -| * 1eb05c1d0 remove unused preKeyLastResort -| * 966db1bd4 Get tests compiling by any means necessary -| * fdc846cb5 remove test for deleted method -| * 170eb6377 update old non-existant API usage -| * 7a832e85e remove wrong import -|/ -* f285fc4e1 Merge branch 'mkirk/keyword-checks' -|\ -| * 5236fba69 keyword checks -|/ -* 551102210 include C assert variants in keywords check -* 920a82564 Merge tag '2.29.3.3' -|\ -| * e7f9598e6 (tag: 2.29.3.3, private/release/2.29.3, origin/release/2.29.3) disable dark theme switch for production -| * 2ffca9807 "Bump build to 2.29.3.3." -| * 770c19ea0 (tag: 2.29.3.2) sync translations -| * 7b709666b "Bump build to 2.29.3.2." -| * 53087ff72 Merge branch 'mkirk/cache-group-name' into release/2.29.3 -| |\ -| | * df67e883f BlockList vs. "zero length" group names -| | * b447e6859 clarify post-unblock-group copy -| | * c1b88b5f4 copy cleanup: remove redundant body -| | * 24ea8262d consolidate blocked-group state tracking -| | * 0f9b0936d Use cached group details when rendering blocklist -| | * 1f15ba6dc Cache group details on blocking manager -| |/ -| * 8d51839a2 sync translations -| * 7b664ee21 update translation comment -| * e53766d80 (tag: 2.29.3.1) "Bump build to 2.29.3.1." -| * b96e9a6a8 Fix: not receiving group deliveries -| * c0991fce7 (tag: 2.29.3.0) enable dark theme for beta -| * c384b961d Merge branch 'mkirk/ignore-left-group-messages' into release/2.29.3 -| |\ -| | * 01627446a update pods -| | * b09831d8d copy updates -| | * f1e5b1862 Ignore messages from left groups -| | * b369ffa88 add type annotations -| | * 7b7da4bc1 add docs to BlockListCache -| | * fd492f379 Use BlockListCache where possible -| | * 2eca462ef can view conversation settings for left group -| | * 2c49232db remove barely used getters -| | * 448936d15 BlockListCache -| | * 28d28cf2b remove unused code -| | * b6eb1476c Leave group when blocking it -| | * 13cf9eab3 copy fixups -| | * 8aba5725c BlockListViewController v. group blocking -| | * 809b3766c Home view cell v. group blocking -| | * 2c9d905a1 Message processor ignores messages from blocked group -| | * c6de8c579 WIP: Localizations -| | * b1da5e93d group blocking v. conversation view -| | * eadb04efc WIP: ContactViewHelper incorporates group blocking -| | * b282d51da SyncMessages for blocked groups -| | * 236c17f65 WIP: group blocking -| | * bfe1f38c7 update protos for group blocking -| |/ -| * 2c4cd1150 Merge branch 'mkirk/fix-group-avatar-update' into release/2.29.3 -| |\ -| | * 08c0b248e fix group avatar updates and quote generation -| |/ -| * 99b256499 "Bump build to 2.29.3.0." -| * 17da53257 (tag: 2.29.2.4, private/release/2.29.2, origin/release/2.29.2) "Bump build to 2.29.2.4." -| * e4d12feeb rev gallery db extension since our `isValid` checks have changed -| * 5bafc7b6d Don't allow enabling dark theme in production yet -* | 5627e6718 Merge branch 'charlesmchen/attachmentCleanup' -|\ \ -| * | 22afe39cd Respond to CR. -| * | 2ea751bba Clean up attachment downloads. -| * | 32f1ce947 Clean up attachment downloads. -|/ / -* | 6a2e00928 Merge branch 'charlesmchen/loggingAndAsserts' -|\ \ -| * | 8ef3497e5 Update cocoapods. -| * | b00858921 Update Cocoapods. -| * | 9b94580da Update assertions. -|/ / -* | 5e6a93cff Merge branch 'charlesmchen/operationQueueNames' -|\ \ -| * | e15b8ebe1 Add names to operation queues. -|/ / -* | a3cc9ab67 Merge branch 'charlesmchen/fix-ssk-tests-k3' -|\ \ -| * | 6c8af5b54 Update cocoapods. -| * | 62c55c9cf Fix broken tests. -|/ / -* | 68714b296 Merge branch 'charlesmchen/fix-ssk-tests-k2' -|\ \ -| * | 2ba642c9e Ensure fakes/mocks are debug-only. -| * | ef12612a9 Update cocoapods. -| * | e784f9fee Move fakes to SSK/tests. -|/ / -* | 45ff1979a Update cocoapods. -* | 2710f33af Merge branch 'charlesmchen/fix-ssk-tests-k1' -|\ \ -| * | 25239ca60 Respond to CR. -| * | 3935b019f Add base class for tests. -|/ / -* | e740d8fd4 Merge branch 'charlesmchen/removeLogTag' -|\ \ -| * | 3fe7d7f9b Remove more usage of logTag. -|/ / -* | 7872145e1 Merge branch 'charlesmchen/fix-ssk-tests-h' -|\ \ -| * | df7acfeed Simplify OWSPreferences access. -|/ / -* | 6007f8df6 Merge branch 'charlesmchen/fix-ssk-tests-d' -|\ \ -| * | 106ecf2e8 Respond to CR. -| * | 6a83eab4f Update Cocoapods. -| * | cc117b385 Modify environment accessors to use our 'shared' convention. -| * | 3a12446be Modify environment accessors to use our 'shared' convention. -| * | bd05cdc03 Rename TextSecureKitEnv to SSKEnvironment. -|/ / -* | b642a5fab Update log. -* | 7dd6132c6 Merge branch 'charlesmchen/fix-ssk-tests-c' -|\ \ -| * | 8b143e710 Update cocoapods. -| * | bcceda186 Respond to CR. -| * | cfb511aa5 Respond to CR. -| * | eb616a341 Respond to CR. -| * | 535241ef9 Add test app context; use mock "document" and "shared data container" directories in tests, use mock keychain storage in tests. -| * | 399dd13ce Add test app context; use mock "document" and "shared data container" directories in tests, use mock keychain storage in tests. -|/ / -* | 0357699fc RI Cocoapods submodule. -* | f9eab5cd2 Merge remote-tracking branch 'origin/release/2.29.2' -|\ \ -| |/ -| * 654c98d80 (tag: 2.29.2.3) "Bump build to 2.29.2.3." -| * a443a64ff Merge branch 'charlesmchen/convoThumbnails3' into release/2.29.2 -| |\ -| | * 9fefdd2e2 Respond to CR. -| | * a2fe4dbe3 Refine image validation. -| | * 34a05cdb8 Refine image validation. -| |/ -| * 5b04a421b Merge branch 'charlesmchen/convoThumbnails2' into release/2.29.2 -| |\ -| | * 1c325cd21 (private/charlesmchen/convoThumbnails2) Respond to CR. -| | * b6649319d Fix build breakage. -| | * 27fa5dc2e Make thumbnail logic thread-safe to being called on main thread. -| | * a04aa259e Fix bug in sync loading of thumbnails. -| | * 5bdbf76b0 Cache "is valid image/video" properties. -| | * b1f2b9e75 Clean up thumbnail-related logic. -| | * 51e8fdcb2 Use small thumbnail when creating quoted reply. -| | * dc3467dcd Tidy up attachment usage. -| | * 0be12da3d Use thumbnails in media views. -| | * 5d96af98b Use large thumbnail in media views. -| | * 30ed6caf0 Use thumbnails as video stills in conversation view. -| | * a2fad5796 Load GIFs from disk in media view; don't cache GIF data in memory. -| | * 12307aeee Load GIFs from disk in media view; don't cache GIF data in memory. -| |/ -| * 9ad661c29 Merge branch 'charlesmchen/convoThumbnails' into release/2.29.2 -| |\ -| | * a088b94c7 Update Cocoapods, fix build breakage. -| | * b91751a11 Respond to CR. -| | * ad0d09483 Fix build breakage. -| | * 748b24315 Restore full-screen thumbnails. -| | * 9eb2a4f5a Raise max valid image size. -| | * 72a71c185 Improve handling of thumbnails dir. -| | * 3a5d1877d Reduce thumbnail sizes. -| | * ec83ed182 Clean up. -| | * 32bf47fc7 Don't track thumbnail metadata in db; improve thumbnail quality. -| | * 8026d3465 Remove full-screen thumbnail. -| | * 2daa66fdf Use thumbnails dir. -| | * a9096209e Add failure methods to thumbnail service. -| | * 8748dc9b2 Modify new thumbnail system to include video and GIF thumbnails. -| | * 206432fdf Add failure methods to thumbnail service. -| | * f6e792c70 Add failure methods to thumbnail service. -| | * cf469da94 Use new thumbnails in conversation cells. -| | * 3437361d7 Use new thumbnails in media gallery thumbnails. -| | * ac4365e1c Add OWSThumbnailService. -| | * 1831f0b1f Reorder AttachmentStream methods. -| | * 446ceb2b9 Rename AttachmentStream methods. -| | * 498828f93 Rename AttachmentStream methods. -| |/ -| * 17f1ba3b9 (tag: 2.29.2.2) "Bump build to 2.29.2.2." -| * a92be0811 "Bump build to 2.29.2.1." -| * be6d92440 Merge branch 'mkirk/webrtc-m69' into release/2.29.2 -| |\ -| | * 30b28be52 Update WebRTC to M69 -| |/ -| * c961bffc1 Merge branch 'mkirk/enable-sw-decoders' into release/2.29.2 -| |\ -| | * 9ab4da5c8 cherry-pick Merge branch 'charlesmchen/logSdp' -| | * d57c2f515 enable sw decoders -| |/ -| * c0b9639aa "Bump build to 2.29.2.0." -| * d37827de1 (tag: 2.29.2.1) "Bump build to 2.29.2.1." -| * d6f856a62 fixup: Leave theme enabled if ever enabled -| * c81e0a58b (tag: 2.29.2.0) "Bump build to 2.29.2.0." -| * 4e19a7943 Leave theme enabled if ever enabled -| * 64dd7c79e enable dark theme for beta -* | c9fdefd19 Merge branch 'mkirk/overflow-rebased' -|\ \ -| * | d534651ac (private/mkirk/overflow-rebased) check keywords in diff -| * | 9ec82b9a4 graceful failure when receiving too-small profile data -| * | 01a6a3d98 avoid overflow in debug logging -| * | 503cb046e remove unused FunctionalUtil code -| * | a2852ee93 Overflow math and safer asserts in Cryptography.m -|/ / -* | ccea3ff0f Merge branch 'mkirk/production-asserts' -|\ \ -| * | 48a85aab1 remove unused files -| * | c7662b5a8 Step 2/2 %s/OWSAssert/OWSAssertDebug for existing previous assert semantics -| * | a54ed8b20 Step 1/2 Prefer safer asserts -|/ / -* | 6f6b1d0aa Merge branch 'charlesmchen/hotfixLoggingAndFails' -|\ \ -| * | 44a3a8146 Update logging and asserts in hotfix changes. -|/ / -* | 6a01f01f2 (private/signingkey) Merge branch 'mkirk/size-input-toolbar' -|\ \ -| * | 5d9cd86d1 size toolbar WRT draft -|/ / -* | 17656a3aa Merge branch 'charlesmchen/fix-ssk-tests-b' -|\ \ -| * | fac7f6932 (origin/charlesmchen/fix-ssk-tests-b) Rename TSGroupMetaMessage enum values. -|/ / -* | f4d1f2565 Merge remote-tracking branch 'origin/release/2.29.1' -|\ \ -| |/ -| * 055fe76c9 (tag: 2.29.1.1, origin/release/2.29.1) "Bump build to 2.29.1.1." -| * 2cdca0299 show generic file icon for invalid GIF -| * d1dead058 (tag: 2.29.1.0) sync translations -| * c709fe220 "Bump build to 2.29.1.0." -| * e7c70db38 Merge branch 'mkirk/images' into release/2.29.1 -| |\ -| | * 6821e4a3a (private/mkirk/images) Don't include invalid media in gallery -| | * e715bf9ea image sizing -| |/ -* | 19f79bc77 Merge branch 'mkirk/fix-ssk-tests' -|\ \ -| * | 8c2515a66 update pods for embedding ssk tests -| * | 495830f08 Fixup some SSK tests -| * | 6d9241393 WIP: Run SSK tests -|/ / -* | 7df897655 Fix breakage in production builds. -* | beea74b76 Merge branch 'charlesmchen/performUpdatesExceptionDetails' -|\ \ -| * | 1cc0fbcb1 Elaborate logging around 'perform updates' crash. -|/ / -* | 97d4b3bc1 Merge branch 'charlesmchen/objcLogging' -|\ \ -| * | 947760673 Apply OWS log functions in Objective-C. -| * | f473f6011 Apply OWS log functions in Objective-C. -| * | cc5a480ba Apply OWS log functions in Objective-C. -| * | 03829779c Apply OWS log functions in Objective-C. -| * | c0d486b1f Apply OWS log functions in Objective-C. -| * | 3a5037790 Apply OWS log functions in Objective-C. -| * | d81dea1d8 Add OWS log macros. -|/ / -* | 2c60f6f22 Merge branch 'charlesmchen/logSdp' -|\ \ -| * | 0b5b74a90 Respond to CR. -| * | 490ac5dd7 Redact ice-pwd from SDP. -| * | 02daca11a Redact ice-pwd from SDP. -| * | b4539328e Log call session description. -| * | 2d06c05a4 Log call session description. -| * | 329f8d6f4 Log call session description. -|/ / -* | 77711df27 Merge branch 'charlesmchen/prodFail' -|\ \ -| * | 713606271 (private/charlesmchen/prodFail) Rename fail macros in Obj-C. -| * | 5b50e81b4 Rename fail macros in Swift. -| * | 7be8f3087 Apply -> Never. -| * | d01023d86 Respond to CR. -| * | 11eaf1474 Add OWSProdExit(). -|/ / -* | 202a91680 Merge branch 'charlesmchen/reworkingLogging' -|\ \ -| * | 16a7361e5 Update Cocoapods. -| * | 4f2f4a44a Respond to CR. -| * | d4f7b5d45 Respond to CR. -| * | f34bdd34b Respond to CR. -| * | dd4f1babb Respond to CR. -| * | e1049fdfc Respond to CR. -| * | bc23e38ef Respond to CR. -| * | cf6f3841a Apply new Swift logging. -| * | 3697974ca Rework Swift logging. -|/ / -* | 1a92f414e Revert "Disable dark theme in production." -* | 1d2590fa1 Merge tag '2.29.0.17' -|\ \ -| |/ -| * 2c8cec183 (tag: 2.29.0.17, private/release/2.29.1, origin/release/2.29.0) "Bump build to 2.29.0.17." -| * 472a92a1a Disable dark theme in production. -* | 65c323440 update translation location -* | 1503608f5 Merge branch 'mkirk/faster-presentation' -|\ \ -| * | 7e8b2e303 (michaelkirk/mkirk/faster-presentation) Faster conversation presentation. -|/ / -* | ae44b316a (charlesmchen/callServiceState_) Merge branch 'mkirk/show-message-actions-on-call' -|\ \ -| * | bc2ba63c2 DRY refactor -| * | 37738c24c Allow menuActions + callBanner -|/ / -* | 495ed5667 Merge branch 'mkirk/cleanup-longview' -|\ \ -| * | 464b854eb CR: follow naming conventions -| * | 9c9f3875a Link styling -| * | 5148747c1 clean up long text VC -|/ / -* | c8c2b8c64 Merge branch 'mkirk/swift-assert-main-thread' -|\ \ -| * | 82e559d11 Use swift macros for main thread assert -|/ / -* | aabf9e79e Merge branch 'mkirk/async-search' -|\ \ -| * | 781c53532 weak capture self -| * | fc7dc03ce don't block main thread during search -|/ / -* | 65fe3cc1d Merge branch 'mkirk/debug-protos' -|\ \ -| * | 2fc3a211f restrict debug methods -|/ / -* | 1295a09ab add comment -* | b75bc27d5 Respond to CR. -* | c6132249e Respond to CR. -* | cb827169f Respond to CR. -|/ -* 1bf273eb3 Merge branch 'mkirk/theme-message-actions-overlay' -|\ -| * eaf8d789f Darken message actions overlay in dark theme -|/ -* 1fc5ebdc1 Merge branch 'mkirk/search-bar-theme-2' -|\ -| * 1743407cc Code cleanup per code review -| * e4b7d253a Theme "no results" cell -| * 3022f9292 Tweak tint for search bar icons in dark theme -| * 75bb9b60d Alternative dark theme search bar -| * e435358bf Revert "Add custom themed search bar." -|/ -* bc7efaf4a (tag: 2.29.0.16) "Bump build to 2.29.0.16." -* 4971d40c7 Respond to CR. -* 10ab97bb6 (tag: 2.29.0.15) "Bump build to 2.29.0.15." -* 501b5a7c9 Merge branch 'charlesmchen/themeQuotedReplies' -|\ -| * 9e2161229 Respond to CR. -| * 6dd474d79 Theme quoted replies. -| * a92fca5c1 Theme quoted replies. -|/ -* 7b835bd08 Merge branch 'mkirk/fix-toolbar-appearance' -|\ -| * 32f879534 media tile toolbar respects theme by using UIAppearance defaults -|/ -* 61dc39b69 Merge branch 'mkirk/quote-2' -|\ -| * 93cb378f7 constantize toast inset -| * 06a8bffa6 Never show more than one toast view -| * 75ead2ac0 quoted reply: distinguish "not found" vs. "no longer available" -|/ -* fb9958b1d (tag: 2.29.0.14) "Bump build to 2.29.0.14." -* 122e138f0 Merge branch 'charlesmchen/disableCDS' -|\ -| * 2b8b688fb Disable CDS. -| * 2af0a897e Disable CDS. -|/ -* cbdc46fda Merge branch 'mkirk/dark-keyboard' -|\ -| * b80d88c82 theme attachment approval keyboard -|/ -* 5907cd2a0 Merge branch 'mkirk/tap-to-retry' -|\ -| * c6f77ec6e "Tap to retry" retries, rather than maybe deletes. -|/ -* 7b156be73 Merge branch 'mkirk/gallery-headers' -|\ -| * 8cd290ba2 fix section headers not appearing on iOS11/iPhoneX -| * 92de74552 theme gallery section headers -|/ -* d070693b7 Merge branch 'mkirk/overzealous-assert' -|\ -| * c1df969a2 remove overzealous assert -| * 191b0232b SAE uses statusBarHeight via OWSNavigationController via OWSNavbar -| * d57cbf2ac main thread operation init which creates background task -|/ -* 6aee5d539 (michaelkirk/master) Merge branch 'charlesmchen/deletePhoneNumberFormatting' -|\ -| * c7ed09ed9 Fix 'can't delete formatting in phone number' issue. -|/ -* 7020798e3 (tag: 2.29.0.13) "Bump build to 2.29.0.13." -* f717dceef Merge branch 'charlesmchen/themeSearchBar' -|\ -| * 8daaef22d Add custom themed search bar. -|/ -* 6e4414f47 (tag: 2.29.0.12) "Bump build to 2.29.0.12." -* af1c07630 Merge branch 'charlesmchen/themeReview' -|\ -| * decb0c54c Theme review. -| * d62e07d6f Theme review. -| * 4ea5d9b84 Theme review. -|/ -* ccc77511f Merge branch 'charlesmchen/messageTimeFormatPerf' -|\ -| * b4b4cd61d (charlesmchen/messageTimeFormatPerf) Improve message timestamp formatting. -|/ -* ab10bc9bc Merge branch 'charlesmchen/tapToCopySentTimestamp' -|\ -| * be7482eb6 (charlesmchen/tapToCopySentTimestamp) Tap to copy sender timestamp to clipboard. -|/ -* 419e30f38 Merge branch 'charlesmchen/conversationCrash' -|\ -| * f89fa8359 (origin/charlesmchen/conversationCrash, charlesmchen/conversationCrash) Revert "Add logging around 'SAE to same thread' crash." -| * e3378dec6 Revert "Add logging around 'share from SAE to same conversation' crash." -| * 87d51aaa8 "Bump build to 2.29.0.11." -| * f62bf7d18 Add logging around 'share from SAE to same conversation' crash. -|/ -* e148ec785 Merge branch 'charlesmchen/syncConversationColors' -|\ -| * 52be2127f Sync conversation colors. -|/ -* a712a20da (tag: 2.29.0.10) "Bump build to 2.29.0.10." -* eee2f7c8c Add logging around 'SAE to same thread' crash. -* 56e3ff14f Merge branch 'charlesmchen/conversationViewCrashLogging' -|\ -| * b347c40c6 Clean up ahead of PR. -| * d9d73ba70 "Bump build to 2.29.0.9." -| * 0a7b3537b Recreate message database view when message mappings are corrupt. -| * 1e75b6518 "Bump build to 2.29.0.8." -| * db2f5bf3b Add temporary logging around conversation view crashes. -| * 30ce67523 "Bump build to 2.29.0.7." -| * 420f5f88f Add logging, error checking and recovery around corrupt message mappings. -|/ -* 8f6151048 Merge branch 'charlesmchen/hideHomeViewSearch' -|\ -| * f261a47bd Hide home view search by default. -|/ -* 5f0c1aafb Merge branch 'charlesmchen/themeQA' -|\ -| * a76d488e8 Fix QA issues in theme. -| * 22dda476b Fix QA issues in theme. -|/ -* e628962fd Merge branch 'charlesmchen/messageDetailsVsInsetsFix' -|\ -| * 4e276b109 Apply 'insets fix' correctly in message details view. -|/ -* 7766cb6d7 (tag: 2.29.0.6) "Bump build to 2.29.0.6." -* 9b02bc104 Merge branch 'charlesmchen/conversationViewCrashLogging' -|\ -| * 664e13fb4 (charlesmchen/conversationViewCrashLogging) Revert "Add temporary logging around conversation view crashes." -| * 408689bbf (tag: 2.29.0.5) "Bump build to 2.29.0.5." -| * 26ad9814e Add temporary logging around conversation view crashes. -|/ -* 606b0debc (tag: 2.29.0.4) "Bump build to 2.29.0.4." -* 07a41be5a Merge branch 'charlesmchen/conversationViewExceptionLogging' -|\ -| * b3c19b790 (charlesmchen/conversationViewExceptionLogging) Improve logging of conversation view exceptions. -|/ -* 84bda352e Merge branch 'charlesmchen/isRegisteredRace' -|\ -| * 8ce9f3b24 (charlesmchen/isRegisteredRace) Fix nominal race in "is registered" state. -|/ -* a635a5d1c Merge branch 'charlesmchen/unifyTag' -|\ -| * 26001e49d (charlesmchen/unifyTag) Unify log tags. -|/ -* 767e1e7f4 Merge branch 'charlesmchen/string_h_audit' -|\ -| * 79c25981b (charlesmchen/string_h_audit) String.h audit. -|/ -* e56abeac3 (tag: 2.29.0.3) "Bump build to 2.29.0.3." -* b3cdf3dc0 sync translations -* df2d247ad Merge branch 'mkirk/apply-theme-atomically' -|\ -| * 71cb90b57 Avoid incremental theme-redraws -|/ -* a465c2522 (origin/mkirk/before-apply-theme-atomically) Merge branch 'mkirk/jumboer-emoji' -|\ -| * a1e8bb865 Larger jumbomoji -|/ -* c44f3f3c3 Merge branch 'mkirk/quotes' -|\ -| * 8829cdfb4 Toast view when tapped message doesn't exist, mark remotely sourced. -|/ -* 9ab447a3d Merge branch 'mkirk/tweak-bar-theme' -|\ -| * 7a0d74c17 Use dark blur for navbar -|/ -* 76fbec899 Merge branch 'mkirk/profile-colors' -|\ -| * 1ff443c3a restore transparent navbar in attachment approval -| * ebd2e6d5a Tweak theme -|/ -* 73174d794 Merge branch 'mkirk/log-owsfail' -|\ -| * c05700fd9 Log in OWSFail -|/ -* 5f468f426 (tag: 2.29.0.2) "Bump build to 2.29.0.2." -* 02d7f28f4 Merge branch 'charlesmchen/noInsertAnimations' -|\ -| * 8ecf6884c Remove "sending" color for outgoing messages. -|/ -* 46bc46c38 Merge branch 'charlesmchen/cacheLabelSizes' -|\ -| * 4096d2e0d Respond to CR. -| * 2fecb270e Cache footer timestamp size. -| * c91bc71eb Cache sender name size. -|/ -* e2dfe0012 Merge branch 'charlesmchen/themeSearchBars' -|\ -| * 3fc342560 Theme search bars. -|/ -* 47ab354f5 Merge branch 'charlesmchen/conversationCellsDontAutosize' -|\ -| * dd7e42931 Skip default implementation of preferredLayoutAttributesFittingAttributes. -|/ -* 0fe22ee0e Merge branch 'charlesmchen/cacheSystemMessageText' -|\ -| * 0ac1cb1e7 Cache system message text. -|/ -* fe492b8a9 Merge branch 'charlesmchen/configureDefaultCells' -|\ -| * 800689d9f Configure default cells. -|/ -* d493fd0bc Merge branch 'charlesmchen/mergeNSDataCategories' -|\ -| * 307a8dd85 Merge NSData categories. -| * db3df249b Merge NSData categories. -|/ -* 2c9c02850 Clean up. -* db92704b5 (tag: 2.29.0.1) "Bump build to 2.29.0.1." -* adadf094d Enable theme. -* 4d44d99ec Merge branch 'charlesmchen/refineThemeYetAgain' -|\ -| * 6dfe36f9b Respond to CR. -| * 816f02fba Fix unintentional moves. -| * 9c92719ec Refine theme. -| * 5ef0b6d05 Refine theme. -| * acd7d094b Refine theme. -| * a56a16411 Refine theme. -| * a543cd5a4 Refine theme. -| * 931562de3 Refine theme. -| * ce4fdd513 Refine theme. -| * 9fefce94a Refine theme. -| * d34f83b44 Refine theme. -| * 069c66e5e Refine theme. -| * 8da96e979 Refine theme. -| * 4f8dbf39b Refine theme. -|/ -* 84fcf1ea3 Merge branch 'charlesmchen/noHasAccessors' -|\ -| * 7437e7a6b Remove 'has' accessors from proto wrappers. -|/ -* e4a123bce Merge branch 'charlesmchen/appLaunchTime' -|\ -| * 5d3b0f793 (tag: 2.29.0.0) "Bump build to 2.29.0.0." -| * 1868c5803 Converge appLaunchTime. -|/ -* b3c62d91b Merge remote-tracking branch 'origin/release/2.28.1' -|\ -| * 882c699db (tag: 2.28.1.5, origin/release/2.28.1) "Bump build to 2.28.1.5." -| * 01b6634ac synthesize appLaunchTime -| * 15dfa6e97 (tag: 2.28.1.4) "Bump build to 2.28.1.4." -| * 87f97b8b9 fix typo -| * 504f4afae fix typo -| * 9e45104ee (tag: 2.28.1.3) "Bump build to 2.28.1.3." -| * 2e5cae2a6 Fix typo -| * 5039a6a9e (tag: 2.28.1.2) "Bump build to 2.28.1.2." -| * 19c95359f Merge branch 'charlesmchen/newIncompleteCallsVsJob' into release/2.28.1 -| |\ -| | * 463addaa6 Ignore new calls in the incomplete calls job. -| |/ -| * 4af4ca3cc Merge branch 'charlesmchen/lazyCollapseFooter' into release/2.28.1 -| |\ -| | * faf3cd6a5 (charlesmchen/lazyCollapseFooter, charlesmchen/callEdgeCases) Fix lazy collapse of message cell footers. -| |/ -* | 707112a1c Merge branch 'charlesmchen/saveMediaVsNonMedia' -|\ \ -| * | 7cc867420 Fix "save non-media attachment" crash. -|/ / -* | df0046d09 Merge branch 'charlesmchen/protoWrapperInits' -|\ \ -| * | e5eda8b45 Add convenience initializers to proto wrappers. -|/ / -* | 908b50faa Merge branch 'mkirk/app-updater' -|\ \ -| * | 0620aba3b Add cancel button -| * | 9662b3cb1 Wait a week before nagging when a new release comes out -|/ / -* | 63c94efc8 Merge branch 'mkirk/fix-collectionview-crash' -|\ \ -| * | 51b176136 Fix crash during CollectionView thrash -|/ / -* | 74be5fb1b Merge branch 'mkirk/ios12' -|\ \ -| * | 7e5d9480b Add missing header file -|/ / -* | baa46f6e5 Merge branch 'mkirk/store-kit-review' -|\ \ -| * | 2ea7e2b03 CR: clean up preferences -| * | ff2a5a151 Fixup copy -| * | e5b3cbd00 Use StoreKit for reviews -|/ / -* | 289e3f7a9 Merge branch 'mkirk/rotation-time' -|\ \ -| * | ab6286885 (private/mkirk/rotation-time) Remove noisy comments, update rotation time. -|/ / -* | c94c33d61 Merge branch 'charlesmchen/removeObjcProtos' -|\ \ -| * | a9b5c7962 Update Cocoapods. -| * | 21523ac52 Respond to CR. -| * | 1ab084240 Remove Obj-c proto parser. -| * | a5ffbdebb Remove Obj-c proto parser. -|/ / -* | 39124190a Merge branch 'charlesmchen/protoWrapperTests' -|\ \ -| * | a4d24c78a Respond to CR. -| * | 90002459c Add unit tests around proto wrappers. -|/ / -* | 01268f016 Merge branch 'charlesmchen/callWrappers' -|\ \ -| * | d239c111d Update Cocoapods. -| * | f4a11f0c6 Respond to CR. -| * | dc012d46e Migrate call proto wrappers. -| * | 135a1655f Migrate call proto wrappers. -| * | 32d0f23b2 Migrate call proto wrappers. -| * | 94675e880 Migrate call proto wrappers. -| * | 8837e5902 Migrate call proto wrappers. -|/ / -* | 0610530ee Merge branch 'charlesmchen/protoWrappers4' -|\ \ -| * | 521c725d2 Update Cocoapods. -| * | 68241e8a0 Respond to CR. -| * | 34a404f58 Clean up ahead of PR. -| * | 379104c53 Migrate to WebRTC proto wrappers. -| * | 67110d0de Migrate to websocket proto wrappers. -| * | f795ec352 Migrate to backup proto wrappers. -| * | eaf59b122 Migrate to provisioning proto wrappers. -| * | 50db472be Migrate to fingerprint proto wrappers. -|/ / -* | cace335d4 Merge branch 'charlesmchen/orphanDataCleanerV2' -|\ \ -| * | aeb539502 Update Cocoapods. -| * | 2fd77fcc2 Fix typo. -| * | 4bb0122c0 Respond to CR. -| * | 815ccbdcd Respond to CR. -| * | 06d84860a Fix rebase breakage. -| * | 45e782c24 Revamp orphan data cleaner. -|/ / -* | 95d734b1b Update BUILDING.md -* | 58897928f Update BUILDING.md -* | b26ebee3a Merge branch 'mkirk/update-pods2' -|\ \ -| * | 495c334d1 update pods -|/ / -* | d3a4447f8 Convert overzealous assert. -* | 64c6d820f Fix typo. -* | 3395bdab6 Merge branch 'charlesmchen/redundantContentInsets' -|\ \ -| * | cea93784b (charlesmchen/redundantContentInsets) Avoid redundant content inset updates. -|/ / -* | 55158e2a5 Merge branch 'charlesmchen/cleanupFormatting2' -|\ \ -| * | c687c0976 (charlesmchen/cleanupFormatting2) Update Cocoapods. -| * | d709a0249 Clean up formatting. -|/ / -* | 9b45a15c3 Merge branch 'release/2.28.1' -|\ \ -| |/ -| * c8f33e4fc (tag: 2.28.1.1, release/2.28.1) "Bump build to 2.28.1.1." -| * 89b3ebb72 Merge branch 'charlesmchen/deferMessageResizing' into release/2.28.1 -| |\ -| | * 4918b8994 (charlesmchen/deferMessageResizing) Delay footer collapse in new messages. -| | * 95cf4f5c6 Don't reserve space for timestamp in footer. -| | * 251eef46a Delay footer collapse in new messages. -| |/ -| * c957578a0 (tag: 2.28.1.0) Merge branch 'mkirk/fix-remaining-navbar' into release/2.28.1 -| |\ -| | * dbbccaadb fixup block table vis a new navbar style -| | * 991848b36 Fix "blue navbar" for contact picker -| |/ -| * 4d42fafdf Merge branch 'charlesmchen/redesignOptimizations' into release/2.28.1 -| |\ -| | * 4d2bdf9bd (charlesmchen/redesignOptimizations) Respond to CR. -| | * 21c630c09 Ignore redundant body text view updates; cache body text view size. -| | * ea765437e Improve date formatting perf. -| |/ -| * d6d16ed16 "Bump build to 2.28.1.0." -* | f633ebe2d update socketrocket -* | c6697bb4b Merge branch 'mkirk/seed' -|\ \ -| * | 0bc03b0fd Move seed -|/ / -* | 4704c6751 Merge branch 'mkirk/update-pods' -|\ \ -| * | a7bc02352 update pods -|/ / -* | ae488d330 Merge branch 'mkirk/upstream-yap-db' -|\ \ -| * | fc1ce02ae CR: Now that we have transaction semantics, this shouldn't happen. -| * | 1eb7fc986 YapDB introduced a method purpose built to do what we were approximating. -| * | df01c7e63 Update to latest YapDB (with Signal patches applied) -|/ / -* | 2ba5f65d8 Merge branch 'charlesmchen/protoWrappers3' -|\ \ -| * | 2433a08c8 Update Cocoapods. -| * | a647b5be4 Respond to CR. -| * | 3f4752437 Respond to CR. -| * | 03a9b21cf Respond to CR. -| * | 632dc145f Code generate Swift wrappers for protocol buffers. -| * | 6be3d2e42 Code generate Swift wrappers for protocol buffers. -| * | 8d814a521 Code generate Swift wrappers for protocol buffers. -| * | 950cab7eb Code generate Swift wrappers for protocol buffers. -| * | ff8565dbd Code generate Swift wrappers for protocol buffers. -| * | d3adb8024 Code generate Swift wrappers for protocol buffers. -| * | ab31e5a07 Code generate Swift wrappers for protocol buffers. -|/ / -* | faebd9af8 Merge branch 'charlesmchen/protoWrappers2' -|\ \ -| * | 2819c758f Update Cocoapods. -| * | 28acea3cf Respond to CR. -| * | e1eb58ba3 Swift proto parsing wrappers. -| * | 0d23b06cb Code generate Swift wrappers for protocol buffers. -| * | 377634a1f Code generate Swift wrappers for protocol buffers. -| * | b164ce940 Code generate Swift wrappers for protocol buffers. -|/ / -* | 808443f2a Merge branch 'charlesmchen/protoWrappers' -|\ \ -| * | 547938904 Update cocoapods. -| * | 73f22ae62 Code generate Swift wrappers for protocol buffers. -| * | aefbc3c0b Code generate Swift wrappers for protocol buffers. -| * | 6941ab8c8 Code generate Swift wrappers for protocol buffers. -| * | 827f97928 Code generate Swift wrappers for protocol buffers. -| * | 77810f591 Code generate Swift wrappers for protocol buffers. -| * | 64c99988a Code generate Swift wrappers for protocol buffers. -| * | 02a4de637 Code generate Swift wrappers for protocol buffers. -| * | 2b05bbc0a Code generate Swift wrappers for protocol buffers. -| * | 937ae2455 Code generate Swift wrappers for protocol buffers. -| * | d8378c537 Code generate Swift wrappers for protocol buffers. -| * | f814157a9 Code generate Swift wrappers for protocol buffers. -| * | e45a6d5be Code generate Swift wrappers for protocol buffers. -| * | 0cf199bd7 Code generate Swift wrappers for protocol buffers. -| * | c81acb1fa Code generate Swift wrappers for protocol buffers. -| * | d0c7489b7 Code generate Swift wrappers for protocol buffers. -| * | 1e21dbfaa Code generate Swift wrappers for protocol buffers. -| * | 6276a0de8 Code generate Swift wrappers for protocol buffers. -| * | 9846a529f Code generate Swift wrappers for protocol buffers. -|/ / -* | 70b6382d0 Merge branch 'charlesmchen/tidyFiles' -|\ \ -| * | c15ddf85f (charlesmchen/tidyFiles) Respond to CR. -| * | dfc39b4a1 Tidy files. -| * | e6bc37d94 Tidy files. -| * | 2c1947439 Tidy files. -| * | 8f55f5332 Tidy files. -|/ / -* | ed47c0a6d Merge branch 'charlesmchen/tidyProfileAvatars' -|\ \ -| * | d6cb07cc4 (charlesmchen/tidyProfileAvatars) Respond to CR. -| * | 0f4e846ed Tidy profile avatars. -|/ / -* | 2647beceb Merge branch 'charlesmchen/cdsAuthProperties' -|\ \ -| * | 16e51b854 (charlesmchen/cdsAuthProperties) Fixup CDS auth properties. -|/ / -* | 6bf0465bc Merge branch 'charlesmchen/nilSignalAccounts' -|\ \ -| * | 579e88bdc (charlesmchen/nilSignalAccounts) Improve nullability handling for SignalAccount. -|/ / -* | 20c82e6ad Merge branch 'charlesmchen/logLogLogs' -|\ \ -| * | f611abc16 (charlesmchen/logLogLogs) Log when we change logging state. -|/ / -* | 103a8dc57 ubsan fixups -* | 78ad597e4 Merge tag '2.28.0.15' -|\ \ -| |/ -| * 48a69c46d (tag: 2.28.0.15, origin/release/2.28.0, release/2.28.0) "Bump build to 2.28.0.15." -| * d713c4158 sync translations -| * f81db023f Merge branch 'charlesmchen/newMessageAnimations' into release/2.28.0 -| |\ -| | * cd6225c43 Respond to CR. -| | * 995c2f2a2 Refine 'new message' animations. -| | * 24d85898e Refine 'new message' animations. -| | * 026ef02ce Refine 'new message' animations. -| |/ -| * 2bb12e6fb Merge branch 'mkirk/inbox-behind-navbar' into release/2.28.0 -| |\ -| | * def8b43da iOS9/10 fixups -| | * 78b4df95a fixup call banner offsets -| | * bfe1eb550 Move reminder views into scrollable content -| |/ -| * 3afdd9850 Merge branch 'mkirk/message-actions-ux' into release/2.28.0 -| |\ -| | * 29c459fe6 Haptic feedback when changing menu action selection -| | * e5e5bbddc Menu UX -| |/ -| * 6539318b4 Merge branch 'mkirk/fix-video-call-ar' into release/2.28.0 -| |\ -| | * 04c00ff28 Fix letterboxed video on M68 -| |/ -| * 181d99d80 (tag: 2.28.0.14) "Bump build to 2.28.0.14." -| * 0fb3ac85a Sync translations -| * 87f4b0ac2 (private/release/2.28.0) Clean up data. -* | a2c65e3a4 Merge branch 'jsq/fix-warnings' -|\ \ -| * | 6dc74ddca Fix some project warnings + other fixes -|/ / -* | a0b8016bc Merge branch 'charlesmchen/timerAnimation' -|\ \ -| * | 1b01e8f65 Clean up timer animation. -|/ / -* | 2fe619370 Merge branch 'mkirk/tsan' -|\ \ -| * | 165881210 TSan config -|/ / -* | 31c6f44b4 Merge branch 'charlesmchen/fileCleanup' -|\ \ -| * | 4a4edc68e Clean up data. -|/ / -* | 54afa2163 rename token -> password -* | 6e94fd50b Merge branch 'charlesmchen/certificateSubject' -|\ \ -| * | 8c4b34aa5 Revert "rename token -> password" -| * | 9e80c96d1 Revert "Revert "Revert "Revert "Revert temporary changes."""" -| * | 8e18f4057 Respond to CR. -| * | 3cac5bbfe Respond to CR. -| * | c0022ecea Move from test to staging environments. -| * | ef6aed75b Revert "Revert "Revert "Revert temporary changes.""" -| * | 8d1011a1f Verify certificate subject. -| * | c65b38ad6 Revert "Revert "Revert temporary changes."" -| * | aef881cad Verify certificate subject. -| * | 54d025e11 Revert "Revert temporary changes." -|/ / -* | 594c9aacf Merge branch 'mkirk/update-auth-params' -|\ \ -| * | 5e2dc1893 rename token -> password -|/ / -* | 1ce277a95 Merge branch 'mkirk/parser-fixup' -|\ \ -| * | ac461ca2d Fixup parser: Robust to servers various "empty" types -|/ / -* | 4a37b0e79 Merge branch 'mkirk/unbatch-legacy-contact' -|\ \ -| * | 6d46ed0e3 No change in behavior: move class down -| * | 2e38fa145 Unbatch legacy contact requests -|/ / -* | e602cf55a Merge branch 'charlesmchen/refineTheme' -|\ \ -| * | baf432f1e (origin/charlesmchen/refineTheme, charlesmchen/refineTheme) Respond to CR. -| * | fa8a07abf Respond to CR. -| * | 581347a7f Refine theme. -| * | 7759c9ca0 Refine theme. -| * | f795b12a8 Refine theme. -|/ / -* | 594eeea19 Merge branch 'charlesmchen/cleanupAttachment' -|\ \ -| * | 9334143f5 (charlesmchen/cleanupAttachment) Organize attachments. -|/ / -* | e194959c1 Merge branch 'charlesmchen/recipientDevices' -|\ \ -| * | b0a516c36 (charlesmchen/recipientDevices) Refine recipient device updates. -| * | 0518b335d Refine recipient device updates. -|/ / -* | 2c8a64a48 Merge branch 'mkirk/dry-up-param-parsing' -|\ \ -| * | bae2e8649 (origin/mkirk/dry-up-param-parsing) Dry up Parameter parsing logic -|/ / -* | c2ed507d6 Merge tag '2.28.0.13' -|\ \ -| |/ -| * 1824d7dce (tag: 2.28.0.13) "Bump build to 2.28.0.13." -| * 778a8aa07 sync translations -| * 4a84404d1 Update WebRTC -* | 0081a877e Merge branch 'mkirk/validated-protos' -|\ \ -| * | 7f8dc8333 Update Pods -| * | d39906f60 CR: test malformed protos -| * | e5856b2ac CR: Add back deprecated constructor to debug list -| * | abcd0a1d2 CR: revert logging change -| * | 06bbe907b builder pattern for proto construction -| * | 9299c5e57 CR: tweak proto class name, include yet-to-be-used protos -| * | b860dce7f Swift protos for Envelope -|/ / -* | e77b798aa Merge branch 'mkirk/webrtc-m68' -|\ \ -| * | 19ece45c8 (origin/mkirk/webrtc-m68) Update WebRTC to M68 -| * | d5ebd5a60 UBSan fixup -|/ / -* | 73012d469 Merge branch 'jsq/xcode-file-templates' -|\ \ -| * | 868a35ce4 (origin/jsq/xcode-file-templates, jsq/xcode-file-templates) Add IDE template macro for consistent headers -|/ / -* | 3126db431 Merge branch 'jsq/building-update' -|\ \ -| * | 196b2fb1f [Build] Update clone instructions -|/ / -* | 2298d50d1 Merge branch 'mkirk/cds-retry' -|\ \ -| * | f002f89f2 Update retryable -|/ / -* | 0598733fc Merge branch 'mkirk/cds-feedback-2' -|\ \ -| * | 3507367a9 Don't report feedback for HTTP errors. -|/ / -* | 11db859e6 adapt to changes since RI -* | 6e1c1a681 Merge tag '2.28.0.12' -|\ \ -| |/ -| * 6518aa24a (tag: 2.28.0.12) "Bump build to 2.28.0.12." -| * d04bb8625 sync translations -| * 48fb652d8 Merge branch 'charlesmchen/unknownObjectVsNPE' -| * fd9125ce1 Merge branch 'mkirk/remove-swipe-for-info' into release/2.28.0 -| |\ -| | * 2d4eb7d05 remove interactive 'swipe for info' -| |/ -| * 57c4d9709 Merge branch 'mkirk/speed-up-message-action-presentation' into release/2.28.0 -| |\ -| | * aba358e89 faster message actions presentation -| |/ -| * 58e2e1383 Merge branch 'mkirk/fixup-navbar' into release/2.28.0 -| |\ -| | * 1d4ead080 fix color behind navbar -| | * 3d6b8e2bb hide navbar blur layer in attachment approval, which has a clear navbar -| |/ -| * 9d279b4d8 (tag: 2.28.0.11) "Bump build to 2.28.0.11." -| * 9fc8a0eb2 Merge branch 'charlesmchen/messageSaveTouchesThread' into release/2.28.0 -| |\ -| | * f0d797a91 Always touch the thread when updating a message. -| | * d793c008b Always touch the thread when updating a message. -| |/ -| * 28f892b3c Merge branch 'charlesmchen/footerAlignment' into release/2.28.0 -| |\ -| | * 88c5fc1af Fix message footer alignment. -| |/ -| * d8c247fc0 Merge branch 'charlesmchen/gesturesVsBreaks' into release/2.28.0 -| |\ -| | * e271730f3 Ignore gestures in date breaks and unread indicators. -| |/ -| * 9049153c6 Merge branch 'charlesmchen/distinctSenderNames' into release/2.28.0 -| |\ -| | * 9d5af7bb2 Set sender names apart. -| |/ -* | 76f0a6b8b Merge branch 'charlesmchen/unknownObjectVsNPE' -|\ \ -| * | 5530b8d70 (charlesmchen/unknownObjectVsNPE) Respond to CR. -| * | 7a898f5e9 Fix NPE using mock for unknown database objects. -| * | 2c973782c Fix NPE using mock for unknown database objects. -| * | 723691400 Fix NPE using mock for unknown database objects. -| * | 708ef6f7d Fix NPE using mock for unknown database objects. -| * | 060e0fd06 Fix NPE using mock for unknown database objects. -|/ / -* | 79dcbf8a7 Update cocoapods. -* | 28ad8d065 Revert Pods update. -* | f31c6a22f Merge branch 'mkirk/cds-feedback' -|\ \ -| * | 558b3bd24 (private/mkirk/cds-feedback) Report contact discovery feedback -|/ / -* | 072100025 Merge branch 'mkirk/contact-discovery' -|\ \ -| * | 8c5d6ba9b (private/mkirk/contact-discovery) Respond to code review. -| * | b42f52871 Integrate with new contact discovery endpoint -| * | a61162569 fixup lookup threading -| * | dedfea78d callback handlers for remote attestation -|/ / -* | e27e45e66 Merge branch 'charlesmchen/socketVsNewLinkedDevice' -|\ \ -| * | bebb8ecfd (charlesmchen/socketVsNewLinkedDevice) Cycle the socket after linking a new device. -|/ / -* | c92f84353 Merge branch 'charlesmchen/byteParser' -|\ \ -| * | b197e4776 (charlesmchen/byteParser) Respond to CR. -| * | 82ebb6e76 Update cocoapods. -| * | 73eb0778c Add unit tests around byte parser. -| * | 28f021ba5 Pull byte parser out into separate source file. -|/ / -* | 2fd996a24 Merge branch 'charlesmchen/internJSQ' -|\ \ -| * | 10636957a (charlesmchen/internJSQ) Intern JSQMessagesViewController. -| * | e0db33e63 Intern JSQMessagesViewController. -| * | 25a98554b Intern JSQMessagesViewController. -|/ / -* | 906d0b01a Fix build break. -* | 6c02c2065 Merge branch 'charlesmchen/sendToSelfIsRead' -|\ \ -| * | baed56103 (charlesmchen/sendToSelfIsRead) Mark message sent to self as read. -|/ / -* | 77fd69c4e Merge branch 'charlesmchen/contactsVsConcurrency' -|\ \ -| * | 304240f26 (charlesmchen/contactsVsConcurrency) Fix concurrency in contacts updater. -| * | 9904443fc Fix concurrency in contacts updater. -|/ / -* | 492debce4 Merge branch 'charlesmchen/remoteTwistedOak' -|\ \ -| * | 88be3a575 (charlesmchen/remoteTwistedOak) Respond to CR. -| * | 819c2b1ce Remove Twisted Oak. -|/ / -* | 1ec04bc37 Merge branch 'charlesmchen/remoteAttestation3' -|\ \ -| * | c3d47d332 (charlesmchen/remoteAttestation3) Respond to CR. -| * | 904ed1549 Add unit test around remote attestation. -|/ / -* | 2427df23f Merge branch 'charlesmchen/remoteAttestation2' -|\ \ -| * | 797bd9be3 (private/charlesmchen/remoteAttestation2, charlesmchen/remoteAttestation2) Respond to CR. -| * | 81a940a27 Clean up ahead of CR. -| * | 7acf9b15e Finish signature verification. -| * | 7476ef123 Remote attestation. -|/ / -* | 551bb5b93 ubsan fixup -* | a680e70b4 Merge branch 'charlesmchen/refineHomeView2' -|\ \ -| * | 2b1f92877 (charlesmchen/refineHomeView2) Respond to CR. -| * | b90e406a5 Clean up ahead of PR. -| * | 48975eaac Respond to CR. -| * | b2b95597c Refine views. -| * | 8862f9a53 Refine views. -| * | fcbf8d4dc Refine views. -| * | 9f9e0965d Refine table views. -|/ / -* | 0025999b2 Merge branch 'mkirk/fix-overzealous-error' -|\ \ -| * | ab1190222 Fix overzealous failure when user has no Signal contacts -| * | 90430c75c update ubsan -|/ / -* | e88e7ef75 Merge branch 'charlesmchen/remoteAttestation' -|\ \ -| * | 81bd4c46e (charlesmchen/remoteAttestation) Update cocoapods for CDS. -| * | 75c3b385b Respond to CR. -| * | 97eb405a9 Revert temporary changes. -| * | f2fdb9693 Clean up ahead of PR. -| * | 460f7344a Remote attestation. -| * | 6686ecb12 Remote attestation. -| * | d7bb2b750 Remote attestation. -| * | f3ba6d4c2 Remote attestation. -|/ / -* | 20284ebc8 update BUILDING.md -* | 6082bd918 Merge branch 'mkirk/update-san' -|\ \ -| * | 9e348f2a2 update ubsan -|/ / -* | 0513077d2 Merge branch 'mkirk/batch-contact-intersections' -|\ \ -| * | eb4c62593 (origin/mkirk/batch-contact-intersections) Cancel quickly if dependent operation fails -| * | 90214ae57 make contact intersection queue serial -| * | 0db339b84 fixup double failure -| * | 9293eb96f code re-org -| * | 344c2a37c update pods for batching contact intersections -| * | 75248b5dc Stub out feedback operation -| * | b7288b256 Move contact intersection into batched operation -| * | f277ae877 Clarify OWSOperation behavior (no behavioral changes) -|/ / -* | e05877a01 Merge branch 'update-translations' -|\ \ -| * | 4ab6892e2 changed string text for MULTIDEVICE_PAIRING_MAX_DESC, ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY, CONTACT_FIELD_ADDRESS_POSTCODE, END_CALL_RESPONDER_IS_BUSY. changed comment for SETTINGS_INVITE_TWITTER_TEXT -| * | c2f7c15f7 removed jsq strings, modified MULTIDEVICE_PAIRING_MAX_RECOVERY text and comment -|/ / -* | a9353ed4e Merge branch 'charlesmchen/deltaContactIntersection2' -|\ \ -| * | 39c7fd9f1 Respond to CR. -| * | 3aa28aee3 Respond to CR. -| * | 3c3742aae Clean up ahead of PR. -| * | bf1642052 Fix nullability. -| * | 03e5d2973 Delta contact intersections. -|/ / -* | 3b2ae010d Merge branch 'charlesmchen/streamlineSignalRecipient' -|\ \ -| * | 899e96f70 (origin/charlesmchen/streamlineSignalRecipient) Respond to CR. -| * | 7f33236d6 Respond to CR. -| * | 094cf3691 Respond to CR. -| * | cc91cb3db Respond to CR. -| * | ace07ac62 Respond to CR. -| * | c830f880a Streamline SignalRecipient. -| * | 77884913d Streamline SignalRecipient. -| * | b6489c694 Streamline SignalRecipient. -| * | 05a4222b2 Streamline SignalRecipient. -| * | ef3933bfa Streamline SignalRecipient. -| * | 10b21d10e Streamline SignalRecipient. -| * | 9618fc16c Streamline SignalRecipient. -| * | ebe87348a Streamline SignalRecipient. -| * | d14f764b5 Streamline SignalRecipient. -|/ / -* | 601f1ffe7 update pods to remove test build configuration -* | 256ad75a4 Merge branch 'mkirk/remove-test-build-config' -|\ \ -| * | ef9a0880a (origin/mkirk/remove-test-build-config) Fix analyzer warnings -| * | baacebc95 Enable (quick) static analyzer for normal builds -| * | 77997639f Use CurrentAppContext instead of compiler flag to affect test behavior -|/ / -* | e00f4b30f Merge branch 'mkirk/fixup-tests-5' -|\ \ -| |/ -|/| -| * 12ef25420 Fixup SSK tests -| * d591fb7f2 Fix some compiler warnings -| * 8354a9c13 update fastlane to latest -| * c19a8ce07 Fixup tests -|/ -* 1c9a47416 (tag: 2.28.0.10) "Bump build to 2.28.0.10." -* 89f02a851 sync translations -* e0ee0bd9b Merge branch 'charlesmchen/contentInsetsRevisited' -|\ -| * 0c453c8d5 Fix content insets. -|/ -* 5cecce997 Merge branch 'mkirk/add-header-to-system-info' -|\ -| * 2b5db4fd1 Add header view to info messages. -|/ -* 41deb92ad Merge branch 'mkirk/fix-bottom-artifact-after-selecting-compose' -|\ -| * 11fc674ef Avoid blur as overly-tall navigation bar lingers after dismissal. -| * 7a5f5476d rename to avoid confusion -|/ -* 7b29822c3 Merge branch 'mkirk/fix-table-cell-sizing' -|\ -| * a6a09f4d9 fix squashed cells on ios9/10 -|/ -* 573f60ee5 Merge branch 'mkirk/fixup-audio-margins' -|\ -| * 17e79a522 fixup audio/generic atachment margins -|/ -* c2063d860 replace bullet with center-dot unicode -* cfe3c893d Merge branch 'mkirk/tweak-delivery-status-baseline' -|\ -| * 7b8541013 per design: MessageStatus 1pt below baseline -|/ -* a87be31c6 Merge branch 'mkirk/remove-new-message-after-send' -|\ -| * 567f62590 touch instead of reload to make sure any adjacent bubbles are updated appropriately. -| * 2c3f7db4e Only add one 'incoming message' unread indicator per foreground. -| * f2f3b9eae reload cell after removing unread indicator -|/ -* 51d753c13 Merge branch 'mkirk/tweak-quote-corner-radius' -|\ -| * 1b7888266 per design: tweak quote corner radius -|/ -* b9f3e08e9 (tag: 2.28.0.9) "Bump build to 2.28.0.9." -* 089010cc5 Sync translations -* fa96e0c30 Merge branch 'oscarmv/SettingsButtonMargin' -|\ -| * 24f30e015 Fixed settings button margin in home view controller, also fixes land scape button image glitch. -|/ -* 219d2bd9d Merge branch 'mkirk/fix-insets-compose' -|\ -| * c53f777bc CR: explanatory comment -| * 898d64ae1 Fix compose picker content scrolls behind navbar -|/ -* 16b20f301 Merge branch 'charlesmchen/removeThumbnailShadows' -|\ -| * e3622739b Remove media thumbnail shadows. -|/ -* b9b16f972 Merge branch 'charlesmchen/fileIcon' -|\ -| * 15bfe44b1 Update icon for generic attachments. -|/ -* 257e49740 Merge branch 'mkirk/fix-call-screen-status' -|\ -| * 06b4584e0 move fix to OWSViewController -| * 90e3cb0ed update status bar after screenprotection shows -|/ -* ba1dc6c24 Merge branch 'mkirk/adjust-header-spacing' -|\ -| * 24060c17d CR: proper width calculation for header view -| * f33e5c019 CR: assign gutter trailing/leading in HeaderView -| * fef6c64bd decrease header spacing from 32->28. -|/ -* 5fc21b69e Merge branch 'mkirk/fix-contact-cell' -|\ -| * 8da47b64d clarify different methods -| * 9df6b4bb7 Fix "contact cell too close to edge" in detail view (iOS9/iOS10) -|/ -* 7d0733fa8 (tag: 2.28.0.8) "Bump build to 2.28.0.8." -* 8984e1a71 Sync translations -* a2521169d Merge branch 'mkirk/fix-content-inset' -|\ -| * 0847c0baf ScrollToBottom accounts for top inset -|/ -* 4ee4df631 Merge branch 'charlesmchen/badUnreadIndicatorAnimation' -|\ -| * 687efabed Respond to CR. -| * 96a8df5f8 Fix "new unread indicator animation" issue. -| * f69945ea2 Fix 'breaks vs. collapse' issue. -|/ -* 810d67c3b Merge branch 'charlesmchen/oversizeAccessory' -|\ -| * c3b02522c Fix oversize accessory view. -| * 3a3fb0e41 Fix oversize accessory view. -|/ -* 54bef5b34 Merge branch 'charlesmchen/cdsFeatureFlag' -|\ -| * 23848844f Add feature flag for contact discovery service. -|/ -* 1a2428a4b CR: leave some wiggle room on max window height. -* 34be31b16 Merge branch 'mkirk/message-actions' -|\ -| * e911de01e Ensure delegate is informed of dismissal -| * 39bbcca73 CR: cleanup / copy tweak -| * bdc8181cb hide menu view controller when resigning active -| * dde2fd6f3 Hide menu window when vc dismisses. -| * 82fdd5b88 Split out generic action sheet components -| * 093a5eaa6 don't dismiss if pan is over actionsheet -| * 41af4f8c9 highlight on press -| * 2606ac47f swipe gesture / code reorg -| * 41c1c2fcd scroll focused view to maximize visability -| * 3a157d9df window level on iOS11 -| * d31b91663 new icons -| * ce3030917 MessageActions for info messages -| * 42eb7a8d3 cleanup unused code -| * 9496bedce remove redundant menu controller from media detail -| * b65be4599 quote actions -| * 210cba3e3 Media actions -| * 729336774 delete text -| * 255236814 add text reply action, comment out more deprecated uimenu code -| * 6079ae243 show text details, dismiss before action to avoid problems when action presents -| * 5c2a5b00a comment -| * 0c4cae133 milestone: route one real action (copy text) -| * bb6722ea4 animate in/out -| * ceeddbc67 localize, proper action height -| * adfaeaa8e round top corners -| * 57400e1ec WIP: ActionView -| * 18adf26e0 Don't present over navbar. -| * 635c0275d stop observing db notifications while message actions are presented -| * 6275a2f10 Highlight focused view -| * 22fada245 don't dismiss keyboard when presenting actions -| * ea179a398 first responder debugging -| * aa98963fd Abandonded: separate window pattern -| * 6037a440c wire up window mgmt -|/ -* 3cc13a66a Merge branch 'mkirk/navbar-blur' -|\ -| * a2c67bb96 Enhance navbar blur, match input toolbar blur -|/ -* c08022ade Merge branch 'mkirk/fix-initial-sync' -|\ -| * 872c89fbf Update recipient devices on successful decrypt to avoid wasting a valid session created by sender. -|/ -* 3729943cd Fix production build breakage. -* cd730e7db Merge branch 'charlesmchen/registrationHeaders' -|\ -| * 7866c5ab2 Tweak status bar colors in registration flow. -|/ -* 3e57a4442 Merge branch 'charlesmchen/refineHomeView' -|\ -| * b2f42adb8 Respond to CR. -| * f6eb8dfe7 Refine app settings view. -| * 20d1d1125 Refine home view. -|/ -* 4a2a6362b (tag: 2.28.0.7) "Bump build to 2.28.0.7." -* 9f9c83365 sync translations -* a75f1ac17 Merge branch 'charlesmchen/disappearingMessagesIcon2' -|\ -| * 246218e33 Apply 'disappearing messages disabled' icon. -| * 4d3707a16 Apply "disappearing messages disabled" icon. -|/ -* 92515bdd1 Merge branch 'charlesmchen/moreTweaks' -|\ -| * 828707649 More design tweaks. -|/ -* 220dfef1a Merge branch 'charlesmchen/dedupeForwardClasses' -|\ -| * 49b0ea993 Dedupe forward class declarations. -|/ -* 5a91391ae Fix release breakage. -* 343faed8b Merge branch 'charlesmchen/tweakAppearance' -|\ -| * 83545e72a Tweak appearance. -| * 0c420ed28 Tweak appearance. -| * 750b93512 Tweak appearance. -|/ -* 19173a20b (tag: 2.28.0.6) "Bump build to 2.28.0.6." -* cba041db1 sync translations -* 68ad2dde5 Merge branch 'charlesmchen/reworkUnreadIndicator2' -|\ -| * a505c2a89 Tweak unread indicator + date. -|/ -* 04da18c7f Merge branch 'charlesmchen/reworkUnreadIndicator' -|\ -| * 376e2cc1d Respond to CR. -| * 35f058c46 Rework unread indicators. -| * ecafe546b Rework unread indicators. -| * 8d72bb032 Rework unread indicators. -|/ -* 1ce147e94 Merge branch 'charlesmchen/tweakDisappearingMessagesIndicator' -|\ -| * e48a1e081 Respond to CR. -| * 6711ed1cf Respond to CR. -| * f426af816 Respond to CR. -| * 6d45d533e Respond to CR. -| * e01579ed4 Tweak disappearing messages indicator. -| * 0038c9b3b Tweak disappearing messages indicator. -| * d42ff03ec Tweak disappearing messages indicator. -|/ -* ec7365971 Update cocoapods. -* bbe276048 Merge branch 'charlesmchen/tweakSystemMessages2' -|\ -| * dbb0a494f Tweak system messages. -| * d278017df Tweak system messages. -| * 158aa3abc Tweak system messages; incomplete vs. missed calls. -| * 8b3bdb88f Revert "Merge branch 'charlesmchen/tweakCalls'" -|/ -* b2fe4b910 Merge branch 'charlesmchen/disappearingMessagesIcon' -|\ -| * 949402310 Update disappearing messages icon. -|/ -* 5caa289bc (tag: 2.28.0.5) "Bump build to 2.28.0.5." -* df568753c sync translations -* 4a4eb9b83 Merge branch 'charlesmchen/tweakPhoneNumberProfileNames' -|\ -| * fdc4fafe7 Tweak phone number & profile names. -|/ -* c4d52505b Merge branch 'mkirk/sync-colors' -|\ -| * f0175c0b6 feature gate color syncing -| * a66c88e3c Fix getter for contact threads, remove sneaky read transaction for DM config. -| * 92705490a No write transaction needed for syncing colors -| * 66e726a1f DRY per CR -| * 3530bf4fe sync configuration off main thread -| * 8a43435df avoid deadlock -| * 61cb19ef6 trigger sync when colors updates -| * d53f583e4 sync colors with group -| * 4d3d5d98e Sync colors with contacts -| * 553a94286 update protobufs to sync group color -|/ -* f1b130754 Merge branch 'charlesmchen/readMessageStatusIcon' -|\ -| * 575d0be6a Apply 'read' message status icon. -|/ -* bfebd1202 Merge branch 'mkirk/date-breaks' -|\ -| * c8b4e879e CR: remove unused font -| * c81799169 CR: intercell spacing dicated by ConversationViewItem -| * 3e1c1ab6c capitalize date breaks -| * 77e9533dc remove hairline -| * f22cb48f8 date break font/color to spec -| * 56e5abb2c Format date breaks to spec -| * 0b2facd36 Only include date in date header (no time) -| * 68ffd8139 Only show breaks between new days -|/ -* 66521d94c Merge branch 'mkirk/white-status-for-calls' -|\ -| * 28abf426f White status bar for call screen -|/ -* bd9c93edb Merge branch 'mkirk/tweak-selected-color' -|\ -| * 998c2f392 CR: inline per code review -| * 834021fe3 tweak selected color for homeview cells -|/ -* 823840626 Merge branch 'mkirk/fix-text-color-for-outgoing-failed' -|\ -| * 10ac7be03 prefer localizedUppercaseString for user facing text -| * d5e15b2a0 FAILED label capitalized to spec -| * 76745bee5 failed background color to spec -|/ -* b0978abd0 use points not pixels when determining how short a device is -* 14741c1dc Merge branch 'charlesmchen/attachmentUpload2' -|\ -| * a9c7e77b8 Respond to CR. -| * c70d33b9e Tweak attachment upload view. -|/ -* 2f12cd997 Merge branch 'charlesmchen/tweakHomeView2' -|\ -| * 0a35cbab1 (origin/charlesmchen/tweakHomeView2) Respond to CR. -| * d0618e373 Apply 'failed' message status icon in home view. -|/ -* a04065a52 Merge branch 'charlesmchen/tweakHomeView' -|\ -| * aac805a43 Respond to CR. -| * 159e6d235 Retweak home view unread indicator. -| * 03d393553 Tweak home view cells. -| * 6bab56220 Tweak home view cells. -|/ -* 9abea3663 (tag: 2.28.0.4) "Bump build to 2.28.0.4." -* d80aa3226 sync translations -* 8595d0fb9 Merge branch 'charlesmchen/retweakBreaks' -|\ -| * b92fc8998 Retweak date and unread messages breaks. -|/ -* 4cedce263 Merge branch 'charlesmchen/relativeTimestamps' -|\ -| * 5e71f3130 Respond to CR. -| * d4fa7e5e6 Tweak relative timestamps. -| * 41e505fb6 Tweak relative timestamps. -| * 712d6d89e Tweak relative timestamps. -|/ -* 418d33287 Merge branch 'charlesmchen/untweakColors' -|\ -| * a28a5251f Respond to CR. -| * cf8d5868e Retweak colors. -| * 4893b0190 Retweak colors. -| * e7e31c5ee Retweak colors. -| * 4b448ed01 Retweak colors. -| * bbd65d643 Retweak colors. -|/ -* dd2c0c3a9 Merge branch 'charlesmchen/conversationColorsFeatureFlag' -|\ -| * db27acf61 (charlesmchen/conversationColorsFeatureFlag) Tweak colors flag. -|/ -* e6e945b78 Merge branch 'charlesmchen/retweakSenderAvatarSizes' -|\ -| * 929615ab0 (charlesmchen/retweakSenderAvatarSizes) Tweak sender avatar sizes. -|/ -* 2763f7bd2 fix corner rounding for outgoing messages too -* 34c47f87c Merge branch 'mkirk/fix-rounding-after-date' -|\ -| * f8f0e4aa9 Fix rounding after date -|/ -* 3e0233ea6 Merge branch 'charlesmchen/tweakCalls' -|\ -| * 57c79fd79 Respond to CR. -| * b26231e43 Tweak calls. -| * 1a9a5016f Tweak calls. -|/ -* 74ce3012c (tag: 2.28.0.3) "Bump build to 2.28.0.3." -* c40c2a632 Merge tag '2.27.1.4' -|\ -| * 46b835b50 (tag: 2.27.1.4, origin/hotfix/2.27.1) "Bump build to 2.27.1.4." -| * 82bb54baa Merge branch 'mkirk/multiple-replies' into hotfix/2.27.1 -| |\ -| | * 3eb7e9271 Fix: second reply from lockscreen doesn't send -| |/ -* | 914b76c36 Merge branch 'mkirk/sharp-corners' -|\ \ -| * | 37c4a802e sharp corners respect RTL -| * | fa89a84da CR: move builder to BubbleView -| * | 0ecc97d5f date header should break cluster -| * | 42da082b0 extract rounded bezier builder -| * | 900abf236 CR: simplify -| * | 287da9c30 fixup quote corners -| * | 68c7abcbb Sharp corners -|/ / -* | f19d3374e Merge branch 'mkirk/fixup-bubble-shape' -|\ \ -| * | 40df1c8c3 CR: simplify -| * | b301dba4b cell height to spec -| * | 1f6668d86 corner radius to spec -| * | 51411f661 circular corners -|/ / -* | fadc6d7dc Merge branch 'mkirk/show-footer-across-clusters' -|\ \ -| * | 0f2c0dcd8 Only collapse footers within a cluster (from the same author) -|/ / -* | e6820499a Merge branch 'mkirk/fix-presentation-corners' -|\ \ -| * | 6e66e4e1f match media corners on dismiss -|/ / -* | 881d4be58 (tag: 2.28.0.2) "Bump build to 2.28.0.2." -* | a1f5512e8 Merge tag '2.27.1.3' -|\ \ -| |/ -| * 394990685 (tag: 2.27.1.3) "Bump build to 2.27.1.3." -| * 5a6e6e779 Merge branch 'mkirk/short-devices' into hotfix/2.27.1 -| |\ -| | * 24e675ff0 Use dismissable text views where cramped on shorter devices -| |/ -* | 2eccdc066 Merge branch 'mkirk/tweak-icons' -|\ \ -| * | 69863c645 remove unused image asset -| * | 0533eb46e tweak attachment icon -|/ / -* | b70e74b57 Merge branch 'charlesmchen/fixContactCells' -|\ \ -| * | c460ff294 Fix contact cell layout. -|/ / -* | b5698d70c Merge branch 'charlesmchen/profileTildes' -|\ \ -| * | 01cc206e8 Tweak styling of phone number + profile name. -|/ / -* | 79f4a984e Merge branch 'charlesmchen/tweakSendFailed' -|\ \ -| * | 5b5ef7e0b Respond to CR. -| * | ba557858e Tweak message send failed indicator. -| * | dd078b106 Tweak message send failed indicator. -| * | 19699fd45 Tweak message send failed indicator. -| * | 5fc16c1d9 Tweak message send failed indicator. -|/ / -* | 015c0bf5c Merge tag '2.27.1.2' -|\ \ -| |/ -| * 958d249ee (tag: 2.27.1.2) "Bump build to 2.27.1.2." -| * 89119e7da Merge branch 'charlesmchen/websocketFailoverToRestVsQueue' into hotfix/2.27.1 -| |\ -| | * 3f4cd15f5 (charlesmchen/websocketFailoverToRestVsQueue) Use sending queue in websocket send failover to REST. -| |/ -* | 0292e1dd3 (tag: 2.28.0.1) "Bump build to 2.28.0.1." -* | 0f34f7661 Merge tag '2.27.1.1' -|\ \ -| |/ -| * 677b898bf (tag: 2.27.1.1, hotfix/2.27.1) "Bump build to 2.27.1.1." -| * 2c1693c94 Revert "Revert "Revert "Disable contact sharing.""" -| * 847fa3cf0 (tag: 2.27.1.0) "Bump build to 2.27.1.0." -| * 5abd35de3 Merge branch 'mkirk/unblock-ipad-register-button' into hotfix/2.27.1 -| |\ -| | * b47062831 Don't block "register" button on iPad registration -| |/ -| * 1448c505d Merge branch 'mkirk/fix-ios10-cant-see-inbox' into hotfix/2.27.1 -| |\ -| | * f48634701 Fixes iOS10 intermittently can't see inbox -| |/ -| * 6a502fcec Merge branch 'mkirk/fix-initial-contact-group-sync' into hotfix/2.27.1 -| |\ -| | * 1e8c7d63b clarify sync logging -| | * 8576de061 Fix: No contacts/groups after initial device link -| |/ -* | 2106bd9e0 sync translations -* | dee825ceb Merge branch 'charlesmchen/contactShareButtons' -|\ \ -| * | 99b76b973 (charlesmchen/contactShareButtons) Respond to CR. -| * | 92332c2b6 Rework contact share buttons. -|/ / -* | a0710febe Merge branch 'mkirk/smaller-icon' -|\ \ -| * | cfd18bf3f smaller swatch icon -|/ / -* | 1f79e1d59 Merge branch 'mkirk/bump-limit' -|\ \ -| * | 9cb25024c bump limit to allow more legit strings through -|/ / -* | dc036496b Merge branch 'mkirk/tweak-sender-bar' -|\ \ -| * | 2b7fc4c94 CR: fixup false->NO -| * | a27ee19f4 Fix scroll offset for iPhoneX now that content is behind toolbar -| * | 83d3f17d4 remove unused code, add comment -| * | 2b588017f round attachment approval toolbar -| * | 94a23e63b resize bar after send -| * | 1d0a25dba cleanup -| * | 17f0400bb vertically align input toolbar items -| * | 1a00690b1 Compose to stack view -| * | 7ef693f1b pure white blur -| * | 84d60f5dc input toolbar layout tweaks -| * | ce0c706f7 icon tint -|/ / -* | b801979fa Merge branch 'mkirk/misc-cleanup' -|\ \ -| * | bd9696fed canary in case we change margins later -| * | 6d5c0cd29 image corner radius is small -| * | 9108c8932 ContactView is now a stackView -|/ / -* | aa70deef7 (tag: 2.28.0.0) fix picker rounding -* | 283556ed0 "Bump build to 2.28.0.0." -* | 6ea3c1373 Merge branch 'charlesmchen/quotedReplyMargins' -|\ \ -| * | 05b1b37ea Respond to CR. -| * | bc527273f Fix quoted reply margin. -|/ / -* | cf38da0d1 Merge branch 'charlesmchen/smallMediaCorners' -|\ \ -| * | fb0ac3217 Respond to CR. -| * | 3b726bbac Small media corners. -|/ / -* | 1d329fbc1 Merge branch 'charlesmchen/tweakCleanup' -|\ \ -| * | db32dcc6a Cleanup. -|/ / -* | 9dd18c46e Revert "Fix quoted reply margin." -* | c76c571d8 Fix quoted reply margin. -* | 170d35caa Merge branch 'charlesmchen/tweakTimestampFormat' -|\ \ -| * | d932748cd Change timestamp format. Ensure we always have a date break between messages on different days. -|/ / -* | 484be57dc Merge branch 'charlesmchen/tweakMessages3' -|\ \ -| * | 8c143f950 Tweak quoted reply layout. -| * | 9a52d4041 Tweak quoted reply layout. -| * | c6f370810 Refine cell sizing. -| * | 7be6fbc24 Refine intra-cell spacing. -|/ / -* | a80eb0911 Merge branch 'charlesmchen/moreColors' -|\ \ -| * | 49d34ff02 Tweak contact offers. -| * | 82e649c50 Tweak colors. -| * | 53c74d84a Tweak colors. -| * | 0c4470bb3 Tweak colors. -| * | 2653ed7e3 Apply conversation colors. -| * | 63fa6f5c0 Tweak read indicator color. -|/ / -* | f81aec936 Merge branch 'charlesmchen/rtl' -|\ \ -| * | 92a9796e9 Respond to CR. -| * | 1412998b4 Rework isRTL. -|/ / -* | 8bbc25148 Merge branch 'charlesmchen/senderNames3' -|\ \ -| * | a6e401514 Tweak profile names. -| * | bb1caaf3c Tweak profile names. -| * | 39eac9129 Respond to CR. -| * | 4dcb8e18b Clean up ahead of PR. -| * | 32f33f6d1 Tweak sender names. -|/ / -* | 3ee16a0e3 Merge branch 'mkirk/tweak-navbar' -|\ \ -| * | 4f94d5c5a default value -| * | 249b0a32b long text view controller -| * | 5719aba91 separate icon vs. title color for toolbars -| * | 33ab3a663 opaque conversation input toolbar -| * | 126d41e54 Fixup "scroll down" button so it doesn't fall behind toolbar -| * | fd22c6cf2 fix warnings in conversation input toolbar -| * | ee898829a fixup white nav -| * | 767f06b09 fixup status bar -| * | 104e63ded remove appearance juggling -| * | d5fa7f9b2 conversation view scrolls behind bars -| * | f8abe32ae more styling to new nav colors -| * | 001aad001 dark status bar -| * | 5d6a98895 WIP navbar -|/ / -* | e67d03b43 Merge branch 'mkirk/fixup-conversation-color' -|\ \ -| * | de56eb9d6 Proper color for compose screen avatars -|/ / -* | 2b293b762 (origin/charlesmchen/genericAttachmentFileExtension) Merge branch 'charlesmchen/removeFooterShadows' -|\ \ -| * | de8cef52b Tweak message contents. -|/ / -* | 600b1aa49 Merge branch 'charlesmchen/tweakQuotedReplies2' -|\ \ -| * | f0121f20b Respond to CR. -| * | bcde04766 Fix layout of quoted replies. -| * | 678881014 Clean up ahead of PR. -| * | 9ead8b55a Tweak design of quoted replies. -| * | d80de4bcc Tweak design of quoted replies. -|/ / -* | 38db7c440 Merge branch 'charlesmchen/genericAttachmentFileExtension' -|\ \ -| * | 7f855aa9e Respond to CR. -| * | 520819b24 Show generic attachment extension. -|/ / -* | ea7ec9948 Merge branch 'mkirk/pick-color' -|\ \ -| * | 16df4f589 conversation colors -|/ / -* | 7d1cf700b Merge branch 'charlesmchen/genericAttachmentSizing' -|\ \ -| * | d8108c5ea Tweak generic attachment view widths. -|/ / -* | 2559b7b8f Merge branch 'charlesmchen/sendingAnimation' -|\ \ -| * | e0f2a76c7 Animate sending icon. -|/ / -* | 06d8e8cb4 Merge branch 'charlesmchen/tweakCells' -|\ \ -| * | 24c4c4c09 Respond to CR. -| * | 23435b690 Tweak message contents. -| * | dd28c0189 Tweak date headers. -| * | fa5bfc25e Tweak system messages and unread indicators. -|/ / -* | 5970db6fd Merge branch 'charlesmchen/downloadingAttachmentView' -|\ \ -| * | d2f2e1cb2 Respond to CR. -| * | 3d5cff1ed Tweak attachment download view. -|/ / -* | 296c7c286 Merge branch 'charlesmchen/tweakBodyMediaSize' -|\ \ -| * | 554606e2a Ensure body media size. -|/ / -* | 288eb0a0d Merge branch 'charlesmchen/mediaGradients' -|\ \ -| * | e80e5ff9c Improve layer view design. -| * | 1e2a49880 Tweak media view gradients. -|/ / -* | 89b4391b4 Merge branch 'charlesmchen/fixBubbleStrokes' -|\ \ -| * | 0613cf3bb Fix bubble strokes. -|/ / -* | e300a0703 Merge branch 'charlesmchen/tweakAudioLayout' -|\ \ -| * | f607eabb7 Fix audio message layout. -|/ / -* | 266469163 Merge tag '2.27.0.7' -|\ \ -| |/ -| * c91811850 (tag: 2.27.0.7, origin/release/2.27.0, release/2.27.0) "Bump build to 2.27.0.7." -| * 57e3d0d5f Revert "Revert "Disable contact sharing."" -| * 66b0a2f1d Merge branch 'mkirk/call-failed-roulette' into release/2.27.0 -| |\ -| | * 2fdb62764 avoid occasional "call failure" after local hangup. -| |/ -* | a0810b197 Merge branch 'charlesmchen/breakSpacing' -|\ \ -| * | d869afc3e Tweak break spacing. -|/ / -* | 2ab7e644c Merge branch 'origin/tweakMessageFooters' -|\ \ -| * | 7d971f1b7 Rework view item configuration. -| * | dc531a86e Tweak message cells. -|/ / -* | 2126e6b87 Merge branch 'charlesmchen/doubleShadows' -|\ \ -| * | 87380894b Tweak message cells. -|/ / -* | 560d5b530 Merge branch 'charlesmchen/disableCompactTextLayout' -|\ \ -| * | 17d4ccc48 Disable compact text layout. -|/ / -* | d9b63076e Merge remote-tracking branch 'origin/charlesmchen/moveConversationStyle' -|\ \ -| * | 35dc34855 Move conversation style. -|/ / -* | 1a7cc3acb Merge branch 'charlesmchen/tweakColors' -|\ \ -| * | af4eb39a2 Respond to CR. -| * | a34719ce6 Tweak color palette. -| * | f2153f888 Tweak color palette. -| * | cbc80abff Tweak color palette. -| * | ce9a9ec92 Tweak color palette. -| * | 8943669d8 Tweak colors. -|/ / -* | bcc088874 Merge branch 'charlesmchen/tweakNonMedia' -|\ \ -| * | 7634e3a44 Respond to CR. -| * | ffb1c3538 Clean up ahead of PRs. -| * | 3beac83a1 Clean up ahead of PRs. -| * | 416a52b74 Tweak contact shares. -| * | 2b457c649 Tweak contact shares. -| * | 3c4d14034 Tweak contact shares. -| * | dc79d302c Tweak audio messages. -| * | a0b612c64 Tweak generic attachments. -|/ / -* | 1623bf91b Merge branch 'charlesmchen/mediaShadows' -|\ \ -| * | 774310396 Clean up ahead of PR. -| * | 5f0908069 Clean up ahead of PR. -| * | 9cc3a3b7b Add body media shadows. -|/ / -* | ec81e1558 Merge branch 'charlesmchen/senderNames' -|\ \ -| * | e9973b209 Respond to CR. -| * | 966e6a115 Tweak sender names. -|/ / -* | 538194aba Merge branch 'charlesmchen/messageCornerRounding' -|\ \ -| * | c744245c4 Fix corner rounding. -|/ / -* | 8362c2648 Merge branch 'charlesmchen/intraCellSpacing' -|\ \ -| * | 227234d8c Respond to CR. -| * | dc86bee5d Respond to CR. -| * | 16a1dcfb7 Respond to CR. -| * | 89523f556 Tweak intra-cell spacing. -|/ / -* | afa003926 Merge branch 'charlesmchen/breaks' -|\ \ -| * | d04ee3521 Respond to CR. -| * | 4fc24540d Breaks: unread indicators and date headers. -| * | a4703cec7 Breaks: unread indicators and date headers. -| * | 4b60037e3 Breaks: unread indicators and date headers. -| * | d34e53a16 Breaks: unread indicators and date headers. -|/ / -* | a55505a7a Merge branch 'charlesmchen/compactLayout' -|\ \ -| * | 572fee617 Respond to CR. -| * | f5239a4fb Compact layout / widow reduction. -|/ / -* | 3bee54dbe Merge tag '2.27.0.6' -|\ \ -| |/ -| * ad351de5c (tag: 2.27.0.6) "Bump build to 2.27.0.6." -| * a16df5cd7 sync translations -| * b4bda29d1 Merge branch 'mkirk/fix-hidden-searchbar' into release/2.27.0 -| |\ -| | * d9d5131e5 FIX: obscured searchbar upon returning -| |/ -| * 00cde6a03 Merge branch 'mkirk/group-search' into release/2.27.0 -| |\ -| | * 1fcf25fab FIX: compose search group cell -| |/ -| * 9c73dbc88 Merge branch 'mkirk/sync-touchups' into release/2.27.0 -| |\ -| | * b5b51eba2 CR: make members private where possible -| |/ -| * 3e4603920 Merge branch 'charlesmchen/searchFinderAssert' into release/2.27.0 -| |\ -| | * a6dbb7704 Remove overzealous assert in search finder. -| |/ -* | cf4847b6f Merge tag '2.27.0.5' -|\ \ -| |/ -| * 05b200c60 (tag: 2.27.0.5) "Bump build to 2.27.0.5." -| * 4576747bb sync translations -| * 89402d0d2 Merge branch 'mkirk/webrtcM67' into release/2.27.0 -| |\ -| | * 38ee3653f (origin/mkirk/webrtcM67) synchronize access to CaptureController state -| | * af603e53c remove more unused state from PCC -| | * 61156656a Only PCC needs to know about the local RTCTrack -| | * afa385fea adapt to capturer abstraction -| | * 0cd1cb80c Compiling, but video sending not working. -| | * 064035f3f WIP M67 - plumb through AVCaptureSession -| | * 51c3a3df6 update to latest webrtc artifact -| |/ -* | ec8db7ee6 Merge branch 'charlesmchen/fixedBubbleSize' -|\ \ -| * | 2232c2548 Ensure bubble sizing. -| * | c7f9575df Ensure bubble sizing. -|/ / -* | 5e676c13d Merge branch 'charlesmchen/footerView' -|\ \ -| * | 3fba10142 Respond to CR. -| * | 18417edbd Introduce message cell footer view. -| * | 7d5ad0e16 Introduce message cell footer view. -| * | 6626e2ecc Introduce message cell footer view. -| * | f363a196f Introduce message cell footer view. -| * | a769499f5 Remove overzealous assert in search finder. -| * | cbacda87c Introduce message cell footer view. -|/ / -* | 538cd4f89 Merge branch 'charlesmchen/refineConversationStyle' -|\ \ -| * | 8cfb6eef1 Refine conversation style. -|/ / -* | ad663ee06 Merge branch 'charlesmchen/conversationStyle' -|\ \ -| * | 33b1628c2 (origin/charlesmchen/conversationStyle) Rename to ConversationStyle. -|/ / -* | 661272750 Merge branch 'charlesmchen/groupSenderAvatars' -|\ \ -| * | a5d52c420 Clean up ahead of PR. -| * | 4effa56d5 Tweak 'group sender' avatars. -|/ / -* | e3a13dfd9 Respond to CR. -* | 92f63cdb1 Merge branch 'charlesmchen/fixCellLayoutBreakage' -|\ \ -| * | a9b6fe597 Respond to CR. -| * | fdd617487 Fix breakage from cell layout changes. -|/ / -* | f29d83c99 Merge branch 'charlesmchen/tweakTextInsets' -|\ \ -| * | 990bb81e4 Respond to CR. -| * | a31bd16d9 Respond to CR. -| * | 7847db7e1 Tweak text insets to reflect dynamic type. -|/ / -* | fa860592c Merge branch 'charlesmchen/tweakMessages1' -|\ \ -| |/ -|/| -| * 4b5d994c3 Respond to CR. -| * fc299b870 Use UI database connection throughout the conversation cells. -| * d40f74dd0 Respond to CR. -| * 196d82c17 Respond to CR. -| * 53b1ae6a3 Fix gutter constants. -| * 0b04397e2 Tweak message cells. -| * d425809fa Tweak message cells. -| * 98ac13f9b Tweak message cells. -| * ac6f78a5f Tweak message cells. -|/ -* 825e3f4ac (tag: 2.27.0.4) "Bump build to 2.27.0.4." -* 0419f5226 sync translations -* 3ac39fcfe Merge branch 'mkirk/main-thread-connection-failure' -|\ -| * e88dc1525 Fix failing assert: only set state on main thread -|/ -* 9cb2b5114 Merge branch 'mkirk/no-unread-status-for-search-results' -|\ -| * 9d56f100a Don't show unread badge/bold for search message -| * 803a58f33 avoid assert -|/ -* c8c89e539 Merge branch 'mkirk/fix-mute-icon' -|\ -| * 489bbe2fc FIX: mute icon corrupted in homeview -|/ -* 20b34185f Merge branch 'mkirk/fix-input-glitch-after-search' -|\ -| * 9b43e3233 FIX: input toolbar not immediately visible when search was active -|/ -* 532e0b894 Merge branch 'mkirk/archive-banner' -|\ -| * 9f06163b7 Fix contacts reminder view -| * 66ebb7b78 Simplify show/hide with stack view -| * 1528f6f70 Fix archive/outage banner. -|/ -* 2af0ba99b Merge branch 'mkirk/fix-margins-in-contact-cell' -|\ -| * cde1c3fb7 Fix: iOS10 was not respecting margins with our homebrew pin method -|/ -* 0c01bfca9 Merge branch 'charlesmchen/deserializationLogs' -|\ -| * 700e9fa49 Improve logging around deserialization exceptions. -|/ -* 676f8fc03 (tag: 2.27.0.3) "Bump build to 2.27.0.3." -* def7e8415 Sync translations -* fca11a18d Merge branch 'charlesmchen/fixMessageDetailsView' -|\ -| * 8cb057c23 Fix 'contact cell vs. message details layout' issue. -| * c8d0a8003 Fix 'contact cell vs. message details layout' issue. -| * 2ecbf1bb6 Fix 'contact cell vs. message details layout' issue. -| * 1a57fe631 Fix 'contact cell vs. message details layout' issue. -| * 0df71e22a Fix message detail view. -|/ -* c1fea2e7f Merge branch 'charlesmchen/appSettingsButton' -|\ -| * 27af2fc32 Improve app settings buttons. -|/ -* b5acc9418 Merge branch 'charlesmchen/deregistrationCopy' -|\ -| * 525fc547b Apply copy change. -|/ -* a7a9eb2a7 (tag: 2.27.0.2) "Bump build to 2.27.0.2." -* 71c63d9fc Remove obsolete assert. -* b75f4596a Remove obsolete assert. -* 3b1e924eb Merge branch 'mkirk/ipad-registration' -|\ -| * cc1bde34c Inform iPad users upon registration -|/ -* 791365ad1 Merge branch 'mkirk/show-legal-link' -|\ -| * 0bc88666c Show legal terms link -|/ -* 9468cadf2 Merge branch 'charlesmchen/searchVsKeyboard' -|\ -| * f516f30c2 Auto-dismiss search keyboard; "cancel search" button. -|/ -* 6933e28e4 update comment -* 3952954b0 Update Localizable.strings for minor copy change to Registration view -* b62b830fd Merge branch 'mkirk/deserialize-unknown-object' -|\ -| * 737598c73 Return unknown object from deserializer -|/ -* 4bd3f8cbf (tag: 2.27.0.1) "Bump build to 2.27.0.1." -* 8c6eb791a Merge branch 'charlesmchen/lazyContact' -|\ -| * fbbb9276b Respond to CR. -| * 63b6276c2 Clear LRUCache in background. -| * ebcc435c9 Clean up ahead of PR. -| * 87ea1dcae Clean up ahead of PR. -| * 08ca4fdb5 Lazy-load contact avatar data and images. Use NSCache for avatar images. -| * af977ca40 Don't cache CNContact. -| * 41a2ea03b Don't cache CNContact. -| * b9e2963f4 Don't cache CNContact. -| * d3d9d2e64 Don't cache CNContact. -| * 83f11ad79 Don't cache CNContact. -| * 12295bd8c Don't cache CNContact. -|/ -* e2de8f6ff Merge branch 'charlesmchen/outageDetection' -|\ -| * 4ef7193dc Update cocoapods. -| * a7d712d1b Respond to CR. -| * 1eb02bfd9 Outage detection. -| * ae50dbe19 Outage detection. -| * 793a868e6 Outage detection. -| * e507256e5 Outage detection. -| * c96e2bb8b Outage detection. -| * 20b1a2606 Outage detection. -|/ -* 37e3f2685 Merge branch 'charlesmchen/unreadVsOffers_' -|\ -| * 776b5abed Handle edge cases around unread indicator & contact offers. -|/ -* e143b7ea2 Merge branch 'charlesmchen/contentTypeVsImageFormat' -|\ -| * 463a32358 Image content types. -| * 1607aa7f5 Image content types. -|/ -* c7714b09a Merge branch 'charlesmchen/databaseViewTypeChecking' -|\ -| * 4abaed0e6 Tidy up type checking in database views. -|/ -* 56dfc6ffa Merge branch 'charlesmchen/deserializationLogging' -|\ -| * b88254244 Respond to CR. -| * 2e6b4899a Remove TSRecipient. -| * 21a9ce3b2 Ensure TSRecipient can be deserialized. -| * f1708c0b3 Improve logging around deserialization failures. -|/ -* 9e2716d5a Merge branch 'charlesmchen/deregistration' -|\ -| * 4ac810097 Respond to CR. -| * 010c10cb0 Show re-registration in app settings. -| * 7f346326f Add re-registration UI. -| * bc6a4ea8d Add re-registration UI. -| * fc4763673 Improve de-registration checks in socket manager. -| * 6331fbb22 Show de-registration nag view. -| * b0646e8bf Track and persist 'is de-registered' state. -| * 985f735f1 Track and persist "is de-registered" state. -|/ -* 9110d5093 Merge branch 'charlesmchen/databaseFiles' -|\ -| * 28047abb6 Tweak database reset. -|/ -* 0b64ecf67 Respond to CR. -* 18a8efe1a Respond to CR. -* 6ca3688cd (tag: 2.27.0.0) "Bump build to 2.27.0.0." -* 32336e38e Merge tag '2.26.0.26' -|\ -| * 9b948141d (tag: 2.26.0.26, private/release/2.26.0, origin/release/2.26.0, release/2.26.0) "Bump build to 2.26.0.26." -| * d6b1c1ef0 Merge branch 'charlesmchen/autoLoadMoreOnAppear' into release/2.26.0 -| |\ -| | * b5a836bf2 (charlesmchen/autoLoadMoreOnAppear) Shared ui db connection v. auto load more. -| |/ -* | 74358b73f Merge branch 'charlesmchen/unifyCellAndAvatarSizes' -|\ \ -| * | 7e1c0102b Unify the cell and avatar sizes. -| * | 647d80d79 Unify the cell and avatar sizes. -| * | 1acf51ea5 Unify the cell and avatar sizes. -| * | 261719e53 Unify the cell and avatar sizes. -|/ / -* | 834db55ef Merge branch 'mkirk/fix-debug-sync' -|\ \ -| * | c48f2404a Fix overzealous assert -| * | a346465db tune down logging -|/ / -* | 18c1f1ef3 Merge branch 'charlesmchen/searchOversizeText' -|\ \ -| * | 40e5bcc23 Respond to CR. -| * | e8d0d9ecc Index oversize text for search. -|/ / -* | a00df83b3 Merge branch 'charlesmchen/autoSizeContactCells' -|\ \ -| * | c1e1a5269 Auto-size contact cells everywhere. -| * | dd49c6225 Auto-size contact cells everywhere. -|/ / -* | f8e785ef7 Merge tag '2.26.0.25' -|\ \ -| |/ -| * 67fe8531c (tag: 2.26.0.25) "Bump build to 2.26.0.25." -| * 72ff5d4c9 Merge branch 'mkirk/update-ui-db-to-latest' into release/2.26.0 -| |\ -| | * a91b6b35e update UI DB to latest before showing CVC -| |/ -* | 8d078e0a1 Merge branch 'charlesmchen/filterIndexText' -|\ \ -| * | c8f2201a3 Respond to CR. -| * | 527e2715d Elaborate the search tests. -| * | 5c42e4c59 Improve search query construction. -| * | 755d30254 Improve search query construction. -| * | 153f3fc0a Improve search query construction. -| * | a51e9b78b Improve search query construction. -| * | f5a5d84ed Filter search index text. -| * | b5e026575 Filter search index text. -|/ / -* | 80bada526 Update the README. -* | 6450b2510 Merge branch 'mkirk/disappear-group' -|\ \ -| * | 0a1724673 Don't use group name in message. -| * | 95b1dced1 add: messages in Book Club will disappear in 1 minute -| * | 0cf751d34 Newly added group members should have expire time -|/ / -* | a9e5d43fc Merge branch 'mkirk/disappear' -|\ \ -| * | 74b741e9d Update timer -|/ / -* | 95ac17bb7 Merge tag '2.26.0.24' -|\ \ -| |/ -| * 84fa95916 (tag: 2.26.0.24) "Bump build to 2.26.0.24." -| * b3308e4d3 Merge branch 'mkirk/callscreen-read' into release/2.26.0 -| |\ -| | * 0dec029a6 Don't mark as read when callscreen is active -| |/ -* | 4e6b84c50 Merge branch 'charlesmchen/syncMessageSendAsserts' -|\ \ -| * | f9f931fc2 Fix assert around failing sync message sends. -|/ / -* | 9be88f74f Merge branch 'mkirk/localize-socket-timeout' -|\ \ -| * | 0f38f8e3e localize socket timeout -|/ / -* | c9064ce05 Merge branch 'charlesmchen/doubleScroll' -|\ \ -| * | f0e37ff3f Avoid double-scrolling. -|/ / -* | c0a521192 Merge branch 'charlesmchen/updateSearchResults' -|\ \ -| * | 2db4c96a1 Respond to CR. -| * | 3c50269db Debounce search result updates. -| * | 91cc902b1 Update search results. -|/ / -* | e7fc9438c Merge branch 'charlesmchen/sskLogging' -|\ \ -| * | 428968564 Update cocoapods. -| * | c8fee4efa Add swift logging to SSK. -|/ / -* | ef0f92616 Merge branch 'charlesmchen/websocketLogging' -|\ \ -| * | d5c738af2 Clean up websocket logging. -|/ / -* | 8ebb10b90 Merge branch 'charlesmchen/styleSearchResults_' -|\ \ -| * | 44b23d44f Respond to CR. -| * | 99677899b Respond to CR. -| * | f0c1805de Strip snippet formatting. -| * | 31443b568 Clean up ahead of PR. -| * | 9639d3cba Clean up ahead of PR. -| * | 3f9f2abcd Style the search results. -| * | f4a559156 Style the search results. -|/ / -* | 5fec9b7c1 Merge branch 'charlesmchen/contactChangesVsAccess' -|\ \ -| * | 646073c92 Check contacts access when notified of contacts changes. -|/ / -* | 27b612554 Merge branch 'charlesmchen/searchResultsOrdering' -|\ \ -| * | ebc5356a9 Respond to CR. -| * | 758913f95 Respond to CR. -| * | a4aba325d Order the search results. -| * | 4abd3f58c Order the search results. -| * | 37d3dfdfb Merge tag '2.26.0.23' -| |\ \ -| | |/ -| | * 7539d34ed (tag: 2.26.0.23) "Bump build to 2.26.0.23." -| | * 971a69e72 Update l10n strings. -| | * 037ca4bcb Merge branch 'mkirk/call-logging' into release/2.26.0 -| | |\ -| | | * 8c88382f3 less call logging -| | |/ -| | * df7c00b7a Merge branch 'mkirk/fix-freeze-after-swipe' into release/2.26.0 -| | |\ -| | | * 72e4de095 Fix unresponsive interface after swipe on root VC -| | |/ -| * | 7bb93e265 Merge branch 'mkirk/fts-sin-country-code' -| |\ \ -| | * | dff8d7bf9 Moving code around -| | * | f57a5dbc7 Match searches for national number format -| | * | d423d3487 (origin/mkirk/fixup-tests) Disable swift optimizations for tests -| | * | c4b02a0ee fix tests - empty contact threads are intentionally excluded -| | * | bcbe5901c cleanup test code -| |/ / -| * | 09138a1e0 Merge branch 'charlesmchen/openSearchResultMessage' -| |\ \ -| | * | 8164b893a Respond to CR. -| | * | 999e8c8e3 Respond to CR. -| | * | 13e9f11b4 Open message search results. -| | * | 27b6a5e5b Open message search results. -| |/ / -| * | 00c2d47a9 fix typo in TRANSLATIONS doc -| * | ec7c09280 Merge branch 'oscarmv/RemoveAMRSupport' -| |\ \ -| | * | 51a984114 https://github.com/signalapp/Signal-iOS/issues/3455: Treat AMR files as generic attachments (AVFoundation doesn't support playback) -| |/ / -| * | 970148dd2 Update translations doc -| * | 741bc9d1a Merge branch 'mkirk/fts-no-results' -| |\ \ -| | * | 549342c70 Show empty results text -| | * | 98983ac8e Localize search bar -| | * | ecdaad06f Handle no results -| |/ / -| * | 91af7d385 Revert "Disable contact sharing." -| * | ade8dcd6a Merge tag '2.26.0.22' -| |\ \ -| | |/ -| | * 0eb653897 (tag: 2.26.0.22) "Bump build to 2.26.0.22." -| | * 7e9d2b00e Merge branch 'charlesmchen/initialScrollState' into release/2.26.0 -| | |\ -| | | * bb266d03e (charlesmchen/initialScrollState) Preserve default scroll state until conversation view is presented. -| | |/ -| | * b61838006 Merge branch 'charlesmchen/saeContextDefaultApplicationState' into release/2.26.0 -| | |\ -| | | * 0ad9e6cac (charlesmchen/saeContextDefaultApplicationState) Default share app context's default application state to active. -| | |/ -| * | ecf9a5689 Merge branch 'mkirk/fts-contacts' -| |\ \ -| | * | fff847415 adapt to rebase conflicts -| | * | f415827da Contact search results -| |/ / -| * | 42263b795 Merge branch 'charlesmchen/searchResultsNavigation' -| |\ \ -| | * | d1a46e596 Respond to CR. -| | * | 897f5b86a Open search results. -| | * | 6b49bb5e1 Open search results. -| |/ / -| * | f118066b3 Merge branch 'mkirk/fts-search-results-controller' -| |\ \ -| | * | 729befa5c CR: Cap max search results -| | * | 6924045d6 CR: rename Chat -> Conversation for consistency -| | * | b3705196b remove unused code/comments -| | * | 0f7dcccd5 Use search results controller -| | * | 21788f5f9 Avatar, label fonts, resignFirstResponder on scroll -| | * | e6b913b13 Fix layout on iOS10 -| | * | 13c43c252 search groups by member name, cleanup tests -| | * | 6b43199ba Full text search pods changes -| | * | 3a03c4f74 WIP: message indexing -| | * | b00e5a4fd Fuzzier search matching -| | * | f360bcfd3 Less confusing class names -| | * | a9e2834d9 WIP: FTS - rudimentary show results -| | * | ffea3a020 WIP: FTS - wired up Search VC -| | * | 429af7854 WIP: Full Text Search -| | * | a6200a560 update layout tests -| |/ / -| * | 1db1d76d9 Merge branch 'mkirk/fix-build-warnings' -| |\ \ -| | |/ -| |/| -| | * 7df158120 Fix build warnings: mark initWithCoder as designated. -| * | 28f71ff6e (tag: 2.26.0.21) "Bump build to 2.26.0.21." -| * | afc2cabe9 Merge remote-tracking branch 'origin/hotfix/2.25.3' -| |\ \ -| | |/ -| |/| -| | * 16cee92ca (tag: 2.25.3.0, origin/hotfix/2.25.3, hotfix/2.25.3) Suppress legal links. -| | * 7cc46a06f Rebuild finder index. -| | * 6da37da42 "Bump build to 2.25.3.0." -| * | 1a3e4c750 Merge branch 'charlesmchen/riCheckIgnores' -| |\ \ -| | * | d8c0f6756 (charlesmchen/riCheckIgnores) Add list of tags to ignore to RI check script. -| |/ / -| * | 348642ebd (tag: 2.26.0.20) "Bump build to 2.26.0.20." -| * | aa8805091 Merge branch 'charlesmchen/suppressLegalLinks' -| |\ \ -| | * | 0dcde9516 (origin/charlesmchen/suppressLegalLinks, charlesmchen/suppressLegalLinks) Suppress legal links. -| |/ / -| * | ec50c9f40 (tag: 2.26.0.19) "Bump build to 2.26.0.19." -| * | 626573a8a Revert "Revert "Disable contact sharing."" -| * | 5b3306724 (tag: 2.26.0.18) sync latest translations -| * | 10c6ad110 "Bump build to 2.26.0.18." -| * | 25becb43b track ruby version -| * | 28cb6575f Better voip-while-locked copy -| * | 05482c086 (tag: 2.26.0.17) "Bump build to 2.26.0.17." -| * | abfdca65c Merge branch 'charlesmchen/callVsBackground' -| |\ \ -| | * | b59140cb3 (origin/charlesmchen/callVsBackground) Revert some of the socket sending logging. -| | * | 31d8db57e "Bump build to 2.26.0.16." -| | * | 3fe63726e Improve logging around socket messages. -| | * | 53dac3282 "Bump build to 2.26.0.15." -| | * | e7ca98fcf Improve logging around socket messages. -| |/ / -| * | 6243db7d0 (tag: 2.26.0.14) "Bump build to 2.26.0.14." -| * | d17c3906e Disable CloudKit; leave iCloud capability enabled for "iCloud documents" service used by document picker. -| * | 4122e59ce Revert "Disable iCloud capability." -|/ / -* | ed7d5cb59 (tag: 2.26.0.13) "Bump build to 2.26.0.13." -* | 5cf2b3905 Disable iCloud capability. -* | 0e2668235 (tag: 2.26.0.12) "Bump build to 2.26.0.12." -* | f15da251c Update l10n strings. -* | a881d57dd (charlesmchen/signalCore) Merge branch 'mkirk/fix-video-layout' -|\ \ -| * | e2eb772ff Fix layout for iOS9,10 -|/ / -* | 7ebad71a7 Merge branch 'mkirk/voip-notice' -|\ \ -| * | cd298c72c notify when receiving voip before first unlock -|/ / -* | c1afbcca4 (tag: 2.26.0.11) "Bump build to 2.26.0.11." -* | 8b3543929 Merge branch 'charlesmchen/reduceJSQ' -|\ \ -| * | 19c9e226f Respond to CR. -| * | 0c6305bfb Revert changes to l10n files. -| * | 221b81b9a Reduce usage of JSQ. -| * | 3964b78ff Reduce usage of JSQ. -|/ / -* | d3ea8582b Merge branch 'charlesmchen/missingInteractions' -|\ \ -| * | 833f6ad51 Skip missing and invalid interactions in conversation view. -| * | 2c0ba1cbd Skip missing and invalid interactions in conversation view. -|/ / -* | aa2480c9a Merge branch 'charlesmchen/registrationViewVsDynamicType' -|\ \ -| * | dc13e32e4 Don't use dynamic type in registration view... yet. -|/ / -* | c1f5d1d55 Merge branch 'charlesmchen/moreWarnings' -|\ \ -| * | 6bc145ce3 Fix more build warnings. -|/ / -* | 97777ffeb (tag: 2.26.0.10) "Bump build to 2.26.0.10." -* | 630e758fb Update l10n strings. -* | 2fc47893d Update l10n strings. -* | aa79b7044 Merge branch 'mkirk/shared-ui-db' -|\ \ -| * | 9aafd8997 Remove unused synthesized ivars -| * | ae1d82be8 Fix: input toolbar disappears when tapping media while edit menu is present -| * | e6c659d0f remove incorrect comment -| * | 6e6a7446d Use global readWrite connection -| * | 468f7524e Revert "separate read/write db connections" -| * | 00f8ea4ff Use a single ui connection to share cache. -| * | ddd39fcd3 separate read/write db connections -| * | d9172cccb Measure time to display -|/ / -* | 5da01c31a Merge branch 'mkirk/update-openssl' -|\ \ -| * | 51747deeb update openssl -|/ / -* | 5f66e1b0f Merge branch 'charlesmchen/buildWarnings' -|\ \ -| * | 6579857a4 Respond to CR. -| * | 879b9d4c7 Respond to CR. -| * | 6f0c1a975 Fix build warnings. -| * | 9a08afae2 Fix build warnings. -| * | 3cd6a33aa Fix build warnings. -|/ / -* | fae57008f Merge branch 'charlesmchen/conversationViewFirstResponderVsPresentedView' -|\ \ -| * | 5ed22ada7 Respond to CR. -| * | e4f7995e4 Ensure conversation view is first responder before presenting another view. -|/ / -* | 5ee33aca7 Merge branch 'charlesmchen/longGroupNameLabels' -|\ \ -| * | 23e2d971e Handle layout of long group name labels. -|/ / -* | b030bfb5b Fix constant in group invite by text warning. -* | d0ca160df Merge branch 'charlesmchen/backgroundCrashes' -|\ \ -| * | 40729dbdd Use background task while downloading profile avatar. -|/ / -* | 58ee518b2 Merge branch 'charlesmchen/callStateEdgeCases' -|\ \ -| * | ed19949d6 Respond to CR. -| * | e949d8156 Fix more call state edge cases. -| * | b2f884b88 Fix call state edge cases. -|/ / -* | 93a4502ee Merge branch 'oscarmv/EmptyHomeViewMargins' -|\ \ -| * | 39e12e1a6 Ensure that home view label wraps by word. -| * | 69b527254 More code review polish. -| * | 4b98352a3 Changes suggested by code review. Added iPhone 4 screen size to iPhoneX test so Signal doesn't blow up in iPad's iPhone compatibility mode. -| * | eedaea7b2 Fixed leading/trailing margins for empty home view label. -|/ / -* | 4fd3cf41c Merge branch 'charlesmchen/contactsPickerSort' -|\ \ -| * | 0498ceb82 Respond to CR. -| * | 1a2d10d2c Fix ordering of contacts picker. -|/ / -* | bef2e7b5c (tag: 2.26.0.9) Update l10n strings. -* | dea173606 "Bump build to 2.26.0.9." -* | 3385e478e Merge branch 'charlesmchen/groupTextWarning' -|\ \ -| * | b7b7a9a84 Respond to CR. -| * | b80d9ddbf Add warning before sending group message invites. -|/ / -* | eabcfbfa2 Merge branch 'charlesmchen/reportedApplicationState' -|\ \ -| * | 9ee572fb2 Respond to CR. -| * | fefc9843b Modify views to observe changes when active, not just foreground. -| * | 812210a63 Modify views to observe changes when active, not just foreground. -| * | d62725d3b Add reported application state. -|/ / -* | 1de5a7b55 Merge branch 'charlesmchen/iRateVsDead10cc2' -|\ \ -| * | f2fc2b900 Avoid 0xdead10cc crashes in iRate. -|/ / -* | fe1277440 Merge branch 'mkirk/loadForTextDisplay' -|\ \ -| * | aa0a31c25 Reduce viewWillAppear by ~5% by optimizing loadForTextDisplay -|/ / -* | 1cad81ee4 Merge branch 'mkirk/load-less-initially' -|\ \ -| * | 97324eaae Load less messages initially -|/ / -* | 9a731027a Merge branch 'mkirk/ignore-adhoc-tags' -|\ \ -| * | ab2ecf2f2 make failure more obvious -| * | eca2af03b Ignore adhoc tags in reverse_integration_check -|/ / -* | df6dbd571 Update cocoapods. -* | ad8a71356 Merge tag '2.25.2.4' -|\ \ -| |/ -| * 382c7333e (tag: 2.25.2.4, hotfix/2.25.2) "Bump build to 2.25.2.4." -| * 5361cd3f2 Fix dismissal issue in invite flow. -| * 9d5ce8474 (tag: 2.25.2.3) "Bump build to 2.25.2.3." -| * 3631935bb Update l10n strings. -| * 2b94de5d2 (tag: 2.25.2.2) "Bump build to 2.25.2.2." -| * 833c35f43 Merge branch 'charlesmchen/inviteFlow' into hotfix/2.25.2 -| |\ -| | * eecc823d8 (charlesmchen/inviteFlow) Fix invite flow. -| | * 63b545b34 Fix invite flow. -| |/ -| * d754228fd (tag: 2.25.2.1) "Bump build to 2.25.2.1." -| * 2ed80eb2d Update cocoapods. -| * 90f068119 (tag: 2.25.2.0) Update legal URL. -* | 2230f01d4 Merge branch 'mkirk/avoid-double-layout' -|\ \ -| * | 4f520646c Avoid double layout in conversation view; but carefully. -| * | 273063e0a ConversationView first load avoids redundant layout -|/ / -* | 82d13f551 (tag: 2.26.0.8) "Bump build to 2.26.0.8." -* | bcd9bd422 "Bump build to 2.26.0.7." -* | f07cb110b "Bump build to 2.26.0.6." -* | f1e8f14a9 Update l10n strings. -* | 0152381fc Update l10n strings. -* | 3d08f1fba Merge branch 'charlesmchen/callNavigationAnimations' -|\ \ -| * | 40879461b Suppress animations in nav bar around call window. -|/ / -* | e142aa43e Merge branch 'charlesmchen/sendWebSocketFailureBodies' -|\ \ -| * | 61ec865b6 Respond to CR. -| * | 4342b04bd Include response data in 'request over websocket' failures. -|/ / -* | 43848a8fe Merge branch 'charlesmchen/contactsAccessRevoked' -|\ \ -| * | 5e166c238 Respond to CR. -| * | 01cf2fc1b Clear the contacts cache if access to the system contacts is revoked. -|/ / -* | 295f720f9 Merge branch 'charlesmchen/swift4' -|\ \ -| * | f7abcc906 Respond to CR. -| * | 62273a60a Respond to CR. -| * | caad6f796 Clean up ahead of PR. -| * | f63d25a17 Migrate to Swift 4. -| * | 4d8c76478 Migrate to Swift 4. -| * | b2b62880c Migrate to Swift 4. -| * | 77b72b6b0 Migrate to Swift 4. -| * | da5ae63bb Migrate to Swift 4. -| * | 28e26e1f7 Migrate to Swift 4. -| * | 916d55c55 Migrate to Swift 4. -| * | 28f7142a5 Auto-migration to Swift 4. -| * | 6b39f73e6 Fix tests. -|/ / -* | 8063886a4 Merge branch 'charlesmchen/callViewButtonsVsAnimations' -|\ \ -| * | 40ef28795 Avoid spurious animation in call view buttons. -|/ / -* | 19ebc0f86 Merge branch 'charlesmchen/updateCocoapods' -|\ \ -| * | 003740d09 Update cocoapods. -|/ / -* | 6363d3109 Merge branch 'charlesmchen/canSendRequests' -|\ \ -| * | 4d498563e Unify the socket manager's 'can send requests' logic. -|/ / -* | c71081c87 Respond to CR. -* | dc4ad2b6d Merge branch 'charlesmchen/limitPartialContactFetchFix' -|\ \ -| * | bbf7ee451 (charlesmchen/limitPartialContactFetchFix) Limit the scope of the 'incomplete contacts fetch' fix. -|/ / -* | 146685232 Revert "Add temporary verbose logging around message creation." -* | 5f593bd73 Revert "Add temporary verbose logging around message creation." -* | 0aa830603 Revert "Add temporary verbose logging around message creation." -* | cc4f82cbf (tag: 2.26.0.5) "Bump build to 2.26.0.5." -* | 5b0d806a6 Add temporary verbose logging around message creation. -* | e8bb55a51 (tag: 2.26.0.4) "Bump build to 2.26.0.4." -* | f26ad5cd3 Add temporary verbose logging around message creation. -* | 0d3ba5ac2 (tag: 2.26.0.3) "Bump build to 2.26.0.3." -* | 7200a8dc4 Add temporary verbose logging around message creation. -* | c4fa6a1bb Merge branch 'charlesmchen/saeFixes' -|\ \ -| * | 21b54bee4 Fix breakage from recents changes in share extension. -|/ / -* | f87b71514 Merge branch 'charlesmchen/pccDeinit' -|\ \ -| * | 2a4ecd42c Fix crashes while deallocating PeerConnectionClient. -| * | 86e038436 Fix crashes while deallocating PeerConnectionClient. -| * | 8d9c81156 Fix crashes while deallocating PeerConnectionClient. -| * | fff9f74a0 Fix crashes while deallocating PeerConnectionClient. -|/ / -* | 08affb440 Merge branch 'hotfix/2.25.2' -|\ \ -| |/ -| * bb44a8bb5 Merge branch 'mkirk/policy-links' into hotfix/2.25.2 -| |\ -| | * 9a34c6804 policy links -| |/ -| * 8cb444088 "Bump build to 2.25.2.0." -| * 4e0ce3dbe (tag: 2.25.1.1) "Bump build to 2.25.1.1." -| * 54cc2142a Merge branch 'mkirk/start-migrated-disappearing-timers' into hotfix/2.25.1 -| |\ -| | * 84776f275 Start timers for migrated messages -| |/ -| * 3a2efb62a (tag: 2.25.1.0) Merge branch 'charlesmchen/legacyOutgoingMessageState' into hotfix/2.25.1 -| |\ -| | * 1343e4bc1 Preserve legacy outgoing message state; special case contact thread messages. -| |/ -| * 8abc3a8c4 "Bump build to 2.25.1.0." -* | 89c15815c Merge branch 'charlesmchen/callViewBackButtonChanges' -|\ \ -| * | fbd03a3fd Apply design for call view back button. -|/ / -* | e0db39b30 Merge branch 'mkirk/time-out-call' -|\ \ -| * | caa9e3ca6 Show missed call when call times out -|/ / -* | c9f4b34d6 Merge branch 'mkirk/resize-call-navbar' -|\ \ -| * | fc34a0643 CR: annotate device constants -| * | 36ee6af62 respond to CR -| * | b8707b6fa WIP: call view changes -| * | 20424d9a7 remove debug code, reorder for clarity -| * | fe62a6ac9 CNContactController needs to be presented in a navcontroller with a translucent navbar. -| * | 2709a91b5 Fixup attachment approval vis-a-vis call banner -| * | 4f8010023 Tapping on status bar returns to call -| * | 4c9808d1a Fix iPhoneX layout show status bar above call banner -| * | 3383c5e80 Fixup for iPhoneX -| * | 778e11c2c cleanup ahead of PR -| * | 7ad5f1544 Restore cancleable back gesture for those VC's that use it -| * | 49c652ad1 Comment cleanup -| * | 1b6071675 Stop worrying about notification order by using delegate pattern -| * | d9d0227ce Align search bar to safe area insets -| * | 319a6ff76 fixup behavior on iOS10 -| * | 6c7af671b call banner above status bar for now -| * | 29d08545e Use OWSNavigationController instead of UINavigationController -| * | 33eb4c38c Centralize translucency configuration -| * | 12c98f434 cleanup and move to OWSNavigationController -| * | a2b179326 initial render is wrong, but settles somewhere nice -| * | 3a9391f4f notes on what didn't work -| * | 4dbd14ac4 WIP navbar resize -| * | 0e87cbe7a WIP navbar resize -| * | ffe17a3fc add guard to avoid redundant show, fix logic in existing guard when hiding. -| * | 2258e18d3 rename for clarity -| * | 91cd1af3f Extract ReturnToCallViewController -| * | a7252544b WIP: custom navbar -| * | 772af10e5 Resizing call banner window -| * | e62fe87b0 show status bar *above* call window -| * | 94323baba tmp - mute hides callscreen -|/ / -* | b5c290afd Merge branch 'michaelkirk/requestIdProtos' -|\ \ -| * | 966b1ac84 Treat `id` as reserved word, use consistent setter style -|/ / -* | a5fd119c1 (tag: 2.26.0.2) "Bump build to 2.26.0.2." -* | fedb5d938 Merge branch 'charlesmchen/callTerminationBug' -|\ \ -| * | a722bcde7 Fix call termination reference. -|/ / -* | 9eb17c3fd (tag: 2.26.0.1) "Bump build to 2.26.0.1." -* | 1afaa9d65 Merge branch 'charlesmchen/websocketProfileGets' -|\ \ -| * | bb19505c6 Make profile gets over websocket. -|/ / -* | 69b6eb9f4 Merge branch 'charlesmchen/weakPeerConnectionClient' -|\ \ -| * | bfb87582f Respond to CR. -| * | 735b4e07b Respond to CR. -| * | 918abb02a Remove capture of self. -| * | 9c0c87a8c Remove capture of self. -| * | 7eab0569b PeerConnectionClient thread safety. -| * | 078da69ee PeerConnectionClient thread safety. -| * | 9075a12ac PeerConnectionClient thread safety. -| * | c2f1a12d9 PeerConnectionClient thread safety. -| * | 88c2ff26e PeerConnectionClient thread safety. -| * | e63a7f8fb PeerConnectionClient thread safety. -| * | c3e8fde24 PeerConnectionClient thread safety. -| * | 1a0347b78 PeerConnectionClient thread safety. -| * | 729769afa PeerConnectionClient thread safety. -| * | a4a5e9953 PeerConnectionClient thread safety. -|/ / -* | d4fe67126 Respond to CR. -* | ebd24feff Merge branch 'charlesmchen/websocketRequests' -|\ \ -| * | 60d472c9b Update cocoapods. -| * | 0a4168437 Respond to CR. -| * | dc36ae134 Respond to CR. -| * | 1a441cc40 Respond to CR. -| * | 6a1bb3f04 Add web sockets protos to proto make file. -| * | b50561a5b Use websocket for sends. -| * | 5ff984ab1 Use websocket for sends. -| * | fa36f2fb1 Use websocket for sends. -| * | 8a76e778b Use websocket for sends. -| * | 5f1682dea Use websocket for sends. -|/ / -* | fb3efe364 Update ISSUE_TEMPLATE.md -* | 57008b7ad Update ISSUE_TEMPLATE.md -* | f33a845f2 Update ISSUE_TEMPLATE.md -* | fbfa5e6de Update MAINTAINING.md -* | 5d312220a Update the contribution guidelines. -* | 9155a82b6 "Bump build to 2.26.0.0." -* | d3d4157c2 Merge branch 'charlesmchen/callLifecycleEdgeCases' -|\ \ -| * | 1d8c64234 Respond to CR. -| * | a5c42ecca Clean up ahead of CR. -| * | f68f3cc53 Call lifecycle edge cases. -| * | 3967a5ab0 Call lifecycle edge cases. -|/ / -* | 6e0d92e03 Revert "Disable contact sharing." -|/ -* ff4c58cd6 (tag: 2.25.0.28) "Bump build to 2.25.0.28." -* efb0769c6 Disable contact sharing. -* 1ce304d05 (tag: 2.25.0.27) "Bump build to 2.25.0.27." -* a7aaa7f6b Merge branch 'charlesmchen/groupAvatarUpdates' -|\ -| * e2d9c1187 Fix "group avatar doesn't update after local change." -|/ -* 2f8b5b8ea Move app state check to main thread. -* 7254d9260 Revert "Disable contact sharing." -* 0b6b80fea (tag: 2.25.0.26) "Bump build to 2.25.0.26." -* cb603d0ba Disable contact sharing. -* 4d2075794 (tag: 2.25.0.25) "Bump build to 2.25.0.25." -* cc1ccb7f9 Update l10n strings. -* be5a80e65 Merge branch 'mkirk/disappearing-10deadcc' -|\ -| * c0ddcc791 Only clean up messages while active -|/ -* 4080545d8 Merge branch 'mkirk/lowercase-contact-field-labels' -|\ -| * b1e06217b Consistently lower-case contact field headers -|/ -* a48cc8d65 Merge branch 'charlesmchen/normalizeImageColorSpace' -|\ -| * 0620cb60d Normalize image colorspace. -|/ -* 946240fb6 Merge branch 'charlesmchen/readVsVisible2' -|\ -| * 692d0a757 Don't mark messages as read if conversation view isn't 100% visible. -| * 78de7a10f Don't mark messages as read if conversation view isn't 100% visible. -|/ -* 18f3bf535 Merge branch 'mkirk/phone-number-display-name' -|\ -| * c72d45dc9 Fall back to phone number for picker cell display name -|/ -* 8d1d62b61 Merge branch 'mkirk/profile-avatar-in-contact-picker' -|\ -| * 2098ec570 Contact picker uses profile pic, when available. -|/ -* 87a25804d Merge branch 'mkirk/fix-send-with-no-number' -|\ -| * f2750d18c Don't send empty contact card with just avatar -|/ -* ddcca73aa Merge branch 'mkirk/fix-localizations' -|\ -| * af8ddf7bf Use raw text when localization fails -|/ -* 7ccb2df33 Merge branch 'charlesmchen/contactShareAvatar' -|\ -| * db1c8fd9f Respond to CR. -| * c800ae381 Make contact share "bubble/card" reflect share contents. -| * f436fc19c Make contact share "bubble/card" reflect share contents. -|/ -* 3cdce13b4 Merge branch 'charlesmchen/sortGroupMembers' -|\ -| * 2edabdbba Sort group members. -|/ -* cbc27f1c3 Revert "Disable contact sharing." -* 762a03dac (tag: 2.25.0.24) "Bump build to 2.25.0.24." -* 2b6b8c2f6 Disable contact sharing. -* 7b7435c3a (tag: 2.25.0.23) "Bump build to 2.25.0.23." -* 73ea9d245 Update l10n strings. -* fb3790ed6 Merge branch 'charlesmchen/asyncNetworkRequests' -|\ -| * 1a3737d5c Respond to CR. -| * 530983c16 Build & enqueue network requests async. -|/ -* 7a37b3d0b Merge branch 'charlesmchen/readVsVisible' -|\ -| * f6106512d Only mark messages read in conversation view if visible. -|/ -* e908413c1 Merge branch 'charlesmchen/peerConnectionClientDelegateCleanup' -|\ -| * 157f7617c Respond to CR. -| * 3d5cbb73f Rework cleanup of peer connection client delegates. -|/ -* 547605885 Merge branch 'mkirk/localize-all-phone-types' -|\ -| * f652ecef9 localize _Main_ and other CN label types -|/ -* a62e86c7a Revert "Disable contact sharing." -* 3f5d8aa9b (tag: 2.25.0.22) "Bump build to 2.25.0.22." -* e27af7a66 Disable contact sharing. -* 5d4b34504 Merge branch 'mkirk/return-navigation-bars' -|\ -| * c3274f4e7 Fix navbar after using message button in contact card -|/ -* 986e3e092 Revert "Disable contact sharing." -* 398865446 (tag: 2.25.0.21) "Bump build to 2.25.0.21." -* e138c73bd Disable contact sharing. -* 443b3c288 Merge branch 'charlesmchen/profileKeyProtos' -|\ -| * b74f545a6 Fix profile key protos. -|/ -* 4ba0fde3e Merge branch 'mkirk/mark-as-read-fix' -|\ -| * 54f737303 Clean up logging, start messages timer regardless of current configuration -|/ -* 68d70da19 (tag: 2.25.0.20) "Bump build to 2.25.0.20." -* c14a021ae Update l10n strings. -* 127224ad2 Merge branch 'mkirk/resume-read-timer-on-activation' -|\ -| * 30cef1f08 start readtimer whenever we become active -|/ -* 90289bbf7 Merge branch 'mkirk/nav-bar-style' -|\ -| * 117d7319d Add contact modally and restore navbar style when dismssing contacts -|/ -* 4949ade27 Revert "Disable contact sharing." -* a376de01e (tag: 2.25.0.19, origin/release/2.25.0) "Bump build to 2.25.0.19." -* bf205c9df Merge branch 'charlesmchen/unregisteredUsers' -|\ -| * e6dceffdb Respond to CR. -| * 5c7b98e5c Improve handling of unregistered users. -|/ -* d81e40069 Update l10n strings. -* e8b41789d Disable contact sharing. -* 51da7ebdf (tag: 2.25.0.18) "Bump build to 2.25.0.18." -* 115e6b4c4 Merge branch 'charlesmchen/sendToSentMarkAsSent' -|\ -| * 8489c55fd Mark send-to-self as sent. -|/ -* 9fbcd790f Merge branch 'mkirk/fix-cancel-add-crash' -|\ -| * 704a6f55a Fix crash after canceling "Add New Contact" -|/ -* ba95034ce Merge branch 'charlesmchen/avatarSeed' -|\ -| * 152e1d798 Respond to CR. -| * ca09d00e2 Use signal id as avatar color seed if possible. -|/ -* 6ccce6754 Merge branch 'charlesmchen/loadViewVsScreenLock' -|\ -| * edabe5067 Respond to CR. -| * a26cba3de Don't show screen block until app is ready. -|/ -* 726da0ca9 Merge branch 'charlesmchen/homeViewFixes' -|\ -| * aa4345f9c Fix edge cases in home view. -|/ -* 53fb8787f Merge branch 'charlesmchen/caseInsensitiveContactSort' -|\ -| * 0b488f1a6 Use case-insensitive comparison when sorting contacts. -|/ -* ed872beda Merge branch 'charlesmchen/noEcho' -|\ -| * 9c2f61913 Don't echo messages sent to self 1:1. -|/ -* ad6908174 (tag: 2.25.0.17) "Bump build to 2.25.0.17." -* 6b643a0c1 Avoid spurious badge animations. -* 2c80866f8 (tag: 2.25.0.16) "Bump build to 2.25.0.16." -* 867b3484d Update l10n strings. -* ca03203b9 Merge branch 'charlesmchen/debugNotifications2' -|\ -| * 81a40909f Respond to CR. -| * 993600363 Respond to CR. -| * 9a4889c4f Simplify debug notifications. -| * 1a170ba48 Simplify debug notifications. -|/ -* b9c852378 Merge branch 'charlesmchen/saeLiveImageCrash' -|\ -| * 73206c08a Respond to CR. -| * 56b91ddeb Clean up ahead of PR. -| * b62d6900d Fix crash converting images in SAE. -|/ -* 744a3b8be (tag: 2.25.0.15) "Bump build to 2.25.0.15." -* 3579621db Improve logging around home view selection. -* f55012e67 Merge branch 'charlesmchen/debugNotifications' -|\ -| * 4a4882ebe (charlesmchen/debugNotifications) Add debug notification. -|/ -* 408b8d01c Merge branch 'charlesmchen/multipleLocalNotifications' -|\ -| * a3c853066 (charlesmchen/multipleLocalNotifications) Respond to CR. -| * f95151ac8 Don't present multiple converastion views ever. -| * 940161e62 Don't process multiple local notifications. -|/ -* b751a3253 (tag: 2.25.0.14) "Bump build to 2.25.0.14." -* faf15e3c8 Update l10n strings. -* ccc64e62b Fix l10n strings. -* 6ab0d81c3 Merge branch 'mkirk/contact-reply' -|\ -| * 2cc3eabdb quote reply to contact share (no avatar) -|/ -* 742492dd3 remove redundant protocol definition -* 5a8000187 Merge branch 'charlesmchen/mergeOrganizationName' -|\ -| * 8cdb75d52 (charlesmchen/mergeOrganizationName) Respond to CR. -| * 8337c3bd6 Refine contact merging. -|/ -* 8eef940ba Merge branch 'charlesmchen/addToContactsAlways' -|\ -| * c05c1ac87 (charlesmchen/addToContactsAlways) Always show 'add to contacts' button. -|/ -* 52b502138 Merge branch 'mkirk/show-avatar-in-approval' -|\ -| * d1c33921b Show avatar in contact approval view -|/ -* 46ce2d6f8 Merge branch 'charlesmchen/shareContactSinglePresentation' -|\ -| * acdc51ba3 Respond to CR. -| * 37b8b368a Show "share contact" flow in single presented navigation controller. -|/ -* 0f535217a Merge branch 'charlesmchen/contactViewStatusBar' -|\ -| * cb7f28ed3 Use dark status bar in contact view. -|/ -* 61343f665 Merge branch 'charlesmchen/contactNames_' -|\ -| * 646049366 Surface organization name in contact view. -| * aa7cc4633 Rework contact names. -|/ -* 6ecaf01b9 Merge branch 'mkirk/contact-sharing-via-sae' -|\ -| * 407ec997a Add comment per CR -| * 763131522 Remove unused code -| * a16040f19 Fix avatar sending in SAE -| * adabf0273 Fix contact sharing (Avatar TODO) -|/ -* e52045199 Merge branch 'mkirk/cleanup-share-avatars' -|\ -| * ed2945126 Remove contact share avatars upon message deletion -|/ -* efa3c81f6 Merge branch 'mkirk/contact-merging' -|\ -| * c15fea4ec merge avatar with existing -| * 95b93115f Code formatting -| * bf37f4116 Move CNContact logic into our system contact adapter -| * 0c469764f re-use contact picker for "add to existing" -| * 609746abe clarify naming -|/ -* 69aeb041b Merge branch 'mkirk/codecleanup-contact-sync' -|\ -| * b1f332451 cleanup contact syncing -|/ -* d0d9d5456 (tag: 2.25.0.13) "Bump build to 2.25.0.13." -* 31bea605f Merge branch 'charlesmchen/contactViewActions' -|\ -| * 65a516685 Fix l10n strings. -| * b4d24f1c7 Refine field actions in contact view. -|/ -* e04e063fc Merge branch 'charlesmchen/contactShareErrors' -|\ -| * 3bb9e922d Surface contact share errors to user. -|/ -* dad3d2b51 Merge branch 'charlesmchen/contactShareAssets2' -|\ -| * 4079cdb60 Apply more contact share assets. -|/ -* b7946fa90 Merge branch 'charlesmchen/contactShareDynamicTypeRTL' -|\ -| * 0b8d9991e Respond to CR. -| * f77731eb7 Fix h margins in "edit contact share name" view. -| * ff3524fb0 Improve contact share message bubble layout with large dynamic type sizes. -|/ -* b4ef8afbf (tag: 2.25.0.12) "Bump build to 2.25.0.12." -* 6d5263689 Merge branch 'mkirk/return-navbar' -|\ -| * ad4e4b0c4 return navbar after tapping message/call buttons -|/ -* f6c5141cb (tag: 2.25.0.11) "Bump build to 2.25.0.11." -* e5258770a Merge branch 'mkirk/cleanup-contact-share-view-helper' -|\ -| * 42109593a Remove `fromViewController` state from ContactShareViewHelper -| * 77bbbad70 Remove `contactShare` state from ContactShareViewHelper -| * 0265787dd (tag: 2.25.0.10) "Bump build to 2.25.0.10." -| * 37da52413 Fix contact share protos: display name, organization name. -| * 0b90c094a (tag: 2.25.0.9) "Bump build to 2.25.0.9." -| * 946cc114e Update l10n strings. -|/ -* 6c84f6eef Merge branch 'charlesmchen/contactActionsAndPhoneNumberParsing' -|\ -| * c2adf624e Respond to CR. -| * 44ceee584 Add contact share actions to conversation view and improve phone number parsing. -|/ -* 445c10a7e Merge branch 'mkirk/first-responder' -|\ -| * 7e22d9e90 Prevent input toolbar from appearing over camera view, contact view or actionsheet -| * 353abfc13 Views presented from ConversationVC must become first responder. -| * 41aa7eafe makeKeyAndVisible restores first responder, so no need to track it ourselves. -|/ -* 882098e9c Merge branch 'charlesmchen/contactShareAssets' -|\ -| * 01bfa8dfc Apply contact share assets. -|/ -* 5a3c37458 Merge branch 'charlesmchen/faceIDUsageDescription' -|\ -| * 9e4922402 Add usage description for Face ID. -|/ -* 4d65646dc Merge branch 'mkirk/no-reply-from-gallery' -|\ -| * fda5d6567 Avoid crash - reply only works from ConversationVC -|/ -* ac458197a Merge branch 'mkirk/fix-spurious-disabled-timer-messages' -|\ -| * 98aa05449 Avoid spurious "Disabled Disappearing Messages" -|/ -* 7ca07d61d (tag: 2.25.0.8) "Bump build to 2.25.0.8." -* e261b6fcd Merge branch 'mkirk/fix-attachment-building' -|\ -| * d3cda951e Fix/Simplify outgoing attachment proto building -|/ -* 73102a996 Merge branch 'charlesmchen/shareContactsFromShareExtension' -|\ -| * 41f4b0866 Respond to CR. -| * bd116f893 Share contacts from share extension. -|/ -* c56362cee (tag: 2.25.0.7) "Bump build to 2.25.0.7." -* d1e2fbd99 Merge branch 'charlesmchen/editContactShareView2' -|\ -| * 7f1cbd927 Respond to CR. -| * 3092e4e3f Update design of 'approve contact share' view. -| * 50c49baca Update design of 'approve contact share' view. -| * b0c4ad7f6 Apply design changes from Myles. -| * 4e0789585 Apply design changes from Myles. -| * 5f1941f6a Apply design changes from Myles. -|/ -* b7634c650 Merge branch 'mkirk/contact-share-avatars' -|\ -| * a10ae1835 respond to code review -| * 45f91ead4 Use actual avatar in ContactViewController -| * 77fc5571f Implement avatar sending -| * eb97e82d1 fixup debug UI -| * 5ba5e9826 Show downloaded contact avatar in thread -| * 48b4791b1 Download avatar attachment stream -|/ -* 8c4a6c174 Merge branch 'mkirk/no-singleton' -|\ -| * 3fdf703a6 PhoneNumberUtil is no longer a singleton -|/ -* d32545fc2 Merge branch 'mkirk/become-consistent-with-timer' -|\ -| * 9e1a3a0da Consider off/on in addition to duration when becoming consistent -|/ -* 4b6239f49 Fix build breakage. -* 5c63f7f25 Merge branch 'charlesmchen/skippedSends' -|\ -| * e7eaa7945 Handle completely skipped message sends. -|/ -* e63014ccf Merge branch 'charlesmchen/phoneParsingThreadSafety' -|\ -| * 043218fb9 Ensure thread safety in phone parsing logic. -|/ -* 4bf08280d Merge branch 'charlesmchen/editContactShareView' -|\ -| * 7c3991ebd (charlesmchen/editContactShareView) Respond to CR. -| * ba74e3857 Clean up ahead of PR. -| * 2c6f18fa6 Clean up ahead of PR. -| * 60c376452 Clean up ahead of PR. -| * fd93bf677 Clean up ahead of PR. -| * 7a9acce50 Add contact share approval view. -| * 6e18d84a1 Add contact share approval view. -| * 0c745dd98 Add contact share approval view. -|/ -* 4fcbfe0e1 Fix merge breakage. -* 8622dba39 Merge branch 'charlesmchen/contactShareDesign' -|\ -| * 1fc401d20 Respond to CR. -| * bff6c8440 Clean up ahead of PR. -| * b37588fc4 Provide default labels for custom contact fields. -| * 72102cd5f No navigation bar in Contact view, custom back button, fix scrolling. -| * 575573ef6 Let users pick recipient id for actions in contact view. -| * 1a1a043b2 Format phone numbers of contacts. -| * dcf7a0598 Use default avatars for contact shares in contact view. -| * 66989b8db Use default avatars for contact shares in conversation view. -|/ -* dbbd35f92 Merge branch 'charlesmchen/queueSystemContactFetch' -|\ -| * f9d5421ed Modify system contacts fetch to use serial queue. -| * bec5a9f42 Revert "oOnly one system contacts fetch at a time." -| * b767996db oOnly one system contacts fetch at a time. -|/ -* e1a078900 (tag: 2.25.0.6) "Bump build to 2.25.0.6." -* 00181479e Update l10n strings. -* 80b1bfacf Merge branch 'mkirk/debug-disappearing' -|\ -| * a01164e8b (private/mkirk/debug-disappearing) Add canary assert -| * ecf767ea5 canary assert -| * 1dd8c4177 Only touch messages which have been read. -| * 24f3362df ensure expirations started -| * ed3db5097 clarify naming -|/ -* 0b8daaba2 Merge branch 'mkirk/fix-info-message-ordering' -|\ -| * 242cc1138 A few lingering places were ordered with their envelope timestamp -|/ -* 3ad0b0ad6 Merge branch 'charlesmchen/sendFakeContacts' -|\ -| * 8e84f8923 Respond to CR. -| * 8dc333346 Send fake contact shares. -| * 390c0bc20 Send fake contact shares. -| * c53b2934a Send fake contact shares. -| * 612df0a02 Send fake contacts. -|/ -* d4bec2d06 Merge branch 'charlesmchen/contactSharingFeatureFlag' -|\ -| * 459101c20 Add feature flag for contact sharing. -| * f4ee68840 Add feature flag for contact sharing. -|/ -* 36abd6ab7 Merge branch 'mkirk/media-title-view' -|\ -| * b32a1d507 Fix media page title view on iOS9/10 -|/ -* ed7fe90e1 Merge branch 'charlesmchen/contactView' -|\ -| * ff6b45abe (charlesmchen/contactView) Respond to CR. -| * 1d56d56ca Clean up ahead of PR. -| * 91d54360b Add contact view. -| * fa5577eec Create contact view. -| * 2738bcbc5 Create contact view. -|/ -* 9c661b220 Merge branch 'mkirk/errant-input-toolbar' -|\ -| * e604437e2 Don't become first responder while presenting -|/ -* fff7b1196 Merge branch 'mkirk/new-loading-screen' -|\ -| * d98341697 format debug stats -| * f782ea97d Use loading screen whenever launch is slow. -|/ -* f2cc8cf9d Merge branch 'charlesmchen/contactSharePreviews' -|\ -| * 00eadd629 (charlesmchen/contactSharePreviews) Text previews for contact shares. -|/ -* 424bcbf83 Merge branch 'mkirk/contact-share' -|\ -| * 5c0c01dea (origin/mkirk/contact-share) Contact picking -|/ -* 0e858bc09 Merge branch 'charlesmchen/contactShareMessageBubble' -|\ -| * 411d5a3b4 (charlesmchen/contactShareMessageBubble) Respond to CR. -| * 783bf5b81 Clean up ahead of PR. -| * 708b44e3c Improve handling of contact display names. -| * 7e35a7e7d Sketch out rendering of contact shares in conversation view. -|/ -* 87abeb80b Merge branch 'ios-flip-camera' -|\ -| * 0ab8fc277 Proper flip asset -|/ -* 6fcbf0529 Merge branch 'mkirk/remove-assert' -|\ -| * d67a3b416 WORKS GREAT -|/ -* fff60e9bd Merge branch 'charlesmchen/contactNormalizationValidation' -|\ -| * d1f6118e6 Rework contact normalization and validation. -|/ -* d7cc7384e (tag: 2.25.0.5) "Bump build to 2.25.0.5." -* 11591416e Merge branch 'charlesmchen/contactShareModel' -|\ -| * 1520422b2 (charlesmchen/contactShareModel) Respond to CR. -| * 0316a98eb Undo renaming of contactShare property of TSMessage. -| * 147368913 Gather all contact conversion logic in OWSContacts. -| * ee9a13cdf Update cocoapods. -| * bd7c8e4a4 Add conversion methods between vcard, system contacts and ows contacts. -| * 0d8cfc540 Rename contact share class to contact. -| * 796958d87 Elaborate contact conversion. -| * e22e9a784 Populate contact share protos. -| * 757234d30 Populate contact share protos. -| * 2a63423c3 Elaborate fake contact shares. -| * c854cc3de Fix fake contact share message creation. -| * 521013a67 Fix contact share property synthesis. -| * 7490a55f6 Sketch out "contact share" model. -| * 4b8a2fa8a Sketch out "contact share" model. -| * 600574785 Update protos to reflect 'share contact'. -|/ -* 46354cdb1 Merge branch 'charlesmchen/noArchivedThreads' -|\ -| * 2fe7596e0 (charlesmchen/noArchivedThreads) Only show archived threads UI if there are archived threads. -| * 6ab48cec9 Only show archived threads UI if there are archived threads. -|/ -* f65757a1e Merge branch 'charlesmchen/outgoingMessageFixes' -|\ -| * bb9645407 More outgoing message fixes. -|/ -* f028627b4 Merge branch 'charlesmchen/systemCellMeasurement' -|\ -| * 2e06ebfe1 Fix system cell layout. -|/ -* 4d100ccb9 Merge remote-tracking branch 'origin/hotfix/2.24.1' -|\ -| * 9cdf489ac (tag: 2.24.1.0, origin/hotfix/2.24.1) Merge branch 'charlesmchen/corruptDatabaseViews' -| * c5e7b10bd Merge branch 'charlesmchen/dbMigrationsVsStorageReadiness' -| * bec7235d5 "Bump build to 2.24.1.0." -* | 7d08bef8a (tag: 2.25.0.4) "Bump build to 2.25.0.4." -* | 479c9f95a Merge branch 'charlesmchen/outgoingMessageStateFixes' -|\ \ -| * | 752bca313 (charlesmchen/outgoingMessageStateFixes) Fix glitches in outgoing messages. -|/ / -* | 2ebd2f65d Merge branch 'charlesmchen/shareContactProtos' -|\ \ -| * | 8dbe4387b (charlesmchen/shareContactProtos) Update protos to reflect 'share contact'. -|/ / -* | 0131b8de2 Update cocoapods. -* | 81ed1ac79 Merge branch 'charlesmchen/homeViewReference' -|\ \ -| * | 371718f72 (charlesmchen/homeViewReference) Fix global reference to 'inbox' home view. -|/ / -* | 91f5460a0 (tag: 2.25.0.3) "Bump build to 2.25.0.3." -* | 8ae956bba Update l10n strings. -* | afeddb3b8 Merge branch 'charlesmchen/outgoingMessageStatusFixes' -|\ \ -| * | f16e9a292 (charlesmchen/outgoingMessageStatusFixes) Fix issues in outgoing messages status changes. -| * | 5c6f9ec08 Fix issues in outgoing messages status changes. -|/ / -* | 945ab7e4a Merge branch 'mkirk/profile-pic-in-conversation' -|\ \ -| * | 45be54f7a (mkirk/profile-pic-in-conversation) Design polish for the "profile pic in conversation view" and "archived conversations in home view." -| * | b70269579 cleanup -| * | 55e19b55b Fix layout for iOS9/10 -| * | 7a1d24a9a Avatar updates when contact/profile/group photo changes -| * | b1bff7114 WIP moving to stackview backed header view in conversation view -| * | 3d766e4cf Replace ConversationHeaderView with stack view in Media Gallery -|/ / -* | 37f653a7f Merge branch 'charlesmchen/fixCallHangupCrashes' -|\ \ -| * | 28063574d (charlesmchen/fixCallHangupCrashes) Fix call hangup crashes. -|/ / -* | 802379b4b (tag: 2.25.0.2) "Bump build to 2.25.0.2." -* | 9e60a0114 Merge branch 'charlesmchen/dynamicTypeFixes' -|\ \ -| * | 251ce29a8 (charlesmchen/dynamicTypeFixes) Fix dynamic type issues in home view cells. -| * | 5a42bf0ff Fix dynamic type issues in home view cells. -| * | fb0c47aa1 Fix dynamic type issues. -|/ / -* | 023d40e23 Merge branch 'charlesmchen/nudgeDatabaseUpgradeWarning' -|\ \ -| * | 323355468 (charlesmchen/nudgeDatabaseUpgradeWarning) Show database upgrade warning while launching v2.25 or later. -|/ / -* | ec180e8b6 Merge branch 'charlesmchen/fixSyncTranscripts' -|\ \ -| * | 8f19622a8 (charlesmchen/fixSyncTranscripts) Fix sync transcripts. -|/ / -* | cf532b9cb (tag: 2.25.0.1) "Bump build to 2.25.0.1." -* | 1efbc26e2 Fix build break. -* | 789595f6c (tag: 2.25.0.0) Update l10n strings. -* | 79ccc015a Fix missing l10n strings. -* | 015a531ab "Bump build to 2.25.0.0." -* | 3291ca66c Merge branch 'charlesmchen/outgoingMessageState' -|\ \ -| * | 5773b4534 (charlesmchen/outgoingMessageState) Respond to CR. -| * | c75c3d5f9 Respond to CR. -| * | 204d37960 Respond to CR. -| * | 55916e84c Respond to CR. -| * | 4de4a4b22 Respond to CR. -| * | 594e12f23 Respond to CR. -| * | 40ac0daa9 Respond to CR. -| * | 6486b9941 Clean up ahead of PR. -| * | 4b83b4afc Rework outgoing message state. -| * | 9e6062f21 Rework outgoing message state. -| * | 9275c6781 Rework outgoing message state. -|/ / -* | 56c53cdff Merge branch 'mkirk/flip-camera' -|\ \ -| * | 1967b5d29 "Reconnecting..." fixup -| * | e5b535ccf Implement camera direction toggle -| * | 6a4aff0b9 Add flip camera button (non-functioning) -|/ / -* | 040e3b88b Merge branch 'charlesmchen/callVsText' -|\ \ -| * | baa6f2713 (charlesmchen/callVsText) Update Cocoapods. -| * | 61cd5805f Improve 'return to call' window layout. -| * | d7ae6fbbf Respond to CR. -| * | 1d94c2da7 Improve comments. -| * | 6786c7723 Update cocoapods. -| * | 882d1ac61 Clean up ahead of PR. -| * | 9e1021f1a Clean up ahead of PR. -| * | f4439f8af Present calls using window manager. -| * | 17fce2fdd Present calls using window manager. -| * | 6a8796ad0 Present calls using window manager. -| * | 7345ab2e4 Add window manager. Move call view to a separate window. -| * | 9364af9b8 Make screen block view first responder. -|/ / -* | 6ccf93e92 Merge branch 'charlesmchen/corruptDatabaseViews' -|\ \ -| * | aa35594ad (charlesmchen/corruptDatabaseViews) Respond to CR. -| * | 67f2d6608 Detect and handle corrupt database views. -| * | 1a4c01ae2 Detect and handle corrupt database views. -| * | 212891c50 Detect and handle corrupt database views. -| * | f70a45ef1 Clean up ahead of PR. -| * | 50a59c907 Detect and handle corrupt database views. -| * | d3b484482 Detect and handle corrupt database views. -|/ / -* | 66459af99 Merge branch 'mkirk/long-text-scroll-margin' -|\ \ -| * | 0dd12f96e scrollbar should be on right edge, while leaving margin between text and superview -|/ / -* | 107a1ff9c Clean up system contacts fetch. -* | d3fb5d321 Fix build break. -* | 0bead4c68 Merge branch 'charlesmchen/corruptMessageNotifications' -|\ \ -| * | 89abe79c7 Respond to CR. -| * | c5981b164 Notify users of corrupt messages. -|/ / -* | 371b247b4 Merge branch 'charlesmchen/contactsCrash' -|\ \ -| * | fa9a4c808 Simplify usage of contacts framework. -|/ / -* | 8428bd81d Merge branch 'charlesmchen/dbMigrationsVsStorageReadiness' -|\ \ -| * | 7f23dfa25 Respond to CR. -| * | eb3569d8f Don't start app version migrations until storage is ready. -| * | 2265ae08a Don't start app version migrations until storage is ready. -|/ / -* | 2c1e63391 Merge branch 'charlesmchen/archivedConversations' -|\ \ -| * | 1395a6c37 Respond to CR. -| * | e252447cf Clean up ahead of PR. -| * | 21ab670fc Clean up ahead of PR. -| * | fe9a61117 Rework archived conversations mode of home view. -| * | 9c7e9b795 Rework archived conversations mode of home view. -| * | af2539f47 Rework archived conversations mode of home view. -|/ / -* | e66e5b0b9 Merge branch 'mkirk/unjank-homescreen' -|\ \ -| * | f5e810e82 CR: rename ThreadModel -> ThreadViewModel -| * | d1230abdc Fix type declaration -| * | 1f63ce02a Increase cache, remove dead code, add debug logging -| * | b3cd6a112 Add OWSJanksUI assertion -| * | 90dda0bf9 SEPARATE: Use non-signal contact's full name -| * | 113cb254d fixup cache -| * | 9c81eb44a Replace remaining UI usage of `interaction.description` -| * | 897d4a925 HomeView caches thread models -| * | 5f2b38c50 Introduce Thread view model -| * | 1fb1b5bbe WIP unjank home screen -|/ / -* | 7912598cc Merge branch 'release/2.24.0' -|\ \ -| |/ -| * f4adea4e3 (tag: 2.24.0.10, private/release/2.24.0, origin/release/2.24.0, release/2.24.0) "Bump build to 2.24.0.10." -| * af418a98b Merge branch 'charlesmchen/iRateCrashes' into release/2.24.0 -| |\ -| | * f3de6b524 (charlesmchen/iRateCrashes) Ensure iRate synchronizes when active. -| | * fe6e79761 Ensure iRate synchronizes when active. -| |/ -| * 661f48c6d Merge branch 'charlesmchen/debugLogUploaderNPE' into release/2.24.0 -| |\ -| | * c1879250d (charlesmchen/debugLogUploaderNPE) Fix NPE in debug log uploader. -| | * b4fc0cddc Fix NPE in debug log uploader. -| |/ -| * 2c60a5749 Update l10n strings. -| * bc5a86254 Update screen lock settings copy. -| * 83a9c1e9e Merge branch 'charlesmchen/saeScreenLock' into release/2.24.0 -| |\ -| | * 08d36aa86 (charlesmchen/saeScreenLock) Add screen lock UI to SAE. -| |/ -| * 9bb2f3855 Merge branch 'mkirk/design-tweaks' into release/2.24.0 -| |\ -| | * 8e5617509 CR: unread badge updates w/ dynamic text change -| | * 8ca62a8d4 Align top row by baseline -| | * 743867859 smaller font for date/unread, per updated spec -| | * bba2bcefe Grow unread badge into pill -| | * 2bc072fe8 Now that snippet is a bit higher, increase max message cell height -| | * ee4d038d2 Top row baseline and badge to spec -| | * c693beb76 dateTime to spec -| | * 91f4f38c0 snippet to spec (subheading: 15pt) -| | * 5ada961ec unread badge to spec (footnote: 13) -| |/ -| * 15891523b Merge branch 'mkirk/group-delivery' into release/2.24.0 -| |\ -| | * eec767897 (origin/mkirk/group-delivery) Group's meta message defaults to "Delivery" -| |/ -* | 3dfcafb2c Merge branch 'mkirk/call-reconnecting' -|\ \ -| * | 0f46834e8 Show "Reconnecting..." on call screen -| * | 830ed884c Only log timeout when call actually times out -|/ / -* | 2c43d20ee Merge tag '2.24.0.9' -|\ \ -| |/ -| * f45970922 (tag: 2.24.0.9) "Bump build to 2.24.0.9." -| * a2028b1ed Merge branch 'charlesmchen/asyncRegistrationCompletion' into release/2.24.0 -| |\ -| | * 35ee8c1a0 (charlesmchen/asyncRegistrationCompletion) Rework flush of registration connection(s). -| | * a26426825 Rework flush of registration connection(s). -| | * e1138df77 Rework flush of registration connection(s). -| | * 5bbce1402 Rework flush of registration connection(s). -| | * 5d627ee89 Rework flush of registration connection(s). -| | * 4f1f1a107 Rework flush of registration connection(s). -| |/ -| * 1b73fb9e6 Merge branch 'charlesmchen/callViewOptionals' into release/2.24.0 -| |\ -| | * cc42e85bd (charlesmchen/callViewOptionals) Avoid race condition in call view controller. -| | * 621d54db1 Revert "Remove usage of ! in call view." -| | * 943b3f031 Revert "Remove usage of ! in call view." -| | * 594ddfaec Revert "Remove usage of ! in call view." -| | * 3cbd49627 Remove usage of ! in call view. -| | * 699bf0a82 Remove usage of ! in call view. -| | * ce197b0ad Remove usage of ! in call view. -| |/ -* | 3950d2c54 Merge branch 'mkirk/disappearing-messages' -|\ \ -| |/ -|/| -| * c88ce07f6 CR: Clean up comments, use property setter instead of ivar -| * eb140a683 Timer info messages *before* the message which changed the timer -| * a9e7c5e87 Cleanup: simplify migration, remove unused code -| * b039fdd27 UI Fix: start with full hourglass on short timer durations -| * 754549adf Start timer for expiring message based on when read receipt was sent -| * dfb2a034a Use explicit transactions. -| * b7625689c Simplify reasoning around disappearing messages -| * 57ae2b173 Clarify existing functionality, but no change in behavior -|/ -* ef95e0538 (tag: 2.24.0.8) "Bump build to 2.24.0.8." -* 499d06842 (tag: 2.24.0.7) "Bump build to 2.24.0.7." -* e2fa797e0 Merge remote-tracking branch 'origin/charlesmchen/fixMessageTaps' -|\ -| * a1386eca8 (charlesmchen/fixMessageTaps) Fix taps in message cells. -|/ -* d3f106e3b (tag: 2.24.0.6) "Bump build to 2.24.0.6." -* 87c335e07 Merge branch 'charlesmchen/fixDateComparators' -|\ -| * e7855c16a Fix date comparators. -| * 3b5ee662d Fix date comparators. -| * 5067dcba5 Fix date comparators. -|/ -* 5a6220a84 (tag: 2.24.0.5) "Bump build to 2.24.0.5." -* 26f8050da Merge tag '2.23.4.2' -|\ -| * e96ad2f97 (tag: 2.23.4.2, origin/hotfix/2.23.4, hotfix/2.23.4) "Bump build to 2.23.4.2." -| * c3b72ac6b Merge branch 'charlesmchen/callViewVsKeyboard_' into hotfix/2.23.4 -| |\ -| | * ae61b44a9 (charlesmchen/callViewVsKeyboard_) Resolve conflict between keyboard and call view. -| |/ -* | 7090a59a3 (tag: 2.24.0.4) "Bump build to 2.24.0.4." -* | 34e99cc42 Update l10n strings. -* | b8b131a1f (tag: 2.24.0.3) "Bump build to 2.24.0.3." -* | eb51ea42e Merge remote-tracking branch 'origin/hotfix/2.23.4' -|\ \ -| |/ -| * bc35a3859 (tag: 2.23.4.1) "Bump build to 2.23.4.1." -| * 5cf6e6532 Fix screen lock alerts. -| * 66f028a3b (tag: 2.23.4.0) Update nullability -| * 7d7981e82 Merge branch 'charlesmchen/mainWindow' into hotfix/2.23.4 -| |\ -| | * 85cb78ddf Add mainWindow property to app context. -| |/ -| * 4e9c653c8 "Bump build to 2.23.4.0." -* | 27935361c Merge branch 'charlesmchen/malformedProtos' -|\ \ -| * | 5ce39337e Handle malformed protos. -|/ / -* | b925f913b Merge branch 'charlesmchen/attachmentTypeAssets' -|\ \ -| * | 284cc8c26 Apply attachment type assets. -| * | 146db1984 Apply attachment type assets. -|/ / -* | f2d5bd48f Merge branch 'mkirk/nullability-fix' -|\ \ -| * | c926ca10a Update nullability -|/ / -* | 4d539ba1c Merge branch 'mkirk/retry-failed-thumbnail-download' -|\ \ -| * | 64ff4cd66 tap-to-retry failed thumbnail downloads -|/ / -* | 8716d6b7a Merge branch 'charlesmchen/homeAndConversationViewDesignTweaks' -|\ \ -| * | f6d5b9197 Respond to CR. -| * | 94e9c72e6 Apply design changes from Myles. -| * | bb9c1fb23 Apply design changes from Myles. -| * | 6a69070ce Apply design changes from Myles. -|/ / -* | aedeca03d Merge branch 'charlesmchen/shapeLayerAnimations' -|\ \ -| * | 6831412e4 Respond to CR. -| * | a5c7bdb98 Don't animate changes to shape layer properties. -|/ / -* | e02bbaeec Merge branch 'charlesmchen/fixBlockScreenAnimation' -|\ \ -| * | 115235d1b (private/charlesmchen/fixBlockScreenAnimation, charlesmchen/fixBlockScreenAnimation) Fix animation glitch in blocking window. -|/ / -* | df685da49 Merge remote-tracking branch 'private/hotfix/2.23.3' -|\ \ -| |/ -| * 2167a28e0 (tag: 2.23.3.2, private/hotfix/2.23.3, hotfix/2.23.3) "Bump build to 2.23.3.2." -| * e48607540 "Bump build to 2.23.3.1." -| * 174b1e360 Merge branch 'charlesmchen/screenLock7' into hotfix/2.23.3 -| |\ -| | * 03e6a5dc7 (private/charlesmchen/screenLock7, charlesmchen/screenLock7) Refine screenlock. -| |/ -| * c31e2fbb6 "Bump build to 2.23.3.0." -* | 76b9564b8 Merge branch 'mkirk/text-caption-size' -|\ \ -| * | f879291f1 Don't underestimate removed space. -| * | 13a432b9d Limit attachment caption length to 2k bytes -|/ / -* | 2a2f0bcad (tag: 2.24.0.2) "Bump build to 2.24.0.2." -* | d821942f0 Merge branch 'charlesmchen/quoteReplyTweaks' -|\ \ -| * | 59a3d736b Respond to CR. -| * | d7ae35f72 Streamline usage of quoted message view. -| * | 195d35737 Streamline usage of quoted message view. -|/ / -* | f8b11c57c Merge branch 'charlesmchen/incompleteAsserts' -|\ \ -| * | daf0f0b22 Fix incomplete asserts. -| * | 9c9309951 Fix incomplete asserts. -|/ / -* | 194ae2dfd Merge branch 'charlesmchen/saeVsMainThread' -|\ \ -| * | 6caa5b87b Add more asserts around thread in SAE. -|/ / -* | 7013cf9b4 Merge branch 'charlesmchen/messageDetailsVsIPhoneX' -|\ \ -| * | a5a2f02ed Respond to CR. -| * | 644e78f19 Respond to CR. -| * | eb400114c Fix message details layout in iPhone X. -|/ / -* | 7f6cdf7e6 Merge branch 'mkirk/use-profile-name' -|\ \ -| * | e554884ab Use profile name in quoted messages, fix "multi account" label -|/ / -* | 6703e1b11 Merge branch 'mkirk/quote-you' -|\ \ -| * | 40879ca3e Distinguish between quoting yourself and someone else quoting you -|/ / -* | 859ecc48d Merge branch 'charlesmchen/reduceServiceLoad' -|\ \ -| * | 829cfd042 (charlesmchen/reduceServiceLoad) Reduce oversize text size. -|/ / -* | 98ed2b49c Merge tag '2.23.2.0' -|\ \ -| |/ -| * 2264edd9d (tag: 2.23.2.0, origin/release/2.23.2, release/2.23.2) "Bump build to 2.23.2.0." -* | 2d9eb2b61 Merge tag '2.23.1.2' -|\ \ -| |/ -| * 8f1cfed5c (tag: 2.23.1.2) "Bump build to 2.23.1.2." -| * 018a35df7 Merge remote-tracking branch 'origin/charlesmchen/screenLockRework_' into release/2.23.2 -| |\ -| | * 2b210c755 (charlesmchen/screenLockRework_) Fix screen lock edge cases. -| | * ad6937378 Fix screen lock edge cases. -| |/ -* | dd32faf8f (tag: 2.24.0.1) "Bump build to 2.24.0.1." -* | 6677aa2c7 Update l10n strings. -* | 81ad95a05 Merge branch 'charlesmchen/backgroundCheckOffMain' -|\ \ -| * | 45892e822 Move 'background' check in message processing logic off main thread. -|/ / -* | 5f56269f9 Merge branch 'mkirk/truncate-tail' -|\ \ -| * | 5774e5769 truncate tail for both preview and message bubble -|/ / -* | 50ce0e6db Merge branch 'mkirk/proto-update' -|\ \ -| * | b2b70258f Make our protos backwards compatible with Signal-Android -|/ / -* | ebb3ee86c Merge branch 'mkirk/fix-spurious-group-updates' -|\ \ -| * | bd8e03fe8 Fix spurious "Group Updated" message -|/ / -* | fa4c67795 Merge branch 'charlesmchen/transparentImages2' -|\ \ -| * | 576f5dee8 Add white background to images in quoted reply view. -|/ / -* | dd121ba83 Merge branch 'charlesmchen/reduce10deadcc' -|\ \ -| * | d95f2bdc6 Respond to CR. -| * | d561ba4c6 Reduce 0xdead10cc crashes. -|/ / -* | f01b7b916 Merge branch 'charlesmchen/quoteReplyToYourself' -|\ \ -| * | c152a4134 Respond to CR. -| * | fc2704cf8 Label quoted replies to yourself as such. -|/ / -* | d0aad5360 Merge branch 'charlesmchen/homeViewDesignChanges2' -|\ \ -| * | 759b2a332 Respond to CR. -| * | c6df55b82 Scale home view cells to reflect dynamic type size. -| * | 3688d57ea Scale home view cells to reflect dynamic type size. -| * | 543c898db Scale home view cells to reflect dynamic type size. -| * | 25e487fcd Scale home view cells to reflect dynamic type size. -| * | c3345a4c4 Scale home view cells to reflect dynamic type size. -|/ / -* | fb27d496e Merge branch 'charlesmchen/longPressQuotedReply' -|\ \ -| * | ea82419a4 Fix long press on quoted reply. -|/ / -* | 30943a1c1 Merge branch 'charlesmchen/quotedMessageOverflow' -|\ \ -| * | 031a1d732 Fix quoted message overflow. -|/ / -* | 8857c4491 Merge branch 'charlesmchen/oversizeTextPreviews' -|\ \ -| * | db6f1326b Fix previews of oversize text messages. -| * | 83a470d44 Fix previews of oversize text messages. -|/ / -* | 84b0f57c1 Merge branch 'charlesmchen/transparentImages' -|\ \ -| * | ae91b03c7 Add white background to images in conversation view. -|/ / -* | 13fdfa2db Merge branch 'mkirk/fix-message-details-media' -|\ \ -| * | 532053673 remove WIP comments -| * | 1780973e6 fix image, video, audio interactions in message details -| * | 7abd51838 Move bubble actions to new bubble delegate -|/ / -* | f6698501d Revert "Label quoted replies to yourself as such." -* | 24d7492f6 Label quoted replies to yourself as such. -* | f91f4dbd0 Merge branch 'charlesmchen/homeViewDesignChanges' -|\ \ -| * | c0578b31f Clean up ahead of CR. -| * | 45cb1ec51 Clean up ahead of PR. -| * | abba24988 Rework how dates are formatted in home view. -| * | b8f8a3017 Apply design changes to home view. -|/ / -* | 0b7c025c5 (tag: 2.24.0.0) "Bump build to 2.24.0.0." -* | 086757191 Update l10n files. -* | db4f75592 Merge branch 'mkirk/limit-attachment-length' -|\ \ -| * | d94709e13 Show label when captioning limit has been reached. -| * | 6b6f4f933 Limit caption length -|/ / -* | 8cfb1e132 Merge branch 'charlesmchen/quotedReplyPrerequisites' -|\ \ -| * | c269add62 Respond to CR. -| * | 9769d482d Respond to CR. -| * | 76995e459 Enforce quoted reply edge cases. -|/ / -* | 4655c7432 Merge branch 'charlesmchen/tapQuotedReplies' -|\ \ -| * | 6ee74eaff Respond to CR. -| * | 6a07599e0 Respond to CR. -| * | f2b416d80 Respond to CR. -| * | 8b060a187 Tap on quoted replies. -| * | 65015e686 Tap on quoted replies. -|/ / -* | d220883b5 Merge branch 'fix-blue-new-message-dot' -|\ \ -| * | ca1f8efda Move 'never clear' view to proper subfolder. -| * | 21e0d1cd3 simplified backgroundColor logic -| * | 3a47422b3 class reference in sources -| * | 2f538b9f5 fixed header formatting -| * | d16bffe6c forget target reference to new class in PR -| * | 8984f659f Keeps original background color of a subview in during row selection -|/ / -* | f9fc88286 Merge branch 'charlesmchen/tweakMessageLayout' -|\ \ -| * | e8ad6bad8 Respond to CR. -| * | ebb89ed1f Tweak message layout. -|/ / -* | 27cc9668c Merge branch 'charlesmchen/noRecycleBiometric' -|\ \ -| * | ca6b952c1 Never recycle biometric auth. -|/ / -* | 149d89224 Merge branch 'mkirk/quote-authoring-redesign' -|\ \ -| * | 314e3cbf0 Drive quote authoring with QuotedMessageView -| * | 520dad25b WIP making OWSQuotedMessageView work with preview -| * | 5287ab8f8 Try 2: no more stack view -| * | 5807ba69c attempt 1: QMV doesn't have intrinsic content size, and requires a fixed width to compute it's size, which we don't currently have. -|/ / -* | a6afa2cc0 Merge branch 'charlesmchen/dynamicTextFixes' -|\ \ -| * | 180cbbcdb Don't use scaledFontForFont. -|/ / -* | 3ba3f1099 Merge branch 'fix-truncation-in-segment-control' -|\ \ -| * | 16014f321 autoresize label in segmentControl to avoid unwanted truncation -|/ / -* | 64fba4308 Merge branch 'charlesmchen/quotedReplyDesignTweaks' -|\ \ -| * | 8fe289fee Tweak design of quoted replies. -|/ / -* | a810fb640 Merge branch 'charlesmchen/smallText' -|\ \ -| * | 8c1362b80 Fix small text usage. -|/ / -* | dc0e5a6b9 Merge branch 'charlesmchen/quotedReplies8' -|\ \ -| * | 3799dce82 Respond to CR. -| * | c106a67a5 Use dynamic type everywhere in conversation view. -| * | ade2ee721 Use dynamic type everywhere in conversation view. -|/ / -* | 37966986f Merge branch 'mkirk/attachment-handling' -|\ \ -| * | b1a87633d update pods -| * | 81b2b5770 CR: add comments, make atomic -| * | 88d6a8395 Add assertion canary so we know to re-test syncing once desktop supports sending quoted replies -| * | 02efbd306 Fix blip where thumbnail is initially missing from outgoing message -| * | 90486aa49 Inline method with one caller, fix formatting -| * | 8e4c6b8af Update protos for voice messages -| * | 941b7ec1b clarify method signature -| * | c56e8acc5 QuotedReplyModel from SSK->SignalMessaging -| * | 1d4c0624b Clarify variable names -| * | a9459757f Lingering var renames QuotedReplyDraft -> QuotedReplyModel -| * | f1714bf25 Handle synced quotes -| * | 622f6bdf2 OrphanDataCleaner vs. QuotedAttachment thumbnails -| * | 4399967e9 Comment cleanup, remove unnecessary includes -| * | fa2e1ba89 Fetch thumbnail when not available locally -| * | 42f454b07 Generate thumbnail when quoted attachment is available locally -| * | 351f9ea26 Simplify attachment processor -| * | 325286672 remove unused params -| * | cb5d3d4f8 Use QuotedReplyModel to access attachment data -| * | 3334f2a06 tentative proto changes -| * | 51a4298c1 WIP: Send attachment info in protobuf (no thumbnails yet) -| * | 55c6d99d9 populate draft toolbar -| * | 253435b27 extract QuotedReplyDraft model -| * | 0b8b3b4f1 WIP: towards avatar attachment streams -| * | 53af41fcc Reusable UploadOperation based on extracted OWSOperation -|/ / -* | f3c511b78 Merge branch 'charlesmchen/quotedReplies7' -|\ \ -| * | 0dfdb8ce8 Elaborate quoted reply variations to include replies with attachments. -| * | de2dc4912 Elaborate quoted reply variations to include replies with attachments. -|/ / -* | 93820e7bc Merge branch 'charlesmchen/quotedReplies6' -|\ \ -| * | 3ee37bd3f Respond to CR. -| * | 2f2d1f81a Clean up ahead of PR. -| * | cf1a7e01d Apply message bubble view to message details view. -| * | 6830d4e8c Apply message bubble view to message details view. -| * | d99a2be00 Apply message bubble view to message details view. -|/ / -* | 076b6ad8d Merge branch 'charlesmchen/quotedReplies5' -|\ \ -| * | 316b55bf9 Respond to CR. -| * | 7067085cd Extract message bubble view. -| * | d05b73af2 Extract message bubble view. -| * | d1060a2a8 Extract message bubble view. -| * | 7f0fa1228 Extract message bubble view. -|/ / -* | 00327986d Merge branch 'mkirk/sync-protos' -|\ \ -| * | 2975d4d5d Sync with android protos -|/ / -* | 0106b1a42 Merge branch 'charlesmchen/quotedReplies4' -|\ \ -| * | c5d8a7cb3 Clean up ahead of PR. -| * | f6aa3f89b Clean up ahead of PR. -| * | ca4757b8d Clean up ahead of PR. -| * | c648812cf Update cocoapods. -| * | 71c5c3a4b Refine appearance of quoted reply message cells. -| * | 8a843f70e Refine the attachments in the quoted reply view. -| * | 214e3a9c4 Refine appearance of quoted reply message cells. -|/ / -* | 7fe83cbc4 Merge branch 'charlesmchen/quotedReplies3' -|\ \ -| * | 822aa64b1 (charlesmchen/quotedReplies3) Respond to CR. -| * | cac85508c Refine appearance of quoted reply message cells. -| * | 7e921b793 Refine appearance of quoted reply message cells. -| * | 08ba3852c Refine appearance of quoted reply message cells. -| * | 5235f6eee Refine appearance of quoted reply message cells. -| * | d6f3df82a Refine appearance of quoted reply message cells. -| * | c70f911f6 Refine appearance of quoted reply message cells. -| * | 617150565 Refine appearance of quoted reply message cells. -| * | 10b4ade55 Refine appearance of quoted reply message cells. -| * | 3343b4ec5 Refine appearance of quoted reply message cells. -|/ / -* | dd36c945e Merge branch 'charlesmchen/attachmentEmojis' -|\ \ -| * | 2b3b08d7c (charlesmchen/attachmentEmojis) Respond to CR. -| * | f230717b6 Modify attachment emojis. -|/ / -* | 2df54a577 Merge branch 'charlesmchen/quotedRepliesVsOversizeText' -|\ \ -| * | 30403be9b (charlesmchen/quotedRepliesVsOversizeText) Respond to CR. -| * | 5a17c5609 Quote reply to oversize text. -|/ / -* | c0cdf0f5b Merge branch 'charlesmchen/fixupInteractions' -|\ \ -| * | 9b5db80f2 (charlesmchen/fixupInteractions) Respond to CR. -| * | a561bf5e2 Fix database conversion tests. -| * | 908560908 Fix interaction initializers and tests. -|/ / -* | a6dbe5bf7 Merge branch 'mkirk/update-pods' -|\ \ -| * | eae2fa27b Update pods -|/ / -* | 6958598d0 Merge tag '2.23.1.1' -|\ \ -| |/ -| * 0a20eec4e (tag: 2.23.1.1, origin/release/2.23.1) "Bump build to 2.23.1.1." -| * a98834cc2 pull latest translations -| * 5b55b9eab Merge branch 'charlesmchen/screenLockFix' into release/2.23.1 -| |\ -| | * c46021f19 (charlesmchen/screenLockFix) Fix screen lock edge case. -| |/ -* | 73dc22cc1 Merge branch 'mkirk/quote-authoring' -|\ \ -| * | b6409dd51 CR: formatting changes -| * | eb16043de simplify emoji, remove iconview -| * | b3b3fa64e Use "You" instead of Author name in quote -| * | 51eee90bb Remove unnecessary changes -| * | 52ea54ae6 Add thumbnail when available -| * | bf401bad9 Send quoted messages -| * | d99054d89 Reply menu item -| * | 6874a9e28 Convert to swift -| * | cfbbeca7a WIP: QuotedMessagePreviewView -|/ / -* | 609e68e8b Merge branch 'charlesmchen/quotedReplies2' -|\ \ -| * | 00a81355d (charlesmchen/quotedReplies2) Respond to CR. -| * | 445d38f72 Modify cells to show quoted messages. -| * | 324afb115 Modify cells to show quoted messages. -| * | 5824cbd2a Modify cells to show quoted messages. -| * | 988b6ffae Modify cells to show quoted messages. -| * | f6f98369a Modify cells to show quoted messages. -| * | 22dc90428 Modify cells to show quoted messages. -| * | 2278cdd58 Modify cells to show quoted messages. -| * | 7cf169012 Elaborate conversation view items around quoted replies. -|/ / -* | e24da5989 Merge branch 'mkirk/dynamic-gallery-text' -|\ \ -| * | e6b0f692c Don't use dynamic text for navbar view -|/ / -* | 756132acf Merge branch 'mkirk/fix-audio-alert-levels' -|\ \ -| * | 5f8b3ff28 Object lifecycle disposes SystemSound -| * | 2580c690c CR: Use LRU Cache for storing system sounds -| * | 3cb53f5f4 Respect system alert volume for notifications while in app -|/ / -* | 363a1ae33 Merge branch 'charlesmchen/quotedRepliesVariations' -|\ \ -| * | c36297a9a Elaborate 'quoted reply' variations in the Debug UI. -|/ / -* | 8e695d960 Merge branch 'charlesmchen/simpleBubbleEdge' -|\ \ -| * | 20387f27e Simplify bubble edge. -| * | d5218cf4d Simplify bubble edge. -|/ / -* | c8b8a989f update crash reporting instructions -* | 7befbfc33 Merge branch 'mkirk/fixup-tests-2' -|\ \ -| * | 00e5e1b0d Fixup some tests -|/ / -* | 448e59d7f Merge tag '2.23.1.0' -|\ \ -| |/ -| * f1b6c51cf (tag: 2.23.1.0) "Bump build to 2.23.1.0." -| * 83a8670f2 Pull latest translations -| * ab2074c73 CR: Avoid unnecessary retain -| * c639a2c14 Fix flush of registration connections. -* | e6c6cabf1 Merge branch 'mkirk/iphonex-fixups' -|\ \ -| * | 86553b62f keyboard pinning vs iPhoneX -| * | af5f549e4 Fix TableView layout for iPhoneX -| * | f441c6211 Format -| * | 6f1608f44 Conventional naming for out custom PureLayout methods. -|/ / -* | 41cfdb153 Merge branch 'charlesmchen/quotedReplies_' -|\ \ -| * | 42ea43bc4 Update pods. -| * | 4240b517d Respond to CR. -| * | fb1f3b557 Rework quoted reply debug UI. -| * | 4915c127c Rework quoted reply debug UI. -| * | 8e4f2ca0e Rework proto schema changes for quoted replies. -|/ / -* | 308fa5997 Merge branch 'charlesmchen/bubbleViewsAssert' -|\ \ -| * | 1bea832fa (charlesmchen/bubbleViewsAssert) Fix assert in bubble views. -|/ / -* | 3139bac99 Merge branch 'charlesmchen/lazyAttachmentRestoreVsDebug' -|\ \ -| * | f7ea1678e (charlesmchen/lazyAttachmentRestoreVsDebug) Only resume lazy attachment restore in debug. -|/ / -* | aa7bf920e Merge branch 'charlesmchen/flushRegistrationConnections_' -|\ \ -| * | 9dfc955ee (charlesmchen/flushRegistrationConnections_) Fix flush of registration connections. -|/ / -* | 684614013 Revert "Fix flush of registration connections." -* | 43e50e33c Merge branch 'charlesmchen/bubbleCollapse' -|\ \ -| * | 52b238c49 Fix flush of registration connections. -| * | f98c45603 Respond to CR. -| * | 31f062ed1 Bubble collapse. -| * | 12bcf887c Bubble collapse. -| * | 4f9085a76 Bubble collapse. -| * | 3ca2c08b0 Bubble collapse. -| * | 578f40d79 Bubble collapse. -| * | c8012d389 Bubble collapse. -| * | 3d07dc7c5 Bubble collapse. -| * | 643c6385b Bubble collapse. -| * | 8d74c68f9 Bubble collapse. -| * | 8a74e1020 Bubble collapse. -| * | e0e8eafb5 Bubble collapse. -| * | 4a4e9d1ce Bubble collapse. -| * | 11819d9b8 Bubble collapse. -| * | e1e660678 Bubble collapse. -| * | cb00b2287 Bubble collapse. -| * | 6525ccdb0 Bubble collapse. -| * | 75177ef00 Bubble collapse. -| * | d0cddfd22 Elaborate debug UI for messages. -| * | 3a5ba15d2 Elaborate debug UI for messages. -| * | 041b28dd7 Elaborate debug UI for messages. -| * | 469fb2644 Elaborate debug UI for messages. -| * | 8542a18f3 Elaborate debug UI for messages. -| * | a13076008 Elaborate debug UI for messages. -| * | 66a454ce4 Elaborate debug UI for messages. -| * | e874503f8 Elaborate debug UI for messages. -| * | 24cc6ec11 Elaborate debug UI for messages. -| * | c2e31540d Elaborate debug UI for messages. -| * | 68f3334e7 Elaborate debug UI for messages. -| * | 0dfa9cac7 Elaborate debug UI for messages. -|/ / -* | 972cbaebf Merge branch 'charlesmchen/incrementalBackup8' -|\ \ -| |/ -|/| -| * cf9a326d5 Update Cocoapods. -| * 4602ad901 Respond to CR. -| * 9f866ab32 Update cocoapods. -| * 8254052bb Lazy restore attachments. -| * cb8ee3536 Lazy restore attachments. -| * 1dced463c Lazy restore attachments. -| * b2ac8f10e Lazy restore attachments. -| * 3406d1562 Add local cache of backup fragment metadata. -| * 61dc2c024 Add local cache of backup fragment metadata. -| * e88f5643f Add local cache of backup fragment metadata. -| * 258cdab2d Don't cull CloudKit records for lazy restoring attachments. -| * d0c691bb7 Lazy attachment restores. -|/ -* 2a31223b1 (tag: 2.23.0.14, origin/release/2.23.0, release/2.23.0) "Bump build to 2.23.0.14." -* ea71493fa pull latest translations -* 0a36f3e64 Merge branch 'mkirk/stop-audio-after-leaving-details' -|\ -| * d7cccd1e8 Fix: Audio stops when leaving MessageDetails VC -|/ -* 1dd7d6799 (tag: 2.23.0.13) "Bump build to 2.23.0.13." -* e59abfdab pull latest translations -* 018b00f69 Merge branch 'mkirk/fix-unlock-obscured' -|\ -| * 4eadd84ab Don't obscure "Unlock" button with keyboard -|/ -* 4890fe630 (tag: 2.23.0.12) "Bump build to 2.23.0.12." -* e793aba04 Merge branch 'mkirk/fix-gallery-crash' -|\ -| * 425b35a2c Crash/UI fix fetching edge case -|/ -* 0b4b42875 (tag: 2.23.0.11) "Bump build to 2.23.0.11." -* b1ac4a7c7 Sync translations -* 9afe9f0b7 Merge branch 'mkirk/reflector-redux' -|\ -| * 875321cec Reflector configuration supports per-country code -|/ -* 123534ea2 Merge branch 'charlesmchen/screenLock8' -|\ -| * 1424149a7 Start screen lock countdown if app is inactive for more than N seconds. -|/ -* 1ae3f77db Merge branch 'charlesmchen/screenLock9' -|\ -| * eb9c65e97 Improve handling of local authentication errors. -|/ -* 760900889 (tag: 2.23.0.10) "Bump build to 2.23.0.10." -* 715248073 Sync translations -* e856de215 Merge branch 'charlesmchen/screenLock7' -|\ -| * 72b602c3d Respond to CR. -| * 930d89242 Clean up ahead of PR. -| * 16af07842 Fix more edge cases in Screen Lock. -| * c85e5b39b Fix more edge cases in Screen Lock. -|/ -* 8bcf62258 (tag: 2.23.0.9) "Bump build to 2.23.0.9." -* 9bb335942 Pull latest translations -* 3373bb60e (tag: 2.23.0.8) "Bump build to 2.23.0.8." -* 1e83cd61b Merge branch 'charlesmchen/screenLockUnavailable' -|\ -| * fe23f79d5 Respond to CR. -| * feb5d68f8 Improve handling of unexpected failures in local authentication. -|/ -* 461af0194 Merge branch 'mkirk/remove-switch' -|\ -| * 9adf79c54 Always remove metadata -|/ -* fbb88729c Merge branch 'mkirk/video-scrubbing' -|\ -| * 1d95cd697 Improve video scrubbing UX in PageView -|/ -* 9a440913e (tag: 2.23.0.7) "Bump build to 2.23.0.7." -* f2b5ad92a Sync translations -* a2aec781c Merge branch 'mkirk/fix-crash-after-delete' -|\ -| * e4530a51b Handle "current page view" deleted from tile -| * 457d6c6d9 Don't scroll to bottom on load, since we scroll to focused when view appears. -| * 405edaa12 End select mode after hitting delete -| * 6e3de94e9 code cleanup -|/ -* 46f8b210a (tag: 2.23.0.6) "Bump build to 2.23.0.6." -* 04515713b Merge branch 'charlesmchen/screenLock6' -|\ -| * 664afdcac Fix edge case in screen lock UI. -|/ -* bf79a0195 Merge branch 'charlesmchen/invalidAuthVsLaunch' -|\ -| * 9962bf56b Fix 'invalid auth can hang on launch' issue. -| * ef34cd5d5 Fix 'invalid auth can hang on launch' issue. -|/ -* 4ca29b06e Remove travis ci badge -* c138c0057 Merge branch 'string-cleanup' -|\ -| * 394cc6637 Backport comments from translations -| * a17db6c2d Update Screen Lock text. Clean up a few other strings and comments. -|/ -* e2ed2de0e (tag: 2.23.0.5) "Bump build to 2.23.0.5." -* 1cc470d75 Merge branch 'charlesmchen/screenLock5' -|\ -| * 063e1ccb6 Fix edge cases around pincode-only unlock. -| * 287daf583 Fix edge cases around pincode-only unlock. -|/ -* 53c7f656e (tag: 2.23.0.4) "Bump build to 2.23.0.4." -* 019ad5ef8 Sync translations -* 67626c35b Merge branch 'mkirk/animations' -|\ -| * 037546a2d Fade toolbars, keeping presentation image sharp -| * 10fe10b98 Fix navbar flicker while media is presented -| * c1de22d86 Avoid white flash while dismissing -|/ -* 8e72ac5ee Merge branch 'mkirk/stop-media-playback' -|\ -| * 13378501b Stop any video on dismiss -|/ -* a30ef6a44 Merge branch 'mkirk/batch-delete' -|\ -| * ae892525d don't fade "selected" badge -| * 2edf8384c iPhoneX layout for gallery -| * 3de923bf6 Update footer items after delete scrolls you to next item in pager view -| * 3058cb873 Batch Delete -|/ -* c13226d6c (tag: 2.23.0.3) sync translations -* 2d57b90bd "Bump build to 2.23.0.3." -* 6d45c38b4 Merge branch 'mkirk/delete-from-gallery' -|\ -| * 6c877403c Fix delete from message details -| * 6e20f5b65 Fix Delete -|/ -* e751bbfbb Merge branch 'charlesmchen/screenLock4' -|\ -| * faea31a8c (charlesmchen/screenLock4) Fix screen lock presentation logic. -| * 0e00428da Fix screen lock presentation logic. -|/ -* 4fe5432ac Merge branch 'charlesmchen/screenLock3' -|\ -| * b012efc12 (charlesmchen/screenLock3) Fix screen lock presentation logic. -| * 19755fa5b Refine 'Screen Lock'. -| * 8899c7abd Refine 'Screen Lock'. -|/ -* 03845d0d9 Revert "Refine 'Screen Lock'." -* 871dca413 Refine 'Screen Lock'. -* 70e95b085 Merge branch 'charlesmchen/screenLock' -|\ -| * 5bc089837 (charlesmchen/screenLock) Respond to CR. -| * 2f39b2c22 Respond to CR. -| * 28ce15885 Refine screen lock. -| * bb596dba9 Add screen lock feature. -| * 2d6d375e8 Add screen lock feature. -| * cf0e6fce0 Add screen lock feature. -| * 1f8289102 Add screen lock feature. -| * b62736d7d Add screen lock feature. -| * 1612642c2 Add screen lock feature. -|/ -* 245769ce2 Merge branch 'charlesmchen/sendErrors' -|\ -| * b067d8101 (charlesmchen/sendErrors) Don't log message send errors. -|/ -* ddf14250d Merge branch 'mkirk/fix-pan-swipe' -|\ -| * 1e59fbafd CR: method args shouldn't shadow properties -| * d94f355c2 properly restore navigation bar after dismissing mid-video -| * 6a4642ed9 Fix subsequent animation after swiping -|/ -* 34a40a639 Merge branch 'charlesmchen/deepDeletion' -|\ -| * 847a0269c (charlesmchen/deepDeletion) Properly cleanup content. -| * 8d689ec09 Properly cleanup content. -|/ -* c5a48edf5 Merge branch 'charlesmchen/incrementalBackup6' -|\ -| * d21549943 (charlesmchen/incrementalBackup6) Show backup UI in release builds if backup is enabled. -|/ -* 2cb9677c9 Merge branch 'charlesmchen/incrementalBackup5' -|\ -| * 6580f9112 (charlesmchen/incrementalBackup5) Respond to CR. -| * 439d7e62e Recycle backup fragments. -| * 5de11d735 Recycle backup fragments. -| * bb07de2a3 Pull out "download and parse manifest" logic. -|/ -* bad416277 (charlesmchen/vanityLock) sync translations -* 0e8db320b update copy -* dd33254d7 (tag: 2.23.0.2) "Bump build to 2.23.0.2." -* 7adc296fb sync translations -* 60de39ab0 Merge branch 'mkirk/handle-empty-gallery' -|\ -| * b5503cc00 Handle empty media gallery -|/ -* 3ad6fbf21 Merge branch 'mkirk/gallery-label' -|\ -| * f261fbcf0 Dynamic gallery label -|/ -* 77b83d5a3 Merge branch 'mkirk/gallery-badges' -|\ -| * 6939b1749 remove gradient per myles -| * 0025661a8 Extract GradientView -| * 7754d3d94 Real assets -| * 021c0db55 WIP: waiting on assets -|/ -* 6b4798734 Merge branch 'mkirk/fix-attachment-sending' -|\ -| * 9c57a1f7e Don't generate thumbnail until attachment has been saved -|/ -* dce6c376c (charlesmchen/incrementalBackup7) Merge branch 'charlesmchen/incrementalBackup4' -|\ -| * e8a716f2b (charlesmchen/incrementalBackup4) Update cocoapods. -| * 34d79265a Respond to CR. -| * 5c3bc74d0 Move backup protos to their own proto schema. -| * ab720a310 Move backup protos to their own proto schema. -| * 08ba7c85e Clean up ahead of PR. -| * 18d39f15f Clean up ahead of PR. -| * 2c680cada Clean up ahead of PR. -| * 610bbacd2 Clean up ahead of PR. -| * 2ebd8668b Fix bugs in new db representation, add batch record deletion, improve memory management. -| * fed524ba1 Rework database snapshot representation, encryption, etc. -| * 0c81d5656 Rework database snapshot representation, encryption, etc. -| * ca7c75a08 Rework database snapshot representation, encryption, etc. -| * 1bbd41f72 Improve perf of database snapshots. -|/ -* 267e85915 Avoid overflow -* 84ed75f60 Fix typo -* 0e7051522 Merge branch 'mkirk/gallery-review' -|\ -| * 2465d6df0 CR: ensure image is safe before generating thumbnail -| * 32bf9d52a CR: Delete thumbnail with directory -| * 8e9eb6d21 CR: Use a less-likely-to-collide thumbnail name for legacy attachments -| * d9a2effff CR: remove "k" from non constant -|/ -* 999b0f0f9 Merge branch 'mkirk/hide-all-media-from-settings-gallery' -|\ -| * 352f5c105 Prefer back button over dismiss -| * 00b531697 Don't show the "All Media" button when viewing the slider from the gallery via settings. -|/ -* 21cb4e892 Merge branch 'charlesmchen/reduceGiphyPageSize' -|\ -| * 40416bcdc (charlesmchen/reduceGiphyPageSize) Reduce Giphy page size. -|/ -* 47afa9917 (tag: 2.23.0.1) "Bump build to 2.23.0.1." -* abaa2939c Merge branch 'mkirk/update-footer' -|\ -| * 2095cbb0c Update footer when returning to details via Tile view -|/ -* 5fdadf5bd Merge branch 'mkirk/ensure-video-stopped-2' -|\ -| * 428802aee Only try to stop video when it *is* a video -|/ -* f037101af Merge branch 'mkirk/avoid-audio-crash' -|\ -| * 2412ab092 Avoid occasional audio crash -|/ -* 803260950 Merge branch 'mkirk/ensure-video-stopped' -|\ -| * 24eb4bf44 Stop any video whenever leaving PageView -|/ -* 5ec3df93f Merge branch 'mkirk/tile-view-perf' -|\ -| * 10ee054d0 Avoid flicker when loading more on top -| * 19988a872 Improve scroll-jank on Gallery Tile View -|/ -* fa6d9bfb3 Merge branch 'mkirk/swipe-perf' -|\ -| * 4c2d30a77 Memory warning clears MediaPageView cache -|/ -* b6e0cb3f3 (tag: 2.23.0.0) Update localizations -* bac2f47a0 "Bump build to 2.23.0.0." -* 592e6b246 Merge branch 'mkirk/media-gallery-all-media' -|\ -| * 13d6d72a6 per myles, use lighter blur -| * 770ce1440 ConversationSettings must retain the gallery view -| * f4e68e0df l10n -| * fb4182c41 Ensure gallery is GC'd -| * ba2923bae remove unused category -| * 96e5a8f4b One time thumbnail generation -| * a0bd2c232 OrphanDataCleaner shouldn't delete active thumbnails -| * ae8dbeb8d Access Media Gallery from conversation settings -| * f733c07d0 comment cleanup -| * 4aeff7ba6 Thumbnail generation -| * dfd628250 Gallery performance -| * 985af76d0 WIP: All Media view -| * e5b1c0c9b Fake media send -|/ -* 966660fa2 update copyright year (#3148) -* 737e6eea4 Merge branch 'charlesmchen/incrementalBackup3' -|\ -| * 24cc95585 (charlesmchen/incrementalBackup3) Respond to CR. -| * 0ba47808a Clean up ahead of PR. -| * 62da17a0c Clean up ahead of PR. -| * 54eecd5b1 Protect backup directories. -| * b0d56dcd5 Clean up ahead of PR. -| * cf13a780e Retry backup failures. -| * 05db8e3f7 Retry backup failures. -| * f164d5e94 Improve backup progress. -| * 0bcbb5918 Improve backup progress. -| * 59fc23212 Backup export needs to verify that we have a valid account. -| * 2915c533b Streamline database configuration and cleanup. -| * 061ce8cb1 Add database validity check. -| * 3c2aae3b9 Backup import clears database contents. -| * fc4a66365 Sketch out backup export UI. -| * 91bf0bdb9 Sketch out backup export UI. -| * 669a3610a Fix attachments. -| * 565743b66 Fix edge cases in migrations. -| * d2f2dd273 Fix edge cases in migrations. -| * 86aae78f1 Include migrations in backup. -|/ -* c62b5f9b5 Fix build break. -* 163c5b487 Fix cocoapods. -* 9bce78572 Merge branch 'mkirk/media-gallery' -|\ -| * 4ac9a1019 Media page view controller -| * 88e138672 Move frame to presentation logic, out of init -|/ -* 168ca76e6 Merge branch 'charlesmchen/incrementalBackup2' -|\ -| * 4746948df (charlesmchen/incrementalBackup2) Respond to CR. -| * f10b54994 Clean up ahead of PR. -| * eb263e265 Clean up ahead of PR. -| * 68ba8976c Clean up ahead of PR. -| * cc10dbf32 Clean up ahead of PR. -| * b3ecc085d Clean up ahead of PR. -| * 76b4deffe Respond to CR. -| * 70d14c84c Clean up backup code. -| * 08149005b Clean up backup code. -| * 3f822e8ce Complete minimal backup MVP. -| * f46ea0e87 Implement backup import logic. -| * 30065493a Implement backup import logic. -| * 5035cb040 Implement backup import logic. -| * 04c527a0f Implement backup import logic. -| * f53f1fb46 Add check for backup in cloud. -| * 6cea2779d Stub out backup private key. -| * 999321c06 Check for manifest in cloud. -| * 90c8f5483 Clean up cloud after successful backup export. -|/ -* aa546a02d Merge remote-tracking branch 'origin/release/2.22.0' -|\ -| * 8f468b613 (tag: 2.22.0.4, origin/release/2.22.0) "Bump build to 2.22.0.4." -| * 56f025bae Sync Translations -| * a6d6d1e75 Merge branch 'mkirk/remove-pin-placeholder' into release/2.22.0 -| |\ -| | * 89f177925 Remove PIN placeholder text -| |/ -| * 5f8c5ccd5 Merge branch 'charlesmchen/backgroundTaskTypo' into release/2.22.0 -| |\ -| | * c1169ce24 Fix typo in background task. -| |/ -* | bdb35c566 Merge branch 'charlesmchen/incrementalBackup' -|\ \ -| * | 37d4c413d (charlesmchen/incrementalBackup) Clean up before merge. -| * | b1ca55034 Clean up ahead of PR. -| * | 0e0628a8d Clean up ahead of PR. -| * | b65cc953e Clean up ahead of PR. -| * | a91eea9a1 Fix rebase breakage. -| * | 202a35fdd Only backup every N hours. -| * | fefba6c63 Don't download files from cloud when testing for their existence. -| * | c2751665c Only backup attachments once. -| * | 20587ba37 Upload attachments to cloud; upsert files to cloud. -| * | 0971bad4b Upload database and manifest files to CloudKit. -| * | c84bf81cf Export database for backup. -| * | b603a8dcb Upload test file to CloudKit. -| * | 593f7da72 Upload test file to CloudKit. -| * | d06ad25d7 Sketch out incremental backup manager and settings view. -| * | b296cfb89 Sketch out incremental backup manager and settings view. -| * | 46a89e89f Sketch out OWSBackupStorage. -| * | 792be8018 Incremental backup. -| * | ceba4e4e6 Rename TSStorageManager to OWSPrimaryStorage. -|/ / -* | a412f00ba Fix typo -* | c5ff9a94a Merge tag '2.22.0.3' -|\ \ -| |/ -| * 44a26342e (tag: 2.22.0.3) "Bump build to 2.22.0.3." -| * da2e6e490 judiciously sync translations -| * 028012836 Merge branch 'mkirk/clearer-reminder' into release/2.22.0 -| |\ -| | * 173008fba Clarify reminder view, touchup layout -| |/ -| * b411db6b0 Pull latest translations -| * b8485b19b Merge tag '2.21.0.15' into release/2.22.0 -| |\ -| | * 9595f1c87 (tag: 2.21.0.15, origin/release/2.21.0) "Bump build to 2.21.0.15." -| | * 58f2c65a1 Fix redundant profile downloads -| | * d5d75ae91 Merge branch 'mkirk/fix-lost-call-transactions' into release/2.21.0 -| | |\ -| | | * c5fc671c3 Fix lost call transactions after rebuilding callUIAdapter -| | |/ -| * | e1992212e (tag: 2.22.0.2) "Bump build to 2.22.0.2." -| * | 319e0d808 Merge tag '2.21.0.14' into release/2.22.0 -| |\ \ -| | |/ -| | * 145a81631 (tag: 2.21.0.14) "Bump build to 2.21.0.14." -| | * 93dab2787 pull latest translations -| | * 218623bbb Merge branch 'mkirk/safer-call-connect-fix' into release/2.21.0 -| | |\ -| | | * 3aebaefc3 A lighter touch for the fix-call connect. -| | |/ -| | * d43af9b73 (tag: 2.21.0.13) "Bump build to 2.21.0.13." -| | * 3aa86d0d8 Merge branch 'mkirk/fix-call-connect' into release/2.21.0 -| | |\ -| | | * bbdcd0c76 Call connection fixups -| | |/ -| * | b903f86f8 Merge branch 'mkirk/fix-avatar-download' into release/2.22.0 -| |\ \ -| | * | 74ccdfdf2 Fix redundant profile downloads -| |/ / -| * | c21255cd8 (tag: 2.22.0.1) "Bump build to 2.22.0.1." -| * | 04bf8c4f8 pull latest translations -| * | c4f89c0a0 Merge branch 'mkirk/fix-2fa-registration-layout' into release/2.22.0 -| |\ \ -| | * | ec9538a3e Fix 2fa registration screen layout -| |/ / -| * | 34a56a56c Merge tag '2.21.0.12' into release/2.22.0 -| |\ \ -| | |/ -| | * f84476ec7 (tag: 2.21.0.12) "Bump build to 2.21.0.12." -| | * 9c62a1569 Pull latest translations -| * | 8f8026d7f Merge branch 'mkirk/fix-first-reminder' into release/2.22.0 -| |\ \ -| | * | a885fb5de Fix first reminder too early, offset bugs. -| |/ / -| * | 90fc094d0 Copy tweak -| * | 900e32c31 Merge tag '2.21.0.11' into release/2.22.0 -| |\ \ -| | |/ -| | * 16b3b9bbc (tag: 2.21.0.11) "Bump build to 2.21.0.11." -| | * 907badd02 Sync translations -| * | 2462ea0a3 Merge tag '2.21.0.10' into release/2.22.0 -| |\ \ -| | |/ -| | * 8e0e0ad40 (tag: 2.21.0.10) "Bump build to 2.21.0.10." -| | * c7871b28d Make sure any new call migration settings take effect on first launch -| * | 35b72bc1b (tag: 2.22.0.0) "Bump build to 2.22.0.0." -* | | d9b8ce26f Merge branch 'collinstuart/strip-exif-data' -|\ \ \ -| |/ / -|/| | -| * | 6f7b4a6e4 Strip media metadata. -|/ / -* | f35fe4946 Merge branch 'mkirk/background-fetch' -|\ \ -| * | 8dfc584c2 Try to keep-alive registration lock w/ bg fetch -|/ / -* | a1de99f1f Merge tag '2.21.0.9' -|\ \ -| |/ -| * bd4857607 (tag: 2.21.0.9) "Bump build to 2.21.0.9." -| * 954e17418 Merge branch 'mkirk/fix-log-uploads' into release/2.21.0 -| |\ -| | * 39b87b702 Fix debuglogs.org integration -| |/ -| * 913cdad74 (tag: 2.21.0.8) "Bump build to 2.21.0.8." -| * b8fc4fce1 Merge branch 'mkirk/show-splash-on-first-launch' into release/2.21.0 -| |\ -| | * f459c9ce6 CR: rename SignalClassic constant -| | * 51ae93655 Ensure the user sees the experience upgrade -| | * 5739f074a Show migration screen at first launch. -| |/ -| * 9afce87dd Merge branch 'mkirk/run-call-settings-migration' into release/2.21.0 -| |\ -| | * 55a4b66ca Run call settings migration -| |/ -| * d12a6ae57 (tag: 2.21.0.7) "Bump build to 2.21.0.7." -| * 982cf971a Merge branch 'mkirk/fix-audio-category-for-notifications' into release/2.21.0 -| |\ -| | * 1ddf3bb4e (origin/mkirk/fix-audio-category-for-notifications) Fix "use ambient" for notifications -| |/ -| * cae40d408 (tag: 2.21.0.6) "Bump build to 2.21.0.6." -| * 126a4cb7c Fix build break -| * 6f3663fdc Merge branch 'mkirk/more-conservative-call-changes' into release/2.21.0 -| |\ -| | * 79ee5ed21 Be more conservative about logging legacy users into "Recents" -| |/ -| * 8d13ed6bb Merge branch 'mkirk-2.21.0/mix-notification-audio' into release/2.21.0 -| |\ -| | * 4e64b09ad Don't set audio to ambient while other audioActivity exists -| | * c2501d8d1 Don't migrate legacy users to use new audio tones -| | * 830e9f1bf Make "Signal Classic" audio stand out more -| | * 788316726 Fix "None" audio for fallback notifications. -| | * d3be2b4a3 Vibrate when playing sound as alert -| | * d7fcac8a5 In-App notifications don't pause background audio -| |/ -* | 2a297ca9e Merge branch 'charlesmchen/renameStorageManager_' -|\ \ -| * | bd8db864f Update cocoapods. -| * | db430d6aa Revert unwanted changes. -| * | 692ef423b Rename TSStorageManager to OWSPrimaryStorage. -| * | d6f4db152 Rename TSStorageManager to OWSPrimaryStorage. -|/ / -* | 09d561823 Merge branch 'charlesmchen/accountAttributesVsPin' -|\ \ -| * | 3435be5ab (charlesmchen/accountAttributesVsPin) Preserve registration lock when updating account attributes. -| * | 0f7b85295 Persist registration lock PIN. -|/ / -* | 80a119481 (origin/mkirk/2fa-registration-style) Merge branch 'mkirk/2fa-registration-style' -|\ \ -| * | 60a1cc568 Make 2FA registration screen look like the rest of registration -|/ / -* | 471a19476 Merge branch 'charlesmchen/registerVsRateLimit' -|\ \ -| * | 9499e684e (charlesmchen/registerVsRateLimit) Handle rate limits in registration flow. -| * | 7543a8285 Handle rate limits in registration flow. -|/ / -* | 3207aedeb Merge branch 'charlesmchen/sharedBackgroundTask' -|\ \ -| * | 4f55079a7 (charlesmchen/sharedBackgroundTask) Respond to CR. -| * | 2d6b9a7c8 Respond to CR. -| * | 9db940956 Share background tasks. -|/ / -* | 07ee3ea84 Merge tag '2.21.0.5' -|\ \ -| |/ -| * b0b012046 (tag: 2.21.0.5) "Bump build to 2.21.0.5." -| * dc3d4553a Merge branch 'mkirk/respect-silent-switch' into release/2.21.0 -| |\ -| | * 6077367e6 Notification sounds should respect silent switch -| |/ -* | d516bcc29 Merge branch 'mkirk/2fa-reminders' -|\ \ -| * | 1d3831ecc Registration Lock reminder view -| * | 54792ff46 Fix overzealous assert. -|/ / -* | e8f4a7bfe Merge tag '2.21.0.4' -|\ \ -| |/ -| * 1c24cf7da (tag: 2.21.0.4) "Bump build to 2.21.0.4." -| * f0cdd0c9e Merge branch 'mkirk/fix-default-sound-for-new-users' into release/2.21.0 -| |\ -| | * 760b77297 Default fallback notification should now be "Note" -| | * 95011bdfe order messageReceived sounds in bundle -| |/ -| * 58d84b6d6 "Bump build to 2.21.0.3." -| * 4d65695bd Fix typo -| * ef6bfaf7b (tag: 2.21.0.2) "Bump build to 2.21.0.2." -| * 73ddab476 Merge branch 'mkirk/fix-splash-presentation' into release/2.21.0 -| |\ -| | * eca164805 Don't "show" upgrade splash when receiving a voip notification -| |/ -* | 1ff2f3f42 Merge tag '2.21.0.1' -|\ \ -| |/ -| * aa82f0aa4 (tag: 2.21.0.1) "Bump build to 2.21.0.1." -| * 91a52cd81 (private/release/2.21.0) Merge branch 'charlesmchen/debuglogs2' into release/2.21.0 -| |\ -| | * fa07b77ad Update cocoapods. -| | * 864f1cc8e Clean up ahead of PR. -| | * 4834a85fb Add share option for debug logs. -| | * 256a30029 Integrate with logs service. -| | * 7b84afaaf Integrate with logs service. -| | * 4bbf0d9e3 Integrate with logs service. -| | * 06d16bdec Revert "Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1"" -| |/ -| * aaed4b6a8 Merge branch 'charlesmchen/profileAvatarDownloads' into release/2.21.0 -| |\ -| | * e89a0f815 Respond to CR. -| | * 5e02032fc Fix profile avatar downloads. -| | * 69c49d4a7 Fix profile avatar downloads. -| | * b62a43217 Fix profile avatar downloads. -| | * 15921fa0b Fix profile avatar downloads. -| | * dfa082238 Fix profile avatar downloads. -| |/ -| * 7f51ada7d Merge branch 'mkirk/fix-sound-migration' into release/2.21.0 -| |\ -| | * 1d7e2e367 Fix migration to work with fallback notifications as well -| |/ -| * 716db9f4c Merge branch 'mkirk/more-prominent-default' into release/2.21.0 -| |\ -| | * 46d944740 Make default audio tone more prominent -| |/ -* | ac8dbf81f Merge branch 'mkirk/ri-check' -|\ \ -| * | 17ed0f610 dedupe git hooks -| * | 72428350c Audit for missing reverse integration upon committing to master -|/ / -* | b023e77d0 Merge branch 'charlesmchen/requestFactory' -|\ \ -| * | 7fa7f9506 Cleanup ahead of PR. -| * | bdee76c8c Update cocoapods. -| * | 3e6db43b2 Clean up ahead of PR. -| * | 2395dbf66 Fix redundant sync sends. -| * | 59c745756 Clean up codebase. -| * | c2f092018 Elaborate request factory. -| * | 3acdd8439 Elaborate request factory. -| * | 004479a2c Elaborate request factory. -| * | c17a81936 Elaborate request factory. -| * | 0ca497846 Elaborate request factory. -|/ / -* | df9cc1d9a Fix Cocoapods. -* | 12bd50c3e Merge branch 'charlesmchen/2faVsRegistration' -|\ \ -| * | a87b79341 Respond to CR. -| * | 288d049ce Update l10n strings. -| * | baf6fcc53 Add 2FA registration view. -|/ / -* | 0dd91ab53 Merge branch 'charlesmchen/redundantSyncSends' -|\ \ -| * | b9458fffe Respond to CR. -| * | dcf7f550a Fix redundant sync sends. -| * | b07f466e0 Fix redundant sync sends. -|/ / -* | 60259a8a1 Merge branch 'release/2.21.0' -|\ \ -| |/ -| * dafde88f8 (tag: 2.21.0.0) Merge branch 'charlesmchen/explicitExpireTimer' into release/2.21.0 -| |\ -| | * 71972ebe2 (charlesmchen/explicitExpireTimer) Be more explicit about expire timer. -| |/ -* | 6ca55790d Cleanup. -* | 743715268 Merge branch 'charlesmchen/2fa' -|\ \ -| |/ -|/| -| * caeb97b46 Respond to CR. -| * a5128273b Clean up ahead of PR. -| * 055061ff5 Clean up ahead of PR. -| * 8c5429791 Sketch out 2FA settings views. -| * 2ebea2911 Sketch out 2FA settings views. -| * 4afedac68 Clean up ahead of PR. -| * ea783a8ad Work on two-factor auth settings UI. -| * e12a1e984 Work on two-factor auth settings UI. -| * 1f6cbd399 Sketch out 2FA feature. -|/ -* 3f9eb603e Merge branch 'mkirk/fix-remote-video' -|\ -| * f0ca957a0 Fix remote video view -|/ -* 05d078133 Merge branch 'mkirk/audio-migration-fixups' -|\ -| * fa37fdd30 Fix legacy sounds for voip pushes -| * e5ab6f101 Clean up audio files -| * a068b8573 Audio splashscreen artwork/copy -|/ -* d0bcd8d6c Merge tag '2.20.2.2' -|\ -| * 2038aff9c (tag: 2.20.2.2, origin/hotfix/2.20.2) "Bump build to 2.20.2.2." -| * 20d759dfe Merge branch 'mkirk/explicit-timer-stop' into hotfix/2.20.2 -| |\ -| | * 28c30bbe5 Be explicit when disappearing messages are disabled -| |/ -* | 13b533621 Merge tag '2.20.2.1' -|\ \ -| |/ -| * e392febb6 (tag: 2.20.2.1) "Bump build to 2.20.2.1." -| * be68e0537 (tag: 2.20.2.0) bump version -| * fd2aaad5a Merge branch 'mkirk/fix-group-timer-sync' into hotfix/2.20.2 -| |\ -| | * b48452a74 Fix group-sync disabling disappearing timer -| |/ -* | a71e00397 Fix build break related to Swift 4.1 syntax. -* | bf48ccd4a Merge remote-tracking branch 'origin/hotfix/2.20.1' -|\ \ -| |/ -| * 85eba0cac (tag: hotfix/2.20.2, tag: 2.20.1.1, origin/hotfix/2.20.1) "Bump build to 2.20.1.1." -| * c8550055d Merge branch 'mkirk/fix-shares' into hotfix/2.20.1 -| |\ -| | * 12d51d9e2 Fix sharing url when text is also present -| |/ -| * b1dd325ce Revert "Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1" -| * e4ee3e000 Revert "Respond to CR." -| * 45201d45e Respond to CR. -| * 7bbad0d5a (tag: 2.20.1.0) "Bump build to 2.20.1.0." -| * 8f203f99b Update l10n strings. -| * 3b984bd39 (private/hotfix/2.20.1) Merge branch 'mkirk/perm-thread' into hotfix/2.20.1 -| |\ -| | * 9dfbf6e6b Fix crash presenting settings dialog off main thread -| |/ -| * 815c9af15 Merge branch 'charlesmchen/unsafeFilenameCharacters' into hotfix/2.20.1 -| |\ -| | * 579da1c76 Refine handling of unsafe filename characters. -| | * 47a6d844c Refine handling of unsafe filename characters. -| |/ -| * de5d17a39 Merge branch 'charlesmchen/debugLogs' into hotfix/2.20.1 -| |\ -| | * 7e1ae3316 Refine changes to debug logs. -| | * 920c2b1d7 Rework log upload. -| |/ -| * d32e90c3d Fix build break. -| * a471cc32b Merge branch 'charlesmchen/backgroundEdgeCases' into hotfix/2.20.1 -| |\ -| | * 59f480d5c Use background tasks during storage registration and disappearing message jobs. -| |/ -* | d53448409 Merge branch 'mkirk/migration-splash' -|\ \ -| * | 37fdd407d CR: Add translation comment -| * | cf6dfe08b Custom audio notifications upgrade experience -|/ / -* | 87fa553a7 Merge branch 'mkirk/default-audio-fallback-push' -|\ \ -| * | f1f7f8745 Use aifc files for all notification sounds so we can confidently copy them over the statically named "NewMessage.aifc" which is used by fallback notifications -| * | e020b0ff9 Persist default sound so we can use it for fallback notifications -|/ / -* | 75e3516eb Merge branch 'mkirk/callKitPrivacyVsiOS11' -|\ \ -| * | 658b8c322 CR: typos and doc changes -| * | 5959cdf07 Simplify call privacy settings -| * | 5b9ab0cf5 Auto-disable CallKit privacy in iOS 11 and later. -|/ / -* | 775682052 Merge branch 'charlesmchen/customNotificationSounds3' -|\ \ -| * | 8f22facec Respond to CR. -| * | 38ff82ab9 Rebrand OWSAudioPlayer. -| * | a16c2adda Rework conversation settings view. -| * | 306af29d6 Restore "sonar ping" for "call connecting." -| * | 32b87d0e5 Remove custom ringtones. -| * | efeb00643 Add title for the mute section in conversation settings view. -| * | e54cf313e Use quiet versions of the notification sounds in foreground. -| * | 55b9aa408 Preserve 'classic' Signal notification and ringtone for legacy users. -| * | 390cf3c80 Revive the 'classic' Signal notification and ringtone. -| * | ed95eec76 Preview sound settings in app settings and conversation settings views. -| * | 62af7ddc1 Add "none" option for sounds. Use AVPlayer for everything. -|/ / -* | 57ccde44f Merge branch 'charlesmchen/duplicateTimestampFail' -|\ \ -| * | ad78b1ea5 Convert duplicate timestamp fail to log. -|/ / -* | 42e136959 Merge branch 'charlesmchen/iOS9minimum' -|\ \ -| * | 2c1560692 Respond to CR. -| * | 99aedca45 Strip out special casing for pre-iOS 9 users. -| * | 44e38709d Update minimum iOS version to 9.0. -| * | 710d16418 Update minimum iOS version to 9.0. -|/ / -* | f0e1cea27 Merge branch 'mkirk/send-ice-updates-immediately' -|\ \ -| * | 5f305f844 Send ICE updates immediately after sending CallOffer for faster call connection. -|/ / -* | 76aee0581 Merge branch 'mkirk/dont-send-sender-read-receipts-to-self' -|\ \ -| * | b79244aff Don't enqueue sender read receipts from self-sent messages -|/ / -* | c66fb70b2 Merge branch 'mkirk/use-contact-ringtones' -|\ \ -| * | e8c5509f3 Respect system contact ringtones -|/ / -* | f7935bc36 Merge branch 'charlesmchen/customNotificationSounds2' -|\ \ -| * | 6c8a8fa09 Add new "note" audio asset for fallback push notifications. -| * | 0c20f2215 Improve sound settings view. -| * | e0144dab5 Improve sound settings view. -| * | 899799af9 Improve sound settings view. -| * | 5e8f3086d Update call sounds. -| * | a0f4723fa Update call sounds. -| * | a44a11761 Add custom ringtone sounds. -| * | cd3289565 Add UI for editing per-thread notification sounds. -| * | 396fe8270 Add UI for editing per-thread notification sounds. -| * | dc8b8ca0b Add per-thread custom notification sounds. -| * | 9aa02489b Custom notification sounds in local notifications. -| * | a837c5d41 Custom notification sounds. -| * | 60d839d7a Custom notification sounds. -| * | 5c3f6b0ee Custom notification sounds. -|/ / -* | 3d892abc4 "Bump build to 2.21.0.0." -|/ -* 03bea4fd8 (tag: 2.20.0.42, origin/release/2.20.0) "Bump build to 2.20.0.42." -* 9e3aa77fc Update l10n strings. -* cf39181d0 Merge branch 'mkirk/freeze-after-dismiss' -|\ -| * 5af112321 Fix freeze in host app after "dismissing" select thread VC -|/ -* 01cde6740 (tag: 2.20.0.41) "Bump build to 2.20.0.41." -* fbab526b3 Update l10n strings. -* ff88f1173 Update l10n strings. -* ec32d8839 (tag: 2.20.0.40) "Bump build to 2.20.0.40." -* e0793a0ea Merge branch 'charlesmchen/backgroundVsMigration' -|\ -| * 5235f9795 Use background task while migrating. -|/ -* 8ec9540b8 Merge branch 'charlesmchen/handleCaptions' -|\ -| * 10ca369da Respond to CR. -| * 6006d2287 Improve handling of attachments with captions. -| * 8576da791 Improve handling of attachments with captions. -| * 96b5f2279 Improve handling of attachments with captions. -|/ -* d30dd2204 (tag: 2.20.0.39) "Bump build to 2.20.0.39." -* 81629a87d Fix build break. -* 5e88110a0 (tag: 2.20.0.38) "Bump build to 2.20.0.38." -* 8e9261e1b (tag: 2.20.0.37) "Bump build to 2.20.0.37." -* 708ff7efb (tag: 2.20.0.36) "Bump build to 2.20.0.36." -* 1112f7a64 Merge branch 'charlesmchen/conversationViewVsModifiedExternal' -|\ -| * 152c57090 Respond to CR. -| * 03670b486 Rename the view horizon. -| * fabbe4611 Clean up ahead of PR. -| * 4e1e23282 Flush writes from other processes. -| * 1ff4f8524 Improve handling of db modifications while conversation view is not observing. -| * 5444fc73b Improve handling of db modifications while conversation view is not observing. -| * 2ac771677 Improve handling of db modifications while conversation view is not observing. -|/ -* 31d22e3e3 (tag: 2.20.0.35) "Bump build to 2.20.0.35." -* ba31059e4 Merge branch 'mkirk/fix-share-with-caption' -|\ -| * e43d0b1b5 Fix "Share" for attachment with caption -|/ -* 88d8eacc6 (tag: 2.20.0.34) "Bump build to 2.20.0.34." -* e27ab3620 Merge branch 'mkirk/remove-share-menu' -|\ -| * 5ba5d3f52 Remove "Share" from edit menu -|/ -* 9428b5d02 Merge branch 'mkirk/obscure-alert' -|\ -| * d7f8c3e9d Ensure inputAccessory doesn't obscure the SN alert -|/ -* c0d112639 Merge branch 'mkirk/fix-date-formatting-crash' -|\ -| * 7040437ca Handle nil date when formatting -|/ -* 2575d01b9 (tag: 2.20.0.33) "Bump build to 2.20.0.33." -* 26fbe28c4 Merge branch 'charlesmchen/legacyPasswordOnSuccess' -|\ -| * a4855acf4 Don't clear legacy db password until conversion completes. -|/ -* 85e504745 Merge branch 'charlesmchen/filterUnicodeOrderingCharacters' -|\ -| * 1109158b5 Add comment. -| * 70ba1720d Filter unicode ordering letters. -|/ -* 6ddd9d788 Merge branch 'charlesmchen/backgroundTaskVsDBTransactions' -|\ -| * 3bb802189 Use background tasks during db transactions. -|/ -* 2e1dad740 Merge branch 'charlesmchen/robustMigration2' -|\ -| * 706006539 Improve the robustness of the migration logic. -|/ -* cf507487c (tag: 2.20.0.32) "Bump build to 2.20.0.32." -* 4cfb71dc6 Merge branch 'charlesmchen/robustMigration' -|\ -| * d91507d89 Improve the robustness of the migration logic. -|/ -* e8cbba61f (tag: 2.20.0.31) "Bump build to 2.20.0.31." -* 9295a5630 Elaborate logging around storage migration. -* 1fb170715 Merge branch 'charlesmchen/heicHeifFixes' -|\ -| * 7132179c5 Fix handling of HEIF/HEIC when attaching image "as document." -|/ -* 11680958d (tag: 2.20.0.30) "Bump build to 2.20.0.30." -* b1c4dd7b5 Merge branch 'charlesmchen/storageFailureAlert' -|\ -| * 14122dab5 Fix the storage failure alert. -|/ -* 5d949368a (tag: 2.20.0.29) "Bump build to 2.20.0.29." -* e82954193 Merge branch 'charlesmchen/callConnectionGlitches' -|\ -| * 1a0f4bf92 Improve logging around network activity. -|/ -* ef7d5df09 (tag: 2.20.0.28) "Bump build to 2.20.0.28." -* fbbf432a4 Merge branch 'mkirk/file-browser' -|\ -| * 033505afd Remove slow file protection updates from launch path -| * 6eb1ce682 Debug file browser -|/ -* e6cad5dd2 Merge branch 'mkirk/call-audio-fixups' -|\ -| * 8dfe06e3f Ensure audio session is default after call is terminated. -| * 6eb1951ee Don't stop audio until after CallKit audio session is deactivated -|/ -* 9b73ff14b (tag: 2.20.0.27) "Bump build to 2.20.0.27." -* ef40f0821 "Bump build to 2.20.0.26." -* 8fde4a3a6 Merge branch 'mkirk/call-inaudible' -|\ -| * 707ab5f5a Minimize changes around call audio activity -| * 4dd1c7813 Instrument calls to ensure audio session is maintained -| * abb51b565 Don't de-activate audio sesion when other audio activities are happening -|/ -* 22d078f3c Merge branch 'charlesmchen/indicVsSAE' -|\ -| * 283fe1764 Apply Indic script fixes to SAE and master. -|/ -* 934193570 Merge branch 'charlesmchen/notMigratedWarning' -|\ -| * c937aaaf8 Improve handling of the not migrated case. -| * 6935298f6 Improve handling of the not migrated case. -|/ -* 5bc96d437 Merge branch 'charlesmchen/profileConsistency' -|\ -| * 03f6d473a Fix issues around profile updates. -|/ -* 3a2ec950c Merge branch 'charlesmchen/scrollVsAttachmentApproval' -|\ -| * ceaf02844 Always scroll to bottom after sending attachments. -|/ -* 90b8ee484 Merge remote-tracking branch 'origin/hotfix/2.19.7' -|\ -| * 3300e788e (tag: 2.19.7.6, private/hotfix/2.19.7, origin/hotfix/2.19.7) Bump build to 2.19.7.6. -| * 77bf0b66f Fix attachment MIME types. -| * 9c23e2baa (tag: 2.19.7.5) Bump build to 2.19.7.5. -* | d648a258d Merge branch 'hotfix/2.19.7' -|\ \ -| |/ -| * 4c8c40ca2 (tag: 2.19.7.4) Bump build to 2.19.7.4. -| * abfd333a1 Address Indic script crash. -* | a4906b278 Update l10n strings. -* | 950526f31 Merge branch 'charlesmchen/saeNotifications' -|\ \ -| * | 3ab33b997 Respond to CR. -| * | 33cb8b7e4 Revert "Surface error messages in SAE as alerts." -| * | bd51ae164 Surface error messages in SAE as alerts. -|/ / -* | 87233490d (tag: 2.20.0.25) "Bump build to 2.20.0.25." -* | 569728118 Merge branch 'charlesmchen/saeFilenames' -|\ \ -| * | 2e1b8a7b8 Respond to CR. -| * | 7ea1f3d92 Fix handling of file types in SAE. -| * | c2787341a Fix handling of URLs in SAE. -|/ / -* | efbcdb98f Merge branch 'charlesmchen/failedStatusMessage' -|\ \ -| * | 8fdc61c72 Fix failed status messages in message detail view. -|/ / -* | b511d60b3 Merge branch 'charlemschen/signalAppearanceVsSAE' -|\ \ -| * | fdf9b023b Don't apply signal appearance in SAE. -|/ / -* | 53eb9d07e (tag: 2.20.0.24) "Bump build to 2.20.0.24." -* | 394cd5c94 Merge branch 'charlesmchen/refineSAELifecycle' -|\ \ -| * | c29898f43 Refine the SAE lifecycle. -|/ / -* | 1259851f7 (tag: 2.20.0.23) "Bump build to 2.20.0.23." -* | 47aa29db2 Fix build breakage. -* | da8da2921 (tag: 2.20.0.22) "Bump build to 2.20.0.22." -* | 1c69cd3dc Merge branch 'mkirk/missing-messages' -|\ \ -| * | da15f245c CR: fix early return, assert on error -| * | b4359b33d Fix "lose messages received while in background" -|/ / -* | 4262a83e0 (tag: 2.20.0.21) "Bump build to 2.20.0.21." -* | c1a78d1f1 Merge branch 'charlesmchen/saeShutdown' -|\ \ -| * | d13511ca7 Exit SAE when complete. -|/ / -* | d374e6ab8 "Bump build to 2.20.0.20." -* | 7ff99fe76 Merge branch 'mkirk/fixup-readiness-dispatch' -|\ \ -| * | 5c432a2bc Fix crash on launch in debug. -|/ / -* | 0522f33a8 (tag: 2.20.0.19) "Bump build to 2.20.0.19." -* | f8b7c08be Merge branch 'charlesmchen/batchProcessingGlitch' -|\ \ -| * | b7958262b Respond to CR. -| * | 8930110ef Fix glitch in batch processing of incoming messages. -| * | 6f28c7525 Fix glitch in batch processing of incoming messages. -|/ / -* | e48542e1d Merge branch 'charlesmchen/iOS8Nag' -|\ \ -| * | 9508761f0 Respond to CR. -| * | 4b62faf2f Aggressively nag iOS 8 users to upgrade iOS. -|/ / -* | 132bf81c0 Update l10n strings. -* | 09665973a (tag: 2.20.0.18) "Bump build to 2.20.0.18." -* | 508bc72e6 Merge branch 'mkirk/logging-fixups' -|\ \ -| * | 3d5f7e6bf Clean up logging -|/ / -* | 929233c9e Merge branch 'mkirk/media-detail-tap-shift' -|\ \ -| * | c6e5d4369 Don't adjust inset when fully zoomed in. -|/ / -* | e0294b238 Merge branch 'mkirk/fix-redundant-transcript-caption' -|\ \ -| * | 4d0362f9a Don't create redundant caption for sync'd transcripts. -|/ / -* | 337f4a141 Merge branch 'mkirk/fix-details-bubble-layout' -|\ \ -| * | 19eb17b46 Fix bubble layout in message details -|/ / -* | 6c357e822 (tag: 2.20.0.17) "Bump build to 2.20.0.17." -* | 042f32bd2 Merge branch 'charlesmchen/messageSenderDeadlocks' -|\ \ -| * | 81522e4a2 Respond to CR. -| * | 888bf9256 Avoid deadlocks in message sender. -| * | 01496b2db Avoid deadlocks in message sender. -| * | a19882baa Avoid deadlocks in message sender. -|/ / -* | d5e61dac9 Merge branch 'collinstuart/constant-time-compare' -|\ \ -| * | cc94573e9 Constant time compare -|/ / -* | b358a75e3 Merge branch 'mkirk/crash-on-first-message' -|\ \ -| * | ea12ed4c2 Fix dynamic type check which was too restrictive -|/ / -* | f131c71d9 Merge branch 'charlesmchen/messageDateTimes' -|\ \ -| * | 0944c2661 Respond to CR. -| * | 48b6c3daf Refine message date/time formatting. -|/ / -* | 2d7a10ac0 [Pods] remove userdata -* | 286c0133d Update Cocoapods. -* | 3e14e9602 update l10n strings. -* | 3246bcf62 [Pods] remove userdata dir from Pods.xcodeproj -* | b999cd9e6 Merge branch 'mkirk/crash-on-search' -|\ \ -| * | ae2ddb25c CR: add assert -| * | d6b3e191d Fix crash while searching when group somehow has nil members -| * | a23f1b86e nullability annotations for TSGroupModel -|/ / -* | 945c7cd1f Merge branch 'mkirk/fix-notification-percents' -|\ \ -| * | cb8767d19 CR: duplicate comments, DRY -| * | 44678e395 CR: weak capture and clearer comments -| * | debd556e0 Fix notification % escaping, debug UI -| * | 9ad437a04 Merge remote-tracking branch 'jlund/github-updates' -| |\ \ -| | * | e411bd5ee Update cocoapods. -| | * | 2c18a75d1 Update to the new GitHub organization name -| |/ / -| * | f3d0cb49e Merge branch 'charlesmchen/debugLogging' -| |\ \ -|/ / / -| * | e3776015b Respond to CR. -| * | 246a56e92 Respond to CR. -| * | 33686594e Tweak debug logging. -|/ / -* | ab95c501e Merge branch 'charlesmchen/appDelegateHooksVsAppReadiness' -|\ \ -| * | 44cbf142a Respond to CR. -| * | 3e8b08e19 Defer handling app delegate hooks until app is ready. -|/ / -* | 6ed5d814f Merge branch 'charlesmchen/saeTODOs' -|\ \ -| * | ba42ac73d Revisit TODOs in the SAE work. -| * | 9c8178653 Revisit TODOs in the SAE work. -|/ / -* | ebb778cf5 Merge branch 'charlesmchen/saeRefinements' -|\ \ -| * | d54f6aba0 Refine SAE UI. -| * | 114df1837 Refine SAE UI. -|/ / -* | 6feaf0db1 Merge branch 'charlesmchen/appLaunchFailure' -|\ \ -| * | 7c199faf8 Respond to CR. -| * | 98843cd45 Let users submit debug logs if app launch fails. -|/ / -* | 4aaae856d (tag: 2.20.0.16) "Bump build to 2.20.0.16." -* | 4bf453da3 Merge branch 'mkirk/rtl-caption' -|\ \ -| * | 5e95c9060 Fix "caption toolbar not showing" for RTL -|/ / -* | 9b8e2449f Update Carthage for iOS8 compatible WebRTC M63 -* | dc8b5fb97 track pod dependencies publicly -* | 87ef6b1af Merge branch 'mkirk/fix-disappearing-detail' -|\ \ -| * | 5793211a0 Fix "bubble disappears" when receiving read receipt -|/ / -* | 11ad4e788 (tag: 2.20.0.15) "Bump build to 2.20.0.15." -* | 208416f83 Merge branch 'charlesmchen/protocolContext_' -|\ \ -| * | b64528e81 Respond to CR. -| * | 78c4c00ea Respond to CR. -| * | 862172072 Respond to CR. -| * | bd0f60179 Respond to CR. -| * | 38950ae2e Respond to CR. -| * | 6b357f944 Respond to CR. -| * | 43765ef3b Respond to CR. -| * | 51cec20c5 Clean up ahead of PR. -| * | 7d3f79440 Clean up ahead of PR. -| * | c8e7eb903 Add protocol context to protocol kit. -| * | bbd689bfd Add protocol context to protocol kit. -| * | d3e16583e Add protocol context to protocol kit. -| * | 074046b98 Add protocol context to protocol kit. -| * | 7358f3053 Add protocol context to protocol kit. -| * | 218bb15ea Add protocol context to protocol kit. -| * | 39e353503 Add protocol context to protocol kit. -| * | 71782e036 Add protocol context to protocol kit. -| * | 122ef91e5 Add protocol context to protocol kit. -|/ / -* | 169c455d1 Merge branch 'mkirk/open-settings-vs-share-extension' -|\ \ -| * | a1d307370 Cannot open settings from share extension -|/ / -* | bedd1f55f Merge branch 'mkirk/fix-voiceover-rebased' -|\ \ -| * | c646f7633 Garther audio concerns, clean up session when done -|/ / -* | fa9ac5aa4 Merge branch 'mkirk/restrict-pan-gesture' -|\ \ -| * | 7734958ee Make "swipe for info" RTL compatible -| * | 54f7c298b Only initiate "show details" pan gesture when swiping back -| * | 76d1b9dad proper title case -|/ / -* | c82571bd3 Merge branch 'mkirk/fix-receiving-calls' -|\ \ -| * | e3469649f Fix receiving calls -|/ / -* | d3362d5b4 Merge branch 'mkirk/iphonex-vs-sharing' -|\ \ -| * | 0f9dd46b9 Fix attachment approval layout on iPhoneX -|/ / -* | c0bf3d57c (tag: 2.20.0.14) "Bump build to 2.20.0.14." -* | dbf2c6575 Merge branch 'charlesmchen/experienceUpgradesVsIPhoneX' -|\ \ -| * | 11cdd2790 Fix layout of experience upgrade view on iPhone X. -| * | c67c46217 Fix layout of experience upgrade view on iPhone X. -|/ / -* | 94b34e241 Merge branch 'charlesmchen/protoUpdates' -|\ \ -| * | 799949e54 Refine sync messages. -| * | 59ff1561f Set the timestamp property on data messages. -| * | 4218af13d Send image width/height for image and video attachments. -| * | 3a4180214 Send image width/height for image and video attachments. -| * | 43ed8d9a5 Send "disappearing messages" state for groups. -| * | b16a65a4c Sync block state for contacts. -| * | 742d4cabc Send "disappearing messages" state for contacts. -| * | 2dc37d598 Updates service proto schema to latest. -|/ / -* | e39ca59ee Merge tag '2.19.5.0' -|\ \ -| |/ -| * c60422e92 (tag: 2.19.5.0, origin/hotfix/2.19.5) bump version -| * 9ee293227 Merge branch 'mkirk/fix-movie-confirmation-preview' into hotfix/2.19.5 -| |\ -| | * 3a5fa63cd Fix confirmation preview -| |/ -| * 497b8b960 Merge branch 'mkirk/dont-hide-keyboard-when-menu-popped' into hotfix/2.19.5 -| |\ -| | * f41dfa509 Re-aquire first responder when necessary. -| |/ -* | d4c20ad5c Merge branch 'mkirk/keygen-revamp' -|\ \ -| * | 4f8db63fb Ensure keyspec is generated before DB is created -| * | 6f959ff29 CR: be more conservative about deriving key spec, clear old passphrase after deriving key spec. -| * | d22fc664f more granular key access -| * | 426c9baa1 Key material changes -| * | 938b9c85b Don't crash on clean install -| * | 44bbaeef5 fixup test -|/ / -* | 10c503bd3 Merge branch 'charlesmchen/fixSAE' -|\ \ -| * | 5f20d32b4 Fix SAE readiness. -|/ / -* | 9605d80e9 (tag: 2.20.0.13) "Bump build to 2.20.0.13." -* | 419df70e0 Merge branch 'mkirk/fixup-tests' -|\ \ -| * | c4edb0b53 Fixup some tests -|/ / -* | a2b9f9bfc Merge branch 'charlesmchen/asyncDBRegistrations' -|\ \ -| * | 4bfdef520 Respond to CR. -| * | a30170b3b Prefer "app is ready" flag to "storage is ready" flag. -| * | be1fde905 Don't mark app as ready until all version migrations are done. -| * | 3e09143a3 Update YapDatabase to reflect CR. -| * | 1c4b321a9 "Bump build to 2.20.0.12." -| * | 963d0547a Clean up ahead of PR. -| * | 8e427111e Clean up ahead of PR. -| * | ebbe96a5d Clean up ahead of PR. -| * | f9f60bc14 Ensure app delegate hooks are ignored until app is ready. -| * | d46914831 "Bump build to 2.20.0.11." -| * | 6eddfae21 Improve post-migration testing tools. -| * | bb44def8b "Bump build to 2.20.0.10." -| * | 769c1ce24 "Bump build to 2.20.0.9." -| * | 02a972c9d Improve logging in database conversion; disable orphan cleanup. -| * | 8325c3719 Fix build breakage. -| * | 873c78913 Fix build breakage. -| * | b9ec7d96e Register all database views asynchronously. -| * | aeeef4341 Register all database views asynchronously. -| * | b21f79375 Register all database views asynchronously. -| * | eb180ba5c Register all database views asynchronously. -| * | 100adae24 Register all database views asynchronously. -| * | 5cf89a0f3 Register all database views asynchronously. -|/ / -* | 96b7dc516 Update YapDatabase to reflect CR. -* | df240da7e Merge branch 'charlesmchen/photosAsDocuments' -|\ \ -| * | fa76e524c Respond to CR. -| * | 9c84bdb10 Add support for images as documents. -|/ / -* | f4323411d Merge branch 'charlesmchen/debugUIRefinements_' -|\ \ -| * | 7ebeeda5f Clean up ahead of PR. -| * | 3609275c2 Handle malformed row updates. -| * | 6f7f1b3b0 Improve pre-migration testing tools. -| * | 9d101c3f5 Elaborate Debug & Internal UI. -| * | 32b3e89c5 Elaborate Debug & Internal UI. -|/ / -* | 585f15a01 Respond to CR. -* | 115e98af1 Merge branch 'mkirk/block-vs-share' -|\ \ -| * | 456a931b9 Fix block handling for ContactThreads, previously it only worked for recipients without a thread. -|/ / -* | eb440c1c8 "Bump build to 2.20.0.8." -* | 3c2b5e54d Add more logging to database conversion. -* | d9bec1db5 (tag: 2.20.0.7) "Bump build to 2.20.0.7." -* | 639fdb937 (tag: 2.20.0.6) "Bump build to 2.20.0.6." -* | 41b7a8dd7 Fix build breakage. -* | 867451266 (tag: 2.20.0.5) "Bump build to 2.20.0.5." -* | e2fa695fc Fix build break. -* | 2003c6888 (tag: 2.20.0.4) "Bump build to 2.20.0.4." -* | 0ba93a1a0 Merge branch 'charlesmchen/saeVsFileTypes2_' -|\ \ -| * | b3e6278a4 Clean up ahead of PR. -| * | 51fb062af Revert "Revert "Clean up ahead of PR."" -| * | 9d909025c Handle UIImage shares. -| * | 374714c45 Clean up ahead of PR. -| * | 87f5648fc Revert "Clean up ahead of PR." -| * | 79ee6fa31 Add Debug UI around sharing UIImage. -|/ / -* | 0c6639cf5 Merge branch 'charlesmchen/saeVsFileTypes' -|\ \ -| * | 6a7f06f94 Respond to CR. -| * | 74cd37dd7 Clean up ahead of PR. -| * | 56ef293ed Clean up ahead of PR. -| * | f19448226 Clean up ahead of PR. -| * | 0c16f0ad5 Clean up ahead of PR. -| * | b61c716ea Clean up ahead of PR. -| * | 9c3415a91 Clean up ahead of PR. -| * | 30b3463c0 Clean up ahead of PR. -| * | 9b5327cc8 Improve handling of unexpected types. -| * | d1c17167c Don't send text files as text messgaes. -| * | 64e4f054b Add message approval view. -| * | e905098fb Add message approval view. -| * | 069587b15 Add message approval view. -| * | 9845ef6da Add message approval view. -| * | 3cfc77835 Add message approval view. -| * | 2af858c52 Add message approval view. -| * | 979386ee9 Improve handling of text and url shares. -| * | 5770a18b0 Handle text shares like URLs. -| * | 9718387af Send URLs as text messages. -| * | 085975ebe Prepopulate caption field with URL. -| * | 9c4ce3d30 Exclude contacts from SAE. -| * | 2e8a53b4a Don't add captions to text messages. -| * | 992e92614 Unpack oversize text messages if possible. -| * | 6e70c479e Improve handling of contacts. -| * | d85ccd1aa Handle data-based share item providers. -| * | 23c1db5cc Refine filtering of share types. -| * | fc4b0a359 Clean up ahead of PR. -| * | 3f74c488b Clean up ahead of PR. -| * | 03877867f Clean up ahead of PR. -| * | b9bd21e73 Improve presentation of text attachments in attachment approval view. -| * | c0d4c3f1d Fix handling of URL shares. -| * | 112e36943 Fix handling of URL shares. -| * | 6a80db784 Enable support for sharing urls in SAE. -|/ / -* | a14e1e8fd Merge branch 'charlesmchen/unregisterVsSAE' -|\ \ -| * | da0b7df1b Respond to CR. -| * | 482ad0864 Handle unregistration in SAE. -|/ / -* | 8a936dcbd Merge branch 'charlesmchen/removeSpuriousWarning' -|\ \ -| * | 6a81d8e5c Respond to CR. -| * | 7e769de5d Remove spurious warning. -|/ / -* | 1db1768af Merge branch 'charlesmchen/slaveBuildOpenSSL' -|\ \ -| * | 513ba5776 Update OpenSSL build. -|/ / -* | 9dbd907b7 Merge branch 'charlesmchen/internalBuildNumberSuffix' -|\ \ -| * | fd0bc807d Remove suffix for internal build numbers. -|/ / -* | 785cc14ad Merge branch 'charlesmchen/databaseConversion' -|\ \ -| * | 21a010672 Update reference to YapDatabase. -| * | d8f72dbec Clean up ahead of PR. -| * | 0cc7f3e00 Clean up ahead of PR. -| * | 2375cc2f7 Add support for key specs. -| * | 5d422e03d Add support for key specs. -| * | c5079ed3d Add support for key specs. -| * | 224c24e68 Use key spec for databases. -| * | a3e77019e Update storage to use database salts. -| * | 2773fcb5d Clean up ahead of PR. -| * | 149199138 Clean up ahead of PR. -| * | a05acd017 Add protocol context to protocol kit. -| * | d0f1706a4 Modify YapDatabase to read converted database. -| * | 3cd1b2c96 WIP comment -| * | acc97b197 Properly force checkpoint at end of conversion -| * | 468dedf58 Use debug configuration when building Signal for tests -| * | 629713792 Disable optimizations when building tests for SignalMessaging -| * | eadb64b75 Elaborate test suite around database conversion. -| * | 9801689c0 Modify YapDatabase to read converted database. -| * | 0a2439937 cleanup -| * | 45e44ca08 Modify YapDatabase to read converted database, part 3. -| * | d7a43d00d Modify YapDatabase to read converted database, part 2. -| * | 173da64bc Modify YapDatabase to read converted database, part 1. -| * | 3b681aba3 Successfully convert database. -| * | cc15092eb Resolve issues around database conversion. -| * | 11a709a62 WIP: set plaintext header length -| * | 71dc7f55d Copy DB setup / keying from Yap into conversion -| * | 05035e40a Fixup tests -| * | c6cc497ea Don't migrate database until verifying keychain is accessible -| * | 1bff0f2b0 Incomplete commit starting work on loading databases for conversion. -| * | 5ba5b763e Add tests around database conversion. -| * | dc7334257 Convert databases if necessary. -| * | 6b51be75a Revert "Set preprocessor symbols for internal builds." -| * | a91056c5e Set preprocessor symbols for internal builds. -|/ / -* | fcb9c2e64 Merge branch 'mkirk/fix-timer-offset' -|\ \ -| * | 6491bb895 Fix timer offset -|/ / -* | a70a97ae4 Merge branch 'mkirk/disappearing-status' -|\ \ -| * | 886c0174a Rename color per code review -| * | baa312f44 Timer button with duration label -| * | 5c76d4c99 Stopwatch Asset instead of hourglass -| * | 5c2075cdb Show disappearing messages timer in share extension -|/ / -* | e0ea3921f Merge branch 'mkirk/media-permissions' -|\ \ -| * | 3ca5ec272 Ensure media-library permissions when accessing media library -|/ / -* | 4b03482ee Merge branch 'charlesmchen/releaseConfiguration' -|\ \ -| * | c947f6b22 Modify build version script to support --version and --internal switches. -| * | 4e15e9bf2 Add Signal "internal" scheme with DEBUG and INTERNAL flags set for signal project. -| * | a21bc4f4b Convert SAE scheme to a shared scheme. -|/ / -* | c7376d76c Merge branch 'mkirk/fullscreen-approval' -|\ \ -| * | 5dde17d93 Show approval/caption view in app. -|/ / -* | 58558b36d Add clarifying comment. -* | d75b57758 Merge branch 'mkirk/ri-2-19-4' -|\ \ -| * \ 3f3a4bc49 Merge remote-tracking branch 'origin/master' into mkirk/ri-2-19-4 -| |\ \ -| |/ / -|/| | -* | | 6532a3237 Merge branch 'CollinStuart-collinstuart/update-build-documentation' -|\ \ \ -| * | | 225ad5a4a Update build instructions -| * | | f542e0d25 Update build instructions -|/ / / -| * | 94d58b88b Play video inline in approval view -| * | 0c6a42003 clang-format after RI -| * | a423fe8a0 WIP Merge tag '2.19.4.4' -| |\ \ -|/ / / -| | _ -| * 56112e79b (tag: 2.19.4.4, origin/hotfix/2.19.4) bump build -| * 7eb6b1cdd Revert submodule update from "Bump version to 2.19.4." -| * a4cadfecf (tag: 2.19.4.3) bump build -| * 764b81535 (tag: 2.19.4.2) bump build -| * 9c9734f5a Merge branch 'hotfix-2-19-4/fix-zoom' into hotfix/2.19.4 -| |\ -| | * 63c23b77d Cleanup presentation view, feels less blurry -| | * 1ef824029 Fix distorted images -| | * 3582ab42d Fix media detail presentation -| | * 7c2bfdfb1 rename: imageView -> mediaView -| | * 8851413b3 CR: cleanup, remove debug animation time, move constant -| | * e140ffc42 Fullscreen presentation touchups -| |/ -| * d6ea5bad6 Merge branch 'hotfix-2-19-4/fix-content-offset' into hotfix/2.19.4 -| |\ -| | * 74e03aad0 Fix intermittent content offset problem -| |/ -| * 7be8f0083 (tag: 2.19.4.1) Bump build to 2.19.4.1. -| * ea4912e93 Merge branch 'mkirk/fix-keyboard-glitch' into hotfix/2.19.4 -| |\ -| | * 74019b2ae Fix keyboard animation glitch after sending -| |/ -| * e11ac51e3 (tag: 2.19.4.0) Bump version to 2.19.4. -| * 2b81d4553 Merge branch 'mkirk/input-accessory-view' into hotfix/2.19.4 -| |\ -| | * 1ec409ad2 CR: re-enable default keyboard toggle -| | * c91658119 CR: double tap zoom centers on tap location -| | * 8d2934d86 CR: remove unnecessary code, comments -| | * 412fe2735 Rename FullImageViewController -> MediaDetailViewController -| | * 8454e512d Use FullSreen media VC for message details -| | * c7c433c59 iOS8 compatability for video player -| | * 86d61eee3 Custom video player layer to avoid "double present/dismiss" -| | * 918e3f7df Videos play in full-screen media view controller, use modern movie player. -| | * 81268012e Better keyboard management. -| |/ -* | 7947cc0fe Merge branch 'charlesmchen/updateOpenSSL' -|\ \ -| * | 63dc3391b Update OpenSSL to new version, app extension compliant. -|/ / -* | 5aa016add Merge branch 'charlesmchen/sessionEdgeCases_' -|\ \ -| * | 0d5b5bc44 Respond to CR. -| * | 3de9a4ea5 Add debug UI actions around clearing and snapshotting session state. -|/ / -* | a1770ec7f Merge branch 'charlesmchen/robustBackup' -|\ \ -| * | 05b034e92 Clear out NSUserDefaults during backup restore. -| * | 67197ddf1 Rename any existing files and directories in restored directories. -|/ / -* | 09032552c Merge branch 'charlesmchen/dontUseMainApplicationState' -|\ \ -| * | 2b528ad89 Don't use mainApplicationState in business logic. -|/ / -* | b271eab4c Merge branch 'charlesmchen/skipRedundantSyncMessages' -|\ \ -| * | fec2410ac Respond to CR. -| * | 3f2bee838 Respond to CR. -| * | d81d85c38 Respond to CR. -| * | c308e2511 Skip redundant sync messages. -| * | a2b67a17f Skip redundant sync messages. -| * | 41e6eaeaf Skip redundant sync messages. -|/ / -* | de4c5e0b1 Merge branch 'charlesmchen/sessionDatabaseRevert2_' -|\ \ -| * | 76676659f Respond to CR. -| * | 17907dca1 Clean up ahead of PR. -| * | 15b8e5832 Retain changes from session database branch. -|/ / -* | 76a295aaa Merge branch 'charlesmchen/backup' -|\ \ -| * | 59933ce1d Fix rebase breakage. -| * | 5ba8445f0 Fix rebase breakage. -| * | df53033ca Clean up ahead of PR. -| * | 0422e4252 Clean up ahead of PR. -| * | f6296f1fe Clean up ahead of PR. -| * | 16f731757 Complete backup restore/import. -| * | 272a90d26 Add import back up UI. Begin work on import backup logic. -| * | 857ca56ab Rework progress mode of export backup UI. -| * | 980b3d25a Rework "export backup" UI. -| * | cb4b44b8f Lock databases during backup export. -| * | b77382f99 Fix security issues in the backup process. -| * | 2011dae8b Show share UI for backups. -| * | ea945558c Show share UI for backups. -| * | 2789c0f12 Write backup to encrypted zip. -| * | 8769fb07c Write backup to encrypted zip. -|/ / -* | 221a21115 Merge branch 'charlesmchen/saeLookupNonContacts' -|\ \ -| * | 58e925268 Let users send to non-contacts, non-threads in SAE. -| * | 4d6ee9e2d Let users send to non-contacts, non-threads in SAE. -| * | 9e89502fd Let users send to non-contacts, non-threads in SAE. -|/ / -* | 49fc30229 Merge branch 'charlesmchen/sessionDatabaseRevert_' -|\ \ -| * | 89c7ebf74 Respond to CR. -| * | bf3f5dd14 Respond to CR. -| * | 77572bdae Retain changes from session database branch. -| * | 1839b1055 Retain changes from session database branch. -| * | 9ac2383a2 Retain changes from session database branch. -| * | e77c3e671 Retain changes from session database branch. -|/ / -* | b8c6d2917 Merge branch 'charlesmchen/storageReset' -|\ \ -| * | d01ec57f0 Fix storage reset. -|/ / -* | 23693c8ce Merge branch 'charlesmchen/sendDatabase' -|\ \ -| * | 3a9886bb2 Send database action in debug UI. -|/ / -* | eefd66e4a Merge branch 'mkirk/sharing-vs-sn' -|\ \ -| * | 3a6ddd4bf CR: cleanup -| * | 6e2d9c814 identity change vs. share extension -| * | 6b5883dc1 Don't resize attachment view when switching between alerts. -|/ / -* | 697fc4ff4 Merge branch 'mkirk/fix-message-detail-view' -|\ \ -| * | 46930b935 Fix crash when viewing non-attachment message details. -|/ / -* | 3b17c43e8 Merge branch 'mkirk/fix-profile-flicker' -|\ \ -| * | 4e6816ec5 (private/mkirk/fix-profile-flicker) Code cleanup -| * | 14723f3e7 Fix profile avatar flicker -|/ / -* | 34d2df8d6 Merge branch 'mkirk/attachment-progress' -|\ \ -| * | 01fa3c89c CR: cleanup comments, extract callback into method -| * | b87079d4b Sharing attachment shows progress / retry dialog -|/ / -* | 37ee9f0e7 Merge branch 'mkirk/attachment-caption' -|\ \ -| * | 42ea1dfbb CR: more margin, match button size to default text field, fix layout when rotated. -| * | 8141843f2 comment typo -| * | 7907a64df move gradient up with keyboard -| * | 653a272b5 Don't obscure attachment when keyboard is popped. -| * | 38d94952f Shadow for Send button, clean up color accessors -| * | cfa147831 "Done" button for caption toolbar -| * | 9eb4178c6 style for captioning toolbar -| * | 513e33b0f Cleanup before code review -| * | cf091758a Fix oversized text messages -| * | 82aeee301 can delete text messages again -| * | f5b9ae97e fix insets for incoming vs outgoin -| * | eeaea5fa0 better match for corner radius -| * | 0ea3a3655 make sure captioned attachment doesn't grow too large -| * | 2c20cb9e7 make sure mediaview isn't too tall in detail view -| * | 411de65b4 TODO: Show caption in details -| * | 0e9c9a9bb Separate gestures for text/vs media -| * | 92477c78b cleanup before PR -| * | bce18637f render attachments with captions -| * | 3176cb5a6 text sizing correctly -| * | f8866c4e0 Fix some constraints, get other attachment types looking good -| * | 76ca52f33 caption bubble properly sized, but all attachments make space now -| * | 3eb3c268a Towards a caption in message -| * | e20f44024 WIP: Support sending attachment captions -| * | 0964c1641 cleanup, plus ill fated attempt to offset content beyond keyboard height. -| * | 26be69975 cleanup constraint based layout -| * | 3a078c831 lays out in iOS11, but doesn't resize -| * | 03e786a14 input toolbar looks good on iOS9/10, but totally broken on 11 -| * | 96906440a remove height animation, ensure growing text area has content in proper place. -| * | 562e706ec animate height change, but looks goofy -| * | a5c5dd3f9 WIP, extract subclass -| * | 9ee9a0efe resizing input accessory view. -| * | f9524b02e multiline must be textview, not textfield -| * | 57a5e62db WIP - attachment caption -|/ / -* | 76481a86a stabalize sort for same-named SignalAccounts -* | 4e8b836e0 Merge branch 'charlesmchen/sessionDatabase2' -|\ \ -| * | 05100b114 Respond to CR. -| * | 6b0e3508a Respond to CR. -| * | 245304116 Respond to CR. -| * | 085f8a6f6 Clean up ahead of PR. -| * | 70926d7f1 Clean up ahead of PR. -| * | 6b58b4cbd Rework database view registration. -| * | fe67cd924 Rework database view registration. -| * | f88b954ab Clean up TSStorageManager usage. -| * | d3efb2e1c Clean up TSStorageManager usage. -| * | 9258b0883 Clean up TSStorageManager usage. -| * | d52eba739 Clean up TSStorageManager usage. -| * | 85686d314 Continue TSStorageManager refactor. -|/ / -* | b496a1095 Merge branch 'charlesmchen/sessionDatabase_' -|\ \ -| * | 9a990b58e Respond to CR. -| * | 1163e76de Clean up ahead of PR. -| * | 9815bca82 Clean up ahead of PR. -| * | 92b870ca1 Clean up ahead of PR. -| * | 5dcf4b3bb Clean up ahead of PR. -| * | 137fe6fb8 Pull out OWSStorage base class for TSStorageManager. -| * | a29c4ce5d Pull out OWSStorage base class for TSStorageManager. -|/ / -* | 40ec86907 Merge branch 'charlesmchen/attachmentDownloadsVsBackground' -|\ \ -| * | a572285ad Respond to CR. -| * | 2cc375290 Improve background task logic. -| * | c3b6de4f8 Improve background task logic. -| * | f9ce34f55 Improve background task logic. -| * | 5adf98788 Use background task during message processing. -| * | df8ded90b Use background task during attachment downloads. -|/ / -* | 157bf0041 Merge branch 'hotfix/2.19.3' -|\ \ -| |/ -| * ced4e3b78 (tag: 2.19.3.3, origin/hotfix/2.19.3) Bump build to 2.19.3.3. -| * d5762470b (tag: 2.19.3.2) Bump build to 2.19.3.2. -| * b0f9a03e5 Merge branch 'mkirk/replace-cache-for-migration' into hotfix/2.19.3 -| |\ -| | * 1955f3664 CR: clarify names, comments, asserts -| | * 60eac4e0b notify only when SignalAccounts actually change -| | * 27c99cf4d sort SignalAccounts loaded from cache -| | * e78edcde8 Only clear cache when user pulls-to-refresh -| | * 49196f801 Spin activity indicator until contacts are fetched -| | * f4e471e0d SignalAccount cache perf improvments -| |/ -* | bdb9eed88 Merge branch 'charlesmchen/yapDatabaseCrash1' -|\ \ -| * | 3643414da Respond to CR. -| * | e45d63e86 Clean up ahead of PR. -| * | 0c9d9ba67 Fix issues around cross process db changes. -| * | 0be63d293 Add "send to last thread" option in debug logs. -| * | f57c12f34 Update YapDatabase. -| * | 571840b1d Update YapDatabase. -| * | 609536fcb Include build version in logging. -| * | bc7f4623c Update YapDatabase. -| * | c8351cef5 Update YapDatabase. -|/ / -* | 4f0651853 Merge tag '2.19.3.1' -|\ \ -| |/ -| * f18245009 (tag: 2.19.3.1) bump build -| * 162b33ed5 Merge branch 'mkirk-2.19.3/fixup-account-cache' into hotfix/2.19.3 -| |\ -| | * 1f8042685 Show loading cell when contacts are still loading. -| | * c07d7777c Reinstate notification when SignalAccounts change -| |/ -* | 3affb07a1 post-merge formatting fixup -* | 16448e2a0 Merge tag '2.19.3.0' -|\ \ -| |/ -| * 6f7cae691 (tag: 2.19.3.0) Log counts to determine when SignalAccount cache goes missing -| * f272c9088 Merge branch 'mkirk-hotfix-2.19.3/persist-signal-accounts' into hotfix/2.19.3 -| |\ -| | * 64e90d29f CR: extract method, more asserts and annotations -| | * 42dc872c9 use dedicated read connection to pre-populate cache -| | * 336c92dda remove cached display name machinery, cleanup -| | * 7ea4b85a2 Persist signal accounts (and their embedded Contact) -| |/ -| * 9cea6971b (tag: 2.19.2.0, origin/hotfix/2.19.2) bump version -* | a0f44f75e (tag: 2.20.0.3) Bump build to 2.20.0.3. -* | 2b038dfd3 sync translations -* | 481427bf9 Merge branch 'mkirk/share-audio' -|\ \ -| * | 6fb5990fa Don't zoom for audio/generic attachments -| * | 73b215229 Fixup approval view for audio and generic attachments -|/ / -* | 26c76e6a0 Merge branch 'mkirk/convert-video' -|\ \ -| * | f9d22545b Only copy imported video when necessary. -| * | 849388feb CR: clean up loading assets once no longer needed -| * | 03220ffa7 CR: Faster animation from loading -> picker -| * | 813f4e474 Respond to CR -| * | 47e92dbad cleanup -| * | 899674127 DocumentPicker converts to mp4 when necessary -| * | 031e40d09 Use SignalAttachment logic in conversation view too -| * | 7d0acc94f cleanup -| * | 56f1bf030 cleanup -| * | 65f79770a rebase fixup -| * | 90e9b4a4f WIP - send all video types -| * | 4ce2eb3c6 Show ProgressView for video conversion -| * | b1b6dcfbf Simplify loading delay, use loading screen as activity indicator for video conversion -| * | 538b3e5fd Async API for video export -| * | 21fd7b040 Ensure sent video is mp4 -|/ / -* | 3ad409238 Merge branch 'mkirk/approval-view-revamp' -|\ \ -| * | d3e7c99a6 Attachment approval: cancel/confirm to top/bottom toolbars -|/ / -* | fc26c3fdb Merge branch 'charlesmchen/profileManagerConcurrency' -|\ \ -| * | 8642a708e Respond to CR. -| * | b9b3eb054 Clean up ahead of PR. -| * | 429312523 Simplify OWSUserProfile's "apply changes" logic using model diffing. -| * | ee92efd4a Don't emit "user profile changed" notifications if nothing changed. -| * | f684482c5 Don't emit "user profile changed" notifications if nothing changed. -| * | 7b4aa4056 Don't emit "user profile changed" notifications if nothing changed. -| * | 97ce1a667 Rework user profile saves; block SAE if no local user profile key. -| * | 3ea901044 Rework thread safety in profile manager. -| * | 74efcb904 Rework thread safety in profile manager. -| * | ee300590e Rework thread safety in profile manager. -| * | 911c4d380 Rework thread safety in profile manager. -|/ / -* | c1d435c9d Merge branch 'charlesmchen/imageQualityRevisited' -|\ \ -| * | bf09c805b Respond to CR. -| * | c91827959 Convert image attachment thresholds to be based on file size. -| * | 80ae5e0fc Respond to CR. -| * | 11b484853 Respond to CR. -| * | 89db8b3a4 Respond to CR. -| * | 84061cca9 Change image resizing/quality behavior, preferring smaller images in the common case. -| * | 55aa5eef6 Clean up ahead of PR. -| * | 125aabb0a Change image resizing/quality behavior, preferring smaller images in the common case. -|/ / -* | be5ac8527 Merge branch 'mkirk/track-dyload-time' -|\ \ -| * | ddd200482 track dyload time -|/ / -* | b6f3c69f8 Merge branch 'mkirk/fixup-headers' -|\ \ -| * | d9cca77e2 update header references -|/ / -* | 726fde235 Merge branch 'mkirk/affix-searchbar' -|\ \ -| * | 23014f9ea Keep header affixed to navbar. -|/ / -* | b014c236b (tag: 2.20.0.2) bump build number -* | f7dfe23c6 sync translations -* | d6359d655 Update carthage - WebRTC M63 -* | 71f56ef3d Merge branch 'mkirk/dismiss-share-view' -|\ \ -| * | 1c74d8f91 CR: remove reset of BundleDocumentTypes -| * | dd1795e33 fixup rebae -| * | 3ecf0a753 Cancelling dismisses share extension, remove "import with signal" -|/ / -* | 2cd3ce62f Merge branch 'mkirk/conversation-picker-presentation' -|\ \ -| * | ed33663e6 CR: remove redundant isHidden -| * | cd95e1784 avoid race condition in presentation animation -| * | 3bb772f13 Modal conversation picker, hide loading screen when possible -|/ / -* | 6bb9b9cbc Merge branch 'charlesmchen/saeSetupOrder' -|\ \ -| * | d15d5ce3a Respond to CR. -| * | 791743a5f Fix order of operations in SAE setup. -|/ / -* | 03d116594 Merge branch 'charlesmchen/estonianAndTaiwaneseChinese' -|\ \ -| * | 345323fe8 Add Estonian and Taiwanese Chinese localizations. -|/ / -* | 5053b0268 Merge branch 'charlesmchen/logTagProperty' -|\ \ -| * | f7bcf1d04 Fix tests. -| * | 1be828574 Respond to CR. -| * | f148003fb Convert logTag to property. -|/ / -* | c36c4d6ec Merge branch 'charlesmchen/swiftSingletons' -|\ \ -| * | b12f192c6 Respond to CR. -| * | 36703d3bb Add asserts around Swift singletons. -| * | 7a1e47cd2 Add asserts around Swift singletons. -|/ / -* | 26bd1f2e6 Merge branch 'charlesmchen/saeVsStatics' -|\ \ -| * | 8312614cf Respond to CR. -| * | 99f0b9d3e Fix issues around statics. -|/ / -* | 28a55e244 Merge branch 'mkirk/preview' -|\ \ -| * | 0429836ff CR: rename keyWindow -> keyReferenceView, split long line -| * | ca999627e CR: replace, not push VC -| * | c0c71ad76 cleanup -| * | 4aba6e0c9 Present conversation picker when DB is ready -| * | 3f6f881d3 Use assets from duplicated main bundle -| * | eca19e587 Reconcile MediaMessageView zoom behavior with AppExtension -| * | 3036337a5 Include filename, support sharing all other image types -| * | 3eceb8637 Show alert if we fail to build the attachment -| * | 89b9887f1 Make DeviceSleepManager extension compatible -| * | e20072ff2 CR: remove bundle specific image assets -| * | 654d34546 remove null references to moved certificates -| * | c52192295 fixup rebase. move jobs to proper dir -| * | 56fe9d057 Attachment Approval -| * | a58f1f385 Share a photo from photos app -| * | f781199e2 ignore warnings in AFNetworking -|/ / -* | 1a6f21996 Merge branch 'charlesmchen/saeErrorViews' -|\ \ -| * | 3960b8162 Respond to CR. -| * | 848f055da Add SAE error views. -|/ / -* | f1c42a5db Merge branch 'charlesmchen/sendDebugLogToSelf' -|\ \ -| * | 94b5dfb1b Localize the debug log UI. -| * | a617724da Add "send to self" option to debug logs. -|/ / -* | 136a8acae Merge branch 'charlesmchen/environment3' -|\ \ -| * | 6e545c57c Bump build to 2.20.0.1. -| * | 01dfa83be Continue conversion of app setup. -| * | 076844bfe Continue conversion of app setup. -| * | 310cf1330 Continue conversion of app setup. -|/ / -* | 71cfa2802 Merge branch 'charlesmchen/saeVsTests_' -|\ \ -| * | 53f51bcd0 Clean up ahead of PR. -| * | 69e0bcd30 Fix tests. -| * | 9e44a7306 Fix tests vs. SAE. -| * | e7bd33df4 Fix tests broken by SAE. -|/ / -* | aeb6f320d Fix plist value type. -* | fdbe175c0 Merge branch 'charlesmchen/environment2' -|\ \ -| * | 8d014f057 Respond to CR. -| * | f5353fc7d Clean up ahead of PR. -| * | 150f417a5 Clean up ahead of PR. -| * | 022b2f93d Respond to CR. -| * | e94ef01d7 Respond to CR. -| * | 9da165b84 Continue conversion of app setup. -|/ / -* | e56475d92 Merge branch 'charlesmchen/environment' -|\ \ -| * | ce899edf1 Respond to CR. -| * | dc51f92f1 Clean up ahead of PR. -| * | 2eba37165 Clean up ahead of PR. -| * | b4e8df79d Migrate environment to SignalMessaging. -| * | a16058e47 Migrate environment to SignalMessaging. -| * | 6d87df88a Migrate environment to SignalMessaging. -| * | c817aa51b Migrate environment to SignalMessaging. -|/ / -* | 9ea954bec Merge branch 'mkirk/search-profile-names' -|\ \ -| * | e3b0333b9 CR: Separate class files -| * | 27ddf4a35 Cleanup before PR -| * | cd440b839 Consolidate search logic -| * | 766e57996 Share picker searches by profile name -| * | 3ed52b6d5 Fix profile label for share context -| * | 286463bb2 Thread picker adds sections for threads vs other contacts -| * | 71bafcc8f Search SignalAccounts by profile name -| * | 06f52deaf address some additional compiler warnings -|/ / -* | 2cc417daf Merge branch 'mkirk/fix-build-warnings' -|\ \ -| * | 23d3006fd remove unused code -| * | 08c324f94 Fix compiler warnings around ambiguous macro redefinition. -| * | 2af818b3b Make SignalMessaging AppExtension safe -| * | fcb17585b fix compiler warnings -| * | 013877734 New @available syntax avoids compiler warnings -| * | f96b7bc27 CNContact doesn't exist before iOS9 -| * | 0dec643b9 update header to match implementation atomicity -| * | 5e7ca8993 Proper function prototypes -|/ / -* | 5705b256e Merge branch 'charlesmchen/logsVsSAE' -|\ \ -| * | 98eb4613e Enable logging in SAE; rework log file management to include multiple log directories. -| * | bf21d0c0e Enable logging in SAE; rework log file management to include multiple log directories. -|/ / -* | 23f151fa5 Merge branch 'charlesmchen/saeLoading' -|\ \ -| * | 8cc33b3de Refine loading view of share extension. -|/ / -* | eaebec622 Merge branch 'charlesmchen/l10nScriptsVsSAE' -|\ \ -| * | f728f5c09 Incorporate l10n strings from main app into SAE. -| * | 074664f73 Revert "Modify l10n string extraction script to copy strings to SAE." -| * | efe0758e3 Revert "Modify l10n string download script to copy strings to SAE." -| * | 9f31c048a Modify l10n string download script to copy strings to SAE. -| * | c61490c0b Modify l10n string extraction script to copy strings to SAE. -|/ / -* | c82ff5b3c Merge branch 'charlesmchen/customUIForSAE' -|\ \ -| * | e7b32899c Sketch out SAE load screen; make a number of infrastructure changes. -|/ / -* | 43eefd35e Merge branch 'charlesmchen/shareExtensionTypes' -|\ \ -| * | f20196e3f Use dict to specify supported types for SAE. -|/ / -* | aa1ca3410 Merge branch 'charlesmchen/appExtensionContext' -|\ \ -| * | 15e3b5ad7 Add app extension context, bridging header and PCH to app extension. -| * | 61b33b1a4 Make SignalMessaging a build dependency of the share extension. -| * | 2aafdcf57 Add app extension context, bridging header and PCH to app extension. -|/ / -* | 1b65e0c9e Merge branch 'charlesmchen/appExtensionVsBuildNumberScript' -|\ \ -| * | d5f2ebff4 Update "bump build number" script to update share extension. -|/ / -* | bc234d42e Merge branch 'charlesmchen/appExtensionCapabilitiesAndInfo' -|\ \ -| * | f896bf99d Update share extension capabilities. -| * | 8706d8f59 Update share extension capabilities. -|/ / -* | afea3008b Merge branch 'mkirk/use-framework-friendly-openssl' -|\ \ -| * | 7ca314aa2 Use up-to-date framework friendly OpenSSL -|/ / -* | 08ad7bc9c Merge branch 'mkirk/use-chrono' -|\ \ -| * | 336d59a6c restore chrono timestamp -|/ / -* | 14d595062 Merge branch 'charlesmchen/crossProcessDBModifications' -|\ \ -| * | e7df2511a Register CrossProcessNotifier. -| * | 64762eb42 Observe YapDatabaseModifiedExternallyNotification. -|/ / -* | 9aa05733d Merge branch 'charlesmchen/addressSharingExtensionTODOs_' -|\ \ -| * | 62cf9b1dd Respond to CR. -| * | d17ccadea Use AppContext to resolve share extension FIXMEs. -| * | e712e8bfc Use AppContext to resolve share extension FIXMEs. -|/ / -* | 94436f7b0 Merge branch 'charlesmchen/appContext' -|\ \ -| * | 4c31d9949 Respond to CR. -| * | 66fae5bd5 Clean up ahead of PR. -| * | ffa69b350 Add application context class. -|/ / -* | 594544b26 Merge branch 'charlesmchen/appExtensionMigration' -|\ \ -| * | 8d4e9b456 Respond to CR. -| * | 779e89fe7 Clean up ahead of PR. -| * | 7429e1968 Clean up ahead of PR. -| * | edaf65223 Migrate to shared data NSUserDefaults. -| * | cd11ec569 Add app group, share keychain. Take a first pass at file migration to shared data directory. -|/ / -* | 1ccf5132c Merge branch 'mkirk/orphan-cleaner-fixup' -|\ \ -| * | 336aa1352 Avoid overzealous assert -|/ / -* | d458906a6 Merge branch 'mkirk/bubble-factory-perf' -|\ \ -| * | 9ac3ce375 Memoize bubble factory -|/ / -* | fd829ba57 Merge branch 'hotfix/2.19.1' -|\ \ -| |/ -| * 741723c99 (tag: 2.19.1.0, origin/hotfix/2.19.1) pull latest translations -| * a85b14415 Merge branch 'mkirk/proper-file-extensions' into hotfix/2.19.1 -| |\ -| | * 9d1e3dc22 We need to change file extensions when converting data -| |/ -| * b242f6491 Merge branch 'charlesmchen/addPhotoUsageDescription' into hotfix/2.19.1 -| |\ -| | * 1f3cc8752 Fix the add photo permission crash on iOS 11. -| |/ -| * a90210594 Merge branch 'mkirk/ios8-send-crash' into hotfix/2.19.1 -| |\ -| | * 1a99b3491 Fix iOS8 crash on type -| |/ -| * 33f223318 Bump version number to v2.19.1. -* | 2072359a7 add todo -* | 3828edab1 Merge branch 'mkirk/share-spike-framework-friendly' -|\ \ -| * | 2c4cf9651 Some proof of framework integration in the sample share extension -| * | e9796600c disable some asserts for now -| * | 961727814 Move pinning certificates into App -| * | a11d83187 WIP: Framework-friendly - compiles but crashes on launch -| * | c5b0f7cd0 framework compatible CocoaLumberjack import -| * | 7894a5876 FIXME: Changes to get share extension compiling -| * | b56f0e0d2 Pod setup for SignalMessaging framework -| * | de028404b Shared framework between app and extension -| * | d96eb8932 ShareExtension template -|/ / -* | 2685eae12 Merge branch 'charlesmchen/fakeLargeAttachments' -|\ \ -| * | 40b2ecf58 Add debug UI for hallucinating lots of large attachments to stress shared data migration. -| * | bfc144567 Add debug UI for hallucinating lots of large attachments to stress shared data migration. -|/ / -* | 42e972ef7 Merge branch 'charlesmchen/signalServiceConcurrency' -|\ \ -| * | 829464baa Remove concurrency limitations from signal service. -|/ / -* | 8d790ffb9 Update contributing.ms to use signal.org URLs; remove Bithub references (#2806) -|/ -* f4f2ff883 (tag: 2.19.0.22) Bump build to 2.19.0.22. -* 8b93c4aa2 Merge branch 'charlesmchen/unreadIndicatorAssert' -|\ -| * 8acce3b5b Simplify the unread indicator logic. -|/ -* a03a96693 Merge branch 'mkirk/archive-after-reset' -|\ -| * 43092ee6a CR: be extra paranoid about archiving the reset session -| * 47926418b Prevent subsequent "No valid session" errors from the recipient of an EndSession message. -|/ -* 443ef5837 (tag: 2.19.0.21) Bump build to 2.19.0.21. -* 97efc359f Merge branch 'mkirk/center-loading-more' -|\ -| * a542471bb center "Loading More Messages" label -* | bd6cb2225 Update l10n strings. -|/ -* 6f90786ac Merge branch 'charlesmchen/layoutEdgeCases' -|\ -| * f9f0f1c27 Revert "Force conversation view cells to update layout immediately." -| * 35bdc86ab Reload adjacent rows using original indices, not final indices. -|/ -* 0029b6854 Merge branch 'charlesmchen/unreadLayoutEdgeCases' -|\ -| * 71f5ef594 Improve handling of unread indicator edge cases. -|/ -* e0e0a512e Merge branch 'charlesmchen/identityTransactions' -|\ -| * ba88da60c Use dedicated db connection for recipient identities. -|/ -* 2ec1e7e92 Respond to CR. -* f07cbeef7 (tag: 2.19.0.20) Bump build to 2.19.0.20. -* 61666351c Update l10n strings. -* 5f9f63d89 Merge branch 'charlesmchen/unreadEdgeCases' -|\ -| * 2d241623b Improve handling of edge cases around unread indicator delimiting deleted message(s). -|/ -* 368ad922d Merge branch 'charlesmchen/unreadVsConversationUI' -|\ -| * 5ef9d53c9 Update conversation view UI to reflect unread state. -|/ -* b3d936396 Merge branch 'charlesmchen/forceConversationCellLayout' -|\ -| * ef820a371 Force conversation view cells to update layout immediately. -|/ -* 0cda3661f Merge branch 'charlesmchen/unknownCountry' -|\ -| * 9b4ac4073 Improve robustness around unknown country codes. -|/ -* 73655de3d (tag: 2.19.0.19) bump build -* 7d6f37b0e Sync translations -* e1c50103b Merge branch 'mkirk/insert-unread-indicator' -|\ -| * 370364c93 Scroll down button scrolls to unread -|/ -* ed0e0fadc Merge branch 'charlesmchen/scrollDownButtonVsRTL' -|\ -| * b0c9add29 Update layout of "scroll down button" to reflect RTL. -|/ -* ce9e2fb19 Merge branch 'charlesmchen/contactsSyncDeadlock' -|\ -| * d9fcfdeeb Fix deadlock when responding to contacts sync messages. -| * 9b197fad0 Fix deadlock when responding to contacts sync messages. -|/ -* 93927801e Merge branch 'charlesmchen/swipeTransitionVsRTL' -|\ -| * 92ef50781 Make swipe-for-details RTL-safe. -|/ -* 596206557 (tag: 2.19.0.18) bump build -* 358612542 pull translations -* 74f98067f (tag: 2.19.0.17) bump build -* 7c0d372aa Merge branch 'charlesmchen/autoDismissKeyboardVsPanSettle' -|\ -| * a07e1e0cf For most views, only try to dismiss keyboard when scroll drag starts. -|/ -* 4ca2e10dd Merge branch 'charlesmchen/conversationScrollEdgeCase' -|\ -| * aea2bf3e0 Fix scroll state insets in conversation view. -|/ -* 28fe073c5 Merge branch 'mkirk/update-outgoing-call' -|\ -| * 5cfa7e35f Respond to CR. -| * 34811a635 Fixes: "connected call" showing as "unconnected outgoing" call. -|/ -* 3ab9337bf Merge branch 'charlesmchen/logTags' -|\ -| * b76d9a4e6 Remove redundant logTag methods. -| * a4879f6bb Remove redundant logTag methods. -|/ -* 1fa9deca6 Merge branch 'charlemschen/noCentroidNoPeace' -|\ -| * 8eb4e682d Revert "Show menu controller from centroid of message cells." -|/ -* 86d839d87 Merge branch 'charlesmchen/tweakJumbomoji' -|\ -| * cebeea918 Reduce extremes of Jumbomoji behavior. -|/ -* 72fba8774 Merge branch 'charlesmchen/conversationUpdateEdgeCases_' -|\ -| * d8ae5841d Respond to CR. -| * b3d17ea19 Improving handling of edge cases in conversation view. -| * 45c7d80d9 Improving handling of edge cases in conversation view. -| * 6d4a05bbe Improving handling of edge cases in conversation view. -| * 658746093 Use finalIndex in row changes. -|/ -* bb22adbeb Merge branch 'mkirk/calling-edgecases' -|\ -| * 86c1a3d08 CR: use weak capture -| * 30b50e148 Activate audio at the proper time -| * 81f097c1f Don't drop critical data messages -| * 2e75e9df5 Don't ignore critical errors -| * 91f25bec3 Remove overzealous assert -|/ -* 2ed80249c Merge branch 'mkirk/pop-keyboard-on-compose' -|\ -| * 8ee030bea Don't dismiss keyboard when view appears -|/ -* df8204ac1 Merge branch 'charlesmchen/pushTokensAbout' -|\ -| * ceac36f91 Respond to CR. -| * 6e60d99ec Show push tokens in about view. -|/ -* 9b14c7777 Merge branch 'charlesmchen/contentInset2' -|\ -| * e9bace34b Fix "sliding tables" issue in linked devices view. -|/ -* 115fefdbe Merge branch 'mkirk/replace-missing-call-icon' -|\ -| * abb57f2a1 App icon for system call screen -|/ -* af1fb5444 Merge branch 'mkirk/contact-perms' -|\ -| * 7fd3d665d Request contacts as necessary when app is brought back to the foreground -| * 01e1d10c3 Only show contact nag if we've denied contact access -|/ -* bae0e294d Merge branch 'charlesmchen/endEditingLeaveConversation' -|\ -| * 7b1a846f7 Dismiss keyboard when leaving conversation view. -|/ -* 46b3540d8 Merge branch 'charlesmchen/fixGroupCreation' -|\ -| * 2642f6fce Fix group creation. -|/ -* f61233763 Merge branch 'charlesmchen/fixTableViewLayout' -|\ -| * e79613184 Respond to CR. -| * 089e4a4a0 Fix layout of table views vs. nav bar. -|/ -* 334cecf5a Merge branch 'charlesmchen/dynamicJumbomoji' -|\ -| * 572de1176 Apply dynamic type sizing to Jumbomoji. -|/ -* cc32e52de (tag: 2.19.0.16) Bump build to 2.19.0.16. -* 0ffa79df6 Bump build to 2.19.0.15. -* a5c98ca27 Merge branch 'charlesmchen/skipAnimationsInConversations' -|\ -| * 937ac5830 Skip animations in conversation view. -| * b67179b45 Skip animations in conversation view. -|/ -* 7862345ec Merge branch 'charlesmchen/backButtonRevisited_' -|\ -| * 0ccddb696 Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons. -|/ -* 12aa31192 Merge branch 'charlesmchen/loadMoreFontSize' -|\ -| * 96274a60a Respond to CR. -| * 7aae47b02 Reduce font size of "load more" indicator. -|/ -* 56addee70 Merge branch 'charlesmchen/maxTextLength' -|\ -| * dffd776ac Increase the max text message length. -|/ -* a2642ccc0 Merge branch 'mkirk/show-failed' -|\ -| * 228e350e2 message details shows failed bubble when appropriate -|/ -* b55d647e8 Merge branch 'charlesmchen/menuControllerReuseCell' -|\ -| * 6b8f4c7dd Dismiss menu controller if message cell is hidden or recycled. -|/ -* a755c7e3c Merge branch 'charlesmchen/refineMenuControllerLocation' -|\ -| * 08bb1c909 Show menu controller from centroid of message cells. -|/ -* 307c8595c (tag: 2.19.0.14) Bump build to 2.19.0.14. -* 9d4ec557d Update l10n strings; add Persian l10n. -* 6299fdc67 Merge branch 'mkirk/push-registration' -|\ -| * 607a5cb08 Fix typo in re-registration flow -| * e84fcd7c9 Registration bug also affects other versions of iOS -|/ -* aad93d2d8 Fix broken assert in conversation view item. -* 114de70f3 Merge branch 'charlesmchen/viewItemAttachmentsVsDBConnection' -|\ -| * ddf4bf28c Load attachments for conversation view items using long-lived db connection. -|/ -* 5d5f7f015 Merge branch 'charlesmchen/disappearingMessagesChanges' -|\ -| * df5aa5ef6 Update UI to reflect changes to disappearing messages configuration. -|/ -* 3380ecdbf (tag: 2.19.0.13) Bump build to 2.19.0.13. -* 11e4f08be Merge branch 'charlesmchen/delayNotificaitonsLikeAndroid' -|\ -| * 21e9f57cb Imitate Android's behavior of delaying local notifications based on incoming sync messages. -|/ -* 7730b78d8 Merge branch 'charlesmchen/dontBackupFiles' -|\ -| * 2d8a7b03d Respond to CR. -| * d7b0424c7 Don't back up profile pics, attachments or gifs. -|/ -* f7c2cf0f2 Merge branch 'charlesmchen/slidingTableContent' -|\ -| * 81f37e991 Respond to CR. -| * e65010d51 Fix "sliding table content" issue on iOS 11. -|/ -* 61ee93c77 (tag: 2.19.0.12) Bump build to 2.19.0.12. -* cbcccf273 Merge branch 'charlesmchen/fixCalling' -|\ -| * 2f84e0c42 Fix calling; be explicit about which messages should be saved. -|/ -* 20355521f Merge branch 'mkirk/message-focuse' -|\ -| * 9675cbb1e Scroll only as far as necessary -|/ -* 15a407de1 (tag: 2.19.0.11) Bump build to 2.19.0.11. -* 5fa6e3a32 Merge branch 'charlesmchen/conversationViewFixes' -|\ -| * cc90f4cb8 Respond to CR. -| * 86fdd6dea Fix edge cases in conversation view. -|/ -* 9aeaa00f6 Merge branch 'charlesmchen/randomMessageActions' -|\ -| * 451dc44e8 Add script to make random changes. -| * bfde1aef5 Add script to make random changes. -|/ -* 88ae3fbed (tag: 2.19.0.10) Bump build to 2.19.0.10. -* 25263bb10 Merge branch 'charlesmchen/evacuateViewItemCache' -|\ -| * 6413bc8e4 Evacuate the view item cache. -|/ -* adca3f5d1 Merge branch 'charlesmchen/dontResurrectZombies' -|\ -| * 19ba564f8 Respond to CR. -| * 00feb14b1 Respond to CR. -| * 5eea0347b Rework the "update with..." methods to avoid re-saving deleted models. -| * 94b59c326 Rework the "update with..." methods to avoid re-saving deleted models. -| * c6160a5a1 Rework the "update with..." methods to avoid re-saving deleted models. -| * 69fa80b89 Don't resurrect zombies. -| * fce52841f Don't resurrect zombies. -|/ -* 8f3304ff9 (tag: 2.19.0.6) Bump build to 2.19.0.6. -* 87b5b8514 Merge branch 'mkirk/iphone-x' -|\ -| * a27b03409 Fix GIF picker footer for iPhoneX -| * e5263dcf0 Clarify comment -| * b40d2afc0 Scanner view for iPhoneX -| * 8c69e00a3 Adapt ConversationViewController to iPhoneX -| * a3153d29d Fix callscreen for iPhoneX -| * b0ce60a38 Fix layout of registration page for iPhoneX -|/ -* 1fa0dda58 Merge branch 'charlesmchen/tapVsLinkVsKeyboard' -|\ -| * c3b6c9055 Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. -| * 3da1d8c63 Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. -| * c91dda43e Disable partial text selection; ignore taps outside links; ignore taps on non-sent messages, link-icy all links. -| * c3087cf3d Don't dismiss keyboard when tapping in the conversation view. -|/ -* 1944df7a0 (tag: 2.19.0.5) Bump build to 2.19.0.5. -* bf0f33e4b Temporarily alter animations in conversation view. -* af6a7c103 Add a comment. -* 049370f52 (tag: 2.19.0.4) Bump build to 2.19.0.4. -* 42a70e0de Revert "Temporarily make logging around conversation view row updates more verbose." -* ab7522c47 Merge branch 'charlesmchen/backgroundVsContactsPermission' -|\ -| * 5c90bc72d Never request contacts permission if app is in the background. -|/ -* 05fc966af (tag: 2.19.0.3) Bump build to 2.19.0.3. -* f0a8e08df Temporarily alter animations in conversation view. -* 906620a13 Merge branch 'charlesmchen/attachmentEdgeCases' -|\ -| * cc0e58365 Respond to CR. -| * 0abdbffe1 Improve handling of attachment edge cases. -|/ -* a9dca831d Fix method extraction. -* 64938b782 Merge branch 'charlesmchen/firstSendVsLinkedDevices' -|\ -| * bac3bd4b6 Respond to CR. -| * 518f15155 Respond to CR. -| * efcd42012 Respond to CR. -| * 071dbd441 Respond to CR. -| * 8b6524661 Respond to CR. -| * e1b32315d Fix assert after registration. -|/ -* 308ecd9cc (tag: 2.19.0.2) Bump build to 2.19.0.2. -* b5f7a4746 Temporarily alter animations in conversation view. -* 84d7596f4 Merge branch 'charlesmchen/attachmentButtonInsets' -|\ -| * 381446459 Increase content insets of attachment button. -|/ -* 82627c302 (tag: 2.19.0.1) Bump build to 2.19.0.1. -* 105b03376 Temporarily make logging around conversation view row updates more verbose. -* 8e87bd334 Merge branch 'charlesmchen/forceCellLayout' -|\ -| * c72f39e64 Layout cell content when presenting the cell. -|/ -* 9f3c20850 Merge branch 'charlesmchen/scrollFixes' -|\ -| * 87b0692af Fixes for scrolling in conversation view. -|/ -* b6ca9a8ce Merge branch 'charlesmchen/permissionsVsInactive' -|\ -| * fc07c7c04 Respond to CR. -| * 593c684fc Don't ask for camera permissions if app is not active. -| * 5cc292fb6 Don't ask for camera permissions if app is not active. -| * 5e61307ce Don't ask for microphone permissions if app is not active. -| * f86882b5f Don't ask for camera permissions if app is not active. -|/ -* f757b7dcb Merge branch 'charlesmchen/xcode91' -|\ -| * 5541be784 Fix build warnings from XCode 9. -| * 6e840ff95 Fix build warnings from XCode 9. -| * a6bfc0a60 Fix build warnings from XCode 9. -| * 2d21e2ae2 Fix build warnings from XCode 9. -|/ -* 48df161eb Merge branch 'mkirk/re-register-push-tokens' -|\ -| * c0bcc40a6 Ensure we re-upload push tokens after re-registering. -|/ -* 2c5389d03 Merge branch 'mkirk/cdn-fail-xcode9' -|\ -| * f29746571 (private/mkirk/cdn-fail-xcode9) Whitelist *.signal.org from ATS. -|/ -* cc0c914ad Merge branch 'mkirk/fix-contact-offer' -|\ -| * 90dad7544 CR: remove unnecessary property -| * 1f5603760 Fix contact offer -|/ -* e38535cbe update OpenSSL pod -* 34abb4246 (tag: 2.19.0.0) Update build versions to v2.19.0. -* f9fc23660 Merge tag '2.18.2.1' -|\ -| * 40d2e003a (tag: 2.18.2.1, origin/release/2.18.2) Bump build to 2.18.2.1. -| * 00752c17a Merge branch 'charlesmchen/approveGIFs' into release/2.18.2 -| |\ -| | * 1f35a1d29 Show attachment approval for GIFs. -| |/ -| * 957c2e396 Merge branch 'charlesmchen/attachmentApprovalCrash' into release/2.18.2 -| |\ -| | * 167a171ca Fix crashes in attachment approval view. -| |/ -| * 511ff83ed (tag: 2.18.2.0) Bumped version numbers for hotfix v2.18.2. -* | d16848583 Merge branch 'mkirk/update-carthage' -|\ \ -| * | 28cb7751d Update dependencies via Carthage -|/ / -* | f59f90893 Merge branch 'charlesmchen/burmese' -|\ \ -| * | 3952f717a Add Burmese l10n. -|/ / -* | da7338580 Merge tag '2.18.1.0' -|\ \ -| |/ -| * 9c9c63db8 (tag: 2.18.1.0, origin/release/2.18.1) Bumped version numbers for hotfix v2.18.1. -| * bdc43ac11 Merge branch 'mkirk/group-sync-deadlock' into release/2.18.1 -| |\ -| | * e82a3f3dd respond to CR -| | * 8ef9e96b9 Avoid group-sync deadlock by making post-upload save async -| | * 98fd15fae Avoid groupsync deadlock - pass in transaction -| |/ -* | e4d608c61 Merge branch 'charlesmchen/inputToolbarEdge' -|\ \ -| * | e3f7947da Emphasize borders of input toolbar. -|/ / -* | 6297663d3 Merge branch 'charlesmchen/multipleLocalNotifications' -|\ \ -| * | 204902c11 Respond to CR. -| * | 03241128f Respond to CR. -| * | 1ea413ad4 Be more defensive about handling local notifications. -|/ / -* | ee4906b95 Merge branch 'charlesmchen/maxTextCellHeight' -|\ \ -| * | a5c4140a1 Reduce max text message bubble size. -| * | ea0b6065e Revert "Constrain the max text cell height to the height of the screen." -| * | 608cd2781 Constrain the max text cell height to the height of the screen. -|/ / -* | 0cd49e597 Merge branch 'charlesmchen/ensureAttachmentContentType' -|\ \ -| * | 8b6265f1b Respond to CR. -| * | 4d5740236 Ensure attachments always have a valid content type. -|/ / -* | 5548030bd Merge branch 'charlesmchen/messageStatusBias' -|\ \ -| * | 2b8fc59a8 Respond to CR. -| * | 74854dd78 Tweak biases of the message status logic. -| * | 365e984b7 Tweak biases of the message status logic. -|/ / -* | e07a240ee Merge tag '2.18.0.9' -|\ \ -| |/ -| * 384d3b201 (tag: 2.18.0.9, origin/release/2.18.0) Bump build to 2.18.0.9. -| * 7fc960fef Merge branch 'mkirk/re-redux-pki' into release/2.18.0 -| |\ -| | * 81cff837a (private/mkirk/re-redux-pki) Include root certs from pki.goog -| |/ -| * 92557bf3e (tag: 2.18.0.8) Bump build to 2.18.0.8. -| * 80f91dcf5 (private/release/2.18.0) Merge branch 'mkirk/censorship-circumvention-redux' into release/2.18.0 -| |\ -| | * 6c13d46be use manually specified censorship host -| | * 39e3e9b44 use .com when in US -| | * 11e07370a more logging -| | * a30533e7b Add GTSGIAG3 to censorship circumvention trust store -| |/ -* | 4037e2ee3 Merge tag '2.18.0.7' -|\ \ -| |/ -| * 6037477c4 (tag: 2.18.0.7) Bump build to 2.18.0.7. -| * 3db87d74c Merge branch 'mkirk/reduce-debounce-time' into release/2.18.0 -| |\ -| | * ad8c1db68 Reduce progressive search delay -| |/ -* | ef80b53ff Merge branch 'mkirk/debug-reregister' -|\ \ -| * | 295646e5f Rebase cleanup -| * | 0706edf42 Generate new registrationId on re-register -| * | 58d4c9536 Re-register without losing your messages in Debug-UI -|/ / -* | 83357a0fe Merge branch 'charlesmchen/messageDetailBubbleSizing' -|\ \ -| * | 93ee029cf Respond to CR. -| * | ae48cf1de Fix sizing of text bubbles in message detail view. -|/ / -* | 5a82d349c Merge branch 'charlesmchen/fixTextMessageLinks' -|\ \ -| * | 7fd5b00d8 Fix text message links in conversation view. -|/ / -* | 1014f27f4 Merge branch 'charlesmchen/redundantSyncMessages' -|\ \ -| * | 1fa75ead5 Respond to CR. -| * | 74096fc2c Don't send sync messages to self if no linked devices. -|/ / -* | 602775f3e Merge branch 'mkirk-2.18.0/call-audio' -|\ \ -| * | b77e33173 Unify Mute/Hold audio handling -| * | c7642cc62 Fix volume burst when call connects -| * | 402d4157c Uniform volume when ringing on speakerphone vs video -| * | a63a767bf connecting ping quieter, ringer is louder -| * | 36a39caad Remove overzealous assert -|/ / -* | aa5eb0561 Merge branch 'charlesmchen/dontAnimateMessageSends' -|\ \ -| * | af5489952 Don't animate message sends. -| * | 40e04ffb9 Respond to CR. -| * | 5df4ac92b Don't animate message sends. -|/ / -* | 5daba7aea Merge branch 'charlesmchen/digitsAintJumbomoji' -|\ \ -| * | f823ba8c1 Respond to CR. -| * | 05e57cf8b Don't treat digits 0..9 as Jumbomoji. -|/ / -* | 3f772c16a Merge branch 'charlesmchen/modiferReturnToSend' -|\ \ -| * | 5d4316755 Respond to CR. -| * | d52b19a69 Let users with external keyboards send messages using modifier-return (shift, command, option). -|/ / -* | 24b82b61f Merge branch 'charlesmchen/logVoiceMemoSizes' -|\ \ -| * | 0c92850d3 Log voice memo durations. -|/ / -* | c6738c477 Merge branch 'charlesmchen/gifVsDraft' -|\ \ -| * | 89dbcb0fe Respond to CR. -| * | f95e599c5 Don't overwrite draft after GIF send. -|/ / -* | 569e6808a Update podfile.lock. -* | db8a38196 Merge remote-tracking branch 'origin/release/2.18.0' -|\ \ -| |/ -| * a08bd0980 (tag: 2.18.0.6) Bump build to 2.18.0.6. -| * b0629fb6d Update l10n strings. -| * 5b1c89c13 Merge branch 'charlesmchen/splitgifs2' into release/2.18.0 -| |\ -| | * a3600d8e8 Avoid stalls in GIF downloader. -| | * 94f3601d3 Avoid stalls in GIF downloader. -| | * b3e39e658 Avoid stalls in GIF downloader. -| |/ -| * 5a6e73911 (tag: 2.18.0.5) pull latest translations -| * af82b02e4 bump version -| * 1a6cb7da1 Merge branch 'charlesmchen/splitGifs' into release/2.18.0 -| |\ -| | * 7041f976d Use HTTP pipelining in Giphy asset requests. -| | * 98af9bcc6 Use HTTP pipelining in Giphy asset requests. -| | * c2a17920b Respond to CR. -| | * 004c9e480 Respond to CR. -| | * f37e7f26d Respond to CR. -| | * 487bd0675 Respond to CR. -| | * cfb2a720d Respond to CR. -| | * 89a04852d Respond to CR. -| | * 12de1aa90 Split up GIF requests. -| | * 55d53ae22 Split up GIF requests. -| | * c83090a46 Split up GIF requests. -| | * e4602f2a1 Split up GIF requests. -| | * 2dfea2524 Split up GIF requests. -| | * 84406b5fe Split up GIF requests. -| |/ -| * cca33f02b Sync translations -| * aee6b3c0c Merge branch 'mkirk-2.18.0/handle-padded-attachments' into release/2.18.0 -| |\ -| | * cf9874302 Remove unecessary subdata for unpadded attachment -| | * ce51d2da3 Example (disabled) padding strategy for attachment sender -| | * cbbb37686 Handle receiving padded attachments -| |/ -| * 81386eae0 Merge branch 'mkirk-2.18.0/require-attachment-checksum' into release/2.18.0 -| |\ -| | * 259695a9f Attachments require digest or show explanatory error. -| |/ -| * 334a04c43 Merge branch 'mkirk-2.18.0/attachment-size' into release/2.18.0 -| |\ -| | * 6eeb78157 Include size in attachment pointer -| |/ -* | 0eb9242f7 Merge branch 'charlesmchen/cocoapodsWarnings' -|\ \ -| * | bb4d94fd1 Respond to CR. -| * | aec6d67df Respond to CR. -| * | 73ae5b298 Suppress build warnings for Cocoapods dependencies. -|/ / -* | 82bcffe77 Merge branch 'charlesmchen/streamlineRelayout' -|\ \ -| * | a0ddb2a06 Respond to CR. -| * | 9053d038a Remove extra logging. -| * | 5ac2f16eb Skip redundant relayout. -|/ / -* | 03df001d7 Merge branch 'charlesmchen/jumbomoji' -|\ \ -| * | e3d8421b9 Respond to CR. -| * | 0a926567e Respond to CR. -| * | c6047b72b Respond to CR. -| * | 563eed6c6 Respond to CR. -| * | 530b70d70 Respond to CR. -| * | 841a2333e Respond to CR. -| * | eb3ca4325 Jumbomoji. -|/ / -* | 06938208c Merge branch 'charlesmchen/hideMIMEtypes' -|\ \ -| * | 997665a90 Hide MIME types in production builds. -|/ / -* | 1d3faec43 Merge branch 'charlesmchen/failedMessageSends' -|\ \ -| * | bee70fa02 Respond to CR. -| * | 5e1c6c02a Add "failed message send" badges. -|/ / -* | 1e7d15841 Merge branch 'charles/longTextMessageDetails' -|\ \ -| * | 8cb3e5d35 Fix edge cases around oversize test messages. -|/ / -* | e1526876a Merge branch 'charlesmchen/jsqRewriteOversizeText' -|\ \ -| * | 9cc4521d0 Respond to CR. -| * | bcf83a4c8 Rework handling of oversize text messages. -|/ / -* | 97bab48a9 Merge branch 'charlesmchen/oneSystemContactsFetchAtATime' -|\ \ -| * | 5af6b6f21 Respond to CR. -| * | 1b3b5fc9e Respond to CR. -| * | d1141581d Only one system contacts fetch at a time. -| * | 878fd3d84 Only one system contacts fetch at a time. -| * | 8c1dfe7ee Only one system contacts fetch at a time. -|/ / -* | 445045b80 Merge branch 'mkirk/show-disappearing-button-dynamically' -|\ \ -| * | 8f9311a6a Show timer in navbar without reload -|/ / -* | ec840340e Merge branch 'mkirk/fix-crash-slide-animation' -|\ \ -| * | 709010499 remove overzealous assert -|/ / -* | 3065b22bb Merge branch 'charlesmchen/jsqRewriteVsTests' -|\ \ -| * | c8c09ec19 Respond to CR. -| * | 7e585b72a Fix tests broken by the JSQ rewrite. -| * | 3927815a3 Fix tests broken by the JSQ rewrite. -|/ / -* | 418fef335 Merge branch 'mkirk/wider-bubbles' -|\ \ -| * | 2d7deff83 Make message bubbles a bit wider. -|/ / -* | 9dd99123f Merge branch 'mkirk/fix-stutter' -|\ \ -| * | cd291e19f We conceivably want to to initiate calls more than once without leaving the conversation view. e.g. from Contacts.app -| * | 4000760cf Fix "back button count" flash. Only call once. -|/ / -* | 103a61d36 Merge branch 'charlesmchen/jsqRewriteVsRTL' -|\ \ -| * | df7d40ed4 Respond to CR. -| * | a23b8b717 RTL fixes for JSQ rewrite. -|/ / -* | a3b698730 Merge branch 'mkirk/swipe-left-2' -|\ \ -| * | 43dd3abf6 clamp value per CR -| * | 59b125c3f Add clarifying comment per CR -| * | d87f00005 Interactive/Cancelable slide left for details -|/ / -* | ac8d59bb7 Merge branch 'charlesmchen/changeMediaPreviewSizes' -|\ \ -| * | 6b2f7e484 Respond to CR. -| * | fb3bb852c Tap image attachment preview to view full screen. -| * | 722fc4d7a Fix size of message previews. -|/ / -* | 9ff157740 Merge branch 'charlesmchen/keyboardLayout' -|\ \ -| * | be0149ccf Update layout of views to reflect keyboard. -|/ / -* | d7c112014 Merge branch 'charlesmchen/dontSendWithReturn' -|\ \ -| * | 0eafbd8fe Respond to CR. -| * | 188b733d5 Don't send with return key. -|/ / -* | fdeac3a79 Merge branch 'charlesmchen/hebrew' -|\ \ -| * | 1e2091e1e Add Hebrew l10n. -| * | 5cde74f50 Add Hebrew l10n. -|/ / -* | 56e756612 Merge branch 'charlesmchen/scrollDismissKeyboard' -|\ \ -| * | 27af31023 Auto-dismiss keyboard if user scrolls away from bottom of the conversation. -|/ / -* | 1237d762e Merge branch 'charlesmchen/inputToolbarFixes' -|\ \ -| * | 3fa2f22be Fixes for input toolbar. -|/ / -* | 2895da504 Merge branch 'charlesmchen/dateHeaderSpacing' -|\ \ -| * | c9e385920 Fix spacing around date headers. -|/ / -* | 3a4167bd6 Merge branch 'charlesmchen/fixAttachmentUploads' -|\ \ -| * | 429f83391 Center the progress bar within the bubble mask. -| * | 658c3c559 Only show attachment upload UI for not-yet-uploaded attachments. -| * | 067b16903 Fix attachment uploads. -|/ / -* | 9b57df67e Fix broken build. -* | 39c6b5fd7 Merge branch 'charlesmchen/refineAttachmentApproval' -|\ \ -| * | c1f35a0ea Respond to CR. -| * | bf8d694eb Rework attachment approval UI. -| * | 2fa3cf1bc Rework attachment approval UI. -| * | cbb0030b1 Rework attachment approval UI. -| * | d04f9111d Rework attachment approval UI. -|/ / -* | 1fee5d97e Merge branch 'release/2.18.0' -|\ \ -| |/ -| * efd58022d (tag: 2.18.0.4) bump version -| * 288b975a1 Pull latest translations -| * f3f0d591e Revert "Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons." -| * 66ab4e254 Merge tag '2.16.2.0' into release/2.18.0 -| |\ -| | * f4ab65b37 (tag: 2.16.2.0, origin/hotfix/2.16.2) bump version -| | * bfaa7f2e0 On iOS11 doc picker requires system appearance. -| | * f8182cd3c fix desktop linking for some users -| | * b663a09c8 helpful tools for building ios11 -| * | 2d10080c3 Merge tag '2.17.1.1' into release/2.18.0 -| |\ \ -| | * | 866be0743 (tag: 2.17.1.1, origin/hotfix/2.17.1) Bump build to 2.17.1.1. -| | * | 1967e2aa6 Merge branch 'charlesmchen/backButtonVsiOS11.1Beta' into hotfix/2.17.1 -| | |\ \ -| | | * | 7c82f6d44 Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons. -| | |/ / -* | | | 688f77b7d Merge branch 'charlesmchen/fixAudioAndGenericMessageLayout' -|\ \ \ \ -| * | | | a1d8c7765 Respond to CR. -| * | | | 54c56f1c4 Fix layout of generic and audio messages. -|/ / / / -* | | | 92883c3a9 Merge branch 'charlesmchen/jsqRewriteGlitches' -|\ \ \ \ -| * | | | a16197f19 Respond to CR. -| * | | | b1b0ddbf2 Fix layout glitches in JSQ rewrite. -|/ / / / -* | | | 2067b395b Merge branch 'mkirk/show-failed-footer' -|\ \ \ \ -| * | | | 21df2dc04 Never hide "failed to send" footer -|/ / / / -* | | | 46dd30e63 Merge branch 'dastmetz-accessibilityCallScreen' -|\ \ \ \ -| * | | | e8f92ede6 added accessibility labels for call screen controls FREEBIE -|/ / / / -* | | | 1a9186410 Merge branch 'mkirk/use-failed-color' -|\ \ \ \ -| * | | | bd4b4f004 Use proper color when messages fail to send. -|/ / / / -* | | | 8b1bea8d1 Merge branch 'mkirk/cleanup-after-db-registration' -|\ \ \ \ -| * | | | c5244e175 orphan cleanup shouldn't happen until DB is registered -|/ / / / -* | | | 68e755ade Merge branch 'release/2.18.0' -|\ \ \ \ -| |/ / / -| * | | e427d25c5 (tag: 2.18.0.3) Bump build to 2.18.0.3. -| * | | 8fdc980ca Update l10n strings. -| * | | bdb289080 Merge branch 'charlesmchen/gifProxy' into release/2.18.0 -| |\ \ \ -| | * | | c11b82ba3 Respond to CR. -| | * | | 9274d7fd9 Fix proxying of Giphy requests. -| |/ / / -| * | | 0cd56d4bc On iOS11 doc picker requires system appearance. -| * | | b6c9a2a67 Merge branch 'mkirk/gif-data' into release/2.18.0 -| |\ \ \ -| | * | | 64c7c40b8 CR: add shadow to activity indicator -| | * | | 2af99eb71 Allow canceling GIF download -| | * | | 891cc6ee0 CR: better method names -| | * | | 6eaa49593 preview vs. sending have independent resolution min -| | * | | 688810c26 CR: Enforce "one time only" with a bool, not a cell ref -| | * | | 591cba646 fix comment typos -| | * | | a01de4491 Fix intermittent crash -| | * | | 6db589526 dismiss keyboard when scrolling after auto-search -| | * | | be51776d8 Fix mask appearing partially above search bar -| | * | | 37177de7c Make sure user knows what they're picking -| | * | | e4ad169d7 Show retryable error alert when fetching GIF fails -| | * | | 3939e8a6a Download picked GIF faster: cancel pending request -| | * | | b8ce636af Show loading screen while selected GIF downloads -| | * | | ddf2fe21a Download smaller GIF for previews. -| | * | | 2a4c6506f log giphy data usage in debug -| |/ / / -| * | | 4dabb7181 Fix "can't send same GIF twice" issue. -| * | | 9eb490918 (tag: 2.18.0.2) bump build -| * | | a7195e404 (tag: 2.18.0.1) Merge branch 'charlesmchen/refineGifSearch' into release/2.18.0 -| |\ \ \ -| | * | | a386ac568 Respond to CR. -| | * | | b90e9fcd6 Skip redundant GIF searches. -| | * | | 33d3c4123 Progressive GIF search shouldn't dismiss keyboard. -| |/ / / -| * | | 2716f5039 (tag: 2.18.0.0) Bump version -| * | | 6e12b9c89 Fix trailing edge of group member listing -* | | | bfde3142c Merge branch 'charlesmchen/fixMarkAsRead' -|\ \ \ \ -| * | | | 7fa7d5d52 Fix "mark as read." -|/ / / / -* | | | 21cdaeed0 Merge branch 'charlesmchen/cleanupConversationView' -|\ \ \ \ -| * | | | b0aa84e42 Clean up conversation view. -|/ / / / -* | | | bc6b5d088 Merge branch 'charlesmchen/reloadAndLayoutChurn' -|\ \ \ \ -| * | | | d355b45ba Reduce relayout and reload churn; respond to dynamic type changes. -| * | | | c2608785e Reduce relayout and reload churn; respond to dynamic type changes. -|/ / / / -* | | | 385d7c0c7 Merge branch 'charlesmchen/textInputVsLeaveConversationView' -|\ \ \ \ -| * | | | 4dc6934fc End text editing if we leave conversation view. -|/ / / / -* | | | 27d8af694 Merge branch 'charlesmchen/linkifyTextMessages' -|\ \ \ \ -| * | | | bd5639baa Linkify text messages. -|/ / / / -* | | | 98433272b Merge branch 'charlesmchen/fixMessageCellLayout' -|\ \ \ \ -| * | | | bf80e6dd3 Fix broken message cell layout. -|/ / / / -* | | | 990fd1cca Merge branch 'charlesmchen/autoLoadMore' -|\ \ \ \ -| * | | | 45ba79d29 Auto-load more message if user scrolls near the top of the conversation. -|/ / / / -* | | | 7249a04a8 Merge branch 'charlesmchen/fixMessageInjection' -|\ \ \ \ -| * | | | 1ad3add1d Fix message injection. -|/ / / / -* | | | 1529ded43 Merge branch 'charlesmchen/resetKeyboardAfterSend' -|\ \ \ \ -| * | | | c7097db93 Respond to CR. -| * | | | f28abbc2a Revert from numeric to default keyboard after message send. -|/ / / / -* | | | 31941de1b Merge branch 'charlesmchen/sendGifTwice' -|\ \ \ \ -| * | | | fb4d43d54 Fix "can't send same GIF twice" issue. -|/ / / / -* | | | fb360cd41 Merge branch 'charlesmchen/attachmentApprovalInInputToolbar' -|\ \ \ \ -| * | | | f3102e276 Fix presentation animation of new "attachment approval" state of input toolbar. -| * | | | 0fe76aaab Move "attachment approval" into input toolbar. -|/ / / / -* | | | 7e41489d8 Merge branch 'charlesmchen/menuController' -|\ \ \ \ -| * | | | 298a4aa10 Simplify and fix edge cases around menu controller. -| * | | | 06eb794db Simplify and fix edge cases around long pressing on system message cells. -|/ / / / -* | | | 6cba186d8 Merge branch 'charlesmchen/inputPlaceholder' -|\ \ \ \ -| * | | | 37841d9b6 Respond to CR. -| * | | | 4a94d039e Restore the input toolbar's placeholder text. -|/ / / / -* | | | 7d3df0bf0 Merge branch 'charlesmchen/conversationCellPerf' -|\ \ \ \ -| * | | | c47573334 Respond to CR. -| * | | | 3b945a9da Respond to CR. -| * | | | 88c874e4e Clean up ahead of PR. -| * | | | 257f8249b Cull cached cell media outside a load window. -| * | | | 65efa7f83 Lazy load, eagerly unload & cache cell media. -| * | | | e77292c2a Add contentWidth property to ConversationViewCell. -|/ / / / -* | | | d7f24e480 Increase profile disclosure compression resistance -* | | | 9818fc774 Merge branch 'charlesmchen/reworkConversationInputToolbar' -|\ \ \ \ -| * | | | b269c72ac Respond to CR. -| * | | | f36ecbdfa Button locations in input toolbar should reflect RTL. -| * | | | cec614706 Button locations in input toolbar should reflect RTL. -| * | | | 2ec852235 Fix the input toolbar. -|/ / / / -* | | | 741ef123f Merge branch 'charlesmchen/restoreLoadMoreMessages' -|\ \ \ \ -| * | | | b9f6bbb36 Clean up ahead of PR. -| * | | | 163e66dd4 Restore "load more messages" functionality. -|/ / / / -* | | | 78bf4fb57 Merge branch 'charlesmchen/injectFakeIncomingMessages' -|\ \ \ \ -| * | | | ccb37bfac Respond to CR. -| * | | | ae550fa96 Add actions to debug UI to inject fake incoming messages. -|/ / / / -* | | | 88ca1279e Merge branch 'charlesmchen/verticalScrollIndicatorConversationView' -|\ \ \ \ -| * | | | ed350f8ea Add vertical scroll indicator to conversation view. -|/ / / / -* | | | 9395fe058 Merge branch 'charlesmchen/socketProcessOffMainThread' -|\ \ \ \ -| * | | | e3868df69 Move write of incoming messages off main thread. -|/ / / / -* | | | fe87015bb Merge branch 'charlesmchen/incomingAttachmentsVsExpiration' -|\ \ \ \ -| * | | | 8704722f9 Don't start expiration of incoming messages until attachments are downloaded. -|/ / / / -* | | | 5e7ca0a75 Merge branch 'charlesmchen/rewriteConversationView2_' -|\ \ \ \ -| * | | | 032ec59d1 Respond to CR. -| * | | | 01691b7ad Ensure attachment masking is updated to reflect cell relayout. -| * | | | 212d5dd11 Clean up ahead of PR. -| * | | | ae27d062f Clamp content aspect ratio. -| * | | | b6a61afd5 Clean up ahead of PR. -| * | | | 46dc0acdf Fix media cropping. -| * | | | 132d5b340 Clean up ahead of PR. -| * | | | e91599d98 Restore message cell footers. -| * | | | 3723a4845 Restore message cell footers. -| * | | | c2f07bb3d Restore message cell footers. -| * | | | 227fd5280 Resize conversation view cells as necessary. -| * | | | f7bd813c9 Restore the date headers to the conversation view cells. -|/ / / / -* | | | 603a7d263 Merge branch 'release/2.18.0' -|\ \ \ \ -| |/ / / -| * | | 90468135c Merge branch 'mkirk/compose-cr-fixups' into release/2.18.0 -| |\ \ \ -| | * | | ab05bd32e compose search cleanup per code review -| |/ / / -* | | | 0f859d6b2 Merge branch 'release/2.18.0' -|\ \ \ \ -| |/ / / -| * | | a76b1f52b Merge branch 'mkirk/show-entire-message' into release/2.18.0 -| |\ \ \ -| | * | | 9ae4a26eb Message details shows entire message -| |/ / / -| * | | 0a19e0715 Merge branch 'mkirk/fix-invite-sms' into release/2.18.0 -| |\ \ \ -| | * | | 038ca0d6a Fix invite via SMS in search -| |/ / / -| * | | 69ee9cbcf Merge branch 'mkirk/pull-to-refresh-inbox' into release/2.18.0 -| |\ \ \ -| | * | | 6a65ee6de Pull to refresh on homeview fetches messages. -| |/ / / -| * | | e47d15d08 Merge branch 'mkirk/revamp-compose' into release/2.18.0 -| |\ \ \ -| | * | | 3080cb512 Compose View: collation index and group search -| |/ / / -* | | | d8b9fcf05 Merge branch 'charlesmchen/rewriteConversationView_' -|\ \ \ \ -| |/ / / -|/| | | -| * | | 49501a5d1 Respond to CR. -| * | | b1624d681 Respond to CR. -| * | | b833976b7 Clean up ahead of PR. -| * | | 5621fe893 Clean up ahead of PR. -| * | | fb408f980 Remove JSQ. -|/ / / -* | | 796be18c5 enable gif picker -* | | 12b674ffb Merge branch 'mkirk/log-sent-timestamps' -|\ \ \ -| * | | b2efb722d Log timestamp of sent messages -|/ / / -* | | af4a4c436 Merge branch 'mkirk/call-timeout' -|\ \ \ -| * | | dd5a19d1f Suspend while answering shows "Missed Call" -|/ / / -* | | a434a381f Merge branch 'hotfix/2.17.1' -|\ \ \ -| |/ / -| * | 23b8560b7 (tag: 2.17.1.0) sync translations -| * | 2cc59dc16 bump version -| * | 875297f1a Merge branch 'charlesmchen/profileSaveDeadlock' into hotfix/2.17.1 -| |\ \ -| | * | 44051bd7e Avoid deadlock in profile manager. -| |/ / -| * | b2ee64e70 Merge branch 'mkirk/fix-registration-layout' into hotfix/2.17.1 -| |\ \ -| | * | f314b2e50 Fix registration screen layout -| |/ / -* | | 97d99e5c2 Merge branch 'mkirk/push-notification-fixups' -|\ \ \ -| * | | 9a7e3cb9d Register for manual message fetching when unable to obtain push tokens -| * | | df15c904b Rework push registration -|/ / / -* | | b916e14ab Merge branch 'mkirk/silent-group-info-request' -|\ \ \ -| * | | 703d4df9e Avoid phantom notifications for group info requests -|/ / / -* | | 0431d1813 Merge branch 'charlesmchen/giphyAPIKey' -|\ \ \ -| * | | b0e1904f9 Respond to CR. -| * | | 7923eafe7 Use separate Giphy API key for Signal iOS. -|/ / / -* | | ede89a740 Merge branch 'mkirk/background-push-notifications' -|\ \ \ -| * | | b5258be9b respond to code review -| * | | 876521f4c Fetch messages sooner when launched from background -| * | | c7cfe188e Sync push tokens on background launch as well -|/ / / -* | | abcf421ef Merge branch 'charlesmchen/gifs3' -|\ \ \ -| * | | 7d9c2825d Add progressive search to Gif picker. -|/ / / -* | | 0f58a528a Merge branch 'charlesmchen/removeFLAnimatedImage' -|\ \ \ -| * | | 5999178e7 Remove FLAnimatedImage. -|/ / / -* | | e4b563bcd Merge branch 'mkirk/update-deps' -|\ \ \ -| * | | 2e196e21c update third party dependencies -|/ / / -* | | e5205ea31 Merge branch 'charlesmchen/gifs2' -|\ \ \ -| * | | fd28e5413 Respond to CR. -| * | | 52a8fb4b8 Add loading background to gif cells, refactor gif cells. -| * | | 334396dac Add activity indicator, "error", "no results" and retry to gif picker. -| * | | 6fb9af636 Rework gif picker background & giphy logo. -|/ / / -* | | 61373a194 Fix build by including missing newly added WebRTC framework headers -* | | 098906882 Merge branch 'mkirk/webrtc-mtl-view' -|\ \ \ -| |/ / -|/| | -| * | fe8c6346a Update carthage to use oak-built WebRTC.framework M61+Signal -| * | 4c797151e Avoid divide by 0 error -| * | 3864880a6 CR: ensure view doesn't grow indefinitely -| * | 3d3af2179 CR: clarify comment, proper linewrap -| * | 580e82bea CR: clamp reasonable aspect ratio -| * | 14b6f3163 position video view below status bar -| * | 15f613563 Fix AspectRatio on legacy video view -| * | c3dc8508a pre-PR cleanup -| * | f837a4624 Fix post call crash on iOS8 -| * | 39e5875a3 remove overzealous assert -| * | 2a4e113c8 Cleanup -| * | 9b33bb0b6 fix layout on MetalKit view -| * | ff2f9ebaf fix compiling on 32bit. -| * | f171c5648 Video calls use MetalKit when available -| * | 7e39e58fc WebRTC M61 -|/ / -* | 4ab0ae273 (tag: 2.17.0.8) pull translations -* | 7b50a0c7d bump build -* | a28dfd7c5 Merge branch 'qatar-censorship-circumvention' -|\ \ -| * | 8ff14a3f6 Enable censorship circumvention in Qatar. -|/ / -* | f46747179 Merge branch 'charlesmchen/ignoreGroupInfoRequest' -|\ \ -| * | 0c46b770e Ignore group info requests if sender and recipient aren't both known group members. -|/ / -* | a5023aada Merge branch 'charlesmchen/groupSafety' -|\ \ -| * | 13a665799 Respond to CR. -| * | 2a5a0929e Create & access groups more carefully. -| * | 380ed0f82 Create & access groups more carefully. -|/ / -* | 87c5a6c5f Merge branch 'charlesmchen/respondToSyncBlocklistRequest' -|\ \ -| * | a31b1aeea Respond to "sync block list" request. -|/ / -* | 4e30ec1ae (tag: 2.17.0.7) bump build -* | b21731526 Merge branch 'mkirk/fix-readreceipt-pref' -|\ \ -| * | 462a6e445 Persist read receipts to proper collection -|/ / -* | 7636f41b1 (tag: 2.17.0.6) sync translations -* | ba15f7775 Merge branch 'charlesmchen/tweakScrollDownButtonMargins' -|\ \ -| * | cef1f9186 Fix the scroll down button margins. -|/ / -* | b938ec6ed bump build -* | 8dd3e47d8 Merge branch 'mkirk/send-config-sync-on-change' -|\ \ -| * | 2125dbe72 CR: Avoid potential transaction nesting -| * | 5d62741a3 Sync read receipt configuration upon set -|/ / -* | e22db2adb Shorter string fits button better on small devices -* | 6fd638539 (tag: 2.17.0.5) sync translations -* | d5f8c7933 bump build -* | 2292f20c9 Merge branch 'charlesmchen/fixIsContactTest' -|\ \ -| * | 9f5454a4c Fix the "is contact" test. -| * | 10c00501f Fix the "is contact" test. -| * | 50ec55c31 Fix the "is contact" test. -|/ / -* | 2ddde6617 Merge branch 'mkirk/sync-settings-req' -|\ \ -| * | ab5b09033 Sync read receipt config to linked devices -| * | be197621a Add read receipts field/configuration protos -|/ / -* | 25d75363f Merge branch 'charlesmchen/gifs' -|\ \ -| * | 8b7d34e51 Respond to CR. -| * | fd9188415 Respond to CR. -| * | a0c9a8439 Clean up ahead of PR. -| * | d73a1a02a Tweak GIF cells. -| * | 801734a93 Clean up ahead of PR. -| * | e4556967b Ensure gif cells reload when app becomes active or network becomes available. -| * | 5b7011620 Unify the "message was sent" logic in conversation view. Ensure "message sent" sounds are played after sending attachments. -| * | 3bfb91d0c Ignore obsolete GIF requests. -| * | c32945b57 Clean up ahead of PR. -| * | 56e30d954 Clean up ahead of PR. -| * | e0194fd60 Allow multiple simultaneous GIF downloads. -| * | d9658ab9d Clean up ahead of PR. -| * | a65a4b133 Clean up ahead of PR. -| * | 48e6cea20 Replace FLAnimatedImage with YYImage. -| * | aa43fd69f Improving parsing of stills. -| * | 6a5e07eee Use proper LRU cache for giphy assets. -| * | 4f77a2a50 Load GIFs progressively using stills. -| * | 2dfd7aa0e Actually send GIFs. -| * | c50ccf3ee Fix gif download cancellation. -| * | 789cea118 Pull out GifDownloader class. -| * | e9885af97 Sketch out the GIF picker. -| * | 424200182 Sketch out the GIF picker. -| * | ee9101eb1 Sketch out the GIF picker. -| * | 3b9726a4f Sketch out the GIF picker. -| * | 206f96c9a Sketch out GIF picker. -| * | 62ba5701f Sketch out GIF picker. -| * | 27e5a2f1b Sketch out GIF picker. -| * | 30a77c597 Parse Giphy API responses. -| * | b4d29bd5d Parse Giphy API responses. -| * | 9710964e3 Sketch out the GIF manager. -|/ / -* | ac649a474 (tag: 2.17.0.4) Bump build to 2.17.0.4. -* | 0263dbb00 Update l10n strings. -* | c9ef7176d Merge branch 'charlesmchen/fixScrollDownButton2' -|\ \ -| * | dbe2c6aa7 Fix scroll down button. -|/ / -* | c093cf083 (tag: 2.17.0.3) sync latest translations -* | 9983cfa02 bump build -* | 3812fe54a Merge pull request #2599 from WhisperSystems/charlesmchen/contactChangesVsOffers -|\ \ -| * | f99ce23e6 Fix wrongful "add to contacts offer" issue. -|/ / -* | 87e1409b4 Merge branch 'mkirk/read-receipts-splash' -|\ \ -| * | 175474e0d Read receipt update screen -|/ / -* | 2c25c25c2 Merge branch 'mkirk/attachments-unknown' -|\ \ -| * | a2421d5b3 Fix "unknown attachment" notifications -|/ / -* | 9d5874025 Merge branch 'charlesmchen/scrollDownHotArea' -|\ \ -| * | 6abc4bed9 Increase hot area of scroll down button. -|/ / -* | 1e07ae11c Merge branch 'charlesmchen/biggerMessageBatches' -|\ \ -| * | 08e560f96 Respond to CR. -| * | 0a081f7dc Use longer delay when batch processing incoming messages. -| * | 69c9a5a49 Use longer delay when batch processing incoming messages. -|/ / -* | 5cc7aadb6 Merge branch 'charlesmchen/tweakReadReceipts' -|\ \ -| * | 46d2b7a89 Refine read receipt processing cycle. -| * | 6b3c0377c Refine read receipt processing cycle. -|/ / -* | 502b41eba Merge branch 'charlesmchen/tweakMessageMetadata' -|\ \ -| * | 34218feec Disable contact cells in message metadata view. -| * | 256b5ab44 Don't show recipient status group titles for 1:1 threads. -|/ / -* | 3eb427493 Merge branch 'charlesmchen/capButtonTextSize' -|\ \ -| * | ffea39abd Cap the flat button text size. -|/ / -* | e5387a397 Update l10n strings. -* | d6d528d6f Merge branch 'charlesmchen/listGroupMembers' -|\ \ -| * | b3da6a977 Change the "group members" item name. -|/ / -* | 791613a3e (tag: 2.17.0.2) bump build -* | 5706683dd sync translations -* | 251d4968a Merge branch 'charlesmchen/moreThreadSafety' -|\ \ -| * | c3dca21a6 More thread safety fixes. -|/ / -* | 8fbc996bc Merge branch 'mkirk/fix-rtl-bubbles' -|\ \ -| * | e2445e6ed Fix RTL bubbles in conversation and message detail view -|/ / -* | b2a38323b Merge branch 'mkirk/stricter-l10n-script' -|\ \ -| * | 09a457ee6 Check all preconditions up front -|/ / -* | 2b05326d7 (tag: 2.17.0.1) bump build -* | 549c39c6c sync latest translations -* | 70f28d048 Merge branch 'mkirk/bubble-metadata-view' -|\ \ -| * | c3bb8a019 on main thread, per CR -| * | 5704bf176 message bubbles for message detail view controller -|/ / -* | 0b73018c0 Merge branch 'mkirk/fix-notification-launch' -|\ \ -| * | 344903fa5 Show proper thread from notification -|/ / -* | 36d55fb7a Merge branch 'charlesmchen/fixMarkAsReadFromLinkedDevice' -|\ \ -| * | 65957c932 Respond to CR. -| * | 8b15dba4e Fix "mark as read on linked device". -|/ / -* | 08e3c6cc0 regenerate source l10n, replace lost JSQMVC strings -* | b34076eea Merge branch 'charlesmchen/offMainThread' -|\ \ -| * | facbc5606 Move more work off the main thread. -| * | 9573e0e16 Move more work off the main thread. -|/ / -* | 80ae95271 Merge branch 'mkirk/fix-assert' -|\ \ -| * | e77a7e09b Fix assert for empty thread -|/ / -* | 5faeed4d5 Fix breakage. -* | f0021bb35 Merge branch 'charlesmchen/readReceiptsCopy' -|\ \ -| * | 3566ed8de Update read receipts setting copy. -|/ / -* | 147f99f1b Merge branch 'charlesmchen/reworkMessageMetadataView' -|\ \ -| * | 2dce0e9b1 Respond to CR. -| * | 26c8c4e1f Rework message metadata view. -| * | de29b5a6e Rework message metadata view. -| * | 29c405904 Rework message metadata view. -|/ / -* | ca76af1fe Merge branch 'mkirk/remove-already-registered-button' -|\ \ -| * | 655598d0a remove existing account button -|/ / -* | cdd17c769 Merge branch 'charlesmchen/outgoingMessagesFromLinkedDevices' -|\ \ -| * | 1df1144e4 Respond to CR. -| * | 33376f66d Simplify processing of messages from linked devices. -|/ / -* | 1a3b3b2c0 Merge branch 'charlesmchen/contactCellsInMessageMetadata' -|\ \ -| * | a231834a7 Use contact cells in message metadata view. -|/ / -* | 0b60b521c Merge branch 'charlesmchen/tweakReadReceiptsSetting' -|\ \ -| * | d6e884924 Rework "send read receipts" setting. -|/ / -* | 6aec89177 Merge branch 'charlesmchen/silentMessages' -|\ \ -| * | 9b5affb39 Send silent messages where appropriate. -|/ / -* | cc2d08d03 Merge branch 'charlesmchen/messageDetailViewChanges_' -|\ \ -| * | d28a014e2 Respond to CR. -| * | cf4aeac0e Modify message metadata view to observe DB changes. -|/ / -* | 745e9978d Merge branch 'charlesmchen/messageDates' -|\ \ -| * | b3ab6d060 Respond to CR. -| * | 3a39a1ba5 Format message statuses with date if possible. -| * | d557817bb Format message statuses with date if possible. -|/ / -* | 0b535ae81 (tag: 2.17.0.0) sync translations -* | 3485ff8d2 bump version -* | 8088318db Merge branch 'charlesmchen/migrateDecryptJobs' -|\ \ -| * | 834ad3f8e Respond to CR. -| * | 01bda556c Fix class rename. -| * | 6b8c9b6bc Iterate the names of the incoming message queue extensions. -| * | eec0efa3c Fix class rename. -|/ / -* | eec2e5c76 Merge branch 'charlesmchen/deliveryReceipts' -|\ \ -| * | a4d285f50 Respond to CR. -| * | aa7329013 Handle new-style delivery receipts. -| * | 25c40ea3c Handle new-style delivery receipts. -|/ / -* | 60738b450 Merge branch 'charlesmchen/refactorLinkedDeviceReadReceipts' -|\ \ -| * | ee13084d5 Respond to CR. -| * | ffe44e68b Refactor linked device read receipts. -|/ / -* | 289291e03 Merge branch 'charlesmchen/profileDeadlock_' -|\ \ -| * | 16d4256e9 Address deadlocks in profile manager. -|/ / -* | 1fe905f0f Merge branch 'charlesmchen/npeCanPerformAction' -|\ \ -| * | af7fd60d7 Fix NPE in conversation view. -|/ / -* | e617ae910 Merge branch 'mkirk/no-sync-profile' -|\ \ -| * | 4777335ff Don't attempt to sync profile until registered. -|/ / -* | c38fd51fb Merge branch 'charlesmchen/profileDeadlock2' -|\ \ -| * | 9dcc7e1ea Respond to CR. -| * | 57b5ccdc3 Address deadlocks in profile manager. -| * | cb365d0a5 Address deadlocks in profile manager. -|/ / -* | 907ddd4d3 Merge branch 'charlesmchen/messageDetailView' -|\ \ -| * | 19e010645 Respond to CR. -| * | 9f9ac746d Sketch out message metadata view. -|/ / -* | 3bb8f4aad Merge branch 'charlesmchen/tweakReadReceipts' -|\ \ -| * | f001e8c22 Respond to CR. -| * | 315c1d7dc Hide all read receipts in UI if not enabled. -|/ / -* | 8f92421cc Merge branch 'mkirk/fix-desktop-linking' -|\ \ -| * | ce2a4422e fix desktop linking for some users -|/ / -* | b4312a561 Merge remote-tracking branch 'origin/hotfix/2.16.1' -|\ \ -| |/ -| * 612615a2b (tag: 2.16.1.3, origin/hotfix/2.16.1) bump build -| * cfa99f253 update l10n -| * 6271cbaf5 Merge branch 'mkirk-hotfix-2.16.1/launch-from-notification-crash-fix' into hotfix/2.16.1 -| |\ -| | * 73bdae336 Fix 1-time crash when launching 2.16 from notification -| |/ -| * bfb5fac87 Make "database view registration complete" check thread-safe. -* | 442ab102b Merge branch 'charlesmchen/showRecipientReadReceipts2' -|\ \ -| * | b74da07f7 Respond to CR. -| * | 825503210 Remove extraneous database view. -| * | 11cadf420 Send, receive & show read receipts to senders/from receivers. -|/ / -* | 29dae9bb9 Merge branch 'charlesmchen/stress' -|\ \ -| * | f2d19ffe0 Respond to CR. -| * | c92c6de7b Add stress group to debug UI. -| * | 7268bde50 Add stress group to debug UI. -| * | bd416176a Add stress group to debug UI. -|/ / -* | 77e0c9664 Respond to CR. -* | d40862fd7 Merge branch 'charlesmchen/fixMessageProcessingEdgeCases' -|\ \ -| * | edd63164d Fix build breaks. -| * | 874ebf703 Use private queues in message decrypter and batch processor. -| * | 077b74a0a Fix handling of edge cases around groups. -| * | 2b0b49b7f Don't batch message decryption. -| * | bfb03c0db Fix message processing edge cases. -|/ / -* | d5ff2cae6 Merge branch 'charlesmchen/asyncNotifications' -|\ \ -| * | 445f6dc6f Respond to CR. -| * | 35a2470cb Post notifications asynchronously. -|/ / -* | 1382270c6 Merge branch 'charlesmchen/readReceiptsManager' -|\ \ -| * | 1c8dbcd22 Respond to CR. -| * | 3eaeb4e0e Add read receipts manager. -|/ / -* | 2cfa24ba7 Respond to CR. -* | 5a843e714 Merge branch 'charlesmchen/refactorMessageProcessing' -|\ \ -| * | b28c4b74b Pull out TSMessageDecrypter class. -|/ / -* | 46c4f4e44 Merge branch 'charlesmchen/precommitIncludesAndClasses' -|\ \ -| * | f1b7d895e Modify precommit script to clean up includes and forward declarations. -|/ / -* | 83479a505 clarify translations procedure -* | e1c8d38f3 update translations doc -* | c4b368340 Merge branch 'charlesmchen/batchMessageProcessing' -|\ \ -| * | 993df25f3 Respond to CR. -| * | 46f17a02c DRY up decryption logic. -| * | e39b9169b Decrypt and process messages in batches. -| * | 9987ebb3c Decrypt and process messages in batches. -| * | 023c804a6 Decrypt and process messages in batches. -| * | fa353259c Process messages in a single transaction (wherever possible). -| * | 6fce2c26b Process messages in a single transaction (wherever possible). -| * | afc753e7e Add batch message processor. -| * | c498e4b35 Decouple message decryption and processing. -|/ / -* | 3abcbdf98 Merge branch 'charlesmchen/databaseViewRegistrationCheckVsConcurrency' -|\ \ -| * | bfd50a9e0 Make "database view registration complete" check thread-safe. -|/ / -* | 3d3f3bb59 Merge branch 'charlesmchen/readReceiptPreferencesCR' -|\ \ -| * | 8a4d67a6e (origin/charlesmchen/readReceiptPreferencesCR) Respond to CR. -| * | 183f0f1cc Respond to CR. -|/ / -* | bd360262c Merge branch 'charlesmchen/readReceiptPreferences' -|\ \ -| * | 83c21c615 Add setting for read receipts in app settings. -| * | 65732af3d New users opt-out of read receipts; legacy users opt-in. -| * | 40d728e02 Add read receipts preference. -| * | 80e5f281c Rename app preferences class. -|/ / -* | c7fab5b92 Merge branch 'charlesmchen/readReceiptsProtos_' -|\ \ -| * | 74b2f3052 Revert "Modify read receipt photos to support sending read receipts to both linked devices and senders." -| * | a7546aee6 Modify read receipt photos to support sending read receipts to both linked devices and senders. -| * | 39a961e37 Rework incoming read receipts handling. -| * | 737503549 Rework incoming read receipts handling. -| * | 2b1ea1996 Modify read receipt photos to support sending read receipts to both linked devices and senders. -| * | 0e7eaf7c6 Modify read receipt photos to support sending read receipts to both linked devices and senders. -|/ / -* | 3367292ba Merge branch 'hotfix/2.16.1' -|\ \ -| |/ -| * 8f2eb7adf Merge branch 'charlesmchen/improveStartupLogging' into hotfix/2.16.1 -| |\ -| | * f92b221e6 Startup logging. -| | * 70602e3bc Startup logging. -| |/ -| * 7101d4aa3 (tag: 2.16.1.2) bump build -| * 7f6c27863 pull latest translations -| * 3ead1c0d8 Merge pull request #2553 from WhisperSystems/mkirk-hotfix-2.16.1/pick-any-profile-photo -| |\ -| | * 5e878b486 Show album organizer for profile picker -| |/ -| * 92a2fd6b6 Avoid NPEs when entering conversation view. -| * 95c5a907f (tag: 2.16.1.1) Bump build to 2.16.1.1. -| * f1d8d7ac7 Update l10n strings. -| * 07c579c34 Merge branch 'mkirk/callscreen-uses-profile-name' into hotfix/2.16.1 -| |\ -| | * e11a3bd18 change animation to linear -| | * 643f583fa Disable name marquee scrolling whenever local video is open -| | * 0ec2ac862 Marquee label for callview controller -| | * bd6387d1d fit more of profile name on call screen -| | * c4139b0f3 Callkit ringer uses profile name -| |/ -| * 509ed8dc6 Update l10n strings. -| * 13ebc9a64 Merge branch 'mkirk/khmer-l10n' into hotfix/2.16.1 -| |\ -| | * ad76155bd audit/fix up supported l10ns (added km and lt) -| |/ -| * fd4287c55 Bump version to 2.16.1.0. -* | 05cc84ee1 Merge branch 'charlesmchen/flatButtonCR' -|\ \ -| * | 2affcd934 Respond to CR. -|/ / -* | 8ceca7645 Merge branch 'charlesmchen/modalActivityIndicatorCR' -|\ \ -| * | c0f5bda2b Respond to CR. -|/ / -* | 90eebb3d7 Merge branch 'charlesmchen/lazyLoadAttachmentsCR' -|\ \ -| * | a5ece18e6 Fix build break. -| * | 400f536e3 Respond to CR. -| * | 872ce17dd Clean up data source temp files when complete. -|/ / -* | cf246a41c Merge branch 'charlesmchen/profileNotificationsVsConversationView' -|\ \ -| * | 541966aaf Fix NPEs when profiles change while entering conversation view. -|/ / -* | 9f803fa44 Merge branch 'charlesmchen/conversationPresentation' -|\ \ -| * | 2c68b0641 Respond to CR. -| * | e222b9df6 Normalize conversation presentation logic. -| * | 04d452b07 Normalize conversation presentation logic. -| * | b6d782046 Normalize conversation presentation logic. -|/ / -* | f3fa107e4 Merge branch 'charlesmchen/callsVsPermissionsCrashes' -|\ \ -| * | 7b1b532b1 Respond to CR. -| * | 43370ffc3 Fix assert during calls without camera permission. -| * | e8daf9a8d Fix assert when missing camera permission during calls. -|/ / -* | 9ee25fd60 Merge branch 'charlesmchen/pullToRefreshContacts' -|\ \ -| * | 563753a4c Force contacts intersection in pull-to-refresh from new thread view. -| * | 3aa90451f Restore pull-to-refresh in the "new contact thread" view. -|/ / -* | 28219008b Merge branch 'charlesmchen/linkedDeviceSendVsScrollState' -|\ \ -| * | 05b181887 Don't "scroll to bottom" when messages are sent from desktop. -| * | 48121e5ea Don't "scroll to bottom" when messages are sent from desktop. -|/ / -* | 894c7b3da Merge branch 'mkirk/update-support-url' -|\ \ -| * | 4997b4e33 update to new support URL -|/ / -* | 2824892b6 Merge branch 'charlesmchen/postRegistration' -|\ \ -| * | 0b772b3a3 Move post-registration work from view to app delegate. -|/ / -* | b39aa3b91 Merge branch 'charlesmchen/flatButton' -|\ \ -| * | 9ee72756a Create Flat UI rounded button class. -| * | 46d00383f Create Flat UI rounded button class. -| * | 3993035d9 Create Flat UI rounded button class. -| * | 5be2014ec Create Flat UI rounded button class. -|/ / -* | c95ff44ea Merge branch 'charlesmchen/modalActivityIndicator' -|\ \ -| * | ab00342d6 Add modal activity indicator view. -|/ / -* | b0186754b Merge branch 'charlesmchen/lazyLoadAttachments' -|\ \ -| * | bb2a822f3 Clean up the data source class. -| * | d3ad0950b Clean up the data source class. -| * | b8573d732 Apply OWSFail() in more places. -| * | 9dfebb2d4 Apply OWSFail() in more places. -| * | c21a7673c Rework preservation of attachment filenames. -| * | 0746b1300 Apply DataSource to message sender. -| * | b95b5f69d Apply DataSource to message sender. -| * | 20e5013aa Convert DataSource to Objective-C. -| * | 69816cdf0 Convert DataSource to Objective-C. -| * | 2282733fa Add data source class. -|/ / -* | 94f02c0d1 Merge branch 'charlesmchen/contactsAndProfilesVsDebugUI' -|\ \ -| * | 0c281cab9 Add "log user profiles" debug UI action. -| * | d8d3f3607 Add "delete all contacts" debug UI action. -|/ / -* | 948da2afb Merge remote-tracking branch 'origin/release/2.16.0' -|\ \ -| |/ -| * 43a2b9ebe (tag: 2.16.0.20, origin/release/2.16.0) Bump build to 2.16.0.20. -| * 5d58f4383 More profile logging -| * 3d5836a76 (tag: 2.16.0.19) Bump build to 2.16.0.19. -| * 066cc411f Merge branch 'mkirk-2.16.0/fix-no-profile-crash' into release/2.16.0 -| |\ -| | * 04bf548a7 Fix one-time crash when opening thread without having a local profile -| |/ -| * 2bd50a7bf (tag: 2.16.0.18) Bump build to 2.16.0.18. -| * 60ab8bd04 Update l10n strings. -| * 628dd8055 Merge branch 'mkirk-2.16.0/fix-nav-controller' into release/2.16.0 -| |\ -| | * 25a2646c8 Always present settings from OWSNavigationController -| |/ -* | 7d5377875 Merge branch 'charlesmchen/conversationBackButtonHotArea' -|\ \ -| * | df2bf6338 Fix back button width on iOS 11. -| * | 26a6e76f3 Rework conversation view header. -| * | b626fb5bf Rework conversation view header. -| * | 644f435b1 Rework conversation view header. -|/ / -* | daa8c409e Merge branch 'charlesmchen/renameViews' -|\ \ -| |/ -|/| -| * c106794fe Rename conversation view. -| * 928525c31 Rename home view. -| * fd4f00fa4 (origin/charlesmchen/renameNewContactThreadView) Rename new contact thread view. -|/ -* 29848835f (tag: 2.16.0.17) Bump build to 2.16.0.17. -* e6d14db2f Merge branch 'charlesmchen/pushNotificationsVsConcurency' -|\ -| * fc92293da Fix build break. -| * 6911c8047 validate push settings on main thread -|/ -* 58e6ab60d Update l10n strings. -* ddb4d9743 (tag: 2.16.0.16) Bump build to 2.16.0.16. -* 77760b8ad Merge branch 'mkirk/ios11-images' -|\ -| * 2d13c4922 [iOS11] Support sending .heif filesS -| * 83ca34edb Fix sending images taken on iOS11 camera. -|/ -* 454a7c295 Merge branch 'mkirk/jsq-ios11' -|\ -| * ecf8ca093 [JSQMVC] iOS11 compatability -|/ -* 5170fe09b (tag: 2.16.0.15) Bump build to 2.16.0.15. -* 8d4850657 Merge branch 'mkirk/avatar-cropper' -|\ -| * d827453f4 copy tweak -| * 0d04cf251 Ensure the crop view is WYSIWIG. -| * 4e93bec23 black masking style for avatar cropper -|/ -* 79f0c14e2 Merge branch 'mkirk/upgrade-experience' -|\ -| * 809a9c3d1 copy tweak -| * 59eb782d5 Optimize layout for profile upgrade, remove other upgrade screens -| * 0244a8203 code cleanup for clarity -| * 90b1db9eb new upgrade layout -| * b7cc1e9f5 top margin iphone5c -| * 73a441a28 introducing profiles -|/ -* e1e8d05ed Merge branch 'charlesmchen/groupVsUserProfileWhitelist' -|\ -| * 16dcc73b2 Respond to CR. -| * 2ce66527f Add group members individual to profile whitelist when adding group. -|/ -* 605ba90bc Merge branch 'charlesmchen/initialConversationRangeSize' -|\ -| * 6a2d14ad2 Refine message view's initial range size. -| * a1cb2c015 Refine message view's initial range size. -|/ -* 2cd72d64c (tag: 2.16.0.13) Fix commit messages written by build number script. -* 3be347ed2 Bump build from to 2.16.0.13. -* 85c07da43 Merge branch 'mkirk/icon-cleanup' -|\ -| * cd4cfb50d clean up avatar icon -|/ -* 13640db20 Merge branch 'mkirk/enforce-name-limit' -|\ -| * ae174d4a8 proper handling for multibyte characters -| * 362b38378 Length-limit profile name field -|/ -* b648165db Merge branch 'charlesmchen/skipProfileUpgradeNag' -|\ -| * 3d0300242 Use "skip" not "stop" in profile upgrade nag. -|/ -* 43db34c99 Merge branch 'charlesmchen/fixFakeContacts' -|\ -| * 94daccc78 Fix fake contacts. -| * a35a21d5c Batch the creation of fake contacts. -|/ -* 49147a499 Merge branch 'mkirk/fix-view-load' -|\ -| * 1cd51a8df Use existing isViewLoaded var -|/ -* 7f5975f02 Merge branch 'mkirk/prod-crashes' -|\ -| * 3b85c5e49 crashfix: production crash when notification fired before view loaded -| * 2cd2596dd crashfix: thread.uniqueId is sometimes nil in production -| * bb8f6c1b7 crashfix: crash while accessing image property -| * 2eaaba908 crashfix: on addObject, presumably it's nil. -|/ -* 274fa25e6 (tag: 2.16.0.12) Bump build from to 2.16.0.12. -* b8802729b Merge branch 'charlesmchen/layoutGlitches' -|\ -| * 1be49e485 Update JSQMessagesViewController pod. -| * 95eaa2c3b Preserve scroll state across conversation view layout changes, if possible. -| * b2c8ad2d2 Restore scroll state after resetting the conversation view's mapping. -| * 7d3249196 Preserve scroll state across conversation view layout changes, if possible. -|/ -* eaa1f4f31 (tag: 2.16.0.11) Bump build from to 2.16.0.11. -* 894ba2802 Merge branch 'charlesmchen/isScrolledToBottom' -|\ -| * fce2ad279 Refine the "is scrolled to bottom" logic to better handle new conversations. -|/ -* 4884473ea Merge branch 'charlesmchen/gifOfDeath' -|\ -| * bb1681f96 Respond to CR. -| * cc048b397 Respond to CR. -| * ef21c6d50 Ignore "GIF of death." -| * 7f15228ab Ignore "GIF of death." -| * 5fcf89dff Ignore "GIF of death." -|/ -* 6a76fed3c Merge branch 'charlesmchen/keyboardShowVsScrollState' -|\ -| * b9908997c Remain scrolled to bottom after presenting the keyboard in messages view. -|/ -* 045d7efb2 Merge branch 'charlesmchen/debugVsProduction' -|\ -| * d03233947 Modify debug builds to use production service. -|/ -* 6156fcb24 Merge branch 'mkirk/fix-provisioning-cipher' -|\ -| * 01d0117f9 provisioning cipher: Fix memory leak, handle failure -| * 1f7b6f61c Regression test for provisioning cipher -|/ -* 59f2c4674 (tag: 2.16.0.10) Bump build from to 2.16.0.10. -* d7b0b6a25 Fix build break in production builds. -* 43dddf931 (tag: 2.16.0.9) Bump build from to 2.16.0.9. -* 1e31eb6cd Merge branch 'mkirk/sync-whitelist' -|\ -| * bdb75fa59 infer when group has been whitelisted on linked device -|/ -* e97de3599 Merge branch 'charlesmchen/dontIgnoreAttachments' -|\ -| * b00db33d1 Don't ignore attachments. -|/ -* 0cc169e60 Merge branch 'charlesmchen/syncLocalProfile' -|\ -| * 3c90c3361 Respond to CR. -| * 71d7490e3 Re-sync local profile state with service if necessary. -|/ -* cf7f9dabf Merge branch 'charlesmchen/rtlVsSystemMessages' -|\ -| * ac3743f81 Fix RTL layout of system message cells. -|/ -* de98d3c15 Merge branch 'charlesmchen/messageViewScrollStateAgain' -|\ -| * 92a0fbe01 Fix yet another edge case around message view scroll state. -|/ -* 4a2ca15b7 Fix build break around parameter name. -* 70cbfb9ec Merge branch 'charlesmchen/messageViewScrollStateRevisited' -|\ -| * 44f071bdf Respond to CR. -| * 6f5437ee0 Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. -| * 997cd2ef2 Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. -| * 7f717c0ca Revisit the [UIScrollView _adjustContentOffsetIfNecessary] issue. Fix glitches in the initial scroll state in message view. Don't reset scroll state when returning to the message view. -|/ -* 3ffb321e2 fix assert -* 18bc7cb0a Merge branch 'mkirk/sync-local-profile-earlier' -|\ -| * 4c51f1810 sync local profile as soon as it's created -|/ -* 1aeccc6a4 Merge branch 'mkirk/profile-key-flag' -|\ -| * ab84cbd67 use messageSender property now that the class relies on it in multiple places. -| * 42934e5fd remove retry logic per code review -| * d71b7684a cleanup logging -| * 55d0db8c4 Disable profile-key sending with feature flag -| * ec0cf36ab Don't print empty bubbles. -| * 69e8ca8ea Handle receiving profile key messages -| * 4382f3361 Send blank PROFILE_MESSAGE after whitelisting someone -| * 6c63009e9 Dedicated "Profile" debug section -| * 9c5666061 profile key flag and debug action -|/ -* fb42077db Merge branch 'mkirk/profile-key-sync' -|\ -| * d8aa9b4a3 better comment per CR -| * 0feb966a1 comment cleanup / code formatting -| * 6cde79c56 Assert profile key length on sending/receiving -| * 6235e7fe5 Don't send profile key with every sync message since we explicitly sync upon update/create. -| * 526d5e33b Sync profile key to sibling devices when updating contact -| * 46919e470 Add own profile key to multidevice provisioning message -| * 1f3d2d1ed Send any profile key in contact sync -| * f0a57edde proto update: multiDevice profileKey sync -|/ -* ce92cc632 Merge branch 'charlesmchen/fixScrollDownButton' -|\ -| * d3d9e5dab Fix scroll down button state. -|/ -* 4f8508050 Merge branch 'charlesmchen/localProfileVsUploadForm' -|\ -| * cdfdb80fd Respond to CR. -| * 7e4859241 Clear the local profile avatar immediately when we request upload form. -|/ -* 47ae4bd90 Merge branch 'charlesmchen/clearProfileAvatars' -|\ -| * 0fa19b526 Clear own avatar on service if necessary when updating local profile. Clear others' avatar when appropriate. -| * 50a8d0f16 Clear own avatar on service if necessary when updating local profile. Clear others' avatar when appropriate. -|/ -* 65eb5c725 Bump build from to 2.16.0.8. -* 5ec9b40f1 Merge branch 'mkirk/profile-censorship' -|\ -| * 1e51bf489 extract event names -| * 251e206b6 profiles vs. censorship circumvention -|/ -* c630a1ecc Merge branch 'charlesmchen/messageViewTweaks' -|\ -| * f2ae73e15 Remove obsolete "scrollLaterTimer" hack in messages view. -| * 8794880db Unbound message bubble cache size and DRY up cache logic. -|/ -* d4879a5f5 Update JSQMessageView. -* c08d81e45 Merge branch 'charlesmchen/cropAndScaleAvatar' -|\ -| * c90ca331e Respond to CR. -| * 2aaa9155d Add view to Crop and scale avatar. -| * 6b8e189f4 Add view to Crop and scale avatar. -| * 728028563 Add double-tap to zoom out. -| * e7b32f9fd Add double-tap to zoom out. -| * 2b50eb5ac Add view to Crop and scale avatar. -| * 2c301feeb Add view to Crop and scale avatar. -|/ -* 428edb617 Merge branch 'charlesmchen/profileNameLengthError' -|\ -| * 374a59e93 Remove an old TODO. -| * e8a6ca1c2 Show an error when profile name is too long. -|/ -* 3cccf9275 Merge branch 'mkirk/profile-name-for-avatar' -|\ -| * bde40a1f9 Ensure avatar upates right after profile change. -| * f6720f9af properly clear all cached avatar images -| * b579ea591 Use profile name when building avatar if contact name is unavailable -|/ -* 0812e73fd Merge branch 'charlesmchen/groupProfileWhitelistCache' -|\ -| * 89bacf5cc Respond to CR. -| * 65db75a91 Fix group profile whitelist check. -|/ -* 1944979ac Merge branch 'charlesmchen/noAvatarInNewContacts' -|\ -| * 9bf80a215 Don't add avatar to new contacts. -|/ -* 7dbf372f7 Merge branch 'mkirk/remove-profile-key-debug' -|\ -| * 903d792af Debug action to clobber local profile and key -|/ -* 75ceb62f2 Merge branch 'mkirk/more-name' -|\ -| * 041c5a4a1 CR: setNeedsLayout -| * f49e12256 listen for profile names change notifications -| * 96f0ab215 wip -| * fd9935467 profile name vs. verified in ContactTableViewCell -| * e54e1d11c show profile name snippet in inbox and conversation settings -|/ -* b22a8f51b (tag: 2.16.0.7) Bump build from to 2.16.0.7. -* f8000d86b Merge branch 'mkirk/fix-whitelist' -|\ -| * 279eb8902 Fix whitelist -|/ -* 6d6ffd6d3 (tag: 2.16.0.6) Bump build from to 2.16.0.6. -* 5593cd2ee Merge branch 'charlesmchen/messageViewTruncateRange' -|\ -| * b28a6bab2 Respond to CR. -| * 57b76b341 Ensure message view range is properly truncated with view is configured. -|/ -* 51d11cdcc Merge branch 'charlesmchen/profileViewTweaks2' -|\ -| * 15d2fd23d Rework save/cancel buttons in profile view. -| * 68309eb00 Rework save/cancel buttons in profile view. -|/ -* afd530af1 Merge branch 'mkirk/fix-boot-crash' -|\ -| * 0a57e7db0 Fix slow start crash after upgrade to 2.16 -|/ -* cda5157b9 Merge branch 'charlesmchen/writeTransactionsVsSyncDBRegistration' -|\ -| * 703b34809 Respond to CR. -| * a9b55675c Add assert to ensure that we don't use write transactions before sync database view registration is complete. -|/ -* 9a045054e Merge branch 'charlesmchen/stagingServiceVsProduction' -|\ -| * 97f74ca5b Only use staging service in debug builds. -|/ -* 828cfb5fa Merge branch 'charlesmchen/groupOffers' -|\ -| * 5e6f5804c Respond to CR. -| * 584ddab0b Show "share profile with group" banner. -| * ae1908c40 Show "share profile with group" banner. -|/ -* 673c44e13 Merge branch 'charlesmchen/padEmptyProfileName' -|\ -| * 68ee56174 Pad empty profile names instead of nil. -|/ -* 3d6bf273d (tag: 2.16.0.5) Bump build from to 2.16.0.5. -* 7eeb32686 Fix minor build error. -* ec3f099af (tag: 2.16.0.4) Bump build from to 2.16.0.4. -* 42b5da2db Merge branch 'charlesmchen/reworkProfileView' -|\ -| * 6dda535f2 Rework the profile view. -| * 313d06b31 Rework the profile view. -| * 020d2c567 Rework the profile view. -| * 3181ee788 Rework the profile view. -|/ -* d27708497 Merge branch 'charlesmchen/observeProfileChanges' -|\ -| * 9dfeb132c Respond to CR. -| * 1e43e9337 Observe profile changes in conversation view. -|/ -* 9a70aef99 (tag: 2.16.0.3) Bump build from to 2.16.0.3. -* 72c983e4a Merge branch 'charlesmchen/contactOffers' -|\ -| * 14d472781 Respond to CR. -| * a340c9ebd Clean up ahead of CR. -| * 4578a72ab Reorder where contact offers appear. -| * 02c96b7b0 Rework the contact offers. -| * 9e02524b0 Rework the contact offers. -| * c2f9d7dcb Rework the contact offers. -| * 265bdce0b Start reworking the contact offers. -| * a825fad47 Start reworking the contact offers. -| * 98eb4693c Rework the contact offers. -| * 5f2f8ec6d Start reworking the contact offers. -|/ -* 7ede899a7 Merge branch 'mkirk/openssl' -|\ -| * 0ab958f03 cleanup per codereview -| * 0f9f26a57 handle remote user's profile key has changed -| * 72fbb0202 aes-gcm via openssl -| * d6d403ce6 fix some tests -|/ -* 636790c99 Merge branch 'charlesmchen/profileForNewAndOldUsers' -|\ -| * 27e496ad0 Respond to CR. -| * 1b055c485 Rework "cancel navigate back" logic. -| * 25b0f7961 Rework "cancel navigate back" logic. -| * 08347478a Implement alternative approach to veto-able back buttons. -| * 9d8c39684 Add profile view to upgrade/nag workflow. -| * ffb4b3f9d Add profile view to registration workflow. -|/ -* 26f9c7ad0 Merge branch 'mkirk/clarify-profile-name-use' -|\ -| * 7c386b1d1 CR: RTL, trim profile names, ensure not empty -| * 4511b4015 Clarify where we use the profile name -|/ -* c536f4d4b Merge branch 'charlesmchen/newContactConversationsVsProfileWhitelist' -|\ -| * 164bf19b4 Respond to CR. -| * 622c0c3f5 * Add debug UI tools for clearing and logging the profile whitelist. * Auto-add new contact threads to profile whitelist when local user sends first message to that thread. * Ensure dynamic interactions have a non-negative timestamp even if the conversation was empty. * Only call updateMessageMappingRangeOptions _after_ beginLongLivedReadTransaction and updating messageMappings. * Improve documentation around how to avoid corrupt mappings in conversation view. * Fix edge cases around large initial range sizes. * Always treat dynamic interactions as read. * Rebuild the “unseen” database views to remove dynamic interactions (see above). -| * d476bc286 * Add debug UI tools for clearing and logging the profile whitelist. * Auto-add new contact threads to profile whitelist when local user sends first message to that thread. * Ensure dynamic interactions have a non-negative timestamp even if the conversation was empty. * Only call updateMessageMappingRangeOptions _after_ beginLongLivedReadTransaction and updating messageMappings. * Improve documentation around how to avoid corrupt mappings in conversation view. * Fix edge cases around large initial range sizes. * Always treat dynamic interactions as read. * Rebuild the “unseen” database views to remove dynamic interactions (see above). -| * 0b14f8757 Improve comments about mapping consistency in conversation view. -|/ -* 58a4993b2 Merge branch 'mkirk/fix-send-jank' -|\ -| * e08fa4bce Fix jolting animation after sending a message -|/ -* 92ecf0cdc Merge branch 'mkirk/push-registration-blocks-signal-registration' -|\ -| * 2e8364332 Don't consider registration complete until user registers their push notification tokens. -|/ -* d41a9fd4d Merge branch 'charlesmchen/increaseConversationRangeSize' -|\ -| * 6c3662b94 Increase max conversation range length. -|/ -* 2f2902a76 (tag: 2.16.0.2) Bump build from to 2.16.0.2. -* 34a0f9810 Merge branch 'charlesmchen/profileViewTweaks' -|\ -| * ddd8c9ff5 Respond to CR. -| * 3ecd415b8 Show activity indicator during profile update; trim whitespace from profile names. -|/ -* 14b6fbcb0 Merge branch 'charlesmchen/profilesVsEncoding' -|\ -| * 943945b4b Fix “profiles not encoded” bug. -|/ -* 7a03ab4e7 (tag: 2.16.0.1) Bump build from to 2.16.0.1. -* 83f400c16 Merge branch 'charlesmchen/profileManagerConcurrency' -|\ -| * 46d27cef3 Respond to CR. -| * 1dd75a05f Tweak concurrency in profile manager. -| * 02f8b13f4 Rework concurrency in the profile manager. -|/ -* 8dce481ea Merge branch 'charlesmchen/layoutGlitch' -|\ -| * b2360ace6 Fix layout glitch in messages view. -|/ -* 34cf56fb3 Merge branch 'charlesmchen/profileVsAppSettingsHeader' -|\ -| * f618f8782 Respond to CR. -| * 90f959d0a Respond to CR. -| * cdb181ead Sketch out profile header in app settings view. -| * 13aea6687 Sketch out profile header in app settings view. -|/ -* fde0ca6ed (tag: 2.16.0.0) Update l10n strings. -* 80951349e Bump version to 2.16.0.0. -* 00860e898 Merge branch 'mkirk/scale-avatar' -|\ -| * abec53672 simplify check for max file size per CR -| * 2c3e99c37 better var name per code review -| * fd02644ca resize profile avatar -|/ -* 6bb102783 Merge branch 'mkirk/save-profile-to-contact' -|\ -| * 9f72db44a Avoid lossy re-encoding of profile image -| * 0290f176c Use profile name/avatar when creating new contact -|/ -* 9f45ddd39 Merge branch 'mkirk/gcm-verification' -|\ -| * 97afa4d48 verification on decrypt -|/ -* b3ddd73ce Merge branch 'mkirk/new-profile-service-scheme' -|\ -| * 135243e38 CR: variable rename, better comments, fix up tests -| * 7499b3aaf Avatar API integration / WIP crypto scheme -| * 283d36c55 remove avatar digest. -| * fc3f9ae39 Replace server sent avatar URL with hardcoded -|/ -* 391928443 Merge branch 'mkirk/call-debugging' -|\ -| * 3d9796db7 Debug actions for calling -|/ -* a90f11490 (origin/mkirk/fix-profile-crash) Merge branch 'mkirk/fix-profile-crash' -|\ -| * 9fdc3202a White listing must happen on main thread -|/ -* 69b75942f Merge commit '2.15.3.2' -|\ -| * d29dd5c2b (tag: 2.15.3.2) Bumping build. -* | 1ee27996e Merge branch 'hotfix/2.15.3.1' -|\ \ -| |/ -| * 8da3108b5 (tag: 2.15.3.1, origin/hotfix/2.15.3.1) Drop stale EndCall/BusyCall messages -* | 370ce5ba0 Merge branch 'hotfix/2.15.3' -|\ \ -| |/ -| * 4cf860cfe (tag: 2.15.3.0, origin/hotfix/2.15.3) pull latest translations -| * 46e5240f8 bump version -| * 93d2baa09 [JSQMVC] Fix scrolling crashes -| * 0e241299d Discard GroupInfoRequest from unknown group -* | 4f6d91ce6 Merge branch 'mkirk/fixup-tests' -|\ \ -| * | 40b99a15e (origin/mkirk/fetch-profile-avatars) Fix up some tests -|/ / -* | 620550a46 Merge branch 'mkirk/upload-profile-avatar' -|\ \ -| * | a3ae22c84 Upload profile avatar to service -| * | 45a1f534b Rename method to make way for new method. -|/ / -* | 388b778a0 Merge branch 'mkirk/unknown-group-info-request' -|\ \ -| * | 72b3f3779 (origin/mkirk/unknown-group-info-request) Discard GroupInfoRequest from unknown group -|/ / -* | a8bfa45f1 Merge branch 'mkirk/use-profile-data' -|\ \ -| * | 16c646a93 Use profile name/image when available. -|/ / -* | 8f54df0ff Merge branch 'mkirk/whitelist-on-main' -|\ \ -| * | ee613e488 Can only set whitelist on main thread -|/ / -* | e07ed5017 define avatar form URL -* | 71be024fd [SPK] more asserts/logging -* | 98e668530 Merge branch 'charlesmchen/profile10a' -|\ \ -| * | e01fbc247 Refine profile logic. -| * | 09e65a674 Incomplete work to upload avatars. -| * | f6668d24c Download profile avatars. -| * | 9266c3a4f Clear profile state when a user’s profile key changes. -| * | 8b9749202 Load local user profile avatar if necessary. -| * | 21304c18a Once we've shared our profile key with a user (perhaps due to being a member of a whitelisted group), make sure they're whitelisted. -|/ / -* | fa1678f94 Merge branch 'charlesmchen/profiles9a' -|\ \ -| * | 98def4178 Respond to CR. -| * | 823927685 Update profile on service. -| * | 83d01eed7 Don’t encrypt/decrypt avatar URL or digest. -|/ / -* | cc789c7df Merge branch 'charlesmchen/profiles8' -|\ \ -| * | f6bcff542 Fix rebase breakage. -| * | 83e2fbe28 Rework where profile key is attached in photos. -| * | b5fdc05b9 Move profile key to data, call, sync and null protos. -| * | 37ce388eb Add “add to profile whitelist” offer. -|/ / -* | 9f6ca3d84 Merge branch 'mkirk/precache-localnumber' -|\ \ -| * | ed4de7e8a Simplify code / pre-cache localNumber -|/ / -* | f99d4e9df Merge branch 'hotfix/2.15.2' -|\ \ -| |/ -| * 783686778 (tag: 2.15.2.2, origin/hotfix/2.15.2) pull latest translations -| * b29d87cb3 bump build -| * df94337a0 Merge branch 'mkirk/improve-asserts' into hotfix/2.15.2 -| |\ -| | * 3856f3dfb (private/mkirk/improve-asserts) Improve asserts/logging -| |/ -* | 219580827 Merge branch 'mkirk/fix-tests' -|\ \ -| * | 52bd68256 fix some recently broken tests -|/ / -* | b18f3bc08 Merge branch 'charlesmchen/unregisterVsProfileCache' -|\ \ -| * | 03774216a Respond to CR. -| * | 6ac4d8e97 Delete profile avatars on disk when unregistering. -|/ / -* | 50a379096 Merge branch 'charlesmchen/profileWhitelistVsOwnGroups' -|\ \ -| * | ddf3929be Auto-add groups to profile whitelist groups when you make them. -|/ / -* | e74e7f7cc Merge branch 'charlesmchen/profiles7' -|\ \ -| * | ba506bf09 Respond to CR. -| * | 49e65ba1b Update user profile update date on successful update. -| * | 9c0f94f1c Fetch profiles from profile manager. Update profile manager with profile fetch results. -| * | 6ec756de4 Move profile manager to Signal. -| * | 540a0a8e4 Refine UserProfile class. Move local user properties to UserProfile. -|/ / -* | 6bc20ea97 Merge branch 'charlesmchen/showThreadsSync' -|\ \ -| * | a70bd3307 Show threads if possible. -|/ / -* | aa5c441ae Merge branch 'mkirk/cache-local-number' -|\ \ -| * | 935b51aa1 Fixup tests -| * | 01e808feb localNumber persistance from Category -> TSAccountManager -| * | 8a4712bf4 Only access localNumber on AccountManager and cache it -|/ / -* | e0aae5058 Merge branch 'mkirk/random-avatar-builder' -|\ \ -| * | 357eb6250 [DEBUG-UI] Add avatar to (some) fake contacts -|/ / -* | 43b3abe32 Merge branch 'hotfix/2.15.2' -|\ \ -| |/ -| * 96faa080c (tag: 2.15.2.1, private/hotfix/2.15.2) Merge branch 'charlesmchen/callViewDelay' into hotfix/2.15.2 -| |\ -| | * d9bc3ac80 Respond to CR. -| | * 9c5934359 Don’t dismiss call view controller to present other view. -| | * 138301975 Don’t dismiss call view controller to present other view. -| | * 791e27057 Terminate call if call view presentation is delayed. -| | * 634617b7d Terminate call if call view presentation is delayed. -| |/ -| * 2da8741df Merge branch 'mkirk/call-screen-timer' into hotfix/2.15.2 -| |\ -| | * 81d7f2825 Timer to ensure call screen shown -| | * c6069376d more logging -| |/ -| * f8e153fb7 Bump build from to 2.15.2.1. -| * 639fcac21 (tag: 2.15.2.0) Merge branch 'charlesmchen/hideThreadsVsDisappearingMessages' into hotfix/2.15.2 -| |\ -| | * 6f03c2d92 Don’t hide threads if they are a group thread, or if they have _ever_ had a message. -| |/ -| * 5c4019b9c Bump version to 2.15.2.0. -* | a1411ff81 Merge branch 'charlesmchen/profiles6' -|\ \ -| * | 539490ee1 Respond to CR. -| * | c603a2651 Rework how user profiles are updated and persisted. Persist other user’s profiles. Load and cache other user’s profile avatars. -| * | d7f275ce7 Add accessor for other users’ profile names. -| * | 4a54f1a99 DRY up and refine the logic to attach the local profile key to outgoing messages. -| * | aa6312b58 DRY up and refine the logic to attach the local profile key to outgoing messages. -| * | 282ac4bb2 Add “share profile” row to conversation settings. -| * | 1c1e173c5 Add support for adding groups to the profile whitelist. -| * | 26b668cce Add profile key to proto schema. Send and receive profile keys. Cache profile manager state. -| * | e58358ce5 Add profile key to content proto schema. -| * | 202724cdc Persist profile whitelist and known profile keys. -|/ / -* | ec6283fac Merge branch 'charlesmchen/yapDatabaseConnectionCategory' -|\ \ -| * | 2993ac002 Clean up database convenience methods and add assertions. -| * | a3b16812e Add convenience category for YapDatabaseConnection. -| * | 4be706caf Add convenience category for YapDatabaseConnection. -| * | 7692a393c Add convenience category for YapDatabaseConnection. -|/ / -* | 92e84ea21 Merge branch 'charlesmchen/profileView3' -|\ \ -| * | a748987d7 Add option to clear profile avatar. -|/ / -* | 83a02536a Merge branch 'charlesmchen/profileView2' -|\ \ -| * | 03a4ebc4d Respond to CR. -| * | 8a8f3d81f Clean up ahead of PR. -| * | c331788c0 Modify the profile view to update profile manager state. -| * | 0f3a3d190 Sketch out profile upload. -| * | 0bd23345a Sketch out the profile view. -| * | 873f5208c Sketch out the profile view. -| * | 72ea09697 Sketch out the profile view. -|/ / -* | b62ab3f66 Merge remote-tracking branch 'origin/hotfix/2.15.1' -|\ \ -| |/ -| * 868d19972 (tag: 2.15.1.0, tag: 2.15.1, origin/hotfix/2.15.1) Merge branch 'charlesmchen/ios8vsLayout' into hotfix/2.15.1 -| |\ -| | * 99c948568 Remove iOS 9-only APIs from layout code. -| |/ -| * 66cda35a8 Merge branch 'mkirk/fix-privacy-switch' into hotfix/2.15.1 -| |\ -| | * 249a3fcab Show proper setting for CallKitPrivacy -| |/ -| * 845c286b4 bump version -* | 5884d5d23 Merge branch 'mkirk/avatar-flash' -|\ \ -| * | 742f8cf90 Avoid unnecessariy flashing avatars -| * | 092578045 [DEBUG-UI] create fake contact threads -| * | bdd31fc77 Merge branch 'charlesmchen/profileManager' -| |\ \ -| | * | 63e20cd8b Sketch out profile manager. -| |/ / -| * | 7b2bab2ab Merge branch 'charlesmchen/l10nScriptVsSSK' -| |\ \ -|/ / / -| * | 74009a320 Modify l10n string extraction script to reflect SSK move. -|/ / -* | 4bf407a24 fix some compiler warnings -* | efcbd3b3a Merge branch 'charlesmchen/registrationCleanup' -|\ \ -| * | 3c3bd3c91 Tweaks to registration views. -|/ / -* | d809a30fa fix tests -|/ -* 1e002f7ef (tag: hotfix/2.15.1, tag: 2.15.0.4) Bump build from to 2.15.0.4. -* cb53d27e5 Merge branch 'charlesmchen/messageMappingsGrowth' -|\ -| * a0eead37c Ensure size of message mappings range increases monotonically. -|/ -* 2a6df19e0 Merge branch 'mkirk/drain-queue-perf' -|\ -| * a19669342 Make sure DB views are ready before kicking processing job -| * 0b38b4668 remove unnecessary dispatch -| * 6a5c6a9fc didBecomeActive kicks the processing queue -| * 106608998 Fix thread explosion -|/ -* 00fc1299d Merge branch 'charlesmchen/messageFooterAlignment' -|\ -| * 31d65c3d7 Fix RTL alignment of message footers. -|/ -* a9c07e88b Merge branch 'mkirk/fix-spinner-layout' -|\ -| * feb1061c0 Fix spinner layout on iphone5 -|/ -* 020bd4849 Fix tests -* 43f451e23 Remove errant assert. -* b6cecd44a Merge branch 'charlesmchen/fixWarningsInAnalyticsMacros' -|\ -| * bdb50552d Fix asserts in analytics macros. -|/ -* 240b8adbd Merge branch 'charlesmchen/debugUIVsManualCensorshipCircumvention' -|\ -| * 5acb3714e Add debug UI to enable manual censorship circumvention. -| * 75c7cc4ab Add debug UI to enable manual censorship circumvention. -|/ -* 964eb28f1 Merge branch 'charlesmchen/debugGroupsVsLocalNumber' -|\ -| * d22e29ec0 Include local number when creating debug groups. -|/ -* fe7ad9cc8 Merge branch 'charlesmchen/debugCreateGroups' -|\ -| * 8f17730d9 Modify “create groups” debug UI to use current 1:1 contact. -| * 653f7faca Add debug UI for creating groups. -|/ -* 1c3dd8cac (tag: 2.15.0.3) Bump build from to 2.15.0.3. -* 2bd113f14 Merge branch 'charlesmchen/hideEmptyConversations' -|\ -| * e74ef14ae Revert accidental change to Carthage. -| * 678db31c1 Hide empty conversations in home view. -| * c042a96aa Hide empty conversations in home view. -| * c6e21e83a Hide empty conversations in home view. -| * 8e628a629 Hide empty conversations in home view. -| * 189003916 Hide empty conversations in home view. -| * 103a7fab3 Hide empty conversations in home view. -|/ -* 6dff283de Update l10n strings. -* 75fb55e01 Merge tag '2.14.1.2' -|\ -| * 18ff07276 (tag: 2.14.1.2) bump build -| * 0b43b9448 revert WebRTC to fix iOS8 crashes -| * be731b7b2 (tag: 2.14.1.1) sync translations -| * 3cbab3fe3 bump build -| * 84e9c33f1 Optionally link Metal/MetalKit frameworks used by WebRTC -* | bca736a2b Merge tag '2.13.4.0' -|\ \ -| * \ 79aa5e279 (tag: 2.13.4.0, origin/hotfix/2.13.4.0) Merge branch 'charlesmchen/showUpgradeLabel' into hotfix/2.13.4.0 -| |\ \ -| | * | 9aa54cad6 Fix missing “database upgrade” label on launch screen. -| | * | ab9770c17 Fix missing “database upgrade” label on launch screen. -| | * | 503874481 Fix missing “database upgrade” label on launch screen. -| |/ / -| * | 1e99c55e8 Merge branch 'charlesmchen/moreDebugMessages' into hotfix/2.13.4.0 -| |\ \ -| | * | d94ee7ab1 Add options to send 3k debug messages. -| |/ / -| * | ac48b1388 Bump version number to 2.13.4.0. -| * | 2e5ba529a [SSK] Update SSK to hotfix/2.13.4.0. -* | | 3f805d31d (tag: 2.15.0.2) Bump build from to 2.15.0.2. -* | | 07ee0db80 Merge branch 'charlesmchen/moreCallServiceAnalytics' -|\ \ \ -| * | | dd13119f1 Add more instrumentation to CallService. -| * | | 904515994 Add more instrumentation to CallService. -* | | | 5c50aa74c Merge branch 'charlesmchen/crashDeletingThreads' -|\ \ \ \ -| |/ / / -|/| | | -| * | | e16d0e326 Avoid crash when deleting threads - and improve perf. -|/ / / -* | | 842e1503b Merge branch 'charlesmchen/gatherAnalyticsEventNames' -|\ \ \ -| * | | e5c0fa89d Respond to CR. -| * | | 465711c2c Add script to extract and gather analytics event names. -| * | | f1807cd70 Add script to extract and gather analytics event names. -| * | | 0cf9c01af Add script to extract and gather analytics event names. -| * | | 8aff95c44 Add script to extract and gather analytics event names. -| * | | b4f348ad1 Add script to extract and gather analytics event names. -| * | | 31ab9a00d Add script to extract and gather analytics event names. -|/ / / -* | | e9cf39a4c Merge branch 'charlesmchen/fixConversationViewTitle' -|\ \ \ -| * | | 6858a1e94 Fix assert in conversation view around nil title. -| * | | 803e91c3c Fix assert in conversation view around nil title. -|/ / / -* | | 898f122d2 Merge branch 'mkirk/drop-oversized-envelopes' -|\ \ \ -| * | | 91ad2ec32 Properly handle too-large messages -|/ / / -* | | 0113bb2c1 Merge branch 'charlesmchen/instrumentRegistrationFunnel' -|\ \ \ -| * | | 4ac7600c0 Respond to CR. -| * | | d4af62adc Instrument registration happy path with analytics. -|/ / / -* | | 0189f601c Merge branch 'charlesmchen/streamlineAnalyticsProperties' -|\ \ \ -| * | | 531489a82 Streamline analytics properties. -| * | | f973af5a8 Streamline analytics properties. -| * | | 013bf62f7 Streamline analytics properties. -|/ / / -* | | 8d796cc26 Merge branch 'mkirk/fix-crash-on-nil-key' -|\ \ \ -| * | | 3f4dcecf1 ensure blocking keychange message has identityKey before proceeding -|/ / / -* | | 8b724c5d7 Merge branch 'mkirk/durable-store' -|\ \ \ -| * | | eafc370bb CR: move property to method to clearly avoid Mantle serialization -| * | | 4d8429186 Store undecrypted envelopes before doing any processing. -|/ / / -* | | f4fc6de6e (tag: 2.15.0.1) Bump build from to 2.15.0.1. -* | | 1009b1ba7 Fix tests. -* | | 1486ef858 Merge branch 'charlesmchen/databaseObservation' -|\ \ \ -| * | | d80f470c2 Respond to CR. -| * | | 2e7fe5cfd Rework database observation in home and message views. -| * | | 1f1a68118 Rework database observation in home and message views. -|/ / / -* | | c41037a4f Merge branch 'charlesmchen/leakedViewControllers' -|\ \ \ -| * | | c1139a3a2 Fix many leaks in the view controllers. -| * | | f0cecfad1 Surface memory leaks by logging the deallocation of view controllers. -|/ / / -* | | d72c4a21c Fix missing variable type. -* | | 171eec25c Merge branch 'charlesmchen/easyTapGroupName' -|\ \ \ -| * | | 511cbbeaa Make it easier to tap-to-edit group names in new group and update group vies. -|/ / / -* | | 92f053e7a Merge branch 'charlesmchen/analytics6' -|\ \ \ -| * | | 863fd27ab Respond to CR. -| * | | 7cbdde7b1 Rework handling of critical errors, e.g. errors while initializing TSStorageManager. -| * | | 8e51b5ade Clean up ahead of PR. -| * | | 958a8b4c8 Instrument CallService. -|/ / / -* | | 90945609e (tag: 2.15.0.0) Bump version to 2.15.0.0. -* | | 8236f0545 Merge branch 'charlesmchen/analytics5' -|\ \ \ -| * | | ef4b1cf47 Respond to CR. -| * | | fa7a2407b Respond to CR. -| * | | b17a7c575 Review NSError usage. -| * | | 11f52757b Use background task when sending analytics events. -| * | | 543c05b2c Add a “critical” severity level for analytics events. -|/ / / -* | | 9962c936c Merge branch 'charlesmchen/analytics3' -|\ \ \ -| * | | 2418baec1 Respond to CR. -| * | | 9587aab37 Instrument network errors. -| * | | 117bca7c4 Instrument errors in app delegate. -| * | | 7da5df594 Instrument errors in storage manager. -| * | | 19c0a7ad7 Instrument errors in message sender. -| * | | e168db79a Instrument errors in message manager. -|/ / / -* | | bf82d2e2e Merge branch 'mkirk/atomic-registration' -|\ \ \ -| * | | c74a5c074 CR: strong reference to migration job, clarify variable -| * | | 6e19c1aae Don't crash when messaging user with malformed profile -| * | | a5f067936 migration to fix any half-registered users -| * | | 7c2880544 Don't consider yourself registered until you've uploaded your prekeys -|/ / / -* | | 078a1312f Merge branch 'charlesmchen/gifVsUrl' -|\ \ \ -| * | | 97772a32f Respond to CR. -| * | | 9eaeba9af Address yet another edge cases around pasteboards that contain both textual and non-textual content, e.g. a gif and the URL of that gif. -|/ / / -* | | aa5730dc1 Merge branch 'charlesmchen/alwaysReloadTableWhenChangingGrouping' -|\ \ \ -| * | | ceb243b30 Always reload home view table when changing grouping. -|/ / / -* | | d244731ce Merge branch 'mkirk/ssk-install' -|\ \ \ -| * | | 6ef9d568f Instructions, how to use SignalServiceKit -|/ / / -* | | de8a1b429 Merge branch 'mkirk/update-build-instructions' -|\ \ \ -| * | | 9560af493 clarify build instructions -|/ / / -* | | dc211afd5 Merge branch 'charlesmchen/nationalPrefixes' -|\ \ \ -| * | | 128c40a26 Respond to CR. -| * | | c8b2e22a3 [SSK] Migrating changes from obsolete SSK repo. -| * | | 03aacbd68 [SSK] Try applying national prefixes when parsing phone numbers. -|/ / / -* | | 3db5c777c Merge branch 'charlesmchen/analytics2' -|\ \ \ -| * | | 4059c3417 [SSK] Migrating changes from obsolete SSK repo. -| * | | 64a99c63b [SSK] Migrating changes from obsolete SSK repo. -| * | | fdac0305c Update analytics macros. -|/ / / -* | | 04cf1c8cb Merge branch 'charlesmchen/rightToLeft' -|\ \ \ -| * | | 4f5b2993b [SSK] Migrating changes from obsolete SSK repo. -| * | | 14621e128 Respond to CR. -| * | | 34f7cd1a4 Clean up ahead of PR. -| * | | 02c510691 Adapt number formatting to RTL. -| * | | 5edec99fd Adapt number formatting to RTL. -| * | | 04fb3642b Remove .xib for home view cells; adapter home view to RTL. -| * | | eaacac9d8 DRY up common table cell patterns. -| * | | 96fd5e11e Adapt more UI elements to RTL. -| * | | c799e18c7 Adapt voice messages UI to RTL. -| * | | 8005cf022 Adapt conversation settings view to RTL. -| * | | d4e62efce Adapt call view to RTL. -| * | | e2125978d Adapt "new group" and "update group" views to RTL. -| * | | 693e74e86 Adapt conversation settings view to RTL. -| * | | 656cc47de Adapt registration views to RTL. -| * | | d4f012fbb Fix contact table cell and “add to block list” view. -| * | | e15432720 Add arabic translation; begin work on right-to-left layout. -|/ / / -* | | b48225859 Merge branch 'mkirk/localize-jsqmvc-within-signal' -|\ \ \ -| * | | e52248fe3 Localize JSQMessagesViewController within Signal -|/ / / -* | | 45d74e4a9 Merge branch 'mkirk/intern-ssk-2' -|\ \ \ -| * | | 1b8efb525 CI runs SSK tests -| * | | 00fede422 Consolidate Gemfile w/ SSK, update fastlane -| * | | 4b69126d1 Use interned SSK -| * | | ccb4a8874 Import SSK (and history) into Signal-iOS -| |\ \ \ -|/ / / / -| * | | d98c07ecf Merge branch 'charlesmchen/countryNameVsiOS8' -| |\ \ \ -| | * | | 493aaca24 Avoid nil country names on iOS 8. -| |/ / / -| * | | e20d63240 Merge branch 'mkirk/cleanup-with-transaction' -| |\ \ \ -| | * | | faeb7100b use existing transaction in cleanup -| |/ / / -| * | | fe0f01dae Merge branch 'charlesmchen/pasteVoiceMessages' -| |\ \ \ -| | * | | c25550495 Fix copy and paste of voice messages. -| |/ / / -| * | | 640ec13b2 Merge branch 'charlesmchen/orphanCleanup' -| |\ \ \ -| | * | | 6fa3fac4a Fix broken tests. -| | * | | 7a50d6b99 Fix broken tests. -| | * | | 762f91517 Respond to CR. -| | * | | 96da091e9 Run orphan cleanup on startup. -| |/ / / -| * | | 9115a1f97 Merge branch 'mkirk/update-ci-gems' -| |\ \ \ -| | * | | 57b90e146 update ci gems -| |/ / / -| * | | e0f805f80 Merge branch 'mkirk/fix-persistence-upgrade' -| |\ \ \ -| | * | | ab6c1fb3b Fix persist view for upgrade scenarios -| |/ / / -| * | | 9d3175b5c Merge branch 'mkirk/cleanup-logging' -| |\ \ \ -| | * | | 957979585 remove unhelpful logging -| |/ / / -| * | | 8361ffb81 Merge branch 'mkirk/persist-thread-view' -| |\ \ \ -| | * | | ea681a61e persist thread view -| |/ / / -| * | | c1e1247ef Merge branch 'charlesmchen/identityManagerVsStartup' -| |\ \ \ -| | * | | 92276157d Don’t sync verification state until app has finished becoming active. -| |/ / / -| * | | 2216c2d41 Merge pull request #295 from WhisperSystems/mkirk/fix-tests -| |\ \ \ -| | * | | a23b4871e fix tests -| |/ / / -| * | | 72e893d5f Merge commit 'e24f18320d3aefe87d2532c9f0520348c4598cb2' -| |\ \ \ -| | * \ \ e24f18320 Merge branch 'charlesmchen/modelConnection' into hotfix/2.13.3.0 -| | |\ \ \ -| | | * | | 58fb86b8e Use a dedicated connection for model reads & writes. -| | |/ / / -| | * | | 065017caf Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0 -| | |\ \ \ -| | | * | | daae31d30 Modify TSStorageManager to use separate shared read and write connections. -| | |/ / / -| * | | | 8714a8f37 Merge branch 'mkirk/no-sync-to-unregistered-number' -| |\ \ \ \ -| | * | | | deff1fa4e FIX: verifiying unregistered user prints "no longer registered" error on every launch -| |/ / / / -| * | | | 1fc5f7728 Merge branch 'mkirk/declined-call-notification' -| |\ \ \ \ -| | |/ / / -| |/| | | -| | * | | fd625dff5 remove default case for better compiler warnings -| | * | | 89f86c4fd call type for declined call -| |/ / / -| * | | 04ef06ce9 Merge branch 'mkirk/fix-unread-badge' -| |\ \ \ -| | * | | f59779c11 message manager updates badge count -| |/ / / -| * | | 85fe68d3c Fix typo after rename -| * | | d6c5497f6 Merge branch 'mkirk/fix-tests' -| |\ \ \ -| | * | | 0b33ef616 try fastlane scan, since build is timing out. -| | * | | acf31db4b bump travis image to 8.3 -| | * | | a8ea2428c gemfile for consistent build on dev/CI -| | * | | 605db6b78 Fix up deleteAttachments method since making attachmentFolder dispatchOnce -| | * | | 1d71ca5e5 Fix some more tests. -| | * | | 8f9af85cc prefer hacks in test to hacks in code. -| | * | | 1b9aae2ea CR: renaming var to be more general -| | * | | e652dff4b Allow override of singleton enforcement in test app -| | * | | edf5852e8 set-expiration dispatches *sync* so we can test it. -| | * | | 1fb9fa79d Fix up some more tests. -| | * | | 13c5bdb8c fix disappearing messages test -| | * | | 2addb9e81 Fixed test build. Some tests still failing. -| |/ / / -| * | | c711b4a66 Merge branch 'mkirk/key-version' -| |\ \ \ -| | * | | b2f9abbc7 transmit key version byte -| |/ / / -| * | | 14c64239a Merge branch 'charlesmchen/archiveSessionsOnSSQ' -| |\ \ \ -| | * | | e9219743f Archive sessions on the 'session store' queue. -| |/ / / -| * | | 793a7449b Merge branch 'mkirk/archive-sessions-on-id-change' -| |\ \ \ -| | * | | 5da7dc1fd Archive sessions upon identity change. -| |/ / / -| * | | 07e029137 Merge branch 'charlesmchen/diskUsage' -| |\ \ \ -| | * | | e8e7b6bcb Add creation timestamp to attachment streams. -| |/ / / -| * | | 8fda18a8e Merge branch 'mkirk/verification-sync' -| |\ \ \ -| | * | | 5a2169fa7 Don't sync verification until NullMessage succeeds. This better mirrors existing sync message behavior -| | * | | 4c22f371a better comment on strange padding -| | * | | 6dea4c9fe fix padding calculation -| | * | | a5660f4db cleanup ahead of PR -| | * | | d927cba5c don't sync verified state when we have never recorded the recipients identity -| | * | | badaa5432 sync all verification states with contact sync -| | * | | 12bfae10e All sync messages should have 1-512 random padding -| | * | | 35ee92f38 send null message when syncing verification state -| | * | | 99cd8fc27 Log when receiving null message -| | * | | f653bc36a sync verification state with contacts -| | * | | 48b3f498a WIP: adapt to verification proto changes -| | * | | f526a372c proto update -| | * | | 6566ea694 no need to send sync messages when only 1 device -| |/ / / -| * | | 8b04e2a88 Merge branch 'charlesmchen/logOverflow' -| |\ \ \ -| | * | | ed369436f Reduce chattiness of logs; increase log file sizes. -| | * | | b946badd9 [SSK] Reduce chattiness of logs; increase log file sizes. -| |/ / / -| * | | 4609c508e Merge branch 'charlesmchen/fixCFail' -| |\ \ \ -| | * | | 30961cf2a Fix OWSCFail() macro. -| |/ / / -| * | | 4eacfe768 Merge branch 'charlesmchen/verificationSyncVsUI' -| |\ \ \ -| | * | | d8b34f630 Ensure verification UI is updated to reflect incoming verification state sync messages. -| |/ / / -| * | | 2315ab79d Merge branch 'charlesmchen/attachmentStreamUpgradePerf' -| |\ \ \ -| | * | | e86e175ce Respond to CR. -| | * | | beb4ed71e Respond to CR. -| | * | | cf65cc3be Improve perf of attachment stream file path upgrade. -| |/ / / -| * | | ed249840c Merge branch 'charlesmchen/slowLaunchRelease' -| |\ \ \ -| | * | | 27e5c836b Refine observation of async registration completion. -| |/ / / -| * | | 7af758bc6 Merge branch 'charlesmchen/enableVerificationStateSync' -| |\ \ \ -| | * | | 07bec72f6 Enable verification state sync. -| |/ / / -| * | | 5110c5892 Merge branch 'mkirk/verification-key-length' -| |\ \ \ -| | * | | e746c6b7e append/remove key type as necessary to fix verification syncing -| |/ / / -| * | | 2059bb496 Merge branch 'WhisperSystems-mkirk/fix-verification-crash' -| |\ \ \ -| | * | | 742e0d3c9 message sending must be on main thread -| |/ / / -| * | | c0cb153f2 Merge branch 'charlesmchen/holidayCodeReviewOmnibus' -| |\ \ \ -| | * | | 5d7c012b5 Respond to CR. -| | * | | d80e42e0a Respond to post-holiday code reviews. -| | * | | 18e6a1b1c Respond to post-holiday code reviews. -| |/ / / -| * | | a9bac8bce Merge branch 'charlesmchen/syncVerificationRedux' -| |\ \ \ -| | * | | 498c0ef68 Respond to CR. -| | * | | 44e1f4a14 Rework verification state sync per latest proto schema. -| |/ / / -| * | | 26e6aab07 Merge branch 'charlesmchen/lastAppLaunchCompletedVersion' -| |\ \ \ -| | * | | 8ef118f5d Cache the attachments folder in TSAttachmentStream. -| | * | | b9f9b6a0c Add isFirstLaunch method to AppVersion. -| | * | | 32e4eb2a4 Add a “last app completed launch” version. -| |/ / / -| * | | 7379e6a67 Merge branch 'charlesmchen/attachmentStreamUpgradesVsSerialQueue' -| |\ \ \ -| | * | | 470cee0e1 Upgrade attachment streams on a serial queue. -| |/ / / -| * | | 09513fc1c Merge branch 'charlesmchen/databaseViewsVsStartupTime' -| |\ \ \ -| | * | | 22109d719 Respond to CR. -| | * | | 0f9634105 Avoid crashing on startup due to database view creation. -| | * | | bbc7c44c9 Use transactions in the jobs. -| |/ / / -| * | | 96dc0e4fd Merge branch 'charlesmchen/removeBlockingPref' -| |\ \ \ -| | * | | d53db1744 Remove “block on safety number changes” setting in preferences. -| |/ / / -| * | | f999c4abb Merge branch 'charlesmchen/databaseViewsVsPerf2' -| |\ \ \ -| | * | | 0c503c379 Reduce number of database views. -| |/ / / -| * | | d8199a444 Merge branch 'charlesmchen/databaseViewsVsPerf' -| |\ \ \ -| | * | | bf07a8401 Remove an unnecessary database view. -| |/ / / -| * | | 1f1410ffa Merge branch 'charlesmchen/groupCreationErrors' -| |\ \ \ -| | * | | 3598cc18f Ensure message sends only succeed or fail once. -| | * | | e1439a54d Add “group creation failed” error message. -| |/ / / -| * | | 857fb535d Merge branch 'charlesmchen/expirationVsCalls' -| |\ \ \ -| | * | | 26836a572 Skip expiration for calls. -| |/ / / -| * | | 7052b97c7 Merge branch 'charlesmchen/callsStuckOnConnecting' -| |\ \ \ -| | * | | 42cef65de Improve logging around incoming messages. -| |/ / / -| * | | 916851205 Merge branch 'charlesmchen/readReceiptsVsOlderMessages2' -| |\ \ \ -| | * | | dfab38b94 Rework how messages are marked read. -| |/ / / -| * | | 5d1a33b5f Merge branch 'charlesmchen/readReceiptsVsOlderMessages' -| |\ \ \ -| | * | | 4a028d32b Filter messages shown in the home view. -| | * | | dcbb72d85 Filter messages shown in the home view. -| | * | | 5e5071141 Don’t update expiration for messages twice. -| | * | | dc9a2253d Rework how messages are marked read. -| | * | | c5c464378 Rework how messages are marked read. -| |/ / / -| * | | 49f118043 Merge branch 'mkirk/remove-legacy-message-sending' -| |\ \ \ -| | * | | c29549c21 remove legacy message sending -| |/ / / -| * | | 13a119b4b Merge branch 'charlesmchen/refineVerification' -| |\ \ \ -| | * | | f32432788 Don’t update home view sort order in response to dynamic interactions or verification state changes. -| | * | | 1052915c1 We only want to create change messages in response to user activity, on any of their devices. -| |/ / / -| * | | 12aed7a4a Merge branch 'charlesmchen/defaultVerificationMessageDescription' -| |\ \ \ -| | * | | fbc1bad88 Add a default description for verification state messages. -| |/ / / -| * | | 8bd028125 Merge branch 'mkirk/archive-not-delete' -| |\ \ \ -| | * | | 0df5ea3ee CR: continue to delete session when receiving an EndSession -| | * | | cfd9b84e6 Remove redundant missing-session check. -| | * | | 1db9c8b34 prefer archiving vs deleting sessions. -| |/ / / -| * | | f2f654af1 Merge branch 'charlesmchen/verificationStateChangeMessages' -| |\ \ \ -| | * | | ca04d912d Don't actually transmit any verification state sync messages until we finalize the proto schema changes. -| | * | | 841271dc6 Respond to CR. -| | * | | fdd172bda Add verification state change messages. -| | * | | eed637791 Add verification state change messages. -| |/ / / -| * | | fba94754a Merge branch 'mkirk/redundant-sn-changes' -| |\ \ \ -| | * | | 7fc73e2ba include recipient name in error message -| | * | | 94fb7d50e CR: add comment -| | * | | dfd0f8073 When failing to send to new identity, save it. -| |/ / / -| * | | edc6578b9 Merge branch 'charlesmchen/syncVerificationState' -| |\ \ \ -| | * | | 0e1156682 Respond to CR. -| | * | | e27e55ca9 Fix a typo. -| | * | | 5acb20942 Sync verification state. -| | * | | 3c2835d31 Sync verification state. -| | * | | 07ac17fd3 Sync verification state. -| | * | | 90d671924 Sync verification state. -| | * | | 89b1da766 Sync verification state. -| | * | | b2425ddf9 Sync verification state. -| |/ / / -| * | | 33df1fb6c Merge branch 'mkirk/create-missed-call-notification-in-thread' -| |\ \ \ -| | * | | 90087c34f Create an interaction when missing a call due to identity change -| |/ / / -| * | | 435f13f2f Merge branch 'mkirk/avoid-deadlock-on-unknown-session' -| |\ \ \ -| | * | | 0c2a1ff89 avoid deadlock on unknown session -| |/ / / -| * | | d475c5834 Merge branch 'mkirk/identityManager' -| |\ \ \ -| | * | | 81d36a465 code cleanup per code review -| | * | | 4a73ab285 trust matching first known key, regardless of how old it is -| | * | | 1603e8bfb more specific asserts, clean up logging -| | * | | e408250ef Fix crash when messaging user for the first time -| | * | | 167961a45 restore call-back for changed identities -| | * | | 12b5c2c26 Sync verification state. -| | * | | 8a2688387 Fix crash. -| | * | | fcc17ca86 Respond to CR. -| | * | | ecf7ef61f update identity manager names -| | * | | d9acaced2 Clean up ahead of PR. -| | * | | f1d85c2a9 Clean up ahead of PR. -| | * | | 559c389f9 Sketch out OWSIdentityManager. -| | * | | 702f7677c Sketch out OWSIdentityManager. -| | * | | 0fcd0afd1 Sketch out OWSVerificationManager. -| | * | | 9154cc46f Sketch out OWSVerificationManager. -| |/ / / -| * | | 43d1aa49d Merge branch 'charlesmchen/formatFailMessages' -| |\ \ \ -| | * | | 69e40cdf1 Format fail messages. -| |/ / / -| * | | 72fb925af Merge branch 'charlesmchen/reworkSystemMessages' -| |\ \ \ -| | * | | f63c85f5d Rework and unify the system messages. -| |/ / / -| * | | 0ad794dfd Merge branch 'mkirk/better-envelope-logging' -| |\ \ \ -| | * | | ab378f79b better message receipt logging -| |/ / / -| * | | 01f291146 Merge branch 'charlesmchen/obsoleteNotification' -| |\ \ \ -| | * | | 7c78d62a0 Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. -| |/ / / -| * | | 05a96008e Merge branch 'mkirk/reject-unseen-id-calls' -| |\ \ \ -| | * | | ebd4800e2 return unseen identity rather than bool -| | * | | e10cc0c18 determine if recipient identity change is unseen -| |/ / / -| * | | cd7a172b9 Revert "Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification." -| * | | f2fb2cb9d Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. -| * | | 0c46288cf Merge branch 'mkirk/dedicated-session-connection' -| |\ \ \ -| | * | | 806a64ee5 Store session as Immutable to be clear about when it's mutated. -| | * | | 29e86901e Do not cache session objects -| |/ / / -| * | | 07b54039b Merge branch 'charlesmchen/incomingAndOutgoingDatabaseViews' -| |\ \ \ -| | * | | 32d97bc6c Respond to CR. -| | * | | 09f7a9df4 Add incoming and outgoing message database views. -| |/ / / -| * | | 888943a04 Merge branch 'charlesmchen/cleanupTimerUsage' -| |\ \ \ -| | * | | 2b197197b Clean up timer usage. -| |/ / / -| * | | 0a3e75ee8 Merge branch 'charlesmchen/fixMarkAsRead' -| |\ \ \ -| | * | | e889f49e3 Fix “mark as read” logic. -| |/ / / -| * | | 6acfab6a5 Merge branch 'charlesmchen/refineUnseenIndicator' -| |\ \ \ -| | * | | a5bebaf86 Respond to CR. -| | * | | 0eff3625c Respond to CR. -| | * | | 31e216519 Respond to CR. -| | * | | 7c5a11b22 Changes for unseen indicator. -| | * | | 32d5e5214 DRY up the creation of database views. -| | * | | 6e94b3ccc Add a database view for dynamic interactions. -| |/ / / -| * | | c7cc02354 Merge branch 'charlesmchen/cacheAccountNames' -| |\ \ \ -| | * | | 66927f206 Cache display names for accounts. -| |/ / / -| * | | 33a2b05dc Merge branch 'mkirk/remove-unnecessary-notifications' -| |\ \ \ -| | * | | 42b35bb89 Don't notify for some error messages -| |/ / / -| * | | 0eef7ccb8 Merge branch 'mkirk/confirm-send' -| |\ \ \ -| | * | | 09d7d8c02 Given a recipient id, returns any unconfirmed identity -| |/ / / -| * | | 0201fa34c Merge branch 'mkirk/profile-request' -| |\ \ \ -| | * | | 5df67c8e5 move constant per code review -| | * | | fe075d2f7 Support for profile fetching so we can display SN changes upon entering a thread -| | * | | b89d16ea9 Merge branch 'charlesmchen/messageViewPerf2_' -| | |\ \ \ -| |/ / / / -| | * | | ef9303dd0 Rename audio duration and image size methods in TSAttachmentStream. -| |/ / / -| * | | 12c45b8a4 Merge branch 'mkirk/log-error-on-send-failure' -| |\ \ \ -| | * | | 3be70e971 log error on failure -| |/ / / -| * | | d782904d1 Merge branch 'mkirk/safety-numbers' -| |\ \ \ -| | * | | 4a6a02c00 Ensure updates don't clobber -| | * | | 8ee57d913 save identity to legacy identity store so we can switch versions while testing -| | * | | 0001b6c49 Code style per code review, no functional changes -| | * | | f2f3acb89 IdentityKeyStore changes -| |/ / / -| * | | 0a8c4203e Merge branch 'charlesmchen/socketManagerAssert' -| |\ \ \ -| | * | | 07bf3b9af Remove invalid assert in socket manager. -| |/ / / -| * | | 289fd4f0c Merge branch 'charlesmchen/messageViewPerf2' -| |\ \ \ -| | * | | fe796d6c5 Cache image size and audio duration on attachments. -| |/ / / -| * | | d61235825 Merge branch 'charlesmchen/manualCensorshipCircumvention' -| |\ \ \ -| | * | | 58edbdfbd Let users manually specify the domain fronting country. -| | * | | 98ff7e5ab Add support for manually activating censorship circumvention. -| | * | | d3fc5e4ab Rework how the views observe socket state. -| | * | | 45b947dc0 Rework how the views observe socket state. -| | * | | 2171cd1d9 Add support for manually activating censorship circumvention. -| |/ / / -| * | | cbeafac20 Merge branch 'charlesmchen/addToContactsOffer' -| |\ \ \ -| | * | | 66b8d5401 “Add to contacts” offer. -| |/ / / -| * | | 485af7e81 Merge branch 'charlesmchen/localPhoneNumberCountryVsContactParsing' -| |\ \ \ -| | * | | fcc7eb656 Try the country code for the local phone number when parsing phone numbers. -| |/ / / -| * | | dd1451035 Merge branch 'charlesmchen/pinYapDatabase' -| |\ \ \ -| | * | | 4837a9d37 Pin YapDatabase to v2.9.3 to avoid v.3.x. -| |/ / / -| * | | 2439752c2 Merge branch 'charlesmchen/attachmentFilenames' -| |\ \ \ -| | * | | df17403ec Respond to CR. -| | * | | c955b189f Respond to CR. -| | * | | 9fb1012c6 Persist attachment file paths. -| | * | | c75769d40 Rename attachment source filename property. -| |/ / / -| * | | 52097864f Merge branch 'mkirk/show-name-in-sn-change' -| |\ \ \ -| | * | | 92d72b3fc make nonatomic per code review -| | * | | 47b1c31b5 Contact Name in SN changed notifications -| |/ / / -| * | | e212fdf2c Merge branch 'mkirk/group-sn-changes' -| |\ \ \ -| | * | | fcbfde387 nonblocking SN change notifications don't percolate group threads to the top unless there is a message in that thread. -| | * | | 4becd4397 "Bob's SN changed" displayed in every group containing Bob -| |/ / / -| * | | 2f7e76f82 Merge branch 'charlesmchen/searchLocalCallingCode' -| |\ \ \ -| | * | | 5bf3a8093 Honor the local calling code in select recipient view. -| |/ / / -| * | | cd4cb1709 Merge branch 'charlesmchen/retryPushTokenRegistration' -| |\ \ \ -| | * | | 09712f0b7 Retry push token registration. -| |/ / / -| * | | 145b4ee57 Merge branch 'mkirk/faster-contact-parsing' -| |\ \ \ -| | * | | e585b9052 remove checks for other country codes since it's expensive -| |/ / / -| * | | 57a799ef9 Merge branch 'mkirk/cache-phone-number-parsing' -| |\ \ \ -| | * | | 52be0e2ff dont cache when parsing fails with error -| | * | | 1ee30023b Reduce time between editing contacts and seeing those changes in the app -| |/ / / -| * | | e6ff79c12 Revert "Merge branch 'charlesmchen/autoMarkAsRead'" -| * | | f1f5c443f Merge branch 'mkirk/voice-message-snippet' -| |\ \ \ -| | * | | 3cc982e65 use mic for voice message snippet -| |/ / / -| * | | 492aee79e Merge branch 'charlesmchen/onlyReplyToGroupInfoRequester' -| |\ \ \ -| | * | | 0936dd936 Don’t reply to “request group info” messages from non-members of the group in question. -| | * | | 8d10d19f8 Only reply to group info requester. -| |/ / / -| * | | 85ccf2db7 Merge branch 'charlesmchen/voiceMessagesUI' -| |\ \ \ -| | * | | a0c13490c Clean up ahead of PR. -| | * | | f3ed7697d Move filename property to TSAttachment. -| |/ / / -| * | | dd1591689 Merge branch 'mkirk/polite-intersection' -| |\ \ \ -| | * | | 772b3a6ba thumbnail hash without allocating big string. -| | * | | 873d8ff2b include emails in contat hash -| | * | | 5ac08dfeb hashable method to detect when contact has changed -| |/ / / -| * | | 2dc7c7cf2 Merge branch 'charlesmchen/examplePhoneNumbers' -| |\ \ \ -| | * | | 150c166a6 Show example phone numbers. -| | * | | fb3e2557e Show example phone numbers. -| |/ / / -| * | | 2bb745930 Merge branch 'charlesmchen/phoneNumberParsing' -| |\ \ \ -| | * | | 587d03501 Don’t ignore “unnamed” phone numbers. -| |/ / / -| * | | 279e25c1d Merge branch 'charlesmchen/disappearingMessages' -| |\ \ \ -| | * | | 77dbf6480 Respond to CR. -| | * | | c89b9fb0b Disable “disappearing messages” job when inactive. -| | * | | 6e52009ff Rework the “disappearing messages” logic. -| |/ / / -| * | | 9f569d376 Merge branch 'charlesmchen/autoRejoinGroups' -| |\ \ \ -| | * | | d5118273b Respond to CR. -| | * | | 315775ff2 Auto-rejoin groups by emitting and responding to “request group info” messages. -| |/ / / -| * | | 311206918 Merge branch 'mkirk/safer-key-delete' -| |\ \ \ -| | * | | e9c0c46a2 Always keep at least 3 old signed prekeys (accepted or otherwise). -| |/ / / -| * | | 4e08b8092 Merge branch 'charlesmchen/flagVoiceMessages' -| |\ \ \ -| | * | | e56e9434a Respond to CR. -| | * | | b84653235 Flag voice messages as such in protos. -| |/ / / -| * | | 92de9a5e7 Merge branch 'charlesmchen/attachmentMimeTypes' -| |\ \ \ -| | * | | 3e9fbb1be Prefer to deduce the MIME type from the file extension using lookup, not the UTI type. -| | * | | cb6de93a8 Try to deduce attachment MIME type from the file extension if possible. -| |/ / / -| * | | 955c4d8a0 Merge branch 'charlesmchen/phoneNumberParsingPerf' -| |\ \ \ -| | * | | 6c2de6ed5 Fix a hotspot in the phone number parsing logic. -| |/ / / -| * | | 71a304f84 Merge branch 'charlesmchen/multipleAccounts' -| |\ \ \ -| | * | | 1b93cd29c Rework handling of phone number names. -| |/ / / -| * | | d82afb8bb Merge branch 'charlesmchen/contactsSync' -| |\ \ \ -| | * | | 9bfcc8e38 Add “is complete” flag to contacts sync proto. -| | * | | 41e564db4 Use SignalAccount class to sync contacts. -| | * | | 741e5c02a Add “is complete” flag to contacts sync proto. -| |/ / / -| * | | f078f8adc Merge branch 'mkirk/compiler-warnings' -| |\ \ \ -| | * | | ad31c75e8 fix more compiler warnings -| | * | | 50df5b682 nullability annotations for TSInteraction -| | * | | c9f397d59 nullability audit for MimeTypeUtil -| | * | | 1754ad25d nullability annotations -| |/ / / -| * | | 24c84cbba Merge branch 'mkirk/better-send-logs' -| |\ \ \ -| | * | | a92129a0e better sending logs -| |/ / / -| * | | e336e0b34 Merge branch 'mkirk/delay-contact-access' -| |\ \ \ -| | * | | 4338c5935 disambiguate contact param -| |/ / / -| * | | d25a93403 Merge branch 'charlesmchen/cleanup' -| |\ \ \ -| | * | | 9b8d6bd87 Minor cleanup. -| |/ / / -| * | | 25e086c22 Merge branch 'charlesmchen/autoMarkAsRead' -| |\ \ \ -| | * | | 2a64ff29e Temporary change to improve read receipt logging. -| |/ / / -| * | | 77833e727 Merge pull request #196 from WhisperSystems/mkirk/contact-fixup -| |\ \ \ -| | * | | f4dd01e30 Properly handle "work", "home", and "other" labels -| |/ / / -| * | | 4431fa335 Merge branch 'charlesmchen/signalAccount' -| |\ \ \ -| | * | | 5058eb837 Add SignalAccount class. -| | * | | cd9e1fb57 Add SignalAccount class. -| | * | | e3c959812 Extract labels for phone numbers. -| | * | | 9dc601485 Extract labels for phone numbers. -| |/ / / -| * | | 608852898 Merge branch 'mkirk/debug-call-messages' -| |\ \ \ -| | * | | 52b19a911 better debug messages about what *kind* of encrypted message we received -| |/ / / -| * | | c47e766c1 Merge branch 'mkirk/debug-spk' -| |\ \ \ -| | * | | bf6f01315 debug tool: print signed prekey report -| |/ / / -| * | | cc055f034 Merge branch 'charlesmchen/genericAttachmentAppearance' -| |\ \ \ -| | * | | b986db808 Add filename to attachment streams. -| |/ / / -| * | | 5d4b96924 Merge branch 'charlesmchen/utiTypeForFileExtension' -| |\ \ \ -| | * | | 19754bacb Add a "UTI type for file extension" method. -| |/ / / -| * | | c77ad7f77 Merge branch 'charlesmchen/whitespaceVsContactCells' -| |\ \ \ -| | * | | 72730c06a Improve handling of whitespace in contacts. -| |/ / / -| * | | 476047e24 Merge branch 'charlesmchen/ignoreOversizeMessages' -| |\ \ \ -| | * | | 6686167cc Ignore oversize messages. -| |/ / / -| * | | 8251f1e67 Merge branch 'mkirk/sync-session-reset' -| |\ \ \ -| | * | | e1055c26a Sync EndSession messages to linked devices -| | * | | a21108db5 Log message type in prod -| |/ / / -| * | | 0bbe73e11 Merge branch 'charlesmchen/messageSendFatalErrors' -| |\ \ \ -| | * | | b40ec508b Do not retry fatal message send errors. -| |/ / / -| * | | 1fe093074 Merge branch 'mkirk/download-progress' -| |\ \ \ -| | * | | 68476a51d Download service emits progress notifications -| |/ / / -| * | | 1032588da Merge branch 'charlesmchen/groupMessagesVsSafetyNumberChanges' -| |\ \ \ -| | * | | 9b24ad7f1 Do not try to resend unsaved outgoing messages when accepting a safety number change. -| |/ / / -| * | | b9eeb408c Merge branch 'charlesmchen/muteThreads' -| |\ \ \ -| | * | | f0ca46883 Respond to CR. -| | * | | 0e9da39c6 Add muting of threads. -| |/ / / -| * | | 51689b334 Merge branch 'charlesmchen/fixMessagesFromLinkedDevices' -| |\ \ \ -| | * | | a3db112c5 Fix outgoing message status for messages sent from linked devices. -| |/ / / -| * | | bb24ffc91 Merge branch 'charlesmchen/outgoingMessageState' -| |\ \ \ -| | * | | 6341905c9 Respond to CR. -| | * | | ced9d6f46 Retry group sends if any of its errors are re-tryable. -| | * | | f191d6b09 Respond to CR. -| | * | | aa70ada39 Refine error handling for outgoing group messages. -| | * | | db051b3b3 Consider group send a failure if sending to any member in the group fails. -| | * | | 1023eeb8a Rework outgoing message state. -| | * | | 1404d0d7e Rework outgoing message state. -| | * | | bf18b1f28 Rework outgoing message state. -| | * | | 654ef8904 Rework outgoing message state. -| | * | | 04dc930e0 Rework outgoing message state. -| | * | | 0ab6bcd08 Rework outgoing message state. -| |/ / / -| * | | 91aeddf38 Merge branch 'charlesmchen/lostMessages' -| |\ \ \ -| | * | | 42e005a49 Avoid lost messages by acknowledges message receipt after the message is processed. -| |/ / / -| * | | 2367ab743 Merge branch 'charlesmchen/prekeyDoubleUpdate_' -| |\ \ \ -| | * | | 406e2d862 De-bounce the prekey checks. -| | * | | 0224af746 De-bounce the prekey checks. -| |/ / / -| * | | a715ed079 Merge branch 'mkirk/mark-as-accepted' -| |\ \ \ -| | * | | 522c191fd Persist when signed pre key was 'acceptedByService' -| |/ / / -| * | | 238fd0d9f Merge branch 'charlesmchen/honorAttachmentFilenames' -| |\ \ \ -| | * | | fa2ff8158 Respond to CR. -| | * | | 40dcc7c87 Honor attachment filenames. -| | * | | bc10aea20 Honor attachment filenames. -| | * | | b09f7e5e5 Honor attachment filenames. -| |/ / / -| * | | 173823e3a Merge branch 'feature/contactsIntersectionAudit' -| |\ \ \ -| | * | | 715e9e85f Respond to CR. -| | * | | 00f1b53e6 Reduce usage of contacts intersection endpoint. -| |/ / / -| * | | 1d946ccfe Merge branch 'charlesmchen/arbitraryAttachments' -| |\ \ \ -| | * | | 06a56cced Update SignalAttachment to allow arbitrary attachments. -| |/ / / -| * | | 5e40162fd Merge pull request #176 from WhisperSystems/mkirk/protobuf-docs -| |\ \ \ -| | * | | 9c8350701 up to date protobuf building documentation -| * | | | 6649b1a12 Merge branch 'charlesmchen/socketLifecycle' -| |\ \ \ \ -| | |/ / / -| |/| | | -| | * | | aa3402b53 Respond to CR. -| | * | | 04b3166b8 Rework socket manager. -| | * | | b7e24c664 Rework socket manager. -| | * | | 3d46f8e83 Rework socket manager. -| |/ / / -| * | | f94021df9 Merge branch 'mkirk/multiple-recipient' -| |\ \ \ -| | * | | edc556b10 Fix multiple match for SignalRecipient -| |/ / / -| * | | 0ee09323f Merge branch 'charlesmchen/blockOffer' -| |\ \ \ -| | * | | daa832bbc Respond to CR. -| | * | | 17b751d22 Create block offer when non-contacts send you a message. -| |/ / / -| * | | adee71ba9 Merge branch 'charlesmchen/voiceAndWebrtcDefaults' -| |\ \ \ -| | * | | d89d4dea8 Remove the properties related to Redphone and WebRTC support. -| |/ / / -| * | | 59a7b02de Merge branch 'charlesmchen/refineUploadIndicator' -| |\ \ \ -| | * | | e28a81e6a Improve attachment upload progress indicator. -| |/ / / -| * | | 74ade2817 Merge branch 'charlesmchen/license' -| |\ \ \ -| | * | | 009dac0b5 Update license. -| |/ / / -| * | | 1beac5698 Merge branch 'charlesmchen/fixArbitraryAttachmentDownloads' -| |\ \ \ -| | * | | f08d779f4 Fix file extensions for arbitrary file types. -| |/ / / -| * | | 7f2ce6142 Merge branch 'charlesmchen/fixAudioPlayback' -| |\ \ \ -| | * | | e6cd3d071 Fix audio playback. -| |/ / / -| * | | d4e0c49ff Merge branch 'charlesmchen/attachmentRetryVsFailure' -| |\ \ \ -| | * | | 004a952bc Respond to CR. -| | * | | 8258f26ae Don’t mark messages as failed until all retries are exhausted. -| |/ / / -| * | | 19d8a3202 Merge pull request #163 from WhisperSystems/mkirk/debug-asserts -| |\ \ \ -| | * | | 97f93eef7 only assert queues in debug -| |/ / / -| * | | 45b8dc9c9 Merge pull request #162 from WhisperSystems/mkirk/session-corruption -| |\ \ \ -| | * | | 513c27510 Log when we delete sessions -| | * | | bb38fce54 Ensure that deleting sessions happens on session queue -| | * | | 2d93b8c6e Handle mismatched/stale devices on session queue -| | * | | 773b09b01 Inspect session store on serial queue -| | * | | 9e74f3809 deprecate unused method -| | * | | 9a444f428 Assert that session mutation occurs on serial queue -| | * | | 7578176e3 rename sessionCipher to sessionStoreQueue -| | * | | 60dcadb0d Move iOS Versions from Signal-iOS -| |/ / / -| * | | 4f9e05324 Merge branch 'mkirk/consistent-copy' -| |\ \ \ -| | * | | fcf271f08 Block list is two words -| |/ / / -| * | | 694088ee9 Merge branch 'mkirk/terminal-sending-failures' -| |\ \ \ -| | * | | fa9e28989 Don't retry some failures -| |/ / / -| * | | bb1a749c4 Merge branch 'charlesmchen/dontBlockOutgoingGroupMessages' -| |\ \ \ -| | * | | b12e93076 Don’t block outgoing group messages. -| |/ / / -| * | | e4ec72984 Merge branch 'charlesmchen/blocking4' -| |\ \ \ -| | * | | 723174e14 Respond to CR. -| | * | | d47ddd112 Filter outgoing messages using the blacklist. -| | * | | af4faaa60 Filter incoming messages using the blacklist. -| |/ / / -| * | | d1189e5b0 Merge branch 'charlesmchen/singletonAssert' -| |\ \ \ -| | * | | f1e770fa0 Respond to CR. -| | * | | e038d2410 Apply assert to ensure singletons are only created once. -| | * | | cd4134c9d Apply assert to ensure singletons are only created once. -| |/ / / -| * | | ec7a796b7 Merge branch 'charlesmchen/blocking1' -| |\ \ \ -| | * | | 02004a75f Respond to CR. -| | * | | 2a2ad7d67 Improve logging in TSBlockingManager. -| | * | | a40c09e26 Improve comments in TSBlockingManager. -| | * | | f036d75fc Avoid redundant "block list changed" sync messages in TSBlockingManager. -| | * | | f5237ef5d Add TSBlockingManager. -| |/ / / -| * | | 8b5f82eb6 Merge branch 'mkirk/mark-unfresh' -| |\ \ \ -| | * | | 2dbcfed3b Mark a stored session as unfresh -| | * | | f4dfd6584 Debug method to print stored sessions -| |/ / / -| * | | bdd0241a9 Merge pull request #155 from WhisperSystems/mkirk/enforce-singleton -| |\ \ \ -| | * | | 61fe71f0c MessageSender should be accessed as singleton -| | * | | 4b0c01c96 MessagesManager should only be accessible via it's shared singleton -| |/ / / -| * | | 718164fbe Merge branch 'charlesmchen/sharingOfOversizeTextMessages' -| |\ \ \ -| | * | | e9d6a3747 Fix sharing of oversize text messages. -| |/ / / -| * | | 80266856e Merge branch 'charlesmchen/arbitraryAttachments2' -| |\ \ \ -| | * | | 12635c65c Improve support for arbitrary attachments. -| |/ / / -| * | | da3c4bbac Merge branch 'feature/acceptArbitraryIncomingAttachments' -| |\ \ \ -| | * | | 53623adae Accept arbitrary incoming attachments. -| |/ / / -| * | | 7bbbd2fb9 Merge branch 'charlesmchen/failedAttachmentDownloads' -| |\ \ \ -| | * | | 49a24a4e6 Improve handling of incomplete and failed attachment downloads. -| | * | | bdde3c73c Improve handling of incomplete and failed attachment downloads. -| |/ / / -| * | | fbd3859a8 Merge branch 'charlesmchen/removeRedPhoneCode' -| |\ \ \ -| | * | | 36485c946 Remove RedPhone code. -| |/ / / -| * | | 968066eff Merge pull request #151 from WhisperSystems/mkirk/freebie-check-script -| |\ \ \ -| | * | | 708dca282 post commit which double checks for freebie presence -| |/ / / -| * | | 9e0f77755 Merge branch 'charlesmchen/oversizeTextMessages' -| |\ \ \ -| | * | | 75fabe5c2 Add support for oversize text messages sent as attachments. -| |/ / / -| * | | 334912a48 Merge branch 'charlesmchen/filterCountryCodes' -| |\ \ \ -| | * | | d38f6fbfd Filter out country codes properly. -| |/ / / -| * | | 28e2639dc Merge branch 'charlesmchen/swiftDataWriteCrash' -| |\ \ \ -| | * | | f005b66fa code review: move unnecessary __block allocation -| | * | | a73038142 Fix crash writing a "swift" NSData on iOS 9. -| |/ / / -| * | | 97a66f30f Merge branch 'charlesmchen/messageSenderDeadlock' -| |\ \ \ -| | * | | 607dd9a2f Avoid YapDatabase deadlock in OWSMessageSender. -| |/ / / -| * | | 63cc0328b Merge branch 'mkirk/better-envelope-logging' -| |\ \ \ -| | * | | b73594b23 Better envelop logging. -| |/ / / -| * | | 1fd7627da Merge branch 'charlesmchen/sendQueuePerConvo' -| |\ \ \ -| | * | | 5739f71bd Respond to CR. -| | * | | c3d2ea7ab Use a separate sending queue for each conversation. -| |/ / / -| * | | 289d0df06 Merge branch 'charlesmchen/sendToSelfVsIncompleteOperation' -| |\ \ \ -| | * | | 62d52ce9a Fix “send to self operations never complete” issue. -| |/ / / -| * | | d31cfe6fd Ensure existing sessions are invalidated when saving new identity -| * | | 4dc18f2f0 Merge branch 'charlesmchen/phoneNumberParsingTweaks' -| |\ \ \ -| | * | | 584613197 Further refinements to phone number parsing. -| |/ / / -| * | | 5dc493874 Merge branch 'charlesmchen/decryptionExceptionLogging' -| |\ \ \ -| | * | | 7f681e964 Improve logging around decryption exceptions. -| |/ / / -| * | | cdef86e27 Merge branch 'charlesmchen/websocketEdgeCases' -| |\ \ \ -| | * | | a1e501937 Respond to CR. -| | * | | e92d40a12 Fix edge cases around the websocket lifecycle. -| | * | | 0f47dc620 Fix edge cases around the websocket lifecycle. -| |/ / / -| * | | 5cbaafe38 Merge branch 'charlesmchen/maxIncomingAttachmentFileSize' -| |\ \ \ -| | * | | 04a3e4323 Respond to CR. -| | * | | 8231f7997 Don’t check content length header until we’ve received at least one byte of the attachment download. -| | * | | 2c6194353 Abort attachment downloads of excessive size. -| |/ / / -| * | | d3af0d3a2 Merge pull request #135 from WhisperSystems/mkirk/fix-attachment-dispatch -| |\ \ \ -| | * | | 29a0597b0 Only call sendMessage on main thread. -| |/ / / -| * | | ca5bcaf3c Merge branch 'mkirk/refactor_country_code_search' -| |\ \ \ -| | * | | c8fa47d9c Added some tests per CR -| | * | | d3ecbba0e Keep unit tests with their class files -| | * | | 478b5b247 Remove convoluted dependency -| |/ / / -| * | | 778d3dd2b Merge branch 'mkirk/background-sending' -| |\ \ \ -| | * | | 58829e216 ensure we don't interrupt sending by being backgrounded -| |/ / / -| * | | 15f5c078a Merge branch 'mkirk/nsoperation-sending-queue' -| |\ \ \ -| | * | | e68ee28e5 Add clarifying asserts per code review -| | * | | db15ff5e8 Save message before sending starts. -| | * | | df51523a8 Serialize message sending and generalized retry logic. -| |/ / / -| * | | d6af5028c Fix receiving attachments from old clients -| * | | 312f398dd Merge branch 'charlesmchen/nonUSNonContactSearch' -| |\ \ \ -| | * | | 332833da7 Respond to CR. -| | * | | 60e0ddfb9 Fix non-contact lookup for non-US users. -| | * | | e12bd4773 Fix non-contact lookup for non-US users. -| |/ / / -| * | | 7368c5f75 Merge branch 'charlesmchen/fixFilterCallingCodes' -| |\ \ \ -| | * | | d63a519c4 Fix filtering of country codes in registration flow. -| |/ / / -| * | | ca81e139b Merge branch 'charlesmchen/attachmentDownloadErrors' -| |\ \ \ -| | * | | c8efd83c3 Respond to CR. -| | * | | 88f343a0a Attempt to fix the "frequent attachment download errors with low server ids". -| |/ / / -| * | | 7867ce27a Merge branch 'charlesmchen/messageStateIndicators' -| |\ \ \ -| | * | | 25ab52caf Respond to CR. -| | * | | 865d9d7b9 Add "is uploaded" property to attachment streams. -| |/ / / -| * | | 27fb0dd34 Merge branch 'charlesmchen/websocketState' -| |\ \ \ -| | * | | e4636e833 Respond to CR. -| | * | | 958dbd199 Minor clean up. -| | * | | f40629ffa Improve alignment between socket state and socket manager state. -| |/ / / -| * | | b21c628d5 Merge branch 'mkirk/attachment-digest' -| |\ \ \ -| | * | | 8f1412d50 comment constant time compare per code review -| | * | | 452110b68 Include digest in attachments -| |/ / / -| * | | 32ac0fb7c Merge branch 'charlesmchen/paste' -| |\ \ \ -| | * | | e05b68743 Respond to CR. -| | * | | 270a10a62 Add UTIType methods to MIMETypeUtil. -| |/ / / -| * | | 1e6925ebc Fix crash-on-launch for older installs -| * | | 0393e4f0b fix tests -| * | | 168639597 Merge branch 'mkirk/dedupe-incoming-messages' -| |\ \ \ -| | * | | a92158ef1 CR: fix register `async` where specified -| | * | | b389bb3bb Code cleanup. -| | * | | 975726e02 Dedupe incoming messags -| |/ / / -| * | | d6e1e81a8 Merge branch 'charlesmchen/callkitPrivacy' -| |\ \ \ -| | * | | 52bb939fc Respond to CR. -| | * | | 71b804ba5 Add and honor the “CallKit Privacy” setting. -| |/ / / -| * | | 286f72d27 Merge branch 'charlesmchen/webrtcByDefault' -| |\ \ \ -| | * | | 2741fd4bd Enable WebRTC-based audio and video calls by default. -| | * | | 254a247ba Revert "Add WebRTC setting." -| |/ / / -| * | | 14a104b1b fix tests, and off by one in keeping old, accepted keys -| * | | c72e8f8e2 Merge remote-tracking branch 'origin/release/2.7.1' -| |\ \ \ -| | * | | f97470639 Clean up the prekeys. -| | * | | 8acc496a3 Clean up the prekeys. -| | * | | 54736426f Avoid crashes when signed prekey lookup fails. -| * | | | 427f225df Merge branch 'feature/messageSortingRevisited' -| |\ \ \ \ -| | * | | | 686fe679b Respond to CR. -| | * | | | 7bd4d2653 Add “received at” timestamp to all TSMessages so that they may be sorted properly. -| |/ / / / -| * | | | 5ed95c478 Merge branch 'charlesmchen/prekey2' -| |\ \ \ \ -| | * | | | 351a010fe Clean up prekey usage. -| |/ / / / -| * | | | 7c55d559d Merge branch 'charlesmchen/markUnsentMessages' -| |\ \ \ \ -| | * | | | 821c96cc6 Mark "attempting out" messages as "unsent" on app launch. -| |/ / / / -| * | | | 12027152f Merge branch 'charlesmchen/rateLimitingErrorMessage' -| |\ \ \ \ -| | |/ / / -| |/| | | -| | * | | df4b0616e Improve rate-limiting error message in registration and code verification views. -| |/ / / -| * | | 93219e4d2 Merge branch 'charlesmchen/prekey_' -| |\ \ \ -| | * | | e0688e16a Clean up prekey logic. -| |/ / / -| * | | e1949893f Avoid deadlock when marking self-sent messages as read. -| * | | 4d055757d Fix the .pch used by this pod to reflect the changes from the last PR. -| * | | 025279773 Merge branch 'charlesmchen/callStatusMessages' -| |\ \ \ -| | * | | 284212b3f Move OWSDispatch.h to the PCH. -| | * | | 90b85c060 Improve the call status messages in conversation view. -| |/ / / -| * | | bc1af8073 Log when we mark a message as read locally -| * | | 311d80fb2 Missed calls increment unread counter/badge -| * | | 653727ae9 Merge branch 'charlesmchen/messagesFromMeAreAlreadyAutoRead' -| |\ \ \ -| | * | | df1b3418d Respond to CR. -| | * | | 6d356e4b6 Automatically mark as read any messages sent by current user from another device. -| |/ / / -| * | | 4e8ab21c4 Merge pull request #105 from WhisperSystems/mkirk/webrtc -| |\ \ \ -| | * | | 92a69e8e6 Repsond to CR w/ @cmchen. -| | * | | 80fb58231 Merge remote-tracking branch 'origin/master' into mkirk/webrtc -| | |\ \ \ -| | |/ / / -| |/| | | -| * | | | 104645f97 Safely pass exception across dispatch bounds -| * | | | fe3ec457f Disable resetting unreadable storage -| | * | | c68073fdb proper error code for NOTFOUND -| | * | | 7b1b706e2 Include reusable localized text in recipient-not-found error -| | * | | 7ca1d5e8a Merge branch 'charlesmchen/webrtc/threadSafety' into mkirk/webrtc -| | |\ \ \ -| | | * | | 18e144f8b Respond to CR. -| | | * | | ddbc4819f Rework concurrency in the signaling logic. -| | |/ / / -| | * | | 6521a80c4 Lookup methods yield SignalRecipient (#102) -| | * | | 9fdbbb7f8 Merge branch 'charlesmchen/webrtc/video2' into mkirk/webrtc -| | |\ \ \ -| | | * | | 5da4b3d12 Add assert macro that can be used in free functions. -| | |/ / / -| | * | | cf6f107f1 Merge remote-tracking branch 'origin/master' into mkirk/webrtc -| | |\ \ \ -| | |/ / / -| |/| | | -| * | | | 32aad85a7 Merge pull request #98 from WhisperSystems/mkirk/session-corruption -| |\ \ \ \ -| | * | | | 5d863418e Narrow the scope of code run on SessionCipher queue And run all non-cipher code on the main thread. -| | * | | | 3216fd371 Prevent session corruption by using same queue for encrypt vs. decrypt -| |/ / / / -| | * | | f4a46fce0 Merge remote-tracking branch 'origin/master' into mkirk/webrtc -| | |\ \ \ -| | |/ / / -| |/| | | -| * | | | a11293027 Merge branch 'mkirk/dont-reset-storage-before-first-unlock' -| |\ \ \ \ -| | * | | | b5429595a Better logging per CR -| | * | | | a45ab9fe4 We need to know if the DB password is accessible *before* we init the db -| | * | | | dd1aa2682 Prevent destroying user database after resetting device. -| |/ / / / -| * | | | 8f8101573 Remove Cuba from domain fronting. -| * | | | 45391cadd Merge branch 'feature/fixWebsocket2' -| |\ \ \ \ -| | | * | | 275a0dc62 Fix typo. -| | | * | | d640a4155 Merge branch 'feature/swallowSwiftLintErrors' into mkirk/webrtc -| | | |\ \ \ -| | | | * | | 65128d5f5 Swallow errors returned by swift lint. -| | | |/ / / -| | | * | | 7c62097d0 Fix up tests -| | | * | | 305541d03 Merge branch 'feature/fixWebsocket2' into mkirk/webrtc -| | | |\ \ \ -| | | |/ / / -| | |/| | | -| | * | | | 79095ecfb Fix web socket issue. -| |/ / / / -| | * | | 25695677d Merge branch 'charlesmchen/webrtcSetting2' into mkirk/webrtc -| | |\ \ \ -| | | * | | ffb199bcd Respond to CR. -| | | * | | 08ba42c56 Update SignalRecipient with “is WebRTC enabled” property from service. -| | |/ / / -| | * | | 6791875eb Merge branch 'feature/precommitClangFormatSwiftLint2' into mkirk/webrtc -| | |\ \ \ -| | | * | | 6e9ae615c Tweak commit script. -| | |/ / / -| | * | | db27f22c6 Merge branch 'feature/precommitClangFormatSwiftLint' into mkirk/webrtc -| | |\ \ \ -| | | * | | b1c86d1a3 Modify precommit script to "swiftlint" and "git clang-format" files. -| | |/ / / -| | * | | 0f3391ad0 Merge branch 'feature/webrtcSetting' into mkirk/webrtc -| | |\ \ \ -| | | * | | 0f45f292a Add WebRTC setting. -| | |/ / / -| | * | | d1aa253f8 WebRTC calling -| | * | | d7149c60d unique error code for rate-limit -| |/ / / -| * | | 7b7b33807 Merge branch 'feature/databaseErrors' -| |\ \ \ -| | * | | c5cf79c39 Detect, warn about and try to recover from database password retrieval and database load errors. -| |/ / / -| * | | 87719a3bf Merge branch 'charlesmchen/analyticsStub' -| |\ \ \ -| | * | | 2a55075e6 Add stub for analytics. -| |/ / / -| * | | ed98cf262 Merge branch 'charlesmchen/iranVsDomainFronting' -| |\ \ \ -| | * | | 619235172 Remove Iran from censorship circumvention. Current approach isn't sufficient. -| |/ / / -| * | | 4e123e41d Merge branch 'charlesmchen/appVersion' -| |\ \ \ -| | * | | c22085c1a Add class to track app version. -| |/ / / -| * | | 19e4b2c3a Revert "Remove Iran from censorship circumvention. Current approach isn't sufficient." -| * | | 374b45146 Remove Iran from censorship circumvention. Current approach isn't sufficient. -| * | | 7bee4523c Merge branch 'charlesmchen/assertsVsPch' -| |\ \ \ -| | * | | f47097943 Add asserts to .pch. -| |/ / / -| * | | a9340b06f Merge branch 'charlesmchen/censorship-circumvention-2' -| |\ \ \ -| | * | | 5b87af9bc Respond to CR, fix build break. -| | * | | c3af5bc74 Fix the UAE Google domain. -| | * | | cc78978be Update fronting to use country-specific Google domains. -| | * | | 566c6e15d Add asserts header. -| | * | | 2438bd16c Add Iran, Oman, Cuba to censorship list. -| |/ / / -| * | | 52762a1be Clean up. -| * | | 78515377b Censorship circumvention in Egypt and UAE -| * | | b1ebfa987 Revert "WIP: Censorship circumvention in Egypt and UAE" -| * | | f1ade83c3 WIP: Censorship circumvention in Egypt and UAE -| * | | 5ccbd4ca6 Bail if we can't build a database. -| * | | f8bb46c46 check for errors in the keychain password retrieval -| * | | 3eeb6c55d Use correct recipient ID when using sync message even if no contact thread with self exists. -| * | | 4c2a062fb provide custom copy for unauthorized messages -| * | | edebd14d4 Ignore messages with unknown Envelope.Contents -| * | | 745a5a276 return immutable identifiers -| * | | 7036c6339 Compatible with libphonenumber 0.9.1 -| * | | 712502815 Rename an OWSContactsManager method -| * | | 34ffce89f Only calculate fullName once, & sortable fullnames (#67) -| * | | 3083e2929 OWSContact from CNContact -| * | | df756423f Ignore unknown group messages -| * | | 1ba082356 Explicitly include newlines in numeric fingerprint -| * | | e53422f76 Configurable safety number blocking enabled by default -| * | | 60a39f93c Remove phone numbers from scannable QR Code -| * | | 70e536ca8 Privacy preferences for blocking identity change -| * | | 725153307 Add some nullability annotations (#62) -| * | | b0343ee1d Only fetch PreKey once. -| * | | 1ebb82f98 Contacts don't have safety numbers until they've exchanged keys. -| * | | 2e06bb148 Send group message so long as at least one recipient is found -| * | | ebeae2608 Fix crash on messaging unregistered user -| * | | 027fa1073 Only dispatch async at top level. -| * | | b4c504f61 EndSessionMessage notifies remote side of reset session -| * | | 47cad611e Fix register w/o background fetch & stale push tokens -| * | | 03f05f217 Prevent session corruption -| * | | 9c426e0a4 again: Don't send empty message to self after changing disappearing (#54) -| * | | b6676fb02 Better error messages when failure to send due to: -| * | | 3e10a4925 Fix disappearing messages don't become consistent after reinstall (#52) -| * | | 31bd1d07a Handle group keychange error (#50) -| * | | 4ba1e86ec Explain send failures for text and media messages -| * | | d4c55d694 Maps numbers to names in TSGroupModel -| * | | 556dca650 Check return value of malloc -| * | | 91fcd0163 Don't send empty message to self after changing disappearing timer -| * | | f83f80898 Fix ci for xcode 8 -| * | | a32a18ac6 Fix set timer updates in group thread. -| * | | 23854dc72 Report info message type for timer duration changes -| * | | 8fed13f9b Don't start expiration timer until message is sent. -| * | | 0b4d81002 Fix attachment deleting for outgoing messages -| * | | 34868b9b0 fix captions in groups and sync messages (#42) -| * | | 40cdc7f22 disappearing messages -| * | | c1ade86a8 New fingerprint format -| * | | ce1aa04b6 Fix device listing (#38) -| * | | cf035a597 Merge pull request #37 from WhisperSystems/mkirk/more-resilient-db-setup -| |\ \ \ -| | * | | ff9729f42 Avoid blocking app launch -| | * | | f25661763 If we can't find a class definition, don't explode, just log. -| |/ / / -| * | | 5b06b4351 Fix timeout on launch for some users (#36) -| * | | 06538f6b4 Not an error. Don't log it as such. (#35) -| * | | c5edc9997 Production log level to INFO (#34) -| * | | 1098bc203 Fix crash on boot (#33) -| * | | 2dba7d141 Fix contact/group sync messages. (#32) -| * | | 1824af533 Fixes: "unsupported attachment" when group is missing avatar (#31) -| * | | a0df56a68 Fix multiple keychange errors (#29) -| * | | 9821e0c0d Merge pull request #28 from WhisperSystems/desktop-integration -| |\ \ \ -| | * | | 27dfb59a0 Emit notification when message is read. -| | * | | 800e2a954 Log exception rather than crash upon failed deserialization -| | * | | 65e677803 log network manager requests -| | * | | af155bf9e Avoid deadlock when receiving read receipt before incoming message -| | * | | eb96f846a Send user agent to desktop so they can pick a theme for us -| * | | | d80291860 Merge pull request #26 from WhisperSystems/read-voice-messages -| |\ \ \ \ -| | * | | | 3e5af16dc Don't explode when attachment support revoked. -| | * | | | 1df99c581 fix voice messages for iOS -| |/ / / / -| * | | | 7d70f6e77 Merge pull request #25 from WhisperSystems/dt -| |\ \ \ \ -| | |/ / / -| | * | | 0933b9212 Fix race condition with read receipts before incoming message -| | * | | 2de692745 Remove sync data files after sync -| | * | | c8a5f5076 Fixup DevicesManager -| | * | | c39e8b0bc extract constant for image/png -| | * | | acb89f0b0 Outgoing Read Receipts -| | * | | 580781e3e Incoming Read Receipts -| | * | | a99fde4d3 Device manager -| | * | | d48fd158b Build contact/group exports with data streams -| | * | | fb9f0f9a4 Some nullability annotations -| | * | | 8526f018e fixup group sync -| | * | | 69da0b3c2 Sync Groups with Desktop -| | * | | 36d3691c7 gather up device syncing classes -| | * | | 98d1c59bf Sync Contacts with Desktop -| | * | | fe7171dd9 Sync messages with your other devices -| | * | | 9093be2b0 Device provisioning -| | * | | 6ec21ade9 TSContactThread doesn't need to know protobufs -| | * | | f4d90688b Replace compiler warning with logging message -| | * | | 4d52d28e0 Use non-deprecated method for sending data. -| | * | | c1a0b8823 Don't crash when contact lookup is given nil contact -| | * | | 5ae271787 Simplify deviceMessages method -| | * | | 9fe0ca000 bump version -| |/ / / -| * | | 1d0b645fc Update to new protocol (#23) -| * | | f3a91c262 Avoid collision with iOS10 SSKeychain framework (#24) -| * | | 01ab8d132 Handle animated content type in TSAttachment:description: (#19) -| * | | 9aa88f6ce Merge pull request #21 from WhisperSystems/fix-delete-attachments -| |\ \ \ -| | * | | baf564db2 Fixup e61c81 by migrating old schema -| |/ / / -| * | | c14e4bb7b Merge pull request #20 from WhisperSystems/fix-delete-attachments -| |\ \ \ -| | * | | 28281ccfd Delete lingering group avatar attachments -| | * | | e61c81873 Clarify message.attachments -> attachmentIds -| | * | | 0f9a3334c Ensure interactions removed when thread is deleted -| | * | | 2858694ee style changes // fix compiler warnings -| | * | | 5458a73ce Fix travis build -| |/ / / -| * | | 36cab4691 Accepting keychange only resends to single recipient (#18) -| * | | d66c8bd42 Avoid deadlock while accepting new key (#17) -| * | | f537b6f19 Fix (and test) description for corrupted attachments (#16) -| * | | 664162fe2 Use SocketRocket pluggable policies (#15) -| * | | 80671b247 Extract phone formatting method (#14) -| * | | f5aac9610 Fix compiler warning (#13) -| * | | 9ab38efe9 There is no longer a distinction between redphone/text secure users. (#12) -| * | | 8058951b0 Adapt to updated SocketRocket pod refactorings. (#11) -| * | | ba0de5739 update to cocoapods 1.0.1 (#10) -| * | | 32a7d49fa Fix avatar for single contact thread (#9) -| * | | d25045e6b contributing.md referencing Signal-iOS coding guidelines. Inlined legal. (#8) -| * | | 302422565 Get tests + ci running -| * | | a0c147722 Delete last message updates thread preview (signal ios#833) (#3) -| * | | a49d36d66 Renaming to SignalServiceKit. -| * | | 30fff8e42 Upgrading for latest YapDatabase API. -| * | | b5a8cf0f0 Merge pull request #1 from kunickiaj/yapfix -| |\ \ \ -| | * | | 94ef0e30f Fix YapDatabase API change from string based filePath to NSURL -| |/ / / -| * | | f6f613349 Adding completion blocks to media message sends. -| * | | 8d6ce0b57 Notifications Protocol cleanup. -| * | | 5d91a5bd4 Init Commit -| * | | 27e63c37f Initial commit -| / / -* | | 1600b1f44 [SSK] Avoid nil country names on iOS 8. -* | | 0ff7d3f59 Merge branch 'charlesmchen/refineCallService' -|\ \ \ -| * | | a9ce1cde2 Simplify CallViewController. -| * | | 149c64ce4 Refine call service. -|/ / / -* | | 86072d5ff Merge branch 'mkirk/unregistered-user-add-to-contact' -|\ \ \ -| * | | 46ddaa9ca fix: unregistered user shows "add to contacts" -|/ / / -* | | e03936387 Merge branch 'mkirk/remove-verification-debug-ui' -|\ \ \ -| * | | 17b1b7072 Remove verification debug UI -|/ / / -* | | 8066c192b Merge branch 'mkirk/mapping-asserts' -|\ \ \ -| * | | df0cf7660 Assert that mapping is set whenever accessing -|/ / / -* | | 7adf5e81f Merge branch 'mkirk/add-to-existing-requires-contacts' -|\ \ \ -| * | | 1c9ce5eaf CR: Don't just build, but present, alert controller -| * | | 5c66e5584 Adding to existing contact requires contact access -|/ / / -* | | 555264955 Merge branch 'charlesmchen/moreOWSTables' -|\ \ \ -| |_|/ -|/| | -| * | 8b6076562 Respond to CR. -| * | 81a4ebdaf Apply OWSTableViewController to more views. -| * | dc3f07cb5 Apply OWSTableViewController to more views. -|/ / -* | 878806aa5 [JSQMVC] Add Croatian translations -* | 7c6d90031 (tag: 2.14.1.0) sync translations -* | 33e9f2e62 bump version -* | f027d400b (tag: 2.14.0.4) Bump build -* | 50d6e2ccb rebuild WebRTC.framework on oak -* | 2d23e365c sync translations -* | df79c003f Merge branch 'mkirk/fix-audio-route' -|\ \ -| * | 9287b8560 clean up comments per code review -| * | fb5c17a6b minimize sound overlap -| * | e3faddedb Disallow bluetooth when user has opted for local receiver -| * | 524ba80b7 WIP: have ensureAudioSession set preferred input -| * | 220cd345f add comments -| * | ba97ff3f5 Label tweaks for device listing -|/ / -* | be3001e4f Merge branch 'charlesmchen/emptyHomeView' -|\ \ -| * | d36e60b0e Respond to CR. -| * | b6264383d Add possible fixes for the ‘empty home view’ issue. -| * | 90dabe1c8 Add possible fixes for the ‘empty home view’ issue. -| * | f52814bb7 Add possible fixes for the ‘empty home view’ issue. -| * | 3f805cd4c Add possible fixes for the ‘empty home view’ issue. -|/ / -* | 5e58079e1 Update l10n strings. -* | 563398226 (tag: 2.14.0.3) Bump build from to 2.14.0.3. -* | 914d2936a Merge branch 'mkirk/fix-unnecessary-session-changes' -|\ \ -| * | b8ec353d7 Use recommended approach for speakerphone mode -|/ / -* | 847a0ff8b Merge branch 'mkirk/disappear-from-lock-screen' -|\ \ -| * | fa42b4a45 Respect disappearing message timer from lockscreen -|/ / -* | 235a84213 [SSK] Use existing transaction in cleanup. -* | ab7c1698c Merge branch 'charlesmchen/anotherCallLeak' -|\ \ -| * | 6c61e6040 Fix another call view leak. -|/ / -* | 90ad83d49 (tag: 2.14.0.2) Bump build from to 2.14.0.2. -* | 8884cb5a2 [SSK] Fix copy and paste of voice messages. -* | 77fb1dbf4 Merge branch 'mkirk/bt-audio-2' -|\ \ -| * | 90c2324f9 pixel cleanup in bluetooth speaker image -| * | b495b2342 more cleanup and commenting -| * | 03f1bbca6 Move state from CallViewController -> Call -| * | 4e11e90eb cleanup -| * | a59eb25ae extract dismiss string -> CommonStrings.dismissButton -| * | 20a8e7219 disable audio source images until we have icons -| * | 9bd68ed49 WIP: bluetooth shows audio route button instead of speakerphone -| * | 109cb6cdb rename for clarity -|/ / -* | ce048e21d (tag: 2.14.0.1) Bump build from to 2.14.0.1. -* | 3527df7ba Merge branch 'charlesmchen/leakCallView' -|\ \ -| * | ac616d693 Reject the “call connected” promise immediately when clearing a call. -| * | a58c71f4b Fix leak of call view. -|/ / -* | 55ddce79b Merge branch 'mkirk/call-connectivity-fixes' -|\ \ -| * | d9dfc3d7c update fastlane ci -| * | b82aedc3a Assertion failures for unexpected promise state -| * | 438635393 Don't send ICE updates until after the CallOffer has been sent. -| * | d910da015 Partial revert of: Send ICE updates immediately - 2dcfb4e3b8b07bb2b5419cad6fa324e5e585c3da -|/ / -* | 3769ce833 Merge branch 'mkirk/scrub-log-data' -|\ \ -| * | 2067697ed Add comment and clearer tests per CR -| * | 4f1ee9848 scrub any data that slips through to logs -|/ / -* | 86d494bec Merge branch 'charlesmchen/addToExistingContact' -|\ \ -| * | b7c2512ea Respond to CR. -| * | 81555d122 Add “new contact” and “add to existing contact” buttons in 1:1 conversation settings view. -|/ / -* | 1e67bb52e Respond to CR. -* | 990978ac3 Merge branch 'charlesmchen/orphanCleanup' -|\ \ -| * | 0357081cc [SSK] Run orphan cleanup on startup. -| * | 2202fe70f Fix broken tests. -| * | f584c4b43 Fix broken tests. -| * | 0b28285de Fix broken tests. -| * | 69ba2811d Run orphan cleanup on startup. -|/ / -* | 4b7924cc7 [SSK] update CI gems -* | c0aa45571 fix tests -* | 195f124af Merge branch 'mkirk/fix-tests-again' -|\ \ -| * | f4d675e95 update ci to use latest XCode / fastlane -| * | d15da6e6d fix bubble calculator tests -| * | 3eb90ba38 Disable singleton assert for tests -| * | 82180f6a9 fix compilation problems -|/ / -* | fa09ce08f Merge branch 'charlesmchen/owsFailSwift' -|\ \ -| * | c9355630c Respond to CR. -| * | d639d6557 Add owsFail free function for swift. -|/ / -* | 800071415 Merge branch 'charlesmchen/archiveViewIndicator' -|\ \ -| * | 669e0644e Respond to CR. -| * | 5cf0441f5 Add a reminder that you are in archive view. -| * | 54a5b960c Add a reminder that you are in archive view. -| * | 8f3b837a6 Add a reminder that you are in archive view. -| * | 2e727a24b Convert home view to programmatic layout. -|/ / -* | cc31d88f2 [SSK] Fix persist view for upgrade scenario -* | f61980e37 [SSK] remove unhelpful logging -* | 3162160b5 Merge branch 'mkirk/respect-contact-sort-pref' -|\ \ -| * | 522310456 respect system sort order for contacts -|/ / -* | b19dd648d (tag: 2.14.0.0) Bump build number to v2.14.0.0. -* | dbf023597 [SSK] persist thread view -* | 2d8e4232a Merge branch 'mkirk/trickle-ice-2' -|\ \ -| * | 2dcfb4e3b Send ICE updates immediately. -|/ / -* | 0698d1161 Merge branch 'charlesmchen/doubleBusyRace' -|\ \ -| * | 1a400f841 Respond to CR. -| * | b6531a8b5 If two users call each other at the same time, ensure they both see “busy”. -|/ / -* | eb9b6bffd Merge branch 'mkirk/update-webrtc' -|\ \ -| * | 961576448 Update WebRTC to M59 + signal patches -|/ / -* | fbb58c95b Merge branch 'mkirk/log-code-cleanup' -|\ \ -| * | f681712ea Code Cleanup -|/ / -* | 53d00e61c Merge branch 'mkirk/update-copy-tweaks' -|\ \ -| * | e584f4d1e copy tweaks -|/ / -* | c5e42b667 Merge branch 'dermaaarkus-feature/fixWarnings' -|\ \ -| * | 422336db3 fixes compiler warnings FREEBIE -|/ / -* | 84a5a73b5 Merge branch 'charlesmchen/timerLeaks' -|\ \ -| * | c817346ee Fix “timer circular reference” leaks. -|/ / -* | afe6f9ca7 Merge branch 'mkirk/bluetooth' -|\ \ -| * | d8330a2c4 Fix bluetooth audio for calls -|/ / -* | 9a84aa93e Merge branch 'charlesmchen/headzDontSleep' -|\ \ -| * | e3f2583b4 Respond to CR. -| * | 9cbc1e6a1 Block device from sleeping while Debug UI is visible and during database upgrades. -| * | 0244e134f Block device from sleeping during certain activities. -|/ / -* | 700f3229b Merge branch 'charlesmchen/lastRegisteredVsKeychain' -|\ \ -| * | bfd04088b Persist registration view’s “last registered” values in keychain so that they persist across clean installs. -|/ / -* | 340728f16 Merge branch 'mkirk/status-not-tappable' -|\ \ -| * | 1afc6525e selecting network status does not highlight -|/ / -* | 3e11c10c9 [SSK] Don’t sync verification state until app has finished becoming active. -* | e2197848b Merge branch 'charlesmchen/appUpdateNag' -|\ \ -| * | 9e5447f1d Respond to CR. -| * | b400c0a32 Don’t show app upgrade nag unless we are at rest in home view or registration view. -| * | 944cd7bee Show app update nag on launch if necessary. -|/ / -* | 8e891eb35 Merge branch 'hotfix/2.13.3.0' -|\ \ -| |/ -| * e0ee4e42f (tag: 2.13.3.0) [SSK] Modify TSStorageManager to use separate shared read and write connections. -| * 134936092 Merge branch 'charlesmchen/afterDidBecomeActive' into hotfix/2.13.3.0 -| |\ -| | * c5bf85d0b Respond to CR. -| | * ab3aa9d0c Respond to CR. -| | * 97169f521 Move more initialization until after didBecomeActive is complete to avoid the “bad food” crash. -| |/ -| * 32beec611 Merge branch 'charlesmchen/crashOnLaunch' into hotfix/2.13.3.0 -| |\ -| | * 73869b1ef Fix possible cause of crash on launch. -| |/ -| * 7869d1409 Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0 -| |\ -| | * dc1453264 [SSK] Modify TSStorageManager to use separate shared read and write connections. -| | * 7135895c1 Modify TSStorageManager to use separate shared read and write connections. -| |/ -| * 906b307e1 remove unneccessary hack -| * dcf3de2ae Bump version to 2.13.3.0. -* | 7b04823aa [SSK] FIX: verifiying unregistered user prints "no longer registered" error on every launch -* | 438dcb6cc Merge branch 'mkirk/clearer-comment' -|\ \ -| * | 174706817 clearer comment -|/ / -* | 12d8ecfdf Copy tweak: "Incomplete" -> "Unanswered" outgoing call // FREEBIE -* | bf5934897 Merge branch 'mkirk/declined-call-notification' -|\ \ -| * | 1f9f066fa print call record when declining a call -|/ / -* | 88d34b6c4 Merge branch 'mkirk/fix-non-callkit-ringer' -|\ \ -| * | 1e0cf89f7 Explanatory comment -| * | 43a3a4afa play *after* stop -| * | 8abde1dff Non-Callkit adapter plays audio from notification when app is in background -|/ / -* | ed5e86c6e Merge branch 'mkirk/fixup-group-info-messages' -|\ \ -| * | ff10f5277 remove unneccessary hack -|/ / -* | 7f2232553 Merge branch 'mkirk/missed-call-audible-notification' -|\ \ -| * | c1881c02c constantize file name per CR -| * | 9b1695f28 Play audible alert for missed call -|/ / -* | 1d6ab0064 Merge branch 'mkirk/zero-badge-count' -|\ \ -| * | 89260e843 Unregistered users should have 0 badge count -|/ / -* | bf948f54f Merge branch 'mkirk/request-contacts-before-checking' -|\ \ -| * | 633578256 Make sure we're requesting access for contacts before checking access -|/ / -* | 99526f402 Merge branch 'charlesmchen/diskUsage' -|\ \ -| * | 1552c6477 Add “delete old messages” and “save all attachments” debug commands. -| * | 72faa5f82 Add clean up command to the “orphan audit” debug UI. -| * | feb32fdf8 Find orphan and missing attachment stream files. -| * | 284d55ef6 Rework the debug UI. -|/ / -* | 6fd717fe1 Merge branch 'charlesmchen/scrollToButtonGlitch' -|\ \ -| |/ -|/| -| * 07c8eb54b Prevent "scroll to button" button from blipping. -|/ -* 2d8ad30ef (tag: 2.13.2.0) Bump version to 2.13.2.0. -* 3e87d4171 Update l10n strings. -* 6e31713c8 Merge branch 'mkirk/show-timestamp-after-unread' -|\ -| * c6cd0bbca Always show timestamp after unread indicator -| * bef3a56e5 DebugUI: create fake unread messages -|/ -* 7ffb0d98e Merge branch 'mkirk/log-when-stating-token-sync' -|\ -| * 964e55813 log when starting token sync in prod -|/ -* 6719008ed (tag: 2.13.1.0) bump version -* 2fc2c74fb Merge branch 'mkirk/fix-unread-badge' -|\ -| * dbad3b4f8 [SSK] MessagesManager observes for badge count -| * d0d4e6761 update badge count when app is in background -|/ -* 544dec1af [SSK] Fix typo in assert -* 46bf05182 [SSK][SPK] fix upstream tests -* 226b7354d (tag: 2.13.0.16) Bump build from to 2.13.0.16. -* 132348c44 Update l10n strings. -* 1e8c24cba (tag: 2.13.0.15) Bump build from to 2.13.0.15. -* ab40bc724 [SSK] sync key version -* 1aacf3595 Merge branch 'charlesmchen/dontReplyToNoLongerVerified' -|\ -| * e48d51d08 Respond to CR. -| * a462cba45 Don’t reply to “no longer verified”. -|/ -* af67f33e3 Merge branch 'charlesmchen/moreFakeContacts' -|\ -| * db3407853 Refine fake contact creation. -|/ -* 10fb3286c Merge branch 'charlesmchen/removePhoneNumberLengthLimit' -|\ -| * 791c5bb89 Revise phone number length limit in registration view. -| * 351c8c00f Remove phone number length limit in registration view. -|/ -* 96f833473 Merge branch 'charlesmchen/bumpBuildNumberScript' -|\ -| * 0486cfe7e Add script to bump build numbers. -|/ -* 4133673d7 (tag: 2.13.0.14) Bump build number to 2.13.0.14. -* 1eff5513b [SSK] Archive sessions upon identity change. -* 67d60ff01 (tag: 2.13.0.13) Bump build number to 2.13.0.13. -* 4cbba496e Merge branch 'mkirk/archive-sibling-state' -|\ -| * 3e43eef53 [SSK][SPK] Archive all recipient's sessions on identity change. -|/ -* ad17c444f [SSK] Add creation timestamp to attachment streams. -* ff89cbabc (tag: 2.13.0.12) Bump build number to 2.13.0.12. -* 84d8fb085 Update l10n strings. -* 55bc6868f Merge branch 'mkirk/verification-sync' -|\ -| * 140625b2a [SSK] verification sync -| * a933fbf21 (origin/mkirk/verification-sync) sync verifications with contact syncing -| * 37b7bf18e clarify code and clean up code formatting -|/ -* b7307ecfa Merge branch 'charlesmchen/crashManualCircumvention' -|\ -| * e814ae129 Fix crash in manual censorship circumvention logic on iOS 9. -|/ -* d00928902 Merge branch 'charlesmchen/moreScrollDownButton' -|\ -| * f7c81bae9 Show the “scroll down” button if user scrolls up, even if there are no unread messages. -|/ -* 89c252a42 Merge branch 'charlesmchen/logOverflow' -|\ -| * e6aacf0bc [SSK] Reduce chattiness of logs; increase log file sizes. -| * eff1974ee [SSK] Reduce chattiness of logs; increase log file sizes. -|/ -* 1ae7f0710 Merge branch 'charlesmchen/keychainVsRegistrationDebug' -|\ -| * 15ecb0347 Respond to CR. -| * 7726c6804 Persist registration values in the keychain for debug builds only. -|/ -* 06baf5128 (tag: 2.13.0.11) Bump build number to 2.13.0.11. -* c60ca915d Merge branch 'charlesmchen/callServiceLogging' -|\ -| * 3d0811c03 Respond to CR. -| * 029da7e0c Hang up current call if we receive a call offer from the same user. -| * 9fc92990f Improve logging in CallService. -|/ -* 12e083b4e [SSK] Fix OWSCFail() macro. -* c7d923652 [SSK] Ensure verification UI is updated to reflect incoming verification state sync messages. -* 6fa20d62b Merge branch 'charlesmchen/groupsVsNoLongerVerified' -|\ -| * 0855faabb Respond to CR. -| * efbda7076 Improve UX for multiple “no longer verified” members of a group. -| * afb83cfaa Improve UX for multiple “no longer verified” members of a group. -| * f1e5be4c1 Improve UX for multiple “no longer verified” members of a group. -| * a039aac36 Improve UX for multiple “no longer verified” members of a group. -|/ -* 509d2d0aa Merge branch 'charlesmchen/attachmentStreamUpgradePerf' -|\ -| * f3f832557 Respond to CR. -| * 6a1f76665 [SSK] Improve perf of attachment stream file path upgrade. -| * ec077235b Respond to CR. -| * 6a5fe94d5 Improve perf of attachment stream file path upgrade. -|/ -* f6f5d3d45 Merge branch 'charlesmchen/invalidateMessageAdapterCache' -|\ -| * b39c4905c Invalid message adapter cache when app becomes visible. -|/ -* 4f0b5838e (tag: 2.13.0.10) Bump build number to 2.13.0.10. -* ae9a5acf6 Merge branch 'charlesmchen/upgradeLaunchScreenAndPerf' -|\ -| * 0738568b9 Fix upgrade launch screen. -|/ -* 949a38c4d Merge branch 'mkirk/fix-dismiss-kb-after-send' -|\ -| * 11fa08470 [JSQ] Fix: can't dismiss keyboard after sending -|/ -* f305b2c30 Merge branch 'mkirk/delete-system-messages' -|\ -| * 8898f4a6d CR: future proof view placement if we change hierarchy -| * da7dae816 CR: rename longpress->longPress -| * c70b1e968 Make system messages deletable -| * fbba2f5dd colocate CollectionViewDelegate methods -|/ -* 7a2ad9194 Merge branch 'mkirk/fix-cold-call-from-contacts' -|\ -| * 39563ab8c present from signalsViewController so users don't get confused by being dropped into a different thread when the call is over. -| * 982433c2b update call screen avatar when contacts change -| * 36c09aeb8 cleanup ahead of PR -| * ff93732ed WIP: fix call from contacts when signal hasn't been launched yet -|/ -* 59d3e9ed5 (tag: 2.13.0.9) Bump build number to 2.13.0.9. -* 3939dbba2 Merge branch 'charlesmchen/slowLaunchRelease' -|\ -| * eb17a7b18 [SSK] Refine observation of async registration completion. -| * 5ae4b99f8 Refine observation of async registration completion. -|/ -* f5387efba Merge branch 'charlesmchen/maxUnreadCounts' -|\ -| * de453b296 Respond to CR. -| * 5796bbd85 Max out the unread count at 99. -|/ -* dc69034b6 Merge branch 'mkirk/remove-explanatory-alert' -|\ -| * bee4b118e remove unneccessary explanation of UI -|/ -* 7c107a13e Merge branch 'mkirk/keyboard-hides-last-messages' -|\ -| * 0419d35f1 CR: rename method -| * 8fc228915 prefer becomeFirstResponder -| * b4d3e8e74 Fix: tapping input obscures last messages -|/ -* d603e587f (tag: 2.13.0.8) Bump build number to 2.13.0.8. -* 8948a54e2 Enable verification state sync. -* 988ec86fb (tag: 2.13.0.7) Bump build number to 2.13.0.7. -* 7b51c4317 Merge branch 'charlesmchen/staleMapping' -|\ -| * d01a52758 Respond to CR. -| * 0d07e0222 Avoid stale mapping in conversation view. -| * 331a1e90e Avoid stale mapping in conversation view. -| * f6f08891e Avoid stale mapping in conversation view. -| * d4a6a35ee Avoid stale mapping in conversation view. -|/ -* 8d4f30d19 Merge branch 'charlesmchen/asyncDatabaseViewRegistrationVsExportWithSignal' -|\ -| * 9f2a2d1ee Don’t show “export with Signal” UI until async database view registration is complete. -|/ -* 66a71d724 (tag: 2.13.0.6) Bump build number to 2.13.0.6. -* 301e925cc Update l10n strings. -* 62c096aa1 [SSK] append/remove key type as necessary to fix verification syncing -* 41065e692 [SSK] fix crash while syncing verifications -* 98f2245ff Merge branch 'mkirk/view-sn-before-sending' -|\ -| * b404fa3c2 Save identity from profile fetch even if there's no pre-existing identity. -|/ -* c73c01538 Merge branch 'charlesmchen/fingerprintViewLayoutJumps' -|\ -| * fa5897768 Prevent layout from jumping around in fingerprint view. -|/ -* 8b06a007b Merge branch 'mkirk/system-info-timestamp' -|\ -| * 4f3278db1 Fix layout of timestamp for system messages -| * 1125e2ac9 System messsages can show timestamp -|/ -* c95203607 (tag: 2.13.0.5) Bump build to 2.13.0.5. -* 7a50c688f Merge branch 'charlesmchen/messageMappingVsBackground' -|\ -| * 104a548eb Ensure message mapping is up-to-date when app returns from background. -|/ -* fabc0301c Merge branch 'charlesmchen/registrationFontSize' -|\ -| * dc134a991 Tweak font size on fingerprint view. -| * 57c1519b1 Tweak font size on registration view. -|/ -* 50c306e21 Merge branch 'charlesmchen/autoScrollPastUnreadMessages' -|\ -| * e14b9b511 Respond to CR. -| * 8649b2603 Don’t auto-scroll after “loading more messages” unless we have “more unseen messages”. -|/ -* c68f38eb8 Merge branch 'charlesmchen/aboutViewFullAppVersion' -|\ -| * 4d0b15f58 Show long-form app version in about view. -|/ -* dc567e9e8 Merge branch 'charlesmchen/invalidMediaAttachmentsCrash' -|\ -| * 119f1f342 Respond to CR. -| * 6276dcb34 Fix “Invalid media attachments” crash. -|/ -* c758f85cc Merge branch 'charlesmchen/holidayCodeReviewOmnibus' -|\ -| * b53ab8a85 [SSK] Respond to post-holiday code reviews. -| * ab95b04e5 Respond to CR. -| * 3c59678b7 Respond to CR. -| * 90c4ba27b Respond to post-holiday code reviews. -| * bd440f087 Respond to post-holiday code reviews. -|/ -* f4ae0dbba [SSK] Rework verification state sync per latest proto schema. -* b4ceab21c Merge branch 'mkirk/tap-legacy-nonblocking' -|\ -| * 1661e8dc3 (origin/mkirk/tap-legacy-nonblocking) assume contact in 1:1 thread -| * a41b10a69 ignore tap on legacy non-blocking SN change message -|/ -* 79c55eaf8 Merge branch 'charlesmchen/betterFakeMessagesAndUpgradeScreen' -|\ -| * 6444754cb [SSK] Cache the attachments folder in TSAttachmentStream. Add isFirstLaunch method to AppVersion. Add a “last app completed launch” version. -| * 3c28f15db Respond to CR. -| * d340c3262 Tweak the database upgrade copy. -| * 3e3896759 Do not show database upgrade screen for unregistered users. -| * f9fcbad1a Add a “last app completed launch” version. -| * cf3101226 Improve the upgrade screen. -| * 75ccff0e4 Improve debug tools for creating “fake” and “tiny attachment” messages. -|/ -* 70aa46b2d Merge branch 'mkirk/sn-copy-changes' -|\ -| * 60e87bb16 clearer copy for SN changes -|/ -* f098df905 [SSK] Upgrade attachment streams on a serial queue. -* 631a2bbb1 (tag: 2.13.0.4) Bump build number. -* 173cb54b6 Merge branch 'charlesmchen/readVsWriteConnection' -|\ -| * 35d68c618 Fix "writes on long-lived read connection" issue. -|/ -* da55f45af (tag: 2.13.0.3) Bump build number. -* 9eb769fe9 Merge branch 'charlesmchen/loadingRootViewController' -|\ -| * 16dd87a40 Use launch screen as root view controller while database views are loading. -|/ -* 12df7fae8 Update l10n strings. -* 7805119c0 (tag: 2.13.0.2) Bump build number. -* 72ad65e27 Merge branch 'charlesmchen/busyVsUntrusted' -|\ -| * 3bc73bea2 Don't return busy signal to untrusted callers. -|/ -* e50a9e40f Merge branch 'charlesmchen/databaseViewsVsStartupTime' -|\ -| * 42bf2106b [SSK] Avoid crashing on startup due to database view creation. Use transactions in the jobs. -| * f71f33c2a Respond to CR. -| * c7426f934 Avoid crashing on startup due to database view creation. -|/ -* 7b47cd880 Merge branch 'charlesmchen/offersVsSelf' -|\ -| * b18e7cde3 Don’t show offers in conversation with self. -|/ -* 9fa1b295a (tag: 2.13.0.1) Bump build number. -* f47873f78 Merge branch 'charlesmchen/removeBlockingPref' -|\ -| * 7c1d3fe23 [SSK] Remove “block on safety number changes” setting in preferences. -| * 05e316381 Remove “block on safety number changes” setting in preferences. -|/ -* ce99a7462 Merge branch 'charlesmchen/fakeMessages2' -|\ -| * d0791bf51 Add debug UI to create fake messages. -|/ -* 8d828af4f Merge branch 'charlesmchen/databaseViewsVsPerf' -|\ -| * cf0319f02 [SSK] Reduce number of database views. -| * 575d63112 Reduce number of database views. -|/ -* d1097c361 [SSK] Remove an unnecessary database view. -* 678ddcacb Merge branch 'charlesmchen/cullDependencies' -|\ -| * 35879046c Remove OpenSSL pod. -|/ -* 731f090f6 (tag: 2.13.0.0) Merge branch 'charlesmchen/fixOpenSSL' -|\ -| * 1057e4000 Fix OpenSSL cocoapod. -|/ -* a0ffe2bd1 Merge branch 'charlesmchen/groupCreationErrors' -|\ -| * 1818aea62 [SSK] Ensure message sends only succeed or fail once. Add “group creation failed” error message. -| * 6f1f1fac8 Improve handling of group creation failures. -|/ -* f4a77f730 Merge branch 'charlesmchen/notificationSoundsVsConcurrency' -|\ -| * bdfa43573 Allow notification sound check from any thread. -|/ -* e8a0cc08e Merge branch 'charlesmchen/callsStuckOnConnecting' -|\ -| * ab043cea5 [SSK] Improve logging around incoming messages. -| * f5f506d06 Investigate “call stuck on connecting” issue. -|/ -* 24c0e296e Merge branch 'charlesmchen/useReferenceCellsForMeasurement' -|\ -| * 55b86eba2 Use reference cells for measurement. -| * 83b03c004 Use reference cells for measurement. -| * 91af4f93e Use reference cells for measurement. -|/ -* de56c77f3 Merge branch 'charlesmchen/fixBuildWarnings' -|\ -| * 389305e2b Fix build warnings. -|/ -* 07fca2b5d Merge branch 'charlesmchen/throttleNotifications' -|\ -| * 5e993e72c Throttle notification sounds. -|/ -* d01412ae9 Merge branch 'charlesmchen/tweakVerificationUI' -|\ -| * a73c6ede6 Tweak verification UI. -| * 935244843 Tweak verification UI. -|/ -* e9ed91fb0 Update l10n strings. -* 1f82dc9a6 Merge branch 'charlesmchen/readReceiptsVsOlderMessages' -|\ -| * 5ecf38117 [SSK] Rework how messages are marked read. -| * c18a670d6 Don’t update expiration for messages twice. -| * 027cd8cb3 Rework how messages are marked read. -|/ -* 48e8c1825 Merge branch 'charlesmchen/tweakProfileFetch2' -|\ -| * 65d84fd04 Throttle profile fetch and retry on failure. -|/ -* b694dea1b Merge branch 'charlesmchen/tweakProfileFetch' -|\ -| * f8f4e5ee6 Throttle profile fetch and retry on failure. -|/ -* 3c7d47f56 [SSK] Remove legacy message sending. -* 1d27fc62d Bump version and build number to v2.13.0.0. -* df21e616d [SSK] Don’t update home view sort order in response to dynamic interactions or verification state changes. We only want to create change messages in response to user activity, on any of their devices. -* 3a374b4d1 Merge branch 'charlesmchen/fingerprints6' -|\ -| * b68b18837 Use shield instead of checkmark in conversation settings view when users is not verified. -| * 7d7b6689c Tweak verification state messages. -|/ -* 9262c0707 Merge branch 'charlesmchen/fingerprints5' -|\ -| * 7da28bd5d Multiple refinements around verification. -| * 11ca51c95 Show verification state banner. Show verification state in conversation settings view. -|/ -* 8db75e86a Merge branch 'charlesmchen/fingerprints4' -|\ -| * 471e307ec Use checkmark to indicate verification status in conversation view header subtitle, fingerprint view, and in conversation settings row icon. -|/ -* 449e98934 Merge branch 'charlesmchen/fingerprintView3' -|\ -| * a7269a9a5 Clean up ahead of PR. -| * 128e147c1 Show verification state in fingerprint view and let user change that state. -| * 10f3f7fe1 Add “learn link”. Move “scan” button into QR code. -| * 8b9a1e41b DRY up safety number success and failure handling. -|/ -* cc5e81021 [SSK] Add a default description for verification state messages. -* 2dbf305a7 Merge branch 'charlesmchen/fingerprintView2' -|\ -| * 051b00558 Move QR code scanning to a separate view. -| * 526460210 Move QR code scanning to a separate view. -| * 5a867e3f6 Respond to CR. -| * 58ebebc97 Move QR code scanning to a separate view. -|/ -* bc95d4e9e Merge branch 'mkirk/archive-not-delete' -|\ -| * 0a55b965b [SSK][SPK] Archive sessions when fetching profile -| * 6d3d06bd1 CR: continue to delete sessions for EndSession -| * 6715e76c9 Prefer archiving, to deleting old sessions for better handling of out of order decryption. -|/ -* c51b762ec Merge branch 'mkirk/fix-build' -|\ -| * a139bd73e Remove deprecated info message from debug UI -|/ -* 03d35884d Merge branch 'charlesmchen/fingerprintView1' -|\ -| * fe0ddb53d Clean up ahead of PR. -| * 93a587c89 Convert FingerprintViewController to programmatic layout. -| * 3508feaec Convert FingerprintViewController to programmatic layout. -|/ -* 1ed0b1604 Merge branch 'charlesmchen/verificationStateChangeMessages' -|\ -| * 869cdfd12 Add verification state change messages. -| * bc63a72c2 Add verification state change messages. -|/ -* 7335fc4d0 Merge branch 'mkirk/redundant-sn-changes' -|\ -| * 64efa2b3c [SSK] remove redundant SN changes when sending to new identity -| * 75bab75dc Show no redundant error when failing to send due to changed identity -|/ -* 894893ceb Merge branch 'charlesmchen/syncVerificationState' -|\ -| * 1ef9ba065 Clea up usage of fail macro. -|/ -* 4d370130b Merge branch 'charlesmchen/pasteTextFragments' -|\ -| * c3edbd9aa Fix paste of text fragments. -|/ -* 640b210f1 Merge branch 'mkirk/block-file-sharing' -|\ -| * 842baa307 CR: use weak self -| * f7468acad Properly dismiss file view after proceeding with share to no-longer verified identity -| * 4e995b76f Don't try to share file to untrusted identity -|/ -* a1d3e360d [SSK] Sync verification state. -* 3531dda2d Merge branch 'mkirk/create-missed-call-notification-in-thread' -|\ -| * 9ec6ec5e4 [SSK] create missed call notification in threads -| * 1a3204bf4 create interaction in thread when missing call due to changed identity -|/ -* c8a444d93 Merge branch 'mkirk/debug-toggle-verification' -|\ -| * 022292e2e CR: extract method for readability -| * 5b2428c8a debug toggle verification state -|/ -* 32d05bbe0 [SSK] avoid deadlock on unknown session -* 1e6098a9d Merge branch 'mkirk/debug-sn-numbers' -|\ -| * 4000908f4 clarify assert per code review -| * bae91d97d clearer code style -| * d77addc01 extract session state debug utils into section -| * 54865e43e debug item to locally simulate a SN change -|/ -* 34f59d661 Merge branch 'mkirk/identityManager' -|\ -| * 269297716 (origin/mkirk/identityManager) [SSK] New identity manager -| * 8c592a373 log error on assertion failure -| * f74c3a0e8 remove unused code -| * c8d547a08 Only allow callback for identities that were not previously verified -| * 112755304 restore "confirm and callback" functionality -| * 146031e4d update copy / remove some unused "unseen" tracking -| * 41a34e572 Update Safety Number alerts to work with verification -| * c7c243cfe Clean up ahead of PR. -| * b6ddea9ea Sketch out OWSIdentityManager. -| * ceb210748 Sketch out OWSIdentityManager. -|/ -* 847f9e50b Merge branch 'charlesmchen/censorshipCircumventionIndicator' -|\ -| * 1dffdb5ca Indicate if censorship circumvention is active in the main app settings view. -|/ -* 320dfd89e Merge branch 'charlesmchen/moreSystemMessages' -|\ -| * 15074cdb8 Clean up system message cells, make them tappable, etc. -|/ -* 6a6d71db6 Merge branch 'charlesmchen/reworkSystemMessages' -|\ -| * 2d76f2beb Respond to CR. -| * 301c8c51a Clean up ahead of PR. -| * eb53958ae Clean up ahead of PR. -| * efa40dbdb Rework icons in conversation settings view. -| * b3c42f0c3 Rework and unify the system messages. -| * a013a7206 Rework and unify the system messages. -| * 459c6c6ed Rework and unify the system messages. -| * 9cdf907e2 Rework and unify the system messages. -| * 2cbf1e1d0 Rework and unify the system messages. -|/ -* f5caf3704 Merge branch 'mkirk/fix-migration' -|\ -| * 177800c64 (origin/mkirk/fix-migration) only run migration once -|/ -* e80a00a6b [SSK] Format fail messages. -* 58f360b62 [SSK] Rework and unify the system messages. -* ca527951f Merge branch 'charlesmchen/unreadIndicatorAppearance2' -|\ -| * 74209561c Clean up ahead of PR. -| * 713d31ea6 Rework appearance of the unread indicator. -| * c8fc47c08 Rework appearance of the unread indicator. -| * a847a5c86 Fix layout of unread indicator cell subtitle. -| * dab8ddb37 Rework appearance of the unread indicator. -|/ -* 1bbae071f Merge branch 'charlesmchen/unreadChanges' -|\ -| * 90cdb6fcc Only show unread indicator if there is more than one message in the thread. -| * 165de573c Fix edge cases in the unseen indicator. -| * 84d5ee8e4 Clean up ahead of PR. -| * a69c6cce4 Decompose MessagesViewController, add “scroll to bottom button”, improve scrolling behavior. -|/ -* 05fb7dcb3 [SSK] Remove obsolete TSUIDatabaseConnectionDidUpdateNotification notification. -* bee0d095f Merge branch 'charlesmchen/pasteVsMultipleUTITypes' -|\ -| * 831046338 Respond to CR. -| * e48bf6534 Fix “can’t paste GIF from iMessage” issue. -| * 5dcdace26 Fix “can’t paste GIF from iMessage” issue. -|/ -* 5897ca1b6 Merge branch 'charlesmchen/streamlineHomeView' -|\ -| * 5fad3304a Streamline observation of database modifications in home view. -|/ -* a564c960f Merge branch 'charlesmchen/scrollToBottom' -|\ -| * b5f559977 Fix edge cases in the unseen indicator. -| * 226a97585 Clean up ahead of PR. -| * 22fc69bbb Decompose MessagesViewController, add “scroll to bottom button”, improve scrolling behavior. -|/ -* 6db853103 Merge branch 'mkirk/reject-unseen-id-calls' -|\ -| * eea0d7be7 [SSK] update to merged -| * 1059cc062 replace FOUNDATION_EXPORT with extern per code review -| * 295ba5c85 update copy "safety number" is not uppercased -| * 5b12f4afa Prevent outgoing calls started from various places unless have been seen -| * 130aa132a Reject incoming calls from an unseen changed identity -|/ -* 6b4a5398e [SPK] Improve logging around updating and using prekeys. -* 76a0f88f7 [SSK] dont cache session store -* c0753152d [SPK] Improve logging around updating and using prekeys. -* d1212deab Merge branch 'charlesmchen/incomingAndOutgoingDatabaseViews' -|\ -| * d752a9b03 [SSK] Add incoming and outgoing message database views. -| * b31ef7231 Respond to CR. -| * f49309bf6 Add incoming and outgoing message database views. -|/ -* 19a2a1539 [SSK] Clean up timer usage. -* cdda0d4f0 [SSK] Fix “mark as read” logic. -* 7b9eb2c2d Merge branch 'charlesmchen/messagesViewInitialLayout' -|\ -| * 78982f237 Fix issues around initial layout of messages view. -|/ -* 5485f5d55 Merge branch 'charlesmchen/unreadIndicatorVsBackground' -|\ -| * 76df8431a Reset the unread indicator state if possible while app is in the background. -|/ -* 95c17afe7 Merge branch 'charlesmchen/permissiveSendMessageButton' -|\ -| * 0bccd5821 Make “send message” button easier to tap. -|/ -* ffd16d29a Merge branch 'mkirk/interstitial-call-action' -|\ -| * 9a2f218bf show SN confirmation before adding to group -| * 2d7f03a1c interstitial SN confirmation for attachments/voicenotes -| * 47783a9df request confirmation when calling changed SN -|/ -* ced912530 Merge branch 'mkirk/bordered-avatar' -|\ -| * 76fafbce5 not using ibdesignable and it sometimes crashes interface builder. =/ -| * ea08faa55 remove default avatar image, we should always specify -| * c55f7044a Use avatar view in group views -| * 52aa8a374 require explicit avatar diameter -| * 19d74d91e Build higher res avatar for call screen -| * b11f8affa Use AvatarImageView -|/ -* 68d500b8f Merge branch 'charlesmchen/refineUnseenIndicator' -|\ -| * 85d54798f [SSK] Changes for unseen indicator. -| * 746d131a8 Respond to CR. -| * 8a6ca8c01 Fix glitch around downloading attachments. -| * 02df277d1 Respond to CR. -| * 7afcad81c Fix data type issue around losing millisecond precision in message expiration times. -| * 19390abc4 Refine the unseen indicators. -| * b2fa93e2a Skip redundant layout pass in messages view. -| * bd7b7f3d1 Cache the displayable text for messages. -| * ada4880dc Add a database view for dynamic interactions. -|/ -* e3527b408 Merge branch 'charlesmchen/cacheAccountNames' -|\ -| * 63f014fab [SSK] Cache display names for accounts. -| * c871e2de3 Respond to CR. -| * 616041c0f Respond to CR. -| * 86fb08307 Rationalize the attributed and unattributed display name formatting and caching. -| * dd3394be1 Cache display names for accounts. -|/ -* 2f79e624c Merge branch 'charlesmchen/tweakRegistration' -|\ -| * 3a83f9309 Tweak appearance of registration views. -|/ -* 8bf3fb4bc Merge branch 'charlesmchen/socketStatusVsCensorshipCircumvention' -|\ -| * d065c9527 Hide the socket status view when censorship circumvention is active. -|/ -* 680b2c20d Merge branch 'mkirk/fix-reply' -|\ -| * fe54f4319 fix reply-from lockscreen on larger devices -|/ -* 85d0d2750 [SSK] remove some redundant error notifications -* 6395f3c88 Merge branch 'mkirk/confirm-send' -|\ -| * 37e0b1a00 Sending to unconfirmed idnetity presents confirmation -|/ -* 643301eae Fix tag typo -* 30f4fdd5c Merge branch 'mkirk/profile-request' -|\ -| * 1a03be8ae Fetch safety number upon entering thread -|/ -* 22b608c8e Merge branch 'mkirk/screen-protection-cleanup' -|\ -| * 2c7ccbe5d Make sure screen protection is applied before ending bg task -|/ -* ab9b9833d Merge branch 'charlesmchen/messageViewPerf2_' -|\ -| * 1d792d187 Rename audio duration and image size methods in TSAttachmentStream. -|/ -* fc37e251d [SSK] log error on failure -* b97e4931a Merge branch 'mkirk/safety-numbers' -|\ -| * 4700294c2 [SSK][SPK] Safety Number Updates -| * 4b8544d5f ensure atomic write to wasSeen property -| * 6d00aac04 style cleanup, no functional changes -| * bb25d2beb IdentityKeyStore changes -|/ -* 4851e4304 Merge branch 'charlesmchen/removeRegistrationStoryboard' -|\ -| * 247540625 Respond to CR. -| * 4680a2465 Remove registration storyboard. -|/ -* f30cd7c7f [SSK] Remove invalid assert in socket manager. -* 497d15d8a Merge branch 'charlesmchen/messageViewPerf2' -|\ -| * d8ade3288 [SSK] Cache image size and audio duration on attachments. -| * 78f443374 Respond to CR. -| * 964e6f1ad Improve asserts and logging in attachment adapters. -| * b1f7cf0d6 Cache image size and audio duration on attachments. -|/ -* b0fad7ed5 Merge branch 'charlesmchen/registrationView2' -|\ -| * 9577038f1 Respond to CR. -| * 7547d03a7 Clean up ahead of PR. -| * 2fc683dd9 Add example phone number to registration view and make layout responsive. -| * 070395e8b Rewrite registration view. -|/ -* 1f68f3af7 Merge branch 'charlesmchen/appSettingsSegue' -|\ -| * eeb510b90 Respond to CR. -| * 4ac78d9b4 Replace app settings segue. -|/ -* 07f35d9ba Merge branch 'charlesmchen/fixMessageSizeCache' -|\ -| * 632cb7875 Respond to CR. -| * db097ab8d Fix caching of message bubble sizes. -|/ -* d8d4d7522 Merge branch 'charlesmchen/manualCensorshipCircumvention' -|\ -| * b0005ea93 Respond to CR. -| * bc501b16f Let users manually specify the domain fronting country. -| * 98c5e7d69 Add support for manually activating censorship circumvention. -| * c07f28565 Revise manual censorship circumvention. -| * e746636c7 Expose manual censorship circumvention setting. -| * db10cbaee Convert AdvancedSettingsTableViewController to OWSTableView. -| * 7f3d76d8b Convert the app settings view to OWSTableView. -| * 4bb702fe0 Add support for manually activating censorship circumvention. -| * 2e36f4183 Add support for manually activating censorship circumvention. -|/ -* ac5749efd Merge branch 'charlesmchen/unreadIndicator3' -|\ -| * 6550680f6 Fix glitch in unread indicator layout. -|/ -* ed0340fe6 Merge branch 'charlesmchen/registrationView' -|\ -| * dac5483fd Clean up CountryCodeViewController delegates. -| * 61de84a20 Clean up CountryCodeViewController delegates. -| * 867eb7d74 Convert CountryCodeViewController. -| * ea9dc3fe7 Rationalize the segues between registration view and country code view. -|/ -* 157baa1f9 Merge branch 'charlesmchen/stressTesting2' -|\ -| * a37b194dc Add debug functions for sending media messages. -|/ -* 6a1cf5535 Merge branch 'charlesmchen/addToContactsOffer' -|\ -| * d28467aac Respond to CR. -| * df2ee6ba5 “Add to contacts” offer. -| * bc63389d2 “Add to contacts” offer. -| * 7b70fe674 “Add to contacts” offer. -|/ -* 4223766e6 [SSK] Try the country code for the local phone number when parsing phone numbers. -* 62dab31f5 Merge branch 'charlesmchen/unreadIndicator2' -|\ -| * ac0c6e21d Respond to CR. -| * 14ebc58d5 Revise scrolling behavior of messages view. -| * c639926f2 Revise scrolling behavior of messages view. -| * 4e1dda275 Revise scrolling behavior of messages view. -|/ -* 25232596f Merge branch 'charlesmchen/generateAndDeleteRandomContacts' -|\ -| * 55dab36ce Respond to CR. -| * b3948f27d Add debug functions to generate and delete random contacts. -|/ -* e7de25ab0 [SSK] Pin YapDatabase to v2.9.3 to avoid v.3.x. -* 089c3a5bb Merge branch 'charlesmchen/attachmentFilenames' -|\ -| * cab9e3d3d [SSK] Persist attachment file paths. -| * 7db19df74 Respond to CR. -| * c70487be8 Respond to CR. -| * db07ea8a8 Persist attachment file paths. -| * e4f31b5e4 Rename attachment source filename property. -|/ -* 7e031b730 [SSK] Show SN changes in groups, and include name -* 873aab5cd Merge branch 'charlesmchen/unreadIndicator' -|\ -| * f201ddbba Respond to CR. -| * 16549bee1 Clean up ahead of PR. -| * 0983448c7 Add unread indicator. -| * 6164f65f0 Add unread indicator. -| * ac458cc7a Add unread indicator. -|/ -* 745172a6d Merge branch 'charlesmchen/attachmentPerf' -|\ -| * ebf500d80 Respond to CR. -| * 670439699 Lazy load attachments in messages view, etc. -|/ -* 4a3366251 Merge branch 'mkirk/fix-unregistered-display-name' -|\ -| * 35a6dc763 (tag: 2.12.2.0, origin/mkirk/fix-unregistered-display-name) Show Contact name, not number, of unregistered user -|/ -* a210caed3 bump version -* dfd438e5f revert Yap update until next release -* 70d8f4af3 Merge branch 'charlesmchen/iOSUpgradeNag' -|\ -| * 0ec095f21 Nag users on iOS 8 to upgrade. -|/ -* e80d40d7f Update l10n strings. -* 92466aaf8 Merge branch 'mkirk/ios8-contacts' -|\ -| * 14b6294d6 code cleanup pre CR -| * 4adaaa605 Hide contact editing features on iOS8 -| * 05d70a76d iOS8 contact store adaptee -| * 889ad0bc6 Extract code incompatible with iOS8 into adapter -| * 557488bc7 return iOS8 support in project files -|/ -* 7655226a4 Merge branch 'charlesmchen/emptyRegistrationView' -|\ -| * 54faff2db Show alerts for missing or invalid phone numbers in registration view. -|/ -* 1ab8fb29b Merge branch 'charlesmchen/searchLocalCallingCode' -|\ -| * 07cc8baa6 [SSK] Honor the local calling code in select recipient view. -| * 37a601d76 Honor the local calling code in select recipient view. -|/ -* 69a709f93 (origin/release/2.12.2) Merge branch 'charlesmchen/voiceMessagesEdgeCases' -|\ -| * 14fed91ea Fix edge cases in voice message recording. -| * 5c8956f97 Dismiss keyboard before showing the “too short voice message” alert. -|/ -* 6833fb718 [SSK] Retry push token registration. -* b8e10b0d7 Merge branch 'charlesmchen/missingLocalNotifications' -|\ -| * 5fd93eace Fix missing notifications. -| * fc7dec04a Fix missing notifications. -|/ -* 4b655a701 Merge branch 'mkirk/remove-phone-data-detector' -|\ -| * f87696cc6 do not use phone data detectors -|/ -* d211e6238 Merge branch 'mkirk/fix-no-contacts-flicker' -|\ -| * c31fd0dfc Fix flicker of "no contacts" screen on message compose -|/ -* 74a0e285a Merge branch 'charlesmchen/graySettingsButtons' -|\ -| * 9dc1847ca Change conversation settings buttons to gray. -|/ -* ce002c228 (tag: 2.12.1.2) bump build -* 17cff1a26 Revert "Merge branch 'charlesmchen/bluetoothAudio'" -* b76c3fb1c (tag: 2.12.1.1) bump build -* 48a2005aa Merge branch 'charlesmchen/bluetoothAudio' -|\ -| * 6c9f44b99 Clean up ahead of PR. -| * 54bf10350 Fix Bluetooth audio when recording voice messages. -| * 7e18052c4 Fix Bluetooth audio in calls. -|/ -* de1332479 (tag: 2.12.1.0) bump version -* ef1dc359f Merge branch 'mkirk/mic-perms' -|\ -| * e727c0a77 update mic perm copy -| * 16032b9c6 strongSelf per CR -| * c56ff7532 Fix confusing double permission request on new install when sending voice notes -| * 7861af4fc mention voice notes in mic permission request -|/ -* b136c5f74 pull latest translations -* 72168e288 [SSK] faster contact parsing -* 3ca2d0cbe Merge branch 'mkirk/no-signal-accounts' -|\ -| * e2b1cbb15 Don't show "no signal accounts" until contact intersection has completed at least once -|/ -* d2911dfc3 Merge branch 'charlesmchen/voiceMessageMimeTypes' -|\ -| * fc5176819 Work around m4a vs. mp4 issue for voice messages in legacy iOS clients. -|/ -* ab94eaed4 Merge pull request #2118 from WhisperSystems/mkirk/disclosure-icon -|\ -| * cb1c84397 Fix disclosure icon direction on iOS9 -|/ -* 44eed9899 (tag: 2.12.0.2) sync translations -* 285a2f64d bump build 2.12.0.2 -* 20ad9114e [SSK] Reduce time between editing contacts and seeing those changes in the app -* 45339a9f9 Merge branch 'charlesmchen/newNonContactConversationVsBlocking' -|\ -| * c1a1ea7f3 Let users start new 1:1 conversations with blocked non-contacts found by phone number. -|/ -* 8a69edb34 Merge branch 'charlesmchen/keyboardVsVoiceMessages' -|\ -| * 2048b330a Don't hide keyboard when recording a voice message. -|/ -* 14689f025 (tag: 2.12.0.1) Merge branch 'charlesmchen/genericAttachmentsAppearance2' -|\ -| * 00d972db4 Rework appearance of audio and generic attachment messages. -| * b8b2ae10a Rework appearance of generic attachment messages. -| * 2c31a0bdb Rework appearance of audio messages. -|/ -* ea1a1b101 bump build -* a92538ab9 Sync translations -* ef8662907 Merge branch 'mkirk/clearer-settings-heading' -|\ -| * abcc51034 "Conversation Settings" -> "Contact/Group Info" -|/ -* 33dc4d3d8 [SSK] Show Voice Message snippet -* 09f8a20ac [SSK] Revert "Merge branch 'charlesmchen/autoMarkAsRead'" -* 625b1d020 [SSK] Only reply to group info requester & Don’t reply to “request group info” messages from non-members of the group in question. -* da58eb18a partial revert of previous pod update -* 7f2b1c03a Merge branch 'charlesmchen/voiceMessageAppearance2' -|\ -| * 02843958f Rework appearance of audio messages. -|/ -* c27800c12 Merge branch 'charlesmchen/largerAudioWidth' -|\ -| * bcc700781 Respond to CR. -| * e1fba208a Align photo and audio bubble widths. -|/ -* 94210960a Merge branch 'charlesmchen/duplicatesInNewConversationView' -|\ -| * ad9c715bf Deduplicate items in new conversation view and try to show “phone number” results as signal accounts if possible. -|/ -* f3f4514f0 Merge branch 'charlesmchen/ignoreTapsOnOutgoingMessages' -|\ -| * 12e45eaf8 Ignore taps on outgoing messages while they are being sent. -|/ -* 13f4b0ac6 Merge branch 'charlesmchen/contactHelperDelegate' -|\ -| * 1a593e5f3 Respond to CR. -| * 5afe9bca6 Respond to CR. -| * b316e18cf Ensure contact delegate helper is set during initialization. -|/ -* 4814e64c4 Merge branch 'charlesmchen/trimGroupName' -|\ -| * 4a2a3ffa5 Trim whitespace from group names. -| * 782e3d42b Trim whitespace from group names. -|/ -* 8e694d263 Merge branch 'charlesmchen/invalidAudioFiles' -|\ -| * 3e8b4225b Show alert when user tries to play an invalid audio file. -|/ -* 07c39d924 Merge pull request #2105 from WhisperSystems/mkirk/contact-perf -|\ -| * 90de4edee return contact parsing to background thread -* | 4d04ebedf Merge branch 'charlesmchen/keyboardDimissNoContacts' -|\ \ -| |/ -|/| -| * 6ec167e7e Disable scrolling if no contacts in “select recipient” views. -|/ -* 354d46e3f Merge branch 'mkirk/polite-intersection' -|\ -| * 0a7996ffb Perform contact intersection ~every 6 hours even if no contacts changed -| * 9131cd83f update contacts only when changed -|/ -* a67c6cd36 Merge branch 'charlesmchen/voiceMessagesUI' -|\ -| * 67c3bca91 [SSK] Move filename property to TSAttachment. -| * a7cf00feb Respond to CR. -| * 1b99fd1df Respond to CR. -| * 46b6a59d6 Clean up ahead of PR. -| * a15d11c3e Rework appearance of voice messages and audio attachments. -| * ea34cec0d Clean up ahead of PR. -| * 96e155c75 Rework appearance of voice messages and audio attachments. -|/ -* 9f2414b37 Merge branch 'charlesmchen/blockedUsersVsNewGroups' -|\ -| * 0ff3e5e6a Don’t add blocked users to new groups and handle block alert results correctly. -|/ -* 5a69917cf Merge branch 'charlesmchen/textSendVsVoiceMessageButton' -|\ -| * f10d53041 After sending a text message, the "send" button should revert to mic. -|/ -* 7f83c6f16 Merge branch 'charlesmchen/voiceMessageExtraPeriod' -|\ -| * 37278c22d Remove extra period in voice message file names. -|/ -* 722736d26 translation spellcheck =/ -* 8a0ff276c copy tweak -* 8e2493772 Update translations -* cf1010498 (tag: 2.12.0.0) bump version -* d3a96725a fix block scoping. I'm not even sure how this compiled before. -* 755d5dc4e resolve push-token changes from RI of hotfix/2.11.4 -* 929ba0626 Merge branch 'hotfix/2.11.4' into mkirk/fix-push-sync-job -|\ -| * 708690303 (tag: 2.11.4.1, origin/hotfix/2.11.4) bump build -| * 2cffe78c2 Sync push tokens to service after every app upgrade. -| * 73db16e06 (tag: 2.11.4.0) Improve logging around push token sync. -| * 5a7ed605e Bump version number. -* | 82503db38 sync translations -* | 78b52b691 Merge branch 'charlesmchen/examplePhoneNumbers' -|\ \ -| * | c7777bcb1 [SSK] Show example phone numbers. -| * | 73f79f05e Format example phone numbers. -| * | c81eed74c Show example phone numbers. -|/ / -* | 23558ea87 Merge branch 'charlesmchen/phoneNumberParsing' -|\ \ -| * | 0bab5ed40 Always honor filtering in contact-related views. -|/ / -* | fdbc1663f Merge branch 'charlesmchen/disappearingMessages' -|\ \ -| * | 033ce90dd Respond to CR. -| * | eabda5ad9 Clean up ahead of PR. -| * | 19b80d1f4 Rework the “disappearing messages” logic. -|/ / -* | 0adcd157d [SSK] Don’t ignore “unnamed” phone numbers. -* | eb385f1e9 [SSK] Rework the “disappearing messages” logic. -* | 8fae185ab Merge branch 'mkirk/more-call-logging' -|\ \ -| * | 7bdd73287 remove contact name from production log -| * | 20fc733bd Clearer call logging -|/ / -* | a25573cf2 Merge branch 'mkirk/edit-1-1-contact' -|\ \ -| * | 737a5932c tapping contact label shows contact edit view -| * | bd343f697 clean up some animations -| * | aabd56b23 Clean up comments per CR -| * | 9dc9813de fix layout for long named contacts -| * | 3754b6f26 Edit 1:1 contact details -|/ / -* | 8871331cf [SPK] Update license. -* | 387f1018f [SSK] Auto-rejoin groups by emitting and responding to “request group info” messages. -* | d2ef3c38c Merge branch 'charlesmchen/fixScreenProtection' -|\ \ -| * | b2fba060d Fix edge case where screen protection is not removed. -|/ / -* | e295f9294 [SSK] Safer SignedPreKey deletion policy -* | a4b26dda0 Merge branch 'mkirk/contact-editing' -|\ \ -| * | e95b579d9 TODONE -| * | 41deab12d Fix “two table views” bug in “show group members” view. -| * | 073c0d663 Add/Edit contacts in group list -|/ / -* | 279439843 Merge pull request #2089 from WhisperSystems/mkirk/no-name-contacts -|\ \ -| * | 8411d13ef show number for no-name contacts -|/ / -* | bfc4ff6f0 Merge branch 'mkirk/missing-contacts-compose' -|\ \ -| * | 3040c4a34 include missing return -| * | fee47efbe Avoid repaint by requestng contacts before Compose -| * | dc75e592c ensure contact callback on proper thread -| * | 64bcc9458 Instead of alert we're providing in context reminders - no need for these TODOs -| * | 04878bf22 rename method to better reflect new role -| * | 03727a27f compose w/o contact access -> "..by phone number" -| * | 0b6962cdd contacts reminder in compose view -| * | bf5b6d1e6 Invite Flow when "no contact" -| * | 40dead89e don't crash invite flow when contacts disabled -|/ / -* | 94ec38dd0 Merge branch 'charlesmchen/flagVoiceMessages' -|\ \ -| * | d535ce315 [SSK] Flag voice messages as such in protos. -| * | e85aa045e Flag voice messages as such in protos. -|/ / -* | 714b35277 Merge branch 'charlesmchen/clearMessageDrafts' -|\ \ -| * | 29dd62a19 Always clear message drafts after sending a text message. -|/ / -* | 50b1f420b Merge branch 'charlesmchen/attachmentMimeTypes' -|\ \ -| * | 560122067 [SSK] Prefer to deduce the MIME type from the file extension using lookup, not the UTI type. [SSK] Try to deduce attachment MIME type from the file extension if possible. -| * | 4506064aa Prefer to determine an attachment’s file extension for its file name if possible. -| * | 0137e01af Try to deduce attachment MIME type from the file extension if possible. -|/ / -* | 18498eeda Merge branch 'charlesmchen/syncPushTokensOnLaunch' -|\ \ -| * | 2f3831e04 Respond to CR. -| * | dd3d63623 Pull logging into SyncPushTokensJob. -| * | 716aa772f Always sync and log push tokens. Apply OWSAlerts in more places. -|/ / -* | d0e68a825 Merge branch 'charlesmchen/logPushTokensJob' -|\ \ -| * | aba29ac5c Improve logging around SyncPushTokensJob. -|/ / -* | ad3a1a671 Merge remote-tracking branch 'origin/hotfix/2.11.3' -|\ \ -| |/ -| * 41d911c04 (tag: 2.11.3.0, origin/hotfix/2.11.3) pull latest translations -| * 66fe80d77 Merge pull request #2068 from WhisperSystems/mkirk/call-audit -| |\ -| | * 6beee7c01 verify peerconnection at proper time -| | * 2ec893d31 Ensure we're retaining all promises to completion -| |/ -| * dd3d33896 Bump version. -| * 11a3d76ef Merge remote-tracking branch 'origin/charlesmchen/mutingVsConnected' into hotfix/2.11.3 -| |\ -| | * e36c3aaed Reconcile audio and video enabling with call state. -| |/ -* | 6a4a08d3e Merge branch 'charlesmchen/voiceMemos' -|\ \ -| * | b47337c0b Respond to CR. -| * | 34a7f9cba Respond to CR. -| * | b21e5c324 Respond to CR. -| * | 7f92b5a96 Respond to CR. -| * | 7a37de28e Clean up ahead of PR. -| * | bf6d8ec14 Clean up ahead of PR. -| * | 8ecdc8a2e Move voice memo button to send button. -| * | c34d61b93 Add cancel-by-swipe of voice memo recording. -| * | 608cb70a3 Add voice memo recording. -| * | 45c8695ab Sketch out the voice memo UI. -|/ / -* | be504a7e4 Merge branch 'mkirk/missing-contacts-inbox' -|\ \ -| * | fbcda4040 rename class, extract color -| * | a58a71f8f no contacts banner -> system settings -|/ / -* | f76bb8397 Merge branch 'charlesmchen/searchVsNonSignalContacts' -|\ \ -| * | 9f4b8d3b0 Slightly reduce the non-contact cell heights in “new 1:1 conversation” view. -| * | d0e26a58c Show “invite by SMS” offer for matching non-Signal contacts when searching in “new 1:1: conversation” view. -|/ / -* | 791b0d78a Merge branch 'charlesmchen/conversationSettingsAssert' -|\ \ -| * | 1e6fd385b Fix assert in conversation settings view. -|/ / -* | c7d25a66a Merge branch 'charlesmchen/contactParsingPerf' -|\ \ -| * | 3f7d23e04 Fix two hotspots in contact parsing and contact syncing. -|/ / -* | bbf099894 [SSK] Fix a hotspot in the phone number parsing logic. -* | 3671b3aeb Merge branch 'charlesmchen/multipleAccounts' -|\ \ -| * | 057bb76e6 [SSK] Rework handling of phone number names. -| * | 535fc566a Rework handling of phone number names. -|/ / -* | 4032f40a3 Merge branch 'charlesmchen/contactsSync' -|\ \ -| * | 0c4351a90 Use SignalAccount class to sync contacts. -|/ / -* | dd95b13d3 Merge branch 'mkirk/compiler-warnings' -|\ \ -| * | 835ab3dd9 [SSK] fix some compiler warnings -| * | d7c7fff67 Fix some compiler warnings -| * | ce2ee759f Update to latest recommended xcode.proj settings -|/ / -* | fb4ee8ffb Merge branch 'charlesmchen/newConversationView' -|\ \ -| * | 45ae8fb06 Respond to CR. -| * | 2bc1d44cd Respond to CR. -| * | 1b99671e0 Clean up ahead of PR. -| * | 325134c6e Clean up ahead of PR. -| * | 363d84fd2 Update “new conversation” view to use OWSTableView, contacts view helper, etc. -|/ / -* | 4b9ee2dcf Merge branch 'charlesmchen/orderedWebRTCDataChannel' -|\ \ -| * | dcdfcb0a6 Insist upon an "ordered" TCP data channel for delivery reliability. -|/ / -* | 1444cfc63 Merge remote-tracking branch 'origin/hotfix/2.11.2' -|\ \ -| |/ -| * fb7a9e39a (tag: 2.11.2.1, origin/hotfix/2.11.2) bump build -| * ee7adca03 Merge branch 'hotfix/display-text-crash' into hotfix/2.11.2 -| |\ -| | * 2f05dcc2c fix crash when viewing undisplayable text -| |/ -| * 572c1e3d8 (tag: 2.11.2.0) pull latest translations -| * b5b4eb456 bump build -| * 836f6bb67 Merge pull request #2061 from WhisperSystems/charlesmchen/speakerPhoneVsWebRTC -| |\ -| | * 0f85284b8 Fix speakerphone vs. WebRTC AND Fix CallService edge cases. -| |/ -| * 1b66e0ba2 Fix crash when placing call -* | 83a089f42 [SSK] better sender logs -* | a794fe835 Merge branch 'mkirk/delay-contact-access' -|\ \ -| * | a056c1e05 Check for signalContact vs. AB setup. -| * | 364f416a6 Block editing contact if user has denied contact permissions -| * | b24cf2918 don't request contacts until necessary -|/ / -* | 931b6b420 [SSK] Minor cleanup. -* | 563ccf671 [SSK] Temporary change to improve read receipt logging. -* | b801b2cfe Merge branch 'charlesmchen/audioPlayer3' -|\ \ -| * | 33415eaa0 Respond to CR. -| * | ae7934c11 Update appearance of audio and generic attachment adapters. -| * | c2cdeb3bc Remove SCWaveformView. -| * | 800715a5e Remove waveform from audio message bubbles. -|/ / -* | 61523a14a Merge branch 'mkirk/contact-fixups' -|\ \ -| * | 93801e8d2 only show count when there is more than 1 of the same type -| * | 4b6bfa4c4 "home", "other" and "work" instead of "Unknown" phone label -|/ / -* | c7931aa2c Merge branch 'charlesmchen/contactsDatabaseDeadlock' -|\ \ -| * | 147107d76 Fix database deadlock in contacts manager. -|/ / -* | 5b9978b07 Merge branch 'charlesmchen/groupAvatarScaling' -|\ \ -| * | 4bc98dba5 Rework the scaling and cropping of group avatars. -|/ / -* | cb293f286 [SSK] Add SignalAccount class, Extract labels for phone numbers. -* | 97010c590 Merge branch 'charlesmchen/groupsVsNonContacts_' -|\ \ -| * | 8eef4c634 Respond to CR. -| * | 26f69b006 Respond to CR. -| * | f71ec9f7c Respond to CR. -| * | 2bec1db54 Respond to CR. -| * | ad11c50c1 Reworking observation of Contact and SignalAccount changes. -| * | 994aec0d8 Add SignalAccount class. -| * | 6801963a1 Add SignalAccount class. -| * | 93700f104 Extract labels for phone numbers. -| * | 42768294e Extract labels for phone numbers. -| * | cb9d96be0 Clean up ahead of PR. -| * | da7dd1b12 Clean up debug scaffolding. -| * | f5cd39ea3 Apply ContactsViewHelper to SelectThreadViewController. -| * | 61f59067b Improve contact-related views. -|/ / -* | 8a2f1e3ee Merge branch 'mkirk/remove-overzealous-assert' -|\ \ -| * | a1eef6fde Remove invalid assert in case of legitimately stacking unicode -|/ / -* | c6d253d90 Merge branch 'mkirk/fix-init-call-crash' -|\ \ -| * | faa797c74 Fix crash when placing call -|/ / -* | d7352fa84 Merge branch 'charlesmchen/callServiceCautiousUnwrap' -|\ \ -| * | d06f358a2 Don't unwrap with ! in CallService. -|/ / -* | a68d76168 Merge branch 'charlesmchen/cameraVsAttachmentApproval' -|\ \ -| * | 6ae3a5395 Skip attachment approval dialog for image and video shot by camera. -|/ / -* | 700bd6e08 Fix build, remove unnecessary return -* | 27e55d290 Merge branch 'mkirk/crashing-call-service' -|\ \ -| * | 3a0f84cf3 Avoid crash in CallService -|/ / -* | e1162fa64 [SSK] Better debugging information -|/ -* b9a56fe81 (tag: 2.11.1.5) bump build -* d68c5c249 sync translations -* 79a2a7b67 Merge branch 'mkirk/fix-contact-refresh-backoff' -|\ -| * 94b95367f Actually *use* the delay time to enqueu the retry -|/ -* bff1fedaf Merge branch 'mkirk/unregistered_user' -|\ -| * adbc6eb71 style cleanup -| * 4d5d80867 Ensure push token update job runs to completion -|/ -* 549b7d5a9 (tag: 2.11.1.4) bump build -* d408fab7b Sync translations -* 4fe9931a0 Merge branch 'mkirk/import-arbitrary-files' -|\ -| * 48971478d Allow importing of any file that's not a directory -| * 30b12083f Merge branch 'charlesmchen/ongoingCallVsOpenWithSignal' -| |\ -| | * 1b61c3b0c (origin/mkirk/ongoingCallVsOpenWithSignal) fix attachment-import error alert presentation -| | * 2cc3232c0 Fix presentation of “open with Signal” errors. -| | * c08e6e0fc Ignore “open with Signal” if there is an ongoing call. -| |/ -| * c4e90089d Merge branch 'charlesmchen/exportWithSignalErrors' -| |\ -|/ / -| * 782140d36 Respond to CR. -| * 791fee347 Improve errors in the 'export with Signal' feature. -|/ -* b66c0df7f Merge branch 'charlesmchen/exportWithSignalTweaks' -|\ -| * 89c5f93aa Tweak appearance of "export with Signal" UI. -|/ -* 7901b6e68 (tag: 2.11.1.3) sync translations -* 9964e9cb2 bump build -* dcb237bf3 must include name for file types -* d0ff13c51 (tag: 2.11.1.2) sync translations -* 4acdddf1d bump build -* 14f956f3b Merge branch 'mkirk/support-random-extensions' -|\ -| * 822f5c841 support sending all files -| * 93fe12232 display error if user picks directory/bundle e.g. .pxm -|/ -* babe024ea Merge branch 'mkirk/truncate-filenames-in-preview' -|\ -| * 1d9144167 truncate really long file names in the middle -|/ -* 8c1c38b30 Merge branch 'charlesmchen/bundleDocumentTypes' -|\ -| * 8a8b10b68 Respond to CR. -| * d081df9de Respond to CR. -| * c84da982a Respond to CR. -| * 93eed7353 Respond to CR. -| * 5c0c9b533 Respond to CR. -| * e75ed5e47 Respond to CR. -| * 6e36ce97a Let users share imported files to a thread or contact of their choice. -| * 3c7574a90 Register Signal to handle a wide variety of common document types. -|/ -* 54c1a38d5 Merge branch 'charlesmchen/genericAttachmentAppearance' -|\ -| * 788ec4ce0 Respond to CR. -| * d42588b95 Improve appearance of generic attachments and the attachment approval dialog. -|/ -* 7f1019af6 (tag: 2.11.1.1) bump build -* 0197e1d23 Merge branch 'mkirk/limit-document-size' -|\ -| * 66e858a35 Validate all picked attachments/ show preview -| * 4d15fbf2d cherry-pick (rebased) charlesmchen/stressTesting/Signal/src/ViewControllers/SignalAttachment.swift -|/ -* fe6ea0d91 (tag: 2.11.1.0) Merge pull request #2031 from WhisperSystems/mkirk/default-filenames -|\ -| * 203009d4e fix compiler warning / idiomatic optional unwrapping -| * 26b94bf94 Always send a filename -|/ -* 1aa8e35f5 sync translations -* 20a9fa602 bump version -* 0ccc1a69b Merge branch 'mkirk/fix-downloading-group-attachments-view' -|\ -| * 077038b6c Fix squashed "downloading" bubbles in groups -|/ -* 6672886ed Merge branch 'charlesmchen/navigationBarAppearance' -|\ -| * b99984f9d Fix the “message view subtitle mis-sized after muting” issue. -| * 89de68680 Fix the “navigation titles are black after sharing” issue. -|/ -* 444018341 translation comment for "group name" field -* 0cd71b3b2 (tag: 2.11.0.3) sync latest translations -* 0386e8cff bump build -* a05fc7ac9 Merge branch 'mkirk/crop-mask-around-attachments' -|\ -| * 1d65d6dc4 clip upload mask to bounds of generic file bubble -|/ -* b5b6f060c Merge branch 'charlesmchen/editMenuConflicts2' -|\ -| * a0a930aac Resolve the menu item conflicts between message view and media view. -|/ -* b5a2c1752 Merge branch 'charlesmchen/attachmentActionSheetIcons' -|\ -| * 866493c8e Add icons to attachment action sheet. -|/ -* 718109bca Merge branch 'mkirk/doc-picker-fixups' -|\ -| * ea7c74316 capitalize *all* letters of file extension -| * 474a6d325 document picker uses approval dialog -|/ -* 42dcb7fa8 Merge branch 'charlesmchen/editGroupShortcut' -|\ -| * 1acb2d749 Respond to CR. -| * 9779527cf Let users edit group name and avatar by tapping on them in group settings view. -|/ -* 8e332395d Merge branch 'charlesmchen/editMenuConflicts' -|\ -| * 5cbbf5005 Respond to CR. -| * a59f49cea Resolve the menu item conflicts between message view and media view. -|/ -* ea3e6d48f Merge branch 'charlesmchen/crashVsMediaMethod' -|\ -| * 62e6c9a12 Fix crash unsafely accessing optional media method. -|/ -* ba3f964d5 Merge branch 'charlesmchen/onlyLastCellClearsAdapterViews' -|\ -| * 210802994 Respond to CR. -| * 03a97cdd7 Only the last cell associated with a media adapter should clear its views. -|/ -* 50b65f051 Merge branch 'charlesmchen/stretchedImages' -|\ -| * ef92d5e3b Fix distorted images in messages view. -| * 226dffff7 Fix distorted images in messages view. -|/ -* 8bf4cb83a [SSK] Improve handling of whitespace in contacts. -* 16cde883f Merge branch 'charlesmchen/increaseLocalNotificationDelay' -|\ -| * 552eecfd0 Increase local notification delay. -|/ -* 0331244b5 (tag: 2.11.0.2) bump version -* b2e597219 Sync translations -* b6a30cb7f Merge branch 'mkirk/document-picker' -|\ -| * 70d235a67 Choose arbitrary attachments from iCloud/GDrive/Dropbox/etc -|/ -* b1ea340c3 Callscreen fills buttons to show active state -* 4468b465d Merge branch 'charlesmchen/timerRetainCycle' -|\ -| * a4709c921 Respond to CR. -| * eb23252c6 Fix timer retain cycle. -|/ -* d248f6117 [SSK] Ignore oversize messages. -* 52ab0df3f Merge branch 'charlesmchen/audioPlayer2' -|\ -| * 4b2bdd9b5 Use audio attachment player in attachment preview dialog. -| * 041badd29 Decouple the audio attachment player from the video attachment adapter. -|/ -* 13f408908 Merge branch 'charlesmchen/audioPlayer' -|\ -| * b90b71351 Respond to CR. -| * 980d726a4 Add audio attachment player. -|/ -* 61d72f8e9 (tag: 2.11.0.1) bump build -* b3fc16b0b [SSK] handle synced reset-session messages -* 5c39d623a tweaked copy per @RiseT -* 0ff24d18a (tag: 2.11.0.0) bump version -* ed0d3a03a sync translations -* 5bbcc23da [SSK] Do not retry fatal message send errors. -* d9e3e8773 New downloading progress view (#2006) -* 67e94e2b5 [SSK] Do not try to resend unsaved outgoing messages when accepting a safety number change. -* 218e65de3 Merge branch 'charlesmchen/showMuteStatusInHomeView' -|\ -| * 2b09033dd Show mute status in home view. -|/ -* d02c3e278 Merge branch 'charlesmchen/fixMuteUntilDateFormat' -|\ -| * b2dd458f1 Fix “muted until” date format. -|/ -* 0603ab72d Merge branch 'charlesmchen/pauseMediaAdapters' -|\ -| * d65e39845 Respond to CR. -| * b2664158b Pause animated gifs when offscreen; clean up media views more aggressively. -|/ -* 4045d3bda Merge branch 'charlesmchen/improveGroupMembersView' -|\ -| * ee765df4b Respond to CR. -| * e36b5a460 Improve group members view. -|/ -* 9f3e5561f Merge branch 'charlesmchen/fixConversationSettingsSegues' -|\ -| * 06f9affc0 Fix segues in conversation settings view. -|/ -* c81206ca7 Merge branch 'charlesmchen/syncContactsEagerly' -|\ -| * a29809e67 Respond to CR. -| * bfd29cd99 Send contacts sync messages whenever the contacts change. -|/ -* bd261f16c Merge branch 'charlesmchen/fixPasteText' -|\ -| * 2a9ac8756 Fix paste of text. -|/ -* 4451a3a41 Merge branch 'charlesmchen/callServiceEdgeCases' -|\ -| * 791dba924 Respond to CR. -| * 3368659d8 Improve handling of call service edge cases. -| * b4464f91a Improve handling of call service edge cases. -| * 3c4955840 Improve handling of call service edge cases. -| * f920300f2 Improve handling of call service edge cases. -|/ -* 603d51473 Merge branch 'charlesmchen/muteThreads' -|\ -| * 3c8635c35 [SSK] Add muting of threads. -| * 499c8d0bc Add muting of threads. -| * d968c899b Add muting of threads. -| * 2ca122f57 Add muting of threads. -| * 2c286c8b5 Add muting of threads. -| * c8466912f Add muting of threads. -|/ -* ea848f31e [SSK] Fix outgoing message status for messages sent from linked devices. -* b54508bb2 when generating strings verify that SSK is on master -* 20ea6b8d3 Merge branch 'charlesmchen/justOnceContactStore' -|\ -| * 3ccee7ffd Don’t load contact store twice. -|/ -* 5713a0e30 Merge branch 'charlesmchen/fixCalling' -|\ -| * 1fa037527 Fix calling by using actual session descriptions. -|/ -* f0727b541 Merge branch 'charlesmchen/outgoingMessageState' -|\ -| * dd807f676 [SSK] Rework outgoing message state & refine error handling for outgoing group messages. -| * d61407379 Respond to CR. -| * e025b86e7 Rework outgoing message state. -| * cc766bcc5 Rework outgoing message state. -| * 66d1a3785 Rework outgoing message state. -|/ -* 2c46220eb Merge branch 'charlesmchen/notificationsVsConcurrency' -|\ -| * 3e5360500 Improve thread safety in PushManager and NotificationsManager. -|/ -* dca3fa500 Merge branch 'charlesmchen/lostMessages' -|\ -| * f41762c31 [SSK] Avoid lost messages. -| * 1558d8c6c Avoid lost messages by acknowledges message receipt after the message is processed. -|/ -* f9b51c01f [SSK] De-bounce the prekey checks. -* fa5bb7ad9 Make it easier to track local users registration ID in debug log -* 074372278 [SSK] ensure accepted SPKs are marked -* d911b6a99 Merge branch 'call-permissions' -|\ -| * da8596c1b Check microphone permissions: Clean up -| * 70efb5e9e Check microphone permissions before starting a call -|/ -* 528b7296d Merge branch 'charlesmchen/hardwareRingerVsPlayback' -|\ -| * 5c20a8597 Respond to CR. -| * bf9ae552a Ignore hardware mute switch during video playback in attachment approval view. -| * d9ef27d80 Ignore hardware mute switch during video playback in messages view. -|/ -* 1cf45a26d Merge remote-tracking branch 'origin/hotfix/2.10.1' -|\ -| * 2f28441a5 (tag: 2.10.1.2, origin/hotfix/2.10.1) bump build -| * 99c218f2d [SSK] Fix file extensions for arbitrary file types. -| * eb3526b52 (tag: 2.10.1.1) bump build -| * 622a757ec Merge branch 'charlesmchen/fixAudioPlayback' into hotfix/2.10.1 -| |\ -| | * 847a61064 [SSK] Fix audio playback. -| | * 79a2612db Fix audio playback. -| | * 8458fb69a Fix audio playback. -| |/ -| * 99f49dfff (tag: 2.10.1.0) Pull latest translations -| * 4788d0b14 [SSK] Don't mark messages as failed prematurely -| * 207b29e7f bump version -* | 3e7ecf335 Merge branch 'charlesmchen/honorAttachmentFilenames' -|\ \ -| * | 9c6f76253 [SSK] Honor attachment filenames. -| * | 193d9421c Respond to CR. -| * | 0018d0040 Honor attachment filenames. -| * | dd3250a9e Honor attachment filenames. -|/ / -* | aab897abb Merge branch 'feature/contactsIntersectionAudit' -|\ \ -| * | dc3a382c2 Respond to CR. -| * | 2e653afff Reduce usage of contacts intersection endpoint. -| * | 2ede3f334 Reduce usage of contacts intersection endpoint. -| * | 5b4e3a242 Reduce usage of contacts intersection endpoint. -|/ / -* | f38f3d888 [SSK] Update SignalAttachment to allow arbitrary attachments. -* | c1f2ae61b Merge branch 'charlesmchen/arbitraryAttachments' -|\ \ -| * | 70ac0acc6 Respond to CR. -| * | 54d2d85eb Update SignalAttachment to allow arbitrary attachments. -|/ / -* | 72eb63287 Merge branch 'charlesmchen/sendOversizeTextMessages' -|\ \ -| * | da13506db Respond to CR. -| * | db7cb8d38 Send oversize text messages as attachments. -|/ / -* | 9882eeea9 Merge branch 'charlesmchen/improveAttachmentApprovalView' -|\ \ -| * | ebde76916 Respond to CR. -| * | 7f5847d2d Improve file size formatting in attachment approval dialog. -| * | de735dcf3 Add stubs for audio preview to attachment approval dialog. -| * | fc33b0083 Add animated image preview to attachment approval dialog. -| * | 5d79f4397 Add video preview to attachment approval dialog. -|/ / -* | 4d091b470 Merge branch 'charlesmchen/socketLifecycle' -|\ \ -| * | 33593921f [SSK] Rework socket manager. -| * | 625a44890 Respond to CR. -| * | effa88561 Rework socket manager. -|/ / -* | 195d721aa Merge branch 'charlesmchen/homeViewBlockIndicator' -|\ \ -| * | 267462c58 Show block indicator in home view. -|/ / -* | 1d9de0942 [SSK] Make sure we can return multiple recipients matches -* | 1e47f14bd Merge branch 'mkirk/update-linter-script' -|\ \ -| * | 4149cba6d use updated localizable strings linter -|/ / -* | 88d99b7ad Merge branch 'mkirk/fix-edit-menu-positioning' -|\ \ -| * | 5d604a796 [JSQMVC] Fixes "floating" edit menu for narrow media items -|/ / -* | bf02bd2cc Merge branch 'charlesmchen/deferNotifications' -|\ \ -| * | 2a369273c Respond to CR. -| * | b7b5dbb56 Do not present local notifications if a read receipt arrives immediately after. -|/ / -* | 0115eb847 Merge branch 'charlesmchen/blockOffer' -|\ \ -| * | 1d2e5d218 [SSK] Create block offer when non-contacts send you a message. -| * | 55706e9bb Respond to CR. -| * | 878704cb1 Create block offer when non-contacts send you a message. -|/ / -* | f6baf1f51 Merge branch 'charlesmchen/approveAllAttachments' -|\ \ -| * | c2e94f57e Respond to CR. -| * | 660e4dd4c Show attachment approval dialog for all attachments. -|/ / -* | 255b3023f Merge branch 'charlesmchen/messageViewGlitches2' -|\ \ -| * | 5bc5e0015 Add debug UI action to send 1,000 messages so we can “load test” message view’s perf. -| * | 1ac487835 Reload data and invalidate layout whenever message view returns from background. -|/ / -* | 5af43580b Merge branch 'charlesmchen/license' -|\ \ -| * | 25d97a130 Update license. -|/ / -* | 21f5bc2fc Merge branch 'charlesmchen/editMenuVsAttachmentUpload' -|\ \ -| * | 435a42bb3 Hide the edit menu for attachment until they are uploaded. -|/ / -* | f36316c60 Merge branch 'charlesmchen/blockWarningMessages' -|\ \ -| * | 0a8c9e562 Respond to CR. -| * | 4e3fbac10 Add explanation messages to the “block user alert” and the block section of the 1:1 conversation settings view. -|/ / -* | 61c865a78 Merge branch 'charlesmchen/preserveScrolledToBottom' -|\ \ -| * | f503d7f93 Stay scrolled to the bottom during in conversation view during updates. -|/ / -* | 6bc979cbc Merge branch 'charlesmchen/refineUploadIndicator' -|\ \ -| * | ec129ea21 (origin/charlesmchen/refineUploadIndicator) Improve attachment upload progress indicator. -|/ / -* | 8490be6ed [SSK] Remove the properties related to Redphone and WebRTC support. -* | 2fd8a13a3 [SSK] Improve attachment upload progress indicator. -* | 37d408cc7 Merge branch 'mkirk/fix-share' -|\ \ -| * | 032cf0d95 sharing via message view is legible -| * | 811a4ac4b add some missing asserts -|/ / -* | 2a7a4aa34 Merge branch 'mkirk/clarify-verification' -|\ \ -| * | ca768d071 repeat phone number in header, next to back button -| * | fb53a3258 clarify what to do on the verification screen -|/ / -* | 4a128e69a Merge branch 'mkirk/sync-unread-count' -|\ \ -| * | 91fc6b4d0 Stretch to fit wider message counts -| * | 9bd2ff057 Don't repaint back-button unread badge -|/ / -* | 6b0eb7f9b Use numeric pad for verifiation code entry -* | 7fb8b493f bail on scripts whenever an error is encountered -* | dfd4ff5d2 Merge branch 'charlesmchen/messageViewGlitches' -|\ \ -| |/ -|/| -| * 6fde2852b Respond to CR. -| * dc78e32bb Reload data and invalidate layout whenever message view will appear. -|/ -* 0039f4b69 (tag: 2.10.0.3) sync translations -* 1849c8531 bump build -* 2af89c9a2 [SSK][SPK] only assert dispatch in DEBUG -* a93aad512 Respond to CR. -* a15e8b2d9 Merge branch 'charlesmchen/cantBlockSelf' -|\ -| * 4cd1684de Don’t let user block themselves. -| * 372d6b9bf Don’t let user block themselves. -|/ -* df58a0133 Revert "Fix i18n key." -* e3fb0c598 Merge branch 'charlesmchen/multipleItemsInPasteboard' -|\ -| * 1ab441768 Fix paste when pasteboard has multiple items. -|/ -* d3bcc4e4d Merge branch 'charlesmchen/roundAvatarIcons' -|\ -| * 27aeb425e Round avatar icons. -|/ -* 7fb795491 Merge branch 'charlesmchen/fingerprintViewVsKeyboard' -|\ -| * 3ac1e75b5 Ensure keyboard doesn't hide "safety numbers changed" interaction. -|/ -* 0bc8a0f37 Merge branch 'charlesmchen/reformatPhoneNumberVsCountryCodeChange' -|\ -| * 5feca4282 Reformat phone number if user changes country code. -|/ -* df381cf4b Merge branch 'mkirk/session-cleanup' -|\ -| * 6ba5e5cc6 Clean up session-reset logging -|/ -* 0ba81588e Fix i18n key. -* 8c5ceffe1 (tag: 2.10.0.2) sync translations -* 24adac289 bump version -* e8056fcbb Merge branch 'mkirk/fix-session-reset' -|\ -| * d8ae94173 Delete session *before* sending EndSession message -| * 9d0c76ca5 debug action to reset session -| * 033591aec Remove unused code -|/ -* acad91ebc Merge branch 'mkirk/session-corruption' -|\ -| * 87845525b [SSK] serialize all read/write to sessionStore -| * caabae002 Add new debug method to delete session -| * 398ee22f5 [SSK] rename cipher queue to sessionStoreQueue -| * a951d11d9 [SSK] move iOSVersion to SSK -|/ -* 80696e257 Merge branch 'charlesmchen/newConversationScrollVsKeyboard' -|\ -| * 554125aee Dismiss keyboard if user scrolls in “new 1:1 conversation” view. -|/ -* dc174ad6f Merge branch 'charlesmchen/blocking10' -|\ -| * cc16b9c89 CR nit: add assert -| * 19d8f6cf0 Improvements around contact cells. -|/ -* ff6f38346 Merge branch 'charlesmchen/fixTableAssert' -|\ -| * 74820d9ba Respond to CR. -| * a1bd2f66f Fix invalid assert in the OWS table views. -|/ -* c597bacdc Merge branch 'charlesmchen/blocking9' -|\ -| * fd86495e2 Respond to CR. -| * 8823b2884 Refine the “block list” view. -| * b5562fa12 Update “new 1:1 conversation” view. -| * 8867b2882 Tweak appearance of contact cell. -| * b6f944f3d Tweak appearance of “add to block list” view. -|/ -* 42b6ac671 (tag: 2.10.0.1) bump build -* 300251171 Sync translations -* c36bb7203 Merge branch 'mkirk/copy-updates' -|\ -| * 4494a95a6 Block list is two words. Update code/comments/constants -|/ -* e94cc1826 Merge branch 'mkirk/blocking8' -|\ -| * 78705d3ac right align blocked indicator -|/ -* 1a73b439d Merge remote-tracking branch 'origin/charlesmchen/blocking8' -|\ -| * e0c7457ec Refine appearance of “add to block list” view. -| * b3d6a82c4 Show blocked users in “add to block list” view. -|/ -* 4349f00cd Merge branch 'charlesmchen/blocking6' -|\ -| * f56227ce2 Respond to CR. -| * af6e51f83 Make local copy of contact list. -| * 54e6d4400 Multiple improvements around contacts and the blocklist. -|/ -* 68d2ea2fd Merge branch 'charlesmchen/blocking7' -|\ -| * 7273e6faa Respond to CR. -| * 99a1b4e9f Revert unintended l10n changes. -| * 7f21a1bf6 Dismiss “block state indicator” if user scrolls message view. -| * c500e7890 Improve completion handling of block actions. -| * 9c9060203 Block actions in message view for blocked group conversations. -| * 8c347699b Block actions in message view for blocked contact conversations. -|/ -* f46080519 [SSK] Don't retry terminal sending failures -* 353751826 [SSK] Don’t block outgoing group messages. -* d640aaa9d Merge branch 'charlesmchen/blocking5' -|\ -| * 71007cc3d Respond to CR. -| * 253776d65 Respond to CR. -| * dcb7eef3f Respond to CR. -| * 54cd8cfa3 Add blacklist controls to 1:1 conversation view. -|/ -* 80ddc1a2c (tag: 2.10.0.0) sync translations -* 127e7f738 bump release target -* d001a5b51 Merge branch 'charlesmchen/blocking3' -|\ -| * 5fa1a3630 Respond to CR. -| * 8dadc3ba2 Don’t update contacts in the blacklist views. -| * 6c1d46c4d Use contact names where possible in the block list view. -| * a7296db1f Add contacts list to “add blocked number” view. -|/ -* d84f052b2 Merge branch 'charlesmchen/blocking4' -|\ -| * 5a234e34d Filter incoming and outgoing messages using the blacklist. -|/ -* 06ad8733b Merge branch 'charlesmchen/blocking2' -|\ -| * 2e0c95c37 Respond to CR. -| * db3145432 Respond to CR. -| * 89e244ee0 Update to reflect changes to SSK. -| * 8578390ee Clean up blocklist views. -| * 922d48904 Refine BlockListViewController and AddToBlockListViewController. -| * 271cc6f07 Sketch out BlockListViewController and AddToBlockListViewController. -| * a155df161 Pull out OWSTableViewController. -|/ -* 176c1f872 Merge branch 'hotfix/2.9.2' -|\ -| * 1a25367b0 (tag: 2.9.2.1, origin/hotfix/2.9.2) bump version -| * 0a806f499 (tag: 2.9.2.0) Fix crash when viewing changed safety numbers -* | eb68746b6 Merge branch 'charlesmchen/singletonAssert' -|\ \ -| * | f604cfb55 Apply assert to ensure singletons are only created once & filter incoming messages using the blacklist. -| * | 5ff454fd9 Fix double creation of NotificationsManager singleton. -| * | 8374ca149 Apply assert to ensure singletons are only created once. -| * | d00c89215 Apply assert to ensure singletons are only created once. -|/ / -* | afcb08c10 Merge branch 'mkirk/crashing-fingerprint' -|\ \ -| * | 9eb746a7a Fix crash when viewing changed safety numbers -|/ / -* | e82800154 Merge branch 'mkirk/debug-stores' -|\ \ -| * | d2732751a New debug action: print sessions -|/ / -* | febc04ca4 Merge branch 'charlesmchen/registrationViewCallingCode' -|\ \ -| * | 7306803ae Add explicit calling code state to registration view. -|/ / -* | 715399492 [SSK] [SPK] Update SignalProtocolKit and SignalServiceKit -* | 3ed4c4856 Merge branch 'charlesmchen/spacesInPaths' -|\ \ -| * | d12a582ee Rename source directories with a space in their name. -|/ / -* | 3d6c153ca Merge branch 'mkirk/enforce-singleton' -|\ \ -| * | 7f239c804 [SSK] + Enforce singleton access for MessagesManager and MessageSender -|/ / -* | eaf7b6503 Merge branch 'charlesmchen/maxGifSize25mb' -|\ \ -| * | 7058a58d2 Bump maximum animated GIF file size to 25mb. -|/ / -* | 4c0242ee1 [spk] Update SignalProtocolKit -* | 5138539d9 [SSK] Fix sharing of oversize text messages. -* | 9af19645e Merge pull request #1913 from WhisperSystems/mkirk/remove-redphone -|\ \ -| * | 0b4903717 Remove some more RP related code -|/ / -* | 3765d28da Respond to CR. -* | 2f40e3734 Merge branch 'charlesmchen/oversizeTextMessageView' -|\ \ -| * | 4649fcfd2 Add "oversize test message" view. -|/ / -* | 7ff98a0d8 Merge branch 'charlesmchen/countryCodeViewVsKeyboard' -|\ \ -| * | 5a2d4ce62 Hide keyboard when scrolling in country code view. -|/ / -* | 2e49b77f6 Merge branch 'charlesmchen/imageViewVsShare' -|\ \ -| * | a9f2382e8 Change alignment of image view’s share button. -| * | bc2e292a6 Add share button to image view. -|/ / -* | f682ebbbc Merge branch 'charlesmchen/arbitraryAttachments2' -|\ \ -| * | d85dfb8a4 Improve support for arbitrary attachments. -|/ / -* | 306895ea6 [SSK] Improve support for arbitrary attachments. -* | 7c9c4668f Fix typo that causes crash. -* | c656cdfef Merge branch 'charlesmchen/oversizeTextMessagesAndArbitraryAttachments' -|\ \ -| * | 7b8401925 Respond to CR. -| * | 3d451846a Fix build break. -| * | b0aa71fd4 Apply DisplayableTextFilter to oversize text messages. -| * | 80fbc093d Handle oversize text messages and arbitrary attachments. -|/ / -* | bf1a79037 Merge branch 'charlesmchen/refineNewConversationView' -|\ \ -| * | 0dfe02099 Hide new group button if user has no contacts. -| * | 47ae6ccf7 Don't show the "no contacts" mode of new conversation view again after it has been dismissed. -| * | ff89d07dd Fix presentation animation of "no contacts" mode of new conversation view. -| * | b8a7204cd Remove "refresh contacts" button; always show "new group conversation" button. -| * | 4694ae845 Ensure "close new conversation view" always works. -|/ / -* | 630fcedff [SSK] Accept arbitrary incoming attachments. -* | 3114ea32d Merge branch 'charlesmchen/keyboardVsAddContactToGroup' -|\ \ -| * | 210bd704e Hide keyboard when scrolling the contacts list in new/edit group view. -|/ / -* | 3f110dc82 Merge branch 'charlesmchen/debugUI' -|\ \ -| * | 77a775bbc Respond to CR. -| * | 6b8d4ea7a Sketch out debug UI. -|/ / -* | 00e88fefb Merge branch 'charlesmchen/failedAttachmentDownloads' -|\ \ -| * | 32d856ff2 [SSK] Improve handling of incomplete and failed attachment downloads. -| * | 3cb02fcd6 Improve handling of incomplete and failed attachment downloads. -| * | 8a9206d7e Improve handling of incomplete and failed attachment downloads. -|/ / -* | 5250d327e [SSK] Remove RedPhone code. -* | 5993f680c Merge branch 'charlesmchen/removeRedPhoneCode' -|\ \ -| * | faf75e25c [SSK] Remove RedPhone code. -| * | 74f939b52 Remove RedPhone code. -| * | 9db33a965 Remove RedPhone code. -|/ / -* | 919795559 Merge pull request #1908 from WhisperSystems/mkirk/fix-test -|\ \ -| |/ -|/| -| * 4b52a90c8 Fix test -|/ -* 3957020e0 (tag: 2.9.1.0) bump version -* d87492bf6 sync translations -* 8ad36cf7f Merge branch 'charlesmchen/alreadyHaveAnAccountL10N' -|\ -| * 06ed55225 Fix translation of “already have an account?” button. -|/ -* 1862ef441 Merge branch 'charlesmchen/sharpAppIcon' -|\ -| * 90038e928 Sharpen the app icon. -| * 3cb545eb0 Sharpen the app icon. -|/ -* 325ede770 Merge branch 'charlesmchen/noCallKitPrivacyOniOS9' -|\ -| * 3fcdffb91 Only enforce CallKit privacy for missed calls if CallKit is present. -|/ -* e11381ffd Merge branch 'charlesmchen/uploadProgressTweaks' -|\ -| * 36ea27347 Slightly tweak the appearance of the attachment upload progress bar. -| * 26371499d Slightly tweak the appearance of the attachment upload progress bar. -|/ -* 778d76b84 Merge branch 'charlesmchen/imageAttachmentQuality' -|\ -| * e5024cfe7 Raise max GIF file size and default image upload quality. -|/ -* d8851ee52 Merge branch 'charlesmchen/copyImagesOniOS9' -|\ -| * e031e3c38 Respond to CR. -| * 7aef297a2 Cleanup copy to pasteboard of video and audio. -| * 86abb43c3 Copy images to pasteboard as data, not UIImage. -|/ -* 7a7cc34cd Merge branch 'charlesmchen/attachmentErrors' -|\ -| * 21766732d Respond to CR. -| * b90416f47 Show alerts with relevant error messages when attachment-related errors occur. -|/ -* 00a29dea4 [SSK] Filter out country codes properly. -* 3050fe794 Merge branch 'charlesmchen/countryViewsInRegistrationView' -|\ -| * 1246fcd99 Rework country views in registration view. -|/ -* 23dbb7338 Merge branch 'charlesmchen/logSubmissionOfDebugLogs' -|\ -| * ca1467ef2 Respond to CR. -| * 5cab3be67 Log submission of logs. -|/ -* 8b75bd727 (tag: 2.9.0.5) bump build -* ea62e2161 [SSK] fix attachment crash on iOS9 -* f9e1b3f2e (tag: 2.9.0.4) bump build -* f29ca7851 Move PureLayout back to cocoapods for now -* 55a44c8c4 (tag: 2.9.0.3) Bump build -* f2728d461 Remember to copy PureLayout.framework -* 0c8da2865 (tag: 2.9.0.2) Fix search/replace -* 730d6419b Bump build -* 0d52a1845 Update dependencies -* 4f51dcf2e (tag: 2.9.0.1) bump build -* 84bc5b1e6 Pull latest translations -* a4fd42789 Merge branch 'charlesmchen/animatedGifUTITypes' -|\ -| * f68e40f7d Add animated gif UTI types to attachment. -|/ -* 8066cdfe6 Merge branch 'charlesmchen/incomingVideoPlayButton' -|\ -| * d320cef1a Fix play button for incoming video attachments. -|/ -* eb8d4388c [SSK] Avoid YapDatabase deadlock in OWSMessageSender. -* a61e82653 Merge branch 'mkirk/better-envelope-logging' -|\ -| * 6466e9f41 [SSK] Better logging for envelopes -|/ -* fe18cb9a3 [SSK] Use a separate sending queue for each conversation & Fix “send to self operations never complete” issue. -* 0196257ab Merge branch 'charlesmchen/stopButtons' -|\ -| * 58eb77e07 Use “stop” not “cancel” buttons. -|/ -* 2564f5306 (tag: 2.9.0.0) sync translations -* 6a573b87d bump release target -* 34831ea10 [SPK][SSK] Ensure old sessions removed when identity changes -* cebfc479f Fixup acf3a6e syntax -* acf3a6e02 Merge branch 'mkirk/fix-swipe-back' -|\ -| * ab2bfb3a6 Fix spacing of custom back button -| * c182a0596 Fix swipe-back-to-pop gesture. -| * 0a09330d3 Delete unused code -|/ -* b0b4771d6 Merge branch 'charlesmchen/removeRedPhoneCalls' -|\ -| * e724acc97 Respond to CR. -| * c6a280e00 Only initiate WebRTC calls, not RedPhone calls. -| * 814c6d250 Only initiate WebRTC calls, not RedPhone calls. -|/ -* 60ad74b47 Merge pull request #1877 from WhisperSystems/mkirk/fix-settings-not-sticking -|\ -| * 8973881d3 Fix switches for those who like to "slide" -|/ -* d76d04b8e Fixup 4814edf3d38e52051d8dd5a86d0f8ac124b8370e -* 4814edf3d Merge branch 'mkirk/filtering-high-glyph-chars' -|\ -| * 0b8152359 Clearer logging and added an assert per CR -| * 6036e2007 Filter high diacritical text, regardless of length -|/ -* 78b98a5a9 Merge pull request #1863 from WhisperSystems/mkirk/fix-end-call-freeze-and-fail -|\ -| * eb0399f04 Fix "Call failed" due to deadlock when immediately terminating call -|/ -* 11ca9b098 reference "help wanted" label -* 949a7cd9a [SSK] Further refinements to phone number parsing. -* 95de36d67 [SSK] Improve logging around decryption exceptions. -* 876485783 Merge branch 'charlesmchen/disableNewMessageAnimation' -|\ -| * 81ed04571 Disable the "scroll to new message" animation. -|/ -* fcbc709b9 Merge branch 'charlesmchen/honorPrivacyInCallNotifications' -|\ -| * b9b81ca8e Honor call privacy settings in call notifications. -|/ -* 50ad6e4f6 [SSK] Update SSK pod to reflect websocket lifecycle edge cases. -* 5797cb109 [SSK] Update SSK to reflect cancel oversize attachment downloads. -* 49da1aea1 [SSK] Only send messages on main thread -* 0a150b9bb Merge branch 'mkirk/refactor_country_code_search' -|\ -| * da32570dc [SSK] remove convoluted dependency -|/ -* 8ed10c3a9 [SSK] Don't suspend app until message sending completes. -* 55063fec6 [SSK] Serialize message sending -* 0ecbbfaef [SSK] backwards compatible attachment digests -* c39a26659 Merge pull request #1860 from WhisperSystems/mkirk/intern-pastelog -|\ -| * 42975e44e better debug log copy -| * 8adba61b3 intern Pastelog back into Signal. -* | 612339670 Merge branch 'charlesmchen/messageStateIndicators' -|\ \ -| * | 97210b407 Respond to CR. -| * | bf2db32f8 Respond to CR. -| * | 539e66558 Respond to CR. -| * | f0e7e635f Respond to CR. -| * | 9ae047a1d Add progress & disable media views while uploading attachments. -| * | 3dc7f2528 Align the message state indicators with the behavior on Android and desktop. -| * | 029ae00bb Align the message state indicators with the behavior on Android and desktop. -| * | 442546fba Align the message state indicators with the behavior on Android and desktop. -|/ / -* | 1820fdbde Merge remote-tracking branch 'origin/hotfix/2.8.3' -|\ \ -| |/ -|/| -| * 47df77f38 (tag: 2.8.3.0, origin/hotfix/2.8.3) Only run "enable video calling" migration if user is registered. -| * e00449172 bump build -| * 8c81b4c82 (tag: 2.8.2.0) update translations -| * fed756936 bump build -| * aa268e36c This constructor can return nil -| * 3ee1d5568 Migrate existing users to RTC calling -| * dc422f7b0 Convert "is logging enabled" methods to class methods so that they can safely be used before Environment has been initialized. -* | c88f275c9 Merge branch 'charlesmchen/fixCameraAttachments' -|\ \ -| * | b9705cfe0 Fix sending attachments from the camera. -|/ / -* | 1e3f0fffe Invert logging condition. (#1855) -* | 22aa1d535 Merge branch 'feature/fixFilterCallingCodes' -|\ \ -| * | a264d9aa9 Responding to CR. -| * | a226a4a1b Respond to CR. -| * | e5fdaa132 Fix filtering of country codes in registration flow. -|/ / -* | be36d2ebf Merge branch 'charlesmchen/limitOutgoingMessageSize' -|\ \ -| * | 344074617 Respond to CR. -| * | e6e4290fa Limit size of outgoing text messages. -|/ / -* | 04a112aac Merge branch 'charlesmchen/nonUSNonContactSearch' -|\ \ -| * | 099386037 [SSK] Update SSK pod to reflect corresponding changes. -| * | 82179c6d4 Respond to CR. -| * | 3048a0146 Fix non-contact lookup for non-US users. -|/ / -* | 3413bcce2 Merge pull request #1853 from WhisperSystems/mkirk/zxing-framework -|\ \ -| * | 6a4c6915a Update build instructions -| * | 99c982fbb change ZXing to framework for faster incremental compiles in xcode -|/ / -* | c68bfac71 [SSK] Update SSK pod to fix build break. -* | 3db786797 update dependencies -* | 62073a14a Maintain AR when scaling avatar -* | 861e074c1 clarify call integration copy -* | 04034df1f Merge branch 'charlesmchen/videoAttachmentUploadAssert' -|\ \ -| * | 19aac08be Fix thread-safety assert when sending video attachments. -|/ / -* | e7639bbdb Merge branch 'charlesmchen/groupNameUpdates' -|\ \ -| * | 5a130703f Update conversation view title when group name changes. -| * | 081956c2b Update conversation view title when group name changes. -|/ / -* | ec06cf76e Merge branch 'charlesmchen/paste' -|\ \ -| * | 1c95eb5d5 Respond to CR. -| * | 43857a4c7 Respond to CR. -| * | 68838dbaa Respond to CR. -| * | bcf43683f Respond to CR. -| * | 58e273b1a Respond to CR. -| * | bdc729ad2 Respond to CR. -| * | 164db41c2 Move TSImageQuality enum. -| * | 27b515ea4 Add AttachmentApprovalViewController. -| * | cd928cd9b Update MessagesViewController to use SignalAttachment. -| * | 7f2810af3 Update MessagesViewController to use SignalAttachment. -| * | ec595f53d Gather attachment-related logic in SignalAttachment class. -|/ / -* | 58f1a71ce Separate safety number camera image into a separate image view so it can be properly centered. -* | bc1b2fe47 Restrict default avatars to alphanumeric initials (#1519) (#1563) -* | 9178b69f9 Issue1602 + small bug fix FREEBIE (#1799) -* | 153d4addb requestAccessForMediaType completionHandler to be called in UI thread. This leads to inconsistent behaviour once the permission is given -* | ad4ffae16 Merge branch 'mkirk/attachment-digest' -|\ \ -| * | d8c4558c8 [SSK] Attachment digests -|/ / -* | afbbe769a Merge branch 'charlesmchen/fixLoggingPreference' -|\ \ -| |/ -|/| -| * 15e14a9b5 Convert "is logging enabled" methods to class methods so that they can safely be used before Environment has been initialized. -|/ -* fb474a2a1 (tag: 2.8.1.0) Bump version -* 3b1c5214c (tag: 2.8.0.6) pull latest translations -* 28bcf0fc3 bump build -* 3e651fb8d filter undisplayable text -* a9b722ae1 (tag: 2.8.0.5) bump build -* 6e4657162 Fix type error, cast to proper type -* 5ec8a24d3 Turn off screen when held to ear -* 61a3765cf (tag: 2.8.0.4) bump build -* e3eca4db7 stop videoCapture until video track is enabled to save some battery -* 337c40881 (tag: 2.8.0.3) pull latest translations -* 3cfcdb8ab Bump build -* a26afdbca Refine icons and spacing. -* f9cb5d424 (tag: 2.8.0.2) bump build -* 8f7e0a8a5 [SSK] Fix crash-on-launch for older installs -* 505aaa379 tweak copy -* bb9d96efc pull latest translations -* 28af9d33a (tag: 2.8.0.1) bump build -* 9f3bd84d0 Merge branch 'mkirk/upgrade-notes' -|\ -| * 9b2eb8039 Code review on new-features -| * 6aa6f4895 Combine callkit sections -| * b371e627c one-time carousel of changes -|/ -* 4983853dd Merge branch 'charlesmchen/fixCallingCodes' -|\ -| * d49d6077d Respond to CR. -| * 5db7a7935 Fix calling codes in registration flow. -|/ -* af22eb0ff Merge pull request #1817 from WhisperSystems/mkirk/fix-tests -|\ -| * f37b8bac0 Fix test to use updated PeerConnectionClient API -| * dc1e7263f Fix tests on CI -|/ -* a35efd3c6 Merge branch 'charlesmchen/callSettingsNag' -|\ -| * e96692d70 Respond to CR. -| * 012dd3d19 Add “nag” to call settings view that prods the user to change their privacy settings after calls. -|/ -* 90b6789b2 Merge branch 'charlesmchen/fixNewConversationBackButton' -|\ -| * ad3b3f924 Respond to CR. -| * 5d60b7caa Fix back button in “new conversation” view. -|/ -* f65f9c318 Merge branch 'charlesmchen/fixBuildBreak' -|\ -| * c1aea91d1 Fix build break. -|/ -* b5403175f Call sounds - connecting, outgoing ring, busy sound. -* f1adfb4dc Merge branch 'charlesmchen/callkitPrivacy' -|\ -| * 4515b7fbc Respond to CR. -| * a20a21867 Respond to CR. -| * c35c118dc Respond to CR. -| * 01d258207 Add and honor the “CallKit Privacy” setting. -| * f5004b27a Add and honor the “CallKit Privacy” setting. -| * 065d383c1 Add and honor the “CallKit Privacy” setting. -|/ -* 8104ffa12 [SSK] Dedupe incoming messages by timestamp/device -* 4b8a5f8cc TURN-only option, and for unknown caller -* 7a3da3fa6 (tag: 2.8.0.0) Bump release target -* be9725c7c [SSK] lost changes needed to fixup 'charlesmchen/webrtcByDefault' -* fa2e3a2d4 Merge branch 'charlesmchen/webrtcByDefault' -|\ -| * f4453eb99 Enable WebRTC-based audio and video calls by default. -|/ -* 4c6a23d64 Merge branch 'charlesmchen/simplifyPreKeyCheck' -|\ -| * 165e5238c Simplify the prekey check on app launch and activation. -|/ -* c2061cda9 Merge branch 'Label' -|\ -| * bf3a67344 Add accessibility labels for the Create New Group and Settings navigation bar buttons. FREEBIE. -|/ -* c46dd6b7f Merge branch 'patch-1' -|\ -| * 8fbe1d667 Fix typo in Maintaining doc - FREEBIE -|/ -* e5c6d0db9 fix potential deadlock -* 5cd1d1705 Merge branch 'charlesmchen/messagesViewNavBar' -|\ -| * a4093a5f7 Respond to CR. -| * b1744c2b4 Refine the settings button of the home view. -| * 29b30099a Refine icons sizes and layout again. -| * 353fa5754 Rework messages view's navigation bar. -|/ -* 4f02e893e Merge branch 'feature/refineRegistrationAndVerification' -|\ -| * daa87974d Respond to CR. -| * 57c60deda Further refine the registration and verification views. -|/ -* 199c56417 Merge branch 'feature/improveImageScaling' -|\ -| * 04409e0cd Improve image scaling quality. -|/ -* 2fb89ae8b Merge remote-tracking branch 'origin/release/2.7.1' -|\ -| * 927eed7a1 (tag: 2.7.1.2) Remove “beta” copy from WebRTC calling setting UI. -| * 6b2af9ca8 Bump build number to 2.7.1.2. -| * ca19cbe7e (tag: 2.7.1.1) [SSK][SPK] Avoid crashes when signed prekey lookup fails. -| * 3b5a48914 [SSK] Avoid crashes when signed prekey lookup fails. -| * 34d4d6520 Bump build number. -| * c7d08fba4 Avoid checking prekeys twice on app launch. -| * ca85fe168 (tag: 2.7.1.0) [SSK] Avoid crashes when signed prekey lookup fails. -| * cfecb0396 Update translations -| * 2b15deaa7 (origin/charlesmchen/missingPrekeys) Flush logs before submitting logs. -| * 89c7bc74c Bump version and build number. -* | 92509169a [SSK] Update SSK pod to reflect release/2.7.1. -* | c61c75112 Merge branch 'charlesmchen/sharing' -|\ \ -| * | ed0c16855 Respond to CR. -| * | 5bd44673e Add sharing of attachments. -|/ / -* | 92a56b3a8 Merge branch 'feature/messageSortingRevisited' -|\ \ -| * | 701b26418 [libPhoneNumber-iOS] update pod. -| * | 82c4ca04c [SPK] Release 2.7.1 and prekey cleanup. -| * | e27475f8a [SSK] Add “received at” timestamp to all TSMessages so that they may be sorted properly. -|/ / -* | b72a780e5 Merge branch 'charlesmchen/updatePodsAndCarthage' -|\ \ -| * | e4c3fe378 Update Cocoapods and Carthage submodule. -|/ / -* | 56df9f924 Merge branch 'charlesmchen/webRTCSettingVsDismiss' -|\ \ -| * | 5d48b126e Don’t ignore WebRTC setting changes if user dismisses settings before success. -|/ / -* | 6d4945986 Update build script path (#1768) -* | 17ed77331 Merge branch 'charlesmchen/flushLogsVsExit' -|\ \ -| * | 49ba0ff94 Flush logs before exiting the app. -|/ / -* | 8da1e1399 Merge branch 'charlesmchen/flushLogsVsSubmitLogs' -|\ \ -| * | dde8132f0 Flush logs before submitting logs. -|/ / -* | dfcfbe702 Merge branch 'charlesmchen/verificationCodeAutoFormatting' -|\ \ -| * | 6b3fabc0c Respond to CR. -| * | 1a7425d63 Fix auto-formatting and filtering issues in code verification view. -|/ / -* | 2cf3275e7 Merge branch 'charlesmchen/prekey2' -|\ \ -| * | 3c3f782e7 Clean up prekey usage. -|/ / -* | f493e0260 Merge branch 'charlesmchen/markUnsentMessages' -|\ \ -| * | c0f52d1de [SSK] Mark "attempting out" messages as "unsent" on app launch -| * | 21e55d3be Mark "attempting out" messages as "unsent" on app launch. -|/ / -* | b1f554093 Merge branch 'charlesmchen/attachmentViews' -|\ \ -| * | a52771e28 Respond to CR. -| * | e48efe01c Improve formatting of message view controller. -| * | 3b1cc0dfa Fix present & dismiss animations for video attachment view & ensure this view is cleaned up. -| * | 593c3d53d Clean up present & dismiss animations for image attachment view. -| * | 6a3b46254 Add save/copy menu to the image attachment view. -|/ / -* | df509f2d5 Merge branch 'charlesmchen/rateLimitingErrorMessage' -|\ \ -| * | fcf1d7af9 Respond to CR. -| * | 2b64d94ba Update SignalServiceKit pod. -| * | 6cf454b3b Improve rate-limiting error message in registration and code verification views. -|/ / -* | 18b8afa20 Merge branch 'feature/verifyCodeView' -|\ \ -| * | ef8735e23 Respond to CR. -| * | cf828dc1c Rework “verify code” view. -|/ / -* | 1824fd0b7 Merge branch 'charlesmchen/buildInstructions' -|\ \ -| |/ -|/| -| * 9e7ca5d87 Refine Carthage instructions. -| * f02d32595 Update the Carthage submodule. -| * 12dabd004 Refine Carthage instructions. -| * 602fbcfb8 Slightly revise Carthage build instructions. -| * 98a57d69c Revert "Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md." -| * 13647bab3 Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md. -|/ -* 2791b9551 (tag: 2.7.0.10) bump build -* 4a8cfde6b Sync translations -* 2789edbdb Merge branch 'feature/prekeys_' -|\ -| * 97001018a Clean up prekey logic. -|/ -* 35728b283 Merge commit '8b3b2836128a7244822fe4204a0e26139f8b140a' -|\ -| * 8b3b28361 Update Carthage submodule. -|/ -* 2675a724c (tag: 2.7.0.9) [SSK] avoid intermittent YAP deadlock when receiving message -* da2cb228a bump build -* b3ce70554 (tag: 2.7.0.8) sync translations -* 447590ac0 bump build -* e79896430 Update SignalServiceKit pod. -* 84d988a01 Merge branch 'charlesmchen/callStatusMessages' -|\ -| * dea37b422 Respond to CR. -| * 06a775b41 Improve the call status messages in conversation view. -|/ -* 8e2ac368a Update SignalServiceKit pod. -* 3ab65a2c8 Prevent CallKit timeout when placing outgoing call -* 6cdf13ea5 Only time out the intended call -* 6d757d3a5 Merge branch 'charlesmchen/contactsViewsVsContactsUpdates' -|\ -| * 192264e45 Respond to CR. -| * adfbcc3e2 Update views that show contacts to reflect updates. -|/ -* c087c56b0 Fix call timeout -* 31378d4d9 (tag: 2.7.0.7) sync translations -* b82584f22 bump build -* 420d71758 [SSK] log when messages are marked as read locally -* 34e4650c4 Merge branch 'mkirk/timeout-outgoing-call' -|\ -| * 2f6bf0e55 Code cleanup per CR -| * 108720c2e End outgoing call with "No Answer" after 2 minutes -| * 59059bc06 Remove unused code -|/ -* bf1ed9a27 Don't show callkit description pre-iOS10 (#1722) -* 633e4a157 (tag: 2.7.0.6) sync latest translations -* c3971934f bump build -* 4bc4fc457 Merge branch 'charlesmchen/intersitialCallView' -|\ -| * 734dec12e Respond to CR. -| * c43063e1d Add “interstitial call view” that is shown during lengthy “webrtc supported” check. -|/ -* ea57b4849 Merge branch 'charlesmchen/inboxUnreadCountLayout' -|\ -| * fc6035e3f Fix layout issue with inbox unread count on home view. -|/ -* c621e3a00 [SSK] Missed calls increment unread counter -* dc9ffe40e Better translation comments -* 3349ac9a1 Merge branch 'charlesmchen/preventDeviceLockDuringCall' -|\ -| * ce9d9befb Prevent device lock during calls. -|/ -* d1683acdd Merge branch 'charlesmchen/fixRemoteVideoBadFrames' -|\ -| * 7eeac0c6f Fix bad frames in remote video. -|/ -* 6e7c18bbd (tag: 2.7.0.5) sync translations -* 31abe1178 bump build -* 730cc5053 Merge branch 'charlesmchen/refineCallIcons' -|\ -| * c6a55ee2a Refine video icons. -|/ -* 52a191b15 Merge branch 'charlesmchen/messagesFromMeAreAlreadyAutoRead' -|\ -| * 72ef6e600 Update SSK to reflect charlesmchen/messagesFromMeAreAlreadyAutoRead. -|/ -* b8711f9ab contact can be nil for outgoing redphone call -* 82a7ec128 Merge branch 'charlesmchen/labelSignalCallsAsSuch' -|\ -| * 80963d88f Respond to CR. Remove colon from call view status prefix. -| * 9a08449d8 Add “signal” copy to call view. -|/ -* 167e94e57 Merge branch 'charlesmchen/threadSafety5' -|\ -| * 217866c58 Respond to CR. -| * 228b0e7dc Synchronize access to remoteVideoTrack. -|/ -* 828771b13 Merge branch 'charlesmchen/callThreadSafety4_' -|\ -| * ca76ec6f3 Respond to CR. -| * 6f3a45ff8 Avoid crashes when deallocating remote video tracks. -| * 4ae786d0a Ignore CallService events related to obsolete calls. -| * d9bcd563b Avoid possible deadlock in PeerConnectionClient. -|/ -* b7fd7d768 (tag: 2.7.0.4) bump build -* 47fdc1f87 Merge branch 'charlesmchen/fixBusyLogic' -|\ -| * 8f6483e9b Fix bug in the busy logic. -|/ -* ef3df49fd (tag: 2.7.0.3) bump build -* dafa52533 Merge branch 'charlesmchen/callAudioObservation' -|\ -| * 17fe3f66c Ensure audio service observation of call is always correctly wired up. -|/ -* 007d9aca7 (tag: 2.7.0.2) Latest translations -* ed5e4d3c8 bump build -* e55a5b667 Merge branch 'charlesmchen/unhideCallViewOnActivation' -|\ -| * b883b5c54 Show hidden call view controls when app reactivates. -|/ -* ef5c2c541 Only show CallKit footer when showing the CallKit cell -* 90388ebd6 Coordinate "busy" state across redphone and webrtc -* c4a677a0b Fix: Second call fails -* 091052185 Merge branch 'charlesmchen/systemGesturesVsVideoControls' -|\ -| * e34d52962 Prevent system edge swipe gestures from showing/hiding call controls. -|/ -* 61e35f121 Merge branch 'charlesmchen/callKitVsWebRTC' -|\ -| * 53cb36e53 Callkit option should only be visible when "Video Call (Beta)" is enabled. -|/ -* 05f123c5e Fix ongoing call check in OutboundCallInitiator. -* cff3daa82 Merge branch 'feature/handleINStartVideoCallIntent' -|\ -| * d7e434eb0 Modify OutboundCallInitiator to abort if there is an ongoing RedPhone or WebRTC call. -| * d7138b6c8 Respond to CR. -| * 660ff056e Modify handling of INStartVideoCallIntent and INStartAudioCallIntent if there already is an ongoing WebRTC or RedPhone call. -|/ -* a38a3318a Merge branch 'charlesmchen/simulataneousCalls2' -|\ -| * 581ba937f Respond to CR. -| * 52ba5c132 Don’t assert when two devices call each other simultaneously. -|/ -* 2d6851743 Merge branch 'charlesmchen/callThreadSafety3' -|\ -| * 6e390d40b Respond to CR. -| * 732144c9e Respond to CR. -| * 98caeb6a0 Be even more cautious when tearing down a PeerConnectionClient. -|/ -* a328759f0 Don't crash when incoming call on NonCallKit iOS10 -* 43e7defa2 Stop any lingering audio session if provider resets. -* 2216dc8d3 Revert "revert WebRTC related changes to AppAudioManager" -* 8b45ac223 Merge branch 'feature/nonContactConversations' -|\ -| * 4f9ce0c0e Respond to CR. -| * f9c20a36a Clean up ahead of PR. -| * 26b3be4ec Improve "new conversation" view. -| * 3ae85ce2d Add button to start a new conversation with non-contact based on phone number in search field. -|/ -* 0a95dac61 (tag: 2.7.0.1) pull latest translations -* 158fe78ae bump build -* a6b555591 fixup, return nil, not 0 -* 2a9aa4c85 users can opt out of CallKit -* d8df4b9e3 Can receive calls while in settings -* f864207d4 Merge branch 'feature/simultaneousCalls' -|\ -| * 568792551 Prevent simultaneous incoming and outgoing calls from leaving CallService in a bad state. -|/ -* 19aa4b5b8 Merge branch 'charlesmchen/webrtc/busySignal' -|\ -| * 089393048 Handle “busy signal” appropriately. -|/ -* 90c5d4d23 Merge pull request #1686 from WhisperSystems/release/2.7.0 -|\ -| * 08425853c re-use shared call strings -| * a339f5256 Only touch mutable dict only main thread -| * 5d0d1b725 Already on the main thread -| * 947d34583 SSK update to include latest master (which now includes CallKit) -| * 6b4dedfef revert WebRTC related changes to AppAudioManager -| * b6f098bfa Log when receiving unknown call datachannel message -| * b868f07c3 Merge remote-tracking branch 'origin/feature/webrtc' into release/2.7.0 -| |\ -| | * a4c130366 Merge branch 'charlesmchen/webrtc/threadSafety2' into feature/webrtc -| | |\ -| | | * 36356fbff Avoid crashes when closing peer connection client. -| | | * dacb2840f Avoid crashes when closing peer connection client. -| | | * f81feca2d Avoid crashes when closing peer connection client. -| | | * 535770a92 Avoid crashes when closing peer connection client. -| | | * 4dec1e2de Avoid crashes when closing peer connection client. -| | |/ -| * | 736141827 (tag: 2.7.0.0) Merge remote-tracking branch 'origin/master' into feature/webrtc -| |\ \ -| |/ / -|/| | -* | | feb5a9ed3 (tag: 2.6.15.0) [SSK] fix crash when messaging newly unregistered -* | | f9497240e bump release target -* | | 20e037ad8 (tag: 2.6.14.1) bump build -* | | ff7ae4f81 [SSK] Disable resetting unreadable storage (#1643) -| * | e272684ea Merge branch 'mkirk/webrtc/call-activity-2' into feature/webrtc -| |\ \ -| | |/ -| |/| -| | * cd36123bf rename method to better reflect how its used -| | * 7e825648e Show alert when trying to call a non-signal contact from Contacts. -| | * b35c20a06 Don't handle intents pre iOS10. -| | * 17b89f44a share global callUIAdapter, outboundCallInitiator -| | * bbfd9ba74 Place Signal/Redphone calls from system contacts -| |/ -| * 724a1c9b2 Merge branch 'charlesmchen/webrtc/threadSafety_' into feature/webrtc -| |\ -| | * d4ba4c446 Respond to CR. -| | * b415b6142 Respond to CR, mainly by fixing broken tests. -| | * 49bb3d942 Clean up ahead of PR. -| | * d294557bd Rework concurrency in the signaling logic. -| | * dd374afda Rework concurrency in the signaling logic. -| | * d6c849eab Revert whitespace changes. -| | * af289145b Rework concurrency in the signaling logic. -| |/ -| * 592906129 Merge branch 'charlesmchen/webrtc/audioMode' into feature/webrtc -| |\ -| | * d0b2aaac2 Specify AVAudioSession modes for calls. -| |/ -| * f1d843486 More space for non-callkit incoming call buttons (#1660) -| * 9e3f32a39 Merge branch 'charlesmchen/webrtc/logReconnect' into feature/webrtc -| |\ -| | * 8454c7dc2 Log reconnect events as such. -| |/ -| * 60c67793a Merge branch 'charlesmchen/webrtc/connectedSpeakerphone' into feature/webrtc -| |\ -| | * 5dd465567 Ensure audio state when call connects. -| |/ -| * 10eb4beb0 Merge branch 'feature/hardResetGitScript' into feature/webrtc -| |\ -| | * a5cb9b11e Hard reset git script. -| |/ -| * faf1946ba Merge branch 'charlesmchen/webrtc/webrtcVsCarthage' into feature/webrtc -| |\ -| | * 5232899b1 Update Carthage to reflect WebRTC release build. -| |/ -| * 47c2b0380 Merge branch 'charlesmchen/webrtc/textShadows' into feature/webrtc -| |\ -| | * b5aab6098 Respond to CR. -| | * e947276f7 Add drop shadows to text in call view. -| |/ -| * 8aca1b87d Merge branch 'charlesmchen/webrtc/disableLocalVideoInBackground' into feature/webrtc -| |\ -| | * 40b3d038d Disable local video in background. -| |/ -| * ae1a97196 Merge pull request #1658 from WhisperSystems/mkirk/webrtc/call-mux -| |\ -| | * 141a1bd17 Disable half-working call-holding feature all together -| | * 969b73cad Implement call holding (call swapping still broken). -| | * e425d351c WIP: incoming non-signal call while in outgoing signal call -| |/ -| * 08a0853bd Merge branch 'charlesmchen/webrtc/videoRefinements_' into feature/webrtc -| |\ -| | * c8e588408 Respond to CR. -| | * 9a0a7bb6b Show alert when user tries to activate local video without camera permissions. -| | * da53368bc Show alert when user tries to activate local video without camera permissions. -| | * 2ef80e569 Improve thread safety in call ui adapter and adatapees. -| | * 50addfa4e Remove camera constraints. -| | * 6ce33381a Prevent screen from dimming or device from locking during video call. -| |/ -| * 410d5fbf7 Merge branch 'charlesmchen/webrtc/reworkVideoControls' into feature/webrtc -| |\ -| | * 40d794412 Respond to CR. -| | * 9e34f87f0 Fix issues around how remote/local video states affect call view. -| |/ -| * 344692306 Merge branch 'feature/hideVideoControls' into feature/webrtc -| |\ -| | * 699b364ec Show/hide call view controls in remote video mode if user taps screen. -| |/ -| * 459d0d601 Working around a bizarre crash on iOS 9 -| * fff061ff3 Make sure WebRTC preferences are synced *every* call -| * a29e3674c Merge branch 'charlesmchen/webrtc/video5' into feature/webrtc -| |\ -| | * fe140b0da Updated the button icons in the call view’s “remote video” mode. -| |/ -| * 2a4170a32 Merge branch 'charlesmchen/webrtc/video4' into feature/webrtc -| |\ -| | * bc00b8778 Reply to CR. -| | * 9c3ecbc77 Clean up ahead of PR. -| | * d560aa022 Reworked call view’s remote video mode. -| |/ -| * e2d6c574d Fix guard syntax. -| * bba1f05dc Merge branch 'charlesmchen/webrtc/video3' into feature/webrtc -| |\ -| | * 204aeab69 Respond to CR. -| | * ec1f77c63 Polish video calls. -| |/ -| * 8bdf03fa7 Merge branch 'charlesmchen/webrtc/video2_' into feature/webrtc -| |\ -| | * 48ca4fe86 Respond to CR. -| | * 0c7f183ac Respond to CR. -| | * a65d3b7c4 Add video-related views. -| |/ -| * e556a369b Include missing files to fix tests -| * 814aec6cd Recover CallKit state when remote client fails to hangup -| * 6c14f2f50 Fix "Answer" from iOS9 notification doesn't init audio -| * d3e674749 Merge remote-tracking branch 'origin/master' into feature/webrtc -| |\ -| |/ -|/| -* | 1de5a51fe (tag: 2.6.14.0) Pull latest translations -* | 4e72ab92c Prevent session corruption by using a single serial queue for encrypt and decrypt -* | c4eecb24d bump release target -| * 5856e351a Respect WebRTC calling preference (#1640) -| * a6029f254 Merge remote-tracking branch 'origin/master' into feature/webrtc -| |\ -| |/ -|/| -* | 6af933c17 Merge branch 'release/2.6.13' -|\ \ -| * | c2fae986f (tag: 2.6.13.1) [SSK] better logging when we fail to get DB keys -| * | d6f2fa92a remove negative notification -| * | 907e122d6 Migrate legacy db stored logging preferences to NSUserDefaults -| * | 2355c7417 fixup condition -| * | 870fb960a Start logging earlier in app setup. -| * | d9cfb3885 bump build -| * | 9516ab110 Bail on startup if DB password is inaccessible -* | | 7ca8c0f28 Merge branch 'feature/improveAppDelegateLogging' -|\ \ \ -| |/ / -|/| | -| * | 698b91404 Elaborate logging in app delegate. -|/ / -* | 0e7083ed4 (tag: 2.6.13.0) [SSK] remove Cuba from domain fronting -* | 415593b41 (tag: 2.6.12.0) Bump version -* | be0afaf97 (tag: 2.6.11.2) bump build -* | 1645663f8 pull latest translations -* | 44c4d7744 Merge branch 'charlesmchen/fixWebsocket' -|\ \ -| | * cabd85c85 Merge branch 'mkirk/webrtc/fix-non-callkit-ringer' into feature/webrtc -| | |\ -| | | * 333fb6c60 assert on main thread -| | | * b2091431d Fix retain cycle -| | | * 87ed66211 Persist AudioService if CallViewController is dismissed -| | | * 3ee94d57d Only NonCallKit adaptee uses manual ringing -| | | * 4c23b5e23 Remove dependency on AppAudioManager -| | | * 4374e431a Respect silent switch in and out of app. -| | | * a89bde933 Respect silent-switch pre-CallKit -| | |/ -| | * e3a545108 Merge branch 'feature/disableCallKitButtons' into feature/webrtc -| | |\ -| | | * d4dbe7f44 Disable unused CallKit buttons. -| | |/ -| | * 863947149 Merge branch 'charlesmchen/webrtc/video' into feature/webrtc -| | |\ -| | | * 229d95ecb Respond to CR. -| | | * 9e739433c Start work on video. -| | |/ -| | * dbb29d7d7 Don't require recording permissions until call is ringing. -| | * ca218ebb6 update call signatures for test fakes -| | * 0797df19b Only update label on timer -| | * 7b33cbb93 Merge pull request #1600 from WhisperSystems/mkirk/webrtc/unit-test-peerconnectionclient -| | |\ -| | | * 0072ee303 Ensure a stale peerConnectionClient doesn't call any methods on the CallService -| | | * 32789bd96 Move RTCDataChannelDelegate to PeerConnectionClient -| | | * 8998853af Move RTCPeerConnectionDelegate to PeerConnectionClient -| | | * bd65dc6ba Fallback TURN servers if we can't get them from the server for some reason -| | |/ -| | * 1898b9fa1 Merge branch 'charlesmchen/fixWebsocket' into feature/webrtc -| | |\ -| | |/ -| |/| -| * | ec1601638 Update to reflect merged SSK branch. -| * | a023d02ae Respond to CR. -| * | 9c4eda54f Respond to CR. -| * | cb3f56444 Fix web socket issue. -|/ / -* | 7e715052d latest translations -* | c4581dab2 (tag: 2.6.11.1) Bump build -| * ada6da950 Fix merge. -| * ca27d10cd Merge branch 'charlesmchen/webrtc/callView4' into feature/webrtc -| |\ -| | * 1e80946a9 Add call duration to call view. -| |/ -| * 433ac2cf1 Merge branch 'charlesmchen/webrtcSetting' into feature/webrtc -| |\ -| | * 773080b11 Update SSK pod to reflect merge of corresponding charlesmchen/webrtcSetting2 branch into mkirk/webrtc. -| | * 654bdb1a8 Add WebRTC setting. -| |/ -| * 0c8893e91 Merge branch 'charlesmchen/webrtc/callView3' into feature/webrtc -| |\ -| | * 071fc4ddc Improve buttons in call view. -| |/ -| * 8be987de1 Respond to CR. -| * 1c4ebf6f6 Merge branch 'charlesmchen/webrtc/callView2' into feature/webrtc -| |\ -| | * 19633a9f6 Respond to CR. -| | * 9df5cebfc Update the call view icons and refine the layout. -| | * 92eb2f614 Update the call view icons and refine the layout. -| |/ -| * 8f8c92d65 Merge branch 'charlesmchen/webrtc/callView' into feature/webrtc -| |\ -| | * ee5682165 Respond to CR. -| | * 09c2e27e4 Respond to CR. -| | * c6de67601 Respond to CR. -| | * 4a65a8851 Rework new call view. -| |/ -| * 2119f33f8 Merge pull request #1587 from WhisperSystems/mkirk/webrtc/call-kit-mute -| |\ -| | * 469bff573 Make call delegate weak -| | * 1ed39976e make public protocol method implementations public -| | * f6e6e6b78 CallViewController only accesses CallService via the CallUIAdapter -| | * fc6da0525 remove some dead code -| | * 947a63766 Sync "mute" controls between CallKit -| |/ -| * 33db2715f Merge branch 'charlesmchen/webrtc/fontLookup' into feature/webrtc -| |\ -| | * 98e087a47 Fix font lookup on iOS before 8.2. -| |/ -| * 26a6e391b Fix pod. -| * 33eed88ec Merge branch 'charlesmchen/webrtc/flushLogs' into feature/webrtc -| |\ -| | * 740aa643b Add method to flush logs. -| |/ -| * 9265870b9 Merge branch 'charlesmchen/webrtc/buildingWebRTC' into feature/webrtc -| |\ -| | * 692429480 Respond to CR. -| | * 74ca54d78 Improve instructions on how to build WebRTC. -| |/ -| * 8d7352b42 Merge branch 'mkirk/webrtc/fix-tests' into feature/webrtc -| |\ -| | * a17873291 Fix up tests -| | * 02d36e6e6 Include built WebRTC.framework in Carthage dependencies -| |/ -| * c7449db28 remove stubbed audio manager implementation until it's clear what to do with it. -| * 9e248168b merge CallKitProviderDelegate into CallKitCallUIAdaptee -| * ce3780e44 Wip smashign providerdelgate into UIAdaptee -| * 6eecef99b Promise aware Message sender -| * f9b44c889 Added CallService documentation -| * 602a5953f respect silence switch for incoming ringing -| * 57ad7a280 cleanup -| * 647b2b37e WIP: WebRTC calling -|/ -* f01c5a198 Merge branch 'charlesmchen/databaseErrors' -|\ -| * ee63e9116 Update to reflect changes in SSK https://github.com/WhisperSystems/SignalServiceKit/pull/85. -| * 6106326b3 Update to reflect changes in SSK https://github.com/WhisperSystems/SignalServiceKit/pull/85. -|/ -* d7b27a402 Refactor ContactsPicker to show a clean search bar -* a70d5f88b Fix build break related to SignalServiceKit pod. -* 4ad4eb211 Merge branch 'charlesmchen/censorship-circumvention-2' -|\ -| * 2ce4d39f9 Respond to CR. -| * d28b73cfa Add asserts to Signal iOS .pch. -| * 2dac6c888 Update SignalServiceKit pod. -|/ -* b89e1617a (tag: 2.6.11.0) Bump release target -* 063163962 (tag: 2.6.10.2) bump build -* 9f6b26a78 pull latest translations -* a636f0b6a Redphone works on ipv6 only network -* ce18be228 (tag: 2.6.10.1) pull latest translations -* 105e9ce6d (tag: 2.6.10.0) Bump release -* 90daf60c5 Fix travis build -* ba4569f5b delete unused code -* ddba843d4 (tag: 2.6.9.4) Censorship circumvention in Egypt and UAE -* bcd371b96 (tag: 2.6.9.1) Bump build -* c4baf5a62 [SSK] Avoid bricking signal if a key is temporarily unreadable -* 94d37d9c5 Warn user about re-registering existing signal number -* c3a22d7da [SSK] Fix contact sync when no thread to self exists -* 32a05dabc [SPK] Update SignalProtocolKit (AxolotlKit) (#1549) -* 1b50f1d84 (tag: 2.6.9.0) Bump version -* 495628834 Bump up launch screen logo size on iPhone6 and larger -* 84e35bd08 (tag: 2.6.8.0) Update translations -* 727fb7080 Fix show error message when download fails -* 97500d55e Prevent iRate mechanism when handling local notifications -* 490795ea3 Make disappearing messages button visible in German (#1536) -* e7bc2e86d Show email as name when contact has no name -* 76d01863d [Invite Flow] Use email address to collate contacts when no given or family name is provided -* 89730f2b8 Improve accessibility a bit -* e2d725a04 [SSK] Ignore messages with unknown Content -* c1ab36576 Fix crash when attaching media -* 6b67dc4ef bump release target -* 359deb933 (tag: 2.6.7.4) Bump version -* 243ff190b Fix crash in group listing / new group views -* a8f37ef5c (tag: 2.6.7.3) Bump build -* 103f0450a Build avatar from contact initials even if they don't have a phone number -* 8211d4584 Don't explode when missing first name -* 753c445bf [SSK] Update libphonenumber -* e7126f8c6 Less confusing "#" avatar for unknown Contact instead of "+" -* fb508470d (tag: 2.6.7.2) Bump build -* 1dcd1830e Fix crash in group member listing -* 273b3a3ac (tag: 2.6.7.1) Update translations -* a84bff3c6 bump build -* e58de07af Prevent going to the "Background Notifications" when tapping "Notification Sounds" -* e6f0130f3 Fix peek from inbox (#1509) -* f29a0fe49 Change safety number strings to be singular -* 942353cba Fix crash on "show safety numbers" in group thread -* 5a0141003 "No Contacts" screen uses new invite flow -* 81e1ec4b9 Compare both first and last names when sorting (#1487) -* d6e974595 (tag: 2.6.7.0) Bump version -* f0461891e Convert Localizable.strings tools to UTF-8 (#1420) -* 896dd026d Remove DJWActionSheet -* f686fc9a8 Style refactor to reduce rightward drift -* ed29b154b (tag: 2.6.6.7) update translations -* f30c733ef (tag: 2.6.6.6) Custom contact picker for invite flow -* f9a60b622 (tag: 2.6.6.5) Use cleaner signal link in invite email -* 7120ca119 (tag: 2.6.6.4) Make sure we're laying out contact cell after assigning avatar -* 2bac3e428 Better fit for "delete account" button on iPhone5 -* 0aa226f3d (tag: 2.6.6.1) [SSK] If a new message type is introduced, ignore it -* 06ca3c929 Mail and Message invite flow -* bed525039 remove redunant method -* c0c71fe26 Switch back to the default keyboard after sending -* 584118a9f compare safety numbers with clipboard (#1475) -* de7752ab2 Revert 50abf4d02d2c95b11fe2248e57a571c6389f7317 -* a0dc5950f Automatically adjust message bubble text size on dynamic text changes. (#1469) -* 40c3a01b3 Update README with link to development guide -* e67af9d52 (tag: 2.6.6.0) Make settings modal. -* f1b4bd772 Prevent bogus message emission on group deletion -* 087f75397 Voiceover fix- Do not read "no messages" text when it's hidden (#1437) FREEBIE -* b40f6acd0 Voiceover fix: Message author read as thread name (#1437) FREEBIE -* 89451013d Bump build target -* 5213822e7 Update BUILDING.md -* 88d9ef987 (tag: 2.6.5.9) Share dialog for Safety Numbers -* 9b2c03793 (tag: 2.6.5.7) [SSK] explicit newlines in safety numbers -* d76f26e43 (tag: 2.6.5.6) Bump version. -* ee29fff0d (tag: 2.6.5.4) [SSK] Default to blocking changed Safety Numbers -* eb995cb38 revert to tracking longform build -* 7cae80421 (tag: 2.6.5.3) Update translations, bump build. -* f8da3132f (tag: 2.6.5.2) Bump build -* c5be8f2d8 Don't include phone number in scannable safety number QR code -* d3c2f44ae Exclude extra data detectors. -* fbcf5fbf0 Properly assign global contacts updater to environment -* ddeadafc3 Don't show own addressbook info in settings -* 7bcf5190b Address some lingering emoji cropping -* 01a3ef015 Don't show permissions pop-up until user has seen contact disclaimer (#1456) -* 3bbdd13fb (tag: 2.6.5.1) Bump version -* c2aa17e36 Changed Safety numbers no longer block communication -* 28a2a4610 Fix compiler warnings. -* 1da7b3b2c (tag: 2.6.4.14) bump build -* 368db7e55 [SSK] Only need to fetch prekey once -* 4c5bc1ed6 Fix fingerprint Label copying -* 96c5ab011 (tag: 2.6.4.12) Bump build -* 49e5b1948 Update translations -* c7a2fd30c (tag: 2.6.4.11) Bump build -* 23c80748e Hide safety numbers until you've exchanged keys -* 225c5ecfb Merge branch 'jaropawlak/master' (#1408) -|\ -| * b8fc4001e Camera permission fixup -| * c152c1c83 asking for camera permissions #1363 -|/ -* 1912fbde7 (tag: 2.6.4.10) [SSK] Send group messages as long as one recipient is found -* c401f764e (tag: 2.6.4.9) [SSK] Fix crash on messaging unregistered user -* fd8945881 Adds comment on running carthage, which is neccessary to build the project. // FREEBIE -* 79d5cf9e9 (tag: 2.6.4.7) bump version -* 1bf77e826 dismiss keyboard when showing corrupted message actionsheet -* 21d37a92e Fix crash on nil image. -* 82c903b5d (tag: 2.6.4.6) bump build -* ddf089040 Fix crash on nil message -* 157b5ef15 (tag: 2.6.4.5) Bump build -* c6a2fbff2 Tapping corrupted message opens "session reset" activity -* bd370f1de (tag: 2.6.4.4) Fix cropped Chinese/Japanese messages -* 62f9606bf Merge branch 'mkirk/fix-registration-without-background-modes#1329' -|\ -| * 78d9c97d7 Bump build and properly set version. -| * 1dd06a5e6 Fix registration flow / Keep push tokens in sync -| * f98e57e16 WIP: Fix hanging registration when background modes disabled -| * bae050480 Debug logging around call init crash. -| * 4fc526024 Don't prompt for feedback if user hasn't completed registration -* | ac996db25 Merge pull request #1407 from mdouglass/fix-issue-1270 -|\ \ -| |/ -|/| -| * baf0ea96d Fixes [UIDevice isiPhoneVersionSixOrMore] -| * 09d377f7e Unifies bubble sizes for media bubbles -| * c958c7909 Unifies bubble sizes for media bubbles -* | cc8c8d61b [SSK] Update to prevent session corruption -* | 7c6b84c46 Outgoing message sound respects Settings toggle (#1373) -* | 431a91a48 (tag: 2.6.3.15) Convert to non-decimal build numbers. -* | 61fa5756a (tag: 2.6.3.14) bump build. -* | 21ebe0db9 (tag: 2.6.3.13) bump build -* | 1eb234e8b (tag: 2.6.3.12) Attempt to fix intermittent crash in messages view controller -* | e206afdc5 (tag: 2.6.3.11) Bump build -* | 50abf4d02 [JSQMVC] Fix crash on delete when under load. -* | eded20f1f (tag: 2.6.3.10) [SSK] Don't send empty message to self after changing disappearing timer -* | f2ee006d5 (tag: 2.6.3.9) Update translations -* | 541ca3915 Partial revert of 33f6a9552058747d016a788f7de29144e598788e (#1421) -|/ -* bbfffdf79 Scanning an invalid QR code shows an error dialog -* 40d6550fc Update translations -* 560b37751 Fix intermittent crash on network status change -* 66f0f8cc9 [SSK] Better error messages when failing to send -* 84e560697 [SSK] Fix disappearing messages don't become consistent after reinstall -* 689df1be3 Handle key change in group send -* 0e345dbba Update translations -* 33f6a9552 Explain send failures for text and media messages -* 7c32259a9 We aren't using ErrorMessage/InfoMessage. (#1412) -* 722c3a5e7 Create TSOutgoingMessage with info on group change -* 802d2bfdf Revert "Create TSOutgoingMessage with info on group change" -* 8242c9e38 Create TSOutgoingMessage with info on group change -* 876b360e0 Merge pull request #1411 from WhisperSystems/update-translations -|\ -| * 15dcbbb06 re-pull translations after updating source -| * b9945b7e3 pull latest translations before updating source -| * 16a30f289 translate untranslated strings -| * 8c062f93a Refresh Localizable.strings with auto-genstrings -| * 64f4eb73c Allow autogenstrings to find all strings -| * 722356db5 script to generate and merge global .strings file -|/ -* 89ee74f13 Update SSL to 1.0.2j (#1409) -* 8bf4acd78 early boot the simulator to avoid false travis failures -* 49de77299 (tag: 2.6.2.0) Fix slow reloading conversation view. (#1397) -* 50ce28358 (tag: 2.6.1.3) Fix empty bubble when setting disappearing message timer in a thread to yourself. -* 5b0197646 (tag: 2.6.1.2) Fix hidden incoming audio -* bc9154f18 (tag: 2.6.1.1) Bump version / update translations -* 1e417ea93 (tag: 2.6.1.0) Longpress to copy safety numbers -* da82c01f6 Restart timer animation when returning from background -* 04f5c3ce2 Slow the timer animation down a bit. -* 6a4fc3168 Fix delivery shown for undelieverd disappearing messages. -* ddc8db6ac bump build -* 607262df6 Remove observers on dealloc (#1379) -* ca5ca9d0c code verification: show complete phone number -* f63cfdac7 Fixing travis -* a04b35145 Fix set timer in group thread. (#1375) -* 7661b7f40 Consistent copy with other platforms -* 185cb2493 Update translations -* 85beb93e8 Style timer changes less alarmingly. -* 89df8ddb3 Group updates can be deleted -* 07ab1bd93 Call notifications appear immediately after call -* 7106eee4a Call notifications are deletable -* 405990a7d Don't select or copy info message text. -* dc95d328c Don't expire messages until they are sent. -* 2b2ebbe09 Tweak settings design -* dc0807297 Update translations -* c0f37f812 Fix sync messages expirations in SSK -* 023e62e6a fix reused cell starts blinking too early -* 94a23021f Size error messages correctly. -* b95112356 iOS 8 Fixups -* 2edd2b8f8 set launch state correctly -* a28fea838 Fix emoji message truncation on iOS10 -* 9a9f24d8d Fix travis build -* 43a2eb9da Fix occasional crash when sending after deleting messages -* ee0cce75e Disappearing Messages -* 48336b6c5 Resetting session returns you to messages view with an indicator that your session was reset. -* 11a586a83 New Fingerprint Format -* cc2a25b18 (tag: 2.5.3.4) update translations -* 2f33e8726 Update socket rocket to get an upstream crash fix -* 8d2b38f02 Fix device listing -* 3e7e67e27 (tag: 2.5.3.3) Async migrations framework -* 3b687da0e Upgrade SSK to setup db async where possible -* 2ab695596 More logging, scrub phone numbers from file logs (#1357) -* 1433ee265 (tag: 2.5.2.2) Fix crash on boot =/ (#1349) -* 14570cb6c (tag: 2.5.1.0) bumping minor version -* 0c4f1d41b (tag: 2.5.0.20) Fix contact sync in SSK (#1345) -* 891acb163 (tag: 2.5.0.19) Bump version -* be0556f68 fix "last active" date -* 5372173c4 (tag: 2.5.0.17) Fix groups breaking without avatar (#1336) -* 720b167b3 (tag: 2.5.0.16) Fix multiple keychange errors (#1334) -* ed0655556 Merge branch 'release/2.5.0' into release/2.5.0-with-master -|\ -| * 197933817 Fix height of network status on iphone5. -| * 63513bed1 Apple now requires camera permission explanation -| * f753cfeed Fix XCode8 code signing -| * 7c6e9e07b Read receipts remove lockscreen notifications -| * f7198d5ea Don't crash when receiving read receipts after message -| * d8be0b5d2 New translations -| * 0a6402274 Must specify team for XCode 8 build -| * 90dab190f (tag: 2.5.0.8) Update SSK to send useragent upon provisioning -* | b59a0e47d Disable group header interaction (#1328) -* | 50cd4f54f verification code field: improved user experience (#1325) -* | c7ee43079 Support for receiving voice messages from android (aac) (#1321) -* | a03e1e717 Merge pull request #1320 from WhisperSystems/dt -|\ \ -| |/ -| * 5200cccbe (tag: 2.5.0.7) Update translations -| * 6bd2453d7 Fix choppy paperclip icon on iphone6 -| * 33f63e76d Fix devices icon intermittently showing -| * a595cb932 (tag: 2.5.0.5) Desktop Integration Fixups -| * 019310f28 Deselect table rows when swiping back in table views -| * 7e67fb193 Some style for the QR code scanner. -| * f28400146 (tag: 2.5.0.4) bump build -| * 7c3a07960 (tag: 2.5.0.3, tag: 2.5.0.2) Device manager fixes -| * dee26e6e0 Use PNG constant -| * 9006ff604 Multi device read receipts. -| * 428f7fca1 Adapt to nullability annotations in SignalServiceKit -| * 92290a5d4 Fix: Inbox count not updating while viewing archive -| * ef6784ed9 Device Manager -| * 84156698c Provision device from QRCode. -| * 654516119 thread is set during notification callback. -|/ -* eef200222 (tag: 2.4.2.0) Clean up settings (#1316) -* cc2d47fbd Update protocol (#1315) -* e56d41edc Otherwise we'll never run future migrations. (#1314) -* bff6e5613 Avoid collision with iOS10 SSKeychain framework (#1308) -* f8a0be4c7 Return immutable data from generateSecureRandomData:length and use OSStatus to check the status of SecRandomCopyBytes. (#1306) -* b29174a37 Merge pull request #1305 from WhisperSystems/default-screen-security -|\ -| * 9a86ca76c screen security is enabled by default -| * 58548c68c code cleanup -|/ -* 006c4ba95 Update dependencies. (#1304) -* 52861a6ef Fix incorrect GIF message bubble sizing (#1300) -* 6120bd9e8 (tag: 2.4.1.1) Orphan-data cleanup no longer causes timeout (#1303) -* 547cd9797 Improve audio waveform scrolling performance (#1292) -* 92b3ea5d2 (tag: 2.4.1.0) Re-enable attachment cleanup migration after fixing it in SSK (#1298) -* 000a5941f Delete attachment cleanup migration. -* 9f2bb5d2c Fixes lingering interactions after removing thread (#1297) -* f09af989b (tag: 2.4.0.4) 2.4 update translations (#1291) -* 73856c3e4 bump release target to 2.4.0.4 -* 147cc1510 (tag: 2.4.0.3) Input toolbar fits text size (#1290) -* bb3bda236 bump build 2.4.0.3 -* 86f06593d Fix "can't reattach saved GIF" (and others) (#1288) -* 3c2846274 Prevent crash when copying corrupted image attachment. (#1287) -* 06618c99b Merge pull request #1285 from WhisperSystems/network_error_desc -|\ -| * c4209e793 Don't use "we" in error message copy. -| * c5f6b7b7b Improved error message when network doesn’t allow to access Signal port. -|/ -* 583d3e82a Alternative solution for requiring direct taps for launching media view (#1235) (#1261) -* 29769b4b7 Don't highlight text bubble when long pressing adjacent to text bubble (#1281) -* e7affecc1 FIX: Leaving group should dismiss keyboard #1274 (#1278) -* 0455f0361 Fixes Call Error message text should adapt size to fit localized texts (#1164) (#1178) -* 97fdabf9a (tag: 2.4.0.2) Narrow the bubbles a bit. (#1269) -* 835021b0d Fix extra tall error messages by rendering timestamp (#1268) -* f205ff19f (tag: 2.4.0.1) new translations (#1265) -* b22eafc25 (tag: 2.4.0.0) Merge pull request #1264 from WhisperSystems/fix-audio-notification -|\ -| * f899cff12 Fix in-app audio -| * df63c8624 fix compiler warnings -|/ -* 68b36f707 Fix double sends in group thread when accepting keychange (#1263) -* e7d476371 Must tap directly on bubble to launch fullscreen media view (#1260) -* bd1e99026 Merge pull request #1105 from michaelkirk/fix-cannot-delete-media-messages#704 -|\ -| * 9db3b0db2 (michaelkirk/fix-cannot-delete-media-messages#704) Consistent and efficient media Delete/Copy/Save UX -| * 70197fb48 bump version to 2.4.0 -|/ -* cca4bc451 Merge pull request #1255 from WhisperSystems/update-jsqmvc -|\ -| * db3b2d443 Use upstream corner radius -| * 4ccb295db Send button disabled color and dynamically sized -| * f8d65ab0f Post JSQMVC code cleanup -| * b7dd51438 Move colors into style class -| * 1a4b38e34 Modernize init, dealloc, dicts -| * f7f1b6877 Remove unused call thumbnail code -| * e930574b1 rename our custom JSQ classes to OWS so it's clear what is/not our code. -| * 933281f23 format objc. -| * 4d320d601 Unfork JSQMessagesViewController -|/ -* 987ce5f83 bump release target to 2.3.6.0 (#1256) -* d24d54d4f small IOS9 Fixes (#1253) -* 992dbe586 (tag: 2.3.5.0) Fix crash on unknown attachment (#1249) -* cc47a6df7 Merge pull request #1248 from WhisperSystems/release-target-2.3.5 -|\ -| * 01b00e381 bump release target to 2.3.5.0 -|/ -* 385126027 Merge pull request #1247 from WhisperSystems/ios10-crash-on-attaching-media -|\ -| * 1f1920b64 Fix crash on iOS10 when attaching media -| * d4f2c0f24 ensure picker source available to prevent crash -|/ -* 1e43e139f (tag: 2.3.4.0) Get back on upstream SocketRocket (#1241) -* 2fed645c0 Merge pull request #1239 from WhisperSystems/update-translations -|\ -| * b83bcdab8 updated french and japanese translations -|/ -* e3d94db17 Merge pull request #1238 from WhisperSystems/missing-call-button -|\ -| * a181d218c extract and test contact searcher -| * 8c6bf3cba prefer properties per style -| * 1f31015d5 find phone number regardless of punctuation used in search. -| * 26f541850 Remove distinction between TS and RP users -| * 62633ff7f remove unused code -| * 1e0f0157c namespace ContactsManager -> OWSContactsManager -|/ -* b3bb4c745 Set explicit height for all media types. Audio is the only special case. (#1237) -* 87d2fe113 bump release target to 2.3.4 -* a2862757a crash reporting instructions in issue template (#1235) -* aa9908d43 Large media attachments should be compressed (#1232) -* 76352bf47 (tag: 2.3.3.0) Code Cleanup (#1229) -* 7c84c4569 Only call UI modifying observers when UI is present (#1226) -* bee7c71df Prevent freeze when swiping back twice. (#1224) -* 4a1c53f62 Access contacts atomically to avoid corruption (PR #1223) -* 8f04f863b (tag: 2.3.2.1) hide UI element must happen on main thread (#1220) -* 7fef6aeab Fix crash after deleting message (#1219) -* 965261f46 (tag: 2.3.2.0) attempt to fix intermittent SEGFAULT in SocketRocket (Maybe Fixes #1196) (#1217) -* e7f3092f0 CocoaPods 1.0 update and Travis-CI compatibility (#1216) -* 78a5355b0 (tag: 2.3.1.0) Initialize latestContacts to empty dict (#1207) -* 2565801c3 Fix new localizations (#1206) -* 50d0cd608 Improve debug log hint in issue template (#1204) -* a736e8de6 (tag: 2.3.0.7) Fixes avatar not showing for single contact thread (#1202) -* 83de0d75b (tag: 2.3.0.6) New translations (#1193) -* d7c48578a Fix invite crashing without sms (#1192) -* 9bacc3de7 (tag: 2.3.0.5) Reset compose view on thread switch (#1187) -* da6597118 Fix unable to send invite via sms (#1188) -* 4537324fe (tag: 2.3.0.4) Mark encryption as exempt, per Moxie's instruction. (#1173) -* 496f8117f Update translations (#1172) -* 7f022404d [UI] smaller group action menu icon, revert edit divider to neutral color (#1169) -* b7813bdc9 OpenSSL dependency update. (#1167) -* 5286c032c reset "Load Earlier Messages" when switching threads (#1163) -* f05429b59 (tag: 2.3.0.3) Prevent skewed group image (fixes #756) (#1159) -* 752b0feca Bloom filter migration: check for file before deleting (#1147) -* 9f572881f * Cache cleaning uses YAP notificationsThis way we don't have to worry about cleaning the cache explicitlywhen we do destructive actions.// FREEBIE -* 95ab3d677 must *always* be in main thread when dismissing view controller. (#1114) -* 5869fb8e0 Fix ability to attach photos from camera (#1112) -* c0bb704d2 Cache instantiated interactions (#1152) -* 7d8292fd5 show alert must happen in main thread (#1119) -* 9d4befd08 bump up travis timeout for pod install (#1148) -* fc494d735 Merge pull request #1140 from michaelkirk/fix-screen-protection-image -* 288ee04a1 Merge pull request #1139 from WhisperSystems/backlog -|\ -| * 199ce4926 Fix smooshed launch image on iphone 6 by using storyboard instead of static launch image -| * 721ed066f Fixes This class is not key value coding-compliant for the key "keyPath" -| * 4f38e70a0 Add templates for issues and pull requests -| * 72e1180e1 Removing unused didReceiveMemoryWarning methods from view controllers. -| * 6f1ae778b Update README.md -|/ -* 8abfc3e2b Merge pull request #1138 from WhisperSystems/test_branch -|\ -| * 4034baedb Adapting to renaming. -| * 5ff06afe1 Update dependencies. -| * f44393bb7 Re-introduces the delete action. -| * 91d7ca2f5 Remove reference to + button, which was removed in #950. Fixes #1080 Closes #1092 //FREEBIE -| * b80989032 Fix unused_string.py uses python interpreter. -|/ -* bd377e65a Network Signal and deactivate account row don't highlight. Related #1026 -* 2c83046ff Closes #990. -* 1b02e186f Fixes #146 #147. -* 975cda312 Adding missing queue test. -* a7ec383a7 Fixes #984 Fixes #948. -* 0c1a97a74 Some nits & add corner rounding to the message text box. -* da97349d4 Add subtitle to Screen Security setting to explain its function. -* 489407c46 Closes #1021 #977 #980 -* 3acc47d6a Fixes #832 -* c6d44e59e TextSecureKit Refactoring - Using same clang format file for old and new files. - Moving out all TextSecure code to allow other clients (OS X, iOS) to integrate easily TextSecure functionality. - Use TextSecure API to signup. -* 37b582bed Adding support for animated gifs -* 25293fd40 Fixes #957. -* 53793e3c0 Fixes #950 -* 26f9207ca Bye Bye Bloomfilters -* ab8690799 Merge pull request #900 from big-r81/master -|\ -| * 0c9da220b Showing BitHub price in README.md -* | 861e3d626 (tag: 2.2) Fixes #930 -* | b70be4d55 Fixing bug with reused label appearing bold. -* | 5e4a76622 Fixing Travis configuration. -* | d33c80ddd Pulling in latest translations. -* | 777e7e16f 3D Touch: Quick Compose -* | 0fd9acfb2 Phone emoji -* | c4dcb5f80 Fixes #907 -* | 087b7c38d S3 ATS Policy -* | a29eb5470 Attachment type in notification and description. -* | ef6e658c3 Performance updates & smarter layout (2 lines) -* | 047262b95 Fixing typo in restrictions string. -* | 3d4d4123f Removing APNavigation as a dependency. -* | 8189e593e Fixes glitching of inbox label when coming back from background. -* | 1affdbb32 Closes #891 -* | e98a6217f TLS 1.2 on signaling tcp. -* | 0ad55853f Adding staging environment. -* | bbde7cd2a iOS 9 Support -* | 33428d45f Supporting diffing of localizablestrings. -|/ -* eb94a1114 Fixing issue with message ordering. -* f2e58de16 (tag: 2.1.3) Bump up version number & fetch latest translations. -* c95f19014 Require AddressBook permission. -* 0090030f3 Adding rating code -* 2d5d8db72 Fixes #871 -* ada07351e Support for `supportsVOIP` attribute. -* f0eada265 Merge pull request #877 from orta/stop_spinner -|\ -| * 0ab32b80d Stop the spinner when registration fails on a RegistrationVC -|/ -* c4bf4a8f5 Preliminary iOS9 support and upgrading to CocoaLumberjack 2.0 -* f6c0625c2 Removing unused imported classes. -* e7328bd67 Upgrading cert pinning & flagging release. -* 07abcaf7d Register extra keying material at registration. -* 28dae649d Upgrading OpenSSL to 1.0.2d. //FREEBIE -* 040e4c750 Removing literals and self within block. -* 485748068 Checking the result of SecRandomCopyBytes -* 02560f8b2 (tag: 2.1.1) Flagging release. -* 2fc20702d Fixing crash on responding to phone call. -* 7acd8fff2 Fixing memory issue with allocation of the socket status view. -* 4c96ea1c9 Fixes crash on launch for unregistered users who updated. -* a4014c6ad Upgrading AxolotlKit -* b329062e0 Open SSL 1.0.2c //FREEBIE -* fd3e75b51 (tag: 2.1) Bumping up version number & pulling localizations -* 08e3b31ee Recipient's name in group key conflict on send. -* 912b617a1 Support for Mismatched Devices. -* cd0fb8bc5 Fixing graphical glitch in tread with images. -* 57f86008d UX and Notifications fixes - Removes large confusing UX bar and related assets. Replaced with UISwitch. - Enhanced user experience for missed calls. - Fixes issue where missed call would appear as incoming call in call log. - Fixing issues where PushKit handler not called on launch. -* 93de0a432 UX improvements in how failed messages can be resent. -* ab824b469 Fixing Travis now that it supports SDK8.3 More information at http://blog.travis-ci.com/2015-05-26-xcode-63-beta-general-availability/ -* d347df9a4 App Icon: shift speech bubble up to improve visual alignment -* b1b936e43 Bumping up version number - Upgrading dependencies. - Fetching latest localizations. -* bb1a4c180 Addressing issues with managing socket connections in background. -* 0f04132b8 Bumping up version number -* 0f4529422 Reliability enhancements for notifications. -* 0f57804ee Enable data selectors. -* 61ab11d45 Fixes #775. -* 1550c6121 Addressing issues with background decryption. - Simplifying background timeout strategy for reliabilty. - Adding Notifications settings. - Dropping support for VOIP Push < 8.2 because buggy. -* 2d41a3e25 Permissions dialog description. -* 9652584ad Upgrading dependencies. -* e47e9759e Fixing leaky caches. -* 89dd9efe0 Fixing call message errors. -* 13448bdb2 Notifications enhancements. -* 80b1f2cbc Update CONTRIBUTING.md -* abc63eca2 Fixes issues with registration in iOS simulator. -* dceb1c997 Bump up version number, pull localizations and dependencies -* c6cdbea89 Fixes #761 -* d12c5b308 Fixes #680 -* 8e8ad7668 (tag: 2.0.2) Bump up version number and new localizations -* 788aa8cb4 Dropping some required permissions. Smarter microphone permission. -* 7a5f9f141 Remove initialization on MIMETypeUtil -* 1f61291e0 Addresses some performance issues on loading from database. -* 82a9029c3 Fixes #713 -* fa1791a4d Show phone number instead of "Unknown Caller" in call view. -* 0c93679a3 Fixes #709 -* 5dd8c4747 Fixes #578 -* 9bf5518f6 Fixes #724 -* 099bea05b OpenSSL 1.0.2a -* 8e48c596b Fixes #244 -* e8ea00d71 Perform contact intersection on AddressBook change. -* 0d97edf7a Fixes #673 -* 9c611fad7 Fixes #725 -* ea3789484 Fixes #708 -* a1d0b6b1a Lets user select country by country code. -* ff82f60e0 Fixes #674 -* b3a4a2021 (tag: 2.0.1) Tuning WebSocket heart beat to 30s. -* 5aa560c0e Updating translations for 2.0.1-2 release. -* b6ef5f0b7 Bloomfilter moves to Cache folder -* 50fa491c7 Fixes #620 -* 4873b9538 Bumping up release number to 2.0.1 -* a2f20de41 Code cleanup. -* ee62cbdf2 Fixes #404 -* daac2c0db Fixes #566 -* 7aad5c597 Fixing UX issue with unsynchronized clocks. -* 456d1c479 Fixes #530 -* 212f0d435 Fixes #611 -* 763d56c5d Fixes #613 -* d4e7096e8 Fixes #609 -* c1a2f006b (tag: 2.0) Fixes bug spotted by @jlund with the unread count. -* 24616735e Fixing issue when migration closed and re-opened. -* 311a758d2 Preparing release -* 3ade70804 Fixes based on corbett and abolishme's feedback -* 796882105 Fixing Storyboard warnings. -* 9872bed42 Addressing some storage related fixes. -* 1ede61f27 Localizing the TextSecure component of Signal. -* ae5410fa6 Making sure that registrationID > 0. -* b37683c0e Fixed positioning of "+" on group create screen. -* c5970bfa3 Updating licenses of dependencies. -* 19ca10d43 Allows retry of failed downloads. -* 9569a9b9c Multiple visual enhancements and repo cleanup. -* 23187ec73 New Conversation icon should be a plus (see new_conversation_icon). -* 1befa9861 Should use new Inbox and Archive icons -* be6c412cd Navigation bar hidden upon connection completed. -* d912471a9 Settings and Empty States of the 98 issues list. -* 720177f92 New ringtone. -* 414c44df8 Closes #590 - New Conversation Iconography. -* 667cc983e Closes #589 - Enhancements conversation view. -* 3112bd9a1 Design enhancements, part of #577 -* d70a9403b Empty states. -* 70248837e New avatar placeholders. -* dfdd0a197 Support for `remoteRegistrationId`. -* cbc7a59a5 Tapping signal icon should return user to last conversations mode. Closes #580. -* b80f99b8a Cleanup iconography & fixes #582 -* d6fd2ff61 Fixes #584 #585 #586 -* 5118575d3 Fixing issue with provisioning profiles. -* bbc4e3648 Closes #575 -* 724268046 (tag: 2.0_beta_31_01_2015) Contact ordering and graying out RedPhone-only users. -* 8a5c5efd7 Group avatar relationship for deletion. -* 585079de2 Fixes #553 -* 4833487e9 Removing call recorder + contacts refresh -* 3f81385c2 Resetting status bar to white. -* a6976bac1 Migrations from 1.0.x and 2.0 beta. -* b7d65ce92 Designing the empty state during contact refresh. -* af3cf2520 Support for various screen sizes. -* 0e201939b Updated iTunes artwork -* 6a1a78570 Fixed spacing on inbox number in icon -* 1d1a140d6 Addressing UI issues. -* 1bbfbd428 Replacing Twitter icon with brand guidelines one. -* cf4a12618 Better phone number parsing for SMS. -* 5e92fdbbb Pinning upstream cert. -* 797492fc1 Various enhancements to the groups. -* f0ac231b7 Setting status bars to white as completion of all modal presentations. -* f5848365f Deliberate handling of MIME types for video, audio, and images. -* 994c9d1c5 Attachment with caption fixes. -* 019550701 Removing unused ContactsTableViewController. -* a389344e0 Fixing issue with identity key change messages deletion. -* 499cdfa56 Re-enables user interaction with navbar when view appears. -* 826b73051 Multiple constraints updates & addressing warnings. -* 553a38288 Archiving and correctly sorting empty threads. -* aca02221b Various design and UI consistency improvements. -* 6278152ad New round of iconography. -* 884c96079 Closes #319 -* fb0281fd6 Exclude Signal files from backup & encrypt when possible. -* bcd98f90e Closes #263 -* 529c1346f Closes #303 -* 638dfae66 messaging view and group creation fixes: -* d84ac5a49 New iconography -* 8fa1be362 Contacts table view reloading on contact refresh complete. -* 7f97d84eb Delivery receipts working -* 6d2acb70f in message view compose, ability to call -* 2d6b15333 Replaced all iconography and added new icons -* 91591545a Support for calls & groups in new blue styled format. -* a9ad6643a Close #509 -* 5ccbc4131 Closes #315 -* 478110dc8 Allows unregistering of RedPhone. -* 349d84c87 Vectorial Signal header icon. -* 7d5154b10 Dismiss search bar when new group is created. -* bfe0e44cd Audio attachments: Prevent progress to be set to NaN. -* 0e1a51e88 Fixed empty group avatar issue. -* bf11775e1 Fullscreen image attachment menu. -* 86c524ddb Fixing crashes when deleting single messages. -* 1eef08628 Audio attachments UI -* d740f801c Swipe to delete implemented -* b494b71db Audio farts. -* ccdc4b5d1 Redesign implementation. -* bfd710a9e Upgrading to OpenSSL 1.0.2. -* 84dbc6a45 Closes issue #277 - Fixed speakerphone bug. -* 4f506e670 Merge pull request #382 from jackflips/contributing -|\ -| * 9e3bc8199 added optout message -| * de844446f Merge pull request #381 from joyceyan/my_feature -| |\ -| |/ -|/| -* | 314424d02 modified contributing.md to add git best practices link -|/ -* 7c658b287 Enhancements in build configuration. -* 60fbfd129 Fixes crashes & edge cases for initials string. -* 14164d985 Closes #359 -* 9e8ba9130 Settings refactoring. -* 96dc676bf Addresses multiples UI issues. -* 3a43145c2 Closes #282 - Avatar initials placeholder. -* b954ff244 Closes #261 - Signal 1.0 to 2.0 utility. -* 71320a690 Bypass ratchet and network to discuss with self. -* 07c539c84 Groups: Showing members joining/leaving. -* 5d6ac1f8b Session Warning Label: Renaming the Secure session ended. -* 34ba5efe1 Closes #291 -* b9a71445d End error message sentences with a dot. -* bf8f2bb26 Closes #270 #271 #273 -* f3f3eb55c Fixes crash (since ee07490) on loading empty MessagesVC -* 1784fcf90 Group avatar: Set default one locally if not selected. -* c9c4a9371 Members of groups selection -* ee07490d3 MessagesVC: Paging and fix scrolling bug. -* 9ae4a435a Show name for unregistered contact in threads. -* 2d850021a Fixing bug causing outgoing calls to be cancelled. Closes #264 -* fc6b4b554 New wire format -* 86aea62b8 Groups: Fixes issue discussed in #248 -* 0d7de05a1 Adding building instructions + TextSecure in README -* ffd68d30c Adding support for iPad icons. Closes #255 -* 4c0dbeb98 Group avatar fixes -* 7a1a2c205 Closes #234 -* eff589af9 Closes #236 -* 4cb3231bb Settings: Share fingerprint in tweet (close #210) -* 5cf96b2b0 Incoming call when app closed: updates contact label when available. -* 0266621ce Phone calls in MessageView. -* 2082c2ada Bugfix: Caused private message to not be processed correctly -* af9f8579b Showing name of contact on outgoing phone call -* 9b4afebbd Preventing "null" notifications on group updates and attachments -* c69ce8ad2 Actions on messages notification for replying. -* 5961c635e MessagesVC: Scrolls to bottom and fixes jumpiness -* a93b11145 Groups: Name of leaving user + outgoing message layout. -* e58f9bf96 Groups: Update messages, avatars and bug fixes -* 3c568f704 Bugfix: messages shown as delivered since 312423a -* 93c571dae Removing keying material and wiping messages. -* 402df7230 Attachments handling -* f2217cacd Setting for Image Compression. -* 224cea777 Fixing "jump" on loading MessagesViewController -* 333c920e0 Group functionality -* c74899661 Removing logging statement. -* 8334adb4d Attachments: Sending and receiving -* 9683451ed Rename to 'attachment' -* f8db90014 Attachements: Fixing UI issues -* db74e1756 Fixing crash on notification style setting -* eb8c3e57e Adding Clang Format file -* 3dc21ba65 Receiving and displaying attachements -* 71ad9beeb Fingerprint verification instructions -* 29b8fb6ea Settings: Let user pick notification style -* 03073a9c0 Signup: remove unused segue -* a55b00552 Removing keyboard when proposing new fingerprint. -* e269bd62e Bugfix: Fixes crash on multiple update. -* 80a8c3921 Debug: Logging new password creation. -* c11c4361e Bugfix: Fixing ordering for compose view. -* 6b4f339d7 Identity Key QR verification -* f67e0d13f Support for MITM/key change interface. -* d90d27995 Error handling messages and Info Messages -* dde6fc0a7 Bug fixes in MessageViewController -* daa6bfd65 Fixing crash in MessagesViewController. -* 6868e2234 Messages view fixes -* 32f1cb375 Archive/Inbox: Unread layout and other enhancements -* 708075578 Signup enhancements. -* 5b0914c03 Signup flow: request call. -* 83cc102f9 Immediate feedback on send + unread count badges. -* b5ba841c6 Support for Archiving. (Closes #213) -* 2d722d499 Multiple UI enhancements. -* 5ddb85b6c Modal presentation of the setup view. -* 52d84ae00 LaunchScreens and Screen Security. -* 8435a800d WebSocket Public Key Pinning. -* 54dae0639 Messages: Fix delivered label -* e70fd6391 General: Screenshot protection (closes #216) -* 67a1a4133 Display fingerprints. -* 901640507 Removing developer-specific junk. -* 91e0b6642 Addresses multiple UI issues. - New Contact spacing to let user tap call/message icons - Handeling error messages, delivery receipts, timestamps -* d4f5675a5 Supporting alert on unregistered users + bug fixes. -* 35a2762c5 Starting background fetching of messages. -* 6446c6fbe Socket Management -* 9b5379b3e Messages: Add a failed outgoing message cell -* 211e20aaf Signup: Locking UI while async requests -* 1eff2b3ad Rewriting outgoing pipeline with GCD. -* 851483603 Integrating call and messaging buttons. -* fbbeff70e Handling delivery receipts. -* b22579d8f Settings and thread fixes. -* f1c92b229 Registering by tapping SMS link. -* bf9084a7c WebSocket reconnect. Casting issues. -* 1e3dd3d94 Integration work - thread view -* b58d2fb86 Integrating deletion of threads. -* d73e42bef Integrating Message View. -* 84e12a39c ContactDetail: Link notes -* b3d2544b1 Signals: Fix mistake in removing observer for Socket Notifications -* 0c88202f7 Adapting to changes to SubProtocol and InboxView -* 121ef0439 Integrating the TextSecure Contact Discovery. -* 60ceaab70 Fix error not being shown when failing to verify SMS code -* e48ea5292 ContactDetail: Fix crash on parsedPhoneNumbers -* 60f50e521 ContactDetail: Remove Favourite button -* 756777fd0 InCall: remove blue outline on mute and speaker buttons -* faa447310 SubProto support for WebSocket messages -* 336eb1fa0 Enables Auto-layout on larger screen sizes. -* ad5bb9200 Integrating socket status indicator and remove favorites. -* 8b6ac1359 Fixes InCallViewController & contacts not displayed -* c9056662e Fixing issues with merge -* 6dd04a49f Refactoring signup flow, storage, contacts. -* d876d8a15 Registration refactoring - wip. -* 95c14ddef General: Unused views cleanup -* 64ab73bae General: Unused View controller clean up -* 6524b08ff FullImage: Base of pinching, double tapping & zooming -* e174215b2 Fix Scale: Set Launch Screen -* c3dff810a Registration refactoring - wip. -* 9ca103744 Pods for textSecure fork CI -* b9907b9a3 Laying ground for signup flow refactoring -* 43af8c18e Merging UI code with some basic TextSecureKit code. -* a60bc8be9 Initial Message UI -* 7e555c6c2 Merge pull request #203 from gitter-badger/gitter-badge -|\ -| * af89ae83c Added Gitter badge -|/ -* bb04f27aa Updated Travis configuration and categories guidelines. -* f65d552f6 Prefix NSArray categories. -* 135f139da Merge pull request #200 from Strilanc/warning_fix_235 -|\ -| * abb0486ec Fixed a warning in PriorityQueueTest, and some dot syntax //FREEBIE - Also simplified the comparators -|/ -* 5b64b1815 Merge pull request #197 from gavia/bugfix -|\ -| * 3ddfd9159 phone/ related bug fixes -|/ -* d7bd62ca7 Addressing issues with empty contact names -* 36a24c544 Rate Limiting Message was never displayed. -* 30a6da31c Merge pull request #191 from Strilanc/patch-1 -|\ -| * 867402afa Update doc comment in ZrptManager.h // FREEBIE -|/ -* 26d2c2ac4 Merge pull request #187 from WhisperSystems/gavia-master -|\ -| * 9fac4209b Vibrations and minor fix in audio interrupts -| * 40c7adfda Bump up version number of release. -| * 24ee727d6 Closes #181 -| * 7d4fb1ae1 Updating Pods & translations for release -| * 3031d6852 More advanced fixes for push notifications on iOS7 -| * f771487aa Fixing singleton initialization -| * 6951fd1fb Fixed issue #139. -* | fbd7813c3 (tag: 1.0.8) Bump up version number of release. -* | eed0dad4a Closes #181 -* | 3072e85b0 Updating Pods & translations for release -* | 5091c53aa More advanced fixes for push notifications on iOS7 -* | f8d201fc5 Fixing singleton initialization -|/ -* efdda2f07 Update Building to note non-operational. //FREEBIE -* 5854eed86 (tag: 1.0.7) Updating localizations -* c572132c9 Fixing iOS 7 push notification issue -* 7b388da35 Closes #174 -* 356bf0b0b Merge pull request #161 from Strilanc/partial_uint_parse_fix -|\ -| * a060bea69 Found a method to parse NSUInteger exactly and precisely //FREEBIE -| * 00ea396ff Merge branch 'master' of https://github.com/WhisperSystems/Signal-iOS into partial_uint_parse_fix -| |\ -| |/ -|/| -* | 1cf6efb47 Updating Travis for iOS 8.0 support -* | cbdbcb2a1 (tag: 1.0.6.2) Fixing build & signing settings for contributors -* | 8d30498b6 (tag: 1.0.6) Fetching translations from Transifex -* | 43ca8b511 Fixing registration issues -* | 953d4d80f Syntax fixes from #172 -* | d05791e69 Moving away from custom HTTP stack -* | 510831d70 Auto-layout enhancements + Submit Debug Logs -* | 779e9d1b3 Multiple fixes -* | 002909f74 Merge pull request #165 from abcdev/unuglify-icon -|\ \ -| * | 46efc484f Removed wrong/unnecessary/ugly black border. Removed 512x512 version. Since it is supported by iTunes Connect anymore. -| * | a3cf2ed30 Rerendered Icon in iOS 7 and iOS 8 style. It was rendered with a wrong and useless border before. -|/ / -* | 3c28bb952 Enabling new screen sizes -| * f98d661ea Removed size-assuming NSUInteger parsing tests -|/ -* 06a459785 Fixed RecentCall unconditionally setting userNotified, even for missed calls //FREEBIE -* b9cf163b1 Same fixes applied to unit test code signing //FREEBIE -* 44a19a5d7 Attempting to fix code signing issues - Changed run scheme back to "Debug" from ad-hoc distribution - Reset provisioning profile build settings to automatic - Reset code signing identity build settings to just iOS Distribution / iOS Developer - Reset Development Team to "None" (it seemed to be forcing the automatically chosen debugging cert to be one from whisper systems) FREEBIE -* cd0bda710 (tag: 1.0.5) iOS 8 Support -* 8b42036f1 Reverting timestamp RTP field -* 854046d97 Typo fix FREEBIE -* f1de95ab0 Recursively added dot syntax, translating more terms when they were encountered in the dif FREEBIE -* f582dd7a2 Merge pull request #150 from Strilanc/speex_warnings_ignore -|\ -| * 99b61c4a3 Disabled warnings that were firing in the sub-project for the third-party speex code. -|/ -* 476d9a0d9 Merge pull request #148 from Strilanc/modernate_1 -|\ -| * baaef7832 Using dot syntax for local*, all*, full*, first*, last*, to*, encodedAs*, copy* FREEBIE -|/ -* 54043cd80 Merge pull request #145 from Strilanc/audio_stampery -|\ -| * 97e2285b2 Setting timestamp based on number of samples sent - Added timeStamp property to EncodedAudioPacket - Added timeStamp parameter to rtpPackageWithDefaults constructor - Added nextTimeStamp to AudioPacker with random initial value and sample length increases - AudioSocket forwards timeStamp - Added generateSecureRandomUInt32 to CryptoTools - Updated tests FREEBIE -|/ -* 611f5c5f0 Closes #138 -* ae5039529 Fixed single-character cuts being mistaken for backspace presses //FREEBIE -* 03ce3635c Improved the phone number editing during registration - Fixed a crash where an offset wrapped around when deleting the opening bracket - Backspacing now skips over formatting characters - Cursor position is maintained more accurately when reformatting - Added a few utility methods - Also fixed a test not having "test" as a prefix, causing it not to run //FREEBIE -* e9f8881bd Checking error codes and cleaning up when errors occur in EvpKeyAgreement - Added a test to actually exercise the DH agreement path //FREEBIE -* 4dd8df804 Updating dependencies -* 5401056d3 Checked indentation, future source results, directory layout, thenTry vs then, dependencies -* ced4fc894 Initial work to depend on external futures library instead of internal implementation -* 5d31f76f3 Fixed packEcCoordinatesFromEcPoint having variable-sized output, prevent reconstruction of public key -* 4cd30f32e Using getter syntax for shared*, is*, and has* -* 1793d41b8 Merge pull request #116 from Strilanc/modern_0 -|\ -| * a3b438b04 Retry build -| * 9e3687264 Using dot syntax for count and length -* | 8bd42de61 (tag: 1.0.4-2) Pulling new translations -* | dc4e4689e (tag: 1.0.4-1) Checks and extra logging for login issues -* | c52c6c624 Clearing notifications from notification center -|/ -* 84eb87ac6 Manually refactored cases the refactoring to Modern Objective-C was complaining about //FREEBIE -* 1e9a3e9a4 Ran "Edit -> Refactor -> Convert to Modern Objective-C Syntax" - dictionaryWithObject -> @{key: val} - objectAtIndex -> a[i] - numberWithBool/Int/etc -> @1, @(val) - Reverted friendly fire on ProtocolBuffers - Did not do ANY other changes (including changes to make more refactorings succeed) //FREEBIE -* 6fd78ef14 Added canary test to notify future maintainers when safety pads can be removed from spandsp usage //FREEBIE -* 76b94c80d (tag: 1.0.4) Updating Pods -* 491bb2f8c Updating translations -* 5b53e33cc Revert "Updating to spandsp-0.0.6" -* ecea5d6e5 Updating to spandsp-0.0.6 -* 50e1b8012 Fixing localization and performance issues -* 619b53cb0 Screen security feature. Closes #31 -* f5bbf9d48 Enhancements to certificate pinning -* aca4733ac Multiple fixes -* 2a0b0cbff Updating OpenSSL -* 56b3d5475 Fix link to travis build status in README.md //FREEBIE -* 9051045b9 Fixes for Travis setup -* bf8f60bf0 Adding submodule -* 6c027c2ed Removing dependencies -* 9240a095a Travis CI-support and iOS8 push notifications -* 0d7e2d2f2 Caching ressources for Travis -* dd73eafe4 Preparing tests for Travis -* db1927373 Xcode project file fix -* 2031a9509 UInt16 variance test //FREEBIE -* 60e3b1459 Updating translations -* a4eb34b23 (tag: 1.0.3) Only display contacts that have a phone number -* 5ac7acfbc Enhancements in the verification flow -* 7ab15a580 Updating translations //FREEBIE -* da3819b1c Merge branch 'testingBranch' -|\ -| * 9c31b9ab6 Logging migration errors -| * 1519bba1e Merge branch 'master' into testingBranch -| |\ -| |/ -|/| -* | c2d78bba1 Migration scheme -* | 17571b6c5 Closes #52 -* | 120c50f2e Merge pull request #81 from abcdev/patch-issue-70 -|\ \ -| * | df89f4e00 Closes #70 -* | | 60fb869ba Closes #80 #37 -|/ / -* | 3113665f0 Removing some test headers -* | cb0c7ff60 Merge branch 'postLaunchFixes' of github.com:WhisperSystems/Signal-iOS into postLaunchFixes -|\ \ -| * | 91dadcc48 Add translation link -| * | 004030946 Adding App Store Link -| * | afd5be4c3 Closes #75 -| * | b21c1ee1f Closes #67 -| * | a588f27c6 Transitioning off custom preference files -* | | c33e38e92 Merging various bug fixes -* | | 1bc219368 Add translation link -* | | 3a8acb7f8 Adding App Store Link -* | | 7ec22427c Closes #75 -* | | 755bc5961 Closes #67 -* | | 9465423c7 Transitioning off custom preference files -* | | 021468ff4 Fix case of openssl/ includes for case-sensitive build environments. -* | | 65e9b4782 Class comment in the header. -* | | e48bea1a3 Final removal of the CryptoUtils class name, replaced with CryptoTools. -* | | eabb5f43f Handshake HMAC Authentication success/failure test. Random uint16 generation variance testing for full CryptoTools test coverage. Removal of stub tests. -* | | 88a3886bd Merge pull request #32 from ygini/hotfix/ReadMe_TypoInProjectName -|\ \ \ -| |/ / -|/| | -| * | 849219c61 Fix the project name (who was TextSecure iOS instead of Signal iOS). -|/ / -* | 19ff47e27 Closes #27 -* | 0ff4ceb5f Closes #25 -* | 9b97b8a4c (tag: 1.3, tag: 1.2, tag: 1.0.2) Bump up version number for App Store release -* | 0941d485c New wording for support features -* | 5c124c647 Using PastelogKit -* | a6bac7cbf Merge branch 'AdvancedNetworkLogging' -|\ \ -| * \ e61a8c2aa Merge branch 'master' into AdvancedNetworkLogging -| |\ \ -* | | | cc0075eba Fixing typo in strings -* | | | 44bd921db Changes for arm64 and Clang redefined-types -* | | | 675956f79 Goodbye OCTest, Hello XCTest -| |/ / -|/| | -* | | ad6ff2361 Merge branch 'AdvancedNetworkLogging' -|\ \ \ -| |/ / -| * | c839f05c1 Cleaning environment prefs -| * | 05fe10612 Advanced network logging -|/ / -* | 4acd43a09 Fixing NSNumber to BOOL conversion -* | 8fb14356e Merge branch 'Keychain-store' -|\ \ -| * | 4a6d80765 Fixing #18 -| * | cfbcdc5a5 Re-registering, generating new server passwords -| * | 021da47a9 Bug fixes + Keychain store -|/ / -* | a813ecbff Fixing localization bug -* | 09b6fdea1 Adding more logging to address the initialization issues -* | 120fc196b Bumping up version number -* | e93c27e22 Additional call anonymous logging -* | bdf6f957a NSComparator for unit tests -* | 930a601fb Localized challenge alertview -* | 766174016 Localized sign up messages and gist log upload -* | 6efa1cd35 Removing non-used debug environment -* | c69747e48 (tag: 0.1) Production logging & sign up error handling -* | 6c2f33a6d Updating OpenSSL to 1.0.1h -* | c1f797aeb Merge pull request #10 from mcginty/phone-icons -|\ \ -| * | 7aef8b7d4 updated phone icon -* | | 8d98e22d2 Fixing name in repo -|/ / -* | bd1741e94 Merge pull request #4 from jazzz/hotfix/callerid -|\ \ -* | | 5ca65914a Update CONTRIBUTING.md -| | * db33d636e Migration scheme -| | * 68f96d562 Closes #52 -| | * 46b869628 Closes #80 #37 -| | * 5812f80d4 Closes #70 -| | * 9703e601b slight refactoring to fit code style -| | * bde62ed7c do not reposition cursor to end of number on change -| | * d8ee13f04 respect cursor position for insert and delte -| | * 6890ac3b4 Removing some test headers -| | * 3f8f7d6a9 Merge branch 'postLaunchFixes' of github.com:WhisperSystems/Signal-iOS into postLaunchFixes -| | |\ -| | | * c1aa5346f Add translation link -| | | * 3a691d178 Adding App Store Link -| | | * db9c29f50 Closes #75 -| | | * 70865f3eb Closes #67 -| | | * 6ee267a5f Transitioning off custom preference files -| | * | a470b6eef Merging various bug fixes -| | * | 4c3943673 Add translation link -| | * | 645846c41 Adding App Store Link -| | * | defa69308 Closes #75 -| | * | 19eb620fb Closes #67 -| | * | c73e6b65e Transitioning off custom preference files -| | * | 583373ba7 Fix case of openssl/ includes for case-sensitive build environments. -| | * | c15115c5f Class comment in the header. -| | * | bba541806 Final removal of the CryptoUtils class name, replaced with CryptoTools. -| | * | 6e48eba05 Handshake HMAC Authentication success/failure test. Random uint16 generation variance testing for full CryptoTools test coverage. Removal of stub tests. -| | * | c0a9e8092 Merge pull request #32 from ygini/hotfix/ReadMe_TypoInProjectName -| | |\ \ -| | | |/ -| | |/| -| | | * b41d50681 Fix the project name (who was TextSecure iOS instead of Signal iOS). -| | |/ -| | * f317c76a8 Closes #27 -| | * 29bd2f078 Closes #25 -| | * f4212284e Bump up version number for App Store release -| | * 9260116fa New wording for support features -| | * b574fcda5 Using PastelogKit -| | * e965a1234 Merge branch 'AdvancedNetworkLogging' -| | |\ -| | | * 750f64f85 Merge branch 'master' into AdvancedNetworkLogging -| | | |\ -| | * | | 3428c724b Fixing typo in strings -| | * | | 556769cff Changes for arm64 and Clang redefined-types -| | * | | adf81b4ae Goodbye OCTest, Hello XCTest -| | | |/ -| | |/| -| | * | 14e7ce623 Merge branch 'AdvancedNetworkLogging' -| | |\ \ -| | | |/ -| | | * 4b2acd62f Cleaning environment prefs -| | | * 3031ae741 Advanced network logging -| | |/ -| | * 24b09ccc2 Fixing NSNumber to BOOL conversion -| | * d4855cea1 Merge branch 'Keychain-store' -| | |\ -| | | * 5e9285ef6 Fixing #18 -| | | * 196d63fee Re-registering, generating new server passwords -| | | * 2cdb05754 Bug fixes + Keychain store -| | |/ -| | * 09fcf2ff0 Fixing localization bug -| | * fe41d3379 Adding more logging to address the initialization issues -| | * e8b9a831d Bumping up version number -| | * 407c64f6e Additional call anonymous logging -| | * 61264a480 NSComparator for unit tests -| | * 6d76b8b27 Localized challenge alertview -| | * 2a58c03b9 Localized sign up messages and gist log upload -| | * dca3c74bc Removing non-used debug environment -| | * 9d6ca82e8 Production logging & sign up error handling -| | * febb719c6 Updating OpenSSL to 1.0.1h -| | * 3488752d4 Merge pull request #10 from mcginty/phone-icons -| | |\ -| | | * 56509dc17 updated phone icon -| | * | 45b8c1564 Fixing name in repo -| | |/ -| | * 3c3436643 Merge pull request #4 from jazzz/hotfix/callerid -| | |\ -| | |/ -| |/| -| * | 08b68abb5 properly update callerid for incoming calls -|/ / -| * b9e80b263 Update CONTRIBUTING.md -|/ -* 109ecb36b Cleaning up unnecessary headers -* a6bf14385 (tag: 1.0) Cleaner Keychain storage -* 637350710 initial commit From 6ab8ea9b6ee46b3b292775e56a2f9dd02806e934 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 11:13:06 -0400 Subject: [PATCH 331/493] Respond to CR. --- Signal/Signal-Info.plist | 2 +- .../ConversationViewController.m | 93 +++++++++---------- .../ConversationView/ConversationViewModel.h | 15 ++- .../ConversationView/ConversationViewModel.m | 82 ++++++++++------ .../MenuActionsViewController.swift | 6 +- 5 files changed, 118 insertions(+), 80 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 0e7535531..d5218f796 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -9,7 +9,7 @@ OSXVersion 10.14.3 WebRTCCommit - 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 + 1445d719bf05280270e9f77576f80f973fd847f8 M73 CFBundleDevelopmentRegion en diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index c0b18ad11..9aa7c893d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -212,7 +212,7 @@ typedef enum : NSUInteger { @property (nonatomic, nullable) NSString *lastSearchedText; @property (nonatomic) BOOL isShowingSearchUI; @property (nonatomic, nullable) MenuActionsViewController *menuActionsViewController; -@property (nonatomic) CGFloat contentInsetPadding; +@property (nonatomic) CGFloat extraContentInsetPadding; @end @@ -749,7 +749,7 @@ typedef enum : NSUInteger { if (!self.viewHasEverAppeared) { [self scrollToDefaultPosition]; } else if (self.menuActionsViewController != nil) { - [self scrollToFocusInteraction:NO]; + [self scrollToMenuActionInteraction:NO]; } [self updateLastVisibleSortId]; @@ -763,7 +763,7 @@ typedef enum : NSUInteger { - (NSArray> *)viewItems { - return self.conversationViewModel.viewItems; + return self.conversationViewModel.viewState.viewItems; } - (ThreadDynamicInteractions *)dynamicInteractions @@ -773,14 +773,11 @@ typedef enum : NSUInteger { - (NSIndexPath *_Nullable)indexPathOfUnreadMessagesIndicator { - NSInteger row = 0; - for (id viewItem in self.viewItems) { - if (viewItem.unreadIndicator) { - return [NSIndexPath indexPathForRow:row inSection:0]; - } - row++; + NSNumber *_Nullable unreadIndicatorIndex = self.conversationViewModel.viewState.unreadIndicatorIndex; + if (unreadIndicatorIndex == nil) { + return nil; } - return nil; + return [NSIndexPath indexPathForRow:unreadIndicatorIndex.integerValue inSection:0]; } - (NSIndexPath *_Nullable)indexPathOfMessageOnOpen @@ -1981,11 +1978,11 @@ typedef enum : NSUInteger { // which we might want to scroll to the bottom of the screen to // pin above the menu actions popup. CGSize mainScreenSize = UIScreen.mainScreen.bounds.size; - self.contentInsetPadding = MAX(mainScreenSize.width, mainScreenSize.height); + self.extraContentInsetPadding = MAX(mainScreenSize.width, mainScreenSize.height); UIEdgeInsets contentInset = self.collectionView.contentInset; - contentInset.top += self.contentInsetPadding; - contentInset.bottom += self.contentInsetPadding; + contentInset.top += self.extraContentInsetPadding; + contentInset.bottom += self.extraContentInsetPadding; self.collectionView.contentInset = contentInset; self.menuActionsViewController = menuActionsViewController; @@ -1996,14 +1993,14 @@ typedef enum : NSUInteger { OWSLogVerbose(@""); // Changes made in this "is presenting" callback are animated by the caller. - [self scrollToFocusInteraction:NO]; + [self scrollToMenuActionInteraction:NO]; } - (void)menuActionsDidPresent:(MenuActionsViewController *)menuActionsViewController { OWSLogVerbose(@""); - [self scrollToFocusInteraction:NO]; + [self scrollToMenuActionInteraction:NO]; } - (void)menuActionsIsDismissing:(MenuActionsViewController *)menuActionsViewController @@ -2038,24 +2035,26 @@ typedef enum : NSUInteger { } UIEdgeInsets contentInset = self.collectionView.contentInset; - contentInset.top -= self.contentInsetPadding; - contentInset.bottom -= self.contentInsetPadding; + contentInset.top -= self.extraContentInsetPadding; + contentInset.bottom -= self.extraContentInsetPadding; self.collectionView.contentInset = contentInset; self.menuActionsViewController = nil; - self.contentInsetPadding = 0; + self.extraContentInsetPadding = 0; } -- (void)scrollToFocusInteractionIfNecessary +- (void)scrollToMenuActionInteractionIfNecessary { if (self.menuActionsViewController != nil) { - [self scrollToFocusInteraction:NO]; + [self scrollToMenuActionInteraction:NO]; } } -- (void)scrollToFocusInteraction:(BOOL)animated +- (void)scrollToMenuActionInteraction:(BOOL)animated { - NSValue *_Nullable contentOffset = [self contentOffsetForFocusInteraction]; + OWSAssertDebug(self.menuActionsViewController); + + NSValue *_Nullable contentOffset = [self contentOffsetForMenuActionInteraction]; if (contentOffset == nil) { OWSFailDebug(@"Missing contentOffset."); return; @@ -2063,11 +2062,13 @@ typedef enum : NSUInteger { [self.collectionView setContentOffset:contentOffset.CGPointValue animated:animated]; } -- (nullable NSValue *)contentOffsetForFocusInteraction +- (nullable NSValue *)contentOffsetForMenuActionInteraction { - NSString *_Nullable focusedInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; - if (focusedInteractionId == nil) { - // This is expected if there is no focus interaction. + OWSAssertDebug(self.menuActionsViewController); + + NSString *_Nullable menuActionInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; + if (menuActionInteractionId == nil) { + OWSFailDebug(@"Missing menu action interaction."); return nil; } CGPoint modalTopWindow = [self.menuActionsViewController.focusUI convertPoint:CGPointZero toView:nil]; @@ -2075,18 +2076,13 @@ typedef enum : NSUInteger { CGPoint offset = modalTopLocal; CGFloat focusTop = offset.y - self.menuActionsViewController.vSpacing; - NSIndexPath *_Nullable indexPath = nil; - for (NSUInteger i = 0; i < self.viewItems.count; i++) { - id viewItem = self.viewItems[i]; - if ([viewItem.interaction.uniqueId isEqualToString:focusedInteractionId]) { - indexPath = [NSIndexPath indexPathForRow:(NSInteger)i inSection:0]; - break; - } - } - if (indexPath == nil) { - // This is expected if the focus interaction is being deleted. + NSNumber *_Nullable interactionIndex + = self.conversationViewModel.viewState.interactionIndexMap[menuActionInteractionId]; + if (interactionIndex == nil) { + // This is expected if the menu action interaction is being deleted. return nil; } + NSIndexPath *indexPath = [NSIndexPath indexPathForRow:interactionIndex.integerValue inSection:0]; UICollectionViewLayoutAttributes *_Nullable layoutAttributes = [self.layout layoutAttributesForItemAtIndexPath:indexPath]; if (layoutAttributes == nil) { @@ -2109,16 +2105,12 @@ typedef enum : NSUInteger { if (!OWSWindowManager.sharedManager.isPresentingMenuActions) { return NO; } - NSString *_Nullable focusedInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; - if (focusedInteractionId == nil) { + NSString *_Nullable menuActionInteractionId = self.menuActionsViewController.focusedInteraction.uniqueId; + if (menuActionInteractionId == nil) { return NO; } - for (id viewItem in self.viewItems) { - if ([viewItem.interaction.uniqueId isEqualToString:focusedInteractionId]) { - return NO; - } - } - return YES; + // Check whether there is still a view item for this interaction. + return (self.conversationViewModel.viewState.interactionIndexMap[menuActionInteractionId] == nil); } #pragma mark - ConversationViewCellDelegate @@ -3857,8 +3849,8 @@ typedef enum : NSUInteger { newInsets.top = 0; newInsets.bottom = MAX(0, self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y); - newInsets.top += self.contentInsetPadding; - newInsets.bottom += self.contentInsetPadding; + newInsets.top += self.extraContentInsetPadding; + newInsets.bottom += self.extraContentInsetPadding; BOOL wasScrolledToBottom = [self isScrolledToBottom]; @@ -4515,7 +4507,7 @@ typedef enum : NSUInteger { targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset { if (self.menuActionsViewController != nil) { - NSValue *_Nullable contentOffset = [self contentOffsetForFocusInteraction]; + NSValue *_Nullable contentOffset = [self contentOffsetForMenuActionInteraction]; if (contentOffset != nil) { return contentOffset.CGPointValue; } @@ -4768,6 +4760,11 @@ typedef enum : NSUInteger { OWSAssertDebug(conversationUpdate); OWSAssertDebug(self.conversationViewModel); + if (!self.viewLoaded) { + OWSLogVerbose(@"Ignoring update; view has not yet loaded."); + return; + } + [self updateBackButtonUnreadCount]; [self updateNavigationBarSubtitleLabel]; [self dismissMenuActionsIfNecessary]; @@ -5018,7 +5015,7 @@ typedef enum : NSUInteger { [strongSelf updateInputToolbarLayout]; if (self.menuActionsViewController != nil) { - [self scrollToFocusInteraction:NO]; + [self scrollToMenuActionInteraction:NO]; } else if (lastVisibleIndexPath) { [strongSelf.collectionView scrollToItemAtIndexPath:lastVisibleIndexPath atScrollPosition:UICollectionViewScrollPositionBottom diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h index b9fafcd2f..a4025f1f7 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.h @@ -34,6 +34,19 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { #pragma mark - +@interface ConversationViewState : NSObject + +@property (nonatomic, readonly) NSArray> *viewItems; +@property (nonatomic, readonly) NSDictionary *interactionIndexMap; +// We have to track interactionIds separately. We can't just use interactionIndexMap.allKeys, +// as that won't preserve ordering. +@property (nonatomic, readonly) NSArray *interactionIds; +@property (nonatomic, readonly, nullable) NSNumber *unreadIndicatorIndex; + +@end + +#pragma mark - + @interface ConversationUpdateItem : NSObject @property (nonatomic, readonly) ConversationUpdateItemType updateItemType; @@ -82,7 +95,7 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) { @interface ConversationViewModel : NSObject -@property (nonatomic, readonly) NSArray> *viewItems; +@property (nonatomic, readonly) ConversationViewState *viewState; @property (nonatomic, nullable) NSString *focusMessageIdOnOpen; @property (nonatomic, readonly, nullable) ThreadDynamicInteractions *dynamicInteractions; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m index 2bb7925a9..3c34ab266 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m @@ -44,6 +44,50 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - +@implementation ConversationViewState + +- (instancetype)initWithViewItems:(NSArray> *)viewItems +{ + self = [super init]; + if (!self) { + return self; + } + + _viewItems = viewItems; + NSMutableDictionary *interactionIndexMap = [NSMutableDictionary new]; + NSMutableArray *interactionIds = [NSMutableArray new]; + for (NSUInteger i = 0; i < self.viewItems.count; i++) { + id viewItem = self.viewItems[i]; + interactionIndexMap[viewItem.interaction.uniqueId] = @(i); + [interactionIds addObject:viewItem.interaction.uniqueId]; + + if (viewItem.unreadIndicator != nil) { + _unreadIndicatorIndex = @(i); + } + } + _interactionIndexMap = [interactionIndexMap copy]; + _interactionIds = [interactionIds copy]; + + return self; +} + +- (nullable id)unreadIndicatorViewItem +{ + if (self.unreadIndicatorIndex == nil) { + return nil; + } + NSUInteger index = self.unreadIndicatorIndex.unsignedIntegerValue; + if (index >= self.viewItems.count) { + OWSFailDebug(@"Invalid index."); + return nil; + } + return self.viewItems[index]; +} + +@end + +#pragma mark - + @implementation ConversationUpdateItem - (instancetype)initWithUpdateItemType:(ConversationUpdateItemType)updateItemType @@ -150,7 +194,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; // * Afterward, we must prod the view controller to update layout & view state. @property (nonatomic) ConversationMessageMapping *messageMapping; -@property (nonatomic) NSArray> *viewItems; +@property (nonatomic) ConversationViewState *viewState; @property (nonatomic) NSMutableDictionary> *viewItemCache; @property (nonatomic, nullable) ThreadDynamicInteractions *dynamicInteractions; @@ -187,6 +231,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; _persistedViewItems = @[]; _unsavedOutgoingMessages = @[]; self.focusMessageIdOnOpen = focusMessageIdOnOpen; + _viewState = [[ConversationViewState alloc] initWithViewItems:@[]]; [self configure]; @@ -492,22 +537,12 @@ static const int kYapDatabaseRangeMaxLength = 25000; } } -- (nullable id)viewItemForUnreadMessagesIndicator -{ - for (id viewItem in self.viewItems) { - if (viewItem.unreadIndicator) { - return viewItem; - } - } - return nil; -} - - (void)clearUnreadMessagesIndicator { OWSAssertIsOnMainThread(); // TODO: Remove by making unread indicator a view model concern. - id _Nullable oldIndicatorItem = [self viewItemForUnreadMessagesIndicator]; + id _Nullable oldIndicatorItem = [self.viewState unreadIndicatorViewItem]; if (oldIndicatorItem) { // TODO ideally this would be happening within the *same* transaction that caused the unreadMessageIndicator // to be cleared. @@ -613,10 +648,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; } } - NSMutableArray *oldItemIdList = [NSMutableArray new]; - for (id viewItem in self.viewItems) { - [oldItemIdList addObject:viewItem.itemId]; - } + NSArray *oldItemIdList = self.viewState.interactionIds; // We need to reload any modified interactions _before_ we call // reloadViewItems. @@ -655,7 +687,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } - OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldItemIdList.count, self.viewItems.count); + OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldItemIdList.count, self.viewState.viewItems.count); [self updateViewWithOldItemIdList:oldItemIdList updatedItemSet:updatedItemSet]; } @@ -668,10 +700,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; OWSLogVerbose(@""); - NSMutableArray *oldItemIdList = [NSMutableArray new]; - for (id viewItem in self.viewItems) { - [oldItemIdList addObject:viewItem.itemId]; - } + NSArray *oldItemIdList = self.viewState.interactionIds; if (![self reloadViewItems]) { // These errors are rare. @@ -682,7 +711,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } - OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldItemIdList.count, self.viewItems.count); + OWSLogVerbose(@"self.viewItems.count: %zd -> %zd", oldItemIdList.count, self.viewState.viewItems.count); [self updateViewWithOldItemIdList:oldItemIdList updatedItemSet:[NSSet set]]; } @@ -698,10 +727,9 @@ static const int kYapDatabaseRangeMaxLength = 25000; return; } - NSMutableArray *newItemIdList = [NSMutableArray new]; + NSArray *newItemIdList = self.viewState.interactionIds; NSMutableDictionary> *newViewItemMap = [NSMutableDictionary new]; - for (id viewItem in self.viewItems) { - [newItemIdList addObject:viewItem.itemId]; + for (id viewItem in self.viewState.viewItems) { newViewItemMap[viewItem.itemId] = viewItem; } @@ -1510,7 +1538,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; viewItem.senderName = senderName; } - self.viewItems = viewItems; + self.viewState = [[ConversationViewState alloc] initWithViewItems:viewItems]; self.viewItemCache = viewItemCache; return !hasError; @@ -1661,7 +1689,7 @@ static const int kYapDatabaseRangeMaxLength = 25000; // Update the view items if necessary. // We don't have to do this if they haven't been configured yet. - if (didChange && self.viewItems != nil) { + if (didChange && self.viewState.viewItems != nil) { // When we receive an incoming message, we clear any typing indicators // from that sender. Ideally, we'd like both changes (disappearance of // the typing indicators, appearance of the incoming message) to show up diff --git a/Signal/src/ViewControllers/MenuActionsViewController.swift b/Signal/src/ViewControllers/MenuActionsViewController.swift index c54dc0546..4e04f6c76 100644 --- a/Signal/src/ViewControllers/MenuActionsViewController.swift +++ b/Signal/src/ViewControllers/MenuActionsViewController.swift @@ -36,7 +36,7 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { weak var delegate: MenuActionsViewControllerDelegate? @objc - public let focusedInteraction: TSInteraction? + public let focusedInteraction: TSInteraction private let focusedView: UIView private let actionSheetView: MenuActionSheetView @@ -46,7 +46,7 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { } @objc - required init(focusedInteraction: TSInteraction?, focusedView: UIView, actions: [MenuAction]) { + required init(focusedInteraction: TSInteraction, focusedView: UIView, actions: [MenuAction]) { self.focusedView = focusedView self.focusedInteraction = focusedInteraction @@ -180,7 +180,7 @@ class MenuActionsViewController: UIViewController, MenuActionSheetDelegate { public let vSpacing: CGFloat = 10 @objc - public func focusUI() -> UIView { + public var focusUI: UIView { return actionSheetView } From 9fe3aa06ed57e24460e6f3aedb3aaf4d7b6ee4f0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 11:15:09 -0400 Subject: [PATCH 332/493] Respond to CR. --- .../ConversationView/ConversationViewController.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 9aa7c893d..9f826a3ff 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4761,7 +4761,8 @@ typedef enum : NSUInteger { OWSAssertDebug(self.conversationViewModel); if (!self.viewLoaded) { - OWSLogVerbose(@"Ignoring update; view has not yet loaded."); + // It's safe to ignore updates before the view loads; + // viewWillAppear will call resetContentAndLayout. return; } From 96dda0cacf0150f7a54fee65677c92f941f13c51 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 12:06:13 -0700 Subject: [PATCH 333/493] "Bump build to 2.38.0.5." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index d5218f796..203e8b1c0 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.4 + 2.38.0.5 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index d9aed993d..b4e57b908 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.4 + 2.38.0.5 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From aa46113b4af4917e3bd9208e907f8c29e531ace8 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 12:08:40 -0700 Subject: [PATCH 334/493] disable custom capture flow for now --- SignalServiceKit/src/Util/FeatureFlags.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index afe797338..4d58938c0 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -22,6 +22,6 @@ public class FeatureFlags: NSObject { @objc public static var useCustomPhotoCapture: Bool { - return true + return false } } From 7d72244315d7d5d834e1d262411bf2a6e7b30f0f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 12:09:53 -0700 Subject: [PATCH 335/493] autogenstrings --- Signal/translations/en.lproj/Localizable.strings | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 6ee9840fa..8b2e4cdeb 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -116,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloading…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Error Sending Attachment"; @@ -1643,6 +1637,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; From 6ccd73837c5e8cdcf22f7d7de72dcbf7444594f5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 10:27:31 -0700 Subject: [PATCH 336/493] rename haptic classes, no change in functionality --- Signal/src/UserInterface/HapticFeedback.swift | 39 +++++++++---------- .../MenuActionsViewController.swift | 4 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Signal/src/UserInterface/HapticFeedback.swift b/Signal/src/UserInterface/HapticFeedback.swift index beb47fd6a..672e33803 100644 --- a/Signal/src/UserInterface/HapticFeedback.swift +++ b/Signal/src/UserInterface/HapticFeedback.swift @@ -1,24 +1,37 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation -protocol HapticAdapter { +protocol SelectionHapticFeedbackAdapter { func selectionChanged() } -class LegacyHapticAdapter: NSObject, HapticAdapter { +class SelectionHapticFeedback: SelectionHapticFeedbackAdapter { + let adapter: SelectionHapticFeedbackAdapter - // MARK: HapticAdapter + init() { + if #available(iOS 10, *) { + adapter = ModernSelectionHapticFeedbackAdapter() + } else { + adapter = LegacySelectionHapticFeedbackAdapter() + } + } + func selectionChanged() { + adapter.selectionChanged() + } +} + +class LegacySelectionHapticFeedbackAdapter: NSObject, SelectionHapticFeedbackAdapter { func selectionChanged() { // do nothing } } @available(iOS 10, *) -class FeedbackGeneratorHapticAdapter: NSObject, HapticAdapter { +class ModernSelectionHapticFeedbackAdapter: NSObject, SelectionHapticFeedbackAdapter { let selectionFeedbackGenerator: UISelectionFeedbackGenerator override init() { @@ -33,19 +46,3 @@ class FeedbackGeneratorHapticAdapter: NSObject, HapticAdapter { selectionFeedbackGenerator.prepare() } } - -class HapticFeedback: HapticAdapter { - let adapter: HapticAdapter - - init() { - if #available(iOS 10, *) { - adapter = FeedbackGeneratorHapticAdapter() - } else { - adapter = LegacyHapticAdapter() - } - } - - func selectionChanged() { - adapter.selectionChanged() - } -} diff --git a/Signal/src/ViewControllers/MenuActionsViewController.swift b/Signal/src/ViewControllers/MenuActionsViewController.swift index 4e04f6c76..d23799801 100644 --- a/Signal/src/ViewControllers/MenuActionsViewController.swift +++ b/Signal/src/ViewControllers/MenuActionsViewController.swift @@ -245,7 +245,7 @@ class MenuActionSheetView: UIView, MenuActionViewDelegate { private let actionStackView: UIStackView private var actions: [MenuAction] private var actionViews: [MenuActionView] - private var hapticFeedback: HapticFeedback + private var hapticFeedback: SelectionHapticFeedback private var hasEverHighlightedAction = false weak var delegate: MenuActionSheetDelegate? @@ -268,7 +268,7 @@ class MenuActionSheetView: UIView, MenuActionViewDelegate { actions = [] actionViews = [] - hapticFeedback = HapticFeedback() + hapticFeedback = SelectionHapticFeedback() super.init(frame: frame) From 179dec299f712d8a233c81c9dc4dd8a6833db914 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 09:23:25 -0700 Subject: [PATCH 337/493] Show hint when other party enables video --- Signal.xcodeproj/project.pbxproj | 14 +++- .../Call/CallVideoHintView.swift | 83 +++++++++++++++++++ .../{ => Call}/CallViewController.swift | 28 ++++++- .../translations/en.lproj/Localizable.strings | 3 + 4 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 Signal/src/ViewControllers/Call/CallVideoHintView.swift rename Signal/src/ViewControllers/{ => Call}/CallViewController.swift (97%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 0dba75b4d..2b4c0a184 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -506,6 +506,7 @@ 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */; }; 4CC613362227A00400E21A3A /* ConversationSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC613352227A00400E21A3A /* ConversationSearch.swift */; }; 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */; }; + 4CFD151D22415AA400F2450F /* CallVideoHintView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFD151C22415AA400F2450F /* CallVideoHintView.swift */; }; 4CFE6B6C21F92BA700006701 /* LegacyNotificationsAdaptee.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */; }; 70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70377AAA1918450100CAF501 /* MobileCoreServices.framework */; }; 768A1A2B17FC9CD300E00ED8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 768A1A2A17FC9CD300E00ED8 /* libz.dylib */; }; @@ -1256,6 +1257,7 @@ 4CEB78C72178EBAB00F315D2 /* OWSSessionResetJobRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OWSSessionResetJobRecord.h; sourceTree = ""; }; 4CEB78C82178EBAB00F315D2 /* OWSSessionResetJobRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OWSSessionResetJobRecord.m; sourceTree = ""; }; 4CFB4E9B220BC56D00ECB4DE /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = translations/nb.lproj/Localizable.strings; sourceTree = ""; }; + 4CFD151C22415AA400F2450F /* CallVideoHintView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallVideoHintView.swift; sourceTree = ""; }; 4CFE6B6B21F92BA700006701 /* LegacyNotificationsAdaptee.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LegacyNotificationsAdaptee.swift; path = UserInterface/Notifications/LegacyNotificationsAdaptee.swift; sourceTree = ""; }; 4CFF4C0920F55BBA005DA313 /* MenuActionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuActionsViewController.swift; sourceTree = ""; }; 69349DE607F5BA6036C9AC60 /* Pods-SignalShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalShareExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension.debug.xcconfig"; sourceTree = ""; }; @@ -1883,11 +1885,11 @@ 34B3F8331E8DF1700035BE1A /* ViewControllers */ = { isa = PBXGroup; children = ( + 4CFD151B22415A6C00F2450F /* Call */, 452B998F20A34B6B006F2F9E /* AddContactShareToExistingContactViewController.swift */, 340FC87A204DAC8C007AEB0F /* AppSettings */, 34D5CCA71EAE3D30005515DB /* AvatarViewHelper.h */, 34D5CCA81EAE3D30005515DB /* AvatarViewHelper.m */, - 34B3F83B1E8DF1700035BE1A /* CallViewController.swift */, 4C13C9F520E57BA30089A98B /* ColorPickerViewController.swift */, 348BB25C20A0C5530047AEC2 /* ContactShareViewHelper.swift */, 34B3F83E1E8DF1700035BE1A /* ContactsPicker.swift */, @@ -2335,6 +2337,15 @@ path = SSKTests; sourceTree = ""; }; + 4CFD151B22415A6C00F2450F /* Call */ = { + isa = PBXGroup; + children = ( + 34B3F83B1E8DF1700035BE1A /* CallViewController.swift */, + 4CFD151C22415AA400F2450F /* CallVideoHintView.swift */, + ); + path = Call; + sourceTree = ""; + }; 76EB03C118170B33006006FC /* src */ = { isa = PBXGroup; children = ( @@ -3551,6 +3562,7 @@ 348570A820F67575004FF32B /* OWSMessageHeaderView.m in Sources */, 450DF2091E0DD2C6003D14BE /* UserNotificationsAdaptee.swift in Sources */, 34B6A907218B5241007C4606 /* TypingIndicatorCell.swift in Sources */, + 4CFD151D22415AA400F2450F /* CallVideoHintView.swift in Sources */, 34D1F0AB1F867BFC0066283D /* OWSContactOffersCell.m in Sources */, 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */, 34386A51207D0C01009F5D9C /* HomeViewController.m in Sources */, diff --git a/Signal/src/ViewControllers/Call/CallVideoHintView.swift b/Signal/src/ViewControllers/Call/CallVideoHintView.swift new file mode 100644 index 000000000..4a6809e97 --- /dev/null +++ b/Signal/src/ViewControllers/Call/CallVideoHintView.swift @@ -0,0 +1,83 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +protocol CallVideoHintViewDelegate: AnyObject { + func didTapCallVideoHintView(_ videoHintView: CallVideoHintView) +} + +class CallVideoHintView: UIView { + let label = UILabel() + var tapGesture: UITapGestureRecognizer! + weak var delegate: CallVideoHintViewDelegate? + + let kTailHMargin: CGFloat = 12 + let kTailWidth: CGFloat = 16 + let kTailHeight: CGFloat = 8 + + init() { + super.init(frame: .zero) + + tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap(tapGesture:))) + addGestureRecognizer(tapGesture) + + let layerView = OWSLayerView() + let shapeLayer = CAShapeLayer() + shapeLayer.fillColor = UIColor.ows_signalBlue.cgColor + layerView.layer.addSublayer(shapeLayer) + addSubview(layerView) + layerView.autoPinEdgesToSuperviewEdges() + + let container = UIView() + addSubview(container) + container.autoSetDimension(.width, toSize: ScaleFromIPhone5(250), relation: .lessThanOrEqual) + container.layoutMargins = UIEdgeInsets(top: 7, leading: 12, bottom: 7, trailing: 12) + container.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: 0, leading: 0, bottom: kTailHeight, trailing: 0)) + + container.addSubview(label) + label.autoPinEdgesToSuperviewMargins() + label.setCompressionResistanceHigh() + label.setContentHuggingHigh() + label.font = UIFont.ows_dynamicTypeBody + label.textColor = .ows_white + label.numberOfLines = 0 + label.text = NSLocalizedString("CALL_VIEW_ENABLE_VIDEO_HINT", comment: "tooltip label when remote party has enabled their video") + + layerView.layoutCallback = { view in + let bezierPath = UIBezierPath() + + // Bubble + let bubbleBounds = container.bounds + bezierPath.append(UIBezierPath(roundedRect: bubbleBounds, cornerRadius: 8)) + + // Tail + var tailBottom = CGPoint(x: self.kTailHMargin + self.kTailWidth * 0.5, y: view.height()) + var tailLeft = CGPoint(x: self.kTailHMargin, y: view.height() - self.kTailHeight) + var tailRight = CGPoint(x: self.kTailHMargin + self.kTailWidth, y: view.height() - self.kTailHeight) + if (!CurrentAppContext().isRTL) { + tailBottom.x = view.width() - tailBottom.x + tailLeft.x = view.width() - tailLeft.x + tailRight.x = view.width() - tailRight.x + } + bezierPath.move(to: tailBottom) + bezierPath.addLine(to: tailLeft) + bezierPath.addLine(to: tailRight) + bezierPath.addLine(to: tailBottom) + shapeLayer.path = bezierPath.cgPath + shapeLayer.frame = view.bounds + } + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - + + @objc + func didTap(tapGesture: UITapGestureRecognizer) { + self.delegate?.didTapCallVideoHintView(self) + } +} diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift similarity index 97% rename from Signal/src/ViewControllers/CallViewController.swift rename to Signal/src/ViewControllers/Call/CallViewController.swift index cb6b5360b..758914d33 100644 --- a/Signal/src/ViewControllers/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -234,8 +234,10 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, func createViews() { self.view.isUserInteractionEnabled = true - self.view.addGestureRecognizer(OWSAnyTouchGestureRecognizer(target: self, - action: #selector(didTouchRootView))) + self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, + action: #selector(didTouchRootView))) + + videoHintView.delegate = self // Dark blurred background. let blurEffect = UIBlurEffect(style: .dark) @@ -596,6 +598,8 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, updateCallUI(callState: call.state) } + let videoHintView = CallVideoHintView() + internal func updateLocalVideoLayout() { if !localVideoView.isHidden { localVideoView.superview?.bringSubview(toFront: localVideoView) @@ -744,10 +748,20 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, contactNameLabel.isHidden = true callStatusLabel.isHidden = true ongoingCallControls.isHidden = true + videoHintView.isHidden = true } else { leaveCallViewButton.isHidden = false contactNameLabel.isHidden = false callStatusLabel.isHidden = false + + if hasRemoteVideo && !hasLocalVideo && !hasShownLocalVideo && !hasUserDismissedVideoHint { + view.addSubview(videoHintView) + videoHintView.isHidden = false + videoHintView.autoPinEdge(.bottom, to: .top, of: audioModeVideoButton) + videoHintView.autoPinEdge(.trailing, to: .leading, of: audioModeVideoButton, withOffset: buttonSize() / 2 + videoHintView.kTailHMargin + videoHintView.kTailWidth / 2) + } else { + videoHintView.removeFromSuperview() + } } let doLocalVideoLayout = { @@ -1040,6 +1054,8 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, return self.remoteVideoTrack != nil } + var hasUserDismissedVideoHint: Bool = false + internal func updateRemoteVideoTrack(remoteVideoTrack: RTCVideoTrack?) { AssertIsOnMainThread() guard self.remoteVideoTrack != remoteVideoTrack else { @@ -1051,6 +1067,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, remoteVideoView.renderFrame(nil) self.remoteVideoTrack = remoteVideoTrack self.remoteVideoTrack?.add(remoteVideoView) + shouldRemoteVideoControlsBeHidden = false updateRemoteVideoLayout() @@ -1174,3 +1191,10 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } } } + +extension CallViewController: CallVideoHintViewDelegate { + func didTapCallVideoHintView(_ videoHintView: CallVideoHintView) { + self.hasUserDismissedVideoHint = true + updateRemoteVideoLayout() + } +} diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 8b2e4cdeb..dfbc5329e 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -350,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "End call"; From 93c9c83ac593ed1cf0c4671d88370b4d0a48a261 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 19 Mar 2019 10:45:36 -0700 Subject: [PATCH 338/493] Haptic feedback when remote enables video --- Signal/src/UserInterface/HapticFeedback.swift | 59 +++++++++++++++++++ .../Call/CallViewController.swift | 35 +++++++++-- 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/Signal/src/UserInterface/HapticFeedback.swift b/Signal/src/UserInterface/HapticFeedback.swift index 672e33803..2db0b0975 100644 --- a/Signal/src/UserInterface/HapticFeedback.swift +++ b/Signal/src/UserInterface/HapticFeedback.swift @@ -46,3 +46,62 @@ class ModernSelectionHapticFeedbackAdapter: NSObject, SelectionHapticFeedbackAda selectionFeedbackGenerator.prepare() } } + +enum NotificationHapticFeedbackType { + case error, success, warning +} + +extension NotificationHapticFeedbackType { + var uiNotificationFeedbackType: UINotificationFeedbackType { + switch self { + case .error: return .error + case .success: return .success + case .warning: return .warning + } + } +} + +protocol NotificationHapticFeedbackAdapter { + func notificationOccurred(_ notificationType: NotificationHapticFeedbackType) +} + +class NotificationHapticFeedback: NotificationHapticFeedbackAdapter { + + let adapter: NotificationHapticFeedbackAdapter + + init() { + if #available(iOS 10, *) { + adapter = ModernNotificationHapticFeedbackAdapter() + } else { + adapter = LegacyNotificationHapticFeedbackAdapter() + } + } + + func notificationOccurred(_ notificationType: NotificationHapticFeedbackType) { + adapter.notificationOccurred(notificationType) + } +} + +@available(iOS 10.0, *) +class ModernNotificationHapticFeedbackAdapter: NotificationHapticFeedbackAdapter { + let feedbackGenerator = UINotificationFeedbackGenerator() + + init() { + feedbackGenerator.prepare() + } + + func notificationOccurred(_ notificationType: NotificationHapticFeedbackType) { + feedbackGenerator.notificationOccurred(notificationType.uiNotificationFeedbackType) + feedbackGenerator.prepare() + } +} + +class LegacyNotificationHapticFeedbackAdapter: NotificationHapticFeedbackAdapter { + func notificationOccurred(_ notificationType: NotificationHapticFeedbackType) { + vibrate() + } + + private func vibrate() { + AudioServicesPlaySystemSound(kSystemSoundID_Vibrate) + } +} diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index 758914d33..f56a6936b 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -88,10 +88,6 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } } - override var preferredStatusBarStyle: UIStatusBarStyle { - return .lightContent - } - // MARK: - Settings Nag Views var isShowingSettingsNag = false { @@ -230,6 +226,10 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, return .portrait } + override var preferredStatusBarStyle: UIStatusBarStyle { + return .lightContent + } + // MARK: - Create Views func createViews() { @@ -1035,6 +1035,11 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, AssertIsOnMainThread() + guard localVideoView.captureSession != captureSession else { + Logger.debug("ignoring redundant update") + return + } + localVideoView.captureSession = captureSession let isHidden = captureSession == nil @@ -1058,7 +1063,9 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, internal func updateRemoteVideoTrack(remoteVideoTrack: RTCVideoTrack?) { AssertIsOnMainThread() + guard self.remoteVideoTrack != remoteVideoTrack else { + Logger.debug("ignoring redundant update") return } @@ -1070,9 +1077,29 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, shouldRemoteVideoControlsBeHidden = false + if remoteVideoTrack != nil { + playRemoteEnabledVideoHapticFeedback() + } + updateRemoteVideoLayout() } + // MARK: Video Haptics + + let feedbackGenerator = NotificationHapticFeedback() + var lastHapticTime: TimeInterval = CACurrentMediaTime() + func playRemoteEnabledVideoHapticFeedback() { + let currentTime = CACurrentMediaTime() + guard currentTime - lastHapticTime > 5 else { + Logger.debug("ignoring haptic feedback since it's too soon") + return + } + feedbackGenerator.notificationOccurred(.success) + lastHapticTime = currentTime + } + + // MARK: - Dismiss + internal func dismissIfPossible(shouldDelay: Bool, ignoreNag ignoreNagParam: Bool = false, completion: (() -> Void)? = nil) { callUIAdapter.audioService.delegate = nil From 5df4a0bc17369006bbb93ad241faf63486e8736c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 13:07:52 -0400 Subject: [PATCH 339/493] Rework attachment download progress for audio files. --- .../Cells/OWSAudioMessageView.m | 41 +++++++++++++++++++ .../Cells/OWSMessageBubbleView.m | 15 ++++--- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m index 358428aa4..3719e2322 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m @@ -128,6 +128,45 @@ NS_ASSUME_NONNULL_BEGIN self.audioProgressView.progressColor = progressColor; } +- (void)replaceIconWithDownloadProgressIfNecessary:(UIView *)iconView +{ + if (!self.viewItem.attachmentPointer) { + return; + } + + switch (self.viewItem.attachmentPointer.state) { + case TSAttachmentPointerStateFailed: + // TODO: + // [self addTapToRetryView:bodyMediaView]; + return; + case TSAttachmentPointerStateEnqueued: + case TSAttachmentPointerStateDownloading: + break; + } + switch (self.viewItem.attachmentPointer.pointerType) { + case TSAttachmentPointerTypeRestoring: + // TODO: Show "restoring" indicator and possibly progress. + return; + case TSAttachmentPointerTypeUnknown: + case TSAttachmentPointerTypeIncoming: + break; + } + NSString *_Nullable uniqueId = self.viewItem.attachmentPointer.uniqueId; + if (uniqueId.length < 1) { + OWSFailDebug(@"Missing uniqueId."); + return; + } + + CGFloat downloadViewSize = self.iconSize; + MediaDownloadView *downloadView = + [[MediaDownloadView alloc] initWithAttachmentId:uniqueId radius:downloadViewSize * 0.5f]; + iconView.layer.opacity = 0.01f; + [self addSubview:downloadView]; + [downloadView autoSetDimensionsToSize:CGSizeMake(downloadViewSize, downloadViewSize)]; + [downloadView autoAlignAxis:ALAxisHorizontal toSameAxisOfView:iconView]; + [downloadView autoAlignAxis:ALAxisVertical toSameAxisOfView:iconView]; +} + #pragma mark - - (CGFloat)hMargin @@ -192,6 +231,8 @@ NS_ASSUME_NONNULL_BEGIN [self addArrangedSubview:self.audioPlayPauseButton]; [self.audioPlayPauseButton setContentHuggingHigh]; + [self replaceIconWithDownloadProgressIfNecessary:self.audioPlayPauseButton]; + NSString *_Nullable filename = self.attachment.sourceFilename; if (filename.length < 1) { filename = [self.attachmentStream.originalFilePath lastPathComponent]; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index 4308f3513..a822fc7e2 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -838,7 +838,7 @@ NS_ASSUME_NONNULL_BEGIN conversationStyle:self.conversationStyle]; self.viewItem.lastAudioMessageView = audioMessageView; [audioMessageView createContents]; - [self addProgressViewsIfNecessary:audioMessageView]; + [self addProgressViewsIfNecessary:audioMessageView shouldShowDownloadProgress:NO]; self.loadCellContentBlock = ^{ // Do nothing. @@ -857,7 +857,7 @@ NS_ASSUME_NONNULL_BEGIN OWSGenericAttachmentView *attachmentView = [[OWSGenericAttachmentView alloc] initWithAttachment:attachment isIncoming:self.isIncoming]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; - [self addProgressViewsIfNecessary:attachmentView]; + [self addProgressViewsIfNecessary:attachmentView shouldShowDownloadProgress:NO]; self.loadCellContentBlock = ^{ // Do nothing. @@ -895,7 +895,7 @@ NS_ASSUME_NONNULL_BEGIN // progress or tap-to-retry UI. UIView *attachmentView = [UIView new]; - [self addProgressViewsIfNecessary:attachmentView]; + [self addProgressViewsIfNecessary:attachmentView shouldShowDownloadProgress:YES]; self.loadCellContentBlock = ^{ // Do nothing. @@ -907,12 +907,12 @@ NS_ASSUME_NONNULL_BEGIN return attachmentView; } -- (void)addProgressViewsIfNecessary:(UIView *)bodyMediaView +- (void)addProgressViewsIfNecessary:(UIView *)bodyMediaView shouldShowDownloadProgress:(BOOL)shouldShowDownloadProgress { if (self.viewItem.attachmentStream) { [self addUploadViewIfNecessary:bodyMediaView]; } else if (self.viewItem.attachmentPointer) { - [self addDownloadViewIfNecessary:bodyMediaView]; + [self addDownloadViewIfNecessary:bodyMediaView shouldShowDownloadProgress:(BOOL)shouldShowDownloadProgress]; } } @@ -934,7 +934,7 @@ NS_ASSUME_NONNULL_BEGIN [uploadView setCompressionResistanceLow]; } -- (void)addDownloadViewIfNecessary:(UIView *)bodyMediaView +- (void)addDownloadViewIfNecessary:(UIView *)bodyMediaView shouldShowDownloadProgress:(BOOL)shouldShowDownloadProgress { OWSAssertDebug(self.viewItem.attachmentPointer); @@ -954,6 +954,9 @@ NS_ASSUME_NONNULL_BEGIN case TSAttachmentPointerTypeIncoming: break; } + if (!shouldShowDownloadProgress) { + return; + } NSString *_Nullable uniqueId = self.viewItem.attachmentPointer.uniqueId; if (uniqueId.length < 1) { OWSFailDebug(@"Missing uniqueId."); From 31b4612746ef2b1a99ffd4e60f9300122e2ec61b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 13:17:34 -0400 Subject: [PATCH 340/493] Rework attachment download progress for generic attachments. --- .../Cells/OWSAudioMessageView.m | 4 +- .../Cells/OWSGenericAttachmentView.h | 6 ++- .../Cells/OWSGenericAttachmentView.m | 48 ++++++++++++++++++- .../Cells/OWSMessageBubbleView.m | 9 ++-- 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m index 3719e2322..6493dd419 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m @@ -136,8 +136,8 @@ NS_ASSUME_NONNULL_BEGIN switch (self.viewItem.attachmentPointer.state) { case TSAttachmentPointerStateFailed: - // TODO: - // [self addTapToRetryView:bodyMediaView]; + // We don't need to handle the "tap to retry" state here, + // only download progress. return; case TSAttachmentPointerStateEnqueued: case TSAttachmentPointerStateDownloading: diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h index 350b93465..a06a54494 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.h @@ -7,9 +7,13 @@ NS_ASSUME_NONNULL_BEGIN @class ConversationStyle; @class TSAttachment; +@protocol ConversationViewItem; + @interface OWSGenericAttachmentView : UIStackView -- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming; +- (instancetype)initWithAttachment:(TSAttachment *)attachment + isIncoming:(BOOL)isIncoming + viewItem:(id)viewItem; - (void)createContentsWithConversationStyle:(ConversationStyle *)conversationStyle; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m index b95fd220d..2508ced75 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m @@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) TSAttachment *attachment; @property (nonatomic, nullable) TSAttachmentStream *attachmentStream; +@property (nonatomic, weak) id viewItem; @property (nonatomic) BOOL isIncoming; @property (nonatomic) UILabel *topLabel; @property (nonatomic) UILabel *bottomLabel; @@ -30,7 +31,9 @@ NS_ASSUME_NONNULL_BEGIN @implementation OWSGenericAttachmentView -- (instancetype)initWithAttachment:(TSAttachment *)attachment isIncoming:(BOOL)isIncoming +- (instancetype)initWithAttachment:(TSAttachment *)attachment + isIncoming:(BOOL)isIncoming + viewItem:(id)viewItem { self = [super init]; @@ -40,6 +43,7 @@ NS_ASSUME_NONNULL_BEGIN _attachmentStream = (TSAttachmentStream *)attachment; } _isIncoming = isIncoming; + _viewItem = viewItem; } return self; @@ -130,6 +134,8 @@ NS_ASSUME_NONNULL_BEGIN [fileTypeLabel autoCenterInSuperview]; [fileTypeLabel autoSetDimension:ALDimensionWidth toSize:self.iconWidth - 20.f]; + [self replaceIconWithDownloadProgressIfNecessary:imageView]; + UIStackView *labelsView = [UIStackView new]; labelsView.axis = UILayoutConstraintAxisVertical; labelsView.spacing = [OWSGenericAttachmentView labelVSpacing]; @@ -175,6 +181,46 @@ NS_ASSUME_NONNULL_BEGIN [labelsView addArrangedSubview:bottomLabel]; } +- (void)replaceIconWithDownloadProgressIfNecessary:(UIView *)iconView +{ + if (!self.viewItem.attachmentPointer) { + return; + } + + switch (self.viewItem.attachmentPointer.state) { + case TSAttachmentPointerStateFailed: + // We don't need to handle the "tap to retry" state here, + // only download progress. + return; + case TSAttachmentPointerStateEnqueued: + case TSAttachmentPointerStateDownloading: + break; + } + switch (self.viewItem.attachmentPointer.pointerType) { + case TSAttachmentPointerTypeRestoring: + // TODO: Show "restoring" indicator and possibly progress. + return; + case TSAttachmentPointerTypeUnknown: + case TSAttachmentPointerTypeIncoming: + break; + } + NSString *_Nullable uniqueId = self.viewItem.attachmentPointer.uniqueId; + if (uniqueId.length < 1) { + OWSFailDebug(@"Missing uniqueId."); + return; + } + + CGSize iconViewSize = [iconView sizeThatFits:CGSizeZero]; + CGFloat downloadViewSize = MIN(iconViewSize.width, iconViewSize.height); + MediaDownloadView *downloadView = + [[MediaDownloadView alloc] initWithAttachmentId:uniqueId radius:downloadViewSize * 0.5f]; + iconView.layer.opacity = 0.01f; + [self addSubview:downloadView]; + [downloadView autoSetDimensionsToSize:CGSizeMake(downloadViewSize, downloadViewSize)]; + [downloadView autoAlignAxis:ALAxisHorizontal toSameAxisOfView:iconView]; + [downloadView autoAlignAxis:ALAxisVertical toSameAxisOfView:iconView]; +} + + (UIFont *)topLabelFont { return [UIFont ows_dynamicTypeBodyFont]; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index a822fc7e2..d97b87c8f 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -854,8 +854,9 @@ NS_ASSUME_NONNULL_BEGIN { TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); OWSAssertDebug(attachment); - OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:attachment isIncoming:self.isIncoming]; + OWSGenericAttachmentView *attachmentView = [[OWSGenericAttachmentView alloc] initWithAttachment:attachment + isIncoming:self.isIncoming + viewItem:self.viewItem]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; [self addProgressViewsIfNecessary:attachmentView shouldShowDownloadProgress:NO]; @@ -1065,7 +1066,9 @@ NS_ASSUME_NONNULL_BEGIN TSAttachment *attachment = (self.viewItem.attachmentStream ?: self.viewItem.attachmentPointer); OWSAssertDebug(attachment); OWSGenericAttachmentView *attachmentView = - [[OWSGenericAttachmentView alloc] initWithAttachment:attachment isIncoming:self.isIncoming]; + [[OWSGenericAttachmentView alloc] initWithAttachment:attachment + isIncoming:self.isIncoming + viewItem:self.viewItem]; [attachmentView createContentsWithConversationStyle:self.conversationStyle]; result = [attachmentView measureSizeWithMaxMessageWidth:maxMessageWidth]; break; From c2c08d0712220abe43a9370dd562b72d64b5bb27 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 14:43:18 -0400 Subject: [PATCH 341/493] Remove overzealous valid media asserts. --- .../ConversationView/Cells/ConversationMediaView.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 39c31fe4e..0f3392143 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -224,7 +224,7 @@ public class ConversationMediaView: UIView { } strongSelf.tryToLoadMedia(loadMediaBlock: { () -> AnyObject? in guard attachmentStream.isValidImage else { - owsFailDebug("Ignoring invalid attachment.") + Logger.warn("Ignoring invalid attachment.") return nil } guard let filePath = attachmentStream.originalFilePath else { @@ -278,7 +278,7 @@ public class ConversationMediaView: UIView { } self?.tryToLoadMedia(loadMediaBlock: { () -> AnyObject? in guard attachmentStream.isValidImage else { - owsFailDebug("Ignoring invalid attachment.") + Logger.warn("Ignoring invalid attachment.") return nil } return attachmentStream.thumbnailImageMedium(success: { (image) in @@ -341,7 +341,7 @@ public class ConversationMediaView: UIView { } self?.tryToLoadMedia(loadMediaBlock: { () -> AnyObject? in guard attachmentStream.isValidVideo else { - owsFailDebug("Ignoring invalid attachment.") + Logger.warn("Ignoring invalid attachment.") return nil } return attachmentStream.thumbnailImageMedium(success: { (image) in From 6ee4317590a759860355016a2dfcffd98466fa99 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 12:37:50 -0400 Subject: [PATCH 342/493] Add "track" to attachment download progress indicator. --- .../Cells/MediaDownloadView.swift | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift index 5be0d8034..23c39364c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -17,7 +17,8 @@ public class MediaDownloadView: UIView { private let attachmentId: String private let radius: CGFloat - private let shapeLayer = CAShapeLayer() + private let shapeLayer1 = CAShapeLayer() + private let shapeLayer2 = CAShapeLayer() @objc public required init(attachmentId: String, radius: CGFloat) { @@ -26,7 +27,10 @@ public class MediaDownloadView: UIView { super.init(frame: .zero) - layer.addSublayer(shapeLayer) + shapeLayer1.zPosition = 1 + shapeLayer2.zPosition = 2 + layer.addSublayer(shapeLayer1) + layer.addSublayer(shapeLayer2) NotificationCenter.default.addObserver(forName: NSNotification.Name.attachmentDownloadProgress, object: nil, queue: nil) { [weak self] notification in guard let strongSelf = self else { return } @@ -68,11 +72,13 @@ public class MediaDownloadView: UIView { internal func updateLayers() { AssertIsOnMainThread() - shapeLayer.frame = self.bounds + shapeLayer1.frame = self.bounds + shapeLayer2.frame = self.bounds guard let progress = attachmentDownloads.downloadProgress(forAttachmentId: attachmentId) else { Logger.warn("No progress for attachment.") - shapeLayer.path = nil + shapeLayer1.path = nil + shapeLayer2.path = nil return } @@ -87,13 +93,26 @@ public class MediaDownloadView: UIView { let startAngle: CGFloat = CGFloat.pi * 1.5 let endAngle: CGFloat = CGFloat.pi * (1.5 + 2 * CGFloat(progress.floatValue)) - let bezierPath = UIBezierPath() - bezierPath.addArc(withCenter: center, radius: outerRadius, startAngle: startAngle, endAngle: endAngle, clockwise: true) - bezierPath.addArc(withCenter: center, radius: innerRadius, startAngle: endAngle, endAngle: startAngle, clockwise: false) + let bezierPath1 = UIBezierPath() + bezierPath1.append(UIBezierPath(ovalIn: CGRect(origin: center.minus(CGPoint(x: innerRadius, + y: innerRadius)), + size: CGSize(width: innerRadius * 2, + height: innerRadius * 2)))) + bezierPath1.append(UIBezierPath(ovalIn: CGRect(origin: center.minus(CGPoint(x: outerRadius, + y: outerRadius)), + size: CGSize(width: outerRadius * 2, + height: outerRadius * 2)))) + shapeLayer1.path = bezierPath1.cgPath + let fillColor1: UIColor = UIColor(white: 1.0, alpha: 0.4) + shapeLayer1.fillColor = fillColor1.cgColor + shapeLayer1.fillRule = kCAFillRuleEvenOdd - shapeLayer.path = bezierPath.cgPath - let fillColor: UIColor = (Theme.isDarkThemeEnabled ? .ows_gray45 : .ows_gray60) - shapeLayer.fillColor = fillColor.cgColor + let bezierPath2 = UIBezierPath() + bezierPath2.addArc(withCenter: center, radius: outerRadius, startAngle: startAngle, endAngle: endAngle, clockwise: true) + bezierPath2.addArc(withCenter: center, radius: innerRadius, startAngle: endAngle, endAngle: startAngle, clockwise: false) + shapeLayer2.path = bezierPath2.cgPath + let fillColor2: UIColor = (Theme.isDarkThemeEnabled ? .ows_gray25 : .ows_white) + shapeLayer2.fillColor = fillColor2.cgColor CATransaction.commit() } From 8bcc19e36c44d1daf56443691ee7d34951a59f81 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 10:01:50 -0400 Subject: [PATCH 343/493] Add missing accessibility ids in block list view. --- .../ViewControllers/SelectRecipientViewController.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index ac420bc4b..784408f43 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -65,6 +65,9 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien self.tableViewController.tableView.scrollEnabled = NO; } + // These subviews are lazy-created; ensure they exist now. + [self phoneNumberButton]; + [self phoneNumberTextField]; SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _countryCodeButton); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberTextField); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberButton); From 41a3c95831b5ccb2da85ad4e04bbf63935376db3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 15:30:40 -0400 Subject: [PATCH 344/493] Add missing accessibility ids in block list view. --- .../SelectRecipientViewController.m | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index 784408f43..e13e05764 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -64,14 +64,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien if (self.delegate.shouldHideContacts) { self.tableViewController.tableView.scrollEnabled = NO; } - - // These subviews are lazy-created; ensure they exist now. - [self phoneNumberButton]; - [self phoneNumberTextField]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _countryCodeButton); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberTextField); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberButton); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _examplePhoneNumberLabel); } - (void)viewDidLoad @@ -131,6 +123,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien [_countryCodeButton addTarget:self action:@selector(showCountryCodeView:) forControlEvents:UIControlEventTouchUpInside]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _countryCodeButton); } return _countryCodeButton; @@ -157,6 +150,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien _examplePhoneNumberLabel = [UILabel new]; _examplePhoneNumberLabel.font = [self examplePhoneNumberFont]; _examplePhoneNumberLabel.textColor = [Theme secondaryColor]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _examplePhoneNumberLabel); } return _examplePhoneNumberLabel; @@ -176,6 +170,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien [_phoneNumberTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberTextField); } return _phoneNumberTextField; @@ -194,6 +189,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien _phoneNumberButton = button; [button autoSetDimension:ALDimensionWidth toSize:140]; [button autoSetDimension:ALDimensionHeight toSize:kButtonHeight]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _phoneNumberButton); } return _phoneNumberButton; } @@ -511,6 +507,8 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien UIView *buttonRow = [strongSelf createRowWithHeight:kButtonRowHeight previousRow:examplePhoneNumberRow superview:cell.contentView]; + OWSLogVerbose(@"strongSelf.phoneNumberButton: %@", strongSelf.phoneNumberButton.accessibilityIdentifier); + OWSLogFlush(); [buttonRow addSubview:strongSelf.phoneNumberButton]; [strongSelf.phoneNumberButton autoVCenterInSuperview]; [strongSelf.phoneNumberButton autoPinTrailingToSuperviewMargin]; From 931d24967762a51cfb72149c40dfbb735ba13b56 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 15:43:35 -0400 Subject: [PATCH 345/493] Modify OWSFlatButton to propagate the accessibility identifier to wrapper button. --- .../ViewControllers/SelectRecipientViewController.m | 2 -- SignalMessaging/Views/OWSFlatButton.swift | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/ViewControllers/SelectRecipientViewController.m b/SignalMessaging/ViewControllers/SelectRecipientViewController.m index e13e05764..208cfc849 100644 --- a/SignalMessaging/ViewControllers/SelectRecipientViewController.m +++ b/SignalMessaging/ViewControllers/SelectRecipientViewController.m @@ -507,8 +507,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien UIView *buttonRow = [strongSelf createRowWithHeight:kButtonRowHeight previousRow:examplePhoneNumberRow superview:cell.contentView]; - OWSLogVerbose(@"strongSelf.phoneNumberButton: %@", strongSelf.phoneNumberButton.accessibilityIdentifier); - OWSLogFlush(); [buttonRow addSubview:strongSelf.phoneNumberButton]; [strongSelf.phoneNumberButton autoVCenterInSuperview]; [strongSelf.phoneNumberButton autoPinTrailingToSuperviewMargin]; diff --git a/SignalMessaging/Views/OWSFlatButton.swift b/SignalMessaging/Views/OWSFlatButton.swift index 134ccdef9..5e4358f46 100644 --- a/SignalMessaging/Views/OWSFlatButton.swift +++ b/SignalMessaging/Views/OWSFlatButton.swift @@ -15,6 +15,16 @@ public class OWSFlatButton: UIView { private var upColor: UIColor? private var downColor: UIColor? + @objc + public override var accessibilityIdentifier: String? { + didSet { + guard let accessibilityIdentifier = self.accessibilityIdentifier else { + return + } + button.accessibilityIdentifier = "\(accessibilityIdentifier).button" + } + } + override public var backgroundColor: UIColor? { willSet { owsFailDebug("Use setBackgroundColors(upColor:) instead.") From c619f815b5c00e21b86787a0a788e4351f6eccf4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 16:02:16 -0400 Subject: [PATCH 346/493] Add accessibility identifiers to app settings view. --- .../AppSettings/AppSettingsViewController.m | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 82c7da228..7edcd0807 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -164,6 +164,8 @@ } [accessoryLabel sizeToFit]; cell.accessoryView = accessoryLabel; + cell.accessibilityIdentifier + = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"network_status"); return cell; } actionBlock:nil]]; @@ -171,24 +173,29 @@ [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE", @"Settings table view cell label") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"invite") actionBlock:^{ [weakSelf showInviteFlow]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_TITLE", @"Settings table view cell label") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"privacy") actionBlock:^{ [weakSelf showPrivacy]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_NOTIFICATIONS", nil) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"notifications") actionBlock:^{ [weakSelf showNotifications]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"LINKED_DEVICES_TITLE", @"Menu item and navbar title for the device manager") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"linked_devices") actionBlock:^{ [weakSelf showLinkedDevices]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_TITLE", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"advanced") actionBlock:^{ [weakSelf showAdvanced]; }]]; @@ -197,17 +204,20 @@ if (showBackup) { [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_BACKUP", @"Label for the backup view in app settings.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"backup") actionBlock:^{ [weakSelf showBackup]; }]]; } [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_ABOUT", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"about") actionBlock:^{ [weakSelf showAbout]; }]]; #ifdef USE_DEBUG_UI [section addItem:[OWSTableItem disclosureItemWithText:@"Debug UI" + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"debugui") actionBlock:^{ [weakSelf showDebugUI]; }]]; @@ -216,14 +226,17 @@ if (TSAccountManager.sharedInstance.isDeregistered) { [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_REREGISTER_BUTTON", @"Label for re-registration button.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"reregister") selector:@selector(reregisterUser) color:[UIColor ows_materialBlueColor]]]; [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_DATA_BUTTON", @"Label for 'delete data' button.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete_data") selector:@selector(deleteUnregisterUserData) color:[UIColor ows_destructiveRedColor]]]; } else { [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete_account") selector:@selector(unregisterUser) color:[UIColor ows_destructiveRedColor]]]; } @@ -233,7 +246,10 @@ self.contents = contents; } -- (OWSTableItem *)destructiveButtonItemWithTitle:(NSString *)title selector:(SEL)selector color:(UIColor *)color +- (OWSTableItem *)destructiveButtonItemWithTitle:(NSString *)title + accessibilityIdentifier:(NSString *)accessibilityIdentifier + selector:(SEL)selector + color:(UIColor *)color { __weak AppSettingsViewController *weakSelf = self; return [OWSTableItem @@ -254,6 +270,7 @@ [button autoSetDimension:ALDimensionHeight toSize:kButtonHeight]; [button autoVCenterInSuperview]; [button autoPinLeadingAndTrailingToSuperviewMargin]; + button.accessibilityIdentifier = accessibilityIdentifier; return cell; } @@ -335,6 +352,8 @@ [disclosureButton setContentCompressionResistancePriority:(UILayoutPriorityDefaultHigh + 1) forAxis:UILayoutConstraintAxisHorizontal]; + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"profile"); + return cell; } @@ -471,6 +490,7 @@ target:self action:@selector(didPressEnableDarkTheme:)]; } + barButtonItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dark_theme"); return barButtonItem; } From f7d86028da28163317a2740b56c9a1ef557b07f1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 16:04:33 -0400 Subject: [PATCH 347/493] Add accessibility identifiers to profile view. --- Signal/src/ViewControllers/ProfileViewController.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index e765d0483..06b0e94ef 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -111,6 +111,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat nameRow.userInteractionEnabled = YES; [nameRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(nameRowTapped:)]]; + nameRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"nameRow"); [rows addObject:nameRow]; UILabel *nameLabel = [UILabel new]; @@ -150,6 +151,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat avatarRow.userInteractionEnabled = YES; [avatarRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarRowTapped:)]]; + avatarRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"avatarRow"); [rows addObject:avatarRow]; UILabel *avatarLabel = [UILabel new]; @@ -186,6 +188,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat infoRow.userInteractionEnabled = YES; [infoRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(infoRowTapped:)]]; + infoRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"infoRow"); [rows addObject:infoRow]; UILabel *infoLabel = [UILabel new]; From 02340864f83247c5849bab93e3198ef6d5fdaad1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 16:07:06 -0400 Subject: [PATCH 348/493] Add accessibility identifiers to blocklist view. --- .../AppSettings/BlockListViewController.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index e2c62a0e0..9bc5b337c 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -72,12 +72,13 @@ NS_ASSUME_NONNULL_BEGIN [addSection addItem:[OWSTableItem - disclosureItemWithText:NSLocalizedString(@"SETTINGS_BLOCK_LIST_ADD_BUTTON", - @"A label for the 'add phone number' button in the block list table.") - actionBlock:^{ - AddToBlockListViewController *vc = [[AddToBlockListViewController alloc] init]; - [weakSelf.navigationController pushViewController:vc animated:YES]; - }]]; + disclosureItemWithText:NSLocalizedString(@"SETTINGS_BLOCK_LIST_ADD_BUTTON", + @"A label for the 'add phone number' button in the block list table.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"add") + actionBlock:^{ + AddToBlockListViewController *vc = [[AddToBlockListViewController alloc] init]; + [weakSelf.navigationController pushViewController:vc animated:YES]; + }]]; [contents addSection:addSection]; // "Blocklist" section @@ -95,6 +96,8 @@ NS_ASSUME_NONNULL_BEGIN itemWithCustomCellBlock:^{ ContactTableViewCell *cell = [ContactTableViewCell new]; [cell configureWithRecipientId:phoneNumber]; + cell.accessibilityIdentifier + = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"user"); return cell; } customRowHeight:UITableViewAutomaticDimension From b48e204b9069ad84fdacd2ac346138f94ae5ca1b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 16:17:10 -0400 Subject: [PATCH 349/493] Add accessibility identifiers to notification settings views. --- ...otificationSettingsOptionsViewController.m | 4 ++- .../NotificationSettingsViewController.m | 31 ++++++++++++------- .../OWSSoundSettingsViewController.m | 23 ++++++++------ .../ViewControllers/OWSTableViewController.h | 8 +++++ .../ViewControllers/OWSTableViewController.m | 20 +++++++++++- SignalMessaging/utils/OWSPreferences.h | 4 ++- SignalMessaging/utils/OWSPreferences.m | 14 ++++++++- 7 files changed, 79 insertions(+), 25 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m index 05eca55a7..2e7da11a3 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "NotificationSettingsOptionsViewController.h" @@ -40,6 +40,8 @@ if (selectedNotifType == notificationType) { cell.accessoryType = UITableViewCellAccessoryCheckmark; } + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER( + self, NSStringForNotificationType(notificationType)); return cell; } actionBlock:^{ diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m index 7b9f0cfa2..5ac5722c7 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m @@ -8,6 +8,7 @@ #import #import #import +#import @implementation NotificationSettingsViewController @@ -47,6 +48,7 @@ NSLocalizedString(@"SETTINGS_ITEM_NOTIFICATION_SOUND", @"Label for settings view that allows user to change the notification sound.") detailText:[OWSSounds displayNameForSound:[OWSSounds globalNotificationSound]] + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"message_sound") actionBlock:^{ OWSSoundSettingsViewController *vc = [OWSSoundSettingsViewController new]; [weakSelf.navigationController pushViewController:vc animated:YES]; @@ -56,24 +58,29 @@ @"Table cell switch label. When disabled, Signal will not play notification sounds while the app is in the " @"foreground."); [soundsSection addItem:[OWSTableItem switchItemWithText:inAppSoundsLabelText - isOnBlock:^{ - return [prefs soundInForeground]; - } - target:weakSelf - selector:@selector(didToggleSoundNotificationsSwitch:)]]; + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"in_app_sounds") + isOnBlock:^{ + return [prefs soundInForeground]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleSoundNotificationsSwitch:)]]; [contents addSection:soundsSection]; OWSTableSection *backgroundSection = [OWSTableSection new]; backgroundSection.headerTitle = NSLocalizedString(@"SETTINGS_NOTIFICATION_CONTENT_TITLE", @"table section header"); [backgroundSection addItem:[OWSTableItem - disclosureItemWithText:NSLocalizedString(@"NOTIFICATIONS_SHOW", nil) - detailText:[prefs nameForNotificationPreviewType:[prefs notificationPreviewType]] - actionBlock:^{ - NotificationSettingsOptionsViewController *vc = - [NotificationSettingsOptionsViewController new]; - [weakSelf.navigationController pushViewController:vc animated:YES]; - }]]; + disclosureItemWithText:NSLocalizedString(@"NOTIFICATIONS_SHOW", nil) + detailText:[prefs nameForNotificationPreviewType:[prefs notificationPreviewType]] + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"options") + actionBlock:^{ + NotificationSettingsOptionsViewController *vc = + [NotificationSettingsOptionsViewController new]; + [weakSelf.navigationController pushViewController:vc animated:YES]; + }]]; backgroundSection.footerTitle = NSLocalizedString(@"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION", @"table section footer"); [contents addSection:backgroundSection]; diff --git a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m index c218cd34d..659a30514 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m @@ -1,11 +1,12 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSSoundSettingsViewController.h" #import #import #import +#import NS_ASSUME_NONNULL_BEGIN @@ -89,15 +90,19 @@ NS_ASSUME_NONNULL_BEGIN }(); if (sound == self.currentSound) { - item = [OWSTableItem checkmarkItemWithText:soundLabelText - actionBlock:^{ - [weakSelf soundWasSelected:sound]; - }]; + item = [OWSTableItem + checkmarkItemWithText:soundLabelText + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, [OWSSounds displayNameForSound:sound]) + actionBlock:^{ + [weakSelf soundWasSelected:sound]; + }]; } else { - item = [OWSTableItem actionItemWithText:soundLabelText - actionBlock:^{ - [weakSelf soundWasSelected:sound]; - }]; + item = [OWSTableItem + actionItemWithText:soundLabelText + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, [OWSSounds displayNameForSound:sound]) + actionBlock:^{ + [weakSelf soundWasSelected:sound]; + }]; } [soundsSection addItem:item]; } diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.h b/SignalMessaging/ViewControllers/OWSTableViewController.h index c525a2684..53942225c 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.h +++ b/SignalMessaging/ViewControllers/OWSTableViewController.h @@ -91,6 +91,10 @@ typedef BOOL (^OWSTableSwitchBlock)(void); + (OWSTableItem *)checkmarkItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock; ++ (OWSTableItem *)checkmarkItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; + + (OWSTableItem *)itemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock accessoryType:(UITableViewCellAccessoryType)accessoryType; @@ -103,6 +107,10 @@ typedef BOOL (^OWSTableSwitchBlock)(void); + (OWSTableItem *)actionItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock; ++ (OWSTableItem *)actionItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; + + (OWSTableItem *)softCenterLabelItemWithText:(NSString *)text; + (OWSTableItem *)softCenterLabelItemWithText:(NSString *)text customRowHeight:(CGFloat)customRowHeight; diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m index f0625f368..921d7c563 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.m +++ b/SignalMessaging/ViewControllers/OWSTableViewController.m @@ -182,7 +182,17 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; + (OWSTableItem *)checkmarkItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock { - return [self itemWithText:text actionBlock:actionBlock accessoryType:UITableViewCellAccessoryCheckmark]; + return [self checkmarkItemWithText:text accessibilityIdentifier:nil actionBlock:actionBlock]; +} + ++ (OWSTableItem *)checkmarkItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; +{ + return [self itemWithText:text + accessibilityIdentifier:accessibilityIdentifier + actionBlock:actionBlock + accessoryType:UITableViewCellAccessoryCheckmark]; } + (OWSTableItem *)itemWithText:(NSString *)text @@ -290,6 +300,13 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; } + (OWSTableItem *)actionItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock +{ + return [self actionItemWithText:text accessibilityIdentifier:nil actionBlock:actionBlock]; +} + ++ (OWSTableItem *)actionItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + actionBlock:(nullable OWSTableActionBlock)actionBlock; { OWSAssertDebug(text.length > 0); OWSAssertDebug(actionBlock); @@ -299,6 +316,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; item.customCellBlock = ^{ UITableViewCell *cell = [OWSTableItem newCell]; cell.textLabel.text = text; + cell.accessibilityIdentifier = accessibilityIdentifier; return cell; }; return item; diff --git a/SignalMessaging/utils/OWSPreferences.h b/SignalMessaging/utils/OWSPreferences.h index 5bb5c7b3d..a13ae4d1d 100644 --- a/SignalMessaging/utils/OWSPreferences.h +++ b/SignalMessaging/utils/OWSPreferences.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -13,6 +13,8 @@ typedef NS_ENUM(NSUInteger, NotificationType) { NotificationNamePreview, }; +NSString *NSStringForNotificationType(NotificationType value); + // Used when migrating logging to NSUserDefaults. extern NSString *const OWSPreferencesSignalDatabaseCollection; extern NSString *const OWSPreferencesKeyEnableDebugLog; diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m index 56d736f28..287dada8f 100644 --- a/SignalMessaging/utils/OWSPreferences.m +++ b/SignalMessaging/utils/OWSPreferences.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSPreferences.h" @@ -14,6 +14,18 @@ NS_ASSUME_NONNULL_BEGIN +NSString *NSStringForNotificationType(NotificationType value) +{ + switch (notificationType) { + case NotificationNamePreview: + return @"NotificationNamePreview"; + case NotificationNameNoPreview: + return @"NotificationNameNoPreview"; + case NotificationNoNameNoPreview: + return @"NotificationNoNameNoPreview"; + } +} + NSString *const OWSPreferencesSignalDatabaseCollection = @"SignalPreferences"; NSString *const OWSPreferencesCallLoggingDidChangeNotification = @"OWSPreferencesCallLoggingDidChangeNotification"; From f1520d760e97e80ff4a749a50d1b5aacfdfdd103 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Mar 2019 16:20:52 -0400 Subject: [PATCH 350/493] Add accessibility identifiers to other settings views. --- .../AppSettings/AboutTableViewController.m | 2 ++ .../AdvancedSettingsTableViewController.m | 18 +++++++++++++----- .../OWSLinkedDevicesTableViewController.m | 1 + SignalMessaging/utils/OWSPreferences.m | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index 89ff9ab09..2b2bdf672 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -58,6 +58,7 @@ [informationSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_LEGAL_TERMS_CELL", @"table cell label") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"terms") actionBlock:^{ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; @@ -68,6 +69,7 @@ OWSTableSection *helpSection = [OWSTableSection new]; helpSection.headerTitle = NSLocalizedString(@"SETTINGS_HELP_HEADER", @""); [helpSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_SUPPORT", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"support") actionBlock:^{ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://support.signal.org"]]; diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index fb4c72b6a..7369ffa93 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -89,16 +89,21 @@ NS_ASSUME_NONNULL_BEGIN OWSTableSection *loggingSection = [OWSTableSection new]; loggingSection.headerTitle = NSLocalizedString(@"LOGGING_SECTION", nil); [loggingSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_DEBUGLOG", @"") - isOnBlock:^{ - return [OWSPreferences isLoggingEnabled]; - } - target:weakSelf - selector:@selector(didToggleEnableLogSwitch:)]]; + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"enable_debug_log") + isOnBlock:^{ + return [OWSPreferences isLoggingEnabled]; + } + isEnabledBlock:^{ + return YES; + } + target:weakSelf + selector:@selector(didToggleEnableLogSwitch:)]]; if ([OWSPreferences isLoggingEnabled]) { [loggingSection addItem:[OWSTableItem actionItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"submit_debug_log") actionBlock:^{ OWSLogInfo(@"Submitting debug logs"); [DDLog flushLog]; @@ -112,6 +117,8 @@ NS_ASSUME_NONNULL_BEGIN pushNotificationsSection.headerTitle = NSLocalizedString(@"PUSH_REGISTER_TITLE", @"Used in table section header and alert view title contexts"); [pushNotificationsSection addItem:[OWSTableItem actionItemWithText:NSLocalizedString(@"REREGISTER_FOR_PUSH", nil) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER( + self, @"reregister_push_notifications") actionBlock:^{ [weakSelf syncPushTokens]; }]]; @@ -180,6 +187,7 @@ NS_ASSUME_NONNULL_BEGIN [censorshipSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION", @"Label for the 'manual censorship circumvention' switch.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"censorship_circumvention") isOnBlock:isCensorshipCircumventionOnBlock isEnabledBlock:isManualCensorshipCircumventionOnEnabledBlock target:weakSelf diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index 6c9a157c2..42e1da037 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -327,6 +327,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; cell.detailTextLabel.text = NSLocalizedString(@"LINK_NEW_DEVICE_SUBTITLE", @"Subheading for 'Link New Device' navigation"); cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"add"); return cell; } else if (indexPath.section == OWSLinkedDevicesTableViewControllerSectionExistingDevices) { OWSDeviceTableViewCell *cell = diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m index 287dada8f..b10238e2e 100644 --- a/SignalMessaging/utils/OWSPreferences.m +++ b/SignalMessaging/utils/OWSPreferences.m @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *NSStringForNotificationType(NotificationType value) { - switch (notificationType) { + switch (value) { case NotificationNamePreview: return @"NotificationNamePreview"; case NotificationNameNoPreview: From d7b1e65a712307c188247e4540e3f77500831544 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 10:33:11 -0400 Subject: [PATCH 351/493] Add accessibility identifiers to blocklist popups. --- Signal.xcodeproj/project.pbxproj | 6 ++- .../Views/UIAlertController+OWS.swift | 36 ++++++++++++++ SignalMessaging/utils/BlockListUIUtils.m | 48 +++++++++++++++---- 3 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 SignalMessaging/Views/UIAlertController+OWS.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 2b4c0a184..3d13edd0f 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -144,6 +144,7 @@ 346941A3215D2EE400B5BFAD /* Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 3469419F215D2EE400B5BFAD /* Theme.m */; }; 346941A4215D2EE400B5BFAD /* OWSConversationColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 346941A0215D2EE400B5BFAD /* OWSConversationColor.h */; settings = {ATTRIBUTES = (Public, ); }; }; 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346B66301F4E29B200E5122F /* CropScaleImageViewController.swift */; }; + 346E35BE224283B100E55D5F /* UIAlertController+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346E35BD224283B000E55D5F /* UIAlertController+OWS.swift */; }; 346E9D5421B040B700562252 /* RegistrationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346E9D5321B040B600562252 /* RegistrationController.swift */; }; 347850311FD7494A007B8332 /* dripicons-v2.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 34330A5B1E787A9800DF2FB9 /* dripicons-v2.ttf */; }; 347850321FD7494A007B8332 /* ElegantIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 34330A5D1E787BD800DF2FB9 /* ElegantIcons.ttf */; }; @@ -833,6 +834,7 @@ 3469419F215D2EE400B5BFAD /* Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Theme.m; sourceTree = ""; }; 346941A0215D2EE400B5BFAD /* OWSConversationColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSConversationColor.h; sourceTree = ""; }; 346B66301F4E29B200E5122F /* CropScaleImageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CropScaleImageViewController.swift; sourceTree = ""; }; + 346E35BD224283B000E55D5F /* UIAlertController+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIAlertController+OWS.swift"; sourceTree = ""; }; 346E9D5321B040B600562252 /* RegistrationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationController.swift; sourceTree = ""; }; 347850561FD86544007B8332 /* SAEFailedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SAEFailedViewController.swift; sourceTree = ""; }; 3478505A1FD999D5007B8332 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = translations/et.lproj/Localizable.strings; sourceTree = ""; }; @@ -1797,7 +1799,6 @@ 346129CE1FD207F200532771 /* Views */ = { isa = PBXGroup; children = ( - 4523149F1F7E9E18003A428C /* DirectionalPanGestureRecognizer.swift */, 34AC0A0C211B39EA00997B47 /* AvatarImageView.swift */, 34AC0A07211B39E900997B47 /* CommonStrings.swift */, 34AC0A0A211B39EA00997B47 /* ContactCellView.h */, @@ -1806,6 +1807,7 @@ 34AC0A02211B39E700997B47 /* ContactsViewHelper.m */, 34AC09FC211B39E700997B47 /* ContactTableViewCell.h */, 34AC09FF211B39E700997B47 /* ContactTableViewCell.m */, + 4523149F1F7E9E18003A428C /* DirectionalPanGestureRecognizer.swift */, 34AC0A00211B39E700997B47 /* DisappearingTimerConfigurationView.swift */, 4CA46F49219C78050038ABDE /* GalleryRailView.swift */, 34AC0A08211B39E900997B47 /* GradientView.swift */, @@ -1826,6 +1828,7 @@ 34AC0A0D211B39EA00997B47 /* ThreadViewHelper.h */, 34AC0A0B211B39EA00997B47 /* ThreadViewHelper.m */, 4CA5F792211E1F06008C2708 /* Toast.swift */, + 346E35BD224283B000E55D5F /* UIAlertController+OWS.swift */, 34AC0A04211B39E800997B47 /* VideoPlayerView.swift */, ); path = Views; @@ -3417,6 +3420,7 @@ 34480B621FD0A98800BC14EF /* UIColor+OWS.m in Sources */, 4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */, 34BBC857220C7ADA00857249 /* ImageEditorItem.swift in Sources */, + 346E35BE224283B100E55D5F /* UIAlertController+OWS.swift in Sources */, 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */, 34AC0A1C211B39EA00997B47 /* OWSFlatButton.swift in Sources */, 340872D822397F4600CB25B0 /* AttachmentCaptionViewController.swift in Sources */, diff --git a/SignalMessaging/Views/UIAlertController+OWS.swift b/SignalMessaging/Views/UIAlertController+OWS.swift new file mode 100644 index 000000000..4e25bc350 --- /dev/null +++ b/SignalMessaging/Views/UIAlertController+OWS.swift @@ -0,0 +1,36 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation + +extension UIAlertController { + @objc + public func applyAccessibilityIdentifiers() { + for action in actions { + guard let view = action.value(forKey: "__representer") as? UIView else { + owsFailDebug("Missing representer.") + return + } + view.accessibilityIdentifier = action.accessibilityIdentifier + } + } +} + +// MARK: - + +extension UIAlertAction { + private struct AssociatedKeys { + static var AccessibilityIdentifier = "ows_accessibilityIdentifier" + } + + @objc + public var accessibilityIdentifier: String? { + get { + return objc_getAssociatedObject(self, &AssociatedKeys.AccessibilityIdentifier) as? String + } + set { + objc_setAssociatedObject(self, &AssociatedKeys.AccessibilityIdentifier, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN) + } + } +} diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index ec757d16f..c8f71adaf 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "BlockListUIUtils.h" @@ -130,6 +130,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; }]; + blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); [actionSheetController addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton @@ -139,9 +140,14 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); completionBlock(NO); } }]; + dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - [fromViewController presentViewController:actionSheetController animated:YES completion:nil]; + [fromViewController presentViewController:actionSheetController + animated:YES + completion:^{ + [actionSheetController applyAccessibilityIdentifiers]; + }]; } + (void)showBlockGroupActionSheet:(TSGroupThread *)groupThread @@ -180,6 +186,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; }]; + blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); [actionSheetController addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton @@ -189,9 +196,14 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); completionBlock(NO); } }]; + dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - [fromViewController presentViewController:actionSheetController animated:YES completion:nil]; + [fromViewController presentViewController:actionSheetController + animated:YES + completion:^{ + [actionSheetController applyAccessibilityIdentifiers]; + }]; } + (void)blockPhoneNumbers:(NSArray *)phoneNumbers @@ -345,6 +357,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; }]; + unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); [actionSheetController addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton @@ -354,9 +367,14 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); completionBlock(YES); } }]; + dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - [fromViewController presentViewController:actionSheetController animated:YES completion:nil]; + [fromViewController presentViewController:actionSheetController + animated:YES + completion:^{ + [actionSheetController applyAccessibilityIdentifiers]; + }]; } + (void)unblockPhoneNumbers:(NSArray *)phoneNumbers @@ -418,6 +436,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; }]; + unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); [actionSheetController addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton @@ -427,9 +446,14 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); completionBlock(YES); } }]; + dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - [fromViewController presentViewController:actionSheetController animated:YES completion:nil]; + [fromViewController presentViewController:actionSheetController + animated:YES + completion:^{ + [actionSheetController applyAccessibilityIdentifiers]; + }]; } + (void)unblockGroup:(TSGroupModel *)groupModel @@ -469,10 +493,16 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertController *controller = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; - [controller addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) - style:UIAlertActionStyleDefault - handler:completionBlock]]; - [fromViewController presentViewController:controller animated:YES completion:nil]; + UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) + style:UIAlertActionStyleDefault + handler:completionBlock]; + okAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok"); + [controller addAction:okAction]; + [fromViewController presentViewController:controller + animated:YES + completion:^{ + [controller applyAccessibilityIdentifiers]; + }]; } + (NSString *)formatDisplayNameForAlertTitle:(NSString *)displayName From 81508e9d022134722b6fc98ef182ce4eed16a535 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 10:45:36 -0400 Subject: [PATCH 352/493] Add accessibility identifiers to settings popups. --- .../ViewControllers/ProfileViewController.m | 24 ++++++++++++------- SignalMessaging/Views/OWSAlerts.swift | 19 +++++++++++---- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 06b0e94ef..f83cd04c1 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -15,6 +15,7 @@ #import #import #import +#import #import #import #import @@ -304,15 +305,22 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat NSLocalizedString(@"NEW_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE", @"The alert message if user tries to exit the new group view without saving changes.") preferredStyle:UIAlertControllerStyleAlert]; - [controller - addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", - @"The label for the 'discard' button in alerts and action sheets.") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *action) { - [weakSelf profileCompletedOrSkipped]; - }]]; + UIAlertAction *discardAction = + [UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", + @"The label for the 'discard' button in alerts and action sheets.") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *action) { + [weakSelf profileCompletedOrSkipped]; + }]; + discardAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"discard"); + [controller addAction:discardAction]; + [controller addAction:[OWSAlerts cancelAction]]; - [self presentViewController:controller animated:YES completion:nil]; + [self presentViewController:controller + animated:YES + completion:^{ + [controller applyAccessibilityIdentifiers]; + }]; } - (void)avatarTapped diff --git a/SignalMessaging/Views/OWSAlerts.swift b/SignalMessaging/Views/OWSAlerts.swift index 64abd9526..7dd0e3d0f 100644 --- a/SignalMessaging/Views/OWSAlerts.swift +++ b/SignalMessaging/Views/OWSAlerts.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -12,10 +12,13 @@ import Foundation let alertTitle = NSLocalizedString("CALL_AUDIO_PERMISSION_TITLE", comment: "Alert title when calling and permissions for microphone are missing") let alertMessage = NSLocalizedString("CALL_AUDIO_PERMISSION_MESSAGE", comment: "Alert message when calling and permissions for microphone are missing") let alertController = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert) - let dismissAction = UIAlertAction(title: CommonStrings.dismissButton, style: .cancel) + let dismissAction = UIAlertAction(title: CommonStrings.dismissButton, style: .cancel) + dismissAction.accessibilityIdentifier = "OWSAlerts.\("dismiss")" alertController.addAction(dismissAction) + if let settingsAction = CurrentAppContext().openSystemSettingsAction { + settingsAction.accessibilityIdentifier = "OWSAlerts.\("settings")" alertController.addAction(settingsAction) } CurrentAppContext().frontmostViewController()?.present(alertController, animated: true, completion: nil) @@ -51,10 +54,13 @@ import Foundation @objc public class func showAlert(title: String?, message: String? = nil, buttonTitle: String? = nil, buttonAction: ((UIAlertAction) -> Void)? = nil, fromViewController: UIViewController?) { - let actionTitle = buttonTitle ?? NSLocalizedString("OK", comment: "") let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) - alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: buttonAction)) + + let actionTitle = buttonTitle ?? NSLocalizedString("OK", comment: "") + let okAction = UIAlertAction(title: actionTitle, style: .default, handler: buttonAction) + okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" + alert.addAction(okAction) fromViewController?.present(alert, animated: true, completion: nil) } @@ -66,7 +72,9 @@ import Foundation alert.addAction(self.cancelAction) let actionTitle = proceedTitle ?? NSLocalizedString("OK", comment: "") - alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: proceedAction)) + let okAction = UIAlertAction(title: actionTitle, style: .default, handler: proceedAction) + okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" + alert.addAction(okAction) CurrentAppContext().frontmostViewController()?.present(alert, animated: true, completion: nil) } @@ -82,6 +90,7 @@ import Foundation Logger.debug("Cancel item") // Do nothing. } + action.accessibilityIdentifier = "OWSAlerts.\("cancel")" return action } From f37a3059fa303908154679d86046b431c53130c4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 10:56:45 -0400 Subject: [PATCH 353/493] Add accessibility identifiers to debug log popups. --- .../PrivacySettingsTableViewController.m | 20 ++-- Signal/src/util/Pastelog.m | 92 ++++++++++++------- SignalMessaging/categories/UIView+OWS.h | 11 +++ SignalMessaging/categories/UIView+OWS.m | 21 ++++- 4 files changed, 102 insertions(+), 42 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 7c9a286d9..1f9d32835 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -555,16 +555,22 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s uint32_t screenLockTimeout = (uint32_t)round(timeoutValue.doubleValue); NSString *screenLockTimeoutString = [self formatScreenLockTimeout:screenLockTimeout useShortFormat:NO]; - [controller addAction:[UIAlertAction actionWithTitle:screenLockTimeoutString - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [OWSScreenLock.sharedManager - setScreenLockTimeout:screenLockTimeout]; - }]]; + UIAlertAction *action = + [UIAlertAction actionWithTitle:screenLockTimeoutString + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *ignore) { + [OWSScreenLock.sharedManager setScreenLockTimeout:screenLockTimeout]; + }]; + action.accessibilityIdentifier = [NSString stringWithFormat:@"settings.privacy.timeout.%@", timeoutValue]; + [controller addAction:action]; } [controller addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:controller animated:YES completion:nil]; + [fromViewController presentViewController:controller + animated:YES + completion:^{ + [controller applyAccessibilityIdentifiers]; + }]; } - (NSString *)formatScreenLockTimeout:(NSInteger)value useShortFormat:(BOOL)useShortFormat diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m index c1b1809c6..c5e987cb5 100644 --- a/Signal/src/util/Pastelog.m +++ b/Signal/src/util/Pastelog.m @@ -319,17 +319,20 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error alertControllerWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_TITLE", @"Title of the debug log alert.") message:NSLocalizedString(@"DEBUG_LOG_ALERT_MESSAGE", @"Message of the debug log alert.") preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:[UIAlertAction - actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_EMAIL", - @"Label for the 'email debug log' option of the debug log alert.") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [Pastelog.sharedManager submitEmail:url]; + [alert + addAction:[UIAlertAction + actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_EMAIL", + @"Label for the 'email debug log' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_email") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [Pastelog.sharedManager submitEmail:url]; - completion(); - }]]; + completion(); + }]]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_COPY_LINK", @"Label for the 'copy link' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"copy_link") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { UIPasteboard *pb = [UIPasteboard generalPasteboard]; @@ -341,27 +344,32 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF", @"Label for the 'send to self' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_to_self") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [Pastelog.sharedManager sendToSelf:url]; }]]; - [alert addAction:[UIAlertAction - actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD", - @"Label for the 'send to last thread' option of the debug log alert.") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [Pastelog.sharedManager sendToMostRecentThread:url]; - }]]; + [alert addAction:[UIAlertAction actionWithTitle: + NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD", + @"Label for the 'send to last thread' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_to_last_thread") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [Pastelog.sharedManager sendToMostRecentThread:url]; + }]]; #endif - [alert addAction:[UIAlertAction - actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_BUG_REPORT", - @"Label for the 'Open a Bug Report' option of the debug log alert.") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [Pastelog.sharedManager prepareRedirection:url completion:completion]; - }]]; + [alert + addAction: + [UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_BUG_REPORT", + @"Label for the 'Open a Bug Report' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"submit_bug_report") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [Pastelog.sharedManager prepareRedirection:url completion:completion]; + }]]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SHARE", @"Label for the 'Share' option of the debug log alert.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"share") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [AttachmentSharing showShareUIForText:url.absoluteString @@ -370,7 +378,11 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[OWSAlerts cancelAction]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert animated:NO completion:nil]; + [presentingViewController presentViewController:alert + animated:NO + completion:^{ + [alert applyAccessibilityIdentifiers]; + }]; }]; } @@ -507,10 +519,15 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error message:message preferredStyle:UIAlertControllerStyleAlert]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") style:UIAlertActionStyleDefault handler:nil]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert animated:NO completion:nil]; + [presentingViewController presentViewController:alert + animated:NO + completion:^{ + [alert applyAccessibilityIdentifiers]; + }]; } #pragma mark Logs submission @@ -561,18 +578,25 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error message:NSLocalizedString(@"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE", @"Message of the alert before redirecting to GitHub Issues.") preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:[UIAlertAction - actionWithTitle:NSLocalizedString(@"OK", @"") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [UIApplication.sharedApplication - openURL:[NSURL URLWithString:[[NSBundle mainBundle] - objectForInfoDictionaryKey:@"LOGS_URL"]]]; + [alert + addAction:[UIAlertAction + actionWithTitle:NSLocalizedString(@"OK", @"") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [UIApplication.sharedApplication + openURL:[NSURL + URLWithString:[[NSBundle mainBundle] + objectForInfoDictionaryKey:@"LOGS_URL"]]]; - completion(); - }]]; + completion(); + }]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert animated:NO completion:nil]; + [presentingViewController presentViewController:alert + animated:NO + completion:^{ + [alert applyAccessibilityIdentifiers]; + }]; } - (void)sendToSelf:(NSURL *)url diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 7a775e6ef..6ca66a471 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -156,6 +156,17 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); @end +#pragma mark - + +@interface UIAlertAction (OWS) + ++ (instancetype)actionWithTitle:(nullable NSString *)title + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + style:(UIAlertActionStyle)style + handler:(void (^__nullable)(UIAlertAction *action))handler; + +@end + #pragma mark - Macros CGFloat CGHairlineWidth(void); diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index 8bdc03c17..e58f9354f 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -2,9 +2,10 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import "UIView+OWS.h" #import "OWSMath.h" +#import "UIView+OWS.h" #import +#import #import NS_ASSUME_NONNULL_BEGIN @@ -594,6 +595,24 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) @end +#pragma mark - + +@implementation UIAlertAction (OWS) + ++ (instancetype)actionWithTitle:(nullable NSString *)title + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + style:(UIAlertActionStyle)style + handler:(void (^__nullable)(UIAlertAction *action))handler +{ + UIAlertAction *action = [UIAlertAction actionWithTitle:title style:style handler:handler]; + action.accessibilityIdentifier = accessibilityIdentifier; + return action; +} + +@end + +#pragma mark - + CGFloat CGHairlineWidth() { return 1.f / UIScreen.mainScreen.scale; From cb5ce42e761fea8ec7fc04d489788b01bff52000 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 20 Mar 2019 11:16:15 -0400 Subject: [PATCH 354/493] Add accessibility identifiers to privacy popups and subviews. --- .../OWSSoundSettingsViewController.m | 18 ++++++++------- .../PrivacySettingsTableViewController.m | 22 ++++++++++++------- .../OWS2FASettingsViewController.m | 13 +++++++++-- .../Views/UIAlertController+OWS.swift | 2 +- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m index 659a30514..b327efd96 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m @@ -46,16 +46,18 @@ NS_ASSUME_NONNULL_BEGIN - (void)updateNavigationItems { - self.navigationItem.leftBarButtonItem = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel - target:self - action:@selector(cancelWasPressed:)]; + UIBarButtonItem *cancelItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel + target:self + action:@selector(cancelWasPressed:)]; + cancelItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"cancel"); + self.navigationItem.leftBarButtonItem = cancelItem; if (self.isDirty) { - self.navigationItem.rightBarButtonItem = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave - target:self - action:@selector(saveWasPressed:)]; + UIBarButtonItem *saveItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave + target:self + action:@selector(saveWasPressed:)]; + saveItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"save"); + self.navigationItem.rightBarButtonItem = saveItem; } else { self.navigationItem.rightBarButtonItem = nil; } diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 1f9d32835..d820353df 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -419,16 +419,22 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [alertController addAction:[OWSAlerts cancelAction]]; - UIAlertAction *deleteAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", - @"Confirmation text for button which deletes all message, calling, attachments, etc.") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [self deleteThreadsAndMessages]; - }]; + UIAlertAction *deleteAction = + [UIAlertAction actionWithTitle: + NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", + @"Confirmation text for button which deletes all message, calling, attachments, etc.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self deleteThreadsAndMessages]; + }]; [alertController addAction:deleteAction]; - [self presentViewController:alertController animated:true completion:nil]; + [self presentViewController:alertController + animated:true + completion:^{ + [alertController applyAccessibilityIdentifiers]; + }]; } - (void)deleteThreadsAndMessages diff --git a/Signal/src/ViewControllers/OWS2FASettingsViewController.m b/Signal/src/ViewControllers/OWS2FASettingsViewController.m index 5a8dbd6e5..320e638c4 100644 --- a/Signal/src/ViewControllers/OWS2FASettingsViewController.m +++ b/Signal/src/ViewControllers/OWS2FASettingsViewController.m @@ -122,6 +122,7 @@ NS_ASSUME_NONNULL_BEGIN [self.pinTextfield addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _pinTextfield); [self.view addSubview:self.pinTextfield]; } @@ -144,6 +145,7 @@ NS_ASSUME_NONNULL_BEGIN : NSLocalizedString(@"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS", @"Indicates that user has 'two factor auth pin' disabled.")); UILabel *instructionsLabel = [self createLabelWithText:instructions]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, instructionsLabel); [self createTableView]; @@ -191,6 +193,7 @@ NS_ASSUME_NONNULL_BEGIN [instructionsLabel autoPinTopToSuperviewMarginWithInset:kVSpacing]; [instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeLeading withInset:self.hMargin]; [instructionsLabel autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing withInset:self.hMargin]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, instructionsLabel); [self.pinTextfield autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:instructionsLabel withOffset:kVSpacing]; [self.pinTextfield autoPinEdgeToSuperviewSafeArea:ALEdgeLeading withInset:self.hMargin]; @@ -221,6 +224,7 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem disclosureItemWithText: NSLocalizedString(@"ENABLE_2FA_VIEW_DISABLE_2FA", @"Label for the 'enable two-factor auth' item in the settings view") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"enable_2fa") actionBlock:^{ [weakSelf tryToDisable2FA]; }]]; @@ -229,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem disclosureItemWithText: NSLocalizedString(@"ENABLE_2FA_VIEW_ENABLE_2FA", @"Label for the 'enable two-factor auth' item in the settings view") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"disable_2fa") actionBlock:^{ [weakSelf showEnable2FAWorkUI]; }]]; @@ -259,19 +264,23 @@ NS_ASSUME_NONNULL_BEGIN // Note: This affects how the "back" button will look if another // view is pushed on top of this one, not how the "back" // button looks when this view is visible. - self.navigationItem.backBarButtonItem = + UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BACK_BUTTON", @"button text for back button") style:UIBarButtonItemStylePlain target:self action:@selector(backButtonWasPressed)]; + backButton.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"back"); + self.navigationItem.backBarButtonItem = backButton; if (self.shouldHaveNextButton) { - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] + UIBarButtonItem *nextButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"ENABLE_2FA_VIEW_NEXT_BUTTON", @"Label for the 'next' button in the 'enable two factor auth' views.") style:UIBarButtonItemStylePlain target:self action:@selector(nextButtonWasPressed)]; + nextButton.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"next"); + self.navigationItem.rightBarButtonItem = nextButton; } else { self.navigationItem.rightBarButtonItem = nil; } diff --git a/SignalMessaging/Views/UIAlertController+OWS.swift b/SignalMessaging/Views/UIAlertController+OWS.swift index 4e25bc350..a8dec91da 100644 --- a/SignalMessaging/Views/UIAlertController+OWS.swift +++ b/SignalMessaging/Views/UIAlertController+OWS.swift @@ -10,7 +10,7 @@ extension UIAlertController { for action in actions { guard let view = action.value(forKey: "__representer") as? UIView else { owsFailDebug("Missing representer.") - return + continue } view.accessibilityIdentifier = action.accessibilityIdentifier } From 1a80f0c29359692fe899c17041d242006ce5913b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 10:01:40 -0400 Subject: [PATCH 355/493] Add accessibility identifiers to privacy popups and subviews. --- .../ViewControllers/ProfileViewController.m | 4 +++- SignalMessaging/Views/OWSAlerts.swift | 20 +++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index f83cd04c1..534394a28 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -349,10 +349,12 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat case ProfileViewMode_AppSettings: if (self.hasUnsavedChanges) { // If we have a unsaved changes, right item should be a "save" button. - self.navigationItem.rightBarButtonItem = + UIBarButtonItem *saveButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(updatePressed)]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, saveButton); + self.navigationItem.rightBarButtonItem = saveButton; } else { self.navigationItem.rightBarButtonItem = nil; } diff --git a/SignalMessaging/Views/OWSAlerts.swift b/SignalMessaging/Views/OWSAlerts.swift index 7dd0e3d0f..a7bd25a2f 100644 --- a/SignalMessaging/Views/OWSAlerts.swift +++ b/SignalMessaging/Views/OWSAlerts.swift @@ -21,7 +21,10 @@ import Foundation settingsAction.accessibilityIdentifier = "OWSAlerts.\("settings")" alertController.addAction(settingsAction) } - CurrentAppContext().frontmostViewController()?.present(alertController, animated: true, completion: nil) + CurrentAppContext().frontmostViewController()?.present(alertController, animated: true, + completion: { + alertController.applyAccessibilityIdentifiers() + }) } @objc @@ -30,7 +33,10 @@ import Foundation owsFailDebug("frontmostViewController was unexpectedly nil") return } - frontmostViewController.present(alert, animated: true, completion: nil) + frontmostViewController.present(alert, animated: true, + completion: { + alert.applyAccessibilityIdentifiers() + }) } @objc @@ -61,7 +67,10 @@ import Foundation let okAction = UIAlertAction(title: actionTitle, style: .default, handler: buttonAction) okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" alert.addAction(okAction) - fromViewController?.present(alert, animated: true, completion: nil) + fromViewController?.present(alert, animated: true, + completion: { + alert.applyAccessibilityIdentifiers() + }) } @objc @@ -76,7 +85,10 @@ import Foundation okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" alert.addAction(okAction) - CurrentAppContext().frontmostViewController()?.present(alert, animated: true, completion: nil) + CurrentAppContext().frontmostViewController()?.present(alert, animated: true, + completion: { + alert.applyAccessibilityIdentifiers() + }) } @objc From c9d62f47cc9791ba0672df138debe2dd23565c2a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 10:26:38 -0400 Subject: [PATCH 356/493] Respond to CR. --- .../AppSettings/AppSettingsViewController.m | 2 +- .../AppSettings/BlockListViewController.m | 4 +- ...otificationSettingsOptionsViewController.m | 5 ++- .../OWSLinkedDevicesTableViewController.m | 2 +- .../PrivacySettingsTableViewController.m | 24 ++++-------- .../ViewControllers/ProfileViewController.m | 12 ++---- Signal/src/util/Pastelog.m | 18 ++------- SignalMessaging/Views/OWSAlerts.swift | 26 ++++--------- SignalMessaging/categories/UIView+OWS.swift | 31 +++++++++++++++ SignalMessaging/utils/BlockListUIUtils.m | 38 ++++--------------- 10 files changed, 67 insertions(+), 95 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 7edcd0807..8b3956b5b 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -165,7 +165,7 @@ [accessoryLabel sizeToFit]; cell.accessoryView = accessoryLabel; cell.accessibilityIdentifier - = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"network_status"); + = SUBVIEW_ACCESSIBILITY_IDENTIFIER(AppSettingsViewController, @"network_status"); return cell; } actionBlock:nil]]; diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index 9bc5b337c..549ca71cf 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -96,8 +96,8 @@ NS_ASSUME_NONNULL_BEGIN itemWithCustomCellBlock:^{ ContactTableViewCell *cell = [ContactTableViewCell new]; [cell configureWithRecipientId:phoneNumber]; - cell.accessibilityIdentifier - = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"user"); + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER( + BlockListViewController, @"user"); return cell; } customRowHeight:UITableViewAutomaticDimension diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m index 2e7da11a3..02b099a94 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m @@ -40,8 +40,9 @@ if (selectedNotifType == notificationType) { cell.accessoryType = UITableViewCellAccessoryCheckmark; } - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER( - self, NSStringForNotificationType(notificationType)); + cell.accessibilityIdentifier + = SUBVIEW_ACCESSIBILITY_IDENTIFIER(NotificationSettingsOptionsViewController, + NSStringForNotificationType(notificationType)); return cell; } actionBlock:^{ diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index 42e1da037..04b9d605a 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -327,7 +327,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; cell.detailTextLabel.text = NSLocalizedString(@"LINK_NEW_DEVICE_SUBTITLE", @"Subheading for 'Link New Device' navigation"); cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"add"); + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(OWSLinkedDevicesTableViewController, @"add"); return cell; } else if (indexPath.section == OWSLinkedDevicesTableViewControllerSectionExistingDevices) { OWSDeviceTableViewCell *cell = diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index d820353df..53de5bd28 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -411,13 +411,13 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s - (void)clearHistoryLogs { - UIAlertController *alertController = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION", @"Alert message before user confirms clearing history") preferredStyle:UIAlertControllerStyleAlert]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[OWSAlerts cancelAction]]; UIAlertAction *deleteAction = [UIAlertAction actionWithTitle: @@ -428,13 +428,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s handler:^(UIAlertAction *_Nonnull action) { [self deleteThreadsAndMessages]; }]; - [alertController addAction:deleteAction]; + [alert addAction:deleteAction]; - [self presentViewController:alertController - animated:true - completion:^{ - [alertController applyAccessibilityIdentifiers]; - }]; + [self presentAlert:alert animated:YES]; } - (void)deleteThreadsAndMessages @@ -552,7 +548,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s { OWSLogInfo(@""); - UIAlertController *controller = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT", @"Label for the 'screen lock activity timeout' setting of the privacy settings.") message:nil @@ -568,15 +564,11 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [OWSScreenLock.sharedManager setScreenLockTimeout:screenLockTimeout]; }]; action.accessibilityIdentifier = [NSString stringWithFormat:@"settings.privacy.timeout.%@", timeoutValue]; - [controller addAction:action]; + [alert addAction:action]; } - [controller addAction:[OWSAlerts cancelAction]]; + [alert addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:controller - animated:YES - completion:^{ - [controller applyAccessibilityIdentifiers]; - }]; + [fromViewController presentAlert:alert animated:YES]; } - (NSString *)formatScreenLockTimeout:(NSInteger)value useShortFormat:(BOOL)useShortFormat diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 534394a28..692a20d88 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -297,7 +297,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat } __weak ProfileViewController *weakSelf = self; - UIAlertController *controller = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle: NSLocalizedString(@"NEW_GROUP_VIEW_UNSAVED_CHANGES_TITLE", @"The alert title if user tries to exit the new group view without saving changes.") @@ -313,14 +313,10 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat [weakSelf profileCompletedOrSkipped]; }]; discardAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"discard"); - [controller addAction:discardAction]; + [alert addAction:discardAction]; - [controller addAction:[OWSAlerts cancelAction]]; - [self presentViewController:controller - animated:YES - completion:^{ - [controller applyAccessibilityIdentifiers]; - }]; + [alert addAction:[OWSAlerts cancelAction]]; + [self presentAlert:alert animated:YES]; } - (void)avatarTapped diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m index c5e987cb5..00329126d 100644 --- a/Signal/src/util/Pastelog.m +++ b/Signal/src/util/Pastelog.m @@ -378,11 +378,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[OWSAlerts cancelAction]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert - animated:NO - completion:^{ - [alert applyAccessibilityIdentifiers]; - }]; + [presentingViewController presentAlert:alert animated:NO]; }]; } @@ -523,11 +519,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error style:UIAlertActionStyleDefault handler:nil]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert - animated:NO - completion:^{ - [alert applyAccessibilityIdentifiers]; - }]; + [presentingViewController presentAlert:alert animated:NO]; } #pragma mark Logs submission @@ -592,11 +584,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error completion(); }]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; - [presentingViewController presentViewController:alert - animated:NO - completion:^{ - [alert applyAccessibilityIdentifiers]; - }]; + [presentingViewController presentAlert:alert animated:NO]; } - (void)sendToSelf:(NSURL *)url diff --git a/SignalMessaging/Views/OWSAlerts.swift b/SignalMessaging/Views/OWSAlerts.swift index a7bd25a2f..ec4e1687a 100644 --- a/SignalMessaging/Views/OWSAlerts.swift +++ b/SignalMessaging/Views/OWSAlerts.swift @@ -11,20 +11,17 @@ import Foundation public class func showNoMicrophonePermissionAlert() { let alertTitle = NSLocalizedString("CALL_AUDIO_PERMISSION_TITLE", comment: "Alert title when calling and permissions for microphone are missing") let alertMessage = NSLocalizedString("CALL_AUDIO_PERMISSION_MESSAGE", comment: "Alert message when calling and permissions for microphone are missing") - let alertController = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert) + let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert) let dismissAction = UIAlertAction(title: CommonStrings.dismissButton, style: .cancel) dismissAction.accessibilityIdentifier = "OWSAlerts.\("dismiss")" - alertController.addAction(dismissAction) + alert.addAction(dismissAction) if let settingsAction = CurrentAppContext().openSystemSettingsAction { settingsAction.accessibilityIdentifier = "OWSAlerts.\("settings")" - alertController.addAction(settingsAction) + alert.addAction(settingsAction) } - CurrentAppContext().frontmostViewController()?.present(alertController, animated: true, - completion: { - alertController.applyAccessibilityIdentifiers() - }) + CurrentAppContext().frontmostViewController()?.presentAlert(alert) } @objc @@ -33,10 +30,7 @@ import Foundation owsFailDebug("frontmostViewController was unexpectedly nil") return } - frontmostViewController.present(alert, animated: true, - completion: { - alert.applyAccessibilityIdentifiers() - }) + frontmostViewController.presentAlert(alert) } @objc @@ -67,10 +61,7 @@ import Foundation let okAction = UIAlertAction(title: actionTitle, style: .default, handler: buttonAction) okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" alert.addAction(okAction) - fromViewController?.present(alert, animated: true, - completion: { - alert.applyAccessibilityIdentifiers() - }) + fromViewController?.presentAlert(alert) } @objc @@ -85,10 +76,7 @@ import Foundation okAction.accessibilityIdentifier = "OWSAlerts.\("ok")" alert.addAction(okAction) - CurrentAppContext().frontmostViewController()?.present(alert, animated: true, - completion: { - alert.applyAccessibilityIdentifiers() - }) + CurrentAppContext().frontmostViewController()?.presentAlert(alert) } @objc diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index a3d6ac960..82d48a014 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -13,6 +13,8 @@ public extension UIEdgeInsets { } } +// MARK: - + @objc public extension UINavigationController { @objc @@ -45,6 +47,8 @@ public extension UINavigationController { } } +// MARK: - + extension UIView { public func renderAsImage() -> UIImage? { return renderAsImage(opaque: false, scale: UIScreen.main.scale) @@ -124,6 +128,21 @@ extension UIView { } } +// MARK: - + +extension UIViewController { + @objc + public func presentAlert(_ alert: UIAlertController, animated: Bool = true) { + self.present(alert, + animated: animated, + completion: { + alert.applyAccessibilityIdentifiers() + }) + } +} + +// MARK: - + public extension CGFloat { public func clamp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { return CGFloatClamp(self, minValue, maxValue) @@ -155,6 +174,8 @@ public extension CGFloat { } } +// MARK: - + public extension Int { public func clamp(_ minValue: Int, _ maxValue: Int) -> Int { assert(minValue <= maxValue) @@ -163,6 +184,8 @@ public extension Int { } } +// MARK: - + public extension CGPoint { public func toUnitCoordinates(viewBounds: CGRect, shouldClamp: Bool) -> CGPoint { return CGPoint(x: (x - viewBounds.origin.x).inverseLerp(0, viewBounds.width, shouldClamp: shouldClamp), @@ -233,6 +256,8 @@ public extension CGPoint { } } +// MARK: - + public extension CGSize { var aspectRatio: CGFloat { guard self.height > 0 else { @@ -251,6 +276,8 @@ public extension CGSize { } } +// MARK: - + public extension CGRect { public var center: CGPoint { return CGPoint(x: midX, y: midY) @@ -273,6 +300,8 @@ public extension CGRect { } } +// MARK: - + public extension CGAffineTransform { public static func translate(_ point: CGPoint) -> CGAffineTransform { return CGAffineTransform(translationX: point.x, y: point.y) @@ -295,6 +324,8 @@ public extension CGAffineTransform { } } +// MARK: - + public extension UIBezierPath { public func addRegion(withPoints points: [CGPoint]) { guard let first = points.first else { diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index c8f71adaf..7deedd2c9 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -142,12 +142,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - - [fromViewController presentViewController:actionSheetController - animated:YES - completion:^{ - [actionSheetController applyAccessibilityIdentifiers]; - }]; + [fromViewController presentAlert:actionSheetController animated:YES]; } + (void)showBlockGroupActionSheet:(TSGroupThread *)groupThread @@ -198,12 +193,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - - [fromViewController presentViewController:actionSheetController - animated:YES - completion:^{ - [actionSheetController applyAccessibilityIdentifiers]; - }]; + [fromViewController presentAlert:actionSheetController animated:YES]; } + (void)blockPhoneNumbers:(NSArray *)phoneNumbers @@ -369,12 +359,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - - [fromViewController presentViewController:actionSheetController - animated:YES - completion:^{ - [actionSheetController applyAccessibilityIdentifiers]; - }]; + [fromViewController presentAlert:actionSheetController animated:YES]; } + (void)unblockPhoneNumbers:(NSArray *)phoneNumbers @@ -448,12 +433,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheetController addAction:dismissAction]; - - [fromViewController presentViewController:actionSheetController - animated:YES - completion:^{ - [actionSheetController applyAccessibilityIdentifiers]; - }]; + [fromViewController presentAlert:actionSheetController animated:YES]; } + (void)unblockGroup:(TSGroupModel *)groupModel @@ -490,19 +470,15 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); OWSAssertDebug(title.length > 0); OWSAssertDebug(fromViewController); - UIAlertController *controller = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) style:UIAlertActionStyleDefault handler:completionBlock]; okAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok"); - [controller addAction:okAction]; - [fromViewController presentViewController:controller - animated:YES - completion:^{ - [controller applyAccessibilityIdentifiers]; - }]; + [alert addAction:okAction]; + [fromViewController presentAlert:alert animated:YES]; } + (NSString *)formatDisplayNameForAlertTitle:(NSString *)displayName From 882dd16d7ced5bcf2ab4914518d52b8d8ba0d584 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 10:55:04 -0400 Subject: [PATCH 357/493] Apply presentAlert() throughout codebase. --- Signal/src/AppDelegate.m | 18 ++-- .../AppSettings/AppSettingsViewController.m | 18 ++-- .../AppSettings/OWSLinkDeviceViewController.m | 30 +++---- .../OWSLinkedDevicesTableViewController.m | 32 +++---- .../PrivacySettingsTableViewController.m | 4 +- Signal/src/ViewControllers/AvatarViewHelper.m | 17 ++-- .../Call/CallViewController.swift | 2 +- .../ContactShareViewHelper.swift | 4 +- .../ContactViewController.swift | 8 +- .../src/ViewControllers/ContactsPicker.swift | 2 +- .../ConversationViewController.m | 87 +++++++++---------- .../ViewControllers/DebugUI/DebugUIBackup.m | 18 ++-- .../DebugUI/DebugUIFileBrowser.swift | 14 +-- .../ViewControllers/DebugUI/DebugUIMessages.m | 4 +- .../GifPicker/GifPickerViewController.swift | 2 +- .../HomeView/HomeViewController.m | 2 +- Signal/src/ViewControllers/InviteFlow.swift | 2 +- .../MediaPageViewController.swift | 2 +- .../MediaTileViewController.swift | 2 +- .../NewContactThreadViewController.m | 15 ++-- .../ViewControllers/NewGroupViewController.m | 8 +- .../ViewControllers/ProfileViewController.m | 2 +- .../Registration/OnboardingController.swift | 2 +- ...OnboardingVerificationViewController.swift | 2 +- .../Registration/RegistrationController.swift | 2 +- .../SafetyNumberConfirmationAlert.swift | 12 +-- .../FingerprintViewScanController.m | 34 ++++---- .../OWSConversationSettingsViewController.m | 31 ++++--- .../ShowGroupMembersViewController.m | 52 ++++++----- .../UpdateGroupViewController.m | 35 ++++---- Signal/src/util/RegistrationUtils.m | 8 +- .../src/util/UIViewController+Permissions.m | 6 +- SignalMessaging/Views/ContactsViewHelper.m | 15 ++-- SignalMessaging/categories/UIView+OWS.swift | 9 +- .../environment/VersionMigrations.m | 7 +- SignalMessaging/profiles/OWSProfileManager.m | 20 ++--- SignalMessaging/utils/BlockListUIUtils.m | 39 ++++----- 37 files changed, 280 insertions(+), 287 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index da68d29ec..a6b4afeed 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -420,22 +420,22 @@ static NSTimeInterval launchStartedAt; [self.window makeKeyAndVisible]; - UIAlertController *controller = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"APP_LAUNCH_FAILURE_ALERT_TITLE", @"Title for the 'app launch failed' alert.") message:NSLocalizedString(@"APP_LAUNCH_FAILURE_ALERT_MESSAGE", @"Message for the 'app launch failed' alert.") preferredStyle:UIAlertControllerStyleAlert]; - [controller addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG", nil) - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [Pastelog submitLogsWithCompletion:^{ - OWSFail(@"exiting after sharing debug logs."); - }]; - }]]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG", nil) + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [Pastelog submitLogsWithCompletion:^{ + OWSFail(@"exiting after sharing debug logs."); + }]; + }]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:controller animated:YES completion:nil]; + [fromViewController presentAlert:alert]; } - (nullable NSError *)convertDatabaseIfNecessary diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 8b3956b5b..6350714c4 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -429,19 +429,19 @@ - (void)showDeleteAccountUI:(BOOL)isRegistered { __weak AppSettingsViewController *weakSelf = self; - - UIAlertController *alertController = + + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRM_ACCOUNT_DESTRUCTION_TITLE", @"") message:NSLocalizedString(@"CONFIRM_ACCOUNT_DESTRUCTION_TEXT", @"") preferredStyle:UIAlertControllerStyleAlert]; - [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"PROCEED_BUTTON", @"") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *action) { - [weakSelf deleteAccount:isRegistered]; - }]]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"PROCEED_BUTTON", @"") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *action) { + [weakSelf deleteAccount:isRegistered]; + }]]; + [alert addAction:[OWSAlerts cancelAction]]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } - (void)deleteAccount:(BOOL)isRegistered diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m index 3c72976f5..5c40bd474 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m @@ -133,7 +133,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *title = NSLocalizedString(@"LINK_DEVICE_INVALID_CODE_TITLE", @"report an invalid linking code"); NSString *body = NSLocalizedString(@"LINK_DEVICE_INVALID_CODE_BODY", @"report an invalid linking code"); - UIAlertController *alertController = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:body preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton @@ -143,7 +143,7 @@ NS_ASSUME_NONNULL_BEGIN [self popToLinkedDeviceList]; }); }]; - [alertController addAction:cancelAction]; + [alert addAction:cancelAction]; UIAlertAction *proceedAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"LINK_DEVICE_RESTART", @"attempt another linking") @@ -151,18 +151,18 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *action) { [self.qrScanningController startCapture]; }]; - [alertController addAction:proceedAction]; + [alert addAction:proceedAction]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } else { NSString *title = NSLocalizedString( @"LINK_DEVICE_PERMISSION_ALERT_TITLE", @"confirm the users intent to link a new device"); NSString *linkingDescription = NSLocalizedString(@"LINK_DEVICE_PERMISSION_ALERT_BODY", @"confirm the users intent to link a new device"); - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title - message:linkingDescription - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:title + message:linkingDescription + preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton style:UIAlertActionStyleCancel @@ -171,7 +171,7 @@ NS_ASSUME_NONNULL_BEGIN [self popToLinkedDeviceList]; }); }]; - [alertController addAction:cancelAction]; + [alert addAction:cancelAction]; UIAlertAction *proceedAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"CONFIRM_LINK_NEW_DEVICE_ACTION", @"Button text") @@ -179,9 +179,9 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *action) { [self provisionWithParser:parser]; }]; - [alertController addAction:proceedAction]; + [alert addAction:proceedAction]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } } @@ -225,12 +225,10 @@ NS_ASSUME_NONNULL_BEGIN failure:^(NSError *error) { OWSLogError(@"Failed to provision device with error: %@", error); dispatch_async(dispatch_get_main_queue(), ^{ - [self presentViewController:[self retryAlertControllerWithError:error - retryBlock:^{ - [self provisionWithParser:parser]; - }] - animated:YES - completion:nil]; + [self presentAlert:[self retryAlertControllerWithError:error + retryBlock:^{ + [self provisionWithParser:parser]; + }]]; }); }]; } diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index 04b9d605a..a7cf7684f 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -174,23 +174,23 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; NSString *alertTitle = NSLocalizedString( @"DEVICE_LIST_UPDATE_FAILED_TITLE", @"Alert title that can occur when viewing device manager."); - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:alertTitle - message:error.localizedDescription - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:alertTitle + message:error.localizedDescription + preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *retryAction = [UIAlertAction actionWithTitle:[CommonStrings retryButton] style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [self refreshDevices]; }]; - [alertController addAction:retryAction]; + [alert addAction:retryAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.dismissButton style:UIAlertActionStyleCancel handler:nil]; - [alertController addAction:dismissAction]; + [alert addAction:dismissAction]; [self.refreshControl endRefreshing]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } - (void)deviceListUpdateModifiedDeviceList:(NSNotification *)notification @@ -390,11 +390,11 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; NSString *confirmationTitle = [NSString stringWithFormat:confirmationTitleFormat, device.displayName]; NSString *confirmationMessage = NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_BODY", @"Alert message to confirm unlinking a device"); - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:confirmationTitle - message:confirmationMessage - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:confirmationTitle + message:confirmationMessage + preferredStyle:UIAlertControllerStyleAlert]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[OWSAlerts cancelAction]]; UIAlertAction *unlinkAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"UNLINK_ACTION", "button title for unlinking a device") @@ -404,10 +404,10 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; [self unlinkDevice:device success:successCallback]; }); }]; - [alertController addAction:unlinkAction]; + [alert addAction:unlinkAction]; dispatch_async(dispatch_get_main_queue(), ^{ - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; }); } @@ -418,7 +418,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; failure:^(NSError *error) { NSString *title = NSLocalizedString( @"UNLINKING_FAILED_ALERT_TITLE", @"Alert title when unlinking device fails"); - UIAlertController *alertController = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:error.localizedDescription preferredStyle:UIAlertControllerStyleAlert]; @@ -429,11 +429,11 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; handler:^(UIAlertAction *aaction) { [self unlinkDevice:device success:successCallback]; }]; - [alertController addAction:retryAction]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:retryAction]; + [alert addAction:[OWSAlerts cancelAction]]; dispatch_async(dispatch_get_main_queue(), ^{ - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; }); }]; } diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 53de5bd28..561966edc 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -430,7 +430,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s }]; [alert addAction:deleteAction]; - [self presentAlert:alert animated:YES]; + [self presentAlert:alert]; } - (void)deleteThreadsAndMessages @@ -568,7 +568,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s } [alert addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentAlert:alert animated:YES]; + [fromViewController presentAlert:alert]; } - (NSString *)formatScreenLockTimeout:(NSInteger)value useShortFormat:(BOOL)useShortFormat diff --git a/Signal/src/ViewControllers/AvatarViewHelper.m b/Signal/src/ViewControllers/AvatarViewHelper.m index 23ef53ca1..72c5e5073 100644 --- a/Signal/src/ViewControllers/AvatarViewHelper.m +++ b/Signal/src/ViewControllers/AvatarViewHelper.m @@ -30,11 +30,10 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertIsOnMainThread(); OWSAssertDebug(self.delegate); - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:self.delegate.avatarActionSheetTitle - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:self.delegate.avatarActionSheetTitle + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; + [actionSheet addAction:[OWSAlerts cancelAction]]; UIAlertAction *takePictureAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_CAMERA_BUTTON", @"media picker option to take photo or video") @@ -42,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *_Nonnull action) { [self takePicture]; }]; - [actionSheetController addAction:takePictureAction]; + [actionSheet addAction:takePictureAction]; UIAlertAction *choosePictureAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_LIBRARY_BUTTON", @"media picker option to choose from library") @@ -50,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *_Nonnull action) { [self chooseFromLibrary]; }]; - [actionSheetController addAction:choosePictureAction]; + [actionSheet addAction:choosePictureAction]; if (self.delegate.hasClearAvatarAction) { UIAlertAction *clearAction = [UIAlertAction actionWithTitle:self.delegate.clearAvatarActionLabel @@ -58,10 +57,10 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *_Nonnull action) { [self.delegate clearAvatar]; }]; - [actionSheetController addAction:clearAction]; + [actionSheet addAction:clearAction]; } - [self.delegate.fromViewController presentViewController:actionSheetController animated:true completion:nil]; + [self.delegate.fromViewController presentAlert:actionSheet]; } - (void)takePicture diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index f56a6936b..ad1479317 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -458,7 +458,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, // Note: It's critical that we present from this view and // not the "frontmost view controller" since this view may // reside on a separate window. - self.present(actionSheetController, animated: true) + presentAlert(actionSheetController) } func updateAvatarImage() { diff --git a/Signal/src/ViewControllers/ContactShareViewHelper.swift b/Signal/src/ViewControllers/ContactShareViewHelper.swift index 2a4d469d2..0db99098c 100644 --- a/Signal/src/ViewControllers/ContactShareViewHelper.swift +++ b/Signal/src/ViewControllers/ContactShareViewHelper.swift @@ -108,7 +108,7 @@ public class ContactShareViewHelper: NSObject, CNContactViewControllerDelegate { }) actionSheet.addAction(OWSAlerts.cancelAction) - fromViewController.present(actionSheet, animated: true) + fromViewController.presentAlert(actionSheet) } private func showPhoneNumberPicker(phoneNumbers: [String], fromViewController: UIViewController, completion :@escaping ((String) -> Void)) { @@ -123,7 +123,7 @@ public class ContactShareViewHelper: NSObject, CNContactViewControllerDelegate { } actionSheet.addAction(OWSAlerts.cancelAction) - fromViewController.present(actionSheet, animated: true) + fromViewController.presentAlert(actionSheet) } func didPressCreateNewContact(contactShare: ContactShareViewModel, fromViewController: UIViewController) { diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift index 0fdadd71e..59c1f4b19 100644 --- a/Signal/src/ViewControllers/ContactViewController.swift +++ b/Signal/src/ViewControllers/ContactViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -566,7 +566,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate { UIPasteboard.general.string = phoneNumber.phoneNumber }) actionSheet.addAction(OWSAlerts.cancelAction) - present(actionSheet, animated: true) + presentAlert(actionSheet) } func callPhoneNumberWithSystemCall(phoneNumber: OWSContactPhoneNumber) { @@ -594,7 +594,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate { UIPasteboard.general.string = email.email }) actionSheet.addAction(OWSAlerts.cancelAction) - present(actionSheet, animated: true) + presentAlert(actionSheet) } func openEmailInEmailApp(email: OWSContactEmail) { @@ -624,7 +624,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate { UIPasteboard.general.string = strongSelf.formatAddressForQuery(address: address) }) actionSheet.addAction(OWSAlerts.cancelAction) - present(actionSheet, animated: true) + presentAlert(actionSheet) } func openAddressInMaps(address: OWSContactAddress) { diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift index 7eae2858d..f6b9c4089 100644 --- a/Signal/src/ViewControllers/ContactsPicker.swift +++ b/Signal/src/ViewControllers/ContactsPicker.swift @@ -189,7 +189,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView }) alert.addAction(openSettingsAction) - self.present(alert, animated: true, completion: nil) + self.presentAlert(alert) case CNAuthorizationStatus.notDetermined: //This case means the user is prompted for the first time for allowing contacts diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 9f826a3ff..3e0728763 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1060,10 +1060,9 @@ typedef enum : NSUInteger { } BOOL hasMultiple = noLongerVerifiedRecipientIds.count > 1; - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:nil - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; __weak ConversationViewController *weakSelf = self; UIAlertAction *verifyAction = [UIAlertAction @@ -1077,17 +1076,17 @@ typedef enum : NSUInteger { handler:^(UIAlertAction *action) { [weakSelf showNoLongerVerifiedUI]; }]; - [actionSheetController addAction:verifyAction]; + [actionSheet addAction:verifyAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.dismissButton style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) { [weakSelf resetVerificationStateToDefault]; }]; - [actionSheetController addAction:dismissAction]; + [actionSheet addAction:dismissAction]; [self dismissKeyBoard]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } } @@ -1777,19 +1776,18 @@ typedef enum : NSUInteger { - (void)handleUnsentMessageTap:(TSOutgoingMessage *)message { - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:message.mostRecentFailureText - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:message.mostRecentFailureText + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; UIAlertAction *deleteMessageAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"TXT_DELETE_TITLE", @"") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [message remove]; }]; - [actionSheetController addAction:deleteMessageAction]; + [actionSheet addAction:deleteMessageAction]; UIAlertAction *resendMessageAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"") @@ -1801,10 +1799,10 @@ typedef enum : NSUInteger { }]; }]; - [actionSheetController addAction:resendMessageAction]; + [actionSheet addAction:resendMessageAction]; [self dismissKeyBoard]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)tappedNonBlockingIdentityChangeForRecipientId:(nullable NSString *)signalIdParam @@ -1832,11 +1830,11 @@ typedef enum : NSUInteger { NSString *alertMessage = [NSString stringWithFormat:NSLocalizedString(@"CORRUPTED_SESSION_DESCRIPTION", @"ActionSheet title"), self.thread.name]; - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil - message:alertMessage - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil + message:alertMessage + preferredStyle:UIAlertControllerStyleAlert]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[OWSAlerts cancelAction]]; UIAlertAction *resetSessionAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"FINGERPRINT_SHRED_KEYMATERIAL_BUTTON", @"") @@ -1853,10 +1851,10 @@ typedef enum : NSUInteger { [self.sessionResetJobQueue addContactThread:contactThread transaction:transaction]; }]; }]; - [alertController addAction:resetSessionAction]; + [alert addAction:resetSessionAction]; [self dismissKeyBoard]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } - (void)tappedInvalidIdentityKeyErrorMessage:(TSInvalidIdentityKeyErrorMessage *)errorMessage @@ -1865,12 +1863,11 @@ typedef enum : NSUInteger { NSString *titleFormat = NSLocalizedString(@"SAFETY_NUMBERS_ACTIONSHEET_TITLE", @"Action sheet heading"); NSString *titleText = [NSString stringWithFormat:titleFormat, keyOwner]; - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:titleText - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:titleText + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; UIAlertAction *showSafteyNumberAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"SHOW_SAFETY_NUMBER_ACTION", @"Action sheet item") @@ -1879,7 +1876,7 @@ typedef enum : NSUInteger { OWSLogInfo(@"Remote Key Changed actions: Show fingerprint display"); [self showFingerprintWithRecipientId:errorMessage.theirSignalId]; }]; - [actionSheetController addAction:showSafteyNumberAction]; + [actionSheet addAction:showSafteyNumberAction]; UIAlertAction *acceptSafetyNumberAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ACCEPT_NEW_IDENTITY_ACTION", @"Action sheet item") @@ -1900,10 +1897,10 @@ typedef enum : NSUInteger { } }]; - [actionSheetController addAction:acceptSafetyNumberAction]; + [actionSheet addAction:acceptSafetyNumberAction]; [self dismissKeyBoard]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)handleCallTap:(TSCall *)call @@ -1918,7 +1915,7 @@ typedef enum : NSUInteger { TSContactThread *contactThread = (TSContactThread *)self.thread; NSString *displayName = [self.contactsManager displayNameForPhoneIdentifier:contactThread.contactIdentifier]; - UIAlertController *alertController = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:[CallStrings callBackAlertTitle] message:[NSString stringWithFormat:[CallStrings callBackAlertMessageFormat], displayName] preferredStyle:UIAlertControllerStyleAlert]; @@ -1929,11 +1926,11 @@ typedef enum : NSUInteger { handler:^(UIAlertAction *action) { [weakSelf startAudioCall]; }]; - [alertController addAction:callAction]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:callAction]; + [alert addAction:[OWSAlerts cancelAction]]; [self dismissKeyBoard]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } #pragma mark - MessageActionsDelegate @@ -2191,10 +2188,10 @@ typedef enum : NSUInteger { @"Embeds {{the unknown user's name or phone number}}."), [BlockListUIUtils formatDisplayNameForAlertTitle:displayName]]; - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; UIAlertAction *blockAction = [UIAlertAction actionWithTitle:NSLocalizedString( @@ -2210,10 +2207,10 @@ typedef enum : NSUInteger { [interaction removeWithTransaction:transaction]; }]; }]; - [actionSheetController addAction:blockAction]; + [actionSheet addAction:blockAction]; [self dismissKeyBoard]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)tappedAddToContactsOfferMessage:(OWSContactOffersInteraction *)interaction @@ -3393,10 +3390,10 @@ typedef enum : NSUInteger { } - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; UIAlertAction *takeMediaAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_CAMERA_BUTTON", @"media picker option to take photo or video") @@ -3407,7 +3404,7 @@ typedef enum : NSUInteger { UIImage *takeMediaImage = [UIImage imageNamed:@"actionsheet_camera_black"]; OWSAssertDebug(takeMediaImage); [takeMediaAction setValue:takeMediaImage forKey:@"image"]; - [actionSheetController addAction:takeMediaAction]; + [actionSheet addAction:takeMediaAction]; UIAlertAction *chooseMediaAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_LIBRARY_BUTTON", @"media picker option to choose from library") @@ -3418,7 +3415,7 @@ typedef enum : NSUInteger { UIImage *chooseMediaImage = [UIImage imageNamed:@"actionsheet_camera_roll_black"]; OWSAssertDebug(chooseMediaImage); [chooseMediaAction setValue:chooseMediaImage forKey:@"image"]; - [actionSheetController addAction:chooseMediaAction]; + [actionSheet addAction:chooseMediaAction]; UIAlertAction *gifAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"SELECT_GIF_BUTTON", @"Label for 'select GIF to attach' action sheet button") @@ -3429,7 +3426,7 @@ typedef enum : NSUInteger { UIImage *gifImage = [UIImage imageNamed:@"actionsheet_gif_black"]; OWSAssertDebug(gifImage); [gifAction setValue:gifImage forKey:@"image"]; - [actionSheetController addAction:gifAction]; + [actionSheet addAction:gifAction]; UIAlertAction *chooseDocumentAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_DOCUMENT_PICKER_BUTTON", @@ -3441,7 +3438,7 @@ typedef enum : NSUInteger { UIImage *chooseDocumentImage = [UIImage imageNamed:@"actionsheet_document_black"]; OWSAssertDebug(chooseDocumentImage); [chooseDocumentAction setValue:chooseDocumentImage forKey:@"image"]; - [actionSheetController addAction:chooseDocumentAction]; + [actionSheet addAction:chooseDocumentAction]; if (kIsSendingContactSharesEnabled) { UIAlertAction *chooseContactAction = @@ -3454,11 +3451,11 @@ typedef enum : NSUInteger { UIImage *chooseContactImage = [UIImage imageNamed:@"actionsheet_contact"]; OWSAssertDebug(takeMediaImage); [chooseContactAction setValue:chooseContactImage forKey:@"image"]; - [actionSheetController addAction:chooseContactAction]; + [actionSheet addAction:chooseContactAction]; } [self dismissKeyBoard]; - [self presentViewController:actionSheetController animated:true completion:nil]; + [self presentAlert:actionSheet]; } - (nullable NSIndexPath *)lastVisibleIndexPath diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m index bb2b99b42..ff28bc951 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIBackup.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "DebugUIBackup.h" @@ -153,19 +153,19 @@ NS_ASSUME_NONNULL_BEGIN { OWSLogInfo(@"tryToImportBackup."); - UIAlertController *controller = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Restore CloudKit Backup" message:@"This will delete all of your database contents." preferredStyle:UIAlertControllerStyleAlert]; - [controller addAction:[UIAlertAction actionWithTitle:@"Restore" - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [OWSBackup.sharedManager tryToImportBackup]; - }]]; - [controller addAction:[OWSAlerts cancelAction]]; + [alert addAction:[UIAlertAction actionWithTitle:@"Restore" + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [OWSBackup.sharedManager tryToImportBackup]; + }]]; + [alert addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:controller animated:YES completion:nil]; + [fromViewController presentAlert:alert]; } + (void)logDatabaseSizeStats diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIFileBrowser.swift b/Signal/src/ViewControllers/DebugUI/DebugUIFileBrowser.swift index 706a67a23..7a20e1065 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIFileBrowser.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUIFileBrowser.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // @objc class DebugUIFileBrowser: OWSTableViewController { @@ -153,7 +153,7 @@ textField.text = strongSelf.fileURL.lastPathComponent } - strongSelf.present(alert, animated: true) + strongSelf.presentAlert(alert) }, OWSTableItem.disclosureItem(withText: "➡ Move") { [weak self] in @@ -198,7 +198,7 @@ textField.text = oldDirectory.path } - strongSelf.present(alert, animated: true) + strongSelf.presentAlert(alert) }, OWSTableItem.disclosureItem(withText: "❌ Delete") { [weak self] in @@ -233,7 +233,7 @@ alert.addAction(UIAlertAction(title: "Dismiss", style: .default)) - strongSelf.present(alert, animated: true) + strongSelf.presentAlert(alert) }, OWSTableItem.disclosureItem(withText: "🔒 Set File Protection") { [weak self] in @@ -273,7 +273,7 @@ } actionSheet.addAction(OWSAlerts.cancelAction) - strongSelf.present(actionSheet, animated: true) + strongSelf.presentAlert(actionSheet) } ] @@ -311,7 +311,7 @@ textField.placeholder = "File Name" } - strongSelf.present(alert, animated: true) + strongSelf.presentAlert(alert) } managementItems.append(createFileItem) @@ -352,7 +352,7 @@ textField.placeholder = "Dir Name" } - strongSelf.present(alert, animated: true) + strongSelf.presentAlert(alert) } managementItems.append(createDirItem) diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index 38e12da3a..f1941b9d5 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -462,7 +462,7 @@ NS_ASSUME_NONNULL_BEGIN [alert addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:alert animated:YES completion:nil]; + [fromViewController presentAlert:alert]; } #pragma mark - Send Media @@ -2753,7 +2753,7 @@ NS_ASSUME_NONNULL_BEGIN [alert addAction:[OWSAlerts cancelAction]]; UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController]; - [fromViewController presentViewController:alert animated:YES completion:nil]; + [fromViewController presentAlert:alert]; } #pragma mark - Sequences diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift index 8918893ce..d658135a9 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift @@ -404,7 +404,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect strongSelf.dismiss(animated: true, completion: nil) }) - strongSelf.present(alert, animated: true, completion: nil) + strongSelf.presentAlert(alert) }.retainUntilComplete() } diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index b6c631676..f3aa5301f 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -1354,7 +1354,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { }]]; [alert addAction:[OWSAlerts cancelAction]]; - [self presentViewController:alert animated:YES completion:nil]; + [self presentAlert:alert]; } - (void)deleteThread:(TSThread *)thread diff --git a/Signal/src/ViewControllers/InviteFlow.swift b/Signal/src/ViewControllers/InviteFlow.swift index 4f9521e2d..34e4844e4 100644 --- a/Signal/src/ViewControllers/InviteFlow.swift +++ b/Signal/src/ViewControllers/InviteFlow.swift @@ -177,7 +177,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos self.sendSMSTo(phoneNumbers: phoneNumbers) })) warning.addAction(OWSAlerts.cancelAction) - self.presentingViewController.present(warning, animated: true, completion: nil) + self.presentingViewController.presentAlert(warning) } else { self.sendSMSTo(phoneNumbers: phoneNumbers) } diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 412eb652e..bdf05385c 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -396,7 +396,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou actionSheet.addAction(OWSAlerts.cancelAction) actionSheet.addAction(deleteAction) - self.present(actionSheet, animated: true) + self.presentAlert(actionSheet) } // MARK: MediaGalleryDataSourceDelegate diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift index 357b8912f..1d85aae1c 100644 --- a/Signal/src/ViewControllers/MediaTileViewController.swift +++ b/Signal/src/ViewControllers/MediaTileViewController.swift @@ -602,7 +602,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa actionSheet.addAction(deleteAction) actionSheet.addAction(OWSAlerts.cancelAction) - present(actionSheet, animated: true) + presentAlert(actionSheet) } var footerBarBottomConstraint: NSLayoutConstraint! diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index ae7eea43a..ee9eb2228 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -748,10 +748,9 @@ NS_ASSUME_NONNULL_BEGIN stringByAppendingString:NSLocalizedString(@"QUESTIONMARK_PUNCTUATION", @"")]; } - UIAlertController *alertController = - [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRMATION_TITLE", @"") - message:confirmMessage - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRMATION_TITLE", @"") + message:confirmMessage + preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"") @@ -765,8 +764,8 @@ NS_ASSUME_NONNULL_BEGIN } }]; - [alertController addAction:[OWSAlerts cancelAction]]; - [alertController addAction:okAction]; + [alert addAction:[OWSAlerts cancelAction]]; + [alert addAction:okAction]; self.searchBar.text = @""; [self searchTextDidChange]; @@ -774,10 +773,10 @@ NS_ASSUME_NONNULL_BEGIN if ([self presentedViewController]) { [self dismissViewControllerAnimated:YES completion:^{ - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; }]; } else { - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } } diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 562d97c37..90de0b8a5 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -559,7 +559,7 @@ NS_ASSUME_NONNULL_BEGIN return; } - UIAlertController *controller = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle: NSLocalizedString(@"NEW_GROUP_VIEW_UNSAVED_CHANGES_TITLE", @"The alert title if user tries to exit the new group view without saving changes.") @@ -567,15 +567,15 @@ NS_ASSUME_NONNULL_BEGIN NSLocalizedString(@"NEW_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE", @"The alert message if user tries to exit the new group view without saving changes.") preferredStyle:UIAlertControllerStyleAlert]; - [controller + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", @"The label for the 'discard' button in alerts and action sheets.") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [self.navigationController popViewControllerAnimated:YES]; }]]; - [controller addAction:[OWSAlerts cancelAction]]; - [self presentViewController:controller animated:YES completion:nil]; + [alert addAction:[OWSAlerts cancelAction]]; + [self presentAlert:alert]; } - (void)groupNameDidChange:(id)sender diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index 692a20d88..f465ff6e9 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -316,7 +316,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat [alert addAction:discardAction]; [alert addAction:[OWSAlerts cancelAction]]; - [self presentAlert:alert animated:YES]; + [self presentAlert:alert]; } - (void)avatarTapped diff --git a/Signal/src/ViewControllers/Registration/OnboardingController.swift b/Signal/src/ViewControllers/Registration/OnboardingController.swift index f844bcb3e..4911e2893 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingController.swift @@ -245,7 +245,7 @@ public class OnboardingController: NSObject { style: .destructive) { (_) in self.showProfileView(fromView: view) }) - view.present(alert, animated: true) + view.presentAlert(alert) } public func onboardingDidRequire2FAPin(viewController: UIViewController) { diff --git a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift index 3213a1a92..43abb7fce 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingVerificationViewController.swift @@ -490,7 +490,7 @@ public class OnboardingVerificationViewController: OnboardingBaseViewController }) actionSheet.addAction(OWSAlerts.cancelAction) - self.present(actionSheet, animated: true) + self.presentAlert(actionSheet) } private func tryToVerify() { diff --git a/Signal/src/ViewControllers/Registration/RegistrationController.swift b/Signal/src/ViewControllers/Registration/RegistrationController.swift index 25e9c63cd..a4b0d953e 100644 --- a/Signal/src/ViewControllers/Registration/RegistrationController.swift +++ b/Signal/src/ViewControllers/Registration/RegistrationController.swift @@ -76,6 +76,6 @@ public class RegistrationController: NSObject { // style: .destructive) { (_) in // self.showProfileView(fromView: view) // }) -// view.present(alert, animated: true) +// view.presentAlert(alert) // } } diff --git a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift index 2b2bfee2b..ae336c3cc 100644 --- a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift +++ b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -62,7 +62,7 @@ public class SafetyNumberConfirmationAlert: NSObject { comment: "Action sheet body presented when a user's SN has recently changed. Embeds {{contact's name or phone number}}") let body = String(format: bodyFormat, displayName) - let actionSheetController = UIAlertController(title: title, message: body, preferredStyle: .actionSheet) + let actionSheet = UIAlertController(title: title, message: body, preferredStyle: .actionSheet) let confirmAction = UIAlertAction(title: confirmationText, style: .default) { _ in Logger.info("Confirmed identity: \(untrustedIdentity)") @@ -74,7 +74,7 @@ public class SafetyNumberConfirmationAlert: NSObject { } } } - actionSheetController.addAction(confirmAction) + actionSheet.addAction(confirmAction) let showSafetyNumberAction = UIAlertAction(title: NSLocalizedString("VERIFY_PRIVACY", comment: "Label for button or row which allows users to verify the safety number of another user."), style: .default) { _ in Logger.info("Opted to show Safety Number for identity: \(untrustedIdentity)") @@ -85,7 +85,7 @@ public class SafetyNumberConfirmationAlert: NSObject { completion: { completion(false) }) } - actionSheetController.addAction(showSafetyNumberAction) + actionSheet.addAction(showSafetyNumberAction) // We can't use the default `OWSAlerts.cancelAction` because we need to specify that the completion // handler is called. @@ -93,11 +93,11 @@ public class SafetyNumberConfirmationAlert: NSObject { Logger.info("user canceled.") completion(false) } - actionSheetController.addAction(cancelAction) + actionSheet.addAction(cancelAction) beforePresentationHandler?() - UIApplication.shared.frontmostViewController?.present(actionSheetController, animated: true) + UIApplication.shared.frontmostViewController?.presentAlert(actionSheet) return true } diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m index b8be8a4b6..88ddc1677 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "FingerprintViewScanController.h" @@ -177,10 +177,10 @@ NS_ASSUME_NONNULL_BEGIN NSString *descriptionFormat = NSLocalizedString( @"SUCCESSFUL_VERIFICATION_DESCRIPTION", @"Alert body after verifying privacy with {{other user's name}}"); NSString *successDescription = [NSString stringWithFormat:descriptionFormat, contactName]; - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:successTitle - message:successDescription - preferredStyle:UIAlertControllerStyleAlert]; - [alertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:successTitle + message:successDescription + preferredStyle:UIAlertControllerStyleAlert]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"FINGERPRINT_SCAN_VERIFY_BUTTON", @"Button that marks user as verified after a successful fingerprint scan.") @@ -198,9 +198,9 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *action) { [viewController dismissViewControllerAnimated:true completion:nil]; }]; - [alertController addAction:dismissAction]; + [alert addAction:dismissAction]; - [viewController presentViewController:alertController animated:YES completion:nil]; + [viewController presentAlert:alert]; } + (void)showVerificationFailedWithError:(NSError *)error @@ -220,21 +220,21 @@ NS_ASSUME_NONNULL_BEGIN failureTitle = NSLocalizedString(@"FAILED_VERIFICATION_TITLE", @"alert title"); } // else no title. We don't want to show a big scary "VERIFICATION FAILED" when it's just user error. - UIAlertController *alertController = [UIAlertController alertControllerWithTitle:failureTitle - message:error.localizedDescription - preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:failureTitle + message:error.localizedDescription + preferredStyle:UIAlertControllerStyleAlert]; if (retryBlock) { - [alertController addAction:[UIAlertAction actionWithTitle:[CommonStrings retryButton] - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - retryBlock(); - }]]; + [alert addAction:[UIAlertAction actionWithTitle:[CommonStrings retryButton] + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + retryBlock(); + }]]; } - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[OWSAlerts cancelAction]]; - [viewController presentViewController:alertController animated:YES completion:nil]; + [viewController presentAlert:alert]; OWSLogWarn(@"%@ Identity verification failed with error: %@", tag, error); } diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 80f613f93..f6d48ea0b 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -1078,7 +1078,7 @@ const CGFloat kIconViewLength = 24; - (void)didTapLeaveGroup { - UIAlertController *alertController = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"CONFIRM_LEAVE_GROUP_TITLE", @"Alert title") message:NSLocalizedString(@"CONFIRM_LEAVE_GROUP_DESCRIPTION", @"Alert body") preferredStyle:UIAlertControllerStyleAlert]; @@ -1089,10 +1089,10 @@ const CGFloat kIconViewLength = 24; handler:^(UIAlertAction *_Nonnull action) { [self leaveGroup]; }]; - [alertController addAction:leaveAction]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:leaveAction]; + [alert addAction:[OWSAlerts cancelAction]]; - [self presentViewController:alertController animated:YES completion:nil]; + [self presentAlert:alert]; } - (BOOL)hasLeftGroup @@ -1220,10 +1220,9 @@ const CGFloat kIconViewLength = 24; @"MUTE_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of muting a thread."); } - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:title - message:message - preferredStyle:UIAlertControllerStyleActionSheet]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title + message:message + preferredStyle:UIAlertControllerStyleActionSheet]; __weak OWSConversationSettingsViewController *weakSelf = self; if (self.thread.isMuted) { @@ -1233,10 +1232,10 @@ const CGFloat kIconViewLength = 24; handler:^(UIAlertAction *_Nonnull ignore) { [weakSelf setThreadMutedUntilDate:nil]; }]; - [actionSheetController addAction:action]; + [actionSheet addAction:action]; } else { #ifdef DEBUG - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION", @"Label for button to mute a thread for a minute.") style:UIAlertActionStyleDestructive @@ -1253,7 +1252,7 @@ const CGFloat kIconViewLength = 24; [weakSelf setThreadMutedUntilDate:mutedUntilDate]; }]]; #endif - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION", @"Label for button to mute a thread for a hour.") style:UIAlertActionStyleDestructive @@ -1269,7 +1268,7 @@ const CGFloat kIconViewLength = 24; options:0]; [weakSelf setThreadMutedUntilDate:mutedUntilDate]; }]]; - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION", @"Label for button to mute a thread for a day.") style:UIAlertActionStyleDestructive @@ -1285,7 +1284,7 @@ const CGFloat kIconViewLength = 24; options:0]; [weakSelf setThreadMutedUntilDate:mutedUntilDate]; }]]; - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION", @"Label for button to mute a thread for a week.") style:UIAlertActionStyleDestructive @@ -1301,7 +1300,7 @@ const CGFloat kIconViewLength = 24; options:0]; [weakSelf setThreadMutedUntilDate:mutedUntilDate]; }]]; - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_YEAR_ACTION", @"Label for button to mute a thread for a year.") style:UIAlertActionStyleDestructive @@ -1319,9 +1318,9 @@ const CGFloat kIconViewLength = 24; }]]; } - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)setThreadMutedUntilDate:(nullable NSDate *)value diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m index 5bdcc30dc..a3f87b950 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "ShowGroupMembersViewController.h" @@ -213,7 +213,7 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssertIsOnMainThread(); - UIAlertController *actionSheetController = [UIAlertController + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedString(@"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE", @"Label for the 'reset all no-longer-verified group members' confirmation alert.") @@ -225,10 +225,10 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *_Nonnull action) { [weakSelf resetAllNoLongerVerified]; }]; - [actionSheetController addAction:verifyAction]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:verifyAction]; + [actionSheet addAction:[OWSAlerts cancelAction]]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)resetAllNoLongerVerified @@ -275,7 +275,7 @@ NS_ASSUME_NONNULL_BEGIN ContactsViewHelper *helper = self.contactsViewHelper; SignalAccount *_Nullable signalAccount = [helper fetchSignalAccountForRecipientId:recipientId]; - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; if (self.contactsViewHelper.contactsManager.supportsContactEditing) { @@ -283,19 +283,18 @@ NS_ASSUME_NONNULL_BEGIN ? NSLocalizedString(@"GROUP_MEMBERS_VIEW_CONTACT_INFO", @"Button label for the 'show contact info' button") : NSLocalizedString( @"GROUP_MEMBERS_ADD_CONTACT_INFO", @"Button label to add information to an unknown contact"); - [actionSheetController addAction:[UIAlertAction actionWithTitle:contactInfoTitle - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [self - showContactInfoViewForRecipientId:recipientId]; - }]]; + [actionSheet addAction:[UIAlertAction actionWithTitle:contactInfoTitle + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [self showContactInfoViewForRecipientId:recipientId]; + }]]; } BOOL isBlocked; if (signalAccount) { isBlocked = [helper isRecipientIdBlocked:signalAccount.recipientId]; if (isBlocked) { - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") style:UIAlertActionStyleDefault @@ -310,7 +309,7 @@ NS_ASSUME_NONNULL_BEGIN }]; }]]; } else { - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") style:UIAlertActionStyleDestructive @@ -328,7 +327,7 @@ NS_ASSUME_NONNULL_BEGIN } else { isBlocked = [helper isRecipientIdBlocked:recipientId]; if (isBlocked) { - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") style:UIAlertActionStyleDefault @@ -343,7 +342,7 @@ NS_ASSUME_NONNULL_BEGIN }]; }]]; } else { - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") style:UIAlertActionStyleDestructive @@ -361,21 +360,20 @@ NS_ASSUME_NONNULL_BEGIN } if (!isBlocked) { - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_SEND_MESSAGE", @"Button label for the 'send message to group member' button") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self showConversationViewForRecipientId:recipientId]; }]]; - [actionSheetController - addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL", - @"Button label for the 'call group member' button") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [self callMember:recipientId]; - }]]; - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL", + @"Button label for the 'call group member' button") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [self callMember:recipientId]; + }]]; + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"VERIFY_PRIVACY", @"Label for button or row which allows users to verify the " @"safety number of another user.") @@ -385,9 +383,9 @@ NS_ASSUME_NONNULL_BEGIN }]]; } - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; - [self presentViewController:actionSheetController animated:YES completion:nil]; + [self presentAlert:actionSheet]; } - (void)showContactInfoViewForRecipientId:(NSString *)recipientId diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index 2355971d7..40e80dbd7 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -415,32 +415,31 @@ NS_ASSUME_NONNULL_BEGIN return; } - UIAlertController *controller = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"EDIT_GROUP_VIEW_UNSAVED_CHANGES_TITLE", @"The alert title if user tries to exit update group view without saving changes.") message: NSLocalizedString(@"EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE", @"The alert message if user tries to exit update group view without saving changes.") preferredStyle:UIAlertControllerStyleAlert]; - [controller - addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_SAVE", - @"The label for the 'save' button in action sheets.") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - OWSAssertDebug(self.conversationSettingsViewDelegate); + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_SAVE", + @"The label for the 'save' button in action sheets.") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + OWSAssertDebug(self.conversationSettingsViewDelegate); - [self updateGroup]; + [self updateGroup]; - [self.conversationSettingsViewDelegate - popAllConversationSettingsViewsWithCompletion:nil]; - }]]; - [controller addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DONT_SAVE", - @"The label for the 'don't save' button in action sheets.") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *action) { - [self.navigationController popViewControllerAnimated:YES]; - }]]; - [self presentViewController:controller animated:YES completion:nil]; + [self.conversationSettingsViewDelegate + popAllConversationSettingsViewsWithCompletion:nil]; + }]]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DONT_SAVE", + @"The label for the 'don't save' button in action sheets.") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *action) { + [self.navigationController popViewControllerAnimated:YES]; + }]]; + [self presentAlert:alert]; } - (void)updateGroupPressed diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m index bc1b479ed..9a0d7b586 100644 --- a/Signal/src/util/RegistrationUtils.m +++ b/Signal/src/util/RegistrationUtils.m @@ -27,10 +27,10 @@ NS_ASSUME_NONNULL_BEGIN + (void)showReregistrationUIFromViewController:(UIViewController *)fromViewController { - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - [actionSheetController + [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER", @"Label for button that lets users re-register using the same phone number.") @@ -39,9 +39,9 @@ NS_ASSUME_NONNULL_BEGIN [RegistrationUtils reregisterWithFromViewController:fromViewController]; }]]; - [actionSheetController addAction:[OWSAlerts cancelAction]]; + [actionSheet addAction:[OWSAlerts cancelAction]]; - [fromViewController presentViewController:actionSheetController animated:YES completion:nil]; + [fromViewController presentAlert:actionSheet]; } + (void)reregisterWithFromViewController:(UIViewController *)fromViewController diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m index 2778571c1..955e9722e 100644 --- a/Signal/src/util/UIViewController+Permissions.m +++ b/Signal/src/util/UIViewController+Permissions.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "UIViewController+Permissions.h" @@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN }]; [alert addAction:dismissAction]; - [self presentViewController:alert animated:YES completion:nil]; + [self presentAlert:alert]; } else if (status == AVAuthorizationStatusAuthorized) { callback(YES); } else if (status == AVAuthorizationStatusNotDetermined) { @@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN }]; [alert addAction:dismissAction]; - [self presentViewController:alert animated:YES completion:nil]; + [self presentAlert:alert]; }); }; diff --git a/SignalMessaging/Views/ContactsViewHelper.m b/SignalMessaging/Views/ContactsViewHelper.m index 4373047bf..e8d958d61 100644 --- a/SignalMessaging/Views/ContactsViewHelper.m +++ b/SignalMessaging/Views/ContactsViewHelper.m @@ -321,7 +321,7 @@ NS_ASSUME_NONNULL_BEGIN + (void)presentMissingContactAccessAlertControllerFromViewController:(UIViewController *)viewController { - UIAlertController *alertController = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE", comment : @"Alert title for when the user has just tried to edit a " @"contacts after declining to give Signal contacts " @@ -332,18 +332,17 @@ NS_ASSUME_NONNULL_BEGIN @"permissions") preferredStyle:UIAlertControllerStyleAlert]; - [alertController - addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"AB_PERMISSION_MISSING_ACTION_NOT_NOW", - @"Button text to dismiss missing contacts permission alert") - style:UIAlertActionStyleCancel - handler:nil]]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"AB_PERMISSION_MISSING_ACTION_NOT_NOW", + @"Button text to dismiss missing contacts permission alert") + style:UIAlertActionStyleCancel + handler:nil]]; UIAlertAction *_Nullable openSystemSettingsAction = CurrentAppContext().openSystemSettingsAction; if (openSystemSettingsAction) { - [alertController addAction:openSystemSettingsAction]; + [alert addAction:openSystemSettingsAction]; } - [viewController presentViewController:alertController animated:YES completion:nil]; + [viewController presentAlert:alert]; } - (void)presentContactViewControllerForRecipientId:(NSString *)recipientId diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 82d48a014..c576707d6 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -130,9 +130,14 @@ extension UIView { // MARK: - -extension UIViewController { +public extension UIViewController { @objc - public func presentAlert(_ alert: UIAlertController, animated: Bool = true) { + public func presentAlert(_ alert: UIAlertController) { + self.presentAlert(alert, animated: true) + } + + @objc + public func presentAlert(_ alert: UIAlertController, animated: Bool) { self.present(alert, animated: animated, completion: { diff --git a/SignalMessaging/environment/VersionMigrations.m b/SignalMessaging/environment/VersionMigrations.m index 84b081175..143e4b0e0 100644 --- a/SignalMessaging/environment/VersionMigrations.m +++ b/SignalMessaging/environment/VersionMigrations.m @@ -6,6 +6,7 @@ #import "Environment.h" #import "OWSDatabaseMigrationRunner.h" #import "SignalKeyingStorage.h" +#import #import #import #import @@ -67,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN if ([self isVersion:previousVersion atLeast:@"1.0.2" andLessThan:@"2.0"]) { OWSLogError(@"Migrating from RedPhone no longer supported. Quitting."); // Not translating these as so few are affected. - UIAlertController *alertController = [UIAlertController + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"You must reinstall Signal" message: @"Sorry, your installation is too old for us to update. You'll have to start fresh." @@ -78,9 +79,9 @@ NS_ASSUME_NONNULL_BEGIN handler:^(UIAlertAction *_Nonnull action) { OWSFail(@"Obsolete install."); }]; - [alertController addAction:quitAction]; + [alert addAction:quitAction]; - [CurrentAppContext().frontmostViewController presentViewController:alertController animated:YES completion:nil]; + [CurrentAppContext().frontmostViewController presentAlert:alert]; } if ([self isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.1.70"] && [self.tsAccountManager isRegistered]) { diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m index 2a6b658fb..0219e8ac9 100644 --- a/SignalMessaging/profiles/OWSProfileManager.m +++ b/SignalMessaging/profiles/OWSProfileManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSProfileManager.h" @@ -1467,20 +1467,20 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error); { OWSAssertIsOnMainThread(); - UIAlertController *alertController = + UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; NSString *shareTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE", @"Button to confirm that user wants to share their profile with a user or group."); - [alertController addAction:[UIAlertAction actionWithTitle:shareTitle - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [self userAddedThreadToProfileWhitelist:thread]; - successHandler(); - }]]; - [alertController addAction:[OWSAlerts cancelAction]]; + [alert addAction:[UIAlertAction actionWithTitle:shareTitle + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [self userAddedThreadToProfileWhitelist:thread]; + successHandler(); + }]]; + [alert addAction:[OWSAlerts cancelAction]]; - [fromViewController presentViewController:alertController animated:YES completion:nil]; + [fromViewController presentAlert:alert]; } - (void)userAddedThreadToProfileWhitelist:(TSThread *)thread diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index 7deedd2c9..c5e7d7ea3 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -110,7 +110,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); @"blocked user's name or phone number}}."), [self formatDisplayNameForAlertTitle:displayName]]; - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title message:NSLocalizedString(@"BLOCK_USER_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of blocking another user.") @@ -131,7 +131,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; }]; blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); - [actionSheetController addAction:blockAction]; + [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton style:UIAlertActionStyleCancel @@ -141,8 +141,8 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); - [actionSheetController addAction:dismissAction]; - [fromViewController presentAlert:actionSheetController animated:YES]; + [actionSheet addAction:dismissAction]; + [fromViewController presentAlert:actionSheet]; } + (void)showBlockGroupActionSheet:(TSGroupThread *)groupThread @@ -161,7 +161,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); @"A format for the 'block group' action sheet title. Embeds the {{group name}}."), [self formatDisplayNameForAlertTitle:groupName]]; - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title message:NSLocalizedString(@"BLOCK_GROUP_BEHAVIOR_EXPLANATION", @"An explanation of the consequences of blocking a group.") @@ -182,7 +182,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; }]; blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); - [actionSheetController addAction:blockAction]; + [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton style:UIAlertActionStyleCancel @@ -192,8 +192,8 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); - [actionSheetController addAction:dismissAction]; - [fromViewController presentAlert:actionSheetController animated:YES]; + [actionSheet addAction:dismissAction]; + [fromViewController presentAlert:actionSheet]; } + (void)blockPhoneNumbers:(NSArray *)phoneNumbers @@ -330,7 +330,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); @"A format for the 'unblock conversation' action sheet title. Embeds the {{conversation title}}."), [self formatDisplayNameForAlertTitle:displayName]]; - UIAlertController *actionSheetController = + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleActionSheet]; UIAlertAction *unblockAction = [UIAlertAction @@ -348,7 +348,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; }]; unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); - [actionSheetController addAction:unblockAction]; + [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton style:UIAlertActionStyleCancel @@ -358,8 +358,8 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); - [actionSheetController addAction:dismissAction]; - [fromViewController presentAlert:actionSheetController animated:YES]; + [actionSheet addAction:dismissAction]; + [fromViewController presentAlert:actionSheet]; } + (void)unblockPhoneNumbers:(NSArray *)phoneNumbers @@ -402,10 +402,9 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); NSString *message = NSLocalizedString( @"BLOCK_LIST_UNBLOCK_GROUP_BODY", @"Action sheet body when confirming you want to unblock a group"); - UIAlertController *actionSheetController = - [UIAlertController alertControllerWithTitle:title - message:message - preferredStyle:UIAlertControllerStyleActionSheet]; + UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title + message:message + preferredStyle:UIAlertControllerStyleActionSheet]; UIAlertAction *unblockAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") @@ -422,7 +421,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); }]; }]; unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); - [actionSheetController addAction:unblockAction]; + [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton style:UIAlertActionStyleCancel @@ -432,8 +431,8 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); } }]; dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); - [actionSheetController addAction:dismissAction]; - [fromViewController presentAlert:actionSheetController animated:YES]; + [actionSheet addAction:dismissAction]; + [fromViewController presentAlert:actionSheet]; } + (void)unblockGroup:(TSGroupModel *)groupModel @@ -478,7 +477,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); handler:completionBlock]; okAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok"); [alert addAction:okAction]; - [fromViewController presentAlert:alert animated:YES]; + [fromViewController presentAlert:alert]; } + (NSString *)formatDisplayNameForAlertTitle:(NSString *)displayName From 908fe1d0c94519a3df13262267f6765af6f18edc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 10:58:49 -0400 Subject: [PATCH 358/493] Apply presentAlert() throughout codebase. --- .../SharingThreadPickerViewController.m | 61 +++++++++---------- SignalMessaging/categories/UIView+OWS.swift | 11 ++++ 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index 08770ec82..b704057ff 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -434,7 +434,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); if (error) { [fromViewController dismissViewControllerAnimated:YES - completion:^(void) { + completion:^{ OWSLogInfo(@"Sending message failed with error: %@", error); [self showSendFailureAlertWithError:error message:message @@ -448,11 +448,10 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); }); }; - [fromViewController presentViewController:progressAlert - animated:YES - completion:^(void) { - sendMessageBlock(sendCompletion); - }]; + [fromViewController presentAlert:progressAlert + completion:^{ + sendMessageBlock(sendCompletion); + }]; } - (void)showSendFailureAlertWithError:(NSError *)error @@ -503,7 +502,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); OWSFailDebug(@"Untrusted recipient error is missing recipient id."); } - [fromViewController presentViewController:failureAlert animated:YES completion:nil]; + [fromViewController presentAlert:failureAlert]; } else { // Non-identity failure, e.g. network offline, rate limit @@ -526,7 +525,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); }]; [failureAlert addAction:retryAction]; - [fromViewController presentViewController:failureAlert animated:YES completion:nil]; + [fromViewController presentAlert:failureAlert]; } } @@ -597,30 +596,28 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); [progressAlert addAction:progressCancelAction]; [fromViewController - presentViewController:progressAlert - animated:YES - completion:^(void) { - [self.messageSender sendMessage:message - success:^(void) { - OWSLogInfo(@"Resending attachment succeeded."); - dispatch_async(dispatch_get_main_queue(), ^(void) { - [self.shareViewDelegate shareViewWasCompleted]; - }); - } - failure:^(NSError *error) { - dispatch_async(dispatch_get_main_queue(), ^(void) { - [fromViewController - dismissViewControllerAnimated:YES - completion:^(void) { - OWSLogInfo( - @"Sending attachment failed with error: %@", error); - [self showSendFailureAlertWithError:error - message:message - fromViewController:fromViewController]; - }]; - }); - }]; - }]; + presentAlert:progressAlert + completion:^{ + [self.messageSender sendMessage:message + success:^{ + OWSLogInfo(@"Resending attachment succeeded."); + dispatch_async(dispatch_get_main_queue(), ^{ + [self.shareViewDelegate shareViewWasCompleted]; + }); + } + failure:^(NSError *error) { + dispatch_async(dispatch_get_main_queue(), ^{ + [fromViewController + dismissViewControllerAnimated:YES + completion:^{ + OWSLogInfo(@"Sending attachment failed with error: %@", error); + [self showSendFailureAlertWithError:error + message:message + fromViewController:fromViewController]; + }]; + }); + }]; + }]; } - (void)attachmentUploadProgress:(NSNotification *)notification diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index c576707d6..711cb4871 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -144,6 +144,17 @@ public extension UIViewController { alert.applyAccessibilityIdentifiers() }) } + + @objc + public func presentAlert(_ alert: UIAlertController, completion: @escaping (() -> Void)) { + self.present(alert, + animated: true, + completion: { + alert.applyAccessibilityIdentifiers() + + completion() + }) + } } // MARK: - From 40c9c196aa6516465e9f9e61c9a8f800b00efcff Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 11:12:04 -0400 Subject: [PATCH 359/493] Fix memory leaks. --- .../AppSettings/OWSLinkedDevicesTableViewController.m | 2 ++ .../AppSettings/PrivacySettingsTableViewController.m | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index a7cf7684f..0e5adbfb7 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -34,6 +34,8 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; - (void)dealloc { + OWSLogVerbose(@""); + [[NSNotificationCenter defaultCenter] removeObserver:self]; } diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 561966edc..90978af3b 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -185,7 +185,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s target:weakSelf selector:@selector(didToggleScreenSecuritySwitch:)]]; [contents addSection:screenSecuritySection]; - + // Allow calls to connect directly vs. using TURN exclusively OWSTableSection *callingSection = [OWSTableSection new]; callingSection.headerTitle @@ -341,7 +341,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s customRowHeight:UITableViewAutomaticDimension actionBlock:^{ NSURL *url = [NSURL URLWithString:kSealedSenderInfoURL]; - OWSAssertDebug(url); + OWSCAssertDebug(url); [UIApplication.sharedApplication openURL:url]; }]]; @@ -374,7 +374,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s @"sealed_sender_learn_more"] actionBlock:^{ NSURL *url = [NSURL URLWithString:kSealedSenderInfoURL]; - OWSAssertDebug(url); + OWSCAssertDebug(url); [UIApplication.sharedApplication openURL:url]; }]]; [contents addSection:unidentifiedDeliveryLearnMoreSection]; From 1b9eb3c572963814b949593427099c018f3f0354 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 15 Mar 2019 09:16:19 -0400 Subject: [PATCH 360/493] Ensure Callkit is enabled for locale. --- .../PrivacySettingsTableViewController.m | 4 +++- .../call/UserInterface/CallUIAdapter.swift | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 90978af3b..061796827 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -207,7 +207,9 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s selector:@selector(didToggleCallsHideIPAddressSwitch:)]]; [contents addSection:callingSection]; - if (@available(iOS 11, *)) { + if (CallUIAdapter.isCallkitDisabledForLocale) { + // Hide all CallKit-related prefs; CallKit is disabled. + } else if (@available(iOS 11, *)) { OWSTableSection *callKitSection = [OWSTableSection new]; [callKitSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString( diff --git a/Signal/src/call/UserInterface/CallUIAdapter.swift b/Signal/src/call/UserInterface/CallUIAdapter.swift index d2a2ba0b5..c998b475b 100644 --- a/Signal/src/call/UserInterface/CallUIAdapter.swift +++ b/Signal/src/call/UserInterface/CallUIAdapter.swift @@ -100,6 +100,9 @@ extension CallUIAdaptee { // So we use the non-CallKit call UI. Logger.info("choosing non-callkit adaptee for simulator.") adaptee = NonCallKitCallUIAdaptee(callService: callService, notificationPresenter: notificationPresenter) + } else if CallUIAdapter.isCallkitDisabledForLocale { + Logger.info("choosing non-callkit adaptee due to locale.") + adaptee = NonCallKitCallUIAdaptee(callService: callService, notificationPresenter: notificationPresenter) } else if #available(iOS 11, *) { Logger.info("choosing callkit adaptee for iOS11+") let showNames = Environment.shared.preferences.notificationPreviewType() != .noNameNoPreview @@ -129,6 +132,22 @@ extension CallUIAdaptee { callService.addObserverAndSyncState(observer: self) } + @objc + public static var isCallkitDisabledForLocale: Bool { + let locale = Locale.current + guard let regionCode = locale.regionCode else { + owsFailDebug("Missing region code.") + return false + } + + // Apple has stopped approving apps that use CallKit functionality in mainland China. + // When the "CN" region is enabled, this check simply switches to the same pre-CallKit + // interface that is still used by everyone on iOS 9. + // + // For further reference: https://forums.developer.apple.com/thread/103083 + return regionCode == "CN" + } + // MARK: Dependencies var audioSession: OWSAudioSession { From 3850ca29b04d71e732cab7cdbdeffb30b5dc3e79 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Mar 2019 14:45:43 -0700 Subject: [PATCH 361/493] Bigger hack to fix problem with lesser hack. There were two symptoms to this bad "leave app while dismissing keyboard" state... The first, most noticeable symptom was that the main window no longer respected the device orientation. This was caused by UIKit temporarily disabling autorotate during an interactive keyboard dismissal, and not cleaning up after itself when we hid the window mid dismissal due to our screen protection feature. This was solved previously in: ca0a555f8 The second symptom remained, and is solved by this commit. Wherein after getting in this bad state, the interactive keyboard dismiss function behaves oddly. Normally when interactively dismissing the keyboard in a scroll view, the keyboard top follows your finger, until you lift up your finger, at which point, depending on how close you are to the bottom, the keyboard should completely dismiss, or cancel and return to its fully popped position. In the degraded state, the keyboard would follow your finger, but when you lifted your finger, it would stay where your finger left it, it would not complete/cancel the dismiss. The solution is, instead of only re-enabling autorotate, to use a higher level private method which is called upon complete/cancellation of the interactive dismissal. The method, `UIScrollToDismissSupport#finishScrollViewTransition`, as well as re-enabling autorotate, does some other work to restore the UI to it's normal post interactive-keyboard-dismiss gesture state. For posterity here's the decompiled pseudocode: ``` /* @class UIScrollToDismissSupport */ -(void)finishScrollViewTransition { *(int8_t *)&self->_scrollViewTransitionFinishing = 0x0; [self->_controller setInterfaceAutorotationDisabled:0x0]; [self hideScrollViewHorizontalScrollIndicator:0x0]; ebx = *ivar_offset(_scrollViewNotificationInfo); [*(self + ebx) release]; *(self + ebx) = 0x0; esi = *ivar_offset(_scrollViewForTransition); [*(self + esi) release]; *(self + esi) = 0x0; return; } ``` --- .../ConversationViewController.m | 4 +- SignalMessaging/utils/OWSWindowManager.m | 61 ++++++++++++++----- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 3e0728763..2de12e297 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4986,7 +4986,9 @@ typedef enum : NSUInteger { // in the content of this view. It's easier to dismiss the // "message actions" window when the device changes orientation // than to try to ensure this works in that case. - [self dismissMenuActions]; + if (OWSWindowManager.sharedManager.isPresentingMenuActions) { + [self dismissMenuActions]; + } // Snapshot the "last visible row". NSIndexPath *_Nullable lastVisibleIndexPath = self.lastVisibleIndexPath; diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m index f85485492..5f157fdf3 100644 --- a/SignalMessaging/utils/OWSWindowManager.m +++ b/SignalMessaging/utils/OWSWindowManager.m @@ -681,27 +681,60 @@ const UIWindowLevel UIWindowLevel_MessageActions(void) IMP imp1 = [self.rootWindow methodForSelector:selector1]; BOOL (*func1)(id, SEL) = (void *)imp1; BOOL isDisabled = func1(self.rootWindow, selector1); - OWSLogInfo(@"autorotation is disabled: %d", isDisabled); if (isDisabled) { - // NSString *encodedSelectorString2 = @"endDisablingInterfaceAutorotation".encodedForSelector; - NSString *encodedSelectorString2 = @"dgB1VXoFcnN9egB4WgAGdgR3cnR2UgcGAQQBBnIGegEA"; - NSString *selectorString2 = encodedSelectorString2.decodedForSelector; - if (selectorString2 == nil) { - OWSFailDebug(@"selectorString2 was unexpectedly nil"); + OWSLogInfo(@"autorotation is disabled."); + + // The remainder of this method calls: + // [[UIScrollToDismissSupport supportForScreen:UIScreen.main] finishScrollViewTransition] + // after verifying the methods/classes exist. + + // NSString *encodedKlassString = @"UIScrollToDismissSupport".encodedForSelector; + NSString *encodedKlassString = @"ZlpkdAQBfX1lAVV6BX56BQVkBwICAQQG"; + NSString *_Nullable klassString = encodedKlassString.decodedForSelector; + if (klassString == nil) { + OWSFailDebug(@"klassString was unexpectedly nil"); return; } - SEL selector2 = NSSelectorFromString(selectorString2); - - if (![self.rootWindow respondsToSelector:selector2]) { - OWSFailDebug(@"failure: doesn't respond to selector2"); + id klass = NSClassFromString(klassString); + if (klass == nil) { + OWSFailDebug(@"klass was unexpectedly nil"); return; } - IMP imp2 = [self.rootWindow methodForSelector:selector2]; - void (*func2)(id, SEL) = (void *)imp2; - func2(self.rootWindow, selector2); - OWSLogInfo(@"re-enabling autorotation"); + // NSString *encodedSelector2String = @"supportForScreen:".encodedForSelector; + NSString *encodedSelector2String = @"BQcCAgEEBlcBBGR0BHZ2AEs="; + NSString *_Nullable selector2String = encodedSelector2String.decodedForSelector; + if (selector2String == nil) { + OWSFailDebug(@"selector2String was unexpectedly nil"); + return; + } + SEL selector2 = NSSelectorFromString(selector2String); + if (![klass respondsToSelector:selector2]) { + OWSFailDebug(@"klass didn't respond to selector"); + return; + } + IMP imp2 = [klass methodForSelector:selector2]; + id (*func2)(id, SEL, UIScreen *) = (void *)imp2; + id dismissSupport = func2(klass, selector2, UIScreen.mainScreen); + + // NSString *encodedSelector3String = @"finishScrollViewTransition".encodedForSelector; + NSString *encodedSelector3String = @"d3oAegV5ZHQEAX19Z3p2CWUEcgAFegZ6AQA="; + NSString *_Nullable selector3String = encodedSelector3String.decodedForSelector; + if (selector3String == nil) { + OWSFailDebug(@"selector3String was unexpectedly nil"); + return; + } + SEL selector3 = NSSelectorFromString(selector3String); + if (![dismissSupport respondsToSelector:selector3]) { + OWSFailDebug(@"dismissSupport didn't respond to selector"); + return; + } + IMP imp3 = [dismissSupport methodForSelector:selector3]; + void (*func3)(id, SEL) = (void *)imp3; + func3(dismissSupport, selector3); + + OWSLogInfo(@"finished scrollView transition"); } } From e3cc8bb101f3a3c6b90a2382ee2a9e17c14fc98d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 20 Mar 2019 18:07:56 -0700 Subject: [PATCH 362/493] Keep results bar visible when dismissing keyboard or returning to view. --- Signal/src/ConversationSearch.swift | 5 +- .../ConversationViewController.m | 65 ++++++++++++++++++- .../util/UI Categories/UIResponder+OWS.swift | 3 +- SignalMessaging/Views/OWSNavigationBar.swift | 14 ++++ 4 files changed, 81 insertions(+), 6 deletions(-) diff --git a/Signal/src/ConversationSearch.swift b/Signal/src/ConversationSearch.swift index c98d21237..ebfc27fe0 100644 --- a/Signal/src/ConversationSearch.swift +++ b/Signal/src/ConversationSearch.swift @@ -30,7 +30,8 @@ public class ConversationSearchController: NSObject { let thread: TSThread - let resultsBar: SearchResultsBar = SearchResultsBar(frame: .zero) + @objc + public let resultsBar: SearchResultsBar = SearchResultsBar(frame: .zero) // MARK: Initializer @@ -130,7 +131,7 @@ protocol SearchResultsBarDelegate: AnyObject { resultSet: ConversationScreenSearchResultSet) } -class SearchResultsBar: UIToolbar { +public class SearchResultsBar: UIToolbar { weak var resultsBarDelegate: SearchResultsBarDelegate? diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 2de12e297..1156d0376 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -656,7 +656,11 @@ typedef enum : NSUInteger { - (nullable UIView *)inputAccessoryView { - return self.inputToolbar; + if (self.isShowingSearchUI) { + return self.searchController.resultsBar; + } else { + return self.inputToolbar; + } } - (void)registerCellClasses @@ -1218,7 +1222,14 @@ typedef enum : NSUInteger { // We don't have to worry about the input toolbar being visible if the inputToolbar.textView is first responder // In fact doing so would unnecessarily dismiss the keyboard which is probably not desirable and at least // a distracting animation. - if (!self.inputToolbar.isInputTextViewFirstResponder) { + BOOL shouldBecomeFirstResponder = NO; + if (self.isShowingSearchUI) { + shouldBecomeFirstResponder = !self.searchController.uiSearchController.searchBar.isFirstResponder; + } else { + shouldBecomeFirstResponder = !self.inputToolbar.isInputTextViewFirstResponder; + } + + if (shouldBecomeFirstResponder) { OWSLogDebug(@"reclaiming first responder to ensure toolbar is shown."); [self becomeFirstResponder]; } @@ -4123,8 +4134,47 @@ typedef enum : NSUInteger { - (void)showSearchUI { self.isShowingSearchUI = YES; - self.navigationItem.titleView = self.searchController.uiSearchController.searchBar; + + UIView *searchBar = self.searchController.uiSearchController.searchBar; + + // Note: setting a searchBar as the titleView causes UIKit to render the navBar + // *slightly* taller (44pt -> 56pt) + self.navigationItem.titleView = searchBar; [self updateBarButtonItems]; + + // Hack so that the ResultsBar stays on the screen when dismissing the search field + // keyboard. + // + // Details: + // + // When the search UI is activated, both the SearchField and the ConversationVC + // have the resultsBar as their inputAccessoryView. + // + // So when the SearchField is first responder, the ResultsBar is shown on top of the keyboard. + // When the ConversationVC is first responder, the ResultsBar is shown at the bottom of the + // screen. + // + // When the user swipes to dismiss the keyboard, trying to see more of the content while + // searching, we want the ResultsBar to stay at the bottom of the screen - that is, we + // want the ConversationVC to becomeFirstResponder. + // + // If the SearchField were a subview of ConversationVC.view, this would all be automatic, + // as first responder status is percolated up the responder chain via `nextResponder`, which + // basically travereses each superView, until you're at a rootView, at which point the next + // responder is the ViewController which controls that View. + // + // However, because SearchField lives in the Navbar, it's "controlled" by the + // NavigationController, not the ConversationVC. + // + // So here we stub the next responder on the navBar so that when the searchBar resigns + // first responder, the ConversationVC will be in it's responder chain - keeeping the + // ResultsBar on the bottom of the screen after dismissing the keyboard. + if (![self.navigationController.navigationBar isKindOfClass:[OWSNavigationBar class]]) { + OWSFailDebug(@"unexpected navigationController: %@", self.navigationController); + return; + } + OWSNavigationBar *navBar = (OWSNavigationBar *)self.navigationController.navigationBar; + navBar.stubbedNextResponder = self; } - (void)hideSearchUI @@ -4134,8 +4184,17 @@ typedef enum : NSUInteger { self.navigationItem.titleView = self.headerView; [self updateBarButtonItems]; + if (![self.navigationController.navigationBar isKindOfClass:[OWSNavigationBar class]]) { + OWSFailDebug(@"unexpected navigationController: %@", self.navigationController); + return; + } + OWSNavigationBar *navBar = (OWSNavigationBar *)self.navigationController.navigationBar; + OWSAssertDebug(navBar.stubbedNextResponder == self); + navBar.stubbedNextResponder = nil; + // restore first responder to VC [self becomeFirstResponder]; + [self reloadInputViews]; } #pragma mark ConversationSearchControllerDelegate diff --git a/Signal/src/util/UI Categories/UIResponder+OWS.swift b/Signal/src/util/UI Categories/UIResponder+OWS.swift index e0b817bce..ce1d96c30 100644 --- a/Signal/src/util/UI Categories/UIResponder+OWS.swift +++ b/Signal/src/util/UI Categories/UIResponder+OWS.swift @@ -1,11 +1,12 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // // Based on https://stackoverflow.com/questions/1823317/get-the-current-first-responder-without-using-a-private-api/11768282#11768282 extension UIResponder { private weak static var firstResponder: UIResponder? + @objc public class func currentFirstResponder() -> UIResponder? { firstResponder = nil diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift index aae117725..1d0997460 100644 --- a/SignalMessaging/Views/OWSNavigationBar.swift +++ b/SignalMessaging/Views/OWSNavigationBar.swift @@ -55,6 +55,20 @@ public class OWSNavigationBar: UINavigationBar { object: nil) } + // MARK: FirstResponder Stubbing + + @objc + public weak var stubbedNextResponder: UIResponder? + + override public var next: UIResponder? { + if let stubbedNextResponder = self.stubbedNextResponder { + Logger.debug("returning stubbed responder") + return stubbedNextResponder + } + + return super.next + } + // MARK: Theme private func applyTheme() { From 4ea608cd45d25a3d1719734bff2d606f1bb52243 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 12:18:20 -0400 Subject: [PATCH 363/493] Ensure status bar is hidden in image editor subviews. --- .../Views/ImageEditor/ImageEditorBrushViewController.swift | 5 +++++ .../Views/ImageEditor/ImageEditorCropViewController.swift | 5 +++++ .../Views/ImageEditor/ImageEditorTextViewController.swift | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 4281208dc..6848b4a13 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -114,6 +114,11 @@ public class ImageEditorBrushViewController: OWSViewController { paletteView.isHidden = hasStroke } + @objc + public override var prefersStatusBarHidden: Bool { + return true + } + // MARK: - Actions @objc func didTapUndo(sender: UIButton) { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 3a78f54f6..9714a73c3 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -237,6 +237,11 @@ class ImageEditorCropViewController: OWSViewController { : "image_editor_crop_unlock")) } + @objc + public override var prefersStatusBarHidden: Bool { + return true + } + private static let desiredCornerSize: CGFloat = 24 private static let minCropSize: CGFloat = desiredCornerSize * 2 private var cornerSize = CGSize.zero diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index f4814c540..53f1f2cfc 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -234,6 +234,11 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel updateNavigationBar(navigationBarItems: navigationBarItems) } + @objc + public override var prefersStatusBarHidden: Bool { + return true + } + // MARK: - Pinch Gesture private var pinchFontStart: UIFont? From 558b5f5816afe85a101bbd7a6a793497e7e1eca1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 12:18:38 -0400 Subject: [PATCH 364/493] Tap to dismiss caption editor. --- .../AttachmentApprovalViewController.swift | 17 +++++++++++++++ .../AttachmentPrepViewController.swift | 21 ------------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 6d7451bcf..00dd02442 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -114,6 +114,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return bottomToolView }() + lazy var touchInterceptorView = UIView() + // MARK: - View Lifecycle public override var prefersStatusBarHidden: Bool { @@ -145,6 +147,12 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // layout immediately to avoid animating the layout process during the transition self.currentPageViewController.view.layoutIfNeeded() + + view.addSubview(touchInterceptorView) + touchInterceptorView.autoPinEdgesToSuperviewEdges() + touchInterceptorView.isHidden = true + let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:))) + touchInterceptorView.addGestureRecognizer(tapGesture) } override public func viewWillAppear(_ animated: Bool) { @@ -177,6 +185,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC updateNavigationBar() updateInputAccessory() updateControlVisibility() + + touchInterceptorView.isHidden = !isEditingCaptions } // MARK: - Input Accessory @@ -609,6 +619,13 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // MARK: - Event Handlers + @objc + func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) { + Logger.info("") + + isEditingCaptions = false + } + private func cancelPressed() { self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 887565cd4..80dab11b5 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -57,17 +57,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD fatalError("init(coder:) has not been implemented") } - // MARK: - Subviews - - // TODO: Do we still need this? - lazy var touchInterceptorView: UIView = { - let touchInterceptorView = UIView() - let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapTouchInterceptorView(gesture:))) - touchInterceptorView.addGestureRecognizer(tapGesture) - - return touchInterceptorView - }() - // MARK: - View Lifecycle override public func loadView() { @@ -175,10 +164,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD playButton.addTarget(self, action: #selector(playButtonTapped), for: .touchUpInside) playButton.autoCenterInSuperview() } - - view.addSubview(touchInterceptorView) - touchInterceptorView.autoPinEdgesToSuperviewEdges() - touchInterceptorView.isHidden = true } override public func viewWillAppear(_ animated: Bool) { @@ -220,12 +205,6 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD // MARK: - Event Handlers - @objc - func didTapTouchInterceptorView(gesture: UITapGestureRecognizer) { - Logger.info("") - touchInterceptorView.isHidden = true - } - @objc public func didTapPlayerView(_ gestureRecognizer: UIGestureRecognizer) { assert(self.videoPlayer != nil) From 85d58d3396ef92400d34b2a0892a96a06147992a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 14:48:23 -0400 Subject: [PATCH 365/493] Improve handling of call intents. --- Signal/src/AppDelegate.m | 43 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index a6b4afeed..c626266ba 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -852,13 +852,10 @@ static NSTimeInterval launchStartedAt; return; } - NSString *_Nullable phoneNumber = handle; - if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) { - phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle]; - if (phoneNumber.length < 1) { - OWSLogWarn(@"ignoring attempt to initiate video call to unknown anonymous signal user."); - return; - } + NSString *_Nullable phoneNumber = [self phoneNumberForIntentHandle:handle]; + if (phoneNumber.length < 1) { + OWSLogWarn(@"ignoring attempt to initiate video call to unknown user."); + return; } // This intent can be received from more than one user interaction. @@ -914,13 +911,10 @@ static NSTimeInterval launchStartedAt; return; } - NSString *_Nullable phoneNumber = handle; - if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) { - phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle]; - if (phoneNumber.length < 1) { - OWSLogWarn(@"ignoring attempt to initiate audio call to unknown anonymous signal user."); - return; - } + NSString *_Nullable phoneNumber = [self phoneNumberForIntentHandle:handle]; + if (phoneNumber.length < 1) { + OWSLogWarn(@"ignoring attempt to initiate audio call to unknown user."); + return; } if (AppEnvironment.shared.callService.call != nil) { @@ -962,6 +956,27 @@ static NSTimeInterval launchStartedAt; return NO; } +- (nullable NSString *)phoneNumberForIntentHandle:(NSString *)handle +{ + OWSAssertDebug(handle.length > 0); + + if ([handle hasPrefix:CallKitCallManager.kAnonymousCallHandlePrefix]) { + NSString *_Nullable phoneNumber = [self.primaryStorage phoneNumberForCallKitId:handle]; + if (phoneNumber.length < 1) { + OWSLogWarn(@"ignoring attempt to initiate audio call to unknown anonymous signal user."); + return nil; + } + return phoneNumber; + } + + for (PhoneNumber *phoneNumber in + [PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:handle + clientPhoneNumber:[TSAccountManager localNumber]]) { + return phoneNumber.toE164; + } + return nil; +} + #pragma mark - Orientation - (UIInterfaceOrientationMask)application:(UIApplication *)application From 8c345d0878ced931d156be0cdb8bd1a874b0d8e0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Mar 2019 16:41:51 -0400 Subject: [PATCH 366/493] "Bump build to 2.38.0.6." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 203e8b1c0..0cb442d8b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.5 + 2.38.0.6 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index b4e57b908..4d3030a94 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.5 + 2.38.0.6 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From a7ae79aaadb34c358a40b7abd4e1c4d0d0318b1b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 10:26:25 -0400 Subject: [PATCH 367/493] Ignore keyboard notifications while the view is disappearing or has disappeared. --- .../ConversationViewController.m | 16 +++++++++++++++- SignalMessaging/profiles/ProfileFetcherJob.swift | 3 ++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 1156d0376..f6e331c11 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -194,6 +194,7 @@ typedef enum : NSUInteger { @property (nonatomic) BOOL isViewCompletelyAppeared; @property (nonatomic) BOOL isViewVisible; +@property (nonatomic) BOOL isViewDisappearing; @property (nonatomic) BOOL shouldAnimateKeyboardChanges; @property (nonatomic) BOOL viewHasEverAppeared; @property (nonatomic) BOOL hasUnreadMessages; @@ -737,6 +738,7 @@ typedef enum : NSUInteger { [self hideInputIfNeeded]; self.isViewVisible = YES; + self.isViewDisappearing = NO; // We should have already requested contact access at this point, so this should be a no-op // unless it ever becomes possible to load this VC without going via the HomeViewController. @@ -1262,17 +1264,20 @@ typedef enum : NSUInteger { // until `viewDidDisappear`. - (void)viewWillDisappear:(BOOL)animated { - OWSLogDebug(@"viewWillDisappear"); + OWSLogDebug(@""); [super viewWillDisappear:animated]; self.isViewCompletelyAppeared = NO; + self.isViewDisappearing = YES; [self dismissMenuActions]; } - (void)viewDidDisappear:(BOOL)animated { + OWSLogDebug(@""); + [super viewDidDisappear:animated]; self.userHasScrolled = NO; self.isViewVisible = NO; @@ -3828,6 +3833,15 @@ typedef enum : NSUInteger { { OWSAssertIsOnMainThread(); + if (self.isViewDisappearing) { + // To avoid unnecessary animations, ignore keyboard notifications + // while the view is disappearing or has disappeared. + // + // This is safe; we'll always get more keyboard notifications when + // the view will re-appear. + return; + } + NSDictionary *userInfo = [notification userInfo]; NSValue *_Nullable keyboardBeginFrameValue = userInfo[UIKeyboardFrameBeginUserInfoKey]; diff --git a/SignalMessaging/profiles/ProfileFetcherJob.swift b/SignalMessaging/profiles/ProfileFetcherJob.swift index 176729b02..e1608b670 100644 --- a/SignalMessaging/profiles/ProfileFetcherJob.swift +++ b/SignalMessaging/profiles/ProfileFetcherJob.swift @@ -115,7 +115,8 @@ public class ProfileFetcherJob: NSObject { }.catch(on: DispatchQueue.global()) { error in switch error { case ProfileFetcherJobError.throttled(let lastTimeInterval): - Logger.info("skipping updateProfile: \(recipientId), lastTimeInterval: \(lastTimeInterval)") + // skipping + break case let error as SignalServiceProfile.ValidationError: Logger.warn("skipping updateProfile retry. Invalid profile for: \(recipientId) error: \(error)") default: From a6e00c8fecf1959565346271c0b50adcc85e7dcd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 16:53:55 -0400 Subject: [PATCH 368/493] Respond to CR. --- .../ConversationViewController.m | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index f6e331c11..25d0806d4 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -194,7 +194,6 @@ typedef enum : NSUInteger { @property (nonatomic) BOOL isViewCompletelyAppeared; @property (nonatomic) BOOL isViewVisible; -@property (nonatomic) BOOL isViewDisappearing; @property (nonatomic) BOOL shouldAnimateKeyboardChanges; @property (nonatomic) BOOL viewHasEverAppeared; @property (nonatomic) BOOL hasUnreadMessages; @@ -214,6 +213,7 @@ typedef enum : NSUInteger { @property (nonatomic) BOOL isShowingSearchUI; @property (nonatomic, nullable) MenuActionsViewController *menuActionsViewController; @property (nonatomic) CGFloat extraContentInsetPadding; +@property (nonatomic) CGFloat contentInsetBottom; @end @@ -738,7 +738,6 @@ typedef enum : NSUInteger { [self hideInputIfNeeded]; self.isViewVisible = YES; - self.isViewDisappearing = NO; // We should have already requested contact access at this point, so this should be a no-op // unless it ever becomes possible to load this VC without going via the HomeViewController. @@ -1269,7 +1268,6 @@ typedef enum : NSUInteger { [super viewWillDisappear:animated]; self.isViewCompletelyAppeared = NO; - self.isViewDisappearing = YES; [self dismissMenuActions]; } @@ -3833,15 +3831,6 @@ typedef enum : NSUInteger { { OWSAssertIsOnMainThread(); - if (self.isViewDisappearing) { - // To avoid unnecessary animations, ignore keyboard notifications - // while the view is disappearing or has disappeared. - // - // This is safe; we'll always get more keyboard notifications when - // the view will re-appear. - return; - } - NSDictionary *userInfo = [notification userInfo]; NSValue *_Nullable keyboardBeginFrameValue = userInfo[UIKeyboardFrameBeginUserInfoKey]; @@ -3861,18 +3850,26 @@ typedef enum : NSUInteger { UIEdgeInsets oldInsets = self.collectionView.contentInset; UIEdgeInsets newInsets = oldInsets; - // Use a content inset that so that the conversation content - // is not hidden behind the keyboard + input accessory. + // Measures how far the keyboard "intrudes" into the collection view's content region. + // Indicates how large the bottom content inset should be in order to avoid the keyboard + // from hiding the conversation content. // - // Make sure to leave space for the bottom layout guide (the notch). - // - // Always reserve room for the input accessory, which we display even - // if the keyboard is not active. - newInsets.top = 0; - newInsets.bottom = MAX(0, self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y); + // NOTE: we can ignore the "bottomLayoutGuide" (i.e. the notch); this will be accounted + // for by the "adjustedContentInset". + CGFloat keyboardContentOverlap + = MAX(0, self.view.height - self.bottomLayoutGuide.length - keyboardEndFrameConverted.origin.y); - newInsets.top += self.extraContentInsetPadding; - newInsets.bottom += self.extraContentInsetPadding; + // For the sake of continuity, we want to maintain the same contentInsetBottom when the + // the keyboard/input accessory are hidden, e.g. during dismissal animations, when + // presenting popups like the attachment picker, etc. + // + // Therefore, we only zero out the contentInsetBottom if the inputAccessoryView is nil. + if (self.inputAccessoryView == nil || keyboardContentOverlap > 0) { + self.contentInsetBottom = keyboardContentOverlap; + } + + newInsets.top = 0 + self.extraContentInsetPadding; + newInsets.bottom = self.contentInsetBottom + self.extraContentInsetPadding; BOOL wasScrolledToBottom = [self isScrolledToBottom]; From c37fb42c7a98abe6be99823ac439af0f0e18b7b4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Mar 2019 17:38:53 -0700 Subject: [PATCH 369/493] "Bump build to 2.38.0.7." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 0cb442d8b..d96cde91b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.6 + 2.38.0.7 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 4d3030a94..235999e11 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.6 + 2.38.0.7 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From ed6b461662d37055bfed65e32da0309e80d06368 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 22 Mar 2019 12:11:01 -0700 Subject: [PATCH 370/493] search icon --- .../Contents.json | 23 ++++++++++++++++++ .../search-24@1x.png | Bin 0 -> 321 bytes .../search-24@2x.png | Bin 0 -> 654 bytes .../search-24@3x.png | Bin 0 -> 999 bytes .../OWSConversationSettingsViewController.m | 2 +- SignalMessaging/Views/OWSNavigationBar.swift | 1 - 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json create mode 100644 Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png create mode 100644 Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png create mode 100644 Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json b/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json new file mode 100644 index 000000000..56e31a38a --- /dev/null +++ b/Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "search-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "search-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "search-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..f5692befb79df06faaa3100c499e34da92402b27 GIT binary patch literal 321 zcmV-H0lxl;P)2L!FbIT9;1M!HM(GG1p(AA!kC0Ka0hKFUAs{qK z?MIQ2B6Hk}*$9lmvfm*Ymcm zUab1WBbj)}_Jd)IEX>jOAOzpBw*V0};`s(gGAq)4JmlrdA&(u?;TMh0KNX9pJgnXb z(DldeDZbMw0d*#_QWBkIf!iVxLww^Vr%1#k^cFGTP9l%)0z%|NUj5JiDgfXG0Q`mj Tgk?a`00000NkvXXu0mjf$$o?h literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5520b610fb0956ec5334baf5e25dda312a82cfd1 GIT binary patch literal 654 zcmV;90&)F`P)!5cIqbcBx35i&wXa5hLc z$O!HPRH)aAa?gnYJ2p|Cgk&8D$Ag1ANQ|`>CF7~+(LV^R0MDsIFve^Fv;Z0aFG}GD zM*tmwgSGagYNvqP#4!cH4uBhsjV!LsF4o?)GF}m=Wj1369v0U}&1|HUQOBq;#<|KK zz$U2ra_%96ItO*NxK}&S&aK8l8H>e;nctCFJd3FPQ)_uxEOiBtmyenjj^R&QHOH zjrREw1l*qRH};9?MH2w9oy&EIt#GBcOz%=*xlrq$*Vfv-(wGhhi3!a1C@=zz_njYT zF2Gvb2R52vZ4O4jPs}=1J3V|GLrLKv7y%z)dN2pFZ2Ti&jH#5y%5h&;O4(FJ;o1t+ zN-{mNY%l^x?>qWfOMq|V7~7l?@Q<~2&W$a7`@t*v*k%O$z_Lk+ju8lNYw>}T7U^`-%}fbA1La<5>^)p5ZRwZ#3p4ijtitq3`%3x+31jJ(XajOQk&ScFf;NUr{8KAcBaSz4t4t(uvOC zWnJ7YnS>H7QF2HqL1`qEpfnOnP#Os(STPBjFR}Z;;*en0NO1cNd~a-At9_O5NE{_X o(_c9se>GSd4+2Z0Yytqj0c85LWmBGtFaQ7m07*qoM6N<$g1!SD>i_@% literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png b/Signal/Images.xcassets/conversation_settings_search.imageset/search-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ddcb373baf3dbed24992e3f4563370a488aa3b7e GIT binary patch literal 999 zcmVZo*+1?`t%I=jNJqpQA|kJeI~G z+xWtv8LtT%xwGe#YQbX_;gMwvARL-S_Bq)jM-a9nd9St4E)egKHA30eoEDs{HOYO) zEgYhO{uDWAZATVq6kfv7GI~Z^cP!)eNaN-jMX7wyMtA_8i0CN1BZE0SDWhtfdn5WT zhKOh7J?lFWJ&VQ#fQU^L{Ru{XC8C8F8#979uM>)Mnu<8^5k;rKeaGBgU<$g$je9ScYY-wfQ|Z4PG7+I@H~}DH_#s}1Xz9T$7C~Wx-AZ;% z0UMyfjpSDn3vJN}xXG6Np8SScmxCXHqaY3GO)r z%DO{!gvLqZ-V0p?a!n;TLF1%x?*(%W0z2LDa|-z&D4p(LXlLLL!cz_!7mag&Xlcez zo^o~NCLE%{bd&a4k;Ax2`$QDgW1lNRQ#v@@C_Ks?9Mb1GdR}Pvj3N-lk9@}}Uf3Ao zWQ}Cuh}lHTU$U-+!qI~4*acMD)9Tu?7Iq4UgGj{JdlP42Qe#}~nF~8bKg9&1@{sz5OSz#Hm1 V)}SbafgJz<002ovPDHLkV1gXezFz Date: Fri, 22 Mar 2019 18:35:51 -0700 Subject: [PATCH 371/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 102 ++++------- .../translations/az.lproj/Localizable.strings | 102 ++++------- .../translations/bg.lproj/Localizable.strings | 102 ++++------- .../translations/bs.lproj/Localizable.strings | 102 ++++------- .../translations/ca.lproj/Localizable.strings | 102 ++++------- .../translations/cs.lproj/Localizable.strings | 102 ++++------- .../translations/da.lproj/Localizable.strings | 142 ++++++--------- .../translations/de.lproj/Localizable.strings | 102 ++++------- .../translations/el.lproj/Localizable.strings | 102 ++++------- .../translations/es.lproj/Localizable.strings | 104 ++++------- .../translations/et.lproj/Localizable.strings | 102 ++++------- .../translations/fa.lproj/Localizable.strings | 102 ++++------- .../translations/fi.lproj/Localizable.strings | 102 ++++------- .../fil.lproj/Localizable.strings | 102 ++++------- .../translations/fr.lproj/Localizable.strings | 102 ++++------- .../translations/gl.lproj/Localizable.strings | 102 ++++------- .../translations/he.lproj/Localizable.strings | 102 ++++------- .../translations/hr.lproj/Localizable.strings | 102 ++++------- .../translations/hu.lproj/Localizable.strings | 102 ++++------- .../translations/id.lproj/Localizable.strings | 102 ++++------- .../translations/it.lproj/Localizable.strings | 102 ++++------- .../translations/ja.lproj/Localizable.strings | 102 ++++------- .../translations/km.lproj/Localizable.strings | 170 +++++++----------- .../translations/ko.lproj/Localizable.strings | 102 ++++------- .../translations/lt.lproj/Localizable.strings | 102 ++++------- .../translations/lv.lproj/Localizable.strings | 102 ++++------- .../translations/mk.lproj/Localizable.strings | 102 ++++------- .../translations/my.lproj/Localizable.strings | 102 ++++------- .../translations/nb.lproj/Localizable.strings | 102 ++++------- .../nb_NO.lproj/Localizable.strings | 102 ++++------- .../translations/nl.lproj/Localizable.strings | 164 +++++++---------- .../translations/pl.lproj/Localizable.strings | 102 ++++------- .../pt_BR.lproj/Localizable.strings | 104 ++++------- .../pt_PT.lproj/Localizable.strings | 102 ++++------- .../translations/ro.lproj/Localizable.strings | 102 ++++------- .../translations/ru.lproj/Localizable.strings | 168 +++++++---------- .../translations/sl.lproj/Localizable.strings | 102 ++++------- .../translations/sn.lproj/Localizable.strings | 102 ++++------- .../translations/sq.lproj/Localizable.strings | 110 ++++-------- .../translations/sv.lproj/Localizable.strings | 118 ++++-------- .../translations/th.lproj/Localizable.strings | 102 ++++------- .../translations/tr.lproj/Localizable.strings | 114 ++++-------- .../translations/uk.lproj/Localizable.strings | 102 ++++------- .../zh_CN.lproj/Localizable.strings | 102 ++++------- .../zh_TW.lproj/Localizable.strings | 102 ++++------- 45 files changed, 1488 insertions(+), 3378 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index f6ca15563..6164cbe5b 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "إضافة تعليق.."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "نوع الملف: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "فشل التحميل. انقر للمعاودة."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "جارى التحميل.."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "في قائمة الانتظار"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "خطأ في ارسال المرفقات."; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "التالي\n"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "حدد"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "معاودة الاتصال"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "رفض مكالمة واردة"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "انهاء المكالمة"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "حذف المحادثة؟"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "إعدادات المحادثة"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "إنشاء جهة اتصال جديدة"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "انقر للتغيير"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "بحث"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "إعادة ضبط"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "فاكس عمل"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "فشل التسجيل"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "إرسال"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "رمز البلد"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "رمز التسجيل"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "قم بإدخال الرقم"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "لديك حساب في Signal بالفعل؟"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "صيغة رقم الهاتف هذه غير مدعومة, فضلّا تواصل مع الدعم."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "رقم هاتفك"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "فشل التحقق"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "سجل"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "الرجاء إدخال رقم هاتف صالح للتسجيل."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "ترقية iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "الرجوع"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "رمز التحقق"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "اتصل بي بدلاً من ذلك"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "إعادة ارسال الشفرة عبر الرسائل النصية"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "إرسال"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "ادخال شفرة التحقق التي أرسلناها إلى %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "لقد قمت بوضع علامة \"غير متحقق منه\" ل%@."; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 5a3bc0744..955bcb8ed 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "File type: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloading…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Error Sending Attachment"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "End call"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Söhbət quraşdırmaları"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Ölkə kodu"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Nömrə yaz"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Bu formatda telefon nömrəsi dəstəklənmir, Yardıma müraciət edin."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Telefon nömrəniz"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Təsdiqləmə alınmadı"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Register"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Back"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Təsdiqləmə kodu"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index 99ba76faa..998465fd6 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Вид Файл: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Изтегляне..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "На Опашка"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Грешка с изпращане на прикачения файл"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Следващ"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Изберете"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Откажи входящо повикване"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Край на обаждането"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Настройки на Разговор"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Създай Нов Контакт"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Търсене"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Рестартирай"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Служебен Факс"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Регистрацията на този телефонен номер ще бъде възможна без вашия PIN за регистрация за заключване след изтичането на 7 дни, откакто телефонният номер последно е бил активен в Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Този телефонен номер има активирано заключване на регистрация. Моля, въведете ПИН за регистрация.\nПИН кодът Ви за регистрация е отделен от автоматичния код за потвърждение, изпратен на телефона ви по време на последната стъпка."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Регистрацията се провали"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Изпращане"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Код на Държава"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Заключване на Регистрация"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Въведете Номер"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Вече имате Сигнал акаунт?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Формата на телефонният номер не се поддържа, моля свържете се с поддръжката. "; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Вашият Телефонен Номер"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Проверката е Неуспешна"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Неправилен PIN за регистрация."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Регистрирай"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Моля, въведете валиден телефонен номер, за да се регистрирате."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Надстройте iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Обратно"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код за потвърждение"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Звънни ми вместо това"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Повторно изпращане на кода чрез СМС"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Изпрати"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Въведете кода за потвърждение изпратен до %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Маркирахте %@ като проверен."; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 1e0f395a1..ec4257ed3 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Vrsta datoteke: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Greška u preuzimanju. Dodirnite da bi ste pokušali ponovo."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Preuzimanje..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Na redu čekanja"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Greška prilokom slanja priloga"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "End call"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Podešavanje razgovora"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Izradi novi kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Traži"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Poslovni Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Državni kôd "; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Unesite broj"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Već imate Signal račun?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Telefonski broj u ovom formatu nije podržan, molimo kontaktirajte podršku."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Vaš telefonski broj"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Provjera nije uspjela"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Register"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Molimo unesite važeći telefonski broj za registraciju."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ažuriraj iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Nazad"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Potvrdni kôd"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Potvrdi pozivom"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovo pošalji kôd SMS-om"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Unesite potvrdni kôd koji smo poslali na %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@ nije provjeren/a."; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 26c44a305..6e8bcf6ea 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Afegeix una descripció..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipus de fitxer: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Ha fallat la baixada. Toqueu per a provar de nou."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "S'està baixant..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "A la cua"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Error en enviar l'adjunt"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Següent"; -/* Label for redo button. */ -"BUTTON_REDO" = "Refés"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleccionar"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Desfés"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Torna a trucar"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rebutja trucades"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Finalitza la trucada"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Esborrar conversa?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Configuració del xat"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Crea un contacte nou"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toca per canviar"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclòs %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclosos %@i %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dels vostres contactes ja són al Signal, inclosos %@, %@i %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pinzell"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Retalla"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Restableix"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Gira 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Gira 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No podeu compartir més de %@ elements."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax de la feina"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Àlbum sense nom"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "El registre d'aquest número de telèfon serà possible sense el PIN de bloqueig de registre 7 dies després des de l'última activitat del número de telèfon al Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Aquest número de telèfon té el bloqueig de registre activat. Si us plau, introduïu el PIN de bloqueig de registre.\n\nEl PIN de bloqueig de registre és diferent del codi de verificació automatitzat que s'ha enviat al vostre telèfon al pas anterior."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Ha fallat el registre"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Tramet"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Codi internacional"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Pany de Registre"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introduïu el número"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Ja teniu un compte al Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Condicions de servei i política de privadesa"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Registrant aquest dispositiu accepteu el següent de Signal: %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "termes"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "El format del número de telèfon no és compatible, contacteu amb el suport."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Heu de registrar-vos per poder enviar un missatge. "; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "El vostre número de telèfon"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "La verificació ha fallat"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Codi PIN de registre incorrecte."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registra"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Introduïu un número de telèfon vàlid a registrar."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualitzeu l'iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Enrere"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Codi de verificació"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Telefona'm, millor"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Reenvia el codi via SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Tramet"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Introduïu el codi de verificació que hem enviat a %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Heu marcat %@ com a no verificat."; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 21d2f8d29..f3d431dd7 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Přidat titulek..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Typ souboru: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Stahování selhalo. Klepnutím to zkuste znovu."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Stahování…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Ve frontě"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Chyba při odesílání přílohy"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Další"; -/* Label for redo button. */ -"BUTTON_REDO" = "Znovu"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Vybrat"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Zpět"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Zavolat znovu"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Odmítnout příchozí hovor"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Ukončit hovor"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Smazat konverzaci?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Nastavení konverzace"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Vytvořit nový kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Klepněte pro změnu"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hledat"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Některý z vašich kontaktů už je na Signalu, včetně 1 %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Oříznout"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nemůžete sdílet více než %@ položek."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Pracovní fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album beze jména"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrace tohoto telefonního čísla bude možná bez PINu zámku registrace po uplynutí 7 dní od poslední aktivity telefonního čísla na Signalu."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Toto telefonní číslo má povolený zámek registrace. Prosím zadejte PIN zámku registrace.\n\nPIN zámku registrace se liší od ověřovacího kódu, který vám byl odeslán při předchozím kroku."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrace neúspěšná"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Potvrdit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Kód země"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Zámek registrace"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Vložte číslo"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Máte už účet Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Podmínky & Zásady ochrany osobních údajů"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Registrací tohoto zařízení souhlasíte s %@ Signalu"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "podmínky"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Tento formát telefonního čísla není podporován, prosím, kontaktujte podporu."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Před tím, než začnete posílat zprávy, se musíte registrovat."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Vaše telefonní číslo"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Ověření selhalo"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Neplatný PIN zámku registrace."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Zaregistrovat se"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = " Pro registraci zadejte platné telefonní číslo."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgradujte iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Zpět"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Ověřovací kód"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Místo toho mi zavolejte"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Znovu odeslat kód pomocí SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Potvrdit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Zadejte ověřovací kód, který jsme odeslali na %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Označil(a) jste %@ jako neověřený."; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 03649f8cd..5ef328a64 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Tilføj en billedtekst..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Fil type: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Fejl ved afhentning. Tryk for at prøve igen."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Henter..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Sat i kø"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = " Kunne ikke sende fil"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Næste"; -/* Label for redo button. */ -"BUTTON_REDO" = "Gentag"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Vælg"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Fortryd"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ring igen"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Afvis opkald"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Afslut opkald"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Slet samtale?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Samtale indstillingér"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Opret ny kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tryk for at ændre"; @@ -1056,17 +1062,17 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søg"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Nogle af dine kontakter er allerede på Signal, blandt andet %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Nogle af dine kontakter er allerede på Signal, blandt andet %@ og %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Nogle af dine kontakter er allerede på Signal, blandt andet %@, %@ og %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Begynd din første samtale her."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ingen resultater fundet for '%@'"; @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Børste"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Beskær"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan ikke dele mere end %@ ting."; @@ -1509,10 +1500,10 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Dette telefonnummer har registreringslås slået til. Indtast venligst registreringskoden"; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Din Registreringslås PIN er separat fra den automatiske verifikationskode, der blev sendt til din telefon under det sidste trin."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Jeg har glemt min PIN-kode"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registreringslås"; @@ -1521,10 +1512,10 @@ "ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Giv tilladelse"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Din kontaktinformation bliver altid sendt sikkert."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nu"; @@ -1542,7 +1533,7 @@ "ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Dit navn"; /* Title of the 'onboarding profile' view. */ "ONBOARDING_PROFILE_TITLE" = "Konfigurer din profil"; @@ -1551,40 +1542,40 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår og privatlivspolitik"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Tag privatlivet med dig. \nSkriv lige hvad du vil i enhver besked"; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Forkert nummer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Jeg har ikke modtaget en verifikationskode (tilgængelig i %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Den indtastede verifikationskode er forkert"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Jeg har ikke modtaget en verifikationskode"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Tjek at du har mobil dækning og kan modtage SMSer."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Ingen verifikationskode?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Gensend verifikationskode"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring til mig i stedet "; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Stadig ingen verifikationskode?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Indtast verifikationskoden vi sendte til %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Vi har gensendt en verifikationskode til %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Indstillingér"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Arbejdsfax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unavngivet album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrering af dette telefonnummer vil være muligt uden din Registreringslås PIN-kode, når der er gået 7 dage siden telefonnummeret sidst var aktiv på Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Dette telefonnummer har Registreringslås aktiveret. Indtast venligst Registreringslås PIN-koden.\n\nDin Registreringslås PIN er separat fra den automatiske verifikationskode, der blev sendt til din telefon under det sidste trin."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrering fejlede"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Indsend"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landekode"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registreringslås"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Indtast nummer"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Har du allerede en Signal konto?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Vilkår og privatlivspolitik"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ved at registrere denne enhed accepterer du Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "vilkår"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Dette telefonnummerformat er ikke understøttet."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Du skal registrere dig, før du kan sende en besked."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Dit telefonnummer"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifikation mislykkedes"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Forkert registreringslås PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrer"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Indtast venligst et gyldigt telefonnummer for at registrere."; @@ -2412,7 +2388,7 @@ "UNKNOWN_CONTACT_NAME" = "Ukendt kontakt"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Ukendt land"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ukendt"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Opgrader iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Tilbage"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikationskode"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring mig op i stedet."; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Gensend kode på SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Indsend"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Indtast verifikationskoden vi sendte til %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du har markeret %@ som ikke godkendt."; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 9863669bd..64df9d8fc 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Beschriftung hinzufügen …"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Beschriftung"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Dateityp: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Herunterladen gescheitert. Für erneuten Versuch antippen."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Wird heruntergeladen …"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "In Wartereihe"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Fehler beim Senden des Anhangs"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Weiter"; -/* Label for redo button. */ -"BUTTON_REDO" = "Wiederherstellen"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Auswählen"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Rückgängig"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Erneut anrufen"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Eingehenden Anruf ablehnen"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Zum Anschalten deiner Videoübertragung hier antippen"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Anruf beenden"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Unterhaltung löschen?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Keine Treffer"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 Treffer"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d von %d Treffern"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Unterhaltungseinstellungen"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Neuen Kontakt erstellen"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Unterhaltung durchsuchen"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Zum Ändern antippen"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Suchen"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@ und %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Einige deiner Kontakte sind bereits bei Signal, darunter %@, %@ und %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pinsel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Zuschneiden"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Neu starten"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45° rotieren"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90° rotieren"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kannst nicht mehr als %@ Elemente teilen."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax Arbeit"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Bild kann nicht aufgenommen werden."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Bild kann nicht aufgenommen werden."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Konfigurieren der Kamera gescheitert."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unbenanntes Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Ohne deine PIN für die Registrierungssperre wird die Registrierung dieser Rufnummer erst nach Ablauf von 7 Tagen seit der letzten Aktivität der Rufnummer auf Signal möglich sein."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Für diese Rufnummer ist die Registrierungssperre aktiviert. Bitte gib die PIN für die Registrierungssperre ein.\n\nDeine PIN für die Registrierungssperre ist unabhängig vom automatisch erstellten Verifikationscode, der beim letzten Schritt an dein Telefon gesendet wurde."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrierung gescheitert"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Übermitteln"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landesvorwahl"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registrierungssperre"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Rufnummer eingeben"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Du hast bereits ein Signal-Konto?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Bedingungen & Datenschutzerklärung"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Durch Registrieren dieses Geräts stimmst zu Signals %@ zu"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "Bedingungen"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Dieses Rufnummernformat wird nicht unterstützt, bitte den Support kontaktieren."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Du musst dich registrieren, bevor du eine Nachricht senden kannst."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Deine Rufnummer"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifikation gescheitert"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Falsche PIN für die Registrierungssperre."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrieren"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Bitte gib eine gültige Rufnummer ein, um Signal zu registrieren."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS aktualisieren"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Zurück"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikationscode"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Mich anrufen"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Code via SMS erneut senden"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Senden"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Gib den an %@ gesendeten Verifikationscode ein."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du hast %@ als nicht verifiziert markiert."; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index d399f9420..617a1603a 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Προσθήκη λεζάντας..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Τύπος αρχείου: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Η λήψη απέτυχε. Πατήστε για επανάληψη."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Λήψη..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Σε αναμονή"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Σφάλμα αποστολής συννημένου"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Επόμενο"; -/* Label for redo button. */ -"BUTTON_REDO" = "Επαναφορά"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Επιλογή"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Αναίρεση"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Επανάκληση"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Απόρριψη εισερχόμενης κλήσης"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Τερματισμός κλήσης"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Διαγραφή συνομιλίας;"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Ρυθμίσεις Συνομιλίας"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Δημιουργία Νέας Επαφής"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Πατήστε για Αλλαγή"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Αναζήτηση"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Βούρτσα."; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Περικοπή"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Επαναφορά"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Φαξ Εργασίας"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Ανώνυμο άλμπουμ"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Η εγγραφή από αυτό τον αριθμό τηλεφώνου θα είναι δυνατή χωρίς το PIN κλειδώματος εγγραφής αφού περάσουν 7 ημέρες από την τελευταία φορά που αυτός ο αριθμός τηλεφώνου ήταν ενεργός στο Signal. "; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Το κλείδωμα εγγραφής για αυτό τον αριθμό τηλεφώνου είναι ενεργοποιημένο. Παρακαλώ εισάγετε το PIN κλειδώματος εγγραφής.\n\nΤο PIN κλειδώματος εγγραφής είναι διαφορετικό από τον αυτοματοποιημένο κωδικό επαλήθευσης που στάλθηκε στο τηλέφωνό σας κατά τη διάρκεια του τελευταίου βήματος."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Η Εγγραφή Απέτυχε"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Υποβολή"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Κωδικός χώρας"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Κλείδωμα εγγραφής"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Εισαγωγή αριθμού"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Έχετε ήδη λογαριασμό Signal;"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Όροι & Πολιτική Απορρήτου"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Με την εγγραφή αυτής της συσκευής, συμφωνείτε με %@ του Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "όροι"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Αυτή η μορφή αριθμού δεν υποστηρίζεται, παρακαλώ επικοινωνήστε με την υποστήριξη."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Θα πρέπει να εγγραφείτε πρώτα για να μπορέσετε στείλετε ένα μήνυμα."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ο Αριθμός Σας"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Η Eπιβεβαίωση Aπέτυχε"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Λάθος ΡΙΝ κλειδώματος εγγραφής."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Eγγραφή"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Παρακαλώ εισαγάγετε έναν έγκυρο αριθμό τηλεφώνου για να εγγραφείτε."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ενημέρωση Λογισμικού iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Πίσω"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Κωδικός Επαλήθευσης"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Καλέστε με αντ' αυτού"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Επανάληψη Αποστολής Κωδικού με SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Καταχώριση"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Εισάγετε τον κωδικό επαλήθευσης που στείλαμε στο %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Σημειώσατε τον/την %@ ως μη επιβεβαιωμένο/η."; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 6516ddfcf..7b814bd60 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Añade una explicación ..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Descripción"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipo de archivo: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Fallo al descargar. Toca para reintentar."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Descargando ..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "En la cola"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Fallo al enviar archivo adjunto"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Siguiente"; -/* Label for redo button. */ -"BUTTON_REDO" = "Rehacer"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleccionar"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Deshacer"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Llamar de nuevo"; @@ -330,7 +321,7 @@ "CALL_LABEL" = "Llamada"; /* notification body */ -"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Llamada perdida debido a que las cifras de seguridad del contacto han cambiado."; +"CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Llamada perdida debido cifras de seguridad del contacto nuevas."; /* notification body */ "CALL_MISSED_NOTIFICATION_BODY" = "☎️ Llamada perdida"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rechazar llamada entrante"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toca aquí para activar tu cámara"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Finalizar llamada"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "¿Eliminar chat?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Sin resultados"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 resultado"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d de %d resultados"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Ajustes del chat"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Crear nuevo contacto"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Buscar en el chat"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toca para modificar"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Algunos de tus contactos, como p.ej. %@ ya utilizan Signal."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Algunos de tus contactos ya utilizan Signal, p.ej. %@ y %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Algunos de tus contactos ya utilizan Signal, p.ej. %@, %@ y %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pincel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Recortar"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotar 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotar 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "No se pueden compartir más de %@ objetos."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "fax trabajo"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Fallo al tomar foto."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Fallo al tomar foto."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Fallo al activar la cámara."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sin nombre"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Un nuevo registro de este número de teléfono sin código PIN será posible pasados 7 días desde la última vez que este número ha estado activo en Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "El bloqueo de registro está activo para este número de teléfono. Introduce por favor el PIN de desbloqueo que tú mism@ has seleccionado.\n\nEl número PIN de bloqueo de registro no es el número que te hemos enviado por SMS durante el proceso de registro en Signal. "; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Fallo al registrarse"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Enviar"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código de país"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueo de registro"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introducir número"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "¿Ya tienes una cuenta de Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Aviso legal y privacidad"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Al registrar este dispositivo estás de acuerdo con los %@ de Signal."; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "términos de privacidad"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "El formato de número de telefono no es compatible, por favor contacta con nuestro soporte técnico."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Necesitas registrarte antes de poder enviar un mensaje."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Tu número de teléfono"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Fallo al verificar"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Número PIN de bloqueo de registro incorrecto."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrar"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Para registrarte introduce un número de teléfono válido."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Atrás"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificación"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Recibir llamada con código"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Solicitar código de nuevo como SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Comprobar"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Introduce el código que hemos enviado a %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Has retirado la marca de verificación a %@."; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index d15c5bb35..fdb41b9d1 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Lisa pealkiri..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Faili tüüp: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Allalaadimine ei õnnestunud. Uuesti proovimiseks klõpsa."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Allalaadimine..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Järjekorda pandud"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Tõrge manuse saatmisel"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Edasi"; -/* Label for redo button. */ -"BUTTON_REDO" = "Tee uuesti"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Vali"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Võta tagasi"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Helista uuesti"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Keeldu sissetulevast kõnest"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Lõpeta kõne"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Kas kustutada vestlus?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Vestluse sätted"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Loo uus kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Klõpsa muutmiseks"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Otsi"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pihusti"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Kärbi"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Lähtesta"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Sa ei saa jagada rohkem kui %@ üksust."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Töö faks"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Nimeta album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Selle telefoninumbri registreerimine ilma registreerimisluku PIN-koodita on võimalik pärast 7 päeva möödumist telefoninumbri viimasest aktiivsusest Signalis."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Selle telefoninumbri registreerimislukk on lubatud. Palun sisesta registreerimisluku PIN-kood.\n\nSinu registreerimisluku PIN-kood erineb automaatsest kontrollkoodist, mis saadeti viimase sammu käigus sinu telefonile."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registreerimine ei õnnestunud"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Sisesta"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Riigi suunakood"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registreerimislukk"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Sisesta number"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Kas sul juba on Signali konto?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Tingimused ja privaatsuspoliitika"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Registreerides seda seadet nõustud Signali %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "tingimustega"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "See telefoninumber pole toetatud, palun võta ühendust kasutajatoega."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Sõnumite saatmiseks pead registreeruma."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Sinu telefoninumber"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Kinnitamine ei õnnestunud"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Registreerimisluku PIN-kood pole õige."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registreeri"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Registreerumiseks sisesta palun kehtiv telefoninumber."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uuenda iOSi"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Tagasi"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kinnituskood"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Helista mulle"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Saada SMS-kood uuesti"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Sisest"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Sisesta kinnituskood, mille saatsime numbrile %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Sa märkisid kasutaja %@ mittekinnitatuks."; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index 1df6ffe82..02d7af8e9 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "یک عنوان اضافه کنید..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "نوع فايل: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "بارگیری ناموفق بود. برای امتحان دوباره فشار دهید."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "در حال دريافت..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "در صف دانلود"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "خطا در ارسال فایل ضمیمه"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "بعدی"; -/* Label for redo button. */ -"BUTTON_REDO" = "انجام دوباره"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "انتخاب"; -/* Label for undo button. */ -"BUTTON_UNDO" = "لغو"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "تماس دوباره"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "رد تماس"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "پایان تماس"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "گفتگو حذف شود؟"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "تنظیمات گفت و گو"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "ساخت مخاطب جدید"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "برای تغییر کلیک کنید"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "جستجو"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "تنظیم مجدد"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "فکس محل کار"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "آلبوم بی نام"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "ثبت نام این شماره تلفن به مدت 7 روز بدون پین قفل ثبت نام بعد از آخرین باری که شماره تلفن بر روی Signal فعال بوده است ممکن می باشد."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "قفل ثبت نام برای این شماره تلفن فعال می باشد. لطفا پین قفل ثبت نام را وارد کنید.\n\nپین قفل ثبت نام از کد تایید اتوماتیکی که در آخرین مرحله به شما فرستاده شد متفاوت می باشد."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "ثبت نام ناموفق بود"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "ارسال"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "پیش‌شماره کشور"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "قفل ثبت نام"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "شناره را وارد کنید"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "از قبل یک حساب Signal دارید؟"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "شرایط و سیاست های حفظ حریم خصوصی"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "با ثبت این دستگاه، شما موافق با %@ Signal خواهید بود"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "شرایط"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = ".فرمت این شماره تلفن پشتیبانی نمی‌شود. لطفاً با پشتیبانی تماس بگیرید."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "قبل از ارسال پیام نیاز دارید ثبت نام کنید."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "شماره تلفن شما"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "خطا در تائید"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "پین قفل ثبت نام نادرست."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "ثبت نام"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "برای عضویت یک شماره تلفن معتبر وارد کنید."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "به‌روزرسانی iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "بازگشت"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "کد تآیید"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "اعلام با تماس تلفنی"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "ارسال مجدد کد با پیامک"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "ارسال"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "کد تایید ارسال شده به %@ را وارد کنید"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "شما %@ را به عنوان تائیدنشده علامت‌گذاری کردید."; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index cbee05a87..c8163160e 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Lisää kuvateksti..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Kuvaus"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tiedoston tyyppi: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Lataaminen epäonnistui. Yritä uudelleen napauttamalla."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Ladataan..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Jonossa"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Virhe liitteen lähettämisessä"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Seuraava"; -/* Label for redo button. */ -"BUTTON_REDO" = "Tee uudelleen"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Valitse"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Kumoa"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Soita uudelleen"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Hyväksy saapuva puhelu"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Ota video käyttöön napauttamalla tästä"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Lopeta puhelu"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Poistetaanko keskustelu?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Ei tuloksia"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 tulos"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d / %d tuloksesta"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Keskustelun asetukset"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Luo uusi yhteystieto"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Hae keskustelusta"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Napauta muokataksesi"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hae"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@ ja %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Jotkin yhteystietosi ovat jo Signalissa, mukaan lukien %@, %@ ja %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pensseli"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Rajaa"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Alusta"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Kierrä 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Kierrä 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Et voi jakaa useampaa kuin %@ kappaletta."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Työfaksi"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Kuvan ottaminen ei onnistu."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Kuvan ottaminen ei onnistu."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Kameran määrittäminen epäonnistui."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = " Nimeämätön albumi"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Rekisteröiminen tällä puhelinnumerolla on mahdollista ilman rekisteröinnin lukituksen PIN-koodia vasta, kun 7 päivää on kulunut siitä, kun tämä puhelinnumero oli viimeksi aktiivinen Signalissa."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Tällä puhelinnumerolla on rekisteröinnin lukitus käytössä. Syötä rekisteröinnin lukituksen PIN-koodi jatkaaksesi.\n\nRekisteröinnin lukituksen PIN-koodi on eri kuin se automaattinen vahvistuskoodi, jonka sait tekstiviestinä puhelimeesi edellisessä vaiheessa."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Rekisteröinti epäonnistui"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Lähetä"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Maatunnus"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Rekisteröinnin lukitus"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Syötä numero"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Onko sinulla jo Signal-tili?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Käyttöehdot ja yksityisyydensuoja"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Rekisteröimällä tämän laitteen hyväksyt Signalin %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "käyttöehdot"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Tätä puhelinnumeron esitystapaa ei tueta, ota yhteys tukeen."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Sinun täytyy rekisteröityä, ennen kuin voit lähettää viestin."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Sinun puhelinnumerosi"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Vahvistus epäonnistui"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Virheellinen rekisteröinnin lukituksen PIN-koodi."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Rekisteröidy"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Syötä kelvollinen puhelinnumero, jotta voit rekisteröityä."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Päivitä iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Takaisin"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Vahvistuskoodi"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Soita minulle mieluummin"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Lähetä koodi uudelleen tekstiviestinä"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Lähetä"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Syötä vahvistuskoodi, jonka lähetimme numeroon %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Merkitsit yhteystiedon %@ varmentamattomaksi."; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 58f321756..4ed54f5e9 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "File type: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloading…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Error Sending Attachment"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "End call"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Conversation Settings"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Hanapin"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Country Code"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Enter Number"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "This phone number format is not supported, please contact support."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Your Phone Number"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verification Failed"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Register"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Back"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verification Code"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 8a668bdd3..e9cddcbf2 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Ajouter une légende…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Type de fichier : %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Échec de téléchargement. Touchez pour ressayer."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Téléchargement…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "En attente"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Erreur d’envoi du fichier joint"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Suivant"; -/* Label for redo button. */ -"BUTTON_REDO" = "Rétablir"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Sélectionner"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Annuler"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Rappeler"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Refuser l’appel entrant"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Raccrocher"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Supprimer la conversation ?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Aucune correspondance"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d sur %dcorrespondances"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Paramètres de la conversation"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Créer un nouveau contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Chercher dans la conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toucher pour modifier"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Rechercher"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@ et %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Certains de vos contacts sont déjà sur Signal, dont %@, %@ et %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pinceau"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Rogner"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Réinitialiser"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Faire pivoter de 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Faire pivoter de 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Vous ne pouvez pas partager plus de %@ éléments."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Télécopieur travail"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album sans nom"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "L’inscription de ce numéro de téléphone sera possible sans votre NIP de blocage de l’inscription 7 jours après la dernière activité de ce numéro de téléphone sur Signal"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Le blocage de l’inscription est activé pour ce numéro de téléphone. Veuillez saisir le NIP de blocage de l’inscription.\n\nVotre NIP de blocage de l’inscription est distinct du code de vérification généré automatiquement qui a été envoyé à votre téléphone lors de la dernière étape."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Échec d’inscription"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Envoyer"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Code de pays"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Blocage de l’inscription"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Saisir le numéro"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Avez-vous déjà un compte Signal ?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Conditions générales et politique de confidentialité"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "En inscrivant cet appareil, vous acceptez les %@ de Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "conditions générales"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Ce format de numéro de téléphone n’est pas pris en charge, veuillez contacter l’assistance."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Vous devez d’abord vous inscrire avant de pouvoir envoyer un message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Votre numéro de téléphone"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Échec de vérification"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Le NIP de blocage de l’inscription est erroné."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "S’inscrire"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Veuillez saisir un numéro de téléphone valide pour vous inscrire."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Mettez iOS à niveau"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Retour"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Code de vérification"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Appelez-moi plutôt"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Renvoyer le code par texto"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Envoyer"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Saisir le code de vérification que nous avons envoyé à %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Vous avez marqué %@ comme non vérifié."; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 919fa5a0b..b85e348b8 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipo de ficheiro: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Descargando..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Na cola"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Erro ao enviar o anexo"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Seguinte"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleccionar"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rexeitar a chamada entrante"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Fin da chamada"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Axustes da conversa"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Crear novo contacto"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Restablecer"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax do traballo"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Erro ao rexistrarse"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Enviar"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código do país"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueo de rexistro"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Inserir número"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Xa tes unha conta de Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Este formato de número telefónico non está admitido; contacta co soporte."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "O teu número de teléfono"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Erro ao verificar."; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Rexistro"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Insire un número de teléfono válido para rexistrarse."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Volver"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificación"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Recibir chamada con código"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Envia un novo código por SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Enviar"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Introduce o código de verificación que enviamos a %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Marcaches a %@ como sen verificar."; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index c6ff99b2d..fe52f4980 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "הוסף כיתוב..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "סוג קובץ: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "ההורדה נכשלה. הקש כדי לנסות מחדש."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "מוריד..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "ממתין בתור"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "שגיאה בשליחת צרופה"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "הבא"; -/* Label for redo button. */ -"BUTTON_REDO" = "עשה מחדש"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "בחר"; -/* Label for undo button. */ -"BUTTON_UNDO" = "בטל עשייה"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "חייג שוב"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "דחה שיחה נכנסת"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "סיים שיחה"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "למחוק שיחה?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "הגדרות שיחה"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "צור איש קשר חדש"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "הקש כדי לשנות"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "חיפוש"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@ ו%@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "כמה מאנשי הקשר שלך כבר ב־Signal, כולל %@, %@ ו%@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "מברשת"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "חתוך"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "אפס"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "סובב 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "סובב 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "אינך יכול לשתף יותר מן %@ פריטים."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "פקס עבודה"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "אלבום ללא שם"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "הרשמת מספר טלפון זה תהיה אפשרית ללא PIN נעילת ההרשמה שלך בחלוף 7 ימים מאז שמספר הטלפון היה פעיל ב־Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "לטלפון זה יש נעילת הרשמה מאופשרת. אנא הכנס את PIN נעילת ההרשמה שלך.\n\nPIN נעילת ההרשמה שלך נפרד מקוד הוידוא האוטומטי שנשלח אל הטלפון שלך במהלך השלב האחרון."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "הרשמה נכשלה"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "הגש"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "קוד מדינה"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "נעילת הרשמה"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "הכנס מספר"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "יש לך כבר חשבון Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "תנאים ומדיניות פרטיות"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "ע\"י רישום מכשיר זה, אתה מסכים אל %@ של Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "תנאים"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "תסדיר זה של מספר הטלפון אינו נתמך. אנא צור קשר עם התמיכה."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "אתה צריך להירשם לפני שתוכל לשלוח הודעה."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "מספר הטלפון שלך"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "וידוא נכשל"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN נעילת הרשמה לא נכון."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "רשום"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "אנא הכנס מספר תקף של טלפון כדי להירשם."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "שדרג את iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "הקודם"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "קוד וידוא"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "חייג אליי במקום"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "שלח מחדש קוד במסרון"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "הגש"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "הכנס את קוד הוידוא ששלחנו אל %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "סימנת את %@ כלא מוודא."; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 278c311db..41c3dcb55 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Vrsta datoteke: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Preuzimanje nije uspjelo. Dodirni za pokušaj."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Preuzimanje..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Na redu čekanja"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Greška kod slanja privitka"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Sljedeće"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Odaberi"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Nazovi ponovo"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Odbij dolazni poziv"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Završi poziv"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Postavke razgovora"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Izradi novi kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Dodirni za promjenu"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Traži"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Resetiraj"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Poslovni Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registracija ovog telefonskog broja bit će moguća bez vašeg registracijskog PIN-a nakon 7 dana od posljednjeg aktiviranja telefonskog broja na Signalu."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Zaključavanje registracije je omogućeno za ovaj telefonski broj . Unesite PIN registracijskog zaključavanja.\n\nPIN registracijskog zaključavanja odvojen je od automatskog potvrdnog kôda koji je poslan na vaš telefon tijekom posljednjeg koraka."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registracija nije uspjela"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Potvrdi"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Državni kôd "; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Zaključavanje registracije"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Unesite broj"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Već imate Signal račun?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Uvjeti i pravila o privatnosti"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Telefonski broj u ovom formatu nije podržan, molimo kontaktirajte podršku."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Vaš telefonski broj"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Provjera nije uspjela"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Netočan PIN registracijskog zaključavanja."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registriraj"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Molimo unesite važeći telefonski broj za registraciju."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ažuriraj iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Nazad"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Potvrdni kôd"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Potvrdi pozivom"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovo pošalji kôd SMS-om"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Potvrdi"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Unesite potvrdni kôd koji smo poslali na %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@ nije provjeren/a."; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 5f67b53ca..90f243a02 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Fájltípus: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Letöltés..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Várakozik"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Hiba a csatolmány küldése közben"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Tovább"; -/* Label for redo button. */ -"BUTTON_REDO" = "Újra"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Kiválasztás"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Visszavonás"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Bejövő hívás elutasítása"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Hívás befejezése"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Beszélgetés beállítások"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Új kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Keresés"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Alaphelyzetbe állítás"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Munkahelyi fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Sikertelen regisztráció"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Küldés"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Országkód"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Regisztrációs zár"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Telefonszám megadása"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Már van Signal fiókja?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Adatvédelmi és Általános Szerződési Feltételek"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Telefonszám formátum nem támogatott, vedd fel a kapcsolatot a supporttal."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Telefonszámod"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verification Failed"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Regisztrálás"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Adj meg egy valós telefonszámot a regisztrációhoz."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS frissítése"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Vissza"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Hitelesítő kód küldése"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Inkább hívj"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Küldés"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index 74739a9ed..c60e29a4c 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipe Berkas: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Mengunduh..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Antrian"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Gagal Mengirim Lampiran"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Berikutnya"; -/* Label for redo button. */ -"BUTTON_REDO" = "mengulang"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Pilih"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Kembali"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Telepon lagi"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Tolak panggilan masuk"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Akhiri panggilan"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Setelan Percakapan"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Buat Kontak Baru"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Ketuk untuk mengubah"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Pencarian"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Atur kembali"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Kerja Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Pendaftaran nomor telpon ini dapat dilakukan tanpa PIN Kunci Pendaftaran jika 7 hari telah berlalu semenjak nomor telpon tersebut terakhir aktif di Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Nomor telpon ini memiliki Kunci Pendaftaran aktif. Masukkan PIN Kunci Pendaftaran.\n\nPIN Kunci Pendaftaran Anda terpisah dari kode verifikasi otomatis yang dikirimkan ke telpon Anda di langkah terakhir."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Pendaftaran Gagal"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Kirimkan"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Kode Negeri"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Kunci Pendaftaran"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Masukan Nomor"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Sudah memiliki akun Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Syarat & Kebijakan Privasi"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Dengan mendaftarkan perangkat ini, Anda menyetujui %@ Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "syarat"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Format nomor telfon ini tidak didukung, silahkan untuk menghubungi bantuan"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Nomor telepon Anda"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifikasi gagal"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN Kunci Pendaftaran Salah"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Daftar"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Tolong masukkan nomor telepon yang sah untuk mendaftar"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Perbarui iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Kembali"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kode Verifikasi"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Sebaiknya menelepon saya"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kirimkan kembali kode melalui SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Kirimkan"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Masukkan kode verifikasi yang telah dikirimkan pada %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Anda menandai %@ sebagai tidak terverifikasi."; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 7e8ba2953..433b94f85 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Aggiungi una didascalia..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Didascalia"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Formato file: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download fallito. Premi per riprovare."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Download in corso..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "In coda"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Errore invio allegato"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Avanti"; -/* Label for redo button. */ -"BUTTON_REDO" = "Ripeti"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleziona"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Annulla"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Richiama"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rifiuta chiamata"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Termina chiamata"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Elimina conversazione?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Nessun risultato"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 risultato"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d di %d risultati"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Impostazioni conversazione"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Crea nuovo contatto"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Cerca nella conversazione"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tocca per cambiare"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Cerca"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, incluso %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, inclusi %@ e %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alcuni dei tuoi contatti sono già su Signal, inclusi %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pennello"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Ritaglia"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Resetta"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Ruota di 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Ruota di 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Non puoi condividere più di %@ elementi."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax ufficio"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Impossibile scattare foto."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Impossibile scattare foto."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Configurazione fotocamera non riuscita."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album senza nome"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "La registrazione di questo numero di telefono sarà possibile senza il PIN di Blocco Registrazione passati 7 giorni dall'ultima attività su Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Questo numero ha il Blocco Registrazione attivo. Inserire il PIN di Blocco Registrazione.\n\nIl tuo PIN di Blocco Registrazione è separato dal codice di verifica automatico che è stato inviato al tuo telefono durante la fase precedente.\n"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrazione fallita"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Invia"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Codice del Paese"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Blocco registrazione"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Inserisci numero"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Hai già un account Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Politica e termini sulla privacy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Registrando questo dispositivo, accetti %@ di Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "termini"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Il formato di questo numero non è supportato, si prega di contattare il supporto."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Devi iscriverti prima di poter inviare un messaggio."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Il tuo numero di telefono"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifica fallita"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN Blocco Registrazione non corretto."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registra"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Inserire un numero di telefono valido per la registrazione"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Aggiornare iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Indietro"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Codice di verifica"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Chiamami"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Rinvia codice SMS "; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Conferma"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Inserisci il codice di verifica inviato a %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Hai segnato %@ come verificato."; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index b4a6c59d5..fe06be474 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "キャプションの追加..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ファイルの種類：%@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "ダウンロードに失敗しました。タップして再試行してください。"; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "ダウンロード中"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "待ち行列中"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "添付ファイルの送信でエラー"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "進む"; -/* Label for redo button. */ -"BUTTON_REDO" = "やり直す"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "選択"; -/* Label for undo button. */ -"BUTTON_UNDO" = "元に戻す"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "再通話"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "着信を拒否する"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "通話を切る"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "消去しますか？"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "会話設定"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "新規の連絡先を作る"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "タップして変える"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "検索"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます: %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます:%@ と %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "連絡先には、すでにSignalを使用中の人がいます: %@, %@, %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "ブラシ"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "切り取り"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "リセット"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45°回転"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90°回転"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "画像の共有は%@点までです。"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "職場FAX"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "無名のアルバム"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "この電話機を暗証番号なしで登録できるようになるには，Signalを使用しない日が７日以上続く必要があります。"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "登録鍵が有効になっていますので，登録鍵の暗証番号を入力してください。\n\n登録鍵の暗証番号は，最後のステップで自動的に送信された認証コードとは違います。"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "登録に失敗しました"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "送信"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "国番号"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "登録鍵"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "番号を入力する"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Signalのアカウントをお持ちですか？"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "利用規約と個人情報保護"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "このデバイスを登録すると、Signalの%@に同意したことになります"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "\n利用規約"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "サポートされていない形式の電話番号です。サポートに連絡してください。"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "メッセージを送信する前に登録が必要です。"; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "自分の電話番号"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "認証の失敗"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "登録鍵の暗証番号が間違っています"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "登録"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "正しい電話番号を入力してください"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOSを更新する"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "戻る"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "認証コード"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "電話で行う"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "SMSでコードを再送する"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "提出"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "%@に送信された認証コードを入力してください"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@を未確認にしました"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 0a0e925d9..9a7543056 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "ដាក់ចំណងជើងមួយ..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "ចំណងជើង"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ប្រភេទឯកសារ៖ %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "ទាញយកបរាជ័យ។ ចុច ដើម្បីព្យាយាមម្តងទៀត។"; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "កំពុងទាញយក..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "បានតម្រង់ជួរ"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "បញ្ហាការផ្ញើឯកសារភ្ជាប់"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "បន្ទាប់"; -/* Label for redo button. */ -"BUTTON_REDO" = "ធ្វើឡើងវិញ"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "ជ្រើសរើស"; -/* Label for undo button. */ -"BUTTON_UNDO" = "មិនធ្វើវិញ"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "ហៅម្តងទៀត"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "បដិសេធការហៅចូល"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "ចុច​ នៅទីនេះ ដើម្បីបើកវីដេអូរបស់អ្នក"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "បញ្ចប់ការហៅ"; @@ -429,7 +423,7 @@ "COLOR_PICKER_DEMO_MESSAGE_1" = "Choose the color of outgoing messages in this conversation."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_2" = "Only you will see the color you choose."; +"COLOR_PICKER_DEMO_MESSAGE_2" = "មានតែអ្នក នឹងឃើញពណ៌ដែលអ្នកជ្រើសរើស។"; /* Modal Sheet title when picking a conversation color. */ "COLOR_PICKER_SHEET_TITLE" = "ពណ៌ការសន្ទនា"; @@ -564,11 +558,20 @@ "CONTACT_WITHOUT_NAME" = "លេខទំនាក់ទំនងគ្មានឈ្មោះ"; /* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "This cannot be undone."; +"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "នេះមិនអាចថយក្រោយបានទេ។"; /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "លុបការសន្ទនា?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "មិនត្រូវគ្នា"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 ត្រូវគ្នា"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d នៃ %d ត្រូវគ្នា"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "ការកំណត់ការសន្ទនា"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "បង្កើតលេខទំនាក់ទំនងថ្មី"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "ស្វែងរកការសន្ទនា"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "ចុច ដើម្បីផ្លាស់ប្តូរ"; @@ -645,13 +651,13 @@ "CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER" = "បន្ថែមចូល បញ្ជីទំនាក់ទំនង"; /* Message shown in conversation view that offers to share your profile with a user. */ -"CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER" = "Share Your Profile with This User"; +"CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER" = "ចែករំលែកប្រវត្តិរូបរបស់អ្នកជាមួយអ្នកប្រើប្រាស់នេះ"; /* Title for the group of buttons show for unknown contacts offering to add them to contacts, etc. */ "CONVERSATION_VIEW_CONTACTS_OFFER_TITLE" = "អ្នកប្រើនេះមិនមានក្នុងបញ្ជីទំនាក់ទំនងរបស់អ្នកទេ។"; /* Indicates that the app is loading more messages in this conversation. */ -"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Loading More Messages…"; +"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "កំពុងផ្ទុកសារបន្ថែម..."; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ "CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "ចុច សម្រាប់បន្ថែម"; @@ -871,16 +877,16 @@ "ERROR_DESCRIPTION_CLIENT_SENDING_FAILURE" = "បរាជ័យក្នុងការផ្ញើសារ។"; /* Error message indicating that message send is disabled due to prekey update failures */ -"ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale prekey data."; +"ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "មិនអាចបញ្ជូនដោយសារទិន្នន័យ prekey ចាស់។"; /* Error message indicating that message send failed due to block list */ "ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "បរាជ័យក្នុងការផ្ញើសារទៅអ្នកប្រើប្រាស់ ព្រោះអ្នកបានបិទពួកគេ។"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed to write and send attachment."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "បរាជ័យក្នុងការសរសេរ និងបញ្ជូនឯកសារភ្ជាប់។"; /* Generic error used whenever Signal can't contact the server */ -"ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try again."; +"ERROR_DESCRIPTION_NO_INTERNET" = "Signal មិនអាចតភ្ជាប់ទៅកាន់អ៊ីនធើណេត។ សូមសាកល្បងម្តងទៀត។"; /* Error indicating that an outgoing message had no valid recipients. */ "ERROR_DESCRIPTION_NO_VALID_RECIPIENTS" = "ផ្ញើសារបរាជ័យ ដោយសារឈ្មោះអ្នកទទួលមិនត្រឹមត្រូវ។"; @@ -895,7 +901,7 @@ "ERROR_DESCRIPTION_RESPONSE_FAILED" = "ការឆ្លើយតបមិនត្រឹមត្រូវពីសេវាកម្ម។"; /* Error message when attempting to send message */ -"ERROR_DESCRIPTION_SENDING_UNAUTHORIZED" = "This device is no longer registered with your phone number. Please reinstall Signal."; +"ERROR_DESCRIPTION_SENDING_UNAUTHORIZED" = "ឧបករណ៍នេះ លែងចុះឈ្មោះជាមួយលេខទូរស័ព្ទអ្នកទៀតហើយ។ សូមដំឡើង Signal សារជាថ្មី។"; /* Generic server error */ "ERROR_DESCRIPTION_SERVER_FAILURE" = "បញ្ហាបណ្តាញ។ សូមព្យាយាមម្តងទៀតពេលក្រោយ។"; @@ -907,10 +913,10 @@ "ERROR_DESCRIPTION_UNREGISTERED_RECIPIENT" = "លេខទំនាក់ទំនងមិនមែនជាអ្នកប្រើប្រាស់ Signal។"; /* Error message when unable to receive an attachment because the sending client is too old. */ -"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "Attachment failure: Ask this contact to send their message again after updating to the latest version of Signal."; +"ERROR_MESSAGE_ATTACHMENT_FROM_OLD_CLIENT" = "ឯកសារភ្ជាប់បរាជ័យ៖ សាកសួរលេខទំនាក់ទំនងនេះ ដើម្បីបញ្ជូនសាររបស់គេម្តងទៀត បន្ទាប់ពីដំឡើងជំនាន់ Signal ចុងក្រោយ។"; /* No comment provided by engineer. */ -"ERROR_MESSAGE_DUPLICATE_MESSAGE" = "Received a duplicate message."; +"ERROR_MESSAGE_DUPLICATE_MESSAGE" = "បានទទួលសារស្ទួនគ្នា។"; /* No comment provided by engineer. */ "ERROR_MESSAGE_INVALID_KEY_EXCEPTION" = "សោររបស់អ្នកទទួល មិនត្រឹមត្រូវ។"; @@ -919,7 +925,7 @@ "ERROR_MESSAGE_INVALID_MESSAGE" = "សារទទួលបាន មិនបានធ្វើសមកាលកម្ម។"; /* No comment provided by engineer. */ -"ERROR_MESSAGE_INVALID_VERSION" = "Received a message that is not compatible with this version."; +"ERROR_MESSAGE_INVALID_VERSION" = "បានទទួលសារមួយ ដែលមិនស្គាល់នឹងជំនាន់នេះ។"; /* No comment provided by engineer. */ "ERROR_MESSAGE_NO_SESSION" = "គ្មានការប្រើប្រាស់នៅសល់សម្រាប់លេខទំនាក់ទំនង។"; @@ -943,7 +949,7 @@ "EXPERIENCE_UPGRADE_DISMISS_BUTTON" = "លើកក្រោយ"; /* action sheet header when re-sending message which failed because of too many attempts */ -"FAILED_SENDING_BECAUSE_RATE_LIMIT" = "Too many failures with this contact. Please try again later."; +"FAILED_SENDING_BECAUSE_RATE_LIMIT" = "បរាជ័យច្រើនដងជាមួយលេខទំនាក់ទំនងនេះ។ សូមសាកល្បងម្តងទៀតពេលក្រោយ។"; /* action sheet header when re-sending message which failed because of untrusted identity keys */ "FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "Your safety number with %@ has recently changed. You may wish to verify before sending this message again."; @@ -964,10 +970,10 @@ "GALLERY_TILES_EMPTY_GALLERY" = "អ្នកមិនមានឯកសារមេឌាក្នុងការសន្ទនានេះទេ។"; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "Loading Newer Media…"; +"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "កំពុងផ្ទុកឯកសារមេឌាថ្មីៗ..."; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_OLDER_LABEL" = "Loading Older Media…"; +"GALLERY_TILES_LOADING_OLDER_LABEL" = "កំពុងផ្ទុកឯកសារមេឌាចាស់ៗ..."; /* A label for generic attachments. */ "GENERIC_ATTACHMENT_LABEL" = "ឯកសារភ្ជាប់"; @@ -1021,7 +1027,7 @@ "GROUP_MEMBERS_CALL" = "ហៅ"; /* Label for the button that clears all verification errors in the 'group members' view. */ -"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "Clear Verification for All"; +"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED" = "សំអាតការផ្ទៀងផ្ទាត់ទាំងអស់"; /* Label for the 'reset all no-longer-verified group members' confirmation alert. */ "GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED_ALERT_MESSAGE" = "វានឹងសំអាតការផ្ទៀងផ្ទាត់សមាជិកក្នុងក្រុមទាំអស់ ដែលផ្លាស់ប្តូរលេខសុវត្ថិភាព តាំងពីពួកគេបានផ្ទៀងផ្ទាត់លើកចុងក្រោយ។"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ស្វែងរក"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,32 +1083,17 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "កំណត់ឡើងវិញ"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; /* alert title */ -"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Failed to select attachment."; +"IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "បរាជ័យក្នុងការជ្រើសរើសឯកសារភ្ជាប់។"; /* Call setup status label */ "IN_CALL_CONNECTING" = "កំពុងតភ្ជាប់..."; /* Call setup status label */ -"IN_CALL_RECONNECTING" = "Reconnecting…"; +"IN_CALL_RECONNECTING" = "កំពុងតភ្ជាប់ម្តងទៀត..."; /* Call setup status label */ "IN_CALL_RINGING" = "កំពុងរោទិ៍..."; @@ -1114,13 +1105,13 @@ "IN_CALL_TERMINATED" = "ការហៅបានបញ្ចប់។"; /* Label reminding the user that they are in archive mode. */ -"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "These conversations are archived and will only appear in the Inbox if new messages are received."; +"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "ការសន្ទនាទាំងនេះ នឹងត្រូវធ្វើបណ្ណសារ និងបង្ហាញក្នុងប្រអប់សំបុត្រតែប៉ុណ្ណោះ ប្រសិនបើទទួលបានសារថ្មី។"; /* Message shown in the home view when the inbox is empty. */ "INBOX_VIEW_EMPTY_INBOX" = "រៀបរាប់ប្រអប់សំបុត្ររបស់អ្នក។ ចាប់ផ្តើមពីការផ្ញើសារទៅកាន់មិត្តភក្តិណាម្នាក់។"; /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ -"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "You can enable contacts access in the iOS Settings app to see contact names in your Signal conversation list."; +"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "អ្នកអាចបើកការចូលប្រើប្រាស់បញ្ជីទំនាក់ទំនងក្នុងការកំណត់ iOS ដើម្បីមើលឈ្មោះទំនាក់ទំនង ក្នុងបញ្ជីសន្ទនា Signal របស់អ្នក។"; /* info message text in conversation view */ "INCOMING_CALL" = "ការហៅចូល"; @@ -1138,7 +1129,7 @@ "INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE" = "ឯកសារសំឡេងមិនត្រឹមត្រូវ។"; /* Alert body when contacts disabled while trying to invite contacts to signal */ -"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "You can enable contacts access in the iOS Settings app to invite your friends to join Signal."; +"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "អ្នកអាចបើកការចូលប្រើប្រាស់បញ្ជីទំនាក់ទំនងក្នុងការកំណត់ iOS ដើម្បីអញ្ជើញមិត្តភក្តិរបស់អ្នកចូលរួម Signal។"; /* Alert title when contacts disabled while trying to invite contacts to signal */ "INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "អនុញ្ញាតចូលប្រើប្រាស់លេខទំនាក់ទំនង"; @@ -1153,7 +1144,7 @@ "INVITE_FRIENDS_PICKER_TITLE" = "អញ្ជើញមិត្តភក្តិ"; /* Alert warning that sending an invite to multiple users will create a group message whose recipients will be able to see each other. */ -"INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "Inviting multiple users at the same time will start a group message and the recipients will be able to see each other."; +"INVITE_WARNING_MULTIPLE_INVITES_BY_TEXT" = "ការអញ្ជើញអ្នកប្រើប្រាស់ច្រើនក្នុងពេលតែមួយ នឹងចាប់ផ្តើមសារជាក្រុមមួយ និងអ្នកទទួលនឹងអាចមើលឃើញគ្នាទៅវិញទៅមក។"; /* Slider label embeds {{TIME_AMOUNT}}, e.g. '2 hours'. See *_TIME_AMOUNT strings for examples. */ "KEEP_MESSAGES_DURATION" = "សាររលុបវិញបន្ទាប់ពី %@។"; @@ -1168,13 +1159,13 @@ "LEAVE_GROUP_ACTION" = "ចាកចេញពីក្រុម"; /* report an invalid linking code */ -"LINK_DEVICE_INVALID_CODE_BODY" = "This QR code is not valid. Please make sure you are scanning the QR code that is displayed on the device you want to link."; +"LINK_DEVICE_INVALID_CODE_BODY" = "កូដ QR នេះមិនត្រឹមត្រូវ។ សូមប្រាកដថា អ្នកស្កេនកូដ QR ដែលបង្ហាញលើឧបករណ៍ដែលអ្នកចង់ភ្ជាប់។"; /* report an invalid linking code */ "LINK_DEVICE_INVALID_CODE_TITLE" = "ការតភ្ជាប់ឧបករណ៍បានបរាជ័យ"; /* confirm the users intent to link a new device */ -"LINK_DEVICE_PERMISSION_ALERT_BODY" = "This device will be able to see your groups and contacts, access your conversations, and send messages in your name."; +"LINK_DEVICE_PERMISSION_ALERT_BODY" = "ឧបករណ៍នេះ នឹងអាចឃើញក្រុមរបស់អ្នក និងបញ្ជីទំនាក់ទំនង ចូលប្រើប្រាស់ការសន្ទនារបស់អ្នក និងបញ្ជូនសារជាឈ្មោះរបស់អ្នក។"; /* confirm the users intent to link a new device */ "LINK_DEVICE_PERMISSION_ALERT_TITLE" = "ភ្ជាប់ឧបករណ៍នេះឬទេ?"; @@ -1183,7 +1174,7 @@ "LINK_DEVICE_RESTART" = "ព្យាយាមម្តងទៀត"; /* QR Scanning screen instructions, placed alongside a camera view for scanning QR Codes */ -"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "Scan the QR code that is displayed on the device you want to link."; +"LINK_DEVICE_SCANNING_INSTRUCTIONS" = "ស្កេនកូដ QR ដែលបង្ហាញលើឧបករណ៍ដែលអ្នកចង់ភ្ជាប់។"; /* Subheading for 'Link New Device' navigation */ "LINK_NEW_DEVICE_SUBTITLE" = "ស្កេនកូដ QR"; @@ -1192,7 +1183,7 @@ "LINK_NEW_DEVICE_TITLE" = "ភ្ជាប់ឧបករណ៍ថ្មី"; /* Label for link previews with an unknown host. */ -"LINK_PREVIEW_UNKNOWN_DOMAIN" = "Link Preview"; +"LINK_PREVIEW_UNKNOWN_DOMAIN" = "មើលតំណជាមុន"; /* Menu item and navbar title for the device manager */ "LINKED_DEVICES_TITLE" = "បានតភ្ជាប់ឧបករណ៍"; @@ -1228,7 +1219,7 @@ "MEDIA_GALLERY_DELETE_SINGLE_MESSAGE" = "លុបសារ"; /* embeds {{sender name}} and {{sent datetime}}, e.g. 'Sarah on 10/30/18, 3:29' */ -"MEDIA_GALLERY_LANDSCAPE_TITLE_FORMAT" = "%@ on %@"; +"MEDIA_GALLERY_LANDSCAPE_TITLE_FORMAT" = "%@ លើ %@"; /* Format for the 'more items' indicator for media galleries. Embeds {{the number of additional items}}. */ "MEDIA_GALLERY_MORE_ITEMS_FORMAT" = "+%@"; @@ -1246,16 +1237,16 @@ "MESSAGE_ACTION_COPY_TEXT" = "ថតចម្លងសារអក្សរ"; /* Action sheet button title */ -"MESSAGE_ACTION_DELETE_MESSAGE" = "Delete This Message"; +"MESSAGE_ACTION_DELETE_MESSAGE" = "លុបសារនេះ"; /* Action sheet button subtitle */ -"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "It will only be deleted on this device."; +"MESSAGE_ACTION_DELETE_MESSAGE_SUBTITLE" = "វានឹងត្រូវលុបចេញតែពីឧបករណ៍នេះប៉ុណ្ណោះ។"; /* Action sheet button title */ "MESSAGE_ACTION_DETAILS" = "ព័ត៌មានបន្ថែម"; /* Action sheet button title */ -"MESSAGE_ACTION_REPLY" = "Reply to This Message"; +"MESSAGE_ACTION_REPLY" = "ឆ្លើយតបទៅកាន់សារនេះ"; /* Action sheet button title */ "MESSAGE_ACTION_SAVE_MEDIA" = "រក្សាទុកឯកសារមេឌា"; @@ -1333,7 +1324,7 @@ "MESSAGE_STATUS_SEND_FAILED" = "បញ្ជូនបរាជ័យ"; /* message status while message is sending. */ -"MESSAGE_STATUS_SENDING" = "Sending…"; +"MESSAGE_STATUS_SENDING" = "កំពុងផ្ញើ..."; /* status message for sent messages */ "MESSAGE_STATUS_SENT" = "បានផ្ញើ"; @@ -1348,19 +1339,19 @@ "MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ លែងបានផ្ទៀងផ្ទាត់។ ចុច សម្រាប់ជម្រើសបន្ថែម។"; /* Indicates that this 1:1 conversation has been blocked. */ -"MESSAGES_VIEW_CONTACT_BLOCKED" = "You Blocked This User"; +"MESSAGES_VIEW_CONTACT_BLOCKED" = "អ្នកបានហាមឃាត់អ្នកប្រើប្រាស់នេះ"; /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */ "MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ គឺលែងជ្រើសរើសថាបានផ្ទៀងផ្ទាត់ទៀតទេ។ ចុច សម្រាប់ជម្រើសបន្ថែម។"; /* Indicates that a single member of this group has been blocked. */ -"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "You Blocked 1 Member of This Group"; +"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "អ្នកបានហាមឃាត់សមាជិក1ក្នុងក្រុមនេះ"; /* Indicates that this group conversation has been blocked. */ -"MESSAGES_VIEW_GROUP_BLOCKED" = "You Blocked This Group"; +"MESSAGES_VIEW_GROUP_BLOCKED" = "អ្នកបានហាមឃាត់ក្រុមនេះ"; /* Indicates that some members of this group has been blocked. Embeds {{the number of blocked users in this group}}. */ -"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = "You Blocked %@ Members of This Group"; +"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = "អ្នកបានហាមឃាត់សមាជិក%@ នៃក្រុមនេះ"; /* Text for banner in group conversation view that offers to share your profile with this group. */ "MESSAGES_VIEW_GROUP_PROFILE_WHITELIST_BANNER" = "ចែករំលែកប្រវត្តិរូបអ្នកជាមួយក្រុមនេះ?"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "ទូរសារការងារ"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "ការចុះឈ្មោះជាមួយលេខទូរស័ព្ទនេះ នឹងអាចធ្វើបាន ដោយគ្មានលេខកូដ PIN ចាក់សោរការចុះឈ្មោះ បន្ទាប់ពី 7 ថ្ងៃក្រោយ ដោយសារលេខនេះធ្លាប់បានចុះឈ្មោះជាមួយ Signalពីមុន។"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "លេខទូរស័ព្ទនេះ មានបើក ការចាក់សោរចុះឈ្មោះ។ សូមបញ្ចូលលេខកូដ PIN ចាក់សោរការចុះឈ្មោះ។\n\nលេខកូដ PIN ចាក់សោរការចុះឈ្មោះនេះ ខុសពីលេខកូដផ្ទៀងផ្ទាត់ ដែលផ្ញើទៅកាន់លេខទូរស័ព្ទក្នុងជំហានចុងក្រោយ។"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "ការចុះឈ្មោះបរាជ័យ"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "បញ្ជូន"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "កូដប្រទេស"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "ចាក់សោរការចុះឈ្មោះ"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "បញ្ចូលលេខ"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "មានគណនីSignalរួចហើយ"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "លក្ខខណ្ឌនិងគោលការណ៍ឯកជន"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "ដោយចុះឈ្មោះឧបករណ៍នេះ អ្នកយល់ព្រម%@របស់Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "លក្ខខណ្ឌ"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "ទម្រង់លេខទូរស័ព្ទនេះមិនគាំទ្រទេ សូមទំនាក់ទំនងផ្នែកជំនួយ។"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "លេខទូរសព្ទរបស់អ្នក"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "ការផ្ទៀងផ្ទាត់បានបរាជ័យ"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "លេខPIN ចាក់សោរការចុះឈ្មោះមិនត្រឹមត្រូវ។"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "ចុះឈ្មោះ"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "សូមបញ្ចូលលេខទូរស័ព្ទត្រឹមត្រូវមួយ ដើម្បីចុះឈ្មោះ។"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "ធ្វើបច្ចុប្បន្នភាព iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "ត្រលប់ក្រោយ"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "ផ្ទៀងផ្ទាត់កូដ"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "ហៅខ្ញុំជំនួសវិញ"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "ផ្ញើកូដម្តងទៀតតាមសារ SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "បញ្ជូន"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "បញ្ចូលលេខកូដផ្ទៀងផ្ទាត់ ដែលយើងផ្ញើទៅកាន់ %@។"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "អ្នកបានដាក់ ​%@ មិនបានផ្ទៀងផ្ទាត់។"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index 73c1d27b7..8da63926f 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "캡션 더하기..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "파일 종류: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "다운로드 오류. 다시 시도를 눌러주세요."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "다운로드 중..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "첨부파일 발신 에러"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "선택"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "다시 걸기"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "수신전화 거절"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "통화 종료"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "대화 설정"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "검색"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "초기화"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "국가 번호"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "번호 입력"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "This phone number format is not supported, please contact support."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "당신 전화번호"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verification Failed"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "가입"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "뒤로가기"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "확인 코드"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Call Me Instead"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 061d27681..cbf53b831 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Pridėti paaiškinimą…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Paaiškinimas"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Failo tipas: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Atsiuntimas nepavyko. Bakstelėkite, norėdami bandyti dar kartą."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Atsiunčiama…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Laukia eilėje"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Klaida, siunčiant priedą"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Kitas"; -/* Label for redo button. */ -"BUTTON_REDO" = "Grąžinti"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Pasirinkti"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Atšaukti"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Skambinti vėl"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Atmesti gaunamąjį skambutį"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Bakstelėkite čia, norėdami įjungti savo vaizdą"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Užbaigti skambutį"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Ištrinti pokalbį?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Nėra atitikmenų"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 atitikmuo"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d iš %d atitikmenų"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Pokalbio nustatymai"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Sukurti naują kontaktą"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Ieškoti pokalbyje"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Bakstelėkite, norėdami pakeisti"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ieškoti"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@, jau yra Signal."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@ ir %@, jau yra Signal"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Kai kurie jūsų kontaktai, įskaitant %@, %@ ir %@, jau yra Signal"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Teptukas"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Apkirpti"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Atstatyti"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Pasukti 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Pasukti 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Negalite dalintis daugiau nei %@ elementais."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Darbo faksas"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Nepavyko nufotografuoti."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Nepavyko nufotografuoti."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Nepavyko sukonfigūruoti kameros."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Albumas be pavadinimo"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Šio telefono numerio registracija be jūsų Registracijos užrakto PIN bus įmanoma praėjus 7 dienoms nuo to laiko, kai telefono numeris paskutinį kartą buvo aktyvus Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Šiam telefono numeriui yra įjungtas Registracijos užraktas. Įveskite Registracijos užrakto PIN.\n\nJūsų Registracijos užrakto PIN yra atskiras nuo automatinio patvirtinimo kodo, kuris buvo išsiųstas jums į telefoną paskutinio žingsnio metu."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registracija nepavyko"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Pateikti"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Šalies kodas"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registracijos užraktas"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Įveskite numerį"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Jau turite Signal paskyrą?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Sąlygos ir Privatumo politika"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Registruodami šį įrenginį, sutinkate su Signal %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "sąlygomis"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Šis telefono numerio formatas yra nepalaikomas, susisiekite su palaikymu."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Prieš siųsdami žinutę, turite užsiregistruoti."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Jūsų telefono numeris"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Patvirtinimas nepavyko"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Neteisingas Registracijos užrakto PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registruoti"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Norėdami užsiregistruoti, įveskite teisingą telefono numerį."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atnaujinkite iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Atgal"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Patvirtinimo kodas"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Vietoj to, man paskambinkite"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Iš naujo siųsti kodą SMS žinute"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Pateikti"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Įveskite patvirtinimo kodą, kurį mes išsiuntėme jums į %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Jūs pažymėjote %@ kaip nepatvirtintą."; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index b82ab07ac..737ebe47e 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "File type: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloading…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Error Sending Attachment"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "End call"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Conversation Settings"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Meklēt"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Atiestatīt"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Valsts kods"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Ievadiet numuru"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "This phone number format is not supported, please contact support."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Tavs telefona numurs"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verification Failed"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Register"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Back"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Pārbaudes kods"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Piezvani man!"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Resend Code by SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submit"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 05919d228..4def0add0 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Вид на фајл : %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloading…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Queued"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Грешка при праќање на прилог"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Next"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Заврши го повикот"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Разговорни подесувања"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Креирај нов контакт"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Барај"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registration Failed"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Достави"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Повикувачки број на земјата"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Внеси број"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Веќе имате сметка на Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Овој тип на број не е поддржан, Ве молиме контактирајте го тимот за поддршка."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Вашиот телефонски број"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Неуспешно потврдување"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Регистрирајте се"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Please enter a valid phone number to register."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Назад"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код за потврда"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Јави ми се "; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Препрати го кодот преку СМС"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Достави"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified."; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index 2f946ab18..4825dd15b 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ဖိုင်အမျိုးအစား %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "ဒေါင်းလုပ် လုပ်နေသည် ..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "တန်းစီသည် "; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "ပူးတွဲဖိုင်ပေးပို့ရာတွင် အခက်အခဲရှိသည် "; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "နောက်ထက်"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "ရွေးမည်"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "အဝင်ဖုန်းကို လက်မခံပါ"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "ဖုန်းချမည်"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "ပြောစကားအပြင်အဆင် "; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "လိပ်စာအသစ်ထည့်မည် "; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ရှာရန်"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "မူလအတိုင်းပြန်လုပ်မည် "; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "အလုပ်ခွင်ရှိ fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Signal ကို ဤဖုန်းနံပါတ်ဖြင့် နောက်ဆုံး အသုံးပြုပြီး ၇ ရက်အကြာတွင် မှတ်ပုံတင်မှု ပိတ်ထားခြင်း PIN ကို အသုံးပြုစရာမလိုဘဲ ဤဖုန်းနံပါတ်ဖြင့် မှတ်ပုံတင်နိုင်ပါသည်။"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "ဤဖုန်းနံပါတ်တွင် မှတ်ပုံတင်ခြင်း Lock ရှိပါသည်။ ကျေးဇူးပြု၍ မှတ်ပုံတင်ခြင်း lock PIN ကိုထည့်ပါ။\n\nသင်၏မှတ်ပုံတင်ခြင်း lock PIN သည် သင်၏ဖုန်းသို့ နောက်ဆုံးအဆင့်တွင် အလိုအလျောက်ပို့ပေးသည့် ကုတ်နံပါတ်မဟုတ်ပါ။"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "မှတ်ပုံတင်ခြင်းမအောင်မြင်ပါ။"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "တင်မည်"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "နိုင်ငံကုဒ်"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "မှတ်ပုံတင်မှု ပိတ်ထားခြင်း"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "နံပါတ်ထည့်ပါ"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Signal အကောင့် ဖွင့်ပြီးသားလား?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "လိုက်နာဆောင်ရွက်ရမည့် အချက်များ"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "ဤပစ္စည်းဖြင့်မှတ်ပုံတင်ခြင်းဖြင့် သင်သည် Signal ၏ %@ ကိုသဘောတူညီပြီးဖြစ်သည်။"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "စည်းကမ်းချက်"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "ဤဖုန်းနံပါတ်အမျိုးအစားကို အထောက်အပံ့မပေးပါ။ ကျေးဇူးပြုပြီး အကူအညီပေးသည့်အဖွဲ့ကို ဆက်သွယ်ပါ။"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "သင့်ဖုန်းနံပါတ် "; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "အတည်ပြုခြင်း မအောင်မြင်ပါ။ "; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "မှတ်ပုံတင်မှုပိတ်ထားသည့် PIN မှားယွင်းနေပါသည်"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "မှတ်ပုံတင်ခြင်း"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "စာရင်းသွင်းရန် ဆီလျော်သည့် ဖုန်းနံပါတ်ကို ထည့်သွင်းပါ။ "; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS ကို မြှင့်ပါ"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "နောက်သို့"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "အတည်ပြုချက်ကုဒ်"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "ဖုန်းပဲ ခေါ်ပေးပါ"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "ကုဒ်ကို SMS နဲ့ ပြန်ပို့ပါ"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "တင်ပါ"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "%@ ကို ပို့လိုက်သည့် အတည်ပြုကုဒ်ကို ထည့်ပါ။"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "သင်သည် %@ ကို အတည်မပြုရသေးပါ။"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index c6c0d5c03..c64eef509 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Legg til tekst…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Filtype: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Nedlasting feilet. Trykk for å prøve på nytt."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Laster ned..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Satt i kø"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Feil ved sending av vedlegg"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Neste"; -/* Label for redo button. */ -"BUTTON_REDO" = "Gjenopprett"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Velg"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Angre"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ring på nytt"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Avvis innkommende samtale"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Avslutt samtale"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Slett samtale?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Samtaleinnstillinger"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Opprett ny kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Trykk for å endre"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søk"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pensel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Beskjær"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Tilbakestill"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan ikke dele mer enn %@ gjenstander."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax arbeid"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Ikke navngitt album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrering av dette telefonnummeret vil bli mulig igjen uten PIN-kode 7 dager etter at det sist var aktivt på Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Dette telefonnummeret har aktivert registreringslås. Vennligst skriv inn PIN-koden for registrering.\n\nDin PIN-kode er en annen kode enn den automatiske verifiseringskoden som du fikk tilsendt da du satte opp telefonen i forrige steg."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrering mislyktes"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Send inn"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landskode"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registreringslås"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Tast inn nummer"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Har du allerede en konto hos Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Vilkår & personvernerklæring"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ved å registrere denne enheten, godtar du Signals %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "vilkår"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Formatet på telefonnummeret støttes ikke, vennligst ta kontakt med kundeservice."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Du må registrere deg før du kan sende en melding."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ditt telefonnummer"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifisering mislykket"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Feil PIN-kode for registreringslås."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrer"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Vennligst skriv inn et gyldig telefonnummer for å registrere deg."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Oppgrader iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Tilbake"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikasjonskode"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring meg"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Send koden på nytt på SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Send inn"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Bruk verifiseringskoden som ble sendt til %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du markerte %@ som verifisert."; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index 37add6833..7d937688a 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Legg til tekst…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Filtype: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Nedlasting feilet. Trykk for å prøve på nytt."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Laster ned..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Satt i kø"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Feil ved sending av vedlegg"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Neste"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Velg"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ring på nytt"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Avvis innkommende samtale"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Avslutt samtale"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Slett samtale?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Samtaleinnstillinger"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Opprett ny kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Trykk for å endre"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søk"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax arbeid"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Ikke navngitt album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registrering av dette telefonnummeret vil bli mulig igjen uten PIN-kode 7 dager etter at det sist var aktivt på Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Dette telefonnummeret har aktivert registreringslås. Vennligst skriv inn PIN-koden for registrering.\n\nDin PIN-kode er en annen kode enn den automatiske verifiseringskoden som du fikk tilsendt da du satte opp telefonen i forrige steg."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registrering mislyktes"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Send inn"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landskode"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registreringslås"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Tast inn nummer"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Har du allerede en konto hos Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Vilkår & personvernerklæring"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ved å registrere denne enheten, godtar du Signals %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "vilkår"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Formatet på telefonnummeret støttes ikke, vennligst ta kontakt med kundeservice."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Du må registrere deg før du kan sende en melding."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ditt telefonnummer"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifisering mislykket"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Feil PIN-kode for registreringslås."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrer"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Vennligst skriv inn et gyldig telefonnummer for å registrere deg."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Oppgrader iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Tilbake"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikasjonskode"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring meg"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Send koden på nytt på SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Send inn"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Bruk verifiseringskoden som ble sendt til %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du markerte %@ som verifisert."; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 8112e02a3..d13e6b4e9 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -90,11 +90,14 @@ "ATTACHMENT" = "Bijlage"; /* One-line label indicating the user can add no more text to the attachment caption. */ -"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Bijschriftlimiet bereikt."; +"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Bijschriftlengtelimiet bereikt."; /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Voeg een bijschrift toe…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Bijschrift"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Bestandstype: %@"; @@ -102,7 +105,7 @@ "ATTACHMENT_APPROVAL_FILE_SIZE_FORMAT" = "Grootte: %@"; /* One-line label indicating the user can add no more text to the media message field. */ -"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "Berichtenlimiet bereikt."; +"ATTACHMENT_APPROVAL_MESSAGE_LENGTH_LIMIT_REACHED" = "Berichtlengtelimiet bereikt."; /* Label for 'send' button in the 'attachment approval' dialog. */ "ATTACHMENT_APPROVAL_SEND_BUTTON" = "Verzenden"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Downloaden mislukt. Tik om opnieuw te proberen."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Downloaden…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "In wachtrij"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Fout bij verzenden van bijlage"; @@ -276,7 +273,7 @@ "BLOCK_LIST_VIEW_BLOCKED_GROUP_ALERT_TITLE" = "Groep geblokkeerd"; /* The message of the 'You can't block yourself' alert. */ -"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE" = "Je kan jezelf niet blokkeren."; +"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE" = "Je kunt jezelf niet blokkeren."; /* The title of the 'You can't block yourself' alert. */ "BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_TITLE" = "Fout"; @@ -305,20 +302,14 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Volgende"; -/* Label for redo button. */ -"BUTTON_REDO" = "Opnieuw doen"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecteren"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Ongedaan maken"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Opnieuw bellen"; /* Alert message when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_MESSAGE" = "Je kan microfoontoegang inschakelen in de iOS-instellingenapp om te kunnen bellen en spraakberichten op te kunnen nemen met Signal."; +"CALL_AUDIO_PERMISSION_MESSAGE" = "Je kunt microfoontoegang inschakelen in de iOS-instellingenapp om te kunnen bellen en spraakberichten op te kunnen nemen met Signal."; /* Alert title when calling and permissions for microphone are missing */ "CALL_AUDIO_PERMISSION_TITLE" = "Toegang vereist tot microfoon"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Inkomende oproep weigeren"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tik hier om je camera aan te zetten"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Gesprek beëindigen"; @@ -366,10 +360,10 @@ "CALL_VIEW_MUTE_LABEL" = "Dempen"; /* Reminder to the user of the benefits of enabling CallKit and disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Je kan iOS-oproepintegratie inschakelen in de Signal-privacyinstellingen om oproepen vanaf het vergrendelscherm te kunnen beantwoorden."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "Je kunt iOS-oproepintegratie inschakelen in de Signal-privacyinstellingen om oproepen vanaf het vergrendelscherm te kunnen beantwoorden."; /* Reminder to the user of the benefits of disabling CallKit privacy. */ -"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Je kan iOS-oproepintegratie inschakelen in de Signal-privacyinstellingen om de naam en het telefoonnummer voor binnenkomende oproepen te zien."; +"CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY" = "Je kunt iOS-oproepintegratie inschakelen in de Signal-privacyinstellingen om de naam en het telefoonnummer voor binnenkomende oproepen te zien."; /* Label for button that dismiss the call view's settings nag. */ "CALL_VIEW_SETTINGS_NAG_NOT_NOW_BUTTON" = "Niet nu"; @@ -447,7 +441,7 @@ "COMPOSE_MESSAGE_INVITE_SECTION_TITLE" = "Uitnodigen"; /* Multi-line label explaining why compose-screen contact picker is empty. */ -"COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Je kan toegang tot contacten inschakelen in de iOS-instellingen-app om te zien welke van je contacten Signal gebruiken."; +"COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION" = "Je kunt toegang tot contacten inschakelen in de iOS-instellingen-app om te zien welke van je contacten Signal gebruiken."; /* No comment provided by engineer. */ "CONFIRM_ACCOUNT_DESTRUCTION_TEXT" = "Dit zal de app terugzetten door je berichten te verwijderen en je uit te schrijven bij de Signal-server. De app zal afsluiten nadat dit proces is voltooid."; @@ -456,7 +450,7 @@ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Weet je zeker dat je je account wilt wissen?"; /* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Je zal geen berichten in deze groep meer kunnen verzenden of ontvangen."; +"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Je zult geen berichten in deze groep meer kunnen verzenden of ontvangen."; /* Alert title */ "CONFIRM_LEAVE_GROUP_TITLE" = "Wil je de groep echt verlaten?"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Gesprek wissen?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Geen overeenkomsten"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 overeenkomst"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d van de %d overeenkomsten"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Gespreksinstellingen"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Nieuw contact aanmaken"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Zoek gesprek"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tik om te wijzigen"; @@ -775,7 +781,7 @@ "DOMAIN_FRONTING_COUNTRY_VIEW_SECTION_HEADER" = "Censuuromzeilingslocatie"; /* Alert body for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ -"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Je kan toegang inschakelen via de iOS-instellingenapp."; +"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_BODY" = "Je kunt toegang inschakelen via de iOS-instellingenapp."; /* Alert title for when the user has just tried to edit a contacts after declining to give Signal contacts permissions */ "EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Signal heeft toegang nodig tot je contacten om contactinformatie te bewerken"; @@ -814,7 +820,7 @@ "EDIT_TXT" = "Bewerken"; /* body of email sent to contacts when inviting to install Signal. Embeds {{link to install Signal}} and {{link to the Signal home page}} */ -"EMAIL_INVITE_BODY" = "Hé\n\nIk gebruik al een tijdje Signal om de gesprekken op mijn iPhone privé te houden. Ik zou graag hebben dat jij het ook installeert, zodat we zeker kunnen zijn dat enkel jij en ik onze berichten kunnen lezen of gesprekken kunnen horen.\n\nSignal is beschikbaar voor iPhone en Android. Je kan het hier vinden: %@\n\nSignal werkt zoals je bestaande berichtenapp. We kunnen foto’s en filmpjes sturen, elkaar bellen en groepsgesprekken beginnen. Het beste is dat niemand anders het kan zien, zelfs niet de mensen die Signal ontwikkelen!\n\nJe kan meer lezen over Open Whisper Systems, de mensen die Signal ontwikkelen, op deze pagina: %@"; +"EMAIL_INVITE_BODY" = "Hallo,\n\nIk gebruik al een tijdje Signal om de gesprekken op mijn iPhone privé te houden. Ik wil je vragen om ook Signal te installeren, zodat we zeker kunnen zijn dat enkel jij en ik onze berichten kunnen lezen en gesprekken kunnen horen.\n\nSignal is beschikbaar voor iPhone en Android. Je kunt het hier downloaden: %@\n\nSignal werkt net als andere berichtenapps. We kunnen foto’s en filmpjes verzenden, elkaar bellen en je kunt groepsgesprekken beginnen. Het beste is dat niemand anders kan meelezen of luisteren, zelfs niet de mensen die Signal ontwikkelen!\n\nJe kunt meer lezen over Open Whisper Systems, de mensen die Signal ontwikkelen, op deze pagina: %@"; /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Laten we Signal gebruiken"; @@ -958,7 +964,7 @@ "FINGERPRINT_SHRED_KEYMATERIAL_BUTTON" = "Sessie opnieuw instellen"; /* Accessibility label for finishing new group */ -"FINISH_GROUP_CREATION_LABEL" = "Voltooi aanmaken van groep"; +"FINISH_GROUP_CREATION_LABEL" = "Aanmaken van groep voltooien"; /* Label indicating media gallery is empty */ "GALLERY_TILES_EMPTY_GALLERY" = "Je hebt geen media in dit gesprek."; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Zoeken"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@ en %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Sommige van je contactpersonen maken al gebruik van Signal, waaronder %@, %@ en %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Kwast"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Bijsnijden"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Opnieuw beginnen"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Roteer 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Roteer 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Je kunt niet meer dan %@ items delen."; @@ -1120,7 +1111,7 @@ "INBOX_VIEW_EMPTY_INBOX" = "Geef je postvak iets om over naar huis te schrijven. Begin door een vriend of kennis een bericht te zenden."; /* Multi-line label explaining how to show names instead of phone numbers in your inbox */ -"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Je kan toegang geven tot je contacten in de iOS-instellingenapp om contactnamen in je Signal-gesprekkenlijst te zien."; +"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "Je kunt toegang geven tot je contacten in de iOS-instellingenapp om contactnamen in je Signal-gesprekkenlijst te zien."; /* info message text in conversation view */ "INCOMING_CALL" = "Inkomende oproep"; @@ -1138,7 +1129,7 @@ "INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE" = "Ongeldig audiobestand."; /* Alert body when contacts disabled while trying to invite contacts to signal */ -"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Je kan toegang geven tot je contacten in de iOS-instellingenapp om je vrienden en kennissen uit te nodigen voor Signal."; +"INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY" = "Je kunt toegang geven tot je contacten in de iOS-instellingenapp om je vrienden en kennissen uit te nodigen voor Signal."; /* Alert title when contacts disabled while trying to invite contacts to signal */ "INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE" = "Toegang tot contacten toestaan"; @@ -1385,26 +1376,26 @@ /* Alert body Alert body when camera is not authorized */ -"MISSING_CAMERA_PERMISSION_MESSAGE" = "Je kan toegang verlenen tot de camera in de iOS-instellingenapp om video-oproepen te kunnen maken met Signal."; +"MISSING_CAMERA_PERMISSION_MESSAGE" = "Je kunt toegang verlenen tot de camera in de iOS-instellingenapp om video-oproepen te kunnen maken met Signal."; /* Alert title Alert title when camera is not authorized */ "MISSING_CAMERA_PERMISSION_TITLE" = "Signal heeft toegang tot je camera nodig."; /* Alert body when user has previously denied media library access */ -"MISSING_MEDIA_LIBRARY_PERMISSION_MESSAGE" = "Je kan deze toestemming verlenen in de iOS-instellingenapp."; +"MISSING_MEDIA_LIBRARY_PERMISSION_MESSAGE" = "Je kunt deze toestemming verlenen in de iOS-instellingenapp."; /* Alert title when user has previously denied media library access */ "MISSING_MEDIA_LIBRARY_PERMISSION_TITLE" = "Signal heeft toegang nodig tot je foto’s voor deze functie."; /* alert title: cannot link - reached max linked devices */ -"MULTIDEVICE_PAIRING_MAX_DESC" = "Je kan niet nog meer apparaten koppelen."; +"MULTIDEVICE_PAIRING_MAX_DESC" = "Je kunt niet nog meer apparaten koppelen."; /* alert body: cannot link - reached max linked devices */ "MULTIDEVICE_PAIRING_MAX_RECOVERY" = "Je hebt het maximum aantal apparaten gekoppeld aan je account. Verwijder een apparaat en probeer het opnieuw."; /* An explanation of the consequences of muting a thread. */ -"MUTE_BEHAVIOR_EXPLANATION" = "Je zal geen meldingen krijgen voor gedempte gesprekken."; +"MUTE_BEHAVIOR_EXPLANATION" = "Je zult geen meldingen krijgen voor gedempte gesprekken."; /* A button to skip a view. */ "NAVIGATION_ITEM_SKIP_BUTTON" = "Overslaan"; @@ -1452,7 +1443,7 @@ "NEW_GROUP_MESSAGE_NOTIFICATION_TITLE" = "%@ aan %@"; /* Placeholder text for group name field */ -"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Geef dit groepsgesprek een naam"; +"NEW_GROUP_NAMEGROUP_REQUEST_DEFAULT" = "Geef dit groepsgesprek een naam "; /* a title for the non-contacts section of the 'new group' view. */ "NEW_GROUP_NON_CONTACTS_SECTION_TITLE" = "Andere gebruikers"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Werk fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Kan geen bijschrift toevoegen aan afbeelding."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Kan geen bijschrift toevoegen aan afbeelding."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Afstemmen met camera mislukt."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album zonder naam"; @@ -1695,7 +1695,7 @@ "PRIVACY_VERIFICATION_FAILURE_INVALID_QRCODE" = "De gescande code lijkt niet op een veiligheidsnummer. Gebruiken jullie allebei de laatste versie van Signal?"; /* Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}} */ -"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eindversleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contactpersoon.\n\nJe kan ook de code op zijn/haar telefoon scannen, of hem/haar vragen om jouw code te scannen."; +"PRIVACY_VERIFICATION_INSTRUCTIONS" = "Als je de veiligheid van je eind-tot-eind-versleuteling met %@ wilt verifiëren, vergelijk dan de bovenstaande nummers met de nummers op het apparaat van je contactpersoon.\n\nJe kunt ook de code op zijn/haar telefoon scannen, of hem/haar vragen om jouw code te scannen."; /* Navbar title */ "PRIVACY_VERIFICATION_TITLE" = "Veiligheidsnummer verifiëren"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registratie van dit telefoonnummer zal 7 dagen nadat het telefoonnummer laatst actief was op Signal mogelijk zijn zonder je pincode voor registratievergrendeling."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Registratievergrendeling is ingeschakeld voor dit telefoonnummer. Voer de pincode voor registratievergrendeling in.\n\nJe pincode voor registratievergrendeling staat los van de automatische verificatiecode die in de vorige stap naar je telefoon is verzonden."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Registratie mislukt"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Indienen"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landcode"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registratievergrendeling"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Vul nummer in"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Heeft u al een Signalaccount?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Voorwaarden & privacybeleid"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Door dit apparaat te registreren, gaat u akkoord met de %@ van Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "voorwaarden"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Deze opmaak van een telefoonnummer wordt niet ondersteund, neem contact op met support."; @@ -1863,10 +1845,7 @@ "REGISTRATION_PHONENUMBER_BUTTON" = "Telefoonnummer"; /* No comment provided by engineer. */ -"REGISTRATION_RESTRICTED_MESSAGE" = "Je moet je registreren voordat je een bericht kan verzenden."; - -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Je telefoonnummer"; +"REGISTRATION_RESTRICTED_MESSAGE" = "Je moet je registreren voordat je een bericht kunt verzenden."; /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verificatie mislukt"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Onjuiste pincode voor registratievergrendeling."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registreren"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Vul een geldig telefoonnummer in om je te registreren."; @@ -1911,7 +1887,7 @@ "REMINDER_2FA_NAV_TITLE" = "Voer je pincode voor registratievergrendeling in"; /* Alert body after wrong guess for 'two-factor auth pin' reminder activity */ -"REMINDER_2FA_WRONG_PIN_ALERT_BODY" = "Je kan een nieuwe pincode instellingen in je privacy-instellingen."; +"REMINDER_2FA_WRONG_PIN_ALERT_BODY" = "Je kunt een nieuwe pincode instellingen in je privacy-instellingen."; /* Alert title after wrong guess for 'two-factor auth pin' reminder activity */ "REMINDER_2FA_WRONG_PIN_ALERT_TITLE" = "Dat is niet de juiste pincode."; @@ -2163,7 +2139,7 @@ "SETTINGS_INVITE_TITLE" = "Nodig je vrienden uit"; /* content of tweet when inviting via twitter - please do not translate URL */ -"SETTINGS_INVITE_TWITTER_TEXT" = "Je kan me bereiken met de @signalapp. Download de app nu: https://signal.org/download/"; +"SETTINGS_INVITE_TWITTER_TEXT" = "Je kunt me bereiken met de @signalapp. Download de app nu: https://signal.org/download/"; /* Label for settings view that allows user to change the notification sound. */ "SETTINGS_ITEM_NOTIFICATION_SOUND" = "Berichtgeluid"; @@ -2184,7 +2160,7 @@ "SETTINGS_NAV_BAR_TITLE" = "Instellingen"; /* table section footer */ -"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Oproep- en berichtmeldingen kunnen verschijnen wanneer je telefoon vergrendeld is. Als je wil, kan je beperken wat in deze meldingen zichtbaar is."; +"SETTINGS_NOTIFICATION_CONTENT_DESCRIPTION" = "Oproep- en berichtmeldingen kunnen verschijnen wanneer je telefoon vergrendeld is. Als je wilt, kun je beperken wat in deze meldingen zichtbaar is."; /* table section header */ "SETTINGS_NOTIFICATION_CONTENT_TITLE" = "Meldingsinhoud"; @@ -2220,7 +2196,7 @@ "SETTINGS_SCREEN_LOCK_ACTIVITY_TIMEOUT" = "Schermvergrendelingstime-out"; /* Footer for the 'screen lock' section of the privacy settings. */ -"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Ontgrendel het Signal-scherm door middel van Touch ID, Face ID, of de code van je iOS apparaat. Je kan gewoon inkomende gesprekken beantwoorden en berichtmeldingen ontvangen terwijl het scherm vergrendeld is. De meldingsinstellingen van Signal maken het mogelijk de getoonde informatie aan te passen."; +"SETTINGS_SCREEN_LOCK_SECTION_FOOTER" = "Ontgrendel het Signal-scherm door middel van Touch ID, Face ID, of de code van je iOS apparaat. Je kunt gewoon inkomende gesprekken beantwoorden en berichtmeldingen ontvangen terwijl het scherm vergrendeld is. De meldingsinstellingen van Signal maken het mogelijk de getoonde informatie aan te passen."; /* Title for the 'screen lock' section of the privacy settings. */ "SETTINGS_SCREEN_LOCK_SECTION_TITLE" = "Schermvergrendeling"; @@ -2235,7 +2211,7 @@ "SETTINGS_SCREEN_SECURITY_DETAIL" = "Verberg Signal-voorbeeldweergaven in het overzicht van open apps."; /* Settings table section footer. */ -"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "iOS-oproepintegratie geeft Signal-oproepen weer op je vergrendelscherm en in de oproepgeschiedenis van het systeem. Je kan ervoor kiezen dat naam en telefoonnummer van je contact ook weergegeven worden. Als iCloud is ingeschakeld zal je oproepgeschiedenis gedeeld worden met Apple."; +"SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "iOS-oproepintegratie geeft Signal-oproepen weer op je vergrendelscherm en in de oproepgeschiedenis van het systeem. Je kunt er voor kiezen dat naam en telefoonnummer van je gesprekspartner ook weergegeven worden. Als iCloud is ingeschakeld zal je oproepgeschiedenis gedeeld worden met Apple."; /* Label for the notifications section of conversation settings view. */ "SETTINGS_SECTION_NOTIFICATIONS" = "Meldingen"; @@ -2343,7 +2319,7 @@ "SOUNDS_NONE" = "Geen"; /* Alert body after verifying privacy with {{other user's name}} */ -"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Je veiligheidsnummer met %@ komt overeen. Je kan deze contactpersoon markeren als geverifieerd."; +"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Je veiligheidsnummer met %@ komt overeen. Je kunt deze contactpersoon markeren als geverifieerd."; /* No comment provided by engineer. */ "SUCCESSFUL_VERIFICATION_TITLE" = "Veiligheidsnummer komt overeen!"; @@ -2442,7 +2418,7 @@ "UNSUPPORTED_FEATURE_ERROR" = "Je apparaat ondersteunt deze functie niet."; /* Title for alert indicating that group members can't be removed. */ -"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_MESSAGE" = "Je kan groepsleden niet verwijderen. Ofwel moeten zij zelf de groep verlaten, ofwel kan je een nieuwe groep zonder dit lid aanmaken."; +"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_MESSAGE" = "Je kunt groepsleden niet verwijderen. Ofwel moeten zij zelf de groep verlaten, ofwel kun je een nieuwe groep zonder dit lid aanmaken."; /* Title for alert indicating that group members can't be removed. */ "UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE" = "Niet ondersteund"; @@ -2463,13 +2439,13 @@ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optionele voorbeeldweergaven worden nu ondersteund voor enkele van de populairste websites op het internet."; /* Subtitle for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Je kan deze functionaliteit op elk gewenst moment in- of uitschakelen in je Signal-instellingen (Privacy > Voorbeeldweergaven verzenden)."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "Je kunt deze functionaliteit op elk gewenst moment in- of uitschakelen in je Signal-instellingen (Privacy > Voorbeeldweergaven verzenden)."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_TITLE" = "Voorbeeldweergaven"; /* Description for notification audio customization */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Je kan nu standaard- en gespreksspecifieke meldingsgeluiden instellen, en oproepen zullen de beltoon die je voor elk systeemcontact gekozen hebt respecteren."; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "Je kunt nu standaard- en gespreksspecifieke meldingsgeluiden instellen, en oproepen zullen de beltoon die je voor elk systeemcontact gekozen hebt respecteren."; /* button label shown one time, after upgrade */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Meldingsinstellingen controleren"; @@ -2481,7 +2457,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_BUTTON" = "Je profiel instellen"; /* Description of new profile feature for upgrading (existing) users */ -"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Je kan nu een profielfoto en naam delen met je gesprekspartners op Signal."; +"UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_DESCRIPTION" = "Je kunt vanaf nu een profielfoto en naam delen met je gesprekspartners op Signal."; /* Header for upgrade experience */ "UPGRADE_EXPERIENCE_INTRODUCING_PROFILES_TITLE" = "Klaar voor je close-up?"; @@ -2496,7 +2472,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE" = "Nieuw: leesbevestigingen"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Vanaf nu kun je zien of je gesprekspartner een bericht aan het typen is. Deze functie is optioneel; je kan deze op ieder moment uitschakelen."; +"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Vanaf nu kun je zien of je gesprekspartner een bericht aan het typen is. Deze functie is optioneel; je kunt deze op ieder moment uitschakelen."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "Nieuw: typindicatoren"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Werk iOS bij"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Terug"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verificatiecode"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Bel mij"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Code opnieuw verzenden per sms"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Versturen"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Vul de verificatiecode in die we naar %@ hebben gestuurd."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Je hebt %@ gemarkeerd als niet geverifieerd."; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 2884d0f18..1eac03986 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Dodaj podpis..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Typ pliku: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Pobieranie nie powiodło się. Dotknij, aby spróbować ponownie."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Pobieranie..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "W kolejce"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Wystąpił błąd podczas wysyłania załącznika"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Dalej"; -/* Label for redo button. */ -"BUTTON_REDO" = "Przywróć"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Zaznacz"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Cofnij"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Zadzwoń ponownie"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Odrzuć połączenie przychodzące"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Zakończ rozmowę "; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Usunąć konwersację?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Ustawienia konwersacji"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Utwórz nowy kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Dotknij, by zmienić"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Szukaj"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@ oraz %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Niektórzy z Twoich znajomych są już w Signal, między innymi %@, %@ oraz %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pędzel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Przytnij"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reset"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Obróć o 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Obróć o 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nie można udostępnić więcej niż %@ multimediów."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax w pracy"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album bez nazwy"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Rejestracja tego numeru telefonu będzie możliwa bez kodu PIN blokady rejestracji, po upływie 7 dni od ostatniej aktywności tego numeru telefonu w usłudze Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Ten numer telefonu ma włączoną blokadę rejestracji. Wprowadź kod PIN blokady rejestracji.\n\nTwój PIN blokady rejestracji jest oddzielny od automatycznego kodu weryfikacyjnego, który został wysłany na Twój telefon podczas ostatniego kroku."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Rejestracja nieudana"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Wyślij"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Kod kraju"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Rejestracja zablokowana"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Wpisz numer"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Masz już konto Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Regulamin & Polityka Prywatności"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Rejestrując to urządzenie wyrażasz zgodę na %@ z usług Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "warunki korzystania"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Wprowadzony format numeru nie jest wspierany, skontaktuj się z pomocą."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Musisz się zarejestrować, aby móc wysłać wiadomość."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Twój numer telefonu"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Weryfikacja nie powiodła się"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Nieprawidłowy kod PIN blokady rejestracji."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Zarejestruj"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Proszę podać prawidłowy numer telefonu w celu rejestracji."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uaktualnij iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Wróć"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kod weryfikacyjny"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Zadzwoń do mnie"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Wyślij ponownie kod SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Wyślij"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Wprowadź kod weryfikacyjny, który wysłaliśmy na %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@ oznaczony jako niezweryfikowany."; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 31ab9d982..9fdcbb9e3 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Adicionar legenda..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Legenda"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipo de arquivo: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Falha ao baixar. Toque para tentar novamente."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Baixando..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Na fila"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Erro ao Enviar Anexo"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Próximo"; -/* Label for redo button. */ -"BUTTON_REDO" = "Refazer"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecionar"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Desfazer"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ligar novamente"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Recusar chamada"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Terminar chamada"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Excluir conversa?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Configurações de Conversa"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar Novo Contato"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toque para mudar"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Buscar"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@ e %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dos seus contatos já estão no Signal, inclusive %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Escova "; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Cortar"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Girar 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Girar 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Você não pode compartilhar mais de %@ itens."; @@ -1428,7 +1419,7 @@ "NETWORK_STATUS_HEADER" = "Status de rede"; /* No comment provided by engineer. */ -"NETWORK_STATUS_OFFLINE" = "Offline"; +"NETWORK_STATUS_OFFLINE" = "Off-line"; /* A label the cell that lets you add a new member to a group. */ "NEW_CONVERSATION_FIND_BY_PHONE_NUMBER" = "Encontrar pelo número de telefone"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax no Trabalho"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sem nome"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Este número de telefone poderá ser cadastrado sem o PIN de Desbloqueio de Cadastro após 7 dias de inatividade no Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Este número de telefone está com o Bloqueio de Cadastro ativo. Por favor, insira o PIN de Desbloqueio de Cadastro.\n\nSeu PIN de Desbloqueio de Cadastro é um número à parte do código de verificação automático enviado para você na etapa anterior."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Falha no registro"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Enviar"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código Do País"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueio de Cadastro"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Inserir Número"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Já tem uma conta no Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Termos e Política de Privacidade"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ao cadastrar este dispositivo, você concorda com os %@ do Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "termos"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Este formato de número de telefone não possui suporte. Por favor, contactar a assistência. "; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Você precisa se cadastrar antes de mandar uma mensagem."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Seu Número De Telefone"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "A Verificação Falhou"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN de Desbloqueio de Cadastro incorreto."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Cadastro"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor, forneça um número de telefone válido para registrar."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualize o iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Voltar"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de Verificação"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ligar para mim."; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Reenviar código via SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Enviar"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Entre com o código de verificação enviado para %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Você marcou %@ como não verificado."; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 92d03acc5..2b3814dff 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Adicionar uma legenda…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Legenda"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipo de ficheiro: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Falha ao descarregar. Toque para tentar novamente."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "A descarregar..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Em espera"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Erro ao enviar o anexo"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Seguinte"; -/* Label for redo button. */ -"BUTTON_REDO" = "Refazer"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecionar"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Desfazer"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Chamar novamente"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rejeitar chamada"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toque aqui para ligar a sua câmara"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Finalizar chamada"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Eliminar conversa?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Sem resultados"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 resultado"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d de %d resultados"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Definições da conversa"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar novo contacto"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Procurar conversa"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tocar para alterar"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Procurar"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@ e %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Alguns dos seus contactos já estão no Signal, incluindo %@, %@ e %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pincel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Recortar"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Reiniciar"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rodar 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rodar 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Não pode partilhar mais do que %@ itens."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax do trabalho"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Não foi possível capturar a imagem."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Não foi possível capturar a imagem."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Não foi possível configurar a câmara."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sem nome"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "O registo deste número de telefone será possível sem o seu PIN de bloqueio de registo após 7 dias sem que o número tenha estado ativo no Signal. "; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Este número de telefone tem o bloqueio de registo ativo. Por favor introduza o seu PIN de bloqueio de registo.\n\nO seu PIN de bloqueio de registo é distinto do código de verificação que lhe é enviado durante o último passo do registo."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Falha no registo"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Enviar"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código do país"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Bloqueio de registo"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introduza um n.º"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Já possui uma conta Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Termos e política de privacidade"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ao registar o seu dispositivo, está a aceitar %@ do Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "termos"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Este formato de número de telefone não é suportado, por favor contacte o nosso suporte técnico."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "É necessário registar-se antes de poder enviar a mensagem."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "O seu n.º de telefone"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Falha na verificação"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN de bloqueio de registo incorreto"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registar"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Por favor, introduza um número de telefone válido."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualizar iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Voltar"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Código de verificação"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Alternativamente, ligue-me"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Reenviar código via SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Submeter"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Introduza o código de verificação que enviamos para %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Você marcou %@ como não verificado."; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index cb9ea4ee5..759f4265d 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Adaugă un titlu..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tip fișier: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Descărcarea a eșuat. Apasă pentru a reîncerca."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Se descarcă..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "În coada de așteptare"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Eroare la trimiterea atașamentului"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Următorul"; -/* Label for redo button. */ -"BUTTON_REDO" = "Refă"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selectează"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Anulează"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Sună încă o dată"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Respingeți apelul de intrare"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Închideți apelul"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Șterg conversația?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Setări conversație"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Creează contact nou"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Apasă pentru a modifica"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Caută"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, inclusiv %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, printre care %@ și %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Unele dintre persoanele dvs. de contact sunt deja conectate la Signal, printre care %@, %@ și %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pensulă"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Decupare"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Resetare"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotiți la 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotiți la 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Nu puteți partaja mai mult de %@ elemente."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax serviciu"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album fără nume"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Înregistrarea acestui număr de telefon va fi posibilă fără codul PIN de înregistrare după 7 zile de la data când acest număr de telefon a fost ultima oară activ pe Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Acest număr de telefon are blocarea înregistrării activată. Te rog introdu PIN-ul de blocare a înregistrării.\n\nPIN-ul tău de blocare al înregistrării este separat de codul automat de verificare care a a fost trimis telefonului tău în timpul ultimului pas."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Înregistrare eșuată"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Trimite"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Prefixul Țării"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Blocare înregistrare"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Introduceți Numărul"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Ai deja un cont Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Termeni și politică de confidențialitate"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Prin înregistrarea acestui dispozitiv, ești de acord cu %@ aplicației Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "condiții"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Acest format de număr de telefon nu este suportat, te rog contactează suportul tehnic."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Trebuie să te înregistrezi înainte de a trimite un mesaj."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Numărul Tău de Telefon"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verificarea a eșuat"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN-ul de blocare a înregistrării este incorect."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Înregistrează"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Te rog introdu un număr de telefon valid pentru a te putea înregistra."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizează-ți iOS-ul"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Înapoi"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Cod de Verificare"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Mai bine Sună-mă"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Trimite codul din nou prin SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Trimite"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Introdu codul de verificare trimis la %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Ai marcat pe %@ ca neverificat."; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index d828e2722..b2a181e5f 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -18,7 +18,7 @@ "ACTION_SHARE_CONTACT" = "Поделиться контактом"; /* Label for 'video call' button in contact view. */ -"ACTION_VIDEO_CALL" = "Видеовызов"; +"ACTION_VIDEO_CALL" = "Видеозвонок"; /* A label for the 'add by phone number' button in the 'add group member' view */ "ADD_GROUP_MEMBER_VIEW_BUTTON" = "Добавить"; @@ -93,7 +93,10 @@ "ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "Достигнуто ограничение заголовка."; /* placeholder text for an empty captioning field */ -"ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Добавить заголовок..."; +"ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Добавить заголовок…"; + +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Подпись"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Тип файла: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Не удалось скачать. Нажмите, чтобы попробовать ещё раз."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Загрузка..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "В очереди"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Ошибка отправки вложения"; @@ -240,7 +237,7 @@ "BLOCK_LIST_BLOCK_BUTTON" = "Заблокировать"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ -"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Заблокировать и покинуть группу \"%@\"?"; +"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Заблокировать и покинуть группу «%@»?"; /* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */ "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "Заблокировать %@?"; @@ -282,7 +279,7 @@ "BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_TITLE" = "Ошибка"; /* Alert title after unblocking a group or 1:1 chat. Embeds the {{conversation title}}. */ -"BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@ был разблокирован."; +"BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@ был(-a) разблокирован(-a)."; /* Alert body after unblocking a group. */ "BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Теперь участники группы могут снова добавить вас в группу."; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Далее"; -/* Label for redo button. */ -"BUTTON_REDO" = "Вернуть"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Выбор"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Вернуть"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Вызвать снова"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Отклонить входящий звонок"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Нажмите здесь, чтобы включить своё видео"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Завершить звонок"; @@ -393,7 +387,7 @@ "CALLBACK_BUTTON_TITLE" = "Перезвонить"; /* The generic name used for calls if CallKit privacy is enabled */ -"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Абонент Signal"; +"CALLKIT_ANONYMOUS_CONTACT_NAME" = "Пользователь Signal"; /* Message for alert explaining that a user cannot be verified. */ "CANT_VERIFY_IDENTITY_ALERT_MESSAGE" = "Этот пользователь не может быть проверен до тех пор, пока Вы не обменяетесь сообщениями с ним."; @@ -468,10 +462,10 @@ "CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ мог переустановить Signal или сменить устройство. Сверьте ваши коды безопасности для того, чтобы убедиться в конфиденциальности общения."; /* Action sheet title presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ -"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Код безопасности %@ сменился"; +"CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Код безопасности с %@ изменился"; /* Generic button text to proceed with an action */ -"CONFIRMATION_TITLE" = "Подтвердите"; +"CONFIRMATION_TITLE" = "Подтвердить"; /* Label for a contact's postal address. */ "CONTACT_ADDRESS" = "Адрес"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Удалить разговор?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Нет совпадений"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 совпадение"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d из %d совпадений"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Настройки разговоров"; @@ -579,7 +582,7 @@ "CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Заблокировать эту группу"; /* table cell label in conversation settings */ -"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Блокировать этого пользователя"; +"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Заблокировать этого пользователя"; /* Navbar title when viewing settings for a 1-on-1 thread */ "CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Информация о контакте"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Создать новый контакт"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Искать в разговоре"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Нажмите, чтобы изменить"; @@ -627,10 +633,10 @@ "CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Включить звук"; /* Indicates that user's profile has been shared with a group. */ -"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP" = "Данная группа может просматривать Ваш профиль."; +"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP" = "Данная группа может видеть Ваш профиль."; /* Indicates that user's profile has been shared with a user. */ -"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Данный пользователь может просматривать Ваш профиль."; +"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Данный пользователь может видеть Ваш профиль."; /* Button to confirm that user wants to share their profile with a user or group. */ "CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE" = "Поделиться профилем"; @@ -651,7 +657,7 @@ "CONVERSATION_VIEW_CONTACTS_OFFER_TITLE" = "Этот пользователь отсутствует в списке контактов."; /* Indicates that the app is loading more messages in this conversation. */ -"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Загружаем больше сообщений..."; +"CONVERSATION_VIEW_LOADING_MORE_MESSAGES" = "Загружаем больше сообщений…"; /* Indicator on truncated text messages that they can be tapped to see the entire text message. */ "CONVERSATION_VIEW_OVERSIZE_TEXT_TAP_FOR_MORE" = "Показать полностью"; @@ -733,7 +739,7 @@ "DEBUG_LOG_COULD_NOT_EMAIL" = "Невозможно открыть приложение электронной почты."; /* Message of the alert before redirecting to GitHub Issues. */ -"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "Ссылка была скопирована в буфер обмена. Вы перенаправлены в список проблем нашего репозитория GitHub."; +"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "Ссылка была скопирована в буфер обмена. Вы будете перенаправлены в список проблем на GitHub."; /* Title of the alert before redirecting to GitHub Issues. */ "DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "Перенаправление на GitHub"; @@ -790,7 +796,7 @@ "EDIT_GROUP_DEFAULT_TITLE" = "Редактировать группу"; /* Label for the cell that lets you add a new member to a group. */ -"EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Добавить..."; +"EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Добавить…"; /* a title for the members section of the 'new/update group' view. */ "EDIT_GROUP_MEMBERS_SECTION_TITLE" = "Участники"; @@ -946,7 +952,7 @@ "FAILED_SENDING_BECAUSE_RATE_LIMIT" = "Слишком много ошибок с этим контактом. Пожалуйста, попробуйте позже."; /* action sheet header when re-sending message which failed because of untrusted identity keys */ -"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "Число безопасности с 1%@ изменилось. Рекомендуется его подтвердить перед отправкой сообщения снова."; +"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "Ваш код безопасности с %@ недавно изменился. Возможно, вы захотите проверить его перед повторной отправкой этого сообщения."; /* alert title */ "FAILED_VERIFICATION_TITLE" = "Ошибка проверки кода безопасности!"; @@ -964,10 +970,10 @@ "GALLERY_TILES_EMPTY_GALLERY" = "В этой беседе нет медиафайлов."; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "Загрузка новых медиа..."; +"GALLERY_TILES_LOADING_MORE_RECENT_LABEL" = "Загрузка новых медиа…"; /* Label indicating loading is in progress */ -"GALLERY_TILES_LOADING_OLDER_LABEL" = "Загрузка старых медиа..."; +"GALLERY_TILES_LOADING_OLDER_LABEL" = "Загрузка старых медиа…"; /* A label for generic attachments. */ "GENERIC_ATTACHMENT_LABEL" = "Вложение"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Поиск"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@ и %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Некоторые из ваших контактов уже используют Signal, включая %@, %@ и %@."; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,38 +1083,23 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Кисть"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Обрезка"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Сбросить"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Повернуть на 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Повернуть на 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ -"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Невозможно поделиться более чем %@ элементами."; +"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Вы не можете поделиться больше, чем %@ элементами."; /* alert title */ "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "Не удалось выбрать вложение."; /* Call setup status label */ -"IN_CALL_CONNECTING" = "Соединение..."; +"IN_CALL_CONNECTING" = "Соединение…"; /* Call setup status label */ -"IN_CALL_RECONNECTING" = "Переподключение..."; +"IN_CALL_RECONNECTING" = "Переподключение…"; /* Call setup status label */ -"IN_CALL_RINGING" = "Вызов..."; +"IN_CALL_RINGING" = "Вызов…"; /* Call setup status label */ -"IN_CALL_SECURING" = "Собеседник ответил. Обеспечиваем безопасность..."; +"IN_CALL_SECURING" = "Собеседник ответил. Обеспечиваем безопасность…"; /* Call setup status label */ "IN_CALL_TERMINATED" = "Звонок завершен."; @@ -1333,13 +1324,13 @@ "MESSAGE_STATUS_SEND_FAILED" = "Ошибка отправки"; /* message status while message is sending. */ -"MESSAGE_STATUS_SENDING" = "Отправка..."; +"MESSAGE_STATUS_SENDING" = "Отправка…"; /* status message for sent messages */ "MESSAGE_STATUS_SENT" = "Отправлено"; /* status message while attachment is uploading */ -"MESSAGE_STATUS_UPLOADING" = "Загрузка..."; +"MESSAGE_STATUS_UPLOADING" = "Загрузка…"; /* placeholder text for the editable message field */ "MESSAGE_TEXT_FIELD_PLACEHOLDER" = "Новое сообщение"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Рабочий факс"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Невозможно сделать снимок."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Невозможно сделать снимок."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Не удалось настроить камеру."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Безымянный альбом"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Регистрация этого номера телефона без PIN-кода блокировки регистрации будет возможна после 7 дней с момента последней активности номера в Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Для этого номера телефона включена блокировка регистрации. Пожалуйста, введите PIN-код блокировки регистрации.\nPIN-код блокировки регистрации не связан с кодом подтверждения, который был отправлен на ваш телефон на последнем шаге."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Регистрация не удалась"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Подтвердить"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Код страны"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Блокировка регистрации"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Введите номер"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "У вас уже есть аккаунт Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Условия и политика конфиденциальности"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Регистрируясь на этом устройстве, вы соглашаетесь с %@ Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "условиями"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Этот формат телефонного номера не поддерживается. Пожалуйста, обратитесь в поддержку."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Вы должны зарегистрироваться перед тем как вы сможете отправить сообщение."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ваш телефонный номер"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Ошибка подтверждения"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Некорректный PIN-код блокировки регистрации"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Регистрация"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Пожалуйста введите корректный номер телефона для регистрации"; @@ -1887,10 +1863,10 @@ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_TITLE" = "Некорректный номер телефона"; /* Message of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Пожалуйста введите номер телефона для регистрации"; +"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_MESSAGE" = "Пожалуйста, введите номер телефона для регистрации."; /* Title of alert indicating that users needs to enter a phone number to register. */ -"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "Не является телефонным номером"; +"REGISTRATION_VIEW_NO_PHONE_NUMBER_ALERT_TITLE" = "Нет номера телефона"; /* notification action */ "REJECT_CALL_BUTTON_TITLE" = "Отклонить"; @@ -2049,7 +2025,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Обход цензуры (блокировки провайдером) может быть активирован только при подключении к интернету."; /* Table footer for the 'censorship circumvention' section shown when the app is connected to the Signal service. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_WEBSOCKET_CONNECTED" = "Обход цензуры не требуется: Вы уже подключены к Signal."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_WEBSOCKET_CONNECTED" = "Обход цензуры не требуется; вы уже подключены к сервису Signal."; /* Table header for the 'censorship circumvention' section. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Обход цензуры"; @@ -2163,7 +2139,7 @@ "SETTINGS_INVITE_TITLE" = "Пригласите друзей"; /* content of tweet when inviting via twitter - please do not translate URL */ -"SETTINGS_INVITE_TWITTER_TEXT" = "Вы можете связаться со мной, используя @signalapp. Получить его сейчас: https://signal.org/download/"; +"SETTINGS_INVITE_TWITTER_TEXT" = "Вы можете связаться со мной, используя @signalapp. Скачайте его сейчас: https://signal.org/download/"; /* Label for settings view that allows user to change the notification sound. */ "SETTINGS_ITEM_NOTIFICATION_SOUND" = "Звук сообщения"; @@ -2196,7 +2172,7 @@ "SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE" = "Показывать имя и номер вызывающего абонента"; /* Settings table section footer. */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Показывать вызовы в списке \"Недавние\" в приложении Tелефон iOS."; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Показывать вызовы в списке «Недавние» в приложении Tелефон iOS."; /* Short table cell label */ "SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "Показать вызовы в Недавних"; @@ -2268,7 +2244,7 @@ "SETTINGS_TYPING_INDICATORS" = "Индикаторы ввода"; /* An explanation of the 'typing indicators' setting. */ -"SETTINGS_TYPING_INDICATORS_FOOTER" = "Даёт знать собеседнику и Вам о том, что происходит набор сообщения. Функция опциональна и применима ко всем перепискам."; +"SETTINGS_TYPING_INDICATORS_FOOTER" = "Просматривайте и делитесь индикаторами набора сообщений. Этот параметр является необязательным и применяется ко всем разговорам."; /* Label for a link to more info about unidentified delivery. */ "SETTINGS_UNIDENTIFIED_DELIVERY_LEARN_MORE" = "Узнать больше"; @@ -2280,7 +2256,7 @@ "SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Показывать индикаторы"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Показывать значок на экране “Подробнее”, если сообщение было доставлено по технологии запечатанного отправителя."; +"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Показывать значок на экране «Подробнее», если сообщение было доставлено по технологии запечатанного отправителя."; /* switch label */ "SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS" = "Разрешить от всех"; @@ -2304,7 +2280,7 @@ "SHARE_EXTENSION_FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_FORMAT" = "Ваш код безопасности с %@ недавно изменился. Вы можете проверить его в основном приложении перед повторной отправкой."; /* Indicates that the share extension is still loading. */ -"SHARE_EXTENSION_LOADING" = "Загрузка..."; +"SHARE_EXTENSION_LOADING" = "Загрузка…"; /* Message indicating that the share extension cannot be used until the user has registered in the main app. */ "SHARE_EXTENSION_NOT_REGISTERED_MESSAGE" = "Запустите приложение Signal для регистрации."; @@ -2322,7 +2298,7 @@ "SHARE_EXTENSION_SENDING_FAILURE_TITLE" = "Не удалось отправить вложение"; /* Alert title */ -"SHARE_EXTENSION_SENDING_IN_PROGRESS_TITLE" = "Загрузка..."; +"SHARE_EXTENSION_SENDING_IN_PROGRESS_TITLE" = "Загрузка…"; /* Shown when trying to share content to a Signal user for the share extension. Followed by failure details. */ "SHARE_EXTENSION_UNABLE_TO_BUILD_ATTACHMENT_ALERT_TITLE" = "Не удалось подготовить вложение"; @@ -2505,7 +2481,7 @@ "UPGRADE_EXPERIENCE_VIDEO_DESCRIPTION" = "Теперь Signal поддерживает приватные видеозвонки. Просто начните вызов как обычно и нажмите кнопку с изображением камеры на экране."; /* Header for upgrade experience */ -"UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Добро пожаловать в Видео Звонки!"; +"UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Добро пожаловать в видеозвонки!"; /* Message for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_MESSAGE" = "Для Signal требуется iOS 9 или новее. Пожалуйста, используйте функцию Обновление ПО в программе Настройки."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Обновите IOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Назад"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код подтверждения"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Сообщить код посредством голосовой связи"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Прислать код подтвеждения по SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Подтвердить"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Введите код подтверждения, который мы отправим %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Вы отметили %@ как непроверенный."; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index bc804add4..5a134ad99 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Vrsta datoteke: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Prenašam..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "V čakalni vrsti"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Napaka pri pošiljanju priponke"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Naprej"; -/* Label for redo button. */ -"BUTTON_REDO" = "Ponovno uveljavi"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Izberi"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Razveljavi"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ponovni klic"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Zavrni dohodni klic"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Končaj klic"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Nastavitve pogovora"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Ustvari nov stik"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tapnite za razrešitev problema"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Iskanje"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Ponastavi"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Službeni fax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Prijava s to telefonsko številko brez kode PIN bo mogoča šele po sedmih dneh odkar je bila številka nazadnje aktivna v omrežju Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Telefonska številka ima vklopljen PIN za prijavo v omrežje Signal. Za odklep prosimo vnesite svoj PIN.\n\nPIN za prijavo v omrežje Signal ni enak kodi za verifikacijo ki vam je bila pravkar posredovana preko sporočila SMS, temveč gre za kodo, ki ste jo določili sami."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Prijava ni uspela"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Pošlji"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Koda države"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "PIN za prijavo v omrežje"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Vnesite številko"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Že imate račun v omrežju Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Pogoji uporabe in politika zasebnosti"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Z registracijo te naprave se strinjate s %@ aplikacije Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "pogoji uporabe"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Ta format telefonskih številk ni podprt, prosimo obrnite se na center za podporo."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Vaša telefonska številka"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifikacija ni bila uspešna"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Napačen PIN za prijavo v omrežje."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Prijava"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Za registracijo morate vnesti veljavno telefonsko številko."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Nadrgradnja iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Nazaj"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifikacijska koda"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Raje me pokličite"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ponovno pošlji kodo SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Oddaj"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Vnesite kodo za verifikacijo, ki smo jo poslali na %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Uporabnika %@ste označili kot nepotrjenega."; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 8ef0e04d0..10984b028 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Wedzera musoro "; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Rudzi rwe faira :%@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Kutora kwaramba.Bata kuti uzame zvakare."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Zviri kutorwa..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Yaiswa mumutsara"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Pakanganiswa mukutumira chibatanidzwa."; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Zvinoteera"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Sarudza"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Chaya zvakare"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Ramba runhare ruri kupinda"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Dzima "; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Dzima nhaurwa?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Gadziro dzehutaurwa"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Ita kontakt itsva"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Bata kuti ushandure"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Tsvaga"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Tangisa"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax yekubasa"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album risina zita"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "This phone number has Registration Lock enabled. Please enter the Registration Lock PIN.\n\nYour Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Kunyoresa kwa Konewa"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Endesa"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Murau wenyika"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registration Lock"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Pinza nhamba"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Une akaundi yeSignal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Terms & Privacy Policy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Ukanyoresa mudziyo uyu,unobvumira ku%@ yeSignal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "Zvisungo"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Mamiriro eNhamba yerunhare haatsigirwe,tapota bata utsigiro."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Uno fanirwa kunyoresa kuti utumire tsamba."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Nhamba dzako dzerunhare"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Kuwongorora kururama kwaramba"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Incorrect Registration Lock PIN."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Nyoresa"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Tapota isa nhamba dzerunhare kuti unyorese."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Wedzera iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Dzoka"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Murau wekuongorora kururama"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Chayai runhare "; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Tumira zvakare neSMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Endesa"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Isa kodhi yekuvherifaya yatakutumira pa%@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Waratidza %@ kuti haina kuongororwa."; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 8d88ad936..7da82916b 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -12,7 +12,7 @@ /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ -"ACTION_SEND_MESSAGE" = "Dërgo Mesazhin"; +"ACTION_SEND_MESSAGE" = "Dërgoje Mesazhin"; /* Label for 'share contact' button. */ "ACTION_SHARE_CONTACT" = "Ndaje Kontaktin"; @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Shtoni një përshkrim…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Transkriptim"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Lloj kartele: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Shkarkimi dështoi. Prekeni që të riprovohet."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Po shkarkohet…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Në radhë"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Gabim Dërgimi Bashkëngjitjeje"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Pasuesi"; -/* Label for redo button. */ -"BUTTON_REDO" = "Ribëje"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Përzgjidhni"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Zhbëje"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Rithirre"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Hidhe tej thirrjen ardhëse"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Prekeni këtu që të ktheni te videoja juaj"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Përfundoje thirrjen"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Të fshihet Biseda?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "S’ka përputhje"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 përputhje"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d nga %d përputhje"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Rregullime Për Biseda"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Krijoni Kontakt të Ri"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Kërkoni Në Bisedë"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Prekeni që t’i Ndryshoni"; @@ -874,7 +880,7 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "S’arrihet të dërgohet, për shkak të dhënash prekey të vjetruara"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Dështoi dërgimi i mesazhit për përdorues, sepse i keni bllokuar."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "S’u arrit t’i dërgohej mesazh përdoruesit, ngaqë e keni bllokuar."; /* Error message indicating that message send failed due to failed attachment write */ "ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "S’u arrit të shkruhej dhe dërgohej bashkëngjitje."; @@ -949,7 +955,7 @@ "FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY" = "Numri juaj i sigurisë me %@ ka ndryshuar tani afër. Mund të doni ta verifikoni, përpara se ky mesazh të ridërgohet ."; /* alert title */ -"FAILED_VERIFICATION_TITLE" = "Dështoi Verifikimi i Numrit të Sigurisë!"; +"FAILED_VERIFICATION_TITLE" = "S’u arrit të Verifikohej Numri i Sigurisë!"; /* Button that marks user as verified after a successful fingerprint scan. */ "FINGERPRINT_SCAN_VERIFY_BUTTON" = "Vëri Shenjë Si i Verifikuar"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Kërko"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Disa nga kontaktet tuaja kanë tashmë Signal, përfshi %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Disa nga kontaktet tuaj kanë tashmë Signal, përfshi %@ dhe %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Disa nga kontaktet tuaja kanë tashmë Signal, përfshi %@, %@ dhe %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Lyeje"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Qethe"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Riktheje"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rrotulloje me 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rrotulloje me 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "S’mund të ndani me të tjerët më tepër se %@ objekte."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Faks Pune"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "S’arrihet të fotografohet figura"; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "S’arrihet të fotografohet figura"; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "S’u arrit të formësohej kamera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album Pa Emër"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Regjistrimi i këtij numri telefoni do të jetë i mundur pa PIN-in tuaj të Kyçjes së Regjistrime pasi të kenë kaluar 7 ditë që kur numri i telefonit qe aktiv në Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Ky numër telefoni ka të aktivizuar Kyçjen e Regjistrimeve. Ju lutemi, jepni PIN-in për Kyçje Regjistrimesh.\n\nPIN-i juaj për Kyçje Regjistrimesh është tjetër gjë nga kodi i verifikimit të automatizuar që u dërgua për telefonin tuaj gjatë hapit të fundit."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Regjistrimi Dështoi"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Parashtroje"; @@ -1821,14 +1815,11 @@ "REGISTER_RATE_LIMITING_ERROR" = "Keni provuar shumë herë. Ju lutemi, pritni një minutë, përpara se të riprovoni."; /* Title of alert shown when push tokens sync job fails. */ -"REGISTRATION_BODY" = "Dështoi ribërja e regjistrimit për njoftime push."; +"REGISTRATION_BODY" = "S’u arrit të bëhej riregjistrim për njoftime push."; /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Kod Vendi"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Kyçje Regjistrimesh"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Jepni Numër"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Keni tashmë një llogari Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Kushte & Rregulla Privatësie"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Duke regjistruar këtë pajisje, pajtoheni me %@Signal-it"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "kushte"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Ky format numrash telefoni nuk mbulohet, ju lutemi, lidhuni me asistencën."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Përpara se të mund të dërgoni një mesazh, lypset të regjistroheni."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Numri Juaj i Telefonit"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Verifikimi Dështoi"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "PIN Kyçjeje Regjistrimesh i Pasaktë."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Regjistroje"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Ju lutemi, jepni për regjistrim një numër telefoni të vlefshëm."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Përmirësoni iOS-in"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Mbrapsht"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Kod Verifikimi"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Më Mirë Me Thirrje"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ridërgo Kod me SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Parashtroje"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Jepni kodin e verifikimit që dërguam te %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "I keni vënë shenjë %@ si jo të verifikuar."; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index 772718926..2847a03a0 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Lägg till en bildtext..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Rubrik"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Filtyp: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Nedladdning misslyckad. Tryck för att försöka igen."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Laddar ner …"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Köad"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Fel vid sändning av bifogad fil"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Nästa"; -/* Label for redo button. */ -"BUTTON_REDO" = "Gör om"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Välj"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Ångra"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Ring igen"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Avvisa inkommande samtal"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tryck här för att aktivera din video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Avsluta samtal"; @@ -429,7 +423,7 @@ "COLOR_PICKER_DEMO_MESSAGE_1" = "Välj färg för utgående meddelanden för denna konversation."; /* The second of two messages demonstrating the chosen conversation color, by rendering this message in an incoming message bubble. */ -"COLOR_PICKER_DEMO_MESSAGE_2" = "Bara du kommer att kunna se färgen du väljer."; +"COLOR_PICKER_DEMO_MESSAGE_2" = "Bara du kommer att se färgen du väljer."; /* Modal Sheet title when picking a conversation color. */ "COLOR_PICKER_SHEET_TITLE" = "Konversationsfärg"; @@ -456,7 +450,7 @@ "CONFIRM_ACCOUNT_DESTRUCTION_TITLE" = "Är du säker på att du vill radera ditt konto?"; /* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Du kommer inte längre kunna skicka eller ta emot meddelanden i den här gruppen."; +"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Du kommer inte längre att kunna skicka eller ta emot meddelanden i den här gruppen."; /* Alert title */ "CONFIRM_LEAVE_GROUP_TITLE" = "Vill du verkligen lämna?"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Radera konversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Inga resultat"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 resultat"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d av %d resultat"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Konversationsinställningar"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Skapa ny kontakt"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Sök i konversationen"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tryck för att ändra"; @@ -850,7 +856,7 @@ "ENABLE_2FA_VIEW_SELECT_PIN_INSTRUCTIONS" = "Ange en registreringslås-PIN. Du kommer att behöva ange denna PIN nästa gång du registrerar detta telefonnummer med Signal."; /* Indicates that user has 'two factor auth pin' disabled. */ -"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "För ökad säkerhet kan du aktivera en registreringslås-PIN som kommer att krävas för att kunna registrera detta telefonnummer med Signal igen."; +"ENABLE_2FA_VIEW_STATUS_DISABLED_INSTRUCTIONS" = "För ökad säkerhet kan du aktivera en registreringslås-PIN som kommer att krävas för att registrera detta telefonnummer med Signal igen."; /* Indicates that user has 'two factor auth pin' enabled. */ "ENABLE_2FA_VIEW_STATUS_ENABLED_INSTRUCTIONS" = "Registreringslås är aktiverat. Du kommer att behöva ange din PIN när du registrerar ditt telefonnummer med Signal igen."; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Sök"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@ och %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Några av dina kontakter är redan på Signal, inklusive %@, %@ och %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Pensel"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Beskära"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Starta om"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotera 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotera 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "Du kan inte dela mer än %@ objekt."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Arbetsfax"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Kunde inte ta bilden."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Kunde inte ta bilden."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Kunde inte konfigurera kameran."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Namnlösa album"; @@ -1731,7 +1731,7 @@ "PROFILE_VIEW_PROFILE_AVATAR_FIELD" = "Avatar"; /* Description of the user profile. */ -"PROFILE_VIEW_PROFILE_DESCRIPTION" = "Dina kontakter kommer kunna se din Signalprofil när du startar nya konversationer och när du delar den med andra användare eller grupper."; +"PROFILE_VIEW_PROFILE_DESCRIPTION" = "Dina kontakter kommer att kunna se din Signal-profil när du startar nya konversationer och när du delar den med andra användare eller grupper."; /* Link to more information about the user profile. */ "PROFILE_VIEW_PROFILE_DESCRIPTION_LINK" = "Tryck här för att veta mer. "; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Efter att 7 dagar har gått sen telefonnumret senast var aktivt i Signal så kan det här telefonnumret registreras igen utan din pinkod för registreringslås."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Det här telefonnumret har registreringslås aktiverat. Ange pinkoden för registreringslås.\n\nDin pinkod för registreringslås är inte samma som den automatiska verifieringskoden som skickades till din telefon i förra steget."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Kunde inte registrera"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Skicka"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Landskod"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Registreringslås"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Ange nummer"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Har du redan ett Signal-konto?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Villkor & Dataskyddspolicy"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Genom att registrera denna enhet godkänner du Signals %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "villkor"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Formatet på telefonnumret stöds inte, vänligen kontaktar supporten."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Du behöver registrera dig innan du kan skicka ett meddelande."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ditt telefonnummer"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Kunde inte bekräfta"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Fel PIN-kod för registreringslås"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Registrera"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Ange ett giltigt telefonnummer för att registrera."; @@ -1956,13 +1932,13 @@ "SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_LOCKOUT" = "För många felaktiga autentiseringsförsök. Försök igen senare."; /* Indicates that Touch ID/Face ID/Phone Passcode are not available on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att kunna använda skärmlås."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_AVAILABLE" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att använda Skärmlås."; /* Indicates that Touch ID/Face ID/Phone Passcode is not configured on this device. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att kunna använda skärmlås."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_NOT_ENROLLED" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att använda Skärmlås."; /* Indicates that Touch ID/Face ID/Phone Passcode passcode is not set. */ -"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att kunna använda skärmlås."; +"SCREEN_LOCK_ERROR_LOCAL_AUTHENTICATION_PASSCODE_NOT_SET" = "Du måste aktivera en lösenkod i dina iOS-inställningar för att använda Skärmlås."; /* Description of how and why Signal iOS uses Touch ID/Face ID/Phone Passcode to unlock 'screen lock'. */ "SCREEN_LOCK_REASON_UNLOCK_SCREEN_LOCK" = "Autentisera för att öppna Signal"; @@ -2421,7 +2397,7 @@ "UNLINK_ACTION" = "Avlänka"; /* Alert message to confirm unlinking a device */ -"UNLINK_CONFIRMATION_ALERT_BODY" = "Denna enhet kommer inte längre att kunna skicka eller ta emot meddelanden om den är frånkopplad."; +"UNLINK_CONFIRMATION_ALERT_BODY" = "Denna enhet kommer inte längre att skicka eller ta emot meddelanden om den är frånkopplad."; /* Alert title for confirming device deletion */ "UNLINK_CONFIRMATION_ALERT_TITLE" = "Avlänka \"%@\"?"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uppgradera iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Tillbaka"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Verifieringskod"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Ring mig istället"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Skicka koden igen via SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Skicka"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Ange verifieringskoden vi skickade till %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Du markerade %@ som ej verifierad."; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index 97585489f..1bc73735e 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Add a caption…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ชนิดของไฟล์: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Download failed. Tap to retry."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "กำลังดาวน์โหลด…"; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "เข้าคิวแล้ว"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "เกิดข้อผิดพลาดในการส่งไฟล์แนบ"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "ต่อไป"; -/* Label for redo button. */ -"BUTTON_REDO" = "ทำซ้ำ"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "เลือก"; -/* Label for undo button. */ -"BUTTON_UNDO" = "เลิกทำ"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Call Again"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "ปฏิเสธสายเข้า"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "วางสาย"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "ตั้งค่าการสนทนา"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "สร้างผู้ติดต่อใหม่"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tap to Change"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "ค้นหา"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "รีเซ็ต"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "แฟกซ์ที่ทำงาน"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unnamed Album"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "การลงทะเบียนหมายเลขโทรศัพท์นี้โดยไม่มีรหัส PIN ล็อกการลงทะเบียนของคุณสามารถทำได้หลังพ้นระยะเวลา 7 วันนับจากการใช้งานหมายเลขโทรศัพท์นี้บน Signal ครั้งหลังสุด"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "เปิดใช้งานล็อกการลงทะเบียนสำหรับหมายเลขโทรศัพท์นี้แล้ว โปรดป้อนรหัส PIN ล็อกการลงทะเบียน\n\nรหัส PIN ล็อกการลงทะเบียนของคุณนั้นแตกต่างจากรหัสยืนยันอัตโนมัติที่ถูกส่งไปที่โทรศัพท์ของคุณในระหว่างขั้นตอนสุดท้าย"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "ลงทะเบียนไม่สำเร็จ"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "ส่ง"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "รหัสประเทศ"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "ล็อกการลงทะเบียน "; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "ป้อนหมายเลข"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Already have a Signal account?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "เงื่อนไขและนโยบายความเป็นส่วนตัว"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "By registering this device, you agree to Signal's %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "terms"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "ไม่รองรับรูปแบบหมายเลขโทรศัพท์นี้ โปรดติดต่อฝ่ายสนับสนุน"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "You need to register before you can send a message."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "หมายเลขโทรศัพท์ของคุณ"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "การตรวจสอบไม่สำเร็จ"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "รหัส PIN ล็อกการลงทะเบียนไม่ถูกต้อง"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "ลงทะเบียน"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "โปรดป้อนหมายเลขโทรศัพท์ที่ถูกต้องเพื่อลงทะเบียน"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "อัพเกรด iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "ย้อนกลับ"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "รหัสยืนยัน"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "โทรหาฉันแทน"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "ส่งรหัสใหม่ทางเอสเอ็มเอส"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "ส่ง"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "ป้อนรหัสยืนยันที่เราส่งไปที่ %@"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "คุณทำเครื่องหมายว่า %@ ยังไม่ถูกตรวจยืนยัน"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 02243e36a..8291cbbae 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Bir başlık ekleyin..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Başlık"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Dosya türü: %@"; @@ -113,29 +116,23 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "İndirme başarısız. Yeniden denemek için dokunun."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "İndiriliyor..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "Sıraya eklendi"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Eklenti Gönderilirken Hata"; /* Attachment error message for image attachments which could not be converted to JPEG */ -"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Resim dönüştürülemedi."; +"ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG" = "Görüntü dönüştürülemedi."; /* Attachment error message for video attachments which could not be converted to MP4 */ "ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_MP4" = "Video işlenemedi."; /* Attachment error message for image attachments which cannot be parsed */ -"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "Resim işlenemedi."; +"ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE" = "Görüntü işlenemedi."; /* Attachment error message for image attachments in which metadata could not be removed */ "ATTACHMENT_ERROR_COULD_NOT_REMOVE_METADATA" = "Bu görüntüdeki metaveriler kaldırılamadı."; /* Attachment error message for image attachments which could not be resized */ -"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Resim yeniden bouytlandırılamadı."; +"ATTACHMENT_ERROR_COULD_NOT_RESIZE_IMAGE" = "Görüntü yeniden boyutlandırılamadı."; /* Attachment error message for attachments whose data exceed file size limits */ "ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE" = "Eklenti çok büyük."; @@ -150,7 +147,7 @@ "ATTACHMENT_ERROR_MISSING_DATA" = "Eklenti boş."; /* Accessibility hint describing what you can do with the attachment button */ -"ATTACHMENT_HINT" = "Resim seçin ya da fotoğraf çekin, sonra gönderin"; +"ATTACHMENT_HINT" = "Görüntü seçin veya çekin sonra gönderin"; /* Accessibility label for attaching photos */ "ATTACHMENT_LABEL" = "Eklenti"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "İleri"; -/* Label for redo button. */ -"BUTTON_REDO" = "Yinele"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seç"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Geri al"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Tekrar Ara"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Gelen aramayı reddet"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Görüntünüzü açmak için buraya dokunun"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Aramayı sonlandır"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Sohbeti Sil?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "Eşleşme yok"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 eşleşme"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d/%d eşleşme"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Sohbet Seçenekleri"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Yeni Kişi Oluştur"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Sohbeti Araştır"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Değiştirmek için Dokunun"; @@ -814,7 +820,7 @@ "EDIT_TXT" = "Düzenle"; /* body of email sent to contacts when inviting to install Signal. Embeds {{link to install Signal}} and {{link to the Signal home page}} */ -"EMAIL_INVITE_BODY" = "Merhaba,\n\nSon zamanlarda iPhone'umdaki konuşmalarımı gizli tutmak için Signal kullanıyorum. Size de kurmanızı öneririm, böylelikle iletilerimizin ve aramalarımızın aramızda kaldığından emin olabiliriz.\n\nSignal, iPhone ve Android için kullanılabilir. Şu adresten edinebilirsiniz: %@ \n\nSignal mevcut ileti uygulamanız gibi çalışır. Resim ve video gönderebilir, arama yapabilir ve grup sohbetlerine başlayabiliriz. En iyi yanı ise yapımcıları dahil hiçkimsenin göremeyecek olması!\n\nSignal'i yapan Open Whisper Systems hakkında daha fazla bilgi için şu adresi ziyaret edebilirsin: %@"; +"EMAIL_INVITE_BODY" = "Merhaba,\n\nSon zamanlarda iPhone'umdaki konuşmalarımı gizli tutmak için Signal kullanıyorum. Size de kurmanızı öneririm, böylelikle iletilerimizin ve aramalarımızın aramızda kaldığından emin olabiliriz.\n\nSignal, iPhone ve Android için kullanılabilir. Şu adresten edinebilirsiniz: %@ \n\nSignal mevcut ileti uygulamanız gibi çalışır. Görüntü ve video gönderebilir, arama yapabilir ve grup sohbetlerine başlayabiliriz. En iyi yanı ise yapımcıları dahil hiç kimsenin göremeyecek olması!\n\nSignal'i yapan Open Whisper Systems hakkında daha fazla bilgi için şu adresi ziyaret edebilirsin: %@"; /* subject of email sent to contacts when inviting to install Signal */ "EMAIL_INVITE_SUBJECT" = "Haydi Signal'e geçelim"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Ara"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@ ve %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Bazı kişileriniz zaten Signal kullanıyor, örneğin %@, %@ ve %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Fırça"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Kırpma"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Sıfırla"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "45 derece döndür"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "90 derece döndür"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "%@ öğeden daha fazlasını paylaşamazsınız."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "İş Faksı"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Görüntü yakalanamadı."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Görüntü yakalanamadı."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Kamera yapılandırılamadı."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "İsimsiz Albüm"; @@ -1788,7 +1788,7 @@ "QUOTED_REPLY_TYPE_GIF" = "GIF"; /* Indicates this message is a quoted reply to an image file. */ -"QUOTED_REPLY_TYPE_IMAGE" = "Resim"; +"QUOTED_REPLY_TYPE_IMAGE" = "Görüntü"; /* Indicates this message is a quoted reply to a video file. */ "QUOTED_REPLY_TYPE_VIDEO" = "Video"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Bu telefon numarasının kaydı, numaranın en son Signal üzerinde aktif olmasının üzerinden 7 gün geçtikten sonra Kayıt Kilidi PIN'iniz olmadan mümkün olabilecektir."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Bu telefon numarası Kayıt Kilidi'ni etkinleştirmiş. Lütfen Kayıt Kilidi PIN'ini girin.\n\nKayıt Kilidi PIN'iniz son aşamada otomatik olarak gönderilen doğrulama kodundan farklıdır."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Kaydolma İşlemi Başarısız Oldu"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Gönder"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Ülke Kodu"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Kayıt Kilidi"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Numarayı Gir"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Zaten Signal hesabınız var mı?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Şartlar ve Gizlilik İlkesi"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Bu cihazı kaydederek Signal'in %@'ni kabul etmiş olursunuz."; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "şartlar"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Bu telefon numarası formatı desteklenmiyor, lütfen destek ile iletişime geç."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "İleti göndermeden önce kaydolmanız gerekiyor."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Telefon Numaranız"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Doğrulama Başarısız Oldu"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Hatalı Kayıt Kilidi PIN'i."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Kaydet"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Kaydolmak için lütfen geçerli bir telefon numarası girin."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS'u Güncelle"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Geri"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Doğrulama Kodu"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Bunun Yerine Beni Ara"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Kodu tekrar SMS ile gönder"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Gönder"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "%@ numarasına gönderilen doğrulama kodunu giriniz."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "%@ doğrulanmamış olarak işaretlendi."; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index 46ff90964..f5c1126ee 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Додати підпис…"; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Тип файлу: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "Не вдалося завантажити. Натисніть, щоб повторити."; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "Завантаження..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "У черзi"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "Помилка надсилання долучення"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "Далі"; -/* Label for redo button. */ -"BUTTON_REDO" = "Redo"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Вибрати"; -/* Label for undo button. */ -"BUTTON_UNDO" = "Undo"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "Перетелефонувати"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Відхилити вхідний виклик"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Завершити виклик"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Видалити розмову?"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Налаштування розмов"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Створити новий контакт"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Натисніть, щоб змінити"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Пошук"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "Brush"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "Crop"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "Скинути"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "Rotate 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "Rotate 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Робочий факс"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Альбом без назви"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Прив’язати цей номер телефону без вашого ПІНа для блокування входу можна буде через 7 днів з часу останньої активності вашого номера телефону в Signal."; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "Для цього номера телефону увімкнено блокування входу. Уведіть ПІН блокування входу.\n\nВаш ПІН блокування та автоматичний код підтвердження, який було надіслано на ваш телефон у попередньому кроці — це окремі речі."; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "Невдала прив’язка"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Надіслати"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "Код країни"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "Блокування входу"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Уведіть номер"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Вже маєте акаунт Signal?"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "Умови використання та політика конфіденційності"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "Реєструючи цей пристрій, ви погоджуєтеся з %@ Signal"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "Умовами використання"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Цей формат номеру телефону не підтримується, зверніться до служби підтримки."; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Перед тим, як надсилати повідомлення, слід зареєструватися."; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "Ваш номер телефону"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "Невдале підтвердження"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "Хибний ПІН блокування реєстрації."; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "Реєстрація"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "Щоб зареєструватися, уведіть дійсний номер телефону."; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Оновити iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "Назад"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "Код підтвердження"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "Зателефонувати мені"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "Ще раз відправити код у SMS"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "Відправити"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "Введіть код підтвердження, який ми вислали на %@."; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "Ви позначили %@ як неперевірений контакт."; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index f9f0bb264..a6a5d6e99 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "添加注释..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "文件类型: %@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "下载失败，点击重试。"; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "下载中..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "正在排队"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "附件发送错误"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "下一步"; -/* Label for redo button. */ -"BUTTON_REDO" = "重做"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "选择"; -/* Label for undo button. */ -"BUTTON_UNDO" = "撤销"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "重拨"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "拒接来电"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "结束通话"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "删除会话？"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "会话设置"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "新建联系人"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "点击更改"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜索"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@。"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@和%@。"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "您的一些联系人已经在使用Signal了，比如%@，%@，以及%@。"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "笔刷"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "剪裁"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "复位"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "旋转45度"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "旋转90度"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "您最多分享%@项。"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "工作传真"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "未命名的相册"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "从上一次此号码成功激活 Signal 开始，7日之后，您无需输入注册锁 PIN 码就能用这个手机号码重新注册 Signal。"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "这个电话号码已启用注册锁。请输入注册锁 PIN 码。\n\n注意，您的注册锁 PIN 码，与最后一步时发送给您的自动验证码是不同的。"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "注册失败"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "提交"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "国家编码"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "注册锁"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "输入电话号码"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "已有 Signal 帐号？"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "条款和隐私政策"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "注册本设备即表示您同意 Signal 的 %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "条款"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "不支持这个电话号码格式，请联系支持。"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "您需要先注册才能发送消息。"; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "您的电话号码"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "验证失败"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "注册锁 PIN 码不正确。"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "注册"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "请输入一个有效的电话号码来注册。"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "升级 iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "退后"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "验证码"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "通过电话呼叫我以获取验证码"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "重新通过SMS短信发送验证码"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "提交"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "输入我们发送到 %@ 的验证码"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "您已将%@标记为未验证。"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index 1ed7e9a7a..b46645e0b 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -95,6 +95,9 @@ /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "新增標題..."; +/* Title for 'caption' mode of the attachment approval view. */ +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "字幕"; + /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "檔案類型：%@"; @@ -113,12 +116,6 @@ /* Status label when an attachment download has failed. */ "ATTACHMENT_DOWNLOADING_STATUS_FAILED" = "下載失敗。請點擊再試一次。"; -/* Status label when an attachment is currently downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_IN_PROGRESS" = "下載中..."; - -/* Status label when an attachment is enqueued, but hasn't yet started downloading */ -"ATTACHMENT_DOWNLOADING_STATUS_QUEUED" = "已排程"; - /* The title of the 'attachment error' alert. */ "ATTACHMENT_ERROR_ALERT_TITLE" = "附件傳送錯誤"; @@ -305,15 +302,9 @@ /* Label for the 'next' button. */ "BUTTON_NEXT" = "下一步"; -/* Label for redo button. */ -"BUTTON_REDO" = "重做"; - /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "選擇"; -/* Label for undo button. */ -"BUTTON_UNDO" = "復原"; - /* Label for button that lets users call a contact again. */ "CALL_AGAIN_BUTTON_TITLE" = "重撥電話"; @@ -359,6 +350,9 @@ /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "拒絕來電"; +/* tooltip label when remote party has enabled their video */ +"CALL_VIEW_ENABLE_VIDEO_HINT" = "點擊此處以開啟你的影片"; + /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "結束通話"; @@ -569,6 +563,15 @@ /* Title for the 'conversation delete confirmation' alert. */ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "刪除對話？"; +/* keyboard toolbar label when no messages match the search string */ +"CONVERSATION_SEARCH_NO_RESULTS" = "不相符"; + +/* keyboard toolbar label when exactly 1 message matches the search string */ +"CONVERSATION_SEARCH_ONE_RESULT" = "1 項相符"; + +/* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d 之 %d 個相符"; + /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "對話設定"; @@ -620,6 +623,9 @@ /* Label for 'new contact' button in conversation settings view. */ "CONVERSATION_SETTINGS_NEW_CONTACT" = "建立新聯絡人"; +/* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ +"CONVERSATION_SETTINGS_SEARCH" = "搜尋對話"; + /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "點擊以變更"; @@ -1056,13 +1062,13 @@ /* Placeholder text for search bar which filters conversations. */ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "搜尋"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds: {{The name of 1 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "有些你的聯絡人已經在使用 Signal了，包括%@。"; -/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds: {{The names of 2 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "有些你的聯絡人已經在使用Signal 了，包括 %@ 及%@。"; -/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds: {{The names of 3 of your Signal contacts}}. */ +/* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "有些你的聯絡人已經在使用 Signal 了，包括 %@、%@及%@。"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ @@ -1077,21 +1083,6 @@ /* Title for the home view's default mode. */ "HOME_VIEW_TITLE_INBOX" = "Signal"; -/* Label for brush button in image editor. */ -"IMAGE_EDITOR_BRUSH_BUTTON" = "筆刷"; - -/* Label for crop button in image editor. */ -"IMAGE_EDITOR_CROP_BUTTON" = "裁剪"; - -/* Label for button that resets crop & rotation state. */ -"IMAGE_EDITOR_RESET_BUTTON" = "重設"; - -/* Label for button that rotates image 45 degrees. */ -"IMAGE_EDITOR_ROTATE_45_BUTTON" = "旋轉 45°"; - -/* Label for button that rotates image 90 degrees. */ -"IMAGE_EDITOR_ROTATE_90_BUTTON" = "旋轉 90°"; - /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ "IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "你無法分享超過%@個項目。"; @@ -1649,6 +1640,15 @@ /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "工作傳真"; +/* alert title, generic error preventing user from capturing a photo */ +"PHOTO_CAPTURE_GENERIC_ERROR" = "無法擷取圖片。"; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "無法擷取圖片。"; + +/* alert title */ +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "無法設定相機。"; + /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "未命名的相簿"; @@ -1799,12 +1799,6 @@ /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "如果你沒有註冊鎖定 PIN 碼，在此電話號碼，最後活躍於 Signal 的 7 天過後，才可以註冊此電話號碼。"; -/* Instructions to enter the 'two-factor auth pin' in the 2FA registration view. */ -"REGISTER_2FA_INSTRUCTIONS" = "此電話號碼有啟動註冊鎖定功能。請輸入註冊鎖定 PIN 碼。\n\n你的註冊鎖定 PIN 碼與最後一步驟發送至你手機的簡訊驗證碼是分開的。"; - -/* Title for alert indicating that attempt to register with 'two-factor auth' failed. */ -"REGISTER_2FA_REGISTRATION_FAILED_ALERT_TITLE" = "註冊失敗"; - /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "提交"; @@ -1826,9 +1820,6 @@ /* Label for the country code field */ "REGISTRATION_DEFAULT_COUNTRY_NAME" = "國碼"; -/* Navigation title shown when user is re-registering after having enabled registration lock */ -"REGISTRATION_ENTER_LOCK_PIN_NAV_TITLE" = "註冊鎖定"; - /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "輸入號碼"; @@ -1847,15 +1838,6 @@ /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "已經有 Signal 帳號了嗎？"; -/* one line label below submit button on registration screen, which links to an external webpage. */ -"REGISTRATION_LEGAL_TERMS_LINK" = "條款和隱私政策"; - -/* legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink */ -"REGISTRATION_LEGAL_TOP_MATTER_FORMAT" = "透過註冊這個裝置，表示你同意 Signal 的 %@"; - -/* embedded in legal topmatter, styled as a link */ -"REGISTRATION_LEGAL_TOP_MATTER_LINK_TITLE" = "條款"; - /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "不支援這個電話號碼的格式，請聯繫支援部門。"; @@ -1865,9 +1847,6 @@ /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "你必須先註冊才能傳送訊息。"; -/* No comment provided by engineer. */ -"REGISTRATION_TITLE_LABEL" = "你的電話號碼"; - /* Alert view title */ "REGISTRATION_VERIFICATION_FAILED_TITLE" = "驗證失敗"; @@ -1877,9 +1856,6 @@ /* Error message indicating that registration failed due to a missing or incorrect 2FA PIN. */ "REGISTRATION_VERIFICATION_FAILED_WRONG_PIN" = "不正確的註冊鎖定 PIN 碼。"; -/* No comment provided by engineer. */ -"REGISTRATION_VERIFY_DEVICE" = "註冊"; - /* Message of alert indicating that users needs to enter a valid phone number to register. */ "REGISTRATION_VIEW_INVALID_PHONE_NUMBER_ALERT_MESSAGE" = "請輸入有效的電話號碼來註冊。"; @@ -2513,24 +2489,6 @@ /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "更新 iOS"; -/* button text for back button on verification view */ -"VERIFICATION_BACK_BUTTON" = "退後"; - -/* Text field placeholder for SMS verification code during registration */ -"VERIFICATION_CHALLENGE_DEFAULT_TEXT" = "驗證碼"; - -/* button text during registration to request phone number verification be done via phone call */ -"VERIFICATION_CHALLENGE_SEND_VIA_VOICE" = "改用電話撥給我"; - -/* button text during registration to request another SMS code be sent */ -"VERIFICATION_CHALLENGE_SUBMIT_AGAIN" = "重新透過簡訊傳送認證碼"; - -/* button text during registration to submit your SMS verification code. */ -"VERIFICATION_CHALLENGE_SUBMIT_CODE" = "提交"; - -/* Label indicating the phone number currently being verified. */ -"VERIFICATION_PHONE_NUMBER_FORMAT" = "輸入我們傳送給 %@的認證碼。"; - /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */ "VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "你已將 %@標示為未驗證。"; From 2d854406a14e3719361da984fb0b25a4f067b1cd Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 11:12:02 -0400 Subject: [PATCH 372/493] Add accessibilityIdentifiers to home view. --- .../HomeView/HomeViewController.m | 32 ++++++++++----- SignalMessaging/categories/UIView+OWS.swift | 39 +++++++++++++++++++ 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index f3aa5301f..48792175e 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -287,6 +287,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { self.reminderViewCell.selectionStyle = UITableViewCellSelectionStyleNone; [self.reminderViewCell.contentView addSubview:reminderStackView]; [reminderStackView autoPinEdgesToSuperviewEdges]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _reminderViewCell); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, reminderStackView); __weak HomeViewController *weakSelf = self; ReminderView *deregisteredView = @@ -301,18 +303,21 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { }]; _deregisteredView = deregisteredView; [reminderStackView addArrangedSubview:deregisteredView]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, deregisteredView); ReminderView *outageView = [ReminderView nagWithText:NSLocalizedString(@"OUTAGE_WARNING", @"Label warning the user that the Signal service may be down.") tapAction:nil]; _outageView = outageView; [reminderStackView addArrangedSubview:outageView]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, outageView); ReminderView *archiveReminderView = [ReminderView explanationWithText:NSLocalizedString(@"INBOX_VIEW_ARCHIVE_MODE_REMINDER", @"Label reminding the user that they are in archive mode.")]; _archiveReminderView = archiveReminderView; [reminderStackView addArrangedSubview:archiveReminderView]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, archiveReminderView); ReminderView *missingContactsPermissionView = [ReminderView nagWithText:NSLocalizedString(@"INBOX_VIEW_MISSING_CONTACTS_PERMISSION", @@ -322,6 +327,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { }]; _missingContactsPermissionView = missingContactsPermissionView; [reminderStackView addArrangedSubview:missingContactsPermissionView]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, missingContactsPermissionView); self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; self.tableView.delegate = self; @@ -332,6 +338,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kArchivedConversationsReuseIdentifier]; [self.view addSubview:self.tableView]; [self.tableView autoPinEdgesToSuperviewEdges]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _tableView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _searchBar); self.tableView.rowHeight = UITableViewAutomaticDimension; self.tableView.estimatedRowHeight = 60; @@ -340,6 +348,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.view addSubview:self.emptyInboxView]; [self.emptyInboxView autoPinWidthToSuperviewMargins]; [self.emptyInboxView autoVCenterInSuperview]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _emptyInboxView); [self createFirstConversationCueView]; [self.view addSubview:self.firstConversationCueView]; @@ -353,6 +362,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { relation:NSLayoutRelationGreaterThanOrEqual]; [self.firstConversationCueView autoPinEdgeToSuperviewMargin:ALEdgeBottom relation:NSLayoutRelationGreaterThanOrEqual]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationCueView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationLabel); UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; pullToRefreshView.tintColor = [UIColor grayColor]; @@ -360,13 +371,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { action:@selector(pullToRefreshPerformed:) forControlEvents:UIControlEventValueChanged]; [self.tableView insertSubview:pullToRefreshView atIndex:0]; - - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _tableView); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _emptyInboxView); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationCueView); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _firstConversationLabel); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _searchBar); - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _reminderStackView); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, pullToRefreshView); } - (UIView *)createEmptyInboxView @@ -744,15 +749,18 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { settingsButton = [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:self - action:@selector(settingsButtonPressed:)]; + action:@selector(settingsButtonPressed:) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"settings")]; } settingsButton.accessibilityLabel = CommonStrings.openSettingsButton; self.navigationItem.leftBarButtonItem = settingsButton; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, settingsButton); self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCompose target:self - action:@selector(showNewConversationView)]; + action:@selector(showNewConversationView) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"compose")]; } - (void)settingsButtonPressed:(id)sender @@ -1098,6 +1106,10 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { BOOL isBlocked = [self.blocklistCache isThreadBlocked:thread.threadRecord]; [cell configureWithThread:thread isBlocked:isBlocked]; + // TODO: Work with Nancy to confirm that this is accessible via Appium. + NSString *cellName = [NSString stringWithFormat:@"conversation-%@", NSUUID.UUID.UUIDString]; + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, cellName); + return cell; } @@ -1141,6 +1153,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [stackView autoPinEdgeToSuperviewMargin:ALEdgeTop]; [stackView autoPinEdgeToSuperviewMargin:ALEdgeBottom]; + cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"archived_conversations"); + return cell; } diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 711cb4871..3b9656d0f 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -355,3 +355,42 @@ public extension UIBezierPath { addLine(to: first) } } + +// MARK: - + +public extension UIBarButtonItem { + @objc + public convenience init(image: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + self.init(image: image, style: style, target: target, action: action) + + self.accessibilityIdentifier = accessibilityIdentifier + } + + @objc + public convenience init(image: UIImage?, landscapeImagePhone: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + self.init(image: image, landscapeImagePhone: landscapeImagePhone, style: style, target: target, action: action) + + self.accessibilityIdentifier = accessibilityIdentifier + } + + @objc + public convenience init(title: String?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + self.init(title: title, style: style, target: target, action: action) + + self.accessibilityIdentifier = accessibilityIdentifier + } + + @objc + public convenience init(barButtonSystemItem systemItem: UIBarButtonItem.SystemItem, target: Any?, action: Selector?, accessibilityIdentifier: String) { + self.init(barButtonSystemItem: systemItem, target: target, action: action) + + self.accessibilityIdentifier = accessibilityIdentifier + } + + @objc + public convenience init(customView: UIView, accessibilityIdentifier: String) { + self.init(customView: customView) + + self.accessibilityIdentifier = accessibilityIdentifier + } +} From 95e125d55e2e38e28e235d59d9d13b0dd1b6ba62 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 11:55:00 -0400 Subject: [PATCH 373/493] Simplify usage of accessibilityIdentifiers. --- .../OWSSoundSettingsViewController.m | 19 +-- .../PrivacySettingsTableViewController.m | 2 +- .../OWS2FASettingsViewController.m | 16 +-- .../ViewControllers/ProfileViewController.m | 2 +- SignalMessaging/utils/BlockListUIUtils.m | 127 +++++++++--------- 5 files changed, 85 insertions(+), 81 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m index b327efd96..0bc9ff00a 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m @@ -6,6 +6,7 @@ #import #import #import +#import #import NS_ASSUME_NONNULL_BEGIN @@ -46,17 +47,19 @@ NS_ASSUME_NONNULL_BEGIN - (void)updateNavigationItems { - UIBarButtonItem *cancelItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel - target:self - action:@selector(cancelWasPressed:)]; - cancelItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"cancel"); + UIBarButtonItem *cancelItem = + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel + target:self + action:@selector(cancelWasPressed:) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"cancel")]; self.navigationItem.leftBarButtonItem = cancelItem; if (self.isDirty) { - UIBarButtonItem *saveItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave - target:self - action:@selector(saveWasPressed:)]; - saveItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"save"); + UIBarButtonItem *saveItem = + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave + target:self + action:@selector(saveWasPressed:) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"save")]; self.navigationItem.rightBarButtonItem = saveItem; } else { self.navigationItem.rightBarButtonItem = nil; diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 061796827..4cfae0f2a 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -561,11 +561,11 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s UIAlertAction *action = [UIAlertAction actionWithTitle:screenLockTimeoutString + accessibilityIdentifier:[NSString stringWithFormat:@"settings.privacy.timeout.%@", timeoutValue] style:UIAlertActionStyleDefault handler:^(UIAlertAction *ignore) { [OWSScreenLock.sharedManager setScreenLockTimeout:screenLockTimeout]; }]; - action.accessibilityIdentifier = [NSString stringWithFormat:@"settings.privacy.timeout.%@", timeoutValue]; [alert addAction:action]; } [alert addAction:[OWSAlerts cancelAction]]; diff --git a/Signal/src/ViewControllers/OWS2FASettingsViewController.m b/Signal/src/ViewControllers/OWS2FASettingsViewController.m index 320e638c4..af284f2ec 100644 --- a/Signal/src/ViewControllers/OWS2FASettingsViewController.m +++ b/Signal/src/ViewControllers/OWS2FASettingsViewController.m @@ -268,18 +268,18 @@ NS_ASSUME_NONNULL_BEGIN [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"BACK_BUTTON", @"button text for back button") style:UIBarButtonItemStylePlain target:self - action:@selector(backButtonWasPressed)]; - backButton.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"back"); + action:@selector(backButtonWasPressed) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"back")]; self.navigationItem.backBarButtonItem = backButton; if (self.shouldHaveNextButton) { UIBarButtonItem *nextButton = [[UIBarButtonItem alloc] - initWithTitle:NSLocalizedString(@"ENABLE_2FA_VIEW_NEXT_BUTTON", - @"Label for the 'next' button in the 'enable two factor auth' views.") - style:UIBarButtonItemStylePlain - target:self - action:@selector(nextButtonWasPressed)]; - nextButton.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"next"); + initWithTitle:NSLocalizedString(@"ENABLE_2FA_VIEW_NEXT_BUTTON", + @"Label for the 'next' button in the 'enable two factor auth' views.") + style:UIBarButtonItemStylePlain + target:self + action:@selector(nextButtonWasPressed) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"next")]; self.navigationItem.rightBarButtonItem = nextButton; } else { self.navigationItem.rightBarButtonItem = nil; diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index f465ff6e9..e562fcdce 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -308,11 +308,11 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat UIAlertAction *discardAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", @"The label for the 'discard' button in alerts and action sheets.") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"discard") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [weakSelf profileCompletedOrSkipped]; }]; - discardAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"discard"); [alert addAction:discardAction]; [alert addAction:[OWSAlerts cancelAction]]; diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index c5e7d7ea3..bb114cbab 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -117,30 +117,30 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); preferredStyle:UIAlertControllerStyleActionSheet]; UIAlertAction *blockAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [self blockPhoneNumbers:phoneNumbers - displayName:displayName - fromViewController:fromViewController - blockingManager:blockingManager - completionBlock:^(UIAlertAction *ignore) { - if (completionBlock) { - completionBlock(YES); - } - }]; - }]; - blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); + actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self blockPhoneNumbers:phoneNumbers + displayName:displayName + fromViewController:fromViewController + blockingManager:blockingManager + completionBlock:^(UIAlertAction *ignore) { + if (completionBlock) { + completionBlock(YES); + } + }]; + }]; [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { completionBlock(NO); } }]; - dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheet addAction:dismissAction]; [fromViewController presentAlert:actionSheet]; } @@ -168,30 +168,30 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); preferredStyle:UIAlertControllerStyleActionSheet]; UIAlertAction *blockAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [self blockGroup:groupThread - fromViewController:fromViewController - blockingManager:blockingManager - messageSender:messageSender - completionBlock:^(UIAlertAction *ignore) { - if (completionBlock) { - completionBlock(YES); - } - }]; - }]; - blockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block"); + actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self blockGroup:groupThread + fromViewController:fromViewController + blockingManager:blockingManager + messageSender:messageSender + completionBlock:^(UIAlertAction *ignore) { + if (completionBlock) { + completionBlock(YES); + } + }]; + }]; [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { completionBlock(NO); } }]; - dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheet addAction:dismissAction]; [fromViewController presentAlert:actionSheet]; } @@ -333,31 +333,32 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - UIAlertAction *unblockAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [BlockListUIUtils unblockPhoneNumbers:phoneNumbers - displayName:displayName - fromViewController:fromViewController - blockingManager:blockingManager - completionBlock:^(UIAlertAction *ignore) { - if (completionBlock) { - completionBlock(NO); - } - }]; - }]; - unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); + UIAlertAction *unblockAction = + [UIAlertAction actionWithTitle:NSLocalizedString( + @"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [BlockListUIUtils unblockPhoneNumbers:phoneNumbers + displayName:displayName + fromViewController:fromViewController + blockingManager:blockingManager + completionBlock:^(UIAlertAction *ignore) { + if (completionBlock) { + completionBlock(NO); + } + }]; + }]; [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { completionBlock(YES); } }]; - dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheet addAction:dismissAction]; [fromViewController presentAlert:actionSheet]; } @@ -406,31 +407,31 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); message:message preferredStyle:UIAlertControllerStyleActionSheet]; - UIAlertAction *unblockAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [BlockListUIUtils unblockGroup:groupModel - displayName:displayName - fromViewController:fromViewController - blockingManager:blockingManager - completionBlock:^(UIAlertAction *ignore) { - if (completionBlock) { - completionBlock(NO); - } - }]; - }]; - unblockAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock"); + UIAlertAction *unblockAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", + @"Button label for the 'unblock' button") + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [BlockListUIUtils unblockGroup:groupModel + displayName:displayName + fromViewController:fromViewController + blockingManager:blockingManager + completionBlock:^(UIAlertAction *ignore) { + if (completionBlock) { + completionBlock(NO); + } + }]; + }]; [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { completionBlock(YES); } }]; - dismissAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss"); [actionSheet addAction:dismissAction]; [fromViewController presentAlert:actionSheet]; } @@ -473,9 +474,9 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) + accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") style:UIAlertActionStyleDefault handler:completionBlock]; - okAction.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok"); [alert addAction:okAction]; [fromViewController presentAlert:alert]; } From 4188993fc51fc2ec592cef39f24db05023460b53 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 13:05:35 -0400 Subject: [PATCH 374/493] Add accessibilityIdentifiers to 'new contact thread' view. --- .../AppSettings/AboutTableViewController.m | 4 +- .../AdvancedSettingsTableViewController.m | 8 +- .../AppSettings/AppSettingsViewController.m | 35 +++--- .../AppSettings/BlockListViewController.m | 4 +- ...otificationSettingsOptionsViewController.m | 2 +- .../NotificationSettingsViewController.m | 6 +- .../OWSLinkedDevicesTableViewController.m | 2 +- .../OWSSoundSettingsViewController.m | 8 +- .../PrivacySettingsTableViewController.m | 2 +- .../HomeView/HomeViewController.m | 8 +- .../NewContactThreadViewController.m | 105 +++++++++++++----- .../OWS2FASettingsViewController.m | 22 ++-- .../ViewControllers/ProfileViewController.m | 10 +- Signal/src/util/Pastelog.m | 16 +-- .../ViewControllers/OWSTableViewController.h | 5 + .../ViewControllers/OWSTableViewController.m | 14 ++- SignalMessaging/utils/BlockListUIUtils.m | 18 +-- SignalMessaging/utils/UIUtil.h | 8 +- 18 files changed, 170 insertions(+), 107 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m index 2b2bdf672..4a592b66e 100644 --- a/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AboutTableViewController.m @@ -58,7 +58,7 @@ [informationSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_LEGAL_TERMS_CELL", @"table cell label") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"terms") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"terms") actionBlock:^{ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:kLegalTermsUrlString]]; @@ -69,7 +69,7 @@ OWSTableSection *helpSection = [OWSTableSection new]; helpSection.headerTitle = NSLocalizedString(@"SETTINGS_HELP_HEADER", @""); [helpSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_SUPPORT", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"support") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"support") actionBlock:^{ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://support.signal.org"]]; diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index 7369ffa93..8c7654ac2 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN OWSTableSection *loggingSection = [OWSTableSection new]; loggingSection.headerTitle = NSLocalizedString(@"LOGGING_SECTION", nil); [loggingSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_DEBUGLOG", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"enable_debug_log") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"enable_debug_log") isOnBlock:^{ return [OWSPreferences isLoggingEnabled]; } @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN if ([OWSPreferences isLoggingEnabled]) { [loggingSection addItem:[OWSTableItem actionItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"submit_debug_log") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"submit_debug_log") actionBlock:^{ OWSLogInfo(@"Submitting debug logs"); [DDLog flushLog]; @@ -117,7 +117,7 @@ NS_ASSUME_NONNULL_BEGIN pushNotificationsSection.headerTitle = NSLocalizedString(@"PUSH_REGISTER_TITLE", @"Used in table section header and alert view title contexts"); [pushNotificationsSection addItem:[OWSTableItem actionItemWithText:NSLocalizedString(@"REREGISTER_FOR_PUSH", nil) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER( + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( self, @"reregister_push_notifications") actionBlock:^{ [weakSelf syncPushTokens]; @@ -187,7 +187,7 @@ NS_ASSUME_NONNULL_BEGIN [censorshipSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION", @"Label for the 'manual censorship circumvention' switch.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"censorship_circumvention") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"censorship_circumvention") isOnBlock:isCensorshipCircumventionOnBlock isEnabledBlock:isManualCensorshipCircumventionOnEnabledBlock target:weakSelf diff --git a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m index 6350714c4..1dc3e958a 100644 --- a/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m @@ -165,7 +165,7 @@ [accessoryLabel sizeToFit]; cell.accessoryView = accessoryLabel; cell.accessibilityIdentifier - = SUBVIEW_ACCESSIBILITY_IDENTIFIER(AppSettingsViewController, @"network_status"); + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(AppSettingsViewController, @"network_status"); return cell; } actionBlock:nil]]; @@ -173,29 +173,29 @@ [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE", @"Settings table view cell label") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"invite") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"invite") actionBlock:^{ [weakSelf showInviteFlow]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_PRIVACY_TITLE", @"Settings table view cell label") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"privacy") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"privacy") actionBlock:^{ [weakSelf showPrivacy]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_NOTIFICATIONS", nil) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"notifications") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"notifications") actionBlock:^{ [weakSelf showNotifications]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"LINKED_DEVICES_TITLE", @"Menu item and navbar title for the device manager") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"linked_devices") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"linked_devices") actionBlock:^{ [weakSelf showLinkedDevices]; }]]; [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_TITLE", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"advanced") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"advanced") actionBlock:^{ [weakSelf showAdvanced]; }]]; @@ -204,20 +204,20 @@ if (showBackup) { [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_BACKUP", @"Label for the backup view in app settings.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"backup") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"backup") actionBlock:^{ [weakSelf showBackup]; }]]; } [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_ABOUT", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"about") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"about") actionBlock:^{ [weakSelf showAbout]; }]]; #ifdef USE_DEBUG_UI [section addItem:[OWSTableItem disclosureItemWithText:@"Debug UI" - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"debugui") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"debugui") actionBlock:^{ [weakSelf showDebugUI]; }]]; @@ -226,19 +226,20 @@ if (TSAccountManager.sharedInstance.isDeregistered) { [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_REREGISTER_BUTTON", @"Label for re-registration button.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"reregister") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"reregister") selector:@selector(reregisterUser) color:[UIColor ows_materialBlueColor]]]; [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_DATA_BUTTON", @"Label for 'delete data' button.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete_data") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"delete_data") selector:@selector(deleteUnregisterUserData) color:[UIColor ows_destructiveRedColor]]]; } else { - [section addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete_account") - selector:@selector(unregisterUser) - color:[UIColor ows_destructiveRedColor]]]; + [section + addItem:[self destructiveButtonItemWithTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"delete_account") + selector:@selector(unregisterUser) + color:[UIColor ows_destructiveRedColor]]]; } [contents addSection:section]; @@ -352,7 +353,7 @@ [disclosureButton setContentCompressionResistancePriority:(UILayoutPriorityDefaultHigh + 1) forAxis:UILayoutConstraintAxisHorizontal]; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"profile"); + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"profile"); return cell; } @@ -490,7 +491,7 @@ target:self action:@selector(didPressEnableDarkTheme:)]; } - barButtonItem.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dark_theme"); + barButtonItem.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dark_theme"); return barButtonItem; } diff --git a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m index 549ca71cf..2a02ff318 100644 --- a/Signal/src/ViewControllers/AppSettings/BlockListViewController.m +++ b/Signal/src/ViewControllers/AppSettings/BlockListViewController.m @@ -74,7 +74,7 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_BLOCK_LIST_ADD_BUTTON", @"A label for the 'add phone number' button in the block list table.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"add") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"add") actionBlock:^{ AddToBlockListViewController *vc = [[AddToBlockListViewController alloc] init]; [weakSelf.navigationController pushViewController:vc animated:YES]; @@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN itemWithCustomCellBlock:^{ ContactTableViewCell *cell = [ContactTableViewCell new]; [cell configureWithRecipientId:phoneNumber]; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER( + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( BlockListViewController, @"user"); return cell; } diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m index 02b099a94..280c7d48a 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsOptionsViewController.m @@ -41,7 +41,7 @@ cell.accessoryType = UITableViewCellAccessoryCheckmark; } cell.accessibilityIdentifier - = SUBVIEW_ACCESSIBILITY_IDENTIFIER(NotificationSettingsOptionsViewController, + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NotificationSettingsOptionsViewController, NSStringForNotificationType(notificationType)); return cell; } diff --git a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m index 5ac5722c7..42c6dc393 100644 --- a/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/NotificationSettingsViewController.m @@ -48,7 +48,7 @@ NSLocalizedString(@"SETTINGS_ITEM_NOTIFICATION_SOUND", @"Label for settings view that allows user to change the notification sound.") detailText:[OWSSounds displayNameForSound:[OWSSounds globalNotificationSound]] - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"message_sound") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"message_sound") actionBlock:^{ OWSSoundSettingsViewController *vc = [OWSSoundSettingsViewController new]; [weakSelf.navigationController pushViewController:vc animated:YES]; @@ -58,7 +58,7 @@ @"Table cell switch label. When disabled, Signal will not play notification sounds while the app is in the " @"foreground."); [soundsSection addItem:[OWSTableItem switchItemWithText:inAppSoundsLabelText - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"in_app_sounds") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"in_app_sounds") isOnBlock:^{ return [prefs soundInForeground]; } @@ -75,7 +75,7 @@ addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"NOTIFICATIONS_SHOW", nil) detailText:[prefs nameForNotificationPreviewType:[prefs notificationPreviewType]] - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"options") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"options") actionBlock:^{ NotificationSettingsOptionsViewController *vc = [NotificationSettingsOptionsViewController new]; diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m index 0e5adbfb7..d3285b495 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m @@ -329,7 +329,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1; cell.detailTextLabel.text = NSLocalizedString(@"LINK_NEW_DEVICE_SUBTITLE", @"Subheading for 'Link New Device' navigation"); cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(OWSLinkedDevicesTableViewController, @"add"); + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(OWSLinkedDevicesTableViewController, @"add"); return cell; } else if (indexPath.section == OWSLinkedDevicesTableViewControllerSectionExistingDevices) { OWSDeviceTableViewCell *cell = diff --git a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m index 0bc9ff00a..49c5649b2 100644 --- a/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettings/OWSSoundSettingsViewController.m @@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelWasPressed:) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"cancel")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"cancel")]; self.navigationItem.leftBarButtonItem = cancelItem; if (self.isDirty) { @@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(saveWasPressed:) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"save")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"save")]; self.navigationItem.rightBarButtonItem = saveItem; } else { self.navigationItem.rightBarButtonItem = nil; @@ -97,14 +97,14 @@ NS_ASSUME_NONNULL_BEGIN if (sound == self.currentSound) { item = [OWSTableItem checkmarkItemWithText:soundLabelText - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, [OWSSounds displayNameForSound:sound]) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, [OWSSounds displayNameForSound:sound]) actionBlock:^{ [weakSelf soundWasSelected:sound]; }]; } else { item = [OWSTableItem actionItemWithText:soundLabelText - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, [OWSSounds displayNameForSound:sound]) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, [OWSSounds displayNameForSound:sound]) actionBlock:^{ [weakSelf soundWasSelected:sound]; }]; diff --git a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m index 4cfae0f2a..0004f12f3 100644 --- a/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/PrivacySettingsTableViewController.m @@ -425,7 +425,7 @@ static NSString *const kSealedSenderInfoURL = @"https://signal.org/blog/sealed-s [UIAlertAction actionWithTitle: NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", @"Confirmation text for button which deletes all message, calling, attachments, etc.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"delete") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"delete") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [self deleteThreadsAndMessages]; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 48792175e..3806974b9 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -750,7 +750,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { style:UIBarButtonItemStylePlain target:self action:@selector(settingsButtonPressed:) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"settings")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"settings")]; } settingsButton.accessibilityLabel = CommonStrings.openSettingsButton; self.navigationItem.leftBarButtonItem = settingsButton; @@ -760,7 +760,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCompose target:self action:@selector(showNewConversationView) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"compose")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"compose")]; } - (void)settingsButtonPressed:(id)sender @@ -1108,7 +1108,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { // TODO: Work with Nancy to confirm that this is accessible via Appium. NSString *cellName = [NSString stringWithFormat:@"conversation-%@", NSUUID.UUID.UUIDString]; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, cellName); + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, cellName); return cell; } @@ -1153,7 +1153,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [stackView autoPinEdgeToSuperviewMargin:ALEdgeTop]; [stackView autoPinEdgeToSuperviewMargin:ALEdgeBottom]; - cell.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"archived_conversations"); + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"archived_conversations"); return cell; } diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m index ee9eb2228..e41d5530e 100644 --- a/Signal/src/ViewControllers/NewContactThreadViewController.m +++ b/Signal/src/ViewControllers/NewContactThreadViewController.m @@ -104,14 +104,17 @@ NS_ASSUME_NONNULL_BEGIN self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self - action:@selector(dismissPressed)]; + action:@selector(dismissPressed) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"stop")]; // TODO: We should use separate RTL and LTR flavors of this asset. UIImage *newGroupImage = [UIImage imageNamed:@"btnGroup--white"]; OWSAssertDebug(newGroupImage); - UIBarButtonItem *newGroupButton = [[UIBarButtonItem alloc] initWithImage:newGroupImage - style:UIBarButtonItemStylePlain - target:self - action:@selector(showNewGroupView:)]; + UIBarButtonItem *newGroupButton = + [[UIBarButtonItem alloc] initWithImage:newGroupImage + style:UIBarButtonItemStylePlain + target:self + action:@selector(showNewGroupView:) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"new_group")]; newGroupButton.accessibilityLabel = NSLocalizedString(@"CREATE_NEW_GROUP", @"Accessibility label for the create group new group button"); self.navigationItem.rightBarButtonItem = newGroupButton; @@ -122,6 +125,7 @@ NS_ASSUME_NONNULL_BEGIN searchBar.delegate = self; searchBar.placeholder = NSLocalizedString(@"SEARCH_BYNAMEORNUMBER_PLACEHOLDER_TEXT", @""); [searchBar sizeToFit]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, searchBar); _tableViewController = [OWSTableViewController new]; _tableViewController.delegate = self; @@ -149,6 +153,7 @@ NS_ASSUME_NONNULL_BEGIN [self.noSignalContactsView autoPinWidthToSuperview]; [self.noSignalContactsView autoPinEdgeToSuperviewEdge:ALEdgeTop]; [self.noSignalContactsView autoPinToBottomLayoutGuideOfViewController:self withInset:0]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _noSignalContactsView); UIRefreshControl *pullToRefreshView = [UIRefreshControl new]; pullToRefreshView.tintColor = [UIColor grayColor]; @@ -156,6 +161,7 @@ NS_ASSUME_NONNULL_BEGIN action:@selector(pullToRefreshPerformed:) forControlEvents:UIControlEventValueChanged]; [self.tableViewController.tableView insertSubview:pullToRefreshView atIndex:0]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, pullToRefreshView); [self updateTableContents]; @@ -254,6 +260,7 @@ NS_ASSUME_NONNULL_BEGIN action:@selector(presentInviteFlow) forControlEvents:UIControlEventTouchUpInside]; lastSubview = inviteContactsButton; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, inviteContactsButton); UIButton *searchByPhoneNumberButton = [UIButton buttonWithType:UIButtonTypeCustom]; [searchByPhoneNumberButton setTitle:NSLocalizedString(@"NO_CONTACTS_SEARCH_BY_PHONE_NUMBER", @@ -268,6 +275,7 @@ NS_ASSUME_NONNULL_BEGIN action:@selector(hideBackgroundView) forControlEvents:UIControlEventTouchUpInside]; lastSubview = searchByPhoneNumberButton; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, searchByPhoneNumberButton); [lastSubview autoPinEdgeToSuperviewMargin:ALEdgeBottom]; @@ -320,7 +328,7 @@ NS_ASSUME_NONNULL_BEGIN if (self.contactsManager.isSystemContactsDenied) { OWSTableItem *contactReminderItem = [OWSTableItem itemWithCustomCellBlock:^{ - UITableViewCell *newCell = [OWSTableItem newCell]; + UITableViewCell *cell = [OWSTableItem newCell]; ReminderView *reminderView = [ReminderView nagWithText:NSLocalizedString(@"COMPOSE_SCREEN_MISSING_CONTACTS_PERMISSION", @@ -328,10 +336,13 @@ NS_ASSUME_NONNULL_BEGIN tapAction:^{ [[UIApplication sharedApplication] openSystemSettings]; }]; - [newCell.contentView addSubview:reminderView]; + [cell.contentView addSubview:reminderView]; [reminderView autoPinEdgesToSuperviewEdges]; - return newCell; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewContactThreadViewController, @"missing_contacts"); + + return cell; } customRowHeight:UITableViewAutomaticDimension actionBlock:nil]; @@ -347,6 +358,8 @@ NS_ASSUME_NONNULL_BEGIN [staticSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER", @"A label the cell that lets you add a new member to a group.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + NewContactThreadViewController, @"find_by_phone") customRowHeight:UITableViewAutomaticDimension actionBlock:^{ NewNonContactConversationViewController *viewController = @@ -360,12 +373,14 @@ NS_ASSUME_NONNULL_BEGIN // Invite Contacts [staticSection addItem:[OWSTableItem - disclosureItemWithText:NSLocalizedString(@"INVITE_FRIENDS_CONTACT_TABLE_BUTTON", - @"Label for the cell that presents the 'invite contacts' workflow.") - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - [weakSelf presentInviteFlow]; - }]]; + disclosureItemWithText:NSLocalizedString(@"INVITE_FRIENDS_CONTACT_TABLE_BUTTON", + @"Label for the cell that presents the 'invite contacts' workflow.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + NewContactThreadViewController, @"invite_contacts") + customRowHeight:UITableViewAutomaticDimension + actionBlock:^{ + [weakSelf presentInviteFlow]; + }]]; } [contents addSection:staticSection]; @@ -450,6 +465,9 @@ NS_ASSUME_NONNULL_BEGIN // hide separator for loading cell. The loading cell doesn't really feel like a cell loadingCell.backgroundView = [UIView new]; + loadingCell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewContactThreadViewController, @"loading"); + OWSTableItem *loadingItem = [OWSTableItem itemWithCustomCell:loadingCell customRowHeight:40 actionBlock:nil]; [contactsSection addItem:loadingItem]; @@ -495,6 +513,11 @@ NS_ASSUME_NONNULL_BEGIN [cell configureWithRecipientId:signalAccount.recipientId]; + NSString *cellName = [NSString + stringWithFormat:@"signal_contact.%@", signalAccount.recipientId]; + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( + NewContactThreadViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -541,6 +564,11 @@ NS_ASSUME_NONNULL_BEGIN @"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked."); } [cell configureWithRecipientId:phoneNumber]; + + NSString *cellName = [NSString stringWithFormat:@"non_signal_contact.%@", phoneNumber]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewContactThreadViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -552,11 +580,13 @@ NS_ASSUME_NONNULL_BEGIN @"Text for button to send a Signal invite via SMS. %@ is " @"placeholder for the recipient's phone number."), phoneNumber]; - [phoneNumbersSection addItem:[OWSTableItem disclosureItemWithText:text - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - [weakSelf sendTextToPhoneNumber:phoneNumber]; - }]]; + [phoneNumbersSection + addItem:[OWSTableItem disclosureItemWithText:text + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"invite_via_sms") + customRowHeight:UITableViewAutomaticDimension + actionBlock:^{ + [weakSelf sendTextToPhoneNumber:phoneNumber]; + }]]; } } if (searchPhoneNumbers.count > 0) { @@ -590,6 +620,11 @@ NS_ASSUME_NONNULL_BEGIN [cell configureWithRecipientId:signalAccount.recipientId]; + NSString *cellName = + [NSString stringWithFormat:@"signal_contact.%@", signalAccount.recipientId]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewContactThreadViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -613,6 +648,13 @@ NS_ASSUME_NONNULL_BEGIN itemWithCustomCellBlock:^{ GroupTableViewCell *cell = [GroupTableViewCell new]; [cell configureWithThread:thread]; + + // TODO: We need to verify that UUIDs will work for Nancy. + NSString *cellName = + [NSString stringWithFormat:@"group.%@", NSUUID.UUID.UUIDString]; + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( + NewContactThreadViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -644,7 +686,9 @@ NS_ASSUME_NONNULL_BEGIN @"Text for button to send a Signal invite via SMS. %@ is " @"placeholder for the recipient's phone number."), displayName]; + NSString *accessibilityIdentifier = [NSString stringWithFormat:@"invite_via_sms.%@", phoneNumber.toE164]; [inviteeSection addItem:[OWSTableItem disclosureItemWithText:text + accessibilityIdentifier:accessibilityIdentifier customRowHeight:UITableViewAutomaticDimension actionBlock:^{ [weakSelf sendTextToPhoneNumber:phoneNumber.toE164]; @@ -738,7 +782,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)sendTextToPhoneNumber:(NSString *)phoneNumber { - OWSInviteFlow *inviteFlow = [[OWSInviteFlow alloc] initWithPresentingViewController:self]; OWSAssertDebug([phoneNumber length] > 0); @@ -753,16 +796,18 @@ NS_ASSUME_NONNULL_BEGIN preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *okAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"OK", @"") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self.searchBar resignFirstResponder]; - if ([MFMessageComposeViewController canSendText]) { - [inviteFlow sendSMSToPhoneNumbers:@[ phoneNumber ]]; - } else { - [OWSAlerts showErrorAlertWithMessage:NSLocalizedString(@"UNSUPPORTED_FEATURE_ERROR", @"")]; - } - }]; + actionWithTitle:NSLocalizedString(@"OK", @"") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"ok") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [self.searchBar resignFirstResponder]; + if ([MFMessageComposeViewController canSendText]) { + [inviteFlow sendSMSToPhoneNumbers:@[ phoneNumber ]]; + } else { + [OWSAlerts + showErrorAlertWithMessage:NSLocalizedString(@"UNSUPPORTED_FEATURE_ERROR", @"")]; + } + }]; [alert addAction:[OWSAlerts cancelAction]]; [alert addAction:okAction]; diff --git a/Signal/src/ViewControllers/OWS2FASettingsViewController.m b/Signal/src/ViewControllers/OWS2FASettingsViewController.m index af284f2ec..fae3c0e25 100644 --- a/Signal/src/ViewControllers/OWS2FASettingsViewController.m +++ b/Signal/src/ViewControllers/OWS2FASettingsViewController.m @@ -224,19 +224,19 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem disclosureItemWithText: NSLocalizedString(@"ENABLE_2FA_VIEW_DISABLE_2FA", @"Label for the 'enable two-factor auth' item in the settings view") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"enable_2fa") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"enable_2fa") actionBlock:^{ [weakSelf tryToDisable2FA]; }]]; } else { - [section - addItem:[OWSTableItem disclosureItemWithText: - NSLocalizedString(@"ENABLE_2FA_VIEW_ENABLE_2FA", - @"Label for the 'enable two-factor auth' item in the settings view") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"disable_2fa") - actionBlock:^{ - [weakSelf showEnable2FAWorkUI]; - }]]; + [section addItem:[OWSTableItem + disclosureItemWithText: + NSLocalizedString(@"ENABLE_2FA_VIEW_ENABLE_2FA", + @"Label for the 'enable two-factor auth' item in the settings view") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"disable_2fa") + actionBlock:^{ + [weakSelf showEnable2FAWorkUI]; + }]]; } [contents addSection:section]; self.tableViewController.contents = contents; @@ -269,7 +269,7 @@ NS_ASSUME_NONNULL_BEGIN style:UIBarButtonItemStylePlain target:self action:@selector(backButtonWasPressed) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"back")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"back")]; self.navigationItem.backBarButtonItem = backButton; if (self.shouldHaveNextButton) { @@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN style:UIBarButtonItemStylePlain target:self action:@selector(nextButtonWasPressed) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"next")]; + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"next")]; self.navigationItem.rightBarButtonItem = nextButton; } else { self.navigationItem.rightBarButtonItem = nil; diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index e562fcdce..a7599556a 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -112,7 +112,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat nameRow.userInteractionEnabled = YES; [nameRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(nameRowTapped:)]]; - nameRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"nameRow"); + nameRow.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"nameRow"); [rows addObject:nameRow]; UILabel *nameLabel = [UILabel new]; @@ -152,7 +152,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat avatarRow.userInteractionEnabled = YES; [avatarRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarRowTapped:)]]; - avatarRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"avatarRow"); + avatarRow.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"avatarRow"); [rows addObject:avatarRow]; UILabel *avatarLabel = [UILabel new]; @@ -165,7 +165,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat [avatarLabel autoVCenterInSuperview]; self.avatarView = [AvatarImageView new]; - self.avatarView.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"avatarView"); + self.avatarView.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"avatarView"); UIImage *cameraImage = [UIImage imageNamed:@"settings-avatar-camera"]; self.cameraImageView = [[UIImageView alloc] initWithImage:cameraImage]; @@ -189,7 +189,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat infoRow.userInteractionEnabled = YES; [infoRow addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(infoRowTapped:)]]; - infoRow.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"infoRow"); + infoRow.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"infoRow"); [rows addObject:infoRow]; UILabel *infoLabel = [UILabel new]; @@ -308,7 +308,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat UIAlertAction *discardAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", @"The label for the 'discard' button in alerts and action sheets.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"discard") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"discard") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [weakSelf profileCompletedOrSkipped]; diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m index 00329126d..c2077534c 100644 --- a/Signal/src/util/Pastelog.m +++ b/Signal/src/util/Pastelog.m @@ -323,7 +323,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_EMAIL", @"Label for the 'email debug log' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_email") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_email") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [Pastelog.sharedManager submitEmail:url]; @@ -332,7 +332,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error }]]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_COPY_LINK", @"Label for the 'copy link' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"copy_link") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"copy_link") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { UIPasteboard *pb = [UIPasteboard generalPasteboard]; @@ -344,7 +344,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF", @"Label for the 'send to self' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_to_self") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_to_self") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [Pastelog.sharedManager sendToSelf:url]; @@ -352,7 +352,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[UIAlertAction actionWithTitle: NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SEND_TO_LAST_THREAD", @"Label for the 'send to last thread' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"send_to_last_thread") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_to_last_thread") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [Pastelog.sharedManager sendToMostRecentThread:url]; @@ -362,14 +362,14 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_BUG_REPORT", @"Label for the 'Open a Bug Report' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"submit_bug_report") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"submit_bug_report") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [Pastelog.sharedManager prepareRedirection:url completion:completion]; }]]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"DEBUG_LOG_ALERT_OPTION_SHARE", @"Label for the 'Share' option of the debug log alert.") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"share") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"share") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [AttachmentSharing showShareUIForText:url.absoluteString @@ -515,7 +515,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error message:message preferredStyle:UIAlertControllerStyleAlert]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"ok") style:UIAlertActionStyleDefault handler:nil]]; UIViewController *presentingViewController = UIApplication.sharedApplication.frontmostViewControllerIgnoringAlerts; @@ -573,7 +573,7 @@ typedef void (^DebugLogUploadFailure)(DebugLogUploader *uploader, NSError *error [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"ok") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [UIApplication.sharedApplication diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.h b/SignalMessaging/ViewControllers/OWSTableViewController.h index 53942225c..0e22fd5bb 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.h +++ b/SignalMessaging/ViewControllers/OWSTableViewController.h @@ -89,6 +89,11 @@ typedef BOOL (^OWSTableSwitchBlock)(void); customRowHeight:(CGFloat)customRowHeight actionBlock:(nullable OWSTableActionBlock)actionBlock; ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + customRowHeight:(CGFloat)customRowHeight + actionBlock:(nullable OWSTableActionBlock)actionBlock; + + (OWSTableItem *)checkmarkItemWithText:(NSString *)text actionBlock:(nullable OWSTableActionBlock)actionBlock; + (OWSTableItem *)checkmarkItemWithText:(NSString *)text diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m index 921d7c563..5a4303c9a 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController.m +++ b/SignalMessaging/ViewControllers/OWSTableViewController.m @@ -225,10 +225,22 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f; + (OWSTableItem *)disclosureItemWithText:(NSString *)text customRowHeight:(CGFloat)customRowHeight actionBlock:(nullable OWSTableActionBlock)actionBlock +{ + return [self disclosureItemWithText:text + accessibilityIdentifier:nil + customRowHeight:customRowHeight + actionBlock:actionBlock]; +} + ++ (OWSTableItem *)disclosureItemWithText:(NSString *)text + accessibilityIdentifier:(nullable NSString *)accessibilityIdentifier + customRowHeight:(CGFloat)customRowHeight + actionBlock:(nullable OWSTableActionBlock)actionBlock { OWSAssertDebug(customRowHeight > 0 || customRowHeight == UITableViewAutomaticDimension); - OWSTableItem *item = [self disclosureItemWithText:text actionBlock:actionBlock]; + OWSTableItem *item = + [self disclosureItemWithText:text accessibilityIdentifier:accessibilityIdentifier actionBlock:actionBlock]; item.customRowHeight = @(customRowHeight); return item; } diff --git a/SignalMessaging/utils/BlockListUIUtils.m b/SignalMessaging/utils/BlockListUIUtils.m index bb114cbab..8541fac45 100644 --- a/SignalMessaging/utils/BlockListUIUtils.m +++ b/SignalMessaging/utils/BlockListUIUtils.m @@ -118,7 +118,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertAction *blockAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"block") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [self blockPhoneNumbers:phoneNumbers @@ -134,7 +134,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { @@ -169,7 +169,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertAction *blockAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"block") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"block") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [self blockGroup:groupThread @@ -185,7 +185,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [actionSheet addAction:blockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { @@ -336,7 +336,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertAction *unblockAction = [UIAlertAction actionWithTitle:NSLocalizedString( @"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unblock") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils unblockPhoneNumbers:phoneNumbers @@ -352,7 +352,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { @@ -409,7 +409,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); UIAlertAction *unblockAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"unblock") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unblock") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils unblockGroup:groupModel @@ -425,7 +425,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [actionSheet addAction:unblockAction]; UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.cancelButton - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"dismiss") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dismiss") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) { if (completionBlock) { @@ -474,7 +474,7 @@ typedef void (^BlockAlertCompletionBlock)(UIAlertAction *action); [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) - accessibilityIdentifier:SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, @"ok") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"ok") style:UIAlertActionStyleDefault handler:completionBlock]; [alert addAction:okAction]; diff --git a/SignalMessaging/utils/UIUtil.h b/SignalMessaging/utils/UIUtil.h index 715c4be62..f5f17972e 100644 --- a/SignalMessaging/utils/UIUtil.h +++ b/SignalMessaging/utils/UIUtil.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "UIColor+OWS.h" @@ -7,10 +7,10 @@ #import #import -#define SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ -([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) +#define ACCESSIBILITY_IDENTIFIER_WITH_NAME(_root_view, _variable_name) \ + ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name]) #define SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, _variable_name) \ -_variable_name.accessibilityIdentifier = SUBVIEW_ACCESSIBILITY_IDENTIFIER(_root_view, (@ #_variable_name)) + _variable_name.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(_root_view, (@ #_variable_name)) typedef void (^completionBlock)(void); From 50888b20d2086325cf274aa31a8b3bc8d70c6735 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 13:20:04 -0400 Subject: [PATCH 375/493] Add accessibilityIdentifiers to 'new group thread' view. --- .../ViewControllers/NewGroupViewController.m | 53 ++++++++++++------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 90de0b8a5..fbe7b3926 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -106,11 +106,13 @@ NS_ASSUME_NONNULL_BEGIN self.view.backgroundColor = Theme.backgroundColor; - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] - initWithTitle:NSLocalizedString(@"NEW_GROUP_CREATE_BUTTON", @"The title for the 'create group' button.") - style:UIBarButtonItemStylePlain - target:self - action:@selector(createGroup)]; + self.navigationItem.rightBarButtonItem = + [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"NEW_GROUP_CREATE_BUTTON", + @"The title for the 'create group' button.") + style:UIBarButtonItemStylePlain + target:self + action:@selector(createGroup) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"create")]; self.navigationItem.rightBarButtonItem.imageInsets = UIEdgeInsetsMake(0, -10, 0, 10); self.navigationItem.rightBarButtonItem.accessibilityLabel = NSLocalizedString(@"FINISH_GROUP_CREATION_LABEL", @"Accessibility label for finishing new group"); @@ -158,6 +160,11 @@ NS_ASSUME_NONNULL_BEGIN [avatarView autoSetDimension:ALDimensionHeight toSize:kLargeAvatarSize]; [self updateAvatarView]; + [avatarView + addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarTouched:)]]; + avatarView.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, avatarView); + UITextField *groupNameTextField = [OWSTextField new]; _groupNameTextField = groupNameTextField; groupNameTextField.textColor = Theme.primaryColor; @@ -176,10 +183,7 @@ NS_ASSUME_NONNULL_BEGIN [groupNameTextField autoVCenterInSuperview]; [groupNameTextField autoPinTrailingToSuperviewMargin]; [groupNameTextField autoPinLeadingToTrailingEdgeOfView:avatarView offset:16.f]; - - [avatarView - addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarTouched:)]]; - avatarView.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, groupNameTextField); return firstSectionHeader; } @@ -245,6 +249,11 @@ NS_ASSUME_NONNULL_BEGIN @"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked."); } [cell configureWithRecipientId:recipientId]; + + NSString *cellName = [NSString stringWithFormat:@"non_signal_contact.%@", recipientId]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewGroupViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -333,6 +342,12 @@ NS_ASSUME_NONNULL_BEGIN } [cell configureWithRecipientId:signalAccount.recipientId]; + + NSString *cellName = + [NSString stringWithFormat:@"signal_contact.%@", signalAccount.recipientId]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewGroupViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -392,15 +407,16 @@ NS_ASSUME_NONNULL_BEGIN { __weak NewGroupViewController *weakSelf = self; return [OWSTableItem - disclosureItemWithText:NSLocalizedString(@"NEW_GROUP_ADD_NON_CONTACT", - @"A label for the cell that lets you add a new non-contact member to a group.") - customRowHeight:UITableViewAutomaticDimension - actionBlock:^{ - AddToGroupViewController *viewController = [AddToGroupViewController new]; - viewController.addToGroupDelegate = weakSelf; - viewController.hideContacts = YES; - [weakSelf.navigationController pushViewController:viewController animated:YES]; - }]; + disclosureItemWithText:NSLocalizedString(@"NEW_GROUP_ADD_NON_CONTACT", + @"A label for the cell that lets you add a new non-contact member to a group.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(NewGroupViewController, @"add_non_contact") + customRowHeight:UITableViewAutomaticDimension + actionBlock:^{ + AddToGroupViewController *viewController = [AddToGroupViewController new]; + viewController.addToGroupDelegate = weakSelf; + viewController.hideContacts = YES; + [weakSelf.navigationController pushViewController:viewController animated:YES]; + }]; } - (void)removeRecipientId:(NSString *)recipientId @@ -570,6 +586,7 @@ NS_ASSUME_NONNULL_BEGIN [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DISCARD_BUTTON", @"The label for the 'discard' button in alerts and action sheets.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"discard") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [self.navigationController popViewControllerAnimated:YES]; From d253c5aa918e7f5595e1ddbcc9b8451b97f0768d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 13:38:02 -0400 Subject: [PATCH 376/493] Add accessibilityIdentifiers to conversation view. --- .../ConversationInputToolbar.m | 11 ++ .../ConversationViewController.m | 156 +++++++++++------- 2 files changed, 105 insertions(+), 62 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index b351b4d54..fd34c1cd4 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -136,6 +136,7 @@ const CGFloat kMaxTextViewHeight = 98; self.inputTextView.backgroundColor = Theme.toolbarBackgroundColor; [self.inputTextView setContentHuggingLow]; [self.inputTextView setCompressionResistanceLow]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _inputTextView); _textViewHeightConstraint = [self.inputTextView autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight]; @@ -152,6 +153,7 @@ const CGFloat kMaxTextViewHeight = 98; forState:UIControlStateNormal]; self.attachmentButton.tintColor = Theme.navbarIconColor; [self.attachmentButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _attachmentButton); _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; [self.sendButton setTitle:MessageStrings.sendButton forState:UIControlStateNormal]; @@ -161,6 +163,7 @@ const CGFloat kMaxTextViewHeight = 98; self.sendButton.contentEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 4); [self.sendButton autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight]; [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _sendButton); UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"]; OWSAssertDebug(voiceMemoIcon); @@ -169,6 +172,7 @@ const CGFloat kMaxTextViewHeight = 98; forState:UIControlStateNormal]; self.voiceMemoButton.imageView.tintColor = Theme.navbarIconColor; [self.voiceMemoButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoButton); // We want to be permissive about the voice message gesture, so we hang // the long press GR on the button's wrapper, not the button itself. @@ -184,11 +188,13 @@ const CGFloat kMaxTextViewHeight = 98; self.quotedReplyWrapper.hidden = YES; [self.quotedReplyWrapper setContentHuggingHorizontalLow]; [self.quotedReplyWrapper setCompressionResistanceHorizontalLow]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _quotedReplyWrapper); _linkPreviewWrapper = [UIView containerView]; self.linkPreviewWrapper.hidden = YES; [self.linkPreviewWrapper setContentHuggingHorizontalLow]; [self.linkPreviewWrapper setCompressionResistanceHorizontalLow]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _linkPreviewWrapper); // V Stack UIStackView *vStack = [[UIStackView alloc] @@ -346,6 +352,7 @@ const CGFloat kMaxTextViewHeight = 98; self.quotedReplyWrapper.layoutMargins = UIEdgeInsetsZero; [self.quotedReplyWrapper addSubview:quotedMessagePreview]; [quotedMessagePreview ows_autoPinToSuperviewMargins]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, quotedMessagePreview); self.linkPreviewView.hasAsymmetricalRounding = !self.quotedReply; } @@ -563,6 +570,7 @@ const CGFloat kMaxTextViewHeight = 98; self.voiceMemoUI.backgroundColor = Theme.toolbarBackgroundColor; [self addSubview:self.voiceMemoUI]; self.voiceMemoUI.frame = CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height); + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoUI); self.voiceMemoContentView = [UIView new]; [self.voiceMemoUI addSubview:self.voiceMemoContentView]; @@ -572,6 +580,7 @@ const CGFloat kMaxTextViewHeight = 98; self.recordingLabel.textColor = [UIColor ows_destructiveRedColor]; self.recordingLabel.font = [UIFont ows_mediumFontWithSize:14.f]; [self.voiceMemoContentView addSubview:self.recordingLabel]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _recordingLabel); VoiceMemoLockView *voiceMemoLockView = [VoiceMemoLockView new]; self.voiceMemoLockView = voiceMemoLockView; @@ -773,6 +782,7 @@ const CGFloat kMaxTextViewHeight = 98; [sendVoiceMemoButton autoVCenterInSuperview]; [sendVoiceMemoButton setCompressionResistanceHigh]; [sendVoiceMemoButton setContentHuggingHigh]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, sendVoiceMemoButton); UIButton *cancelButton = [[OWSButton alloc] initWithBlock:^{ [weakSelf.inputToolbarDelegate voiceMemoGestureDidCancel]; @@ -781,6 +791,7 @@ const CGFloat kMaxTextViewHeight = 98; [cancelButton setTitleColor:UIColor.ows_destructiveRedColor forState:UIControlStateNormal]; cancelButton.alpha = 0; cancelButton.titleLabel.textAlignment = NSTextAlignmentCenter; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, cancelButton); [self.voiceMemoContentView addSubview:cancelButton]; OWSAssert(self.recordingLabel != nil); diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 25d0806d4..98d94289d 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -619,10 +619,12 @@ typedef enum : NSUInteger { [self.collectionView autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; [self.collectionView applyScrollViewInsetsFix]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _collectionView); _inputToolbar = [[ConversationInputToolbar alloc] initWithConversationStyle:self.conversationStyle]; self.inputToolbar.inputToolbarDelegate = self; self.inputToolbar.inputTextViewDelegate = self; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _inputToolbar); self.loadMoreHeader = [UILabel new]; self.loadMoreHeader.text = NSLocalizedString(@"CONVERSATION_VIEW_LOADING_MORE_MESSAGES", @@ -634,6 +636,7 @@ typedef enum : NSUInteger { [self.loadMoreHeader autoPinWidthToWidthOfView:self.view]; [self.loadMoreHeader autoPinEdgeToSuperviewEdge:ALEdgeTop]; [self.loadMoreHeader autoSetDimension:ALDimensionHeight toSize:kLoadMoreHeaderHeight]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _loadMoreHeader); [self updateShowLoadMoreHeader]; } @@ -1006,6 +1009,7 @@ typedef enum : NSUInteger { [closeButton autoPinLeadingToTrailingEdgeOfView:label offset:kBannerHSpacing]; [bannerView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:tapSelector]]; + bannerView.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"banner_close"); [self.view addSubview:bannerView]; [bannerView autoPinToTopLayoutGuideOfViewController:self withInset:10]; @@ -1083,11 +1087,13 @@ typedef enum : NSUInteger { }]; [actionSheet addAction:verifyAction]; - UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:CommonStrings.dismissButton - style:UIAlertActionStyleCancel - handler:^(UIAlertAction *action) { - [weakSelf resetVerificationStateToDefault]; - }]; + UIAlertAction *dismissAction = + [UIAlertAction actionWithTitle:CommonStrings.dismissButton + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dismiss") + style:UIAlertActionStyleCancel + handler:^(UIAlertAction *action) { + [weakSelf resetVerificationStateToDefault]; + }]; [actionSheet addAction:dismissAction]; [self dismissKeyBoard]; @@ -1358,6 +1364,7 @@ typedef enum : NSUInteger { ConversationHeaderView *headerView = [[ConversationHeaderView alloc] initWithThread:self.thread contactsManager:self.contactsManager]; self.headerView = headerView; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, headerView); headerView.delegate = self; self.navigationItem.titleView = headerView; @@ -1483,7 +1490,9 @@ typedef enum : NSUInteger { 0, round(image.size.width + imageEdgeInsets.left + imageEdgeInsets.right), round(image.size.height + imageEdgeInsets.top + imageEdgeInsets.bottom)); - [barButtons addObject:[[UIBarButtonItem alloc] initWithCustomView:callButton]]; + [barButtons + addObject:[[UIBarButtonItem alloc] initWithCustomView:callButton + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"call")]]; } if (self.disappearingMessagesConfiguration.isEnabled) { @@ -1502,7 +1511,9 @@ typedef enum : NSUInteger { timerView.frame = CGRectMake(0, 0, 36, 44); } - [barButtons addObject:[[UIBarButtonItem alloc] initWithCustomView:timerView]]; + [barButtons + addObject:[[UIBarButtonItem alloc] initWithCustomView:timerView + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"timer")]]; } self.navigationItem.rightBarButtonItems = [barButtons copy]; @@ -1804,14 +1815,15 @@ typedef enum : NSUInteger { [actionSheet addAction:deleteMessageAction]; UIAlertAction *resendMessageAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self.editingDatabaseConnection - asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { - [self.messageSenderJobQueue addMessage:message transaction:transaction]; + actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_again") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [self.editingDatabaseConnection + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { + [self.messageSenderJobQueue addMessage:message transaction:transaction]; + }]; }]; - }]; [actionSheet addAction:resendMessageAction]; @@ -1851,20 +1863,21 @@ typedef enum : NSUInteger { [alert addAction:[OWSAlerts cancelAction]]; UIAlertAction *resetSessionAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"FINGERPRINT_SHRED_KEYMATERIAL_BUTTON", @"") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - if (![self.thread isKindOfClass:[TSContactThread class]]) { - // Corrupt Message errors only appear in contact threads. - OWSLogError(@"Unexpected request to reset session in group thread. Refusing"); - return; - } - TSContactThread *contactThread = (TSContactThread *)self.thread; - [self.editingDatabaseConnection - asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { - [self.sessionResetJobQueue addContactThread:contactThread transaction:transaction]; + actionWithTitle:NSLocalizedString(@"FINGERPRINT_SHRED_KEYMATERIAL_BUTTON", @"") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"reset_session") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + if (![self.thread isKindOfClass:[TSContactThread class]]) { + // Corrupt Message errors only appear in contact threads. + OWSLogError(@"Unexpected request to reset session in group thread. Refusing"); + return; + } + TSContactThread *contactThread = (TSContactThread *)self.thread; + [self.editingDatabaseConnection + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { + [self.sessionResetJobQueue addContactThread:contactThread transaction:transaction]; + }]; }]; - }]; [alert addAction:resetSessionAction]; [self dismissKeyBoard]; @@ -1885,6 +1898,7 @@ typedef enum : NSUInteger { UIAlertAction *showSafteyNumberAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"SHOW_SAFETY_NUMBER_ACTION", @"Action sheet item") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"show_safety_number") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { OWSLogInfo(@"Remote Key Changed actions: Show fingerprint display"); @@ -1894,13 +1908,14 @@ typedef enum : NSUInteger { UIAlertAction *acceptSafetyNumberAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ACCEPT_NEW_IDENTITY_ACTION", @"Action sheet item") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"accept_safety_number") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { OWSLogInfo(@"Remote Key Changed actions: Accepted new identity key"); - // DEPRECATED: we're no longer creating these incoming SN error's per message, - // but there will be some legacy ones in the wild, behind which await - // as-of-yet-undecrypted messages + // DEPRECATED: we're no longer creating these incoming SN error's per message, + // but there will be some legacy ones in the wild, behind which await + // as-of-yet-undecrypted messages #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" if ([errorMessage isKindOfClass:[TSInvalidIdentityKeyReceivingErrorMessage class]]) { @@ -1936,6 +1951,7 @@ typedef enum : NSUInteger { __weak ConversationViewController *weakSelf = self; UIAlertAction *callAction = [UIAlertAction actionWithTitle:[CallStrings callBackAlertCallButton] + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"call_back") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [weakSelf startAudioCall]; @@ -2207,20 +2223,22 @@ typedef enum : NSUInteger { [actionSheet addAction:[OWSAlerts cancelAction]]; - UIAlertAction *blockAction = [UIAlertAction - actionWithTitle:NSLocalizedString( - @"BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION", @"Action sheet that will block an unknown user.") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *action) { - OWSLogInfo(@"Blocking an unknown user."); - [self.blockingManager addBlockedPhoneNumber:interaction.recipientId]; - // Delete the offers. - [self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - contactThread.hasDismissedOffers = YES; - [contactThread saveWithTransaction:transaction]; - [interaction removeWithTransaction:transaction]; - }]; - }]; + UIAlertAction *blockAction = + [UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION", + @"Action sheet that will block an unknown user.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"block_user") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *action) { + OWSLogInfo(@"Blocking an unknown user."); + [self.blockingManager addBlockedPhoneNumber:interaction.recipientId]; + // Delete the offers. + [self.editingDatabaseConnection + readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + contactThread.hasDismissedOffers = YES; + [contactThread saveWithTransaction:transaction]; + [interaction removeWithTransaction:transaction]; + }]; + }]; [actionSheet addAction:blockAction]; [self dismissKeyBoard]; @@ -2566,6 +2584,7 @@ typedef enum : NSUInteger { [self.view addSubview:self.scrollDownButton]; [self.scrollDownButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize]; [self.scrollDownButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _scrollDownButton); // The "scroll down" button layout tracks the content inset of the collection view, // so pin to the edge of the collection view. @@ -2584,6 +2603,7 @@ typedef enum : NSUInteger { [self.scrollUpButton autoPinToTopLayoutGuideOfViewController:self withInset:0]; [self.scrollUpButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; #endif + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _scrollUpButton); [self updateScrollDownButtonLayout]; } @@ -3409,34 +3429,40 @@ typedef enum : NSUInteger { [actionSheet addAction:[OWSAlerts cancelAction]]; - UIAlertAction *takeMediaAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"MEDIA_FROM_CAMERA_BUTTON", @"media picker option to take photo or video") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self takePictureOrVideo]; - }]; + UIAlertAction *takeMediaAction = + [UIAlertAction actionWithTitle:NSLocalizedString( + @"MEDIA_FROM_CAMERA_BUTTON", @"media picker option to take photo or video") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_camera") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [self takePictureOrVideo]; + }]; UIImage *takeMediaImage = [UIImage imageNamed:@"actionsheet_camera_black"]; OWSAssertDebug(takeMediaImage); [takeMediaAction setValue:takeMediaImage forKey:@"image"]; [actionSheet addAction:takeMediaAction]; - UIAlertAction *chooseMediaAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"MEDIA_FROM_LIBRARY_BUTTON", @"media picker option to choose from library") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self chooseFromLibraryAsMedia]; - }]; + UIAlertAction *chooseMediaAction = + [UIAlertAction actionWithTitle:NSLocalizedString( + @"MEDIA_FROM_LIBRARY_BUTTON", @"media picker option to choose from library") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_choose_media") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [self chooseFromLibraryAsMedia]; + }]; UIImage *chooseMediaImage = [UIImage imageNamed:@"actionsheet_camera_roll_black"]; OWSAssertDebug(chooseMediaImage); [chooseMediaAction setValue:chooseMediaImage forKey:@"image"]; [actionSheet addAction:chooseMediaAction]; - UIAlertAction *gifAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"SELECT_GIF_BUTTON", @"Label for 'select GIF to attach' action sheet button") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action) { - [self showGifPicker]; - }]; + UIAlertAction *gifAction = + [UIAlertAction actionWithTitle:NSLocalizedString(@"SELECT_GIF_BUTTON", + @"Label for 'select GIF to attach' action sheet button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_gif") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action) { + [self showGifPicker]; + }]; UIImage *gifImage = [UIImage imageNamed:@"actionsheet_gif_black"]; OWSAssertDebug(gifImage); [gifAction setValue:gifImage forKey:@"image"]; @@ -3445,6 +3471,7 @@ typedef enum : NSUInteger { UIAlertAction *chooseDocumentAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_DOCUMENT_PICKER_BUTTON", @"action sheet button title when choosing attachment type") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_document") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [self showAttachmentDocumentPickerMenu]; @@ -3458,6 +3485,7 @@ typedef enum : NSUInteger { UIAlertAction *chooseContactAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ATTACHMENT_MENU_CONTACT_BUTTON", @"attachment menu option to send contact") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_contact") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [self chooseContactForSending]; @@ -4543,6 +4571,10 @@ typedef enum : NSUInteger { [cell loadForDisplay]; + // TODO: Confirm with nancy if this will work. + NSString *cellName = [NSString stringWithFormat:@"interaction.%@", NSUUID.UUID.UUIDString]; + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, cellName); + return cell; } From f073dd9a523ade4c4abb5a89fde733afbfa13e51 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 15:54:35 -0400 Subject: [PATCH 377/493] Add accessibilityIdentifiers to conversation settings view. --- .../OWSConversationSettingsViewController.m | 191 ++++++++++++------ .../categories/UIViewController+OWS.m | 6 +- 2 files changed, 135 insertions(+), 62 deletions(-) diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index aa3984d4c..1cc654e74 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -214,7 +214,8 @@ const CGFloat kIconViewLength = 24; [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"EDIT_TXT", nil) style:UIBarButtonItemStylePlain target:self - action:@selector(didTapEditButton)]; + action:@selector(didTapEditButton) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"edit")]; } } @@ -272,6 +273,7 @@ const CGFloat kIconViewLength = 24; self.tableView.rowHeight = UITableViewAutomaticDimension; _disappearingMessagesDurationLabel = [UILabel new]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _disappearingMessagesDurationLabel); self.disappearingMessagesDurations = [OWSDisappearingMessagesConfiguration validDurationsSeconds]; @@ -323,21 +325,31 @@ const CGFloat kIconViewLength = 24; if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing && !self.hasExistingContact) { - [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ - return - [weakSelf disclosureCellWithName:NSLocalizedString(@"CONVERSATION_SETTINGS_NEW_CONTACT", - @"Label for 'new contact' button in conversation settings view.") - iconName:@"table_ic_new_contact"]; - } - actionBlock:^{ - [weakSelf presentContactViewController]; - }]]; - [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ - return - [weakSelf disclosureCellWithName:NSLocalizedString(@"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT", - @"Label for 'new contact' button in conversation settings view.") - iconName:@"table_ic_add_to_existing_contact"]; - } + [mainSection + addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + return [weakSelf + disclosureCellWithName: + NSLocalizedString(@"CONVERSATION_SETTINGS_NEW_CONTACT", + @"Label for 'new contact' button in conversation settings view.") + iconName:@"table_ic_new_contact" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"new_contact")]; + } + actionBlock:^{ + [weakSelf presentContactViewController]; + }]]; + [mainSection addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + return [weakSelf + disclosureCellWithName: + NSLocalizedString(@"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT", + @"Label for 'new contact' button in conversation settings view.") + iconName:@"table_ic_add_to_existing_contact" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, + @"add_to_existing_contact")]; + } actionBlock:^{ OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssertDebug(strongSelf); @@ -349,8 +361,11 @@ const CGFloat kIconViewLength = 24; [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ - return [weakSelf disclosureCellWithName:MediaStrings.allMedia - iconName:@"actionsheet_camera_roll_black"]; + return [weakSelf + disclosureCellWithName:MediaStrings.allMedia + iconName:@"actionsheet_camera_roll_black" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"all_media")]; } actionBlock:^{ [weakSelf showMediaGallery]; @@ -362,24 +377,31 @@ const CGFloat kIconViewLength = 24; NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH", @"Table cell label in conversation settings which returns the user to the " @"conversation with 'search mode' activated"); - return - [weakSelf disclosureCellWithName:title iconName:@"conversation_settings_search"]; + return [weakSelf + disclosureCellWithName:title + iconName:@"conversation_settings_search" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"search")]; } actionBlock:^{ [weakSelf tappedConversationSearch]; }]]; if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) { - [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ - return [weakSelf - disclosureCellWithName: - NSLocalizedString(@"VERIFY_PRIVACY", - @"Label for button or row which allows users to verify the safety number of another user.") - iconName:@"table_ic_not_verified"]; - } - actionBlock:^{ - [weakSelf showVerificationView]; - }]]; + [mainSection + addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + return [weakSelf + disclosureCellWithName:NSLocalizedString(@"VERIFY_PRIVACY", + @"Label for button or row which allows users to verify the " + @"safety number of another user.") + iconName:@"table_ic_not_verified" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"safety_numbers")]; + } + actionBlock:^{ + [weakSelf showVerificationView]; + }]]; } if (isNoteToSelf) { @@ -392,15 +414,18 @@ const CGFloat kIconViewLength = 24; OWSCAssertDebug(strongSelf); return [strongSelf - labelCellWithName: - (strongSelf.isGroupThread - ? NSLocalizedString( - @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP", - @"Indicates that user's profile has been shared with a group.") - : NSLocalizedString( - @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER", - @"Indicates that user's profile has been shared with a user.")) - iconName:@"table_ic_share_profile"]; + labelCellWithName: + (strongSelf.isGroupThread + ? NSLocalizedString( + @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP", + @"Indicates that user's profile has been shared with a group.") + : NSLocalizedString( + @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER", + @"Indicates that user's profile has been shared with a user.")) + iconName:@"table_ic_share_profile" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, + @"profile_is_shared")]; } actionBlock:nil]]; } else { @@ -411,13 +436,15 @@ const CGFloat kIconViewLength = 24; OWSCAssertDebug(strongSelf); UITableViewCell *cell = [strongSelf - disclosureCellWithName: - (strongSelf.isGroupThread - ? NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP", - @"Action that shares user profile with a group.") - : NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER", - @"Action that shares user profile with a user.")) - iconName:@"table_ic_share_profile"]; + disclosureCellWithName: + (strongSelf.isGroupThread + ? NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP", + @"Action that shares user profile with a group.") + : NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER", + @"Action that shares user profile with a user.")) + iconName:@"table_ic_share_profile" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"share_profile")]; cell.userInteractionEnabled = !strongSelf.hasLeftGroup; return cell; @@ -476,6 +503,9 @@ const CGFloat kIconViewLength = 24; cell.userInteractionEnabled = !strongSelf.hasLeftGroup; + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"disappearing_messages"); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -524,6 +554,9 @@ const CGFloat kIconViewLength = 24; cell.userInteractionEnabled = !strongSelf.hasLeftGroup; + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"disappearing_messages_duration"); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -541,9 +574,12 @@ const CGFloat kIconViewLength = 24; [OWSConversationColor conversationColorOrDefaultForColorName:colorName].themeColor; NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_CONVERSATION_COLOR", @"Label for table cell which leads to picking a new conversation color"); - return [strongSelf cellWithName:title - iconName:@"ic_color_palette" - disclosureIconColor:currentColor]; + return [strongSelf + cellWithName:title + iconName:@"ic_color_palette" + disclosureIconColor:currentColor + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"conversation_color")]; } actionBlock:^{ [weakSelf showColorPicker]; @@ -561,7 +597,9 @@ const CGFloat kIconViewLength = 24; UITableViewCell *cell = [weakSelf disclosureCellWithName:NSLocalizedString(@"EDIT_GROUP_ACTION", @"table cell label in conversation settings") - iconName:@"table_ic_group_edit"]; + iconName:@"table_ic_group_edit" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"edit_group")]; cell.userInteractionEnabled = !weakSelf.hasLeftGroup; return cell; } @@ -573,7 +611,9 @@ const CGFloat kIconViewLength = 24; UITableViewCell *cell = [weakSelf disclosureCellWithName:NSLocalizedString(@"LIST_GROUP_MEMBERS_ACTION", @"table cell label in conversation settings") - iconName:@"table_ic_group_members"]; + iconName:@"table_ic_group_members" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"group_members")]; cell.userInteractionEnabled = !weakSelf.hasLeftGroup; return cell; } @@ -585,7 +625,9 @@ const CGFloat kIconViewLength = 24; UITableViewCell *cell = [weakSelf disclosureCellWithName:NSLocalizedString(@"LEAVE_GROUP_ACTION", @"table cell label in conversation settings") - iconName:@"table_ic_group_leave"]; + iconName:@"table_ic_group_leave" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"leave_group")]; cell.userInteractionEnabled = !weakSelf.hasLeftGroup; return cell; @@ -638,6 +680,10 @@ const CGFloat kIconViewLength = 24; OWSSound sound = [OWSSounds notificationSoundForThread:strongSelf.thread]; cell.detailTextLabel.text = [OWSSounds displayNameForSound:sound]; + + cell.accessibilityIdentifier = ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"notifications"); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -706,6 +752,10 @@ const CGFloat kIconViewLength = 24; [contentRow autoPinEdgesToSuperviewMargins]; cell.detailTextLabel.text = muteStatus; + + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(OWSConversationSettingsViewController, @"mute"); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -743,8 +793,11 @@ const CGFloat kIconViewLength = 24; cellTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_BLOCK_THIS_USER", @"table cell label in conversation settings"); } - UITableViewCell *cell = - [strongSelf disclosureCellWithName:cellTitle iconName:@"table_ic_block"]; + UITableViewCell *cell = [strongSelf + disclosureCellWithName:cellTitle + iconName:@"table_ic_block" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"block")]; cell.selectionStyle = UITableViewCellSelectionStyleNone; @@ -755,6 +808,7 @@ const CGFloat kIconViewLength = 24; action:@selector(blockConversationSwitchDidChange:) forControlEvents:UIControlEventValueChanged]; cell.accessoryView = blockConversationSwitch; + return cell; } actionBlock:nil]]; @@ -812,17 +866,23 @@ const CGFloat kIconViewLength = 24; return cell; } -- (UITableViewCell *)disclosureCellWithName:(NSString *)name iconName:(NSString *)iconName +- (UITableViewCell *)disclosureCellWithName:(NSString *)name + iconName:(NSString *)iconName + accessibilityIdentifier:(NSString *)accessibilityIdentifier { UITableViewCell *cell = [self cellWithName:name iconName:iconName]; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.accessibilityIdentifier = accessibilityIdentifier; return cell; } -- (UITableViewCell *)labelCellWithName:(NSString *)name iconName:(NSString *)iconName +- (UITableViewCell *)labelCellWithName:(NSString *)name + iconName:(NSString *)iconName + accessibilityIdentifier:(NSString *)accessibilityIdentifier { UITableViewCell *cell = [self cellWithName:name iconName:iconName]; cell.accessoryType = UITableViewCellAccessoryNone; + cell.accessibilityIdentifier = accessibilityIdentifier; return cell; } @@ -916,6 +976,8 @@ const CGFloat kIconViewLength = 24; action:@selector(conversationNameTouched:)]]; mainSectionHeader.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, mainSectionHeader); + return mainSectionHeader; } @@ -1084,11 +1146,12 @@ const CGFloat kIconViewLength = 24; preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *leaveAction = [UIAlertAction - actionWithTitle:NSLocalizedString(@"LEAVE_BUTTON_TITLE", @"Confirmation button within contextual alert") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [self leaveGroup]; - }]; + actionWithTitle:NSLocalizedString(@"LEAVE_BUTTON_TITLE", @"Confirmation button within contextual alert") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"leave_group_confirm") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self leaveGroup]; + }]; [alert addAction:leaveAction]; [alert addAction:[OWSAlerts cancelAction]]; @@ -1228,6 +1291,7 @@ const CGFloat kIconViewLength = 24; if (self.thread.isMuted) { UIAlertAction *action = [UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_UNMUTE_ACTION", @"Label for button to unmute a thread.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unmute") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { [weakSelf setThreadMutedUntilDate:nil]; @@ -1238,6 +1302,7 @@ const CGFloat kIconViewLength = 24; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION", @"Label for button to mute a thread for a minute.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_minute") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; @@ -1255,6 +1320,7 @@ const CGFloat kIconViewLength = 24; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION", @"Label for button to mute a thread for a hour.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_hour") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; @@ -1271,6 +1337,7 @@ const CGFloat kIconViewLength = 24; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION", @"Label for button to mute a thread for a day.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_day") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; @@ -1287,6 +1354,7 @@ const CGFloat kIconViewLength = 24; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION", @"Label for button to mute a thread for a week.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_week") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; @@ -1303,6 +1371,7 @@ const CGFloat kIconViewLength = 24; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_MUTE_ONE_YEAR_ACTION", @"Label for button to mute a thread for a year.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"mute_1_year") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull ignore) { NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; diff --git a/SignalMessaging/categories/UIViewController+OWS.m b/SignalMessaging/categories/UIViewController+OWS.m index 04c1ba1d8..906d8f1c2 100644 --- a/SignalMessaging/categories/UIViewController+OWS.m +++ b/SignalMessaging/categories/UIViewController+OWS.m @@ -4,9 +4,11 @@ #import "Theme.h" #import "UIColor+OWS.h" +#import "UIUtil.h" #import "UIView+OWS.h" #import "UIViewController+OWS.h" #import +#import #import NS_ASSUME_NONNULL_BEGIN @@ -120,7 +122,9 @@ NS_ASSUME_NONNULL_BEGIN action:selector]; } - UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; + UIBarButtonItem *backItem = + [[UIBarButtonItem alloc] initWithCustomView:backButton + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"back")]; backItem.width = buttonFrame.size.width; return backItem; From 3ce3f9faaaf450685e2cdc323ea9c2cfc0bda4bb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 22 Mar 2019 16:13:40 -0400 Subject: [PATCH 378/493] Add accessibilityIdentifiers to conversation settings view. --- .../FingerprintViewController.m | 17 +++++++++---- .../OWSAddToContactViewController.m | 5 +++- .../ShowGroupMembersViewController.m | 25 +++++++++++++++---- .../UpdateGroupViewController.m | 13 +++++++++- Signal/src/util/MainAppContext.m | 1 + SignalMessaging/Views/ContactsViewHelper.m | 1 + SignalMessaging/profiles/OWSProfileManager.m | 1 + 7 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m index c2a9f5f1a..aa4638690 100644 --- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "FingerprintViewController.h" @@ -169,10 +169,13 @@ typedef void (^CustomLayoutBlock)(void); self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self - action:@selector(closeButton)]; - self.shareButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction - target:self - action:@selector(didTapShareButton)]; + action:@selector(closeButton) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"stop")]; + self.shareButton = + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction + target:self + action:@selector(didTapShareButton) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"share")]; self.navigationItem.rightBarButtonItem = self.shareButton; [self createViews]; @@ -190,6 +193,7 @@ typedef void (^CustomLayoutBlock)(void); [self.view addSubview:verifyUnverifyButton]; [verifyUnverifyButton autoPinWidthToSuperview]; [verifyUnverifyButton autoPinToBottomLayoutGuideOfViewController:self withInset:0]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, verifyUnverifyButton); UIView *verifyUnverifyPillbox = [UIView new]; verifyUnverifyPillbox.backgroundColor = [UIColor ows_materialBlueColor]; @@ -217,6 +221,7 @@ typedef void (^CustomLayoutBlock)(void); [self.view addSubview:learnMoreButton]; [learnMoreButton autoPinWidthToSuperview]; [learnMoreButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:verifyUnverifyButton withOffset:0]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, learnMoreButton); UILabel *learnMoreLabel = [UILabel new]; learnMoreLabel.attributedText = [[NSAttributedString alloc] @@ -265,6 +270,7 @@ typedef void (^CustomLayoutBlock)(void); toEdge:ALEdgeTop ofView:instructionsLabel withOffset:-ScaleFromIPhone5To7Plus(8.f, 15.f)]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, fingerprintLabel); // Fingerprint Image CustomLayoutView *fingerprintView = [CustomLayoutView new]; @@ -278,6 +284,7 @@ typedef void (^CustomLayoutBlock)(void); addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(fingerprintViewTapped:)]]; fingerprintView.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, fingerprintView); OWSBezierPathView *fingerprintCircle = [OWSBezierPathView new]; [fingerprintCircle setConfigureShapeLayerBlock:^(CAShapeLayer *layer, CGRect bounds) { diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m index d80dcaab1..842149951 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSAddToContactViewController.h" @@ -166,7 +166,10 @@ NS_ASSUME_NONNULL_BEGIN continue; } + // TODO: Confirm with nancy if this will work. + NSString *cellName = [NSString stringWithFormat:@"contact.%@", NSUUID.UUID.UUIDString]; [section addItem:[OWSTableItem disclosureItemWithText:displayName + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, cellName) actionBlock:^{ [weakSelf presentContactViewControllerForContact:contact]; }]]; diff --git a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m index a3f87b950..4de3f3d24 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/ShowGroupMembersViewController.m @@ -136,6 +136,7 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"GROUP_MEMBERS_RESET_NO_LONGER_VERIFIED", @"Label for the button that clears all verification " @"errors in the 'group members' view.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"no_longer_verified") customRowHeight:UITableViewAutomaticDimension actionBlock:^{ [weakSelf offerResetAllNoLongerVerified]; @@ -196,6 +197,10 @@ NS_ASSUME_NONNULL_BEGIN [cell setAttributedSubtitle:nil]; } + NSString *cellName = [NSString stringWithFormat:@"user.%@", recipientId]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(ShowGroupMembersViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -221,6 +226,7 @@ NS_ASSUME_NONNULL_BEGIN __weak ShowGroupMembersViewController *weakSelf = self; UIAlertAction *verifyAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"ok") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [weakSelf resetAllNoLongerVerified]; @@ -283,11 +289,13 @@ NS_ASSUME_NONNULL_BEGIN ? NSLocalizedString(@"GROUP_MEMBERS_VIEW_CONTACT_INFO", @"Button label for the 'show contact info' button") : NSLocalizedString( @"GROUP_MEMBERS_ADD_CONTACT_INFO", @"Button label to add information to an unknown contact"); - [actionSheet addAction:[UIAlertAction actionWithTitle:contactInfoTitle - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [self showContactInfoViewForRecipientId:recipientId]; - }]]; + [actionSheet + addAction:[UIAlertAction actionWithTitle:contactInfoTitle + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"show_contact_info") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [self showContactInfoViewForRecipientId:recipientId]; + }]]; } BOOL isBlocked; @@ -297,6 +305,7 @@ NS_ASSUME_NONNULL_BEGIN [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unblock") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils @@ -312,6 +321,7 @@ NS_ASSUME_NONNULL_BEGIN [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"block") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils @@ -330,6 +340,7 @@ NS_ASSUME_NONNULL_BEGIN [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_UNBLOCK_BUTTON", @"Button label for the 'unblock' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"unblock") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils @@ -345,6 +356,7 @@ NS_ASSUME_NONNULL_BEGIN [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"BLOCK_LIST_BLOCK_BUTTON", @"Button label for the 'block' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"block") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *_Nonnull action) { [BlockListUIUtils @@ -363,12 +375,14 @@ NS_ASSUME_NONNULL_BEGIN [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_SEND_MESSAGE", @"Button label for the 'send message to group member' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"send_message") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self showConversationViewForRecipientId:recipientId]; }]]; [actionSheet addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"GROUP_MEMBERS_CALL", @"Button label for the 'call group member' button") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"call") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self callMember:recipientId]; @@ -377,6 +391,7 @@ NS_ASSUME_NONNULL_BEGIN addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"VERIFY_PRIVACY", @"Label for button or row which allows users to verify the " @"safety number of another user.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"safety_numbers") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self showSafetyNumberView:recipientId]; diff --git a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m index 40e80dbd7..f2624d178 100644 --- a/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m @@ -143,7 +143,8 @@ NS_ASSUME_NONNULL_BEGIN @"The title for the 'update group' button.") style:UIBarButtonItemStylePlain target:self - action:@selector(updateGroupPressed)] + action:@selector(updateGroupPressed) + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"update")] : nil); } @@ -206,10 +207,12 @@ NS_ASSUME_NONNULL_BEGIN [groupNameTextField autoVCenterInSuperview]; [groupNameTextField autoPinTrailingToSuperviewMargin]; [groupNameTextField autoPinLeadingToTrailingEdgeOfView:avatarView offset:16.f]; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, groupNameTextField); [avatarView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarTouched:)]]; avatarView.userInteractionEnabled = YES; + SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, avatarView); return firstSectionHeader; } @@ -285,6 +288,12 @@ NS_ASSUME_NONNULL_BEGIN } [cell configureWithRecipientId:recipientId]; + + // TODO: Confirm with nancy if this will work. + NSString *cellName = [NSString stringWithFormat:@"member.%@", recipientId]; + cell.accessibilityIdentifier + = ACCESSIBILITY_IDENTIFIER_WITH_NAME(UpdateGroupViewController, cellName); + return cell; } customRowHeight:UITableViewAutomaticDimension @@ -424,6 +433,7 @@ NS_ASSUME_NONNULL_BEGIN preferredStyle:UIAlertControllerStyleAlert]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_SAVE", @"The label for the 'save' button in action sheets.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"save") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { OWSAssertDebug(self.conversationSettingsViewDelegate); @@ -435,6 +445,7 @@ NS_ASSUME_NONNULL_BEGIN }]]; [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"ALERT_DONT_SAVE", @"The label for the 'don't save' button in action sheets.") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"dont_save") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) { [self.navigationController popViewControllerAnimated:YES]; diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index 8631e9291..c808a9160 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -230,6 +230,7 @@ NSString *const ReportedApplicationStateDidChangeNotification = @"ReportedApplic - (nullable UIAlertAction *)openSystemSettingsAction { return [UIAlertAction actionWithTitle:CommonStrings.openSettingsButton + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"system_settings") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [UIApplication.sharedApplication openSystemSettings]; diff --git a/SignalMessaging/Views/ContactsViewHelper.m b/SignalMessaging/Views/ContactsViewHelper.m index e8d958d61..7d5950c65 100644 --- a/SignalMessaging/Views/ContactsViewHelper.m +++ b/SignalMessaging/Views/ContactsViewHelper.m @@ -334,6 +334,7 @@ NS_ASSUME_NONNULL_BEGIN [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"AB_PERMISSION_MISSING_ACTION_NOT_NOW", @"Button text to dismiss missing contacts permission alert") + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"not_now") style:UIAlertActionStyleCancel handler:nil]]; diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m index 0219e8ac9..7eb698855 100644 --- a/SignalMessaging/profiles/OWSProfileManager.m +++ b/SignalMessaging/profiles/OWSProfileManager.m @@ -1473,6 +1473,7 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error); NSString *shareTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE", @"Button to confirm that user wants to share their profile with a user or group."); [alert addAction:[UIAlertAction actionWithTitle:shareTitle + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"share_profile") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self userAddedThreadToProfileWhitelist:thread]; From 62ce0339a5352ca530654c5508c621e4f039eb41 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 21 Mar 2019 16:29:42 -0700 Subject: [PATCH 379/493] Update tags to ignore, introduce scheme for ignoring internal tags --- Scripts/reverse_integration_check.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Scripts/reverse_integration_check.py b/Scripts/reverse_integration_check.py index 7bfb7c35f..4fafa950f 100755 --- a/Scripts/reverse_integration_check.py +++ b/Scripts/reverse_integration_check.py @@ -58,9 +58,30 @@ def main(): '3.0.2', # These tags were from unmerged branches investigating an issue that only reproduced when installed from TF. '2.34.0.10', '2.34.0.11', '2.34.0.12', '2.34.0.13', '2.34.0.15', '2.34.0.16', '2.34.0.17', '2.34.0.18', '2.34.0.19', '2.34.0.20', '2.34.0.6', '2.34.0.7', '2.34.0.8', '2.34.0.9', + '2.37.3.0', + '2.37.4.0', + '2.38.0.2.1', + '2.38.0.3.1', + '2.38.0.4.1' ] tags_of_concern = [tag for tag in tags_of_concern if tag not in tags_to_ignore] + # Interal Builds + # + # If you want to tag a build which is not intended to be reverse + # integrated, include the text "internal" somewhere in the tag name, such as + # + # 1.2.3.4.5-internal + # 1.2.3.4.5-internal-mkirk + # + # NOTE: that if you upload the build to test flight, you still need to give testflight + # a numeric build number - so tag won't match the build number exactly as they do + # with production build tags. That's fine. + # + # To avoid collision with "production" build numbers, use at least a 5 + # digit build number. + tags_of_concern = [tag for tag in tags_of_concern if "internal" not in tag] + if len(tags_of_concern) > 0: logging.debug("Found unmerged tags newer than epoch: %s" % tags_of_concern) raise RuntimeError("💥 Found unmerged tags: %s" % tags_of_concern) From c5a87c4d202fdc300979a3b08949997bf546ade9 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Mar 2019 09:02:12 -0400 Subject: [PATCH 380/493] Add asserts around CDS feedback errors. --- SignalServiceKit/src/Contacts/ContactDiscoveryService.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index cb373c9ed..882aed4be 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -624,6 +624,7 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re [dateFormatter setDateFormat:@"yyy-MM-dd'T'HH:mm:ss.SSSSSS"]; NSDate *timestampDate = [dateFormatter dateFromString:signatureBodyEntity.timestamp]; if (!timestampDate) { + OWSFailDebug(@"Could not parse signature body timestamp: %@", signatureBodyEntity.timestamp); *error = ContactDiscoveryServiceErrorMakeWithReason( ContactDiscoveryServiceErrorAssertionError, @"could not parse signature body timestamp."); return NO; @@ -639,6 +640,7 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re BOOL isExpired = [now isAfterDate:timestampDatePlus1Day]; if (isExpired) { + OWSFailDebug(@"Could not parse signature body timestamp: %@", signatureBodyEntity.timestamp); *error = ContactDiscoveryServiceErrorMakeWithReason( ContactDiscoveryServiceErrorAttestationFailed, @"Signature is expired."); return NO; From 9b34e4ac612bea573f9b04b20143d1dbd5f95a5a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Mar 2019 15:57:57 -0400 Subject: [PATCH 381/493] Respond to CR. --- SignalServiceKit/src/Contacts/ContactDiscoveryService.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 882aed4be..1fe6c1dd7 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -23,6 +23,8 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *reason) { + OWSCFailDebug(@"Error: %@", reason); + return [NSError errorWithDomain:ContactDiscoveryServiceErrorDomain code:code userInfo:@{ ContactDiscoveryServiceErrorKey_Reason : reason }]; @@ -640,7 +642,7 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re BOOL isExpired = [now isAfterDate:timestampDatePlus1Day]; if (isExpired) { - OWSFailDebug(@"Could not parse signature body timestamp: %@", signatureBodyEntity.timestamp); + OWSFailDebug(@"Signature is expired: %@", signatureBodyEntity.timestamp); *error = ContactDiscoveryServiceErrorMakeWithReason( ContactDiscoveryServiceErrorAttestationFailed, @"Signature is expired."); return NO; From 58d99a480f3b1f19225fd40b32e305e5c40d2184 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 21 Mar 2019 15:25:56 -0700 Subject: [PATCH 382/493] Notify iOS9 users occasionally that iOS10 will soon be required --- Signal/translations/en.lproj/Localizable.strings | 2 +- SignalMessaging/Views/OWSAlerts.swift | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index dfbc5329e..c5585ead8 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/SignalMessaging/Views/OWSAlerts.swift b/SignalMessaging/Views/OWSAlerts.swift index ec4e1687a..db7974a1f 100644 --- a/SignalMessaging/Views/OWSAlerts.swift +++ b/SignalMessaging/Views/OWSAlerts.swift @@ -96,10 +96,8 @@ import Foundation @objc public class func showIOSUpgradeNagIfNecessary() { - // Only show the nag to iOS 8 users. - // - // NOTE: Our current minimum iOS version is 9, so this should never show. - if #available(iOS 9.0, *) { + // Our min SDK is iOS9, so this will only show for iOS9 users + if #available(iOS 10.0, *) { return } @@ -110,8 +108,7 @@ import Foundation } if let iOSUpgradeNagDate = Environment.shared.preferences.iOSUpgradeNagDate() { - // Nag no more than once every three days. - let kNagFrequencySeconds = 3 * kDayInterval + let kNagFrequencySeconds = 14 * kDayInterval guard fabs(iOSUpgradeNagDate.timeIntervalSinceNow) > kNagFrequencySeconds else { return } From f8244eeefef5d5b2170fe045bfd2ebe46c16eeea Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 11:40:38 -0600 Subject: [PATCH 383/493] Fix SAE crash for iOS9 --- SignalMessaging/ViewControllers/OWSNavigationController.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m index b2e40a3a5..2237bf7cb 100644 --- a/SignalMessaging/ViewControllers/OWSNavigationController.m +++ b/SignalMessaging/ViewControllers/OWSNavigationController.m @@ -208,6 +208,14 @@ NS_ASSUME_NONNULL_BEGIN - (UIInterfaceOrientationMask)supportedInterfaceOrientations { if (self.visibleViewController) { + if (@available(iOS 10, *)) { + // do nothing + } else { + // Avoid crash in SAE on iOS9 + if (!CurrentAppContext().isMainApp) { + return UIInterfaceOrientationMaskAllButUpsideDown; + } + } return self.visibleViewController.supportedInterfaceOrientations; } else { return UIInterfaceOrientationMaskAllButUpsideDown; From 5973c326de4900c907accbf85e8b999cc0ca2f6d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Mar 2019 16:09:34 -0400 Subject: [PATCH 384/493] Ensure new text items are on the canvas. --- .../Views/ImageEditor/ImageEditorTextViewController.swift | 6 +++--- SignalMessaging/categories/UIView+OWS.swift | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index 53f1f2cfc..beb16d220 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -75,8 +75,8 @@ private class VAlignTextView: UITextView { override var keyCommands: [UIKeyCommand]? { return [ - UIKeyCommand(input: "\r", modifierFlags: .command, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Send Message"), - UIKeyCommand(input: "\r", modifierFlags: .alternate, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Send Message") + UIKeyCommand(input: "\r", modifierFlags: .command, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Add Text"), + UIKeyCommand(input: "\r", modifierFlags: .alternate, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Add Text") ] } @@ -295,7 +295,7 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel // Ensure continuity of the new text item's location // with its apparent location in this text editor. - let locationInView = view.convert(textView.bounds.center, from: textView) + let locationInView = view.convert(textView.bounds.center, from: textView).clamp(view.bounds) let textCenterImageUnit = ImageEditorCanvasView.locationImageUnit(forLocationInView: locationInView, viewBounds: viewBounds, model: model, diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 3b9656d0f..3e1453410 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -270,6 +270,11 @@ public extension CGPoint { return CGPoint(x: sin(angle), y: cos(angle)) } + + public func clamp(_ rect: CGRect) -> CGPoint { + return CGPoint(x: x.clamp(rect.minX, rect.maxX), + y: y.clamp(rect.minY, rect.maxY)) + } } // MARK: - From d9760b6bbcaa216eae15ba9ead2a16deb60bb442 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Mar 2019 16:17:23 -0400 Subject: [PATCH 385/493] Fix bug around layer ordering when rendering image editor output. --- .../Views/ImageEditor/ImageEditorCanvasView.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 92ec0ef7c..59dad9841 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -634,6 +634,7 @@ public class ImageEditorCanvasView: UIView { imageLayer.contentsScale = dstScale * transform.scaling contentView.layer.addSublayer(imageLayer) + var layers = [CALayer]() for item in model.items() { guard let layer = layerForItem(item: item, model: model, @@ -643,6 +644,15 @@ public class ImageEditorCanvasView: UIView { continue } layer.contentsScale = dstScale * transform.scaling * item.outputScale() + layers.append(layer) + } + // UIView.renderAsImage() doesn't honor zPosition of layers, + // so sort the item layers to ensure they are added in the + // correct order. + let sortedLayers = layers.sorted(by: { (left, right) -> Bool in + return left.zPosition < right.zPosition + }) + for layer in sortedLayers { contentView.layer.addSublayer(layer) } From db958f4a01ef142840b73489ef348b5de116135f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Mar 2019 16:24:01 -0400 Subject: [PATCH 386/493] Preserve caption text of edited images. --- .../AttachmentApproval/AttachmentApprovalViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 00dd02442..6c674f1b7 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -584,6 +584,8 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC owsFailDebug("Could not prepare attachment for output: \(attachmentError).") return attachmentItem.attachment } + // Preserve caption text. + dstAttachment.captionText = attachmentItem.captionText return dstAttachment } From ab91fedc3e25cb5495d2a6c8d33ea359eaa2e164 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 21:26:59 -0600 Subject: [PATCH 387/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 2 +- .../translations/az.lproj/Localizable.strings | 2 +- .../translations/bg.lproj/Localizable.strings | 2 +- .../translations/bs.lproj/Localizable.strings | 6 ++-- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 2 +- .../translations/de.lproj/Localizable.strings | 2 +- .../translations/el.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 2 +- .../translations/et.lproj/Localizable.strings | 2 +- .../translations/fa.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 2 +- .../fil.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 4 +-- .../translations/gl.lproj/Localizable.strings | 6 ++-- .../translations/he.lproj/Localizable.strings | 2 +- .../translations/hr.lproj/Localizable.strings | 2 +- .../translations/hu.lproj/Localizable.strings | 2 +- .../translations/id.lproj/Localizable.strings | 4 +-- .../translations/it.lproj/Localizable.strings | 4 +-- .../translations/ja.lproj/Localizable.strings | 2 +- .../translations/km.lproj/Localizable.strings | 2 +- .../translations/ko.lproj/Localizable.strings | 2 +- .../translations/lt.lproj/Localizable.strings | 2 +- .../translations/lv.lproj/Localizable.strings | 2 +- .../translations/mk.lproj/Localizable.strings | 2 +- .../translations/my.lproj/Localizable.strings | 2 +- .../translations/nb.lproj/Localizable.strings | 2 +- .../nb_NO.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 20 +++++------ .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 36 +++++++++---------- .../pt_PT.lproj/Localizable.strings | 8 ++--- .../translations/ro.lproj/Localizable.strings | 2 +- .../translations/ru.lproj/Localizable.strings | 2 +- .../translations/sl.lproj/Localizable.strings | 2 +- .../translations/sn.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 2 +- .../translations/sv.lproj/Localizable.strings | 2 +- .../translations/th.lproj/Localizable.strings | 2 +- .../translations/tr.lproj/Localizable.strings | 2 +- .../translations/uk.lproj/Localizable.strings | 2 +- .../zh_CN.lproj/Localizable.strings | 20 +++++------ .../zh_TW.lproj/Localizable.strings | 2 +- 45 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index 6164cbe5b..da167ad04 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "أهلاً بإتصالات الفيديو الآمنة! "; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "ترقية iOS"; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 955bcb8ed..79d309cf4 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index 998465fd6..7cd50b240 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Здравейте Безопасни Видео Обаждания!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Надстройте iOS"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index ec4257ed3..148a45df6 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -696,7 +696,7 @@ "DATE_TODAY" = "Danas"; /* The day before today. */ -"DATE_YESTERDAY" = "Yesterday"; +"DATE_YESTERDAY" = "Jučer"; /* Error indicating that the debug logs could not be copied. */ "DEBUG_LOG_ALERT_COULD_NOT_COPY_LOGS" = "Could not copy logs."; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Pronađi kontakt po telefonskom broju"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Podsjetnik"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "You may have received messages while your %@ was restarting."; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Pozdrav sigurnim video pozivima!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ažuriraj iOS"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index 6e8bcf6ea..c484b8d1b 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Telefonades de Vídeo Segures!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "El Signal necessita iOS 9 o posterior. Si us plau, useu l'opció d'actualització de programari a la Configuració de l'iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualitzeu l'iOS"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index f3d431dd7..dea30dc85 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Ahoj, bezpečné videohovory!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal vyžaduje iOS 9 nebo novější. Použijte prosím funkci aktualizace softwaru v nastavení iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgradujte iOS"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 5ef328a64..7c4432ca0 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hej sikre videoopkald!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal kræver iOS 9 eller nyere. Brug funktionen Softwareopdatering i Indstillinger-appen."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Opgrader iOS"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 64df9d8fc..27bb3decd 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo, sichere Videoanrufe!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal erfordert iOS 9 oder neuer. Bitte benutze die Softwareaktualisierung in der iOS-App »Einstellungen«."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS aktualisieren"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index 617a1603a..c1b56923d 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Καλωσορίσατε, Ασφαλείς βιντεοκλησεις!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Το Signal χρειάζεται το iOS 9 ή μια νεότερη έκδοση. Χρησιμοποιήστε την επιλογή \"Ενημέρωση λογισμικού\" στην εφαρμογή \"Ρυθμίσεις\" του iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ενημέρωση Λογισμικού iOS"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 7b814bd60..f87fef377 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "¡Saluda a las vídeollamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requiere iOS 9 o posterior. Por favor, actualiza iOS en «Ajustes»."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index fdb41b9d1..a60a0490e 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Tere, turvalised videokõned!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal nõuab iOS 9 või uuemat. Palun kasuta iOSi Settings rakenduse tarkvara uuendamise funktsiooni."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uuenda iOSi"; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index 02d7af8e9..d0fe38470 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "سلام به تماس ویدیویی امن!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "signal نیاز به iOS 9 یا بالاتر دارد. لطفا در تنظیمات برنامه iOS از قابلیت ارتقا نرم افزار استفاده نمایید."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "به‌روزرسانی iOS"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index c8163160e..04d77f9d3 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hei, turvalliset videopuhelut!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal vaatii iOS 9:n tai uudemman. Voit päivittää käyttöjärjestelmäsi Asetukset ohjelmasta."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Päivitä iOS"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 4ed54f5e9..399ed5608 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index e9cddcbf2..66349d1b9 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Ajouter une légende…"; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Légende"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Type de fichier : %@"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Bienvenue aux appels vidéo sécurisés !"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal exige iOS 9 ou version ultérieure. Veuillez utiliser la fonction Mise à jour logicielle de l’appli Réglages d’iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Mettez iOS à niveau"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index b85e348b8..9e7a8bc9b 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -1524,7 +1524,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Insire o teu número de teléfono para comezar"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Número non válido"; @@ -1536,7 +1536,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Establece o teu perfil"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Ola videochamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index fe52f4980..9390e90fc 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "שלום שיחות וידיאו מאובטחות!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal דורש iOS 9 ומעלה. אנא השתמש במאפיין עדכוני תוכנה ביישום הגדרות של iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "שדרג את iOS"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 41c3dcb55..3469fc488 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Pozdrav sigurnim video pozivima!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Ažuriraj iOS"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 90f243a02..a4324de7a 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS frissítése"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index c60e29a4c..3b6ea43e4 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Temukan Kontak dengan Nomor Telepon"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Catatan Pribadi"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "Anda mungkin telah menerima pesan ketika %@ Anda sedang memulai ulang."; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo panggilan video aman!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Perbarui iOS"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 433b94f85..2aed973d0 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rifiuta chiamata"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Clicca per abilitare la tua videocamera"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Termina chiamata"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Videochiamate sicure!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal richiede iOS 9 o successivo. Usa la funzione di aggiornamento sofware presente nelle impostazioni iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Aggiornare iOS"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index fe06be474..ccd645aab 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "安全なビデオ電話にようこそ！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "SignalはiOS9以上に対応しています。iOSの設定・一般で、ソフトウエア・アップデータをしてください。"; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOSを更新する"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 9a7543056..027b7a4c7 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "សួស្តី ការហៅវីដេអូសុវត្ថិភាព!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "ធ្វើបច្ចុប្បន្នភាព iOS"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index 8da63926f..fdc7bab2f 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index cbf53b831..dc56746a6 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Sveiki, saugūs vaizdo skambučiai!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal reikalauja iOS 9 ar naujesnės versijos. iOS nustatymų programėlėje naudokite programinės įrangos atnaujinimo ypatybę."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atnaujinkite iOS"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 737ebe47e..ac282799a 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 4def0add0..53def1970 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Здраво Сигурносни Видео Повици!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index 4825dd15b..657572c92 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "မင်္ဂလာပါ လုံခြုံမှုရှိတဲ့ ဗီဒီယိုခေါ်ဆိုမှုရေ!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS ကို မြှင့်ပါ"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index c64eef509..22e457e5b 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Velkommen til sikre videosamtaler!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal trenger iOS 9 eller nyere. Bruk oppdateringsfunksjonen i iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Oppgrader iOS"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index 7d937688a..fd1707701 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Velkommen til sikre videosamtaler!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal trenger iOS 9 eller nyere. Bruk oppdateringsfunksjonen i iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Oppgrader iOS"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index d13e6b4e9..be5964c2a 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -231,7 +231,7 @@ "BACKUP_UNEXPECTED_ERROR" = "Onverwachte back-upfout"; /* An explanation of the consequences of blocking a group. */ -"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Je zult geen berichten of updates van deze groep meer ontvangen."; +"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Je zult niet langer berichten of meldingen van deze group ontvangen."; /* Button label for the 'block' button */ "BLOCK_LIST_BLOCK_BUTTON" = "Blokkeren"; @@ -459,7 +459,7 @@ "CONFIRM_LINK_NEW_DEVICE_ACTION" = "Nieuw apparaat koppelen"; /* Action sheet body presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ -"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ heet mogelijk de app opnieuw geïnstalleerd of heeft een ander apparaat in gebruik genomen. Verifieer jullie veiligheidsnummers om zeker te zijn dat je met de juiste persoon communiceert."; +"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ heeft mogelijk de app opnieuw geïnstalleerd of heeft een ander apparaat in gebruik genomen. Verifieer jullie veiligheidsnummers om zeker te zijn dat je met de juiste persoon communiceert."; /* Action sheet title presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ "CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Veiligheidsnummer met %@ is veranderd"; @@ -787,13 +787,13 @@ "EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE" = "Signal heeft toegang nodig tot je contacten om contactinformatie te bewerken"; /* table cell label in conversation settings */ -"EDIT_GROUP_ACTION" = "Groep bewerken"; +"EDIT_GROUP_ACTION" = "Groep aanpassen"; /* a title for the contacts section of the 'new/update group' view. */ "EDIT_GROUP_CONTACTS_SECTION_TITLE" = "Contacten"; /* The navbar title for the 'update group' view. */ -"EDIT_GROUP_DEFAULT_TITLE" = "Groep bewerken"; +"EDIT_GROUP_DEFAULT_TITLE" = "Groep aanpassen"; /* Label for the cell that lets you add a new member to a group. */ "EDIT_GROUP_MEMBERS_ADD_MEMBER" = "Toevoegen…"; @@ -805,7 +805,7 @@ "EDIT_GROUP_NEW_MEMBER_LABEL" = "Toegevoegd"; /* The title for the 'update group' button. */ -"EDIT_GROUP_UPDATE_BUTTON" = "Bijwerken"; +"EDIT_GROUP_UPDATE_BUTTON" = "Aanpassen"; /* The alert message if user tries to exit update group view without saving changes. */ "EDIT_GROUP_VIEW_UNSAVED_CHANGES_MESSAGE" = "Wil je de wijzigingen aan deze groep behouden?"; @@ -1048,7 +1048,7 @@ "GROUP_TITLE_CHANGED" = "De titel is nu “%@”."; /* No comment provided by engineer. */ -"GROUP_UPDATED" = "Groep bijgewerkt."; +"GROUP_UPDATED" = "Groep aangepast."; /* No comment provided by engineer. */ "GROUP_YOU_LEFT" = "Je hebt de groep verlaten."; @@ -1491,7 +1491,7 @@ "NOTIFICATIONS_SENDER_ONLY" = "Alleen naam"; /* No comment provided by engineer. */ -"NOTIFICATIONS_SHOW" = "Toon"; +"NOTIFICATIONS_SHOW" = "Laat zien"; /* No comment provided by engineer. */ "OK" = "Begrepen"; @@ -2310,7 +2310,7 @@ "SHOW_SAFETY_NUMBER_ACTION" = "Veiligheidsnummer tonen"; /* notification action */ -"SHOW_THREAD_BUTTON_TITLE" = "Gesprek tonen"; +"SHOW_THREAD_BUTTON_TITLE" = "Gesprek laten zien"; /* body sent to contacts when inviting to Install Signal */ "SMS_INVITE_BODY" = "Ik nodig je uit om Signal te installeren! Hier is de link:"; @@ -2418,7 +2418,7 @@ "UNSUPPORTED_FEATURE_ERROR" = "Je apparaat ondersteunt deze functie niet."; /* Title for alert indicating that group members can't be removed. */ -"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_MESSAGE" = "Je kunt groepsleden niet verwijderen. Ofwel moeten zij zelf de groep verlaten, ofwel kun je een nieuwe groep zonder dit lid aanmaken."; +"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_MESSAGE" = "Je kunt groepsleden niet verwijderen. Ofwel moet hij zelf de groep verlaten, ofwel kun je een nieuwe groep zonder dit lid aanmaken."; /* Title for alert indicating that group members can't be removed. */ "UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE" = "Niet ondersteund"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo, beveiligde videogesprekken!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal vereist iOS 9 of later. Gebruik de software-update-functie in de iOS-instellingenapp."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Werk iOS bij"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 1eac03986..6c65ebc51 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Szyfrowane wideo rozmowy witają!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal wymaga systemu iOS 9 lub nowszego. Przejdź do Aktualizacji oprogramowania w Ustawieniach iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uaktualnij iOS"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 9fdcbb9e3..1e515027e 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -300,7 +300,7 @@ "BUTTON_DONE" = "Pronto"; /* Label for the 'next' button. */ -"BUTTON_NEXT" = "Próximo"; +"BUTTON_NEXT" = "Avançar"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecionar"; @@ -318,7 +318,7 @@ "CALL_INCOMING_NOTIFICATION_BODY" = "☎️ Recebendo ligação"; /* Accessibility label for placing call button */ -"CALL_LABEL" = "Chamar"; +"CALL_LABEL" = "Ligar"; /* notification body */ "CALL_MISSED_BECAUSE_OF_IDENTITY_CHANGE_NOTIFICATION_BODY" = "☎️ Chamada perdida porque o número de segurança do chamador mudou."; @@ -339,7 +339,7 @@ "CALL_USER_ALERT_MESSAGE_FORMAT" = "Gostaria de chamar %@?"; /* Title for alert offering to call a user. */ -"CALL_USER_ALERT_TITLE" = "Chamar?"; +"CALL_USER_ALERT_TITLE" = "Ligar?"; /* Accessibility label for accepting incoming calls */ "CALL_VIEW_ACCEPT_INCOMING_CALL_LABEL" = "Receber chamada"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Recusar chamada"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toque para ligar seu vídeo"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Terminar chamada"; @@ -510,7 +510,7 @@ "CONTACT_FIELD_FAMILY_NAME" = "Sobrenome"; /* Label for the 'given name' field of a contact. */ -"CONTACT_FIELD_GIVEN_NAME" = "Nome"; +"CONTACT_FIELD_GIVEN_NAME" = "Primeiro nome"; /* Label for the 'middle name' field of a contact. */ "CONTACT_FIELD_MIDDLE_NAME" = "Segundo nome"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Excluir conversa?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Sem resultados"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 resultado"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d de %d resultados"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Configurações de Conversa"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar Novo Contato"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Buscar na Conversa"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toque para mudar"; @@ -745,7 +745,7 @@ "DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "Redirecionando para o GitHub"; /* Label for button that lets users re-register using the same phone number. */ -"DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Recadastrar este telefone"; +"DEREGISTRATION_REREGISTER_WITH_SAME_PHONE_NUMBER" = "Recadastrar este número de telefone"; /* Label warning the user that they have been de-registered. */ "DEREGISTRATION_WARNING" = "Dispositivo não cadastrado. Seu número de telefone pode estar cadastrado no Signal em outro aparelho. Clique para se recadastrar."; @@ -847,7 +847,7 @@ "ENABLE_2FA_VIEW_ENABLE_2FA" = "Ativar"; /* Label for the 'next' button in the 'enable two factor auth' views. */ -"ENABLE_2FA_VIEW_NEXT_BUTTON" = "Próximo"; +"ENABLE_2FA_VIEW_NEXT_BUTTON" = "Avançar"; /* Error indicating that the entered 'two-factor auth PINs' do not match. */ "ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "PIN incorreto."; @@ -1279,7 +1279,7 @@ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING" = "Enviando"; /* Status label for messages which are sent. */ -"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Enviado"; +"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Enviada"; /* Status label for messages which were skipped. */ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SKIPPED" = "Ignorada"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax no Trabalho"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Não foi possível capturar a imagem."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Não foi possível capturar a imagem."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Falha ao configurar câmera."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sem nome"; @@ -1833,7 +1833,7 @@ "REGISTRATION_IPAD_CONFIRM_BODY" = "O Signal será agora desativado em outros dispositivos cadastrados atualmente com este número de telefone."; /* button text to proceed with registration when on an iPad */ -"REGISTRATION_IPAD_CONFIRM_BUTTON" = "Registre esse iPad"; +"REGISTRATION_IPAD_CONFIRM_BUTTON" = "Cadastrar este iPad"; /* alert title when registering an iPad */ "REGISTRATION_IPAD_CONFIRM_TITLE" = "Já tem uma conta no Signal?"; @@ -2136,7 +2136,7 @@ "SETTINGS_INFORMATION_HEADER" = "Informação"; /* Settings table view cell label */ -"SETTINGS_INVITE_TITLE" = "Convide seus amigos"; +"SETTINGS_INVITE_TITLE" = "Convide sua turma"; /* content of tweet when inviting via twitter - please do not translate URL */ "SETTINGS_INVITE_TWITTER_TEXT" = "Você pode falar comigo pelo @signalapp. Baixe agora: https://signal.org/download/."; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá, chamadas seguras em vídeo!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "O Signal requer iOS 9 ou superior. Por favor, use o recurso de Atualização de Software disponível nos Ajustes do iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualize o iOS"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 2b3814dff..d5f5f2b57 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rejeitar chamada"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toque aqui para ligar a sua câmara"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toque aqui para activar a sua câmara"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Finalizar chamada"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Criar novo contacto"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Procurar conversa"; +"CONVERSATION_SETTINGS_SEARCH" = "Procurar Conversa"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tocar para alterar"; @@ -1647,7 +1647,7 @@ "PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Não foi possível capturar a imagem."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Não foi possível configurar a câmara."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Falha a configurar a câmara."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Álbum sem nome"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá videochamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "O Signal requer iOS 9 ou superior. Por favor utilize o recurso 'Atualização de software' nas definições da aplicação do iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualizar iOS"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 759f4265d..3d92b9df3 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Bun venit la apeluri video securizate!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal necesită iOS 9 sau o versiune mai nouă. Te rog folosește funționalitatea Actualizări Software din aplicația iOS Setări."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizează-ți iOS-ul"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index b2a181e5f..7dee18460 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Добро пожаловать в видеозвонки!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Для Signal требуется iOS 9 или новее. Пожалуйста, используйте функцию Обновление ПО в программе Настройки."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Обновите IOS"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 5a134ad99..94c013d0f 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "NOVO: varni video klici!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Nadrgradnja iOS"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 10984b028..76dcb1c16 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Ndeipi kunhare dzemavhidhiyo kwakachengetedzwa!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal inoda iOS 9 kana mberi.Tapota shandisa Software Update muapp yema setting."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Wedzera iOS"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 7da82916b..be4541b40 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Tungjatjeta Thirrjeve Video të Sigurta!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal-i lyp iOS 9 ose më të ri. Ju lutemi, përdorni veçorinë Përditësim Software-i që nga aplikacioni Rregullime iOS."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Përmirësoni iOS-in"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index 2847a03a0..b671cbd2d 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallå säkra videosamtal!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal kräver iOS 9 eller senare. Använd funktionen Programuppdatering i appen för iOS-inställningar."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uppgradera iOS"; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index 1bc73735e..4486d34fd 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "การโทรด้วยวิดีโออย่างปลอดภัย!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "อัพเกรด iOS"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 8291cbbae..78070ceaf 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Merhaba Güvenli Görüntülü Aramalar!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal iOS 9 veya daha sonrasını gerektirir. Lütfen iOS Ayarlar uygulamasından Yazılım Güncelleme özeliğini kullanın."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS'u Güncelle"; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index f5c1126ee..81e779a34 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Привіт, захищені відеодзвінки!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal потребує версію iOS 9 або новішу. Будь ласка, перейдіть до розділу Оновлення ПЗ у Параметрах."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Оновити iOS"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index a6a5d6e99..1ca986678 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "添加注释..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "注释"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "文件类型: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "拒接来电"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "点击这里以启用视频"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "结束通话"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "删除会话？"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "没有结果"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1个结果"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d中的%d条结果"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "会话设置"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "新建联系人"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "搜索对话"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "点击更改"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "工作传真"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "无法拍摄图片。"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "无法拍摄图片。"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "配置摄像头失败。"; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "未命名的相册"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "现推出安全的视频通话！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal 仅支持 iOS 9 或更新的系统版本。请到 设置 >> 通用 >> 软件更新 升级 iOS。"; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "升级 iOS"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index b46645e0b..f5f3f953e 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "現推出安全的視訊通話！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal 要求 iOS 9 或以後的版本。請在 iOS 設定中執行軟體更新。"; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "更新 iOS"; From dc87ae821d7891ea6f25cba3acaecae4ff6ae28d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 21:27:06 -0600 Subject: [PATCH 388/493] "Bump build to 2.38.0.8." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index d96cde91b..2a157e7cb 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.7 + 2.38.0.8 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 235999e11..fe04bac96 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.7 + 2.38.0.8 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From d02152cf1430086d7912cfc396bd7dfd17c49eb2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 21:44:59 -0600 Subject: [PATCH 389/493] fix release build --- .../ConversationView/ConversationViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 98d94289d..5f539b058 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2602,8 +2602,8 @@ typedef enum : NSUInteger { [self.scrollUpButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize]; [self.scrollUpButton autoPinToTopLayoutGuideOfViewController:self withInset:0]; [self.scrollUpButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; -#endif SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _scrollUpButton); +#endif [self updateScrollDownButtonLayout]; } From 3ed2e76eb4660585a674769ec33a125e84e5d711 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 21:45:03 -0600 Subject: [PATCH 390/493] "Bump build to 2.38.0.9." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 2a157e7cb..e33e14b84 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.8 + 2.38.0.9 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index fe04bac96..08f7b0a94 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.8 + 2.38.0.9 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 0d9b780f75bb6ac9e7f143be3deef1d337024ed2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Mar 2019 10:41:48 -0400 Subject: [PATCH 391/493] Remove scroll up button. --- .../ConversationViewController.m | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 5f539b058..0002ac339 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -188,9 +188,6 @@ typedef enum : NSUInteger { @property (nonatomic) NSLayoutConstraint *scrollDownButtonButtomConstraint; @property (nonatomic) ConversationScrollButton *scrollDownButton; -#ifdef DEBUG -@property (nonatomic) ConversationScrollButton *scrollUpButton; -#endif @property (nonatomic) BOOL isViewCompletelyAppeared; @property (nonatomic) BOOL isViewVisible; @@ -2592,19 +2589,6 @@ typedef enum : NSUInteger { [self.scrollDownButton autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view]; [self.scrollDownButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; -#ifdef DEBUG - self.scrollUpButton = [[ConversationScrollButton alloc] initWithIconText:@"\uf102"]; - [self.scrollUpButton addTarget:self - action:@selector(scrollUpButtonTapped) - forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:self.scrollUpButton]; - [self.scrollUpButton autoSetDimension:ALDimensionWidth toSize:ConversationScrollButton.buttonSize]; - [self.scrollUpButton autoSetDimension:ALDimensionHeight toSize:ConversationScrollButton.buttonSize]; - [self.scrollUpButton autoPinToTopLayoutGuideOfViewController:self withInset:0]; - [self.scrollUpButton autoPinEdgeToSuperviewSafeArea:ALEdgeTrailing]; - SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _scrollUpButton); -#endif - [self updateScrollDownButtonLayout]; } @@ -2654,13 +2638,6 @@ typedef enum : NSUInteger { [self scrollToBottomAnimated:YES]; } -#ifdef DEBUG -- (void)scrollUpButtonTapped -{ - [self.collectionView setContentOffset:CGPointZero animated:YES]; -} -#endif - - (void)ensureScrollDownButton { OWSAssertIsOnMainThread(); @@ -2686,11 +2663,6 @@ typedef enum : NSUInteger { } self.scrollDownButton.hidden = !shouldShowScrollDownButton; - -#ifdef DEBUG - BOOL shouldShowScrollUpButton = self.collectionView.contentOffset.y > 0; - self.scrollUpButton.hidden = !shouldShowScrollUpButton; -#endif } #pragma mark - Attachment Picking: Contacts From ae5cee21670eb56e76b917078375a48130a1fcdc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Mar 2019 17:05:00 -0400 Subject: [PATCH 392/493] Clean up the link preview cache. --- .../ConversationView/ConversationInputToolbar.m | 4 ++++ .../ConversationView/ConversationViewController.m | 2 ++ Signal/src/ViewControllers/HomeView/HomeViewController.m | 2 ++ .../src/Messages/Interactions/OWSLinkPreview.swift | 7 +++++++ 4 files changed, 15 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index fd34c1cd4..37b768297 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -878,6 +878,10 @@ const CGFloat kMaxTextViewHeight = 98; [self ensureShouldShowVoiceMemoButtonAnimated:YES doLayout:YES]; [self updateHeightWithTextView:textView]; [self updateInputLinkPreview]; + + if (textView.text.ows_stripped.length < 1) { + [OWSLinkPreview clearLinkPreviewCache]; + } } - (void)textViewDidChangeSelection:(UITextView *)textView diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 0002ac339..614d73f7c 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2752,6 +2752,8 @@ typedef enum : NSUInteger { AudioServicesPlaySystemSound(soundId); } [self.typingIndicators didSendOutgoingMessageInThread:self.thread]; + + [OWSLinkPreview clearLinkPreviewCache]; } #pragma mark UIDocumentMenuDelegate diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 3806974b9..7ceb701b8 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -709,6 +709,8 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; + + [OWSLinkPreview clearLinkPreviewCache]; } - (void)viewDidDisappear:(BOOL)animated diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 9bb11b4de..86415b295 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -553,6 +553,13 @@ public class OWSLinkPreview: MTLModel { } } + @objc + public class func clearLinkPreviewCache() { + return serialQueue.async { + linkPreviewDraftCache.removeAllObjects() + } + } + @objc public class func tryToBuildPreviewInfoObjc(previewUrl: String?) -> AnyPromise { return AnyPromise(tryToBuildPreviewInfo(previewUrl: previewUrl)) From 04b60677a6000b2fbc7575d7b7f07ee511dfbefb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Mar 2019 09:00:29 -0400 Subject: [PATCH 393/493] Simplify link preview cache. --- Signal/src/views/LinkPreviewView.swift | 8 +- .../Interactions/OWSLinkPreview.swift | 78 ++++++++----------- 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift index 07d3037ac..bce6af478 100644 --- a/Signal/src/views/LinkPreviewView.swift +++ b/Signal/src/views/LinkPreviewView.swift @@ -103,7 +103,7 @@ public class LinkPreviewDraft: NSObject, LinkPreviewState { } public func imageState() -> LinkPreviewImageState { - if linkPreviewDraft.imageFilePath != nil { + if linkPreviewDraft.jpegImageData != nil { return .loaded } else { return .none @@ -113,11 +113,11 @@ public class LinkPreviewDraft: NSObject, LinkPreviewState { public func image() -> UIImage? { assert(imageState() == .loaded) - guard let imageFilepath = linkPreviewDraft.imageFilePath else { + guard let jpegImageData = linkPreviewDraft.jpegImageData else { return nil } - guard let image = UIImage(contentsOfFile: imageFilepath) else { - owsFailDebug("Could not load image: \(imageFilepath)") + guard let image = UIImage(data: jpegImageData) else { + owsFailDebug("Could not load image: \(jpegImageData.count)") return nil } return image diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 86415b295..231b9995b 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -41,31 +41,22 @@ public class OWSLinkPreviewDraft: NSObject { public var title: String? @objc - public var imageFilePath: String? + public var jpegImageData: Data? - public init(urlString: String, title: String?, imageFilePath: String? = nil) { + public init(urlString: String, title: String?, jpegImageData: Data? = nil) { self.urlString = urlString self.title = title - self.imageFilePath = imageFilePath + self.jpegImageData = jpegImageData super.init() } - deinit { - // Eagerly clean up temp files. - if let imageFilePath = imageFilePath { - DispatchQueue.global().async { - OWSFileSystem.deleteFile(imageFilePath) - } - } - } - fileprivate func isValid() -> Bool { var hasTitle = false if let titleValue = title { hasTitle = titleValue.count > 0 } - let hasImage = imageFilePath != nil + let hasImage = jpegImageData != nil return hasTitle || hasImage } @@ -198,7 +189,7 @@ public class OWSLinkPreview: MTLModel { guard SSKPreferences.areLinkPreviewsEnabled else { throw LinkPreviewError.noPreview } - let imageAttachmentId = OWSLinkPreview.saveAttachmentIfPossible(inputFilePath: info.imageFilePath, + let imageAttachmentId = OWSLinkPreview.saveAttachmentIfPossible(jpegImageData: info.jpegImageData, transaction: transaction) let linkPreview = OWSLinkPreview(urlString: info.urlString, title: info.title, imageAttachmentId: imageAttachmentId) @@ -211,34 +202,32 @@ public class OWSLinkPreview: MTLModel { return linkPreview } - private class func saveAttachmentIfPossible(inputFilePath filePath: String?, + private class func saveAttachmentIfPossible(jpegImageData: Data?, transaction: YapDatabaseReadWriteTransaction) -> String? { - guard let filePath = filePath else { + guard let jpegImageData = jpegImageData else { return nil } - guard let fileSize = OWSFileSystem.fileSize(ofPath: filePath) else { - owsFailDebug("Unknown file size for path: \(filePath)") + let fileSize = jpegImageData.count + guard fileSize > 0 else { + owsFailDebug("Invalid file size for image data.") return nil } - guard fileSize.uint32Value > 0 else { - owsFailDebug("Invalid file size for path: \(filePath)") - return nil - } - let filename = (filePath as NSString).lastPathComponent - let fileExtension = (filename as NSString).pathExtension - guard fileExtension.count > 0 else { - owsFailDebug("Invalid file extension for path: \(filePath)") - return nil - } - guard let contentType = MIMETypeUtil.mimeType(forFileExtension: fileExtension) else { - owsFailDebug("Invalid content type for path: \(filePath)") + let fileExtension = "jpg" + let contentType = OWSMimeTypeImageJpeg + + let filePath = OWSFileSystem.temporaryFilePath(withFileExtension: fileExtension) + do { + try jpegImageData.write(to: NSURL.fileURL(withPath: filePath), options: .atomicWrite) + } catch let error as NSError { + owsFailDebug("file write failed: \(filePath), \(error)") return nil } + guard let dataSource = DataSourcePath.dataSource(withFilePath: filePath, shouldDeleteOnDeallocation: true) else { owsFailDebug("Could not create data source for path: \(filePath)") return nil } - let attachment = TSAttachmentStream(contentType: contentType, byteCount: fileSize.uint32Value, sourceFilename: nil, caption: nil, albumMessageId: nil) + let attachment = TSAttachmentStream(contentType: contentType, byteCount: UInt32(fileSize), sourceFilename: nil, caption: nil, albumMessageId: nil) guard attachment.write(dataSource) else { owsFailDebug("Could not write data source for path: \(filePath)") return nil @@ -528,16 +517,25 @@ public class OWSLinkPreview: MTLModel { // MARK: - Preview Construction // This cache should only be accessed on serialQueue. - private static var linkPreviewDraftCache: NSCache = NSCache() + // + // We should only main + private static var linkPreviewDraftCache: OWSLinkPreviewDraft? private class func cachedLinkPreview(forPreviewUrl previewUrl: String) -> OWSLinkPreviewDraft? { return serialQueue.sync { - return linkPreviewDraftCache.object(forKey: previewUrl as NSString) + guard let linkPreviewDraft = linkPreviewDraftCache, + linkPreviewDraft.urlString == previewUrl else { + Logger.verbose("----- Cache miss.") + return nil + } + Logger.verbose("----- Cache hit.") + return linkPreviewDraft } } private class func setCachedLinkPreview(_ linkPreviewDraft: OWSLinkPreviewDraft, forPreviewUrl previewUrl: String) { + assert(previewUrl == linkPreviewDraft.urlString) // Exit early if link previews are not enabled in order to avoid // tainting the cache. @@ -549,14 +547,14 @@ public class OWSLinkPreview: MTLModel { } serialQueue.sync { - linkPreviewDraftCache.setObject(linkPreviewDraft, forKey: previewUrl as NSString) + linkPreviewDraftCache = linkPreviewDraft } } @objc public class func clearLinkPreviewCache() { return serialQueue.async { - linkPreviewDraftCache.removeAllObjects() + linkPreviewDraftCache = nil } } @@ -766,15 +764,7 @@ public class OWSLinkPreview: MTLModel { return downloadImage(url: imageUrl, imageMimeType: imageMimeType) .map(on: DispatchQueue.global()) { (imageData: Data) -> OWSLinkPreviewDraft in // We always recompress images to Jpeg. - let imageFilePath = OWSFileSystem.temporaryFilePath(withFileExtension: "jpg") - do { - try imageData.write(to: NSURL.fileURL(withPath: imageFilePath), options: .atomicWrite) - } catch let error as NSError { - owsFailDebug("file write failed: \(imageFilePath), \(error)") - throw LinkPreviewError.assertionFailure - } - - let linkPreviewDraft = OWSLinkPreviewDraft(urlString: linkUrlString, title: title, imageFilePath: imageFilePath) + let linkPreviewDraft = OWSLinkPreviewDraft(urlString: linkUrlString, title: title, jpegImageData: imageData) return linkPreviewDraft } .recover(on: DispatchQueue.global()) { (_) -> Promise in From bb1921afe65b21b1ec119dae82c64df980f8910e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Mar 2019 09:03:27 -0400 Subject: [PATCH 394/493] Simplify link preview cache. --- .../ConversationView/ConversationInputToolbar.m | 4 ---- .../ConversationView/ConversationViewController.m | 2 -- Signal/src/ViewControllers/HomeView/HomeViewController.m | 2 -- .../src/Messages/Interactions/OWSLinkPreview.swift | 7 ------- 4 files changed, 15 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 37b768297..fd34c1cd4 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -878,10 +878,6 @@ const CGFloat kMaxTextViewHeight = 98; [self ensureShouldShowVoiceMemoButtonAnimated:YES doLayout:YES]; [self updateHeightWithTextView:textView]; [self updateInputLinkPreview]; - - if (textView.text.ows_stripped.length < 1) { - [OWSLinkPreview clearLinkPreviewCache]; - } } - (void)textViewDidChangeSelection:(UITextView *)textView diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 614d73f7c..0002ac339 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2752,8 +2752,6 @@ typedef enum : NSUInteger { AudioServicesPlaySystemSound(soundId); } [self.typingIndicators didSendOutgoingMessageInThread:self.thread]; - - [OWSLinkPreview clearLinkPreviewCache]; } #pragma mark UIDocumentMenuDelegate diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 7ceb701b8..3806974b9 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -709,8 +709,6 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self.searchResultsController viewDidAppear:animated]; self.hasEverAppeared = YES; - - [OWSLinkPreview clearLinkPreviewCache]; } - (void)viewDidDisappear:(BOOL)animated diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 231b9995b..9f52e3ad4 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -551,13 +551,6 @@ public class OWSLinkPreview: MTLModel { } } - @objc - public class func clearLinkPreviewCache() { - return serialQueue.async { - linkPreviewDraftCache = nil - } - } - @objc public class func tryToBuildPreviewInfoObjc(previewUrl: String?) -> AnyPromise { return AnyPromise(tryToBuildPreviewInfo(previewUrl: previewUrl)) From 81e3dfc3cf6d08b93ec07882b63d35cfd7162bfe Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Mar 2019 12:36:39 -0400 Subject: [PATCH 395/493] Respond to CR. --- SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 9f52e3ad4..8b1eb18eb 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -518,7 +518,7 @@ public class OWSLinkPreview: MTLModel { // This cache should only be accessed on serialQueue. // - // We should only main + // We should only maintain a "cache" of the last known draft. private static var linkPreviewDraftCache: OWSLinkPreviewDraft? private class func cachedLinkPreview(forPreviewUrl previewUrl: String) -> OWSLinkPreviewDraft? { From 987726df6ce200f28f83a085ab5a3edba0c4ce3c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 26 Mar 2019 17:45:12 -0400 Subject: [PATCH 396/493] Temp files. --- Signal/src/AppDelegate.m | 3 + SignalServiceKit/src/Util/OWSFileSystem.h | 3 +- SignalServiceKit/src/Util/OWSFileSystem.m | 70 +++++++++++++++++++++-- 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index c626266ba..26cbab7ae 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -636,6 +636,9 @@ static NSTimeInterval launchStartedAt; // be called _before_ we become active. [self clearAllNotificationsAndRestoreBadgeCount]; + // On every activation, clear old temp directories. + ClearOldTemporaryDirectories(); + OWSLogInfo(@"applicationDidBecomeActive completed."); } diff --git a/SignalServiceKit/src/Util/OWSFileSystem.h b/SignalServiceKit/src/Util/OWSFileSystem.h index 0bbad4c92..aa4dcc90d 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.h +++ b/SignalServiceKit/src/Util/OWSFileSystem.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN // unless the temp data may need to be accessed while the device is locked. NSString *OWSTemporaryDirectory(void); NSString *OWSTemporaryDirectoryAccessibleAfterFirstAuth(void); +void ClearOldTemporaryDirectories(void); @interface OWSFileSystem : NSObject diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m index 183e9edb6..327a04d28 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.m +++ b/SignalServiceKit/src/Util/OWSFileSystem.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSFileSystem.h" @@ -336,12 +336,26 @@ NS_ASSUME_NONNULL_BEGIN @end +#pragma mark - + NSString *OWSTemporaryDirectory(void) { - NSString *dirName = @"ows_temp"; - NSString *dirPath = [NSTemporaryDirectory() stringByAppendingPathComponent:dirName]; - BOOL success = [OWSFileSystem ensureDirectoryExists:dirPath fileProtectionType:NSFileProtectionComplete]; - OWSCAssert(success); + static NSString *dirPath; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + NSString *dirName = [NSString stringWithFormat:@"ows_temp_%@", NSUUID.UUID.UUIDString]; + dirPath = [NSTemporaryDirectory() stringByAppendingPathComponent:dirName]; + BOOL success = [OWSFileSystem ensureDirectoryExists:dirPath fileProtectionType:NSFileProtectionComplete]; + OWSCAssert(success); + + // On launch, clear old temp directories. + // + // NOTE: ClearOldTemporaryDirectoriesSync() will call this function + // OWSTemporaryDirectory(), but there's no risk of deadlock; + // ClearOldTemporaryDirectories() calls ClearOldTemporaryDirectoriesSync() + // after a long delay. + ClearOldTemporaryDirectories(); + }); return dirPath; } @@ -354,4 +368,50 @@ NSString *OWSTemporaryDirectoryAccessibleAfterFirstAuth(void) return dirPath; } +void ClearOldTemporaryDirectoriesSync(void) +{ + // Ignore the "current" temp directory. + NSString *currentTempDirName = OWSTemporaryDirectory().lastPathComponent; + + NSString *dirPath = NSTemporaryDirectory(); + NSError *error; + NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:dirPath error:&error]; + if (error) { + OWSCFailDebug(@"contentsOfDirectoryAtPath error: %@", error); + return; + } + for (NSString *fileName in fileNames) { + if (!CurrentAppContext().isAppForegroundAndActive) { + // Abort if app not active. + return; + } + if ([fileName isEqualToString:currentTempDirName]) { + continue; + } + if (![fileName hasPrefix:@"ows_temp"]) { + continue; + } + NSString *filePath = [dirPath stringByAppendingPathComponent:fileName]; + OWSLogVerbose(@"Clearing old temp directory: %@", filePath); + if (![OWSFileSystem deleteFile:filePath]) { + // This can happen if the app launches before the phone is unlocked. + // Clean up will occur when app becomes active. + OWSLogWarn(@"Could not delete old temp directory: %@", filePath); + } + } +} + +// NOTE: We need to call this method on launch _and_ every time the app becomes active, +// since file protection may prevent it from succeeding in the background. +void ClearOldTemporaryDirectories(void) +{ + // We use the lowest priority queue for this, and wait N seconds + // to avoid interfering with app startup. + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10.f * NSEC_PER_SEC)), + dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), + ^{ + ClearOldTemporaryDirectoriesSync(); + }); +} + NS_ASSUME_NONNULL_END From dd54b40bedbf7731cf88016c7a973afb0dedcf32 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Mar 2019 13:15:26 -0400 Subject: [PATCH 397/493] Respond to CR. --- SignalServiceKit/src/Util/OWSFileSystem.m | 31 +++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m index 327a04d28..36d4a8f07 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.m +++ b/SignalServiceKit/src/Util/OWSFileSystem.m @@ -5,6 +5,7 @@ #import "OWSFileSystem.h" #import "OWSError.h" #import "TSConstants.h" +#import NS_ASSUME_NONNULL_BEGIN @@ -373,6 +374,7 @@ void ClearOldTemporaryDirectoriesSync(void) // Ignore the "current" temp directory. NSString *currentTempDirName = OWSTemporaryDirectory().lastPathComponent; + NSDate *thresholdDate = CurrentAppContext().appLaunchTime; NSString *dirPath = NSTemporaryDirectory(); NSError *error; NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:dirPath error:&error]; @@ -388,11 +390,30 @@ void ClearOldTemporaryDirectoriesSync(void) if ([fileName isEqualToString:currentTempDirName]) { continue; } - if (![fileName hasPrefix:@"ows_temp"]) { - continue; - } + NSString *filePath = [dirPath stringByAppendingPathComponent:fileName]; - OWSLogVerbose(@"Clearing old temp directory: %@", filePath); + + // Delete files with either: + // + // a) "ows_temp" name prefix. + // b) modified time before app launch time. + if (![fileName hasPrefix:@"ows_temp"]) { + NSError *error; + NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error]; + if (!attributes || error) { + // This is fine; the file may have been deleted since we found it. + OWSLogError(@"Could not get attributes of file or directory at: %@", filePath); + continue; + } + // Don't delete files which were created in the last N minutes. + NSDate *creationDate = attributes.fileModificationDate; + if ([creationDate isAfterDate:thresholdDate]) { + OWSLogInfo(@"Skipping file due to age: %f", fabs([creationDate timeIntervalSinceNow])); + continue; + } + } + + OWSLogVerbose(@"Removing temp file or directory: %@", filePath); if (![OWSFileSystem deleteFile:filePath]) { // This can happen if the app launches before the phone is unlocked. // Clean up will occur when app becomes active. @@ -407,7 +428,7 @@ void ClearOldTemporaryDirectories(void) { // We use the lowest priority queue for this, and wait N seconds // to avoid interfering with app startup. - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10.f * NSEC_PER_SEC)), + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.f * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{ ClearOldTemporaryDirectoriesSync(); From 1357449dcc9ea64da051d3ed53b100b996fa6bea Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 27 Mar 2019 16:11:28 -0600 Subject: [PATCH 398/493] Make OrderedDictionary keys generic --- .../Views/ImageEditor/ImageEditorContents.swift | 4 ++-- .../Views/ImageEditor/OrderedDictionary.swift | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift index 8725ba433..e5ce28f6d 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorContents.swift @@ -11,7 +11,7 @@ import UIKit // as immutable, once configured. public class ImageEditorContents: NSObject { - public typealias ItemMapType = OrderedDictionary + public typealias ItemMapType = OrderedDictionary // This represents the current state of each item, // a mapping of [itemId : item]. @@ -72,7 +72,7 @@ public class ImageEditorContents: NSObject { @objc public func items() -> [ImageEditorItem] { - return itemMap.orderedValues() + return itemMap.orderedValues } @objc diff --git a/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift index adec0c9fd..7aa6d7d28 100644 --- a/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift +++ b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift @@ -4,16 +4,13 @@ import Foundation -public class OrderedDictionary: NSObject { +public class OrderedDictionary { - public typealias KeyType = String + private var keyValueMap = [KeyType: ValueType]() - var keyValueMap = [KeyType: ValueType]() + public var orderedKeys = [KeyType]() - var orderedKeys = [KeyType]() - - public override init() { - } + public init() { } // Used to clone copies of instances of this class. public init(keyValueMap: [KeyType: ValueType], @@ -25,7 +22,7 @@ public class OrderedDictionary: NSObject { // Since the contents are immutable, we only modify copies // made with this method. - public func clone() -> OrderedDictionary { + public func clone() -> OrderedDictionary { return OrderedDictionary(keyValueMap: keyValueMap, orderedKeys: orderedKeys) } @@ -90,7 +87,7 @@ public class OrderedDictionary: NSObject { return orderedKeys.count } - public func orderedValues() -> [ValueType] { + public var orderedValues: [ValueType] { var values = [ValueType]() for key in orderedKeys { guard let value = self.keyValueMap[key] else { From 6502d7d4a5983e49ca8b1eda334e64cbfdd6e18d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 19:05:09 -0600 Subject: [PATCH 399/493] remove `isMultiSendEnabled` feature flag --- .../ConversationViewController.m | 26 +++++-------------- .../attachments/SignalAttachment.swift | 7 +---- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 0002ac339..79c3744e1 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2933,22 +2933,11 @@ typedef enum : NSUInteger { return; } - UIViewController *pickerModal; - if (SignalAttachment.isMultiSendEnabled) { - OWSImagePickerGridController *picker = [OWSImagePickerGridController new]; - picker.delegate = self; + OWSImagePickerGridController *picker = [OWSImagePickerGridController new]; + picker.delegate = self; - OWSNavigationController *modal = [[OWSNavigationController alloc] initWithRootViewController:picker]; - modal.ows_prefersStatusBarHidden = @(YES); - pickerModal = modal; - } else { - UIImagePickerController *picker = [OWSImagePickerController new]; - picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - picker.delegate = self; - picker.mediaTypes = @[ (__bridge NSString *)kUTTypeImage, (__bridge NSString *)kUTTypeMovie ]; - - pickerModal = picker; - } + OWSNavigationController *pickerModal = [[OWSNavigationController alloc] initWithRootViewController:picker]; + pickerModal.ows_prefersStatusBarHidden = @(YES); [self dismissKeyBoard]; [self presentViewController:pickerModal animated:YES completion:nil]; @@ -3060,11 +3049,8 @@ typedef enum : NSUInteger { }]; } else { // Non-Video image picked from library - if (SignalAttachment.isMultiSendEnabled) { - OWSFailDebug(@"Only use UIImagePicker for camera/video capture. Picking media from UIImagePicker is not " - @"supported. "); - } - + OWSFailDebug( + @"Only use UIImagePicker for camera/video capture. Picking media from UIImagePicker is not supported. "); // To avoid re-encoding GIF and PNG's as JPEG we have to get the raw data of // the selected item vs. using the UIImagePickerControllerOriginalImage diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift index 48a711516..f872f3b08 100644 --- a/SignalMessaging/attachments/SignalAttachment.swift +++ b/SignalMessaging/attachments/SignalAttachment.swift @@ -193,12 +193,7 @@ public class SignalAttachment: NSObject { // MARK: @objc - public static let isMultiSendEnabled = true - - @objc - public static var maxAttachmentsAllowed: Int { - return isMultiSendEnabled ? 32 : 1 - } + public static let maxAttachmentsAllowed: Int = 32 // MARK: Constructor From 7dbb9517af973364f3edf8139e92aa0230fa8e5b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Mar 2019 18:18:13 -0600 Subject: [PATCH 400/493] Centralize attachment state in nav controller --- Signal.xcodeproj/project.pbxproj | 4 + .../ConversationViewController.m | 60 +--- .../Photos/ImagePickerController.swift | 228 ++++---------- .../Photos/PhotoCaptureViewController.swift | 1 + .../ViewControllers/Photos/PhotoLibrary.swift | 9 +- .../SendMediaNavigationController.swift | 295 ++++++++++++++++++ .../AttachmentApprovalViewController.swift | 18 +- .../SharingThreadPickerViewController.m | 3 +- .../Views/ImageEditor/OrderedDictionary.swift | 4 + .../attachments/SignalAttachment.swift | 4 - SignalServiceKit/src/Util/FeatureFlags.swift | 2 +- 11 files changed, 402 insertions(+), 226 deletions(-) create mode 100644 Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 3d13edd0f..c05e80e06 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -483,6 +483,7 @@ 4C3E245D21F2B395000AE092 /* DirectionalPanGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4523149F1F7E9E18003A428C /* DirectionalPanGestureRecognizer.swift */; }; 4C3EF7FD2107DDEE0007EBF7 /* ParamParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */; }; 4C3EF802210918740007EBF7 /* SSKProtoEnvelopeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */; }; + 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */; }; 4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */; }; 4C4BC6C32102D697004040C9 /* ContactDiscoveryOperationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4BC6C22102D697004040C9 /* ContactDiscoveryOperationTest.swift */; }; 4C5250D221E7BD7D00CE3D95 /* PhoneNumberValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5250D121E7BD7D00CE3D95 /* PhoneNumberValidator.swift */; }; @@ -1233,6 +1234,7 @@ 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = ""; }; 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamParserTest.swift; sourceTree = ""; }; 4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSKProtoEnvelopeTest.swift; sourceTree = ""; }; + 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMediaNavigationController.swift; sourceTree = ""; }; 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissableTextField.swift; sourceTree = ""; }; 4C4BC6C22102D697004040C9 /* ContactDiscoveryOperationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ContactDiscoveryOperationTest.swift; path = contact/ContactDiscoveryOperationTest.swift; sourceTree = ""; }; 4C5250D121E7BD7D00CE3D95 /* PhoneNumberValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneNumberValidator.swift; sourceTree = ""; }; @@ -1857,6 +1859,7 @@ 34969558219B605E00DCFE74 /* Photos */ = { isa = PBXGroup; children = ( + 4C4AE69F224AF21900D4AF6F /* SendMediaNavigationController.swift */, 34969559219B605E00DCFE74 /* ImagePickerController.swift */, 3496955A219B605E00DCFE74 /* PhotoCollectionPickerController.swift */, 3496955B219B605E00DCFE74 /* PhotoLibrary.swift */, @@ -3659,6 +3662,7 @@ 340FC8AB204DAC8D007AEB0F /* DomainFrontingCountryViewController.m in Sources */, 3496744D2076768700080B5F /* OWSMessageBubbleView.m in Sources */, 34B3F8751E8DF1700035BE1A /* CallViewController.swift in Sources */, + 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */, 34D8C0281ED3673300188D7C /* DebugUITableViewController.m in Sources */, 45F32C222057297A00A300D5 /* MediaDetailViewController.m in Sources */, 34B3F8851E8DF1700035BE1A /* NewGroupViewController.m in Sources */, diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 79c3744e1..252ad9923 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -133,8 +133,7 @@ typedef enum : NSUInteger { UIDocumentMenuDelegate, UIDocumentPickerDelegate, UIImagePickerControllerDelegate, - OWSImagePickerControllerDelegate, - OWSPhotoCaptureViewControllerDelegate, + SendMediaNavDelegate, UINavigationControllerDelegate, UITextViewDelegate, ConversationCollectionViewDelegate, @@ -2837,24 +2836,6 @@ typedef enum : NSUInteger { [self showApprovalDialogForAttachment:attachment]; } -#pragma mark - OWSPhotoCaptureViewControllerDelegate - -- (void)photoCaptureViewController:(OWSPhotoCaptureViewController *)photoCaptureViewController - didFinishProcessingAttachment:(SignalAttachment *)attachment -{ - OWSLogDebug(@""); - [self dismissViewControllerAnimated:YES - completion:^{ - [self showApprovalDialogForAttachment:attachment]; - }]; -} - -- (void)photoCaptureViewControllerDidCancel:(OWSPhotoCaptureViewController *)photoCaptureViewController -{ - OWSLogDebug(@""); - [self dismissViewControllerAnimated:YES completion:nil]; -} - #pragma mark - UIImagePickerController /* @@ -2877,19 +2858,8 @@ typedef enum : NSUInteger { UIViewController *pickerModal; if (SSKFeatureFlags.useCustomPhotoCapture) { - OWSPhotoCaptureViewController *captureVC = [OWSPhotoCaptureViewController new]; - captureVC.delegate = self; - OWSNavigationController *navController = - [[OWSNavigationController alloc] initWithRootViewController:captureVC]; - UINavigationBar *navigationBar = navController.navigationBar; - if (![navigationBar isKindOfClass:[OWSNavigationBar class]]) { - OWSFailDebug(@"navigationBar was nil or unexpected class"); - } else { - OWSNavigationBar *owsNavigationBar = (OWSNavigationBar *)navigationBar; - [owsNavigationBar overrideThemeWithType:NavigationBarThemeOverrideClear]; - } - navController.ows_prefersStatusBarHidden = @(YES); - + SendMediaNavigationController *navController = [SendMediaNavigationController showingCameraFirst]; + navController.sendMediaNavDelegate = self; pickerModal = navController; } else { UIImagePickerController *picker = [OWSImagePickerController new]; @@ -2933,11 +2903,8 @@ typedef enum : NSUInteger { return; } - OWSImagePickerGridController *picker = [OWSImagePickerGridController new]; - picker.delegate = self; - - OWSNavigationController *pickerModal = [[OWSNavigationController alloc] initWithRootViewController:picker]; - pickerModal.ows_prefersStatusBarHidden = @(YES); + SendMediaNavigationController *pickerModal = [SendMediaNavigationController showingMediaLibraryFirst]; + pickerModal.sendMediaNavDelegate = self; [self dismissKeyBoard]; [self presentViewController:pickerModal animated:YES completion:nil]; @@ -2960,13 +2927,19 @@ typedef enum : NSUInteger { self.view.frame = frame; } -#pragma mark - OWSImagePickerControllerDelegate +#pragma mark - SendMediaNavDelegate -- (void)imagePicker:(OWSImagePickerGridController *)imagePicker - didPickImageAttachments:(NSArray *)attachments - messageText:(NSString *_Nullable)messageText +- (void)sendMediaNavDidCancel:(SendMediaNavigationController *)sendMediaNavigationController +{ + [self dismissViewControllerAnimated:YES completion:nil]; +} + +- (void)sendMediaNav:(SendMediaNavigationController *)sendMediaNavigationController + didApproveAttachments:(NSArray *)attachments + messageText:(nullable NSString *)messageText { [self tryToSendAttachments:attachments messageText:messageText]; + [self dismissViewControllerAnimated:YES completion:nil]; } #pragma mark - UIImagePickerControllerDelegate @@ -3943,8 +3916,7 @@ typedef enum : NSUInteger { [self scrollToBottomAnimated:NO]; } -- (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval - didCancelAttachments:(NSArray *)attachment +- (void)attachmentApprovalDidCancel:(AttachmentApprovalViewController *)attachmentApproval { [self dismissViewControllerAnimated:YES completion:nil]; } diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 54ac6aa07..82f93c855 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -6,16 +6,19 @@ import Foundation import Photos import PromiseKit -@objc(OWSImagePickerControllerDelegate) -protocol ImagePickerControllerDelegate { - func imagePicker(_ imagePicker: ImagePickerGridController, didPickImageAttachments attachments: [SignalAttachment], messageText: String?) +protocol ImagePickerGridControllerDelegate: AnyObject { + func imagePickerDidCompleteSelection(_ imagePicker: ImagePickerGridController) + + func imagePicker(_ imagePicker: ImagePickerGridController, isAssetSelected asset: PHAsset) -> Bool + func imagePicker(_ imagePicker: ImagePickerGridController, didSelectAsset asset: PHAsset, attachmentPromise: Promise) + func imagePicker(_ imagePicker: ImagePickerGridController, didDeselectAsset asset: PHAsset) + + func imagePickerCanSelectAdditionalItems(_ imagePicker: ImagePickerGridController) -> Bool } -@objc(OWSImagePickerGridController) -class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegate, PhotoCollectionPickerDelegate, AttachmentApprovalViewControllerDelegate { +class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegate, PhotoCollectionPickerDelegate { - @objc - weak var delegate: ImagePickerControllerDelegate? + weak var delegate: ImagePickerGridControllerDelegate? private let library: PhotoLibrary = PhotoLibrary() private var photoCollection: PhotoCollection @@ -25,12 +28,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat var collectionViewFlowLayout: UICollectionViewFlowLayout var titleView: TitleView! - // We use NSMutableOrderedSet so that we can honor selection order. - private let selectedIds = NSMutableOrderedSet() - - // This variable should only be accessed on the main thread. - private var assetIdToCommentMap = [String: String]() - init() { collectionViewFlowLayout = type(of: self).buildLayout() photoCollection = library.defaultPhotoCollection() @@ -79,10 +76,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat navigationItem.titleView = titleView self.titleView = titleView - let featureFlag_isMultiselectEnabled = true - if featureFlag_isMultiselectEnabled { - updateSelectButton() - } + updateSelectButton() collectionView.backgroundColor = .ows_gray95 @@ -109,6 +103,11 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } + guard let delegate = delegate else { + owsFailDebug("delegate was unexpectedly nil") + return + } + switch selectionPanGesture.state { case .possible: break @@ -121,7 +120,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } let asset = photoCollectionContents.asset(at: indexPath.item) - if selectedIds.contains(asset.localIdentifier) { + if delegate.imagePicker(self, isAssetSelected: asset) { selectionPanGestureMode = .deselect } else { selectionPanGestureMode = .select @@ -149,28 +148,30 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } + guard let delegate = delegate else { + owsFailDebug("delegate was unexpectedly nil") + return + } + let asset = photoCollectionContents.asset(at: indexPath.item) switch selectionPanGestureMode { case .select: - guard canSelectAdditionalItems else { + guard delegate.imagePickerCanSelectAdditionalItems(self) else { showTooManySelectedToast() return } - selectedIds.add(asset.localIdentifier) + let attachmentPromise: Promise = photoCollectionContents.outgoingAttachment(for: asset) + delegate.imagePicker(self, didSelectAsset: asset, attachmentPromise: attachmentPromise) collectionView.selectItem(at: indexPath, animated: true, scrollPosition: []) case .deselect: - selectedIds.remove(asset.localIdentifier) + delegate.imagePicker(self, didDeselectAsset: asset) collectionView.deselectItem(at: indexPath, animated: true) } updateDoneButton() } - var canSelectAdditionalItems: Bool { - return selectedIds.count <= SignalAttachment.maxAttachmentsAllowed - } - override func viewWillLayoutSubviews() { super.viewWillLayoutSubviews() updateLayout() @@ -263,14 +264,18 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } + guard let delegate = delegate else { + owsFailDebug("delegate was unexpectedly nil") + return + } + collectionView.reloadData() collectionView.layoutIfNeeded() let count = photoCollectionContents.assetCount for index in 0..] = assets.map({ - return self.photoCollectionContents.outgoingAttachment(for: $0) - }) - - firstly { - when(fulfilled: attachmentPromises) - }.map { attachments in - Logger.debug("built all attachments") - - DispatchQueue.main.async { - modal.dismiss(completion: { - self.didComplete(withAttachments: attachments) - }) - } - }.catch { error in - Logger.error("failed to prepare attachments. error: \(error)") - DispatchQueue.main.async { - modal.dismiss(completion: { - OWSAlerts.showAlert(title: NSLocalizedString("IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS", comment: "alert title")) - }) - } - }.retainUntilComplete() - } - } - - private func didComplete(withAttachments attachments: [SignalAttachment]) { - AssertIsOnMainThread() - - for attachment in attachments { - guard let assetId = attachment.assetId else { - owsFailDebug("Attachment is missing asset id.") - continue - } - // Link the attachment with its asset to ensure caption continuity. - attachment.assetId = assetId - // Restore any existing caption for this attachment. - attachment.captionText = assetIdToCommentMap[assetId] - } - - let vc = AttachmentApprovalViewController(mode: .sharedNavigation, attachments: attachments) - vc.approvalDelegate = self - navigationController?.pushViewController(vc, animated: true) + delegate.imagePickerDidCompleteSelection(self) } var hasPressedDoneSinceAppeared: Bool = false @@ -465,18 +406,13 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat self.doneButton.isEnabled = false } - func deselectAnySelected() { + func clearCollectionViewSelection() { guard let collectionView = self.collectionView else { owsFailDebug("collectionView was unexpectedly nil") return } - selectedIds.removeAllObjects() collectionView.indexPathsForSelectedItems?.forEach { collectionView.deselectItem(at: $0, animated: false)} - - if isInBatchSelectMode { - updateDoneButton() - } } func showTooManySelectedToast() { @@ -577,7 +513,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat } // Any selections are invalid as they refer to indices in a different collection - deselectAnySelected() + clearCollectionViewSelection() photoCollection = collection photoCollectionContents = photoCollection.contents() @@ -605,25 +541,33 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat } override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - let asset = photoCollectionContents.asset(at: indexPath.item) + guard let delegate = delegate else { + owsFailDebug("delegate was unexpectedly nil") + return + } + + let asset: PHAsset = photoCollectionContents.asset(at: indexPath.item) + let attachmentPromise: Promise = photoCollectionContents.outgoingAttachment(for: asset) + delegate.imagePicker(self, didSelectAsset: asset, attachmentPromise: attachmentPromise) if isInBatchSelectMode { - let assetId = asset.localIdentifier - selectedIds.add(assetId) updateDoneButton() } else { // Don't show "selected" badge unless we're in batch mode collectionView.deselectItem(at: indexPath, animated: false) - complete(withAssets: [asset]) + delegate.imagePickerDidCompleteSelection(self) } } public override func collectionView(_ collectionView: UICollectionView, didDeselectItemAt indexPath: IndexPath) { Logger.debug("") + guard let delegate = delegate else { + owsFailDebug("delegate was unexpectedly nil") + return + } let asset = photoCollectionContents.asset(at: indexPath.item) - let assetId = asset.localIdentifier - selectedIds.remove(assetId) + delegate.imagePicker(self, didDeselectAsset: asset) if isInBatchSelectMode { updateDoneButton() @@ -635,69 +579,27 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat } override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + guard let delegate = delegate else { + return UICollectionViewCell(forAutoLayout: ()) + } + guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: PhotoGridViewCell.reuseIdentifier, for: indexPath) as? PhotoGridViewCell else { owsFail("cell was unexpectedly nil") } + cell.loadingColor = UIColor(white: 0.2, alpha: 1) let assetItem = photoCollectionContents.assetItem(at: indexPath.item, photoMediaSize: photoMediaSize) cell.configure(item: assetItem) - let assetId = assetItem.asset.localIdentifier - let isSelected = selectedIds.contains(assetId) - cell.isSelected = isSelected + let isSelected = delegate.imagePicker(self, isAssetSelected: assetItem.asset) + if isSelected { + cell.isSelected = isSelected + } else { + cell.isSelected = isSelected + } return cell } - - // MARK: - AttachmentApprovalViewControllerDelegate - - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) { - self.dismiss(animated: true) { - self.delegate?.imagePicker(self, didPickImageAttachments: attachments, messageText: messageText) - } - } - - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment]) { - navigationController?.popToViewController(self, animated: true) - } - - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, addMoreToAttachments attachments: [SignalAttachment]) { - // If we re-enter image picking via "add more" button, do so in batch mode. - isInBatchSelectMode = true - - // clear selection - deselectAnySelected() - - // removing-and-readding accomplishes two things - // 1. respect items removed from the rail while in the approval view - // 2. in the case of the user adding more to what was a single item - // which was not selected in batch mode, ensure that item is now - // part of the "batch selection" - for previouslySelected in attachments { - guard let assetId = previouslySelected.assetId else { - owsFailDebug("assetId was unexpectedly nil") - continue - } - - selectedIds.add(assetId as Any) - } - - navigationController?.popToViewController(self, animated: true) - } - - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) { - AssertIsOnMainThread() - - guard let assetId = attachment.assetId else { - owsFailDebug("Attachment missing source id.") - return - } - guard let captionText = attachment.captionText, captionText.count > 0 else { - assetIdToCommentMap.removeValue(forKey: assetId) - return - } - assetIdToCommentMap[assetId] = captionText - } } extension ImagePickerGridController: UIGestureRecognizerDelegate { diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 20271cb02..f12129566 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -148,6 +148,7 @@ class PhotoCaptureViewController: OWSViewController { button.setImage(imageName: imageName) } } + private lazy var dismissControl: PhotoControl = { return PhotoControl(imageName: "ic_x_with_shadow") { [weak self] in self?.didTapClose() diff --git a/Signal/src/ViewControllers/Photos/PhotoLibrary.swift b/Signal/src/ViewControllers/Photos/PhotoLibrary.swift index 077934954..76a59d6cb 100644 --- a/Signal/src/ViewControllers/Photos/PhotoLibrary.swift +++ b/Signal/src/ViewControllers/Photos/PhotoLibrary.swift @@ -79,7 +79,6 @@ class PhotoCollectionContents { enum PhotoLibraryError: Error { case assertionError(description: String) case unsupportedMediaType - } init(fetchResult: PHFetchResult, localizedTitle: String?) { @@ -207,15 +206,11 @@ class PhotoCollectionContents { switch asset.mediaType { case .image: return requestImageDataSource(for: asset).map { (dataSource: DataSource, dataUTI: String) in - let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .medium) - attachment.assetId = asset.localIdentifier - return attachment + return SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI, imageQuality: .medium) } case .video: return requestVideoDataSource(for: asset).map { (dataSource: DataSource, dataUTI: String) in - let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI) - attachment.assetId = asset.localIdentifier - return attachment + return SignalAttachment.attachment(dataSource: dataSource, dataUTI: dataUTI) } default: return Promise(error: PhotoLibraryError.unsupportedMediaType) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift new file mode 100644 index 000000000..11eac7a05 --- /dev/null +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -0,0 +1,295 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +import Foundation +import Photos +import PromiseKit + +@objc +protocol SendMediaNavDelegate: AnyObject { + func sendMediaNavDidCancel(_ sendMediaNavigationController: SendMediaNavigationController) + func sendMediaNav(_ sendMediaNavigationController: SendMediaNavigationController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) +} + +@objc +class SendMediaNavigationController: OWSNavigationController { + + // MARK: - Overrides + + override var prefersStatusBarHidden: Bool { return true } + + // MARK: - + + @objc + public weak var sendMediaNavDelegate: SendMediaNavDelegate? + + @objc + public class func showingCameraFirst() -> SendMediaNavigationController { + let navController = SendMediaNavigationController() + + if let owsNavBar = navController.navigationBar as? OWSNavigationBar { + owsNavBar.overrideTheme(type: .clear) + } else { + owsFailDebug("unexpected navbar: \(navController.navigationBar)") + } + navController.setViewControllers([navController.captureViewController], animated: false) + + return navController + } + + @objc + public class func showingMediaLibraryFirst() -> SendMediaNavigationController { + let navController = SendMediaNavigationController() + + if let owsNavBar = navController.navigationBar as? OWSNavigationBar { + owsNavBar.overrideTheme(type: .clear) + } else { + owsFailDebug("unexpected navbar: \(navController.navigationBar)") + } + navController.setViewControllers([navController.mediaLibraryViewController], animated: false) + + return navController + } + + // MARK: + + private var attachmentDraftCollection: AttachmentDraftCollection = .empty + + private var attachments: [SignalAttachment] { + return attachmentDraftCollection.attachmentDrafts.map { $0.attachment } + } + + private let mediaLibrarySelections: OrderedDictionary = OrderedDictionary() + + // MARK: Child VC's + + private lazy var captureViewController: PhotoCaptureViewController = { + let vc = PhotoCaptureViewController() + vc.delegate = self + + return vc + }() + + private lazy var mediaLibraryViewController: ImagePickerGridController = { + let vc = ImagePickerGridController() + vc.delegate = self + + return vc + }() + + private func pushApprovalViewController() { + let approvalViewController = AttachmentApprovalViewController(mode: .sharedNavigation, attachments: self.attachments) + approvalViewController.approvalDelegate = self + + pushViewController(approvalViewController, animated: true) + } +} + +extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { + func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) { + attachmentDraftCollection.append(.camera(attachment: attachment)) + + pushApprovalViewController() + } + + func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) { + // TODO + // sometimes we might want this to be a "back" to the approval view + // other times we might want this to be a "close" and take me back to the CVC + // seems like we should show the "back" and have a seprate "didTapBack" delegate method or something... + + self.sendMediaNavDelegate?.sendMediaNavDidCancel(self) + } +} + +extension SendMediaNavigationController: ImagePickerGridControllerDelegate { + + func imagePickerDidCompleteSelection(_ imagePicker: ImagePickerGridController) { + let mediaLibrarySelections: [MediaLibrarySelection] = self.mediaLibrarySelections.orderedValues + + let backgroundBlock: (ModalActivityIndicatorViewController) -> Void = { modal in + let attachmentPromises: [Promise] = mediaLibrarySelections.map { $0.promise } + + when(fulfilled: attachmentPromises).map { attachments in + Logger.debug("built all attachments") + modal.dismiss { + self.attachmentDraftCollection.selectedFromPicker(attachments: attachments) + self.pushApprovalViewController() + } + }.catch { error in + Logger.error("failed to prepare attachments. error: \(error)") + modal.dismiss { + OWSAlerts.showAlert(title: NSLocalizedString("IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS", comment: "alert title")) + } + }.retainUntilComplete() + } + + ModalActivityIndicatorViewController.present(fromViewController: self, + canCancel: false, + backgroundBlock: backgroundBlock) + } + + func imagePicker(_ imagePicker: ImagePickerGridController, isAssetSelected asset: PHAsset) -> Bool { + return mediaLibrarySelections.hasValue(forKey: asset) + } + + func imagePicker(_ imagePicker: ImagePickerGridController, didSelectAsset asset: PHAsset, attachmentPromise: Promise) { + guard !mediaLibrarySelections.hasValue(forKey: asset) else { + return + } + + let libraryMedia = MediaLibrarySelection(asset: asset, signalAttachmentPromise: attachmentPromise) + mediaLibrarySelections.append(key: asset, value: libraryMedia) + } + + func imagePicker(_ imagePicker: ImagePickerGridController, didDeselectAsset asset: PHAsset) { + if mediaLibrarySelections.hasValue(forKey: asset) { + mediaLibrarySelections.remove(key: asset) + } + } + + func imagePickerCanSelectAdditionalItems(_ imagePicker: ImagePickerGridController) -> Bool { + return attachmentDraftCollection.count <= SignalAttachment.maxAttachmentsAllowed + } +} + +extension SendMediaNavigationController: AttachmentApprovalViewControllerDelegate { + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didRemoveAttachment attachment: SignalAttachment) { + guard let removedDraft = attachmentDraftCollection.attachmentDrafts.first(where: { $0.attachment == attachment}) else { + owsFailDebug("removedDraft was unexpectedly nil") + return + } + + switch removedDraft.source { + case .picker(attachment: let pickerAttachment): + mediaLibrarySelections.remove(key: pickerAttachment.asset) + case .camera(attachment: _): + break + } + + attachmentDraftCollection.remove(attachment: attachment) + } + + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) { + sendMediaNavDelegate?.sendMediaNav(self, didApproveAttachments: attachments, messageText: messageText) + } + + func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) { + sendMediaNavDelegate?.sendMediaNavDidCancel(self) + } + + func attachmentApprovalDidTapAddMore(_ attachmentApproval: AttachmentApprovalViewController) { + // Current design dicates we'll go "back" to the single thing before us. + assert(viewControllers.count == 2) + + // regardless of which VC we're going "back" to, we're in "batch" mode at this point. + mediaLibraryViewController.isInBatchSelectMode = true + mediaLibraryViewController.collectionView?.reloadData() + + popViewController(animated: true) + } +} + +enum AttachmentDraft { + case camera(attachment: SignalAttachment) + case picker(attachment: MediaLibraryAttachment) +} + +extension AttachmentDraft { + var attachment: SignalAttachment { + switch self { + case .camera(let cameraAttachment): + return cameraAttachment + case .picker(let pickerAttachment): + return pickerAttachment.signalAttachment + } + } + + var source: AttachmentDraft { + return self + } +} + +struct AttachmentDraftCollection { + private(set) var attachmentDrafts: [AttachmentDraft] + + static var empty: AttachmentDraftCollection { + return AttachmentDraftCollection(attachmentDrafts: []) + } + + // MARK - + + var count: Int { + return attachmentDrafts.count + } + + var pickerAttachments: [MediaLibraryAttachment] { + return attachmentDrafts.compactMap { attachmentDraft in + switch attachmentDraft.source { + case .picker(let pickerAttachment): + return pickerAttachment + case .camera: + return nil + } + } + } + + mutating func append(_ element: AttachmentDraft) { + attachmentDrafts.append(element) + } + + mutating func remove(attachment: SignalAttachment) { + attachmentDrafts = attachmentDrafts.filter { $0.attachment != attachment } + } + + mutating func selectedFromPicker(attachments: [MediaLibraryAttachment]) { + let pickedAttachments: Set = Set(attachments) + let oldPickerAttachments: Set = Set(self.pickerAttachments) + + for removedAttachment in oldPickerAttachments.subtracting(pickedAttachments) { + remove(attachment: removedAttachment.signalAttachment) + } + + // enumerate over new attachments to maintain order from picker + for attachment in attachments { + guard !oldPickerAttachments.contains(attachment) else { + continue + } + append(.picker(attachment: attachment)) + } + } +} + +struct MediaLibrarySelection: Hashable, Equatable { + let asset: PHAsset + let signalAttachmentPromise: Promise + + var hashValue: Int { + return asset.hashValue + } + + var promise: Promise { + let asset = self.asset + return signalAttachmentPromise.map { signalAttachment in + return MediaLibraryAttachment(asset: asset, signalAttachment: signalAttachment) + } + } + + static func ==(lhs: MediaLibrarySelection, rhs: MediaLibrarySelection) -> Bool { + return lhs.asset == rhs.asset + } +} + +struct MediaLibraryAttachment: Hashable, Equatable { + let asset: PHAsset + let signalAttachment: SignalAttachment + + public var hashValue: Int { + return asset.hashValue + } + + public static func == (lhs: MediaLibraryAttachment, rhs: MediaLibraryAttachment) -> Bool { + return lhs.asset == rhs.asset + } +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 6c674f1b7..7017c122e 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -10,9 +10,16 @@ import PromiseKit @objc public protocol AttachmentApprovalViewControllerDelegate: class { func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment]) - @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, addMoreToAttachments attachments: [SignalAttachment]) - @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) + func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) + + @objc + optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didRemoveAttachment attachment: SignalAttachment) + + @objc + optional func attachmentApprovalDidTapAddMore(_ attachmentApproval: AttachmentApprovalViewController) + + @objc + optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) } // MARK: - @@ -363,6 +370,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC }, completion: { _ in self.attachmentItemCollection.remove(item: attachmentItem) + self.approvalDelegate?.attachmentApproval?(self, didRemoveAttachment: attachmentItem.attachment) self.updateMediaRail() }) } @@ -629,7 +637,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } private func cancelPressed() { - self.approvalDelegate?.attachmentApproval(self, didCancelAttachments: attachments) + self.approvalDelegate?.attachmentApprovalDidCancel(self) } @objc func didTapCaption(sender: UIButton) { @@ -668,7 +676,7 @@ extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { } func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) { - self.approvalDelegate?.attachmentApproval?(self, addMoreToAttachments: attachments) + self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self) } } diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index b704057ff..0097efa37 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -305,8 +305,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); fromViewController:attachmentApproval]; } -- (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval - didCancelAttachments:(NSArray *)attachment +- (void)attachmentApprovalDidCancel:(AttachmentApprovalViewController *)attachmentApproval { [self cancelShareExperience]; } diff --git a/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift index 7aa6d7d28..5cdd820c1 100644 --- a/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift +++ b/SignalMessaging/Views/ImageEditor/OrderedDictionary.swift @@ -30,6 +30,10 @@ public class OrderedDictionary { return keyValueMap[key] } + public func hasValue(forKey key: KeyType) -> Bool { + return keyValueMap[key] != nil + } + public func append(key: KeyType, value: ValueType) { if keyValueMap[key] != nil { owsFailDebug("Unexpected duplicate key in key map: \(key)") diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift index f872f3b08..4a78de696 100644 --- a/SignalMessaging/attachments/SignalAttachment.swift +++ b/SignalMessaging/attachments/SignalAttachment.swift @@ -160,10 +160,6 @@ public class SignalAttachment: NSObject { @objc public let dataUTI: String - // Can be used by views to link this SignalAttachment with an Photos framework asset. - @objc - public var assetId: String? - var error: SignalAttachmentError? { didSet { AssertIsOnMainThread() diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 4d58938c0..afe797338 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -22,6 +22,6 @@ public class FeatureFlags: NSObject { @objc public static var useCustomPhotoCapture: Bool { - return false + return true } } From 1a4062dd89a97dd4c5cdb8e06a9bd9406abc91a4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 06:37:23 -0600 Subject: [PATCH 401/493] Nav buttons: batch, camera/library switch, done --- .../Contents.json | 23 ++ .../create-album-outline-32@1x.png | Bin 0 -> 477 bytes .../create-album-outline-32@2x.png | Bin 0 -> 813 bytes .../create-album-outline-32@3x.png | Bin 0 -> 1208 bytes .../Photos/ImagePickerController.swift | 115 +----- .../SendMediaNavigationController.swift | 335 ++++++++++++++++-- SignalMessaging/categories/UIFont+OWS.h | 1 + SignalMessaging/categories/UIFont+OWS.m | 6 + SignalMessaging/categories/UIView+OWS.h | 1 + SignalMessaging/categories/UIView+OWS.m | 9 +- 10 files changed, 360 insertions(+), 130 deletions(-) create mode 100644 Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/Contents.json create mode 100644 Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@1x.png create mode 100644 Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@2x.png create mode 100644 Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@3x.png diff --git a/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/Contents.json b/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/Contents.json new file mode 100644 index 000000000..ae32da7a5 --- /dev/null +++ b/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "create-album-outline-32@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "create-album-outline-32@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "create-album-outline-32@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@1x.png b/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d23c007d13f7c74ecb487527c2e2ffa568ca4936 GIT binary patch literal 477 zcmV<30V4j1P)ff2ev!v^UF zjF3*Co;W#YED;<+6MB7jCUN}r{3OeQm>F~8Vb;~}fdIq=X#ubSaFFH^r3J79Pqy1jxp66hFrd_W1)v^j zie7V^n1G0+vS;Rsh-C54NJd}6Jgfjby5>j}ke^!L!_Hql=?0pkPz8)R`Uo6-!JBXd z5!rbgf4dY1#>noWQB!pI`;kzbRh(Cyc6tJ1(Geh`a#jM&d@!vOU@>$F$JVRxB%+fB zX0FWyDK5l;+BwT!sCA1oHUzgSd>gC)fM-X6cK~mC&T}^1DKnTrDr+QrlO=hAy9`8y z`7$AaZ^>kcXl;5 zT?XUja#s*=Ga{3g2M|%Ak!z{W*%xHw9_hQx@^V6lb!-kd+}<=Ro&*2<&nbW(iTSP3 Tbda`p00000NkvXXu0mjfzh=!U literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@2x.png b/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9ccabb7c69fce53efb9b3b2cb0d4a6d58bbf66a5 GIT binary patch literal 813 zcmV+|1JeA7P)h5!$HpY63(cTNF-&KQ-utRcXi9CHn| zTZlozkdpxa>6=fUhvjb$hn*3lbIR^g5|lzXwiSktMtR4MmpCyduMSEf96X2yH%9qr zbbNQKLu?}?XW6sa9ueJ>|L)a)XVOOQeCgHU$=QvF@zud%g`coFxo~H)%r(BU+PH_+ zK`9al@Z-J+=RMn#SBEJtL%q0uC!&L@u`r0ptzaL*ir0`u*S-xF=e)pHT(49qV+sM! z;yOIJEDt$xKZmTjb_C2l+h2kt+p0ehX#^W74lQ r?axuAsSJ$(rKt>!fC6k-4gl~E>TFL#pFtBG00000NkvXXu0mjfl8j{` literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@3x.png b/Signal/Images.xcassets/media_send_batch_mode_disabled.imageset/create-album-outline-32@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b13aa24b3e1399da20c58955939905ac51468983 GIT binary patch literal 1208 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJ<{->y95KI&fq^B< z)5S5QV$R#S7YlD2@U%6?-Ji@miT4%nth@=luY3ghC*(}Z7W zfB6YIOjOczT=wzq!`4Z;LH3+NTUZnY8y6lI-~DaZ42DyfsAlcY&m9%a4DPQ#&7HgE z{OW*aU4}OuFU+ltMD>L93>kK?G_W(=*u6gc2;V;6=}WJxr!5u#zilJ;ee>(vq*uOu z#l&!6a=^o|T;14ascBm!+dK3bK1`P7`24K>YfwSn=i4WC-4VRVt*yJX=)C=}b5pzH?AqKr`Wq23F^e1`QmI4|)XdLG>&*!A2tOd;~XU!Gr1_irz?T2Ef){YTGDl4@l6hn zIpR^P4aoL*CE9#;4=Y(Ftye+pfUp@MM zOM2F8HgOG8mK$8pJ#LGHHcxBqQs`}IE?Jji`hQZ)#!39sub8-O`REuuom;-bZKY;| z$iuuy&)FV<8?PuzPX4Fq?@}FhLoLXCvX#o=cU>zSG}OEfvIHChqh-q&{{H=AUgmcD z%k9};{vVs7oZu;)T|D9Hy|fqsr98ojR%*Ju;_YV{(c|BR^@IOj3E_!GOq)A zg+;pV+@3-QmaA637me3_=~=P;v!~0Ajguu7CO>0%nfamG#pcPfc#lk{4^_`dSq@f z3NFuWxf1()!X}+5nns$-&9pVv^n^@Qe|e{kCBo;NMf;R3Tcp>Rw&q{odqGVzW9r0^ znF$t?)?Ycf|AFGA&zh<$e=dJNk&9bfEj8-Bn(1Ahr*q?exUQdPSw6`;>-R!Sv-*;? zcP>`j3weKE^sMq?{}QjI_k>Pq-CmWN>YvUkykqgghqsz!)#~dV7ILiJ=eqdRYd-av z%uX)%l#8e7|CtlY(44$|sYWsrCdy!9_|MQZLF) func imagePicker(_ imagePicker: ImagePickerGridController, didDeselectAsset asset: PHAsset) + var isInBatchSelectMode: Bool { get } func imagePickerCanSelectAdditionalItems(_ imagePicker: ImagePickerGridController) -> Bool } @@ -76,8 +77,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat navigationItem.titleView = titleView self.titleView = titleView - updateSelectButton() - collectionView.backgroundColor = .ows_gray95 let selectionPanGesture = DirectionalPanGestureRecognizer(direction: [.horizontal], target: self, action: #selector(didPanSelection)) @@ -94,10 +93,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat @objc func didPanSelection(_ selectionPanGesture: UIPanGestureRecognizer) { - guard isInBatchSelectMode else { - return - } - guard let collectionView = collectionView else { owsFailDebug("collectionView was unexpectedly nil") return @@ -108,6 +103,10 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } + guard delegate.isInBatchSelectMode else { + return + } + switch selectionPanGesture.state { case .possible: break @@ -138,11 +137,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat } func tryToToggleBatchSelect(at indexPath: IndexPath) { - guard isInBatchSelectMode else { - owsFailDebug("isInBatchSelectMode was unexpectedly false") - return - } - guard let collectionView = collectionView else { owsFailDebug("collectionView was unexpectedly nil") return @@ -153,6 +147,11 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } + guard delegate.isInBatchSelectMode else { + owsFailDebug("isInBatchSelectMode was unexpectedly false") + return + } + let asset = photoCollectionContents.asset(at: indexPath.item) switch selectionPanGestureMode { case .select: @@ -168,8 +167,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat delegate.imagePicker(self, didDeselectAsset: asset) collectionView.deselectItem(at: indexPath, animated: true) } - - updateDoneButton() } override func viewWillLayoutSubviews() { @@ -181,12 +178,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - if let navBar = self.navigationController?.navigationBar as? OWSNavigationBar { - navBar.overrideTheme(type: .alwaysDark) - } else { - owsFailDebug("Invalid nav bar.") - } - // Determine the size of the thumbnails to request let scale = UIScreen.main.scale let cellSize = collectionViewFlowLayout.itemSize @@ -217,10 +208,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat super.viewDidAppear(animated) hasEverAppeared = true - // done button may have been disable from the last time we hit "Done" - // make sure to re-enable it if appropriate upon returning to the view - hasPressedDoneSinceAppeared = false - updateDoneButton() // Since we're presenting *over* the ConversationVC, we need to `becomeFirstResponder`. // @@ -332,78 +319,18 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat // MARK: - Batch Selection - lazy var doneButton: UIBarButtonItem = { - return UIBarButtonItem(barButtonSystemItem: .done, - target: self, - action: #selector(didPressDone)) - }() - - lazy var selectButton: UIBarButtonItem = { - return UIBarButtonItem(title: NSLocalizedString("BUTTON_SELECT", comment: "Button text to enable batch selection mode"), - style: .plain, - target: self, - action: #selector(didTapSelect)) - }() - - var isInBatchSelectMode = false { - didSet { - collectionView!.allowsMultipleSelection = isInBatchSelectMode - updateSelectButton() - updateDoneButton() - } - } - - @objc - func didPressDone(_ sender: Any) { - Logger.debug("") - + func batchSelectModeDidChange() { guard let delegate = delegate else { - owsFailDebug("delegate was unexpectedly nil") return } - hasPressedDoneSinceAppeared = true - updateDoneButton() - - delegate.imagePickerDidCompleteSelection(self) - } - - var hasPressedDoneSinceAppeared: Bool = false - func updateDoneButton() { - guard let collectionView = self.collectionView else { + guard let collectionView = collectionView else { owsFailDebug("collectionView was unexpectedly nil") return } - guard !hasPressedDoneSinceAppeared else { - doneButton.isEnabled = false - return - } - - if let count = collectionView.indexPathsForSelectedItems?.count, count > 0 { - doneButton.isEnabled = true - } else { - doneButton.isEnabled = false - } - } - - func updateSelectButton() { - guard !isShowingCollectionPickerController else { - navigationItem.rightBarButtonItem = nil - return - } - - let button = isInBatchSelectMode ? doneButton : selectButton - button.tintColor = .ows_gray05 - navigationItem.rightBarButtonItem = button - } - - @objc - func didTapSelect(_ sender: Any) { - isInBatchSelectMode = true - - // disabled until at least one item is selected - self.doneButton.isEnabled = false + collectionView.allowsMultipleSelection = delegate.isInBatchSelectMode + collectionView.reloadData() } func clearCollectionViewSelection() { @@ -477,9 +404,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat UIView.animate(.promise, duration: 0.25, delay: 0, options: .curveEaseInOut) { collectionPickerView.superview?.layoutIfNeeded() - - self.updateSelectButton() - self.titleView.rotateIcon(.up) }.retainUntilComplete() } @@ -494,9 +418,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat UIView.animate(.promise, duration: 0.25, delay: 0, options: .curveEaseInOut) { collectionPickerController.view.frame = self.view.frame.offsetBy(dx: 0, dy: self.view.frame.height) - - self.updateSelectButton() - self.titleView.rotateIcon(.down) }.done { _ in collectionPickerController.view.removeFromSuperview() @@ -550,9 +471,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat let attachmentPromise: Promise = photoCollectionContents.outgoingAttachment(for: asset) delegate.imagePicker(self, didSelectAsset: asset, attachmentPromise: attachmentPromise) - if isInBatchSelectMode { - updateDoneButton() - } else { + if !delegate.isInBatchSelectMode { // Don't show "selected" badge unless we're in batch mode collectionView.deselectItem(at: indexPath, animated: false) delegate.imagePickerDidCompleteSelection(self) @@ -568,10 +487,6 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat let asset = photoCollectionContents.asset(at: indexPath.item) delegate.imagePicker(self, didDeselectAsset: asset) - - if isInBatchSelectMode { - updateDoneButton() - } } override func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 11eac7a05..e2e7a41b7 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -19,6 +19,32 @@ class SendMediaNavigationController: OWSNavigationController { override var prefersStatusBarHidden: Bool { return true } + override func viewDidLoad() { + super.viewDidLoad() + + self.delegate = self + + view.addSubview(batchModeButton) + batchModeButton.setCompressionResistanceHigh() + batchModeButton.autoPinEdge(toSuperviewMargin: .bottom) + batchModeButton.autoPinEdge(toSuperviewMargin: .trailing) + + view.addSubview(doneButton) + doneButton.setCompressionResistanceHigh() + doneButton.autoPinEdge(toSuperviewMargin: .bottom) + doneButton.autoPinEdge(toSuperviewMargin: .trailing) + + view.addSubview(cameraModeButton) + cameraModeButton.setCompressionResistanceHigh() + cameraModeButton.autoPinEdge(toSuperviewMargin: .bottom) + cameraModeButton.autoPinEdge(toSuperviewMargin: .leading) + + view.addSubview(mediaLibraryModeButton) + mediaLibraryModeButton.setCompressionResistanceHigh() + mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .bottom) + mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .leading) + } + // MARK: - @objc @@ -27,13 +53,8 @@ class SendMediaNavigationController: OWSNavigationController { @objc public class func showingCameraFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() - - if let owsNavBar = navController.navigationBar as? OWSNavigationBar { - owsNavBar.overrideTheme(type: .clear) - } else { - owsFailDebug("unexpected navbar: \(navController.navigationBar)") - } navController.setViewControllers([navController.captureViewController], animated: false) + navController.updateButtons() return navController } @@ -41,18 +62,126 @@ class SendMediaNavigationController: OWSNavigationController { @objc public class func showingMediaLibraryFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() - - if let owsNavBar = navController.navigationBar as? OWSNavigationBar { - owsNavBar.overrideTheme(type: .clear) - } else { - owsFailDebug("unexpected navbar: \(navController.navigationBar)") - } navController.setViewControllers([navController.mediaLibraryViewController], animated: false) + navController.updateButtons() return navController } - // MARK: + var isInBatchSelectMode = false { + didSet { + if oldValue != isInBatchSelectMode { + updateButtons() + mediaLibraryViewController.batchSelectModeDidChange() + } + } + } + + func updateButtons() { + guard let topViewController = viewControllers.last else { + return + } + + switch topViewController { + case is AttachmentApprovalViewController: + batchModeButton.isHidden = true + doneButton.isHidden = true + cameraModeButton.isHidden = true + mediaLibraryModeButton.isHidden = true + case is ImagePickerGridController: + batchModeButton.isHidden = isInBatchSelectMode + doneButton.isHidden = !isInBatchSelectMode || (attachmentDraftCollection.count == 0 && mediaLibrarySelections.count == 0) + cameraModeButton.isHidden = false + mediaLibraryModeButton.isHidden = true + case is PhotoCaptureViewController: + batchModeButton.isHidden = isInBatchSelectMode + doneButton.isHidden = !isInBatchSelectMode || (attachmentDraftCollection.count == 0 && mediaLibrarySelections.count == 0) + cameraModeButton.isHidden = true + mediaLibraryModeButton.isHidden = false + default: + owsFailDebug("unexpected topViewController: \(topViewController)") + } + + doneButton.updateCount() + } + + func fadeTo(viewControllers: [UIViewController]) { + let transition: CATransition = CATransition() + transition.duration = 0.1 + transition.type = kCATransitionFade + view.layer.add(transition, forKey: nil) + setViewControllers(viewControllers, animated: false) + } + + // MARK: - Events + + private func didTapBatchModeButton() { + // There's no way to _disable_ batch mode. + isInBatchSelectMode = true + } + + private func didTapCameraModeButton() { + fadeTo(viewControllers: [captureViewController]) + updateButtons() + } + + private func didTapMediaLibraryModeButton() { + fadeTo(viewControllers: [mediaLibraryViewController]) + updateButtons() + } + + // MARK: Views + + private lazy var doneButton: DoneButton = { + let button = DoneButton() + button.delegate = self + + return button + }() + + private lazy var batchModeButton: UIButton = { + let button = OWSButton(imageName: "media_send_batch_mode_disabled", + tintColor: .ows_gray60, + block: { [weak self] in self?.didTapBatchModeButton() }) + + let width: CGFloat = 44 + button.autoSetDimensions(to: CGSize(width: width, height: width)) + button.layer.cornerRadius = width / 2 + button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) + button.backgroundColor = .ows_white + + return button + }() + + private lazy var cameraModeButton: UIButton = { + let button = OWSButton(imageName: "settings-avatar-camera-2", + tintColor: .ows_gray60, + block: { [weak self] in self?.didTapCameraModeButton() }) + + let width: CGFloat = 44 + button.autoSetDimensions(to: CGSize(width: width, height: width)) + button.layer.cornerRadius = width / 2 + button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) + button.backgroundColor = .ows_white + + return button + }() + + private lazy var mediaLibraryModeButton: UIButton = { + let button = OWSButton(imageName: "actionsheet_camera_roll_black", + tintColor: .ows_gray60, + block: { [weak self] in self?.didTapMediaLibraryModeButton() }) + + let width: CGFloat = 44 + button.autoSetDimensions(to: CGSize(width: width, height: width)) + button.layer.cornerRadius = width / 2 + button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) + button.backgroundColor = .ows_white + + return button + }() + + // MARK: State private var attachmentDraftCollection: AttachmentDraftCollection = .empty @@ -83,22 +212,60 @@ class SendMediaNavigationController: OWSNavigationController { approvalViewController.approvalDelegate = self pushViewController(approvalViewController, animated: true) + updateButtons() + } +} + +extension SendMediaNavigationController: UINavigationControllerDelegate { + func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) { + if let navbarTheme = preferredNavbarTheme(viewController: viewController) { + if let owsNavBar = navigationBar as? OWSNavigationBar { + owsNavBar.overrideTheme(type: navbarTheme) + } else { + owsFailDebug("unexpected navigationBar: \(navigationBar)") + } + } + } + + // In case back navigation was canceled, we re-apply whatever is showing. + func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) { + if let navbarTheme = preferredNavbarTheme(viewController: viewController) { + if let owsNavBar = navigationBar as? OWSNavigationBar { + owsNavBar.overrideTheme(type: navbarTheme) + } else { + owsFailDebug("unexpected navigationBar: \(navigationBar)") + } + } + } + + // MARK: - Helpers + + private func preferredNavbarTheme(viewController: UIViewController) -> OWSNavigationBar.NavigationBarThemeOverride? { + switch viewController { + case is AttachmentApprovalViewController: + return .clear + case is ImagePickerGridController: + return .alwaysDark + case is PhotoCaptureViewController: + return .clear + default: + owsFailDebug("unexpected viewController: \(viewController)") + return nil + } } } extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) { attachmentDraftCollection.append(.camera(attachment: attachment)) - - pushApprovalViewController() + if isInBatchSelectMode { + updateButtons() + } else { + pushApprovalViewController() + } } func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) { - // TODO - // sometimes we might want this to be a "back" to the approval view - // other times we might want this to be a "close" and take me back to the CVC - // seems like we should show the "back" and have a seprate "didTapBack" delegate method or something... - self.sendMediaNavDelegate?.sendMediaNavDidCancel(self) } } @@ -106,6 +273,10 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { extension SendMediaNavigationController: ImagePickerGridControllerDelegate { func imagePickerDidCompleteSelection(_ imagePicker: ImagePickerGridController) { + showApprovalAfterProcessingAnyMediaLibrarySelections() + } + + func showApprovalAfterProcessingAnyMediaLibrarySelections() { let mediaLibrarySelections: [MediaLibrarySelection] = self.mediaLibrarySelections.orderedValues let backgroundBlock: (ModalActivityIndicatorViewController) -> Void = { modal in @@ -141,11 +312,15 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { let libraryMedia = MediaLibrarySelection(asset: asset, signalAttachmentPromise: attachmentPromise) mediaLibrarySelections.append(key: asset, value: libraryMedia) + + updateButtons() } func imagePicker(_ imagePicker: ImagePickerGridController, didDeselectAsset asset: PHAsset) { if mediaLibrarySelections.hasValue(forKey: asset) { mediaLibrarySelections.remove(key: asset) + + updateButtons() } } @@ -184,19 +359,21 @@ extension SendMediaNavigationController: AttachmentApprovalViewControllerDelegat assert(viewControllers.count == 2) // regardless of which VC we're going "back" to, we're in "batch" mode at this point. - mediaLibraryViewController.isInBatchSelectMode = true - mediaLibraryViewController.collectionView?.reloadData() + isInBatchSelectMode = true + mediaLibraryViewController.batchSelectModeDidChange() - popViewController(animated: true) + popViewController(animated: true) { + self.updateButtons() + } } } -enum AttachmentDraft { +private enum AttachmentDraft { case camera(attachment: SignalAttachment) case picker(attachment: MediaLibraryAttachment) } -extension AttachmentDraft { +private extension AttachmentDraft { var attachment: SignalAttachment { switch self { case .camera(let cameraAttachment): @@ -211,7 +388,7 @@ extension AttachmentDraft { } } -struct AttachmentDraftCollection { +private struct AttachmentDraftCollection { private(set) var attachmentDrafts: [AttachmentDraft] static var empty: AttachmentDraftCollection { @@ -261,7 +438,7 @@ struct AttachmentDraftCollection { } } -struct MediaLibrarySelection: Hashable, Equatable { +private struct MediaLibrarySelection: Hashable, Equatable { let asset: PHAsset let signalAttachmentPromise: Promise @@ -281,7 +458,7 @@ struct MediaLibrarySelection: Hashable, Equatable { } } -struct MediaLibraryAttachment: Hashable, Equatable { +private struct MediaLibraryAttachment: Hashable, Equatable { let asset: PHAsset let signalAttachment: SignalAttachment @@ -293,3 +470,105 @@ struct MediaLibraryAttachment: Hashable, Equatable { return lhs.asset == rhs.asset } } + +extension SendMediaNavigationController: DoneButtonDelegate { + var doneButtonCount: Int { + return attachmentDraftCollection.count - attachmentDraftCollection.pickerAttachments.count + mediaLibrarySelections.count + } + + fileprivate func doneButtonWasTapped(_ doneButton: DoneButton) { + assert(attachmentDraftCollection.count > 0 || mediaLibrarySelections.count > 0) + showApprovalAfterProcessingAnyMediaLibrarySelections() + } +} + +private protocol DoneButtonDelegate: AnyObject { + func doneButtonWasTapped(_ doneButton: DoneButton) + var doneButtonCount: Int { get } +} + +private class DoneButton: UIView { + weak var delegate: DoneButtonDelegate? + + init() { + super.init(frame: .zero) + let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap(tapGesture:))) + addGestureRecognizer(tapGesture) + + let container = UIView() + container.backgroundColor = .ows_white + container.layer.cornerRadius = 20 + container.layoutMargins = UIEdgeInsets(top: 7, leading: 8, bottom: 7, trailing: 8) + + addSubview(container) + container.autoPinEdgesToSuperviewMargins() + + let stackView = UIStackView(arrangedSubviews: [badge, chevron]) + stackView.axis = .horizontal + stackView.alignment = .center + stackView.spacing = 9 + + container.addSubview(stackView) + stackView.autoPinEdgesToSuperviewMargins() + } + + let numberFormatter: NumberFormatter = NumberFormatter() + + func updateCount() { + guard let delegate = delegate else { + return + } + + badgeLabel.text = numberFormatter.string(for: delegate.doneButtonCount) + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + // MARK: - Subviews + + private lazy var badge: UIView = { + let badge = CircleView() + badge.layoutMargins = UIEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4) + badge.backgroundColor = .ows_signalBlue + badge.addSubview(badgeLabel) + badgeLabel.autoPinEdgesToSuperviewMargins() + + // Constrain to be a pill that is at least a circle, and maybe wider. + badgeLabel.autoPin(toAspectRatio: 1.0, relation: .greaterThanOrEqual) + NSLayoutConstraint.autoSetPriority(.defaultLow) { + badgeLabel.autoPinToSquareAspectRatio() + } + + return badge + }() + + private lazy var badgeLabel: UILabel = { + let label = UILabel() + label.textColor = .ows_white + label.font = UIFont.ows_dynamicTypeSubheadline.ows_monospaced() + label.textAlignment = .center + return label + }() + + private lazy var chevron: UIView = { + let image: UIImage + if CurrentAppContext().isRTL { + image = #imageLiteral(resourceName: "small_chevron_left") + } else { + image = #imageLiteral(resourceName: "small_chevron_right") + } + let chevron = UIImageView(image: image.withRenderingMode(.alwaysTemplate)) + chevron.contentMode = .scaleAspectFit + chevron.tintColor = .ows_gray60 + chevron.autoSetDimensions(to: CGSize(width: 10, height: 18)) + + return chevron + }() + + @objc + func didTap(tapGesture: UITapGestureRecognizer) { + delegate?.doneButtonWasTapped(self) + } +} diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h index 2e4dc57b1..741ed989b 100644 --- a/SignalMessaging/categories/UIFont+OWS.h +++ b/SignalMessaging/categories/UIFont+OWS.h @@ -56,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN - (UIFont *)ows_italic; - (UIFont *)ows_bold; - (UIFont *)ows_mediumWeight; +- (UIFont *)ows_monospaced; @end diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m index 8f3675773..14b80f75c 100644 --- a/SignalMessaging/categories/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -229,6 +229,12 @@ NS_ASSUME_NONNULL_BEGIN return derivedFont; } +- (UIFont *)ows_monospaced +{ + return [self.class ows_monospacedDigitFontWithSize:self.pointSize]; +} + + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h index 6ca66a471..64e24b4ce 100644 --- a/SignalMessaging/categories/UIView+OWS.h +++ b/SignalMessaging/categories/UIView+OWS.h @@ -43,6 +43,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value); - (NSLayoutConstraint *)autoPinToSquareAspectRatio; - (NSLayoutConstraint *)autoPinToAspectRatioWithSize:(CGSize)size; - (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio; +- (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio relation:(NSLayoutRelation)relation; #pragma mark - Content Hugging and Compression Resistance diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m index e58f9354f..23263bd87 100644 --- a/SignalMessaging/categories/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -2,8 +2,8 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. // -#import "OWSMath.h" #import "UIView+OWS.h" +#import "OWSMath.h" #import #import #import @@ -148,6 +148,11 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) } - (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio +{ + return [self autoPinToAspectRatio:ratio relation:NSLayoutRelationEqual]; +} + +- (NSLayoutConstraint *)autoPinToAspectRatio:(CGFloat)ratio relation:(NSLayoutRelation)relation { // Clamp to ensure view has reasonable aspect ratio. CGFloat clampedRatio = CGFloatClamp(ratio, 0.05f, 95.0f); @@ -158,7 +163,7 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) self.translatesAutoresizingMaskIntoConstraints = NO; NSLayoutConstraint *constraint = [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeWidth - relatedBy:NSLayoutRelationEqual + relatedBy:relation toItem:self attribute:NSLayoutAttributeHeight multiplier:clampedRatio From 0a324484706f8825cc62a510fef0e34ca38ca97d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 08:48:23 -0600 Subject: [PATCH 402/493] cancel flow per design --- .../Photos/ImagePickerController.swift | 3 +- .../SendMediaNavigationController.swift | 33 ++++++++++++++++++- .../translations/en.lproj/Localizable.strings | 12 +++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index fdb0323f0..d1b784fd3 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -8,6 +8,7 @@ import PromiseKit protocol ImagePickerGridControllerDelegate: AnyObject { func imagePickerDidCompleteSelection(_ imagePicker: ImagePickerGridController) + func imagePickerDidCancel(_ imagePicker: ImagePickerGridController) func imagePicker(_ imagePicker: ImagePickerGridController, isAssetSelected asset: PHAsset) -> Bool func imagePicker(_ imagePicker: ImagePickerGridController, didSelectAsset asset: PHAsset, attachmentPromise: Promise) @@ -273,7 +274,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat @objc func didPressCancel(sender: UIBarButtonItem) { - self.dismiss(animated: true) + self.delegate?.imagePickerDidCancel(self) } // MARK: - Layout diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index e2e7a41b7..cb234fe22 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -214,6 +214,31 @@ class SendMediaNavigationController: OWSNavigationController { pushViewController(approvalViewController, animated: true) updateButtons() } + + private func didRequestExit(dontAbandonText: String) { + if attachmentDraftCollection.count == 0 { + self.sendMediaNavDelegate?.sendMediaNavDidCancel(self) + } else { + let alertTitle = NSLocalizedString("SEND_MEDIA_ABANDON_TITLE", comment: "alert title when user attempts to leave the send media flow when they have an in-progress album") + + let alert = UIAlertController(title: alertTitle, message: nil, preferredStyle: .alert) + + let confirmAbandonText = NSLocalizedString("SEND_MEDIA_CONFIRM_ABANDON_ALBUM", comment: "alert action, confirming the user wants to exit the media flow and abandon any photos they've taken") + let confirmAbandonAction = UIAlertAction(title: confirmAbandonText, + style: .destructive, + handler: { [weak self] _ in + guard let self = self else { return } + self.sendMediaNavDelegate?.sendMediaNavDidCancel(self) + }) + alert.addAction(confirmAbandonAction) + let dontAbandonAction = UIAlertAction(title: dontAbandonText, + style: .default, + handler: { _ in }) + alert.addAction(dontAbandonAction) + + self.presentAlert(alert) + } + } } extension SendMediaNavigationController: UINavigationControllerDelegate { @@ -266,7 +291,8 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { } func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) { - self.sendMediaNavDelegate?.sendMediaNavDidCancel(self) + let dontAbandonText = NSLocalizedString("SEND_MEDIA_RETURN_TO_CAMERA", comment: "alert action when the user decides not to cancel the media flow after all.") + didRequestExit(dontAbandonText: dontAbandonText) } } @@ -276,6 +302,11 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { showApprovalAfterProcessingAnyMediaLibrarySelections() } + func imagePickerDidCancel(_ imagePicker: ImagePickerGridController) { + let dontAbandonText = NSLocalizedString("SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY", comment: "alert action when the user decides not to cancel the media flow after all.") + didRequestExit(dontAbandonText: dontAbandonText) + } + func showApprovalAfterProcessingAnyMediaLibrarySelections() { let mediaLibrarySelections: [MediaLibrarySelection] = self.mediaLibrarySelections.orderedValues diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index c5585ead8..3066ce983 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invite a friend via insecure SMS?"; From fa2d5b422b1428019e92ab1e72d1edbdc398147a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 11:58:43 -0600 Subject: [PATCH 403/493] maintain body text navigating to/from approval view --- .../ConversationViewController.m | 14 +++++++++-- .../SendMediaNavigationController.swift | 13 +++++++++-- .../AttachmentApprovalViewController.swift | 23 +++++++++++++++---- .../AttachmentTextToolbar.swift | 2 ++ .../SharingThreadPickerViewController.m | 6 +++++ 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 252ad9923..77874febc 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2858,7 +2858,8 @@ typedef enum : NSUInteger { UIViewController *pickerModal; if (SSKFeatureFlags.useCustomPhotoCapture) { - SendMediaNavigationController *navController = [SendMediaNavigationController showingCameraFirst]; + SendMediaNavigationController *navController = + [SendMediaNavigationController showingCameraFirstWithMessageText:self.inputToolbar.messageText]; navController.sendMediaNavDelegate = self; pickerModal = navController; } else { @@ -2903,7 +2904,8 @@ typedef enum : NSUInteger { return; } - SendMediaNavigationController *pickerModal = [SendMediaNavigationController showingMediaLibraryFirst]; + SendMediaNavigationController *pickerModal = + [SendMediaNavigationController showingMediaLibraryFirstWithMessageText:self.inputToolbar.messageText]; pickerModal.sendMediaNavDelegate = self; [self dismissKeyBoard]; @@ -3921,6 +3923,14 @@ typedef enum : NSUInteger { [self dismissViewControllerAnimated:YES completion:nil]; } +- (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval + didChangeMessageText:(nullable NSString *)newMessageText +{ + [self.inputToolbar setMessageText:newMessageText animated:NO]; +} + +#pragma mark - + - (void)showErrorAlertForAttachment:(SignalAttachment *_Nullable)attachment { OWSAssertDebug(attachment == nil || [attachment hasError]); diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index cb234fe22..08002d79b 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -19,6 +19,8 @@ class SendMediaNavigationController: OWSNavigationController { override var prefersStatusBarHidden: Bool { return true } + var messageText: String? + override func viewDidLoad() { super.viewDidLoad() @@ -51,19 +53,21 @@ class SendMediaNavigationController: OWSNavigationController { public weak var sendMediaNavDelegate: SendMediaNavDelegate? @objc - public class func showingCameraFirst() -> SendMediaNavigationController { + public class func showingCameraFirst(messageText: String) -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.captureViewController], animated: false) navController.updateButtons() + navController.messageText = messageText return navController } @objc - public class func showingMediaLibraryFirst() -> SendMediaNavigationController { + public class func showingMediaLibraryFirst(messageText: String) -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.mediaLibraryViewController], animated: false) navController.updateButtons() + navController.messageText = messageText return navController } @@ -210,6 +214,7 @@ class SendMediaNavigationController: OWSNavigationController { private func pushApprovalViewController() { let approvalViewController = AttachmentApprovalViewController(mode: .sharedNavigation, attachments: self.attachments) approvalViewController.approvalDelegate = self + approvalViewController.messageText = messageText pushViewController(approvalViewController, animated: true) updateButtons() @@ -361,6 +366,10 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { } extension SendMediaNavigationController: AttachmentApprovalViewControllerDelegate { + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didChangeMessageText newMessageText: String?) { + self.messageText = newMessageText + } + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didRemoveAttachment attachment: SignalAttachment) { guard let removedDraft = attachmentDraftCollection.attachmentDrafts.first(where: { $0.attachment == attachment}) else { owsFailDebug("removedDraft was unexpectedly nil") diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 7017c122e..3f1f4ab68 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -9,17 +9,19 @@ import PromiseKit @objc public protocol AttachmentApprovalViewControllerDelegate: class { - func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, + didApproveAttachments attachments: [SignalAttachment], messageText: String?) + func attachmentApprovalDidCancel(_ attachmentApproval: AttachmentApprovalViewController) + func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, + didChangeMessageText newMessageText: String?) + @objc optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didRemoveAttachment attachment: SignalAttachment) @objc optional func attachmentApprovalDidTapAddMore(_ attachmentApproval: AttachmentApprovalViewController) - - @objc - optional func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, changedCaptionOfAttachment attachment: SignalAttachment) } // MARK: - @@ -216,6 +218,15 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC bottomToolView.update(isEditingCaptions: isEditingCaptions, currentAttachmentItem: currentAttachmentItem) } + public var messageText: String? { + get { + return attachmentTextToolbar.messageText + } + set { + attachmentTextToolbar.messageText = newValue + } + } + // MARK: - Navigation Bar public func updateNavigationBar() { @@ -678,6 +689,10 @@ extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) { self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self) } + + func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar) { + approvalDelegate?.attachmentApproval(self, didChangeMessageText: attachmentTextToolbar.messageText) + } } // MARK: - diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift index 078893bdd..d475d2a0b 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift @@ -13,6 +13,7 @@ protocol AttachmentTextToolbarDelegate: class { func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar) func attachmentTextToolbarDidEndEditing(_ attachmentTextToolbar: AttachmentTextToolbar) func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) + func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar) } // MARK: - @@ -228,6 +229,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { public func textViewDidChange(_ textView: UITextView) { updateHeight(textView: textView) + attachmentTextToolbarDelegate?.attachmentTextToolbarDidChange(self) } public func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index 0097efa37..bf6dbbc37 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -310,6 +310,12 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); [self cancelShareExperience]; } +- (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval + didChangeMessageText:(nullable NSString *)newMessageText +{ + // no-op +} + #pragma mark - MessageApprovalViewControllerDelegate - (void)messageApproval:(MessageApprovalViewController *)approvalViewController From a8caae73cf68798ab08a336bacce8cf6f9a900c3 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 13:02:09 -0600 Subject: [PATCH 404/493] remove redundant state --- .../ConversationViewController.m | 25 ++++++++++++++++--- .../SendMediaNavigationController.swift | 20 +++++++++------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 77874febc..64ae0b959 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2858,8 +2858,7 @@ typedef enum : NSUInteger { UIViewController *pickerModal; if (SSKFeatureFlags.useCustomPhotoCapture) { - SendMediaNavigationController *navController = - [SendMediaNavigationController showingCameraFirstWithMessageText:self.inputToolbar.messageText]; + SendMediaNavigationController *navController = [SendMediaNavigationController showingCameraFirst]; navController.sendMediaNavDelegate = self; pickerModal = navController; } else { @@ -2904,8 +2903,7 @@ typedef enum : NSUInteger { return; } - SendMediaNavigationController *pickerModal = - [SendMediaNavigationController showingMediaLibraryFirstWithMessageText:self.inputToolbar.messageText]; + SendMediaNavigationController *pickerModal = [SendMediaNavigationController showingMediaLibraryFirst]; pickerModal.sendMediaNavDelegate = self; [self dismissKeyBoard]; @@ -2941,9 +2939,26 @@ typedef enum : NSUInteger { messageText:(nullable NSString *)messageText { [self tryToSendAttachments:attachments messageText:messageText]; + [self.inputToolbar clearTextMessageAnimated:NO]; + + // we want to already be at the bottom when the user returns, rather than have to watch + // the new message scroll into view. + [self scrollToBottomAnimated:NO]; + [self dismissViewControllerAnimated:YES completion:nil]; } +- (nullable NSString *)sendMediaNavInitialMessageText:(SendMediaNavigationController *)sendMediaNavigationController +{ + return self.inputToolbar.messageText; +} + +- (void)sendMediaNav:(SendMediaNavigationController *)sendMediaNavigationController + didChangeMessageText:(nullable NSString *)messageText +{ + [self.inputToolbar setMessageText:messageText animated:NO]; +} + #pragma mark - UIImagePickerControllerDelegate /* @@ -3910,7 +3925,9 @@ typedef enum : NSUInteger { messageText:(NSString *_Nullable)messageText { [self tryToSendAttachments:attachments messageText:messageText]; + [self.inputToolbar clearTextMessageAnimated:NO]; [self dismissViewControllerAnimated:YES completion:nil]; + // We always want to scroll to the bottom of the conversation after the local user // sends a message. Normally, this is taken care of in yapDatabaseModified:, but // we don't listen to db modifications when this view isn't visible, i.e. when the diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 08002d79b..79918b935 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -10,6 +10,9 @@ import PromiseKit protocol SendMediaNavDelegate: AnyObject { func sendMediaNavDidCancel(_ sendMediaNavigationController: SendMediaNavigationController) func sendMediaNav(_ sendMediaNavigationController: SendMediaNavigationController, didApproveAttachments attachments: [SignalAttachment], messageText: String?) + + func sendMediaNavInitialMessageText(_ sendMediaNavigationController: SendMediaNavigationController) -> String? + func sendMediaNav(_ sendMediaNavigationController: SendMediaNavigationController, didChangeMessageText newMessageText: String?) } @objc @@ -19,8 +22,6 @@ class SendMediaNavigationController: OWSNavigationController { override var prefersStatusBarHidden: Bool { return true } - var messageText: String? - override func viewDidLoad() { super.viewDidLoad() @@ -53,21 +54,19 @@ class SendMediaNavigationController: OWSNavigationController { public weak var sendMediaNavDelegate: SendMediaNavDelegate? @objc - public class func showingCameraFirst(messageText: String) -> SendMediaNavigationController { + public class func showingCameraFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.captureViewController], animated: false) navController.updateButtons() - navController.messageText = messageText return navController } @objc - public class func showingMediaLibraryFirst(messageText: String) -> SendMediaNavigationController { + public class func showingMediaLibraryFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.mediaLibraryViewController], animated: false) navController.updateButtons() - navController.messageText = messageText return navController } @@ -212,9 +211,14 @@ class SendMediaNavigationController: OWSNavigationController { }() private func pushApprovalViewController() { + guard let sendMediaNavDelegate = self.sendMediaNavDelegate else { + owsFailDebug("sendMediaNavDelegate was unexpectedly nil") + return + } + let approvalViewController = AttachmentApprovalViewController(mode: .sharedNavigation, attachments: self.attachments) approvalViewController.approvalDelegate = self - approvalViewController.messageText = messageText + approvalViewController.messageText = sendMediaNavDelegate.sendMediaNavInitialMessageText(self) pushViewController(approvalViewController, animated: true) updateButtons() @@ -367,7 +371,7 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { extension SendMediaNavigationController: AttachmentApprovalViewControllerDelegate { func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didChangeMessageText newMessageText: String?) { - self.messageText = newMessageText + sendMediaNavDelegate?.sendMediaNav(self, didChangeMessageText: newMessageText) } func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didRemoveAttachment attachment: SignalAttachment) { From f3d0cd99fc22156269b22d4faf52cd13f7849fa5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 16:58:02 -0400 Subject: [PATCH 405/493] Handle notifications for open conversations. --- .../ConversationViewController.h | 4 ++- .../ConversationViewController.m | 17 ++++++---- Signal/src/environment/SignalApp.h | 2 ++ Signal/src/environment/SignalApp.m | 33 +++++++++++++++++-- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.h b/Signal/src/ViewControllers/ConversationView/ConversationViewController.h index 31d7841c1..0529b940b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -25,6 +25,8 @@ typedef NS_ENUM(NSUInteger, ConversationViewAction) { - (void)popKeyBoard; +- (void)scrollToFirstUnreadMessage:(BOOL)isAnimated; + #pragma mark 3D Touch Methods - (void)peekSetup; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 0002ac339..05924083e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -752,7 +752,7 @@ typedef enum : NSUInteger { // We want to set the initial scroll state the first time we enter the view. if (!self.viewHasEverAppeared) { - [self scrollToDefaultPosition]; + [self scrollToDefaultPosition:NO]; } else if (self.menuActionsViewController != nil) { [self scrollToMenuActionInteraction:NO]; } @@ -807,7 +807,7 @@ typedef enum : NSUInteger { return [NSIndexPath indexPathForRow:row inSection:0]; } -- (void)scrollToDefaultPosition +- (void)scrollToDefaultPosition:(BOOL)isAnimated { if (self.isUserScrolling) { return; @@ -824,14 +824,14 @@ typedef enum : NSUInteger { if (indexPath) { if (indexPath.section == 0 && indexPath.row == 0) { - [self.collectionView setContentOffset:CGPointZero animated:NO]; + [self.collectionView setContentOffset:CGPointZero animated:isAnimated]; } else { [self.collectionView scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionTop - animated:NO]; + animated:isAnimated]; } } else { - [self scrollToBottomAnimated:NO]; + [self scrollToBottomAnimated:isAnimated]; } } @@ -3899,7 +3899,7 @@ typedef enum : NSUInteger { // Adjust content offset to prevent the presented keyboard from obscuring content. if (!self.viewHasEverAppeared) { - [self scrollToDefaultPosition]; + [self scrollToDefaultPosition:NO]; } else if (wasScrolledToBottom) { // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom. [self scrollToBottomAnimated:NO]; @@ -4026,6 +4026,11 @@ typedef enum : NSUInteger { [self didScrollToBottom]; } +- (void)scrollToFirstUnreadMessage:(BOOL)isAnimated +{ + [self scrollToDefaultPosition:isAnimated]; +} + #pragma mark - UIScrollViewDelegate - (void)updateLastKnownDistanceFromBottom diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h index b3b5fb9dc..e89daec85 100644 --- a/Signal/src/environment/SignalApp.h +++ b/Signal/src/environment/SignalApp.h @@ -46,6 +46,8 @@ NS_ASSUME_NONNULL_BEGIN focusMessageId:(nullable NSString *)focusMessageId animated:(BOOL)isAnimated; +- (void)presentConversationForThreadAndShowFirstUnreadMessage:(TSThread *)thread animated:(BOOL)isAnimated; + #pragma mark - Methods + (void)resetAppData; diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 0316ae5bd..b03834b31 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -109,7 +109,7 @@ NS_ASSUME_NONNULL_BEGIN DispatchMainThreadSafe(^{ UIViewController *frontmostVC = [[UIApplication sharedApplication] frontmostViewController]; - + if ([frontmostVC isKindOfClass:[ConversationViewController class]]) { ConversationViewController *conversationVC = (ConversationViewController *)frontmostVC; if ([conversationVC.thread.uniqueId isEqualToString:thread.uniqueId]) { @@ -117,11 +117,40 @@ NS_ASSUME_NONNULL_BEGIN return; } } - + [self.homeViewController presentThread:thread action:action focusMessageId:focusMessageId animated:isAnimated]; }); } +- (void)presentConversationForThreadAndShowFirstUnreadMessage:(TSThread *)thread animated:(BOOL)isAnimated +{ + OWSAssertIsOnMainThread(); + + OWSLogInfo(@""); + + if (!thread) { + OWSFailDebug(@"Can't present nil thread."); + return; + } + + DispatchMainThreadSafe(^{ + UIViewController *frontmostVC = [[UIApplication sharedApplication] frontmostViewController]; + + if ([frontmostVC isKindOfClass:[ConversationViewController class]]) { + ConversationViewController *conversationVC = (ConversationViewController *)frontmostVC; + if ([conversationVC.thread.uniqueId isEqualToString:thread.uniqueId]) { + [conversationVC scrollToFirstUnreadMessage:isAnimated]; + return; + } + } + + [self.homeViewController presentThread:thread + action:ConversationViewActionNone + focusMessageId:nil + animated:isAnimated]; + }); +} + - (void)didChangeCallLoggingPreference:(NSNotification *)notitication { [AppEnvironment.shared.callService createCallUIAdapter]; From 01d9993b9d4157d754a1d090fca57ceb5ebd8200 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 17:03:10 -0400 Subject: [PATCH 406/493] Handle notifications for open conversations. --- .../UserInterface/Notifications/AppNotifications.swift | 2 +- Signal/src/environment/SignalApp.h | 2 +- Signal/src/environment/SignalApp.m | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 60f255f91..2f7bf636f 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -648,7 +648,7 @@ class NotificationActionHandler { // can be visible to the user immediately upon opening the app, rather than having to watch // it animate in from the homescreen. let shouldAnimate = UIApplication.shared.applicationState == .active - signalApp.presentConversation(forThreadId: threadId, animated: shouldAnimate) + signalApp.presentConversationAndShowFirstUnreadMessage(forThreadId: threadId, animated: shouldAnimate) return Promise.value(()) } diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h index e89daec85..3c759094e 100644 --- a/Signal/src/environment/SignalApp.h +++ b/Signal/src/environment/SignalApp.h @@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN focusMessageId:(nullable NSString *)focusMessageId animated:(BOOL)isAnimated; -- (void)presentConversationForThreadAndShowFirstUnreadMessage:(TSThread *)thread animated:(BOOL)isAnimated; +- (void)presentConversationAndShowFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated; #pragma mark - Methods diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index b03834b31..8d01c8ddf 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -122,14 +122,16 @@ NS_ASSUME_NONNULL_BEGIN }); } -- (void)presentConversationForThreadAndShowFirstUnreadMessage:(TSThread *)thread animated:(BOOL)isAnimated +- (void)presentConversationAndShowFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated { OWSAssertIsOnMainThread(); + OWSAssertDebug(threadId.length > 0); OWSLogInfo(@""); - if (!thread) { - OWSFailDebug(@"Can't present nil thread."); + TSThread *thread = [TSThread fetchObjectWithUniqueID:threadId]; + if (thread == nil) { + OWSFailDebug(@"unable to find thread with id: %@", threadId); return; } From aad5533127cf7748fb6771d29397ec8662a4ba7b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 18:01:49 -0400 Subject: [PATCH 407/493] Respond to CR. --- Signal/src/UserInterface/Notifications/AppNotifications.swift | 2 +- Signal/src/environment/SignalApp.h | 2 +- Signal/src/environment/SignalApp.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 2f7bf636f..e261a2418 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -648,7 +648,7 @@ class NotificationActionHandler { // can be visible to the user immediately upon opening the app, rather than having to watch // it animate in from the homescreen. let shouldAnimate = UIApplication.shared.applicationState == .active - signalApp.presentConversationAndShowFirstUnreadMessage(forThreadId: threadId, animated: shouldAnimate) + signalApp.presentConversationAndScrollToFirstUnreadMessage(forThreadId: threadId, animated: shouldAnimate) return Promise.value(()) } diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h index 3c759094e..c46e60674 100644 --- a/Signal/src/environment/SignalApp.h +++ b/Signal/src/environment/SignalApp.h @@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN focusMessageId:(nullable NSString *)focusMessageId animated:(BOOL)isAnimated; -- (void)presentConversationAndShowFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated; +- (void)presentConversationAndScrollToFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated; #pragma mark - Methods diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m index 8d01c8ddf..a84975323 100644 --- a/Signal/src/environment/SignalApp.m +++ b/Signal/src/environment/SignalApp.m @@ -122,7 +122,7 @@ NS_ASSUME_NONNULL_BEGIN }); } -- (void)presentConversationAndShowFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated +- (void)presentConversationAndScrollToFirstUnreadMessageForThreadId:(NSString *)threadId animated:(BOOL)isAnimated { OWSAssertIsOnMainThread(); OWSAssertDebug(threadId.length > 0); From eb5cf3978c34f7bc43fc00d4ee00b71b41566491 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 15:11:58 -0400 Subject: [PATCH 408/493] Fix first responder issue in image editor. --- .../AttachmentApprovalViewController.swift | 4 +++- .../ImageEditor/ImageEditorBrushViewController.swift | 5 +++++ .../ImageEditor/ImageEditorCropViewController.swift | 9 +++++---- .../ImageEditor/ImageEditorTextViewController.swift | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 6c674f1b7..cba9ceffa 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -328,7 +328,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } private func updateControlVisibility() { - if !shouldHideControls, !isFirstResponder { + let hasPresentedView = self.presentedViewController != nil + + if !shouldHideControls, !isFirstResponder, !hasPresentedView { becomeFirstResponder() } bottomToolView.shouldHideControls = shouldHideControls diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift index 6848b4a13..a6ea171f3 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorBrushViewController.swift @@ -119,6 +119,11 @@ public class ImageEditorBrushViewController: OWSViewController { return true } + @objc + override public var canBecomeFirstResponder: Bool { + return true + } + // MARK: - Actions @objc func didTapUndo(sender: UIButton) { diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift index 9714a73c3..2cfedcd9c 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCropViewController.swift @@ -242,6 +242,11 @@ class ImageEditorCropViewController: OWSViewController { return true } + @objc + override public var canBecomeFirstResponder: Bool { + return true + } + private static let desiredCornerSize: CGFloat = 24 private static let minCropSize: CGFloat = desiredCornerSize * 2 private var cornerSize = CGSize.zero @@ -407,10 +412,6 @@ class ImageEditorCropViewController: OWSViewController { panGestureRecognizer.shouldBeRequiredToFail(by: pinchGestureRecognizer) } - override public var canBecomeFirstResponder: Bool { - return true - } - // MARK: - Gestures private class func unitTranslation(oldLocationView: CGPoint, diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift index beb16d220..52c4523f1 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift @@ -239,6 +239,11 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel return true } + @objc + override public var canBecomeFirstResponder: Bool { + return true + } + // MARK: - Pinch Gesture private var pinchFontStart: UIFont? From 517a550593ce7ad4ba1592d5fb11e02271e8cd9a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 16:29:57 -0400 Subject: [PATCH 409/493] Further improve "first responder" behavior in the image editor. --- ...AttachmentApprovalInputAccessoryView.swift | 21 +++++++++---- .../AttachmentApprovalViewController.swift | 31 ++++++++++--------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index b983274e2..3f9907d86 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -101,11 +101,7 @@ class AttachmentApprovalInputAccessoryView: UIView { // MARK: - public var shouldHideControls = false { - didSet { - updateContents() - } - } + private var shouldHideControls = false private func updateContents() { var hasCurrentCaption = false @@ -135,6 +131,10 @@ class AttachmentApprovalInputAccessoryView: UIView { if !attachmentCaptionToolbar.textView.isFirstResponder { attachmentCaptionToolbar.textView.becomeFirstResponder() } + } else { + if attachmentCaptionToolbar.textView.isFirstResponder { + attachmentCaptionToolbar.textView.resignFirstResponder() + } } // NOTE: We don't automatically make attachmentTextToolbar.textView // first responder; @@ -143,9 +143,18 @@ class AttachmentApprovalInputAccessoryView: UIView { } public func update(isEditingCaptions: Bool, - currentAttachmentItem: SignalAttachmentItem?) { + currentAttachmentItem: SignalAttachmentItem?, + shouldHideControls: Bool) { + // De-bounce + guard self.isEditingCaptions != isEditingCaptions || + self.currentAttachmentItem != currentAttachmentItem || + self.shouldHideControls != shouldHideControls else { + return + } + self.isEditingCaptions = isEditingCaptions self.currentAttachmentItem = currentAttachmentItem + self.shouldHideControls = shouldHideControls updateContents() } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index cba9ceffa..569ca847a 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -184,7 +184,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC private func updateContents() { updateNavigationBar() updateInputAccessory() - updateControlVisibility() touchInterceptorView.isHidden = !isEditingCaptions } @@ -206,7 +205,10 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC currentPageViewController = pageViewControllers.first } let currentAttachmentItem: SignalAttachmentItem? = currentPageViewController?.attachmentItem - bottomToolView.update(isEditingCaptions: isEditingCaptions, currentAttachmentItem: currentAttachmentItem) + + bottomToolView.update(isEditingCaptions: isEditingCaptions, + currentAttachmentItem: currentAttachmentItem, + shouldHideControls: shouldHideControls) } // MARK: - Navigation Bar @@ -327,15 +329,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return pageViewController.shouldHideControls } - private func updateControlVisibility() { - let hasPresentedView = self.presentedViewController != nil - - if !shouldHideControls, !isFirstResponder, !hasPresentedView { - becomeFirstResponder() - } - bottomToolView.shouldHideControls = shouldHideControls - } - // MARK: - View Helpers func remove(attachmentItem: SignalAttachmentItem) { @@ -411,8 +404,6 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC updateMediaRail() } } - - updateContents() } // MARK: - UIPageViewControllerDataSource @@ -463,6 +454,18 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return super.viewControllers!.map { $0 as! AttachmentPrepViewController } } + @objc + public override func setViewControllers(_ viewControllers: [UIViewController]?, direction: UIPageViewController.NavigationDirection, animated: Bool, completion: ((Bool) -> Void)? = nil) { + super.setViewControllers(viewControllers, + direction: direction, + animated: animated) { [weak self] (finished) in + if let completion = completion { + completion(finished) + } + self?.updateContents() + } + } + var currentItem: SignalAttachmentItem! { get { return currentPageViewController.attachmentItem @@ -682,7 +685,7 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate } func prepViewControllerUpdateControls() { - updateControlVisibility() + updateInputAccessory() } } From a3efb58d15f2dd6cadf1a901a1dc1b0068a6dd37 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 28 Mar 2019 18:29:19 -0400 Subject: [PATCH 410/493] Respond to CR. --- .../AttachmentApprovalInputAccessoryView.swift | 18 +++++++++++++++--- .../AttachmentApprovalViewController.swift | 6 ++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index 3f9907d86..eadc0afda 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -120,6 +120,12 @@ class AttachmentApprovalInputAccessoryView: UIView { currentCaptionWrapper.isHidden = isEditingCaptions || !hasCurrentCaption attachmentTextToolbar.isHidden = isEditingCaptions + updateFirstResponder() + + layoutSubviews() + } + + private func updateFirstResponder() { if (shouldHideControls) { if attachmentCaptionToolbar.textView.isFirstResponder { attachmentCaptionToolbar.textView.resignFirstResponder() @@ -138,8 +144,6 @@ class AttachmentApprovalInputAccessoryView: UIView { } // NOTE: We don't automatically make attachmentTextToolbar.textView // first responder; - - layoutSubviews() } public func update(isEditingCaptions: Bool, @@ -149,7 +153,9 @@ class AttachmentApprovalInputAccessoryView: UIView { guard self.isEditingCaptions != isEditingCaptions || self.currentAttachmentItem != currentAttachmentItem || self.shouldHideControls != shouldHideControls else { - return + + updateFirstResponder() + return } self.isEditingCaptions = isEditingCaptions @@ -168,6 +174,12 @@ class AttachmentApprovalInputAccessoryView: UIView { return CGSize.zero } } + + public var hasFirstResponder: Bool { + return (isFirstResponder || + attachmentCaptionToolbar.textView.isFirstResponder || + attachmentTextToolbar.textView.isFirstResponder) + } } // MARK: - diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 569ca847a..dc837b294 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -206,6 +206,12 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } let currentAttachmentItem: SignalAttachmentItem? = currentPageViewController?.attachmentItem + let hasPresentedView = self.presentedViewController != nil + let isToolbarFirstResponder = bottomToolView.hasFirstResponder + if !shouldHideControls, !isFirstResponder, !hasPresentedView, !isToolbarFirstResponder { + becomeFirstResponder() + } + bottomToolView.update(isEditingCaptions: isEditingCaptions, currentAttachmentItem: currentAttachmentItem, shouldHideControls: shouldHideControls) From 0d822597a12cf7e2aa4750ac463dfe0e7385eeee Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 16:07:01 -0600 Subject: [PATCH 411/493] specify locale when timestamp parsing --- SignalServiceKit/src/Contacts/ContactDiscoveryService.m | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 1fe6c1dd7..38565bab8 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -624,6 +624,15 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; [dateFormatter setTimeZone:timeZone]; [dateFormatter setDateFormat:@"yyy-MM-dd'T'HH:mm:ss.SSSSSS"]; + + // Specify parsing locale + // from: https://developer.apple.com/library/archive/qa/qa1480/_index.html + // Q: I'm using NSDateFormatter to parse an Internet-style date, but this fails for some users in some regions. + // I've set a specific date format string; shouldn't that force NSDateFormatter to work independently of the user's + // region settings? A: No. While setting a date format string will appear to work for most users, it's not the right + // solution to this problem. There are many places where format strings behave in unexpected ways. [...] + NSLocale *enUSPOSIXLocale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]; + [dateFormatter setLocale:enUSPOSIXLocale]; NSDate *timestampDate = [dateFormatter dateFromString:signatureBodyEntity.timestamp]; if (!timestampDate) { OWSFailDebug(@"Could not parse signature body timestamp: %@", signatureBodyEntity.timestamp); From 5e52d66b05b35968cc2e104e96c494b424353e8d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 16:28:26 -0600 Subject: [PATCH 412/493] bump feedback endpoint --- SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index ab4dd9017..68214a7d7 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -516,7 +516,7 @@ NS_ASSUME_NONNULL_BEGIN } parameters = @{ @"reason": limitedReason }; } - NSString *path = [NSString stringWithFormat:@"/v1/directory/feedback-v2/%@", status]; + NSString *path = [NSString stringWithFormat:@"/v1/directory/feedback-v3/%@", status]; return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"PUT" parameters:parameters]; } From 048f19c6b8f065d568bffc4f0ea2e475eaeaab58 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Mar 2019 16:31:06 -0600 Subject: [PATCH 413/493] specify yyyy date format --- SignalServiceKit/src/Contacts/ContactDiscoveryService.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index 38565bab8..7c04e333e 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -623,7 +623,7 @@ NSError *ContactDiscoveryServiceErrorMakeWithReason(NSInteger code, NSString *re NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; NSTimeZone *timeZone = [NSTimeZone timeZoneWithName:@"UTC"]; [dateFormatter setTimeZone:timeZone]; - [dateFormatter setDateFormat:@"yyy-MM-dd'T'HH:mm:ss.SSSSSS"]; + [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSSSS"]; // Specify parsing locale // from: https://developer.apple.com/library/archive/qa/qa1480/_index.html From 5ed16355d78ea28472686f63e575839c4feefe15 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 10:09:50 -0600 Subject: [PATCH 414/493] iOS9 needs a different assertion --- SignalServiceKit/src/Network/SSKWebSocket.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Network/SSKWebSocket.swift b/SignalServiceKit/src/Network/SSKWebSocket.swift index c5724b1c1..b72a680ad 100644 --- a/SignalServiceKit/src/Network/SSKWebSocket.swift +++ b/SignalServiceKit/src/Network/SSKWebSocket.swift @@ -146,8 +146,13 @@ extension SSKWebSocketImpl: WebSocketDelegate { case let wsError as WSError: websocketError = SSKWebSocketError(underlyingError: wsError) case let nsError as NSError: - let networkDownCode = 50 - assert(nsError.domain == "NSPOSIXErrorDomain" && nsError.code == networkDownCode) + // Assert that error is either a Starscream.WSError or an OS level networking error + if #available(iOS 10, *) { + let networkDownCode = 50 + assert(nsError.domain == "NSPOSIXErrorDomain" && nsError.code == networkDownCode) + } else { + assert(nsError.domain == kCFErrorDomainCFNetwork as String) + } websocketError = error default: assert(error == nil, "unexpected error type: \(String(describing: error))") From 05d8846f6c04e9dbf01c96dd04f6743cbdbf07fc Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 10:56:04 -0600 Subject: [PATCH 415/493] match highlight behavior with search behavior --- Signal/src/ConversationSearch.swift | 3 ++- .../ConversationView/Cells/OWSMessageBubbleView.m | 8 +++++--- SignalServiceKit/src/Storage/FullTextSearchFinder.swift | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Signal/src/ConversationSearch.swift b/Signal/src/ConversationSearch.swift index ebfc27fe0..85cbc0085 100644 --- a/Signal/src/ConversationSearch.swift +++ b/Signal/src/ConversationSearch.swift @@ -82,11 +82,12 @@ extension ConversationSearchController: UISearchResultsUpdating { public func updateSearchResults(for searchController: UISearchController) { Logger.verbose("searchBar.text: \( searchController.searchBar.text ?? "")") - guard let searchText = searchController.searchBar.text?.stripped else { + guard let rawSearchText = searchController.searchBar.text?.stripped else { self.resultsBar.updateResults(resultSet: nil) self.delegate?.conversationSearchController(self, didUpdateSearchResults: nil) return } + let searchText = FullTextSearchFinder.normalize(text: rawSearchText) BenchManager.startEvent(title: "Conversation Search", eventId: searchText) guard searchText.count >= ConversationSearchController.kMinimumSearchTextLength else { diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m index d97b87c8f..1e87f7043 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m @@ -708,10 +708,12 @@ NS_ASSUME_NONNULL_BEGIN initWithString:text attributes:@{ NSFontAttributeName : font, NSForegroundColorAttributeName : textColor }]; if (searchText.length >= ConversationSearchController.kMinimumSearchTextLength) { + NSString *searchableText = [FullTextSearchFinder normalizeWithText:searchText]; NSError *error; - NSRegularExpression *regex = [[NSRegularExpression alloc] initWithPattern:searchText - options:NSRegularExpressionCaseInsensitive - error:&error]; + NSRegularExpression *regex = + [[NSRegularExpression alloc] initWithPattern:[NSRegularExpression escapedPatternForString:searchableText] + options:NSRegularExpressionCaseInsensitive + error:&error]; OWSAssertDebug(error == nil); for (NSTextCheckingResult *match in [regex matchesInString:text options:NSMatchingWithoutAnchoringBounds range:NSMakeRange(0, text.length)]) { diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift index 00b64dd11..90d680ab8 100644 --- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift +++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift @@ -138,6 +138,7 @@ public class FullTextSearchFinder: NSObject { // This is a hot method, especially while running large migrations. // Changes to it should go through a profiler to make sure large migrations // aren't adversely affected. + @objc public class func normalize(text: String) -> String { // 1. Filter out invalid characters. let filtered = text.removeCharacters(characterSet: charactersToRemove) From 5b77bc547547fcb062f9d1ffba463c8df648c75a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 11:07:15 -0600 Subject: [PATCH 416/493] sleep hack for iOS9 --- .../ConversationView/ConversationViewController.m | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 05924083e..2860fcc93 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4210,7 +4210,16 @@ typedef enum : NSUInteger { // restore first responder to VC [self becomeFirstResponder]; - [self reloadInputViews]; + if (@available(iOS 10, *)) { + [self reloadInputViews]; + } else { + // We want to change the inputAccessoryView from SearchResults -> MessageInput + // reloading too soon on an old iOS9 device caused the inputAccessoryView to go from + // SearchResults -> MessageInput -> SearchResults + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self reloadInputViews]; + }); + } } #pragma mark ConversationSearchControllerDelegate From 746fd278daf8ca5e4e5df4c31816ce0ad39d854f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 29 Mar 2019 14:25:17 -0400 Subject: [PATCH 417/493] Restart typing indicators animations after app returns from background. --- Signal/src/views/TypingIndicatorView.swift | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Signal/src/views/TypingIndicatorView.swift b/Signal/src/views/TypingIndicatorView.swift index 4e3014519..a90200b19 100644 --- a/Signal/src/views/TypingIndicatorView.swift +++ b/Signal/src/views/TypingIndicatorView.swift @@ -38,8 +38,31 @@ self.axis = .horizontal self.spacing = kDotMaxHSpacing self.alignment = .center + + NotificationCenter.default.addObserver(self, + selector: #selector(didBecomeActive), + name: NSNotification.Name.OWSApplicationDidBecomeActive, + object: nil) } + deinit { + NotificationCenter.default.removeObserver(self) + } + + // MARK: - Notifications + + @objc func didBecomeActive() { + AssertIsOnMainThread() + + // CoreAnimation animations are stopped in the background, so ensure + // animations are restored if necessary. + if isAnimating { + startAnimation() + } + } + + // MARK: - + @objc public override func sizeThatFits(_ size: CGSize) -> CGSize { return CGSize(width: TypingIndicatorView.kMaxRadiusPt * 3 + kDotMaxHSpacing * 2, height: TypingIndicatorView.kMaxRadiusPt) @@ -49,8 +72,12 @@ return [dot1, dot2, dot3] } + private var isAnimating = false + @objc public func startAnimation() { + isAnimating = true + for dot in dots() { dot.startAnimation() } @@ -58,6 +85,8 @@ @objc public func stopAnimation() { + isAnimating = false + for dot in dots() { dot.stopAnimation() } From 8f7ad79506e46541c28c34875c1b999e2071e6b3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 29 Mar 2019 14:11:47 -0400 Subject: [PATCH 418/493] Only update scroll state to reflect keyboard changes if view has appeared. --- .../ConversationView/ConversationViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 2860fcc93..6ff11de17 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3903,7 +3903,7 @@ typedef enum : NSUInteger { } else if (wasScrolledToBottom) { // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom. [self scrollToBottomAnimated:NO]; - } else { + } else if (self.isViewCompletelyAppeared) { // If we were scrolled away from the bottom, shift the content in lockstep with the // keyboard, up to the limits of the content bounds. CGFloat insetChange = newInsets.bottom - oldInsets.bottom; From 2242dd240f9a56e234241eb23a70a3be21037ccf Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 12:43:19 -0600 Subject: [PATCH 419/493] Fix "blank notification text" for oversize messages --- .../Notifications/AppNotifications.swift | 3 +- .../src/Messages/Interactions/TSMessage.m | 48 ++++++++----------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index e261a2418..4c2a4ba2f 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -137,8 +137,7 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { @objc public override init() { - let userNotificationsFeatureEnabled = true - if userNotificationsFeatureEnabled, #available(iOS 10, *) { + if #available(iOS 10, *) { self.adaptee = UserNotificationPresenterAdaptee() } else { self.adaptee = LegacyNotificationPresenterAdaptee() diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m index 8ccd7d19d..ddcbca82c 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m @@ -315,38 +315,32 @@ static const NSUInteger OWSMessageSchemaVersion = 4; // TODO: This method contains view-specific logic and probably belongs in NotificationsManager, not in SSK. - (NSString *)previewTextWithTransaction:(YapDatabaseReadTransaction *)transaction -{ - NSString *_Nullable attachmentDescription = nil; - if ([self hasAttachments]) { - NSString *attachmentId = self.attachmentIds[0]; - TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction]; - if ([OWSMimeTypeOversizeTextMessage isEqualToString:attachment.contentType]) { - // Handle oversize text attachments. - if ([attachment isKindOfClass:[TSAttachmentStream class]]) { - TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachment; - NSData *_Nullable data = [NSData dataWithContentsOfFile:attachmentStream.originalFilePath]; - if (data) { - NSString *_Nullable text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - if (text) { - return text.filterStringForDisplay; - } - } - } - - return @""; - } else if (attachment) { - attachmentDescription = attachment.description; - } else { - attachmentDescription = NSLocalizedString(@"UNKNOWN_ATTACHMENT_LABEL", - @"In Inbox view, last message label for thread with corrupted attachment."); - } - } - +{ NSString *_Nullable bodyDescription = nil; if (self.body.length > 0) { bodyDescription = self.body; } + if (bodyDescription == nil) { + TSAttachment *_Nullable oversizeTextAttachment = [self oversizeTextAttachmentWithTransaction:transaction]; + if ([oversizeTextAttachment isKindOfClass:[TSAttachmentStream class]]) { + TSAttachmentStream *oversizeTextAttachmentStream = (TSAttachmentStream *)oversizeTextAttachment; + NSData *_Nullable data = [NSData dataWithContentsOfFile:oversizeTextAttachmentStream.originalFilePath]; + if (data) { + NSString *_Nullable text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + if (text) { + bodyDescription = text.filterStringForDisplay; + } + } + } + } + + NSString *_Nullable attachmentDescription = nil; + TSAttachment *_Nullable mediaAttachment = [self mediaAttachmentsWithTransaction:transaction].firstObject; + if (mediaAttachment != nil) { + attachmentDescription = mediaAttachment.description; + } + if (attachmentDescription.length > 0 && bodyDescription.length > 0) { // Attachment with caption. if ([CurrentAppContext() isRTL]) { From 70b68f54128da03b4c795dbae2eeaeff48eb5547 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 13:35:13 -0600 Subject: [PATCH 420/493] sync translations --- .../translations/ca.lproj/Localizable.strings | 20 +++++++++---------- .../translations/de.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 12 +++++------ .../translations/he.lproj/Localizable.strings | 20 +++++++++---------- .../translations/id.lproj/Localizable.strings | 4 ++-- .../translations/it.lproj/Localizable.strings | 2 +- .../translations/lt.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 4 ++-- .../translations/pl.lproj/Localizable.strings | 20 +++++++++---------- .../pt_PT.lproj/Localizable.strings | 2 +- .../translations/ro.lproj/Localizable.strings | 20 +++++++++---------- .../translations/ru.lproj/Localizable.strings | 18 ++++++++--------- .../translations/sq.lproj/Localizable.strings | 4 ++-- .../zh_CN.lproj/Localizable.strings | 2 +- .../zh_TW.lproj/Localizable.strings | 2 +- 16 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index c484b8d1b..f3864f93c 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Afegeix una descripció..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Títol"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tipus de fitxer: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Rebutja trucades"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Toqueu aquí per activar el vídeo"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Finalitza la trucada"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Esborrar conversa?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Sense coincidències"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 coincidència"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d de %d coincidències"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Configuració del xat"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Crea un contacte nou"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Cerca la conversa"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Toca per canviar"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax de la feina"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "No s'ha pogut capturar la imatge."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "No s'ha pogut capturar la imatge."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Ha fallat configurar la càmera."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Àlbum sense nom"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Telefonades de Vídeo Segures!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "El Signal necessitarà aviat l'iOS 10 o posterior. Actualitzeu-lo a la Configuració del sistema >> General >> Actualitzacions."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualitzeu l'iOS"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 27bb3decd..397d3482f 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo, sichere Videoanrufe!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal wird bald iOS 10 oder neuer erfordern. Bitte aktualisieren über die iOS-Einstellungen: Einstellungen >> Allgemein >> Softwareaktualisierung."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS aktualisieren"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index f87fef377..05df85c82 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "¡Saluda a las vídeollamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal próximamente solo funcionará en iOS 10 o versiones posteriores. Actualiza en Ajustes >> General >> Actualización de software."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizar iOS"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 66349d1b9..9e93e7e4d 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Refuser l’appel entrant"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Touchez ici pour activer votre caméra"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Raccrocher"; @@ -567,7 +567,7 @@ "CONVERSATION_SEARCH_NO_RESULTS" = "Aucune correspondance"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 correspondance"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ "CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d sur %dcorrespondances"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Télécopieur travail"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Impossible de capturer l’image."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Impossible de capturer l’image."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Échec de configuration de l’appareil photo"; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album sans nom"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Bienvenue aux appels vidéo sécurisés !"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Bientôt, Signal exigera iOS 10 ou ultérieure. Veuillez effectuer une mise à niveau dans l’appli Réglage >> Général >> Mise à jour logicielle"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Mettez iOS à niveau"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 9390e90fc..2f65d5746 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "הוסף כיתוב..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "כיתוב"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "סוג קובץ: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "דחה שיחה נכנסת"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "הקש כאן כדי להפעיל את הוידיאו שלך"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "סיים שיחה"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "למחוק שיחה?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "אין התאמות"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "התאמה 1"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d מתוך %d התאמות"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "הגדרות שיחה"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "צור איש קשר חדש"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "חפש שיחה"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "הקש כדי לשנות"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "פקס עבודה"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "לא היה ניתן ללכוד תמונה."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "לא היה ניתן ללכוד תמונה."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "נכשל בתיצור מצלמה."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "אלבום ללא שם"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "שלום שיחות וידיאו מאובטחות!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal ידרוש בקרוב iOS 10 ומעלה. אנא שדרג דרך יישום הגדרות >> כללי >> עדכוני תוכנה."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "שדרג את iOS"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index 3b6ea43e4..a74a16caf 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -1524,7 +1524,7 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "masukkan nomor telepon untuk memulai"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Nomor salah"; @@ -1536,7 +1536,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Siapkan profil Anda"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Syarat & Kebijakan Privasi"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 2aed973d0..d5955b7ec 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Videochiamate sicure!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal presto richiederà iOS 10 o successivo. Ti preghiamo di aggiornare andando nelle Impostazioni >> Generali >> Aggiornamento software."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Aggiornare iOS"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index dc56746a6..49513dece 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Sveiki, saugūs vaizdo skambučiai!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal greitu metu reikalaus iOS 10 ar naujesnės. Atsinaujinkite Nustatymų (angl. Settings) programėlėje >> Bendra (angl. General) >> Programinės įrangos atnaujinimas (angl. Software Update)."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atnaujinkite iOS"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index be5964c2a..3f0c5c6c8 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -2253,7 +2253,7 @@ "SETTINGS_UNIDENTIFIED_DELIVERY_SECTION_TITLE" = "Verzegelde afzender"; /* switch label */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Indicator tonen"; +"SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Toon verzegelde afzender indicator"; /* table section footer */ "SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS_FOOTER" = "Laat een statuspictogram zien wanneer je drukt op ‘Meer informatie’ bij berichten die zijn afgeleverd met een verzegelde afzender."; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo, beveiligde videogesprekken!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Binnenkort vereist Signal dat je iOS 10 of een latere versie gebruikt. Werk je besturingssysteem bij in Instellingen >> Algemeen >> Software-update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Werk iOS bij"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 6c65ebc51..b52e06fb3 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Dodaj podpis..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Podpis"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Typ pliku: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Odrzuć połączenie przychodzące"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Dotknij tutaj, aby włączyć wideo"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Zakończ rozmowę "; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Usunąć konwersację?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Brak wyników"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 wynik"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d z %d wyników"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Ustawienia konwersacji"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Utwórz nowy kontakt"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Szukaj w konwersacji"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Dotknij, by zmienić"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax w pracy"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Nie można wykonać zdjęcia."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Nie można wykonać zdjęcia."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Nie można skonfigurować kamery."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album bez nazwy"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Szyfrowane wideo rozmowy witają!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal wkrótce będzie wymagał systemu iOS 10 lub nowszego. Zaktualizuj system przechodząc do Ustawienia >> Ogólne >> Aktualizacja oprogramowania."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uaktualnij iOS"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index d5f5f2b57..86789f7f9 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá videochamadas seguras!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "O Signal brevemente irá requerer o iOS 10 ou superior. Por favor atualize em Definições >> Geral >> Atualização de Software."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualizar iOS"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 3d92b9df3..cedb11182 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Adaugă un titlu..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Titlu"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Tip fișier: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Respingeți apelul de intrare"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Apăsați aici pentru a porni video-ul tău"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Închideți apelul"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Șterg conversația?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Nici o potrivire"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 potrivire"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d din %d potriviri"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Setări conversație"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Creează contact nou"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Caută conversație"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Apasă pentru a modifica"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax serviciu"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Imaginea nu a putut fi capturată."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Imaginea nu a putut fi capturată."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Eroare la configurarea camerei."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Album fără nume"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Bun venit la apeluri video securizate!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal va necesita în curând iOS 10 sau o versiune mai nouă. Vă rugăm să actualizați din aplicația Setări >> General >> Actualizări Software."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Actualizează-ți iOS-ul"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 7dee18460..f921301e3 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -459,7 +459,7 @@ "CONFIRM_LINK_NEW_DEVICE_ACTION" = "Привязать устройство"; /* Action sheet body presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ -"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ мог переустановить Signal или сменить устройство. Сверьте ваши коды безопасности для того, чтобы убедиться в конфиденциальности общения."; +"CONFIRM_SENDING_TO_CHANGED_IDENTITY_BODY_FORMAT" = "%@ мог(-ла) переустановить Signal или сменить устройство. Сверьте ваши коды безопасности для того, чтобы убедиться в конфиденциальности общения."; /* Action sheet title presented when a user's SN has recently changed. Embeds {{contact's name or phone number}} */ "CONFIRM_SENDING_TO_CHANGED_IDENTITY_TITLE_FORMAT" = "Код безопасности с %@ изменился"; @@ -940,7 +940,7 @@ "ERROR_MESSAGE_UNKNOWN_ERROR" = "Неизвестная ошибка."; /* No comment provided by engineer. */ -"ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Код безопасности изменился"; +"ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Код безопасности изменился."; /* Format string for 'unregistered user' error. Embeds {{the unregistered user's name or signal id}}. */ "ERROR_UNREGISTERED_USER_FORMAT" = "Незарегистрированный пользователь: %@"; @@ -1674,7 +1674,7 @@ "PRIVACY_UNVERIFY_BUTTON" = "Сбросить проверку"; /* Alert body when verifying with {{contact name}} */ -"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Это не код безопасности для %@. Убедитесь, что подтверждаете соединение с верным пользователем."; +"PRIVACY_VERIFICATION_FAILED_I_HAVE_WRONG_KEY_FOR_THEM" = "Это не код безопасности для %@. Убедитесь, что вы подтверждаете верного пользователя."; /* Alert body */ "PRIVACY_VERIFICATION_FAILED_MISMATCHED_SAFETY_NUMBERS_IN_CLIPBOARD" = "Содержимое буфера обмена не является кодом безопасности для данного собеседника."; @@ -1908,10 +1908,10 @@ "SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION" = "Отправить в любом случае"; /* Snippet to share {{safety number}} with a friend. sent e.g. via SMS */ -"SAFETY_NUMBER_SHARE_FORMAT" = "Наш код безопасности:\n%@"; +"SAFETY_NUMBER_SHARE_FORMAT" = "Наш код безопасности Signal:\n%@"; /* Action sheet heading */ -"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Код безопасности с пользователем %@ изменился. Возможно, вы хотите его подтвердить."; +"SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Код безопасности с %@ изменился. Возможно, вы хотите его подтвердить."; /* label presented once scanning (camera) view is visible. */ "SCAN_CODE_INSTRUCTIONS" = "Отсканируйте QR-код на устройстве пользователя."; @@ -2325,7 +2325,7 @@ "SUCCESSFUL_VERIFICATION_TITLE" = "Коды безопасности совпадают!"; /* Label for button to verify a user's safety number. */ -"SYSTEM_MESSAGE_ACTION_VERIFY_SAFETY_NUMBER" = "Верифицировать код безопасности"; +"SYSTEM_MESSAGE_ACTION_VERIFY_SAFETY_NUMBER" = "Подтвердить код безопасности"; /* {{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 days}}'. See other *_TIME_AMOUNT strings */ "TIME_AMOUNT_DAYS" = "%@ дней"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Добро пожаловать в видеозвонки!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "В скором времени Signal будет работать только на iOS 10 и выше. Пожалуйста, обновите iOS, перейдя в приложение Настройки >> Основные >> Обновление ПО."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Обновите IOS"; @@ -2505,10 +2505,10 @@ "VERIFICATION_STATE_CHANGE_GENERIC" = "Состояние проверки изменено."; /* Label for button or row which allows users to verify the safety number of another user. */ -"VERIFY_PRIVACY" = "Посмотреть номер безопасности"; +"VERIFY_PRIVACY" = "Просмотреть код безопасности"; /* Label for button or row which allows users to verify the safety numbers of multiple users. */ -"VERIFY_PRIVACY_MULTIPLE" = "Просмотр кодов безопасности"; +"VERIFY_PRIVACY_MULTIPLE" = "Проверить коды безопасности"; /* Indicates how to cancel a voice message. */ "VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Проведите для отмены"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index be4541b40..777308ab1 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -90,7 +90,7 @@ "ATTACHMENT" = "Bashkëngjitje"; /* One-line label indicating the user can add no more text to the attachment caption. */ -"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "U mbërrrit në kufi përshkrimes."; +"ATTACHMENT_APPROVAL_CAPTION_LENGTH_LIMIT_REACHED" = "U mbërrrit në kufi përshkrimesh."; /* placeholder text for an empty captioning field */ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Shtoni një përshkrim…"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Tungjatjeta Thirrjeve Video të Sigurta!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal-i së shpejti do të dojë iOS 10 ose të mëvonshëm. Ju lutemi, përmirësojeni që nga aplikacioni Rregullime >> Të përgjithshme >> Përditësim Software-i."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Përmirësoni iOS-in"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 1ca986678..7d7ecdc5f 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "现推出安全的视频通话！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal 即将仅支持 iOS 10 或更新的系统版本。请到 设置 >> 通用 >> 软件更新 升级 iOS。"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "升级 iOS"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index f5f3f953e..ba66a5d17 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "現推出安全的視訊通話！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal 將要求 iOS 10 以上才能使用。請在 \"設定\" >> \"一般\" >> \"軟體更新\" 中升級。"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "更新 iOS"; From 6c4dbfbc4c6623db0e8f31e103a5941f748e05b5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 13:35:35 -0600 Subject: [PATCH 421/493] "Bump build to 2.38.0.10." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index e33e14b84..a22f827d3 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.9 + 2.38.0.10 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 08f7b0a94..9c5fe74cd 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.9 + 2.38.0.10 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From e42192624f47f6d6fd88276b1eb4489c584575bd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 29 Mar 2019 15:43:08 -0600 Subject: [PATCH 422/493] fixup tests --- SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index 79d93e0d0..f6e0c86e5 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -213,11 +213,11 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { let expectation = self.expectation(description: "link download and parsing") OWSLinkPreview.tryToBuildPreviewInfo(previewUrl: "https://www.youtube.com/watch?v=tP-Ipsat90c") - .done { (draft) in + .done { (draft: OWSLinkPreviewDraft) in XCTAssertNotNil(draft) XCTAssertEqual(draft.title, "Randomness is Random - Numberphile") - XCTAssertNotNil(draft.imageFilePath) + XCTAssertNotNil(draft.jpegImageData) expectation.fulfill() }.catch { (error) in From e69494450b0ce05c63bd16f90b6830b5ed5a7627 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 1 Apr 2019 13:56:20 -0600 Subject: [PATCH 423/493] put conversation search behind feature flag --- .../OWSConversationSettingsViewController.m | 31 ++++++++++--------- SignalServiceKit/src/Util/FeatureFlags.swift | 5 +++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m index 1cc654e74..d18d868b3 100644 --- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m @@ -371,21 +371,22 @@ const CGFloat kIconViewLength = 24; [weakSelf showMediaGallery]; }]]; - // TODO icon - [mainSection addItem:[OWSTableItem - itemWithCustomCellBlock:^{ - NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH", - @"Table cell label in conversation settings which returns the user to the " - @"conversation with 'search mode' activated"); - return [weakSelf - disclosureCellWithName:title - iconName:@"conversation_settings_search" - accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( - OWSConversationSettingsViewController, @"search")]; - } - actionBlock:^{ - [weakSelf tappedConversationSearch]; - }]]; + if (SSKFeatureFlags.conversationSearch) { + [mainSection addItem:[OWSTableItem + itemWithCustomCellBlock:^{ + NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH", + @"Table cell label in conversation settings which returns the user to the " + @"conversation with 'search mode' activated"); + return [weakSelf + disclosureCellWithName:title + iconName:@"conversation_settings_search" + accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( + OWSConversationSettingsViewController, @"search")]; + } + actionBlock:^{ + [weakSelf tappedConversationSearch]; + }]]; + } if (!isNoteToSelf && !self.isGroupThread && self.thread.hasSafetyNumbers) { [mainSection diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 4d58938c0..d8cbac11b 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -9,6 +9,11 @@ import Foundation @objc(SSKFeatureFlags) public class FeatureFlags: NSObject { + @objc + public static var conversationSearch: Bool { + return false + } + /// iOS has long supported sending oversized text as a sidecar attachment. The other clients /// simply displayed it as a text attachment. As part of the new cross-client long-text feature, /// we want to be able to display long text with attachments as well. Existing iOS clients From 1d959792e8a89c19478f882d505b4b40a69e990e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 1 Apr 2019 13:59:05 -0600 Subject: [PATCH 424/493] sync translations --- Signal/translations/bs.lproj/Localizable.strings | 4 ++-- Signal/translations/pt_PT.lproj/Localizable.strings | 4 ++-- Signal/translations/tr.lproj/Localizable.strings | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 148a45df6..dc492024d 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -2250,7 +2250,7 @@ "SETTINGS_UNIDENTIFIED_DELIVERY_LEARN_MORE" = "Saznaj više"; /* table section label */ -"SETTINGS_UNIDENTIFIED_DELIVERY_SECTION_TITLE" = "Sealed Sender"; +"SETTINGS_UNIDENTIFIED_DELIVERY_SECTION_TITLE" = "Zapečaćeni pošiljalac"; /* switch label */ "SETTINGS_UNIDENTIFIED_DELIVERY_SHOW_INDICATORS" = "Display Indicators"; @@ -2262,7 +2262,7 @@ "SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS" = "Allow from Anyone"; /* table section footer */ -"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Enable sealed sender for incoming messages from non-contacts and people with whom you have not shared your profile."; +"SETTINGS_UNIDENTIFIED_DELIVERY_UNRESTRICTED_ACCESS_FOOTER" = "Aktiviraj opciju zapečaćenog pošiljaoca za poruke koje dolaze od osoba koje nisu među Vašim kontaktima i s kojima niste razmijenili profile."; /* No comment provided by engineer. */ "SETTINGS_VERSION" = "Verzija"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 86789f7f9..9fe6a3821 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -684,10 +684,10 @@ "DATABASE_VIEW_OVERLAY_TITLE" = "A optimizar a base de dados"; /* Format string for a relative time, expressed as a certain number of hours in the past. Embeds {{The number of hours}}. */ -"DATE_HOURS_AGO_FORMAT" = " Há %@h atrás"; +"DATE_HOURS_AGO_FORMAT" = " Há %@h"; /* Format string for a relative time, expressed as a certain number of minutes in the past. Embeds {{The number of minutes}}. */ -"DATE_MINUTES_AGO_FORMAT" = "Há %@min atrás"; +"DATE_MINUTES_AGO_FORMAT" = "Há %@min"; /* The present; the current time. */ "DATE_NOW" = "Agora"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 78070ceaf..c4443f218 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Yeni Kişi Oluştur"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Sohbeti Araştır"; +"CONVERSATION_SETTINGS_SEARCH" = "Sohbette Ara"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Değiştirmek için Dokunun"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Merhaba Güvenli Görüntülü Aramalar!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal yakında iOS 10 ve sonrasına gereksinim duyacaktır. Lütfen Ayarlar >> Genel >> Yazılım Güncelleme bölümünden yükseltin."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOS'u Güncelle"; From 3b0d6991e1b9f3549b51a25e754c9de060c559bb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 1 Apr 2019 13:59:17 -0600 Subject: [PATCH 425/493] "Bump build to 2.38.0.11." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index a22f827d3..0bb591dc5 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.10 + 2.38.0.11 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 9c5fe74cd..57a84f865 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.0 CFBundleVersion - 2.38.0.10 + 2.38.0.11 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From a7bd3721474adf7efba32a46714dd3ab82e4f71c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:03:03 -0600 Subject: [PATCH 426/493] Fix tests by removing side effect in getter While setting up the test CurrentAppContect, we use OWSTemporaryDirectory which in turn recursively references CurrentAppContext, which crashes. Clearing temp directories on every activation is sufficient. --- SignalServiceKit/src/Util/OWSFileSystem.m | 8 -------- 1 file changed, 8 deletions(-) diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m index 36d4a8f07..4f2d5c3ac 100644 --- a/SignalServiceKit/src/Util/OWSFileSystem.m +++ b/SignalServiceKit/src/Util/OWSFileSystem.m @@ -348,14 +348,6 @@ NSString *OWSTemporaryDirectory(void) dirPath = [NSTemporaryDirectory() stringByAppendingPathComponent:dirName]; BOOL success = [OWSFileSystem ensureDirectoryExists:dirPath fileProtectionType:NSFileProtectionComplete]; OWSCAssert(success); - - // On launch, clear old temp directories. - // - // NOTE: ClearOldTemporaryDirectoriesSync() will call this function - // OWSTemporaryDirectory(), but there's no risk of deadlock; - // ClearOldTemporaryDirectories() calls ClearOldTemporaryDirectoriesSync() - // after a long delay. - ClearOldTemporaryDirectories(); }); return dirPath; } From 3fb8b02b3b4fe4b93b1382466f9262b1c556314c Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 2 Apr 2019 18:19:28 -0600 Subject: [PATCH 427/493] update front --- .../src/Network/OWSCensorshipConfiguration.h | 9 ++--- .../src/Network/OWSCensorshipConfiguration.m | 36 ++++++++++--------- .../src/Network/OWSCountryMetadata.m | 10 +++--- SignalServiceKit/src/TSConstants.h | 4 +-- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h index 208b33504..1f16ac63f 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h @@ -1,14 +1,15 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @class AFSecurityPolicy; -extern NSString *const OWSCensorshipConfiguration_SouqFrontingHost; -extern NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost; -extern NSString *const OWSCensorshipConfiguration_DefaultFrontingHost; +extern NSString *const OWSFrontingHost_GoogleEgypt; +extern NSString *const OWSFrontingHost_GoogleUAE; +extern NSString *const OWSFrontingHost_GoogleOman; +extern NSString *const OWSFrontingHost_GoogleQatar; @interface OWSCensorshipConfiguration : NSObject diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m index 3ddbea908..fd55f80a5 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSCensorshipConfiguration.h" @@ -11,9 +11,11 @@ NS_ASSUME_NONNULL_BEGIN -NSString *const OWSCensorshipConfiguration_SouqFrontingHost = @"cms.souqcdn.com"; -NSString *const OWSCensorshipConfiguration_YahooViewFrontingHost = @"view.yahoo.com"; -NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipConfiguration_YahooViewFrontingHost; +NSString *const OWSFrontingHost_GoogleEgypt = @"www.google.com.eg"; +NSString *const OWSFrontingHost_GoogleUAE = @"www.google.ae"; +NSString *const OWSFrontingHost_GoogleOman = @"www.google.com.om"; +NSString *const OWSFrontingHost_GoogleQatar = @"www.google.com.qa"; +NSString *const OWSFrontingHost_Default = @"www.google.com"; @implementation OWSCensorshipConfiguration @@ -25,7 +27,6 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return nil; } - return [self censorshipConfigurationWithCountryCode:countryCode]; } @@ -45,10 +46,9 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo baseURL = [NSURL URLWithString:frontingURLString]; securityPolicy = [self securityPolicyForDomain:(NSString *)specifiedDomain]; } else { - NSString *frontingURLString = - [NSString stringWithFormat:@"https://%@", OWSCensorshipConfiguration_DefaultFrontingHost]; + NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", OWSFrontingHost_Default]; baseURL = [NSURL URLWithString:frontingURLString]; - securityPolicy = [self securityPolicyForDomain:OWSCensorshipConfiguration_DefaultFrontingHost]; + securityPolicy = [self securityPolicyForDomain:OWSFrontingHost_Default]; } OWSAssertDebug(baseURL); @@ -135,13 +135,17 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo // If the security policy requires new certificates, include them in the SSK bundle + (AFSecurityPolicy *)securityPolicyForDomain:(NSString *)domain { - if ([domain isEqualToString:OWSCensorshipConfiguration_SouqFrontingHost]) { - return [self souqPinningPolicy]; - } else if ([domain isEqualToString:OWSCensorshipConfiguration_YahooViewFrontingHost]) { - return [self yahooViewPinningPolicy]; + if ([domain isEqualToString:OWSFrontingHost_GoogleEgypt]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleQatar]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleOman]) { + return self.googlePinningPolicy; + } else if ([domain isEqualToString:OWSFrontingHost_GoogleUAE]) { + return self.googlePinningPolicy; } else { OWSFailDebug(@"unknown pinning domain."); - return [self yahooViewPinningPolicy]; + return self.googlePinningPolicy; } } @@ -197,7 +201,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return certData; } -+ (AFSecurityPolicy *)yahooViewPinningPolicy ++ (AFSecurityPolicy *)yahooViewPinningPolicy_deprecated { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; @@ -209,7 +213,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return securityPolicy; } -+ (AFSecurityPolicy *)souqPinningPolicy ++ (AFSecurityPolicy *)souqPinningPolicy_deprecated { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; @@ -221,7 +225,7 @@ NSString *const OWSCensorshipConfiguration_DefaultFrontingHost = OWSCensorshipCo return securityPolicy; } -+ (AFSecurityPolicy *)googlePinningPolicy_deprecated ++ (AFSecurityPolicy *)googlePinningPolicy { static AFSecurityPolicy *securityPolicy = nil; static dispatch_once_t onceToken; diff --git a/SignalServiceKit/src/Network/OWSCountryMetadata.m b/SignalServiceKit/src/Network/OWSCountryMetadata.m index 95cf9a4bb..6d3811353 100644 --- a/SignalServiceKit/src/Network/OWSCountryMetadata.m +++ b/SignalServiceKit/src/Network/OWSCountryMetadata.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSCountryMetadata.h" @@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Andorra" tld:@".ad" frontingDomain:nil countryCode:@"AD"], [OWSCountryMetadata countryMetadataWithName:@"United Arab Emirates" tld:@".ae" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleUAE countryCode:@"AE"], [OWSCountryMetadata countryMetadataWithName:@"Afghanistan" tld:@".af" frontingDomain:nil countryCode:@"AF"], [OWSCountryMetadata countryMetadataWithName:@"Antigua and Barbuda" @@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Estonia" tld:@".ee" frontingDomain:nil countryCode:@"EE"], [OWSCountryMetadata countryMetadataWithName:@"Egypt" tld:@".eg" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleEgypt countryCode:@"EG"], [OWSCountryMetadata countryMetadataWithName:@"Spain" tld:@".es" frontingDomain:nil countryCode:@"ES"], [OWSCountryMetadata countryMetadataWithName:@"Ethiopia" tld:@".et" frontingDomain:nil countryCode:@"ET"], @@ -255,7 +255,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"New Zealand" tld:@".nz" frontingDomain:nil countryCode:@"NZ"], [OWSCountryMetadata countryMetadataWithName:@"Oman" tld:@".om" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleOman countryCode:@"OM"], [OWSCountryMetadata countryMetadataWithName:@"Pakistan" tld:@".pk" frontingDomain:nil countryCode:@"PK"], [OWSCountryMetadata countryMetadataWithName:@"Panama" tld:@".pa" frontingDomain:nil countryCode:@"PA"], @@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN [OWSCountryMetadata countryMetadataWithName:@"Paraguay" tld:@".py" frontingDomain:nil countryCode:@"PY"], [OWSCountryMetadata countryMetadataWithName:@"Qatar" tld:@".qa" - frontingDomain:OWSCensorshipConfiguration_SouqFrontingHost + frontingDomain:OWSFrontingHost_GoogleQatar countryCode:@"QA"], [OWSCountryMetadata countryMetadataWithName:@"Romania" tld:@".ro" frontingDomain:nil countryCode:@"RO"], [OWSCountryMetadata countryMetadataWithName:@"Serbia" tld:@".rs" frontingDomain:nil countryCode:@"RS"], diff --git a/SignalServiceKit/src/TSConstants.h b/SignalServiceKit/src/TSConstants.h index 8c327b503..e838abdce 100644 --- a/SignalServiceKit/src/TSConstants.h +++ b/SignalServiceKit/src/TSConstants.h @@ -29,8 +29,8 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) { #define textSecureServerURL @"https://textsecure-service.whispersystems.org/" #define textSecureCDNServerURL @"https://cdn.signal.org" // Use same reflector for service and CDN -#define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org" -#define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org" +#define textSecureServiceReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net" +#define textSecureCDNReflectorHost @"europe-west1-signal-cdn-reflector.cloudfunctions.net" #define contactDiscoveryURL @"https://api.directory.signal.org" #define kUDTrustRoot @"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF" #define USING_PRODUCTION_SERVICE From 1fae83a77716b75396edd5d7b9e3265dec198354 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 2 Apr 2019 19:58:04 -0600 Subject: [PATCH 428/493] respect any CDN headers (eg Host for front) --- SignalMessaging/profiles/OWSProfileManager.m | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m index 7eb698855..e3a723a61 100644 --- a/SignalMessaging/profiles/OWSProfileManager.m +++ b/SignalMessaging/profiles/OWSProfileManager.m @@ -1233,10 +1233,19 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error); }); }; - NSURL *avatarUrlPath = - [NSURL URLWithString:userProfile.avatarUrlPath relativeToURL:self.avatarHTTPManager.baseURL]; - NSURLRequest *request = [NSURLRequest requestWithURL:avatarUrlPath]; - NSURLSessionDownloadTask *downloadTask = [self.avatarHTTPManager downloadTaskWithRequest:request + NSURL *avatarUrl = [NSURL URLWithString:userProfile.avatarUrlPath relativeToURL:self.avatarHTTPManager.baseURL]; + NSError *serializationError; + NSMutableURLRequest *request = + [self.avatarHTTPManager.requestSerializer requestWithMethod:@"GET" + URLString:avatarUrl.absoluteString + parameters:nil + error:&serializationError]; + if (serializationError) { + OWSFailDebug(@"serializationError: %@", serializationError); + return; + } + + __block NSURLSessionDownloadTask *downloadTask = [self.avatarHTTPManager downloadTaskWithRequest:request progress:^(NSProgress *_Nonnull downloadProgress) { OWSLogVerbose( @"Downloading avatar for %@ %f", userProfile.recipientId, downloadProgress.fractionCompleted); From d06280a27072c1f6d39e5dbae96a84db96179982 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 06:28:38 -0600 Subject: [PATCH 429/493] "Bump build to 2.38.1.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 0bb591dc5..8656b93c1 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.38.0 + 2.38.1 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.0.11 + 2.38.1.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 57a84f865..26bc7dd41 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.38.0 + 2.38.1 CFBundleVersion - 2.38.0.11 + 2.38.1.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From fdc9db34871e613dc86f69f07965f3bebabdd8a2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 2 Apr 2019 15:31:20 -0600 Subject: [PATCH 430/493] iOS9 workaround to restore input view after sending captioned attachment --- .../ConversationView/ConversationViewController.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 6ff11de17..ec9e05bb6 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2977,6 +2977,13 @@ typedef enum : NSUInteger { didPickImageAttachments:(NSArray *)attachments messageText:(NSString *_Nullable)messageText { + OWSAssert(self.isFirstResponder); + if (@available(iOS 10, *)) { + // do nothing + } else { + [self reloadInputViews]; + } + [self tryToSendAttachments:attachments messageText:messageText]; } From 8ead2cc83d567add02c060b79387caeb4b4383fd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 10:53:08 -0600 Subject: [PATCH 431/493] fix overzealous assert --- .../ConversationView/ConversationViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ec9e05bb6..bb49b1ba5 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2977,7 +2977,7 @@ typedef enum : NSUInteger { didPickImageAttachments:(NSArray *)attachments messageText:(NSString *_Nullable)messageText { - OWSAssert(self.isFirstResponder); + OWSAssertDebug(self.isFirstResponder); if (@available(iOS 10, *)) { // do nothing } else { From 63907acb54aef902d52d7fcb7e69a8562f874b8e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 2 Apr 2019 15:40:35 -0600 Subject: [PATCH 432/493] Don't update "cancel" status when locked --- .../ConversationInputToolbar.m | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index fd34c1cd4..2f980384b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -484,19 +484,6 @@ const CGFloat kMaxTextViewHeight = 98; // This is okay because there's only space on screen to perform the // gesture in one direction. CGFloat xOffset = fabs(self.voiceMemoGestureStartLocation.x - location.x); - // The lower this value, the easier it is to cancel by accident. - // The higher this value, the harder it is to cancel. - const CGFloat kCancelOffsetPoints = 100.f; - CGFloat cancelAlpha = xOffset / kCancelOffsetPoints; - BOOL isCancelled = cancelAlpha >= 1.f; - if (isCancelled) { - self.voiceMemoRecordingState = VoiceMemoRecordingState_Idle; - [self.inputToolbarDelegate voiceMemoGestureDidCancel]; - break; - } else { - [self.inputToolbarDelegate voiceMemoGestureDidUpdateCancelWithRatioComplete:cancelAlpha]; - } - CGFloat yOffset = fabs(self.voiceMemoGestureStartLocation.y - location.y); // require a certain threshold before we consider the user to be @@ -524,6 +511,19 @@ const CGFloat kMaxTextViewHeight = 98; } } else { [self.voiceMemoLockView updateWithRatioComplete:lockAlpha]; + + // The lower this value, the easier it is to cancel by accident. + // The higher this value, the harder it is to cancel. + const CGFloat kCancelOffsetPoints = 100.f; + CGFloat cancelAlpha = xOffset / kCancelOffsetPoints; + BOOL isCancelled = cancelAlpha >= 1.f; + if (isCancelled) { + self.voiceMemoRecordingState = VoiceMemoRecordingState_Idle; + [self.inputToolbarDelegate voiceMemoGestureDidCancel]; + break; + } else { + [self.inputToolbarDelegate voiceMemoGestureDidUpdateCancelWithRatioComplete:cancelAlpha]; + } } } break; From 5e96769a12a383b1e0fd490b49a7722dd8ac1aa6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 2 Apr 2019 15:16:38 -0600 Subject: [PATCH 433/493] resize voice note bar with rotation --- .../ConversationView/ConversationInputToolbar.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 2f980384b..689a0de88 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -569,7 +569,7 @@ const CGFloat kMaxTextViewHeight = 98; self.voiceMemoUI = [UIView new]; self.voiceMemoUI.backgroundColor = Theme.toolbarBackgroundColor; [self addSubview:self.voiceMemoUI]; - self.voiceMemoUI.frame = CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height); + [self.voiceMemoUI autoPinEdgesToSuperviewEdges]; SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoUI); self.voiceMemoContentView = [UIView new]; @@ -671,8 +671,7 @@ const CGFloat kMaxTextViewHeight = 98; [self.recordingLabel autoPinLeadingToTrailingEdgeOfView:imageView offset:5.f]; [cancelLabel autoVCenterInSuperview]; [cancelLabel autoHCenterInSuperview]; - [self.voiceMemoUI setNeedsLayout]; - [self.voiceMemoUI layoutSubviews]; + [self.voiceMemoUI layoutIfNeeded]; // Slide in the "slide to cancel" label. CGRect cancelLabelStartFrame = cancelLabel.frame; From 9c9545b4088cec57a47bc7c79c342e0b29b17d4b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 11:02:19 -0600 Subject: [PATCH 434/493] update tags to ignore --- Scripts/reverse_integration_check.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Scripts/reverse_integration_check.py b/Scripts/reverse_integration_check.py index 4fafa950f..b5b845aa8 100755 --- a/Scripts/reverse_integration_check.py +++ b/Scripts/reverse_integration_check.py @@ -60,9 +60,15 @@ def main(): '2.34.0.10', '2.34.0.11', '2.34.0.12', '2.34.0.13', '2.34.0.15', '2.34.0.16', '2.34.0.17', '2.34.0.18', '2.34.0.19', '2.34.0.20', '2.34.0.6', '2.34.0.7', '2.34.0.8', '2.34.0.9', '2.37.3.0', '2.37.4.0', + # these were internal release only tags, now we include "-internal" in the tag name to avoid this '2.38.0.2.1', '2.38.0.3.1', - '2.38.0.4.1' + '2.38.0.4.1', + # the work in these tags was moved to the 2.38.1 release instead + '2.38.0.12', + '2.38.0.13', + '2.38.0.14', + # ] tags_of_concern = [tag for tag in tags_of_concern if tag not in tags_to_ignore] From d189621495f75c959849c7dbeea1cfbe5c4b8a50 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 2 Apr 2019 17:09:00 -0400 Subject: [PATCH 435/493] Don't bother cleaning up CKOperations per feature flag. --- Signal/src/util/Backup/OWSBackup.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index 6e0e7aeb3..5fabacf62 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSBackup.h" @@ -138,7 +138,9 @@ NSError *OWSBackupErrorWithDescription(NSString *description) - (void)setup { - [OWSBackupAPI setup]; + if (OWSBackup.isFeatureEnabled) { + [OWSBackupAPI setup]; + } [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) From dc46974395b16d8c1488e617fe6c4d923d131161 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 3 Apr 2019 13:11:08 -0400 Subject: [PATCH 436/493] Respond to CR. --- Signal/src/util/Backup/OWSBackup.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index 5fabacf62..c56069ded 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -138,10 +138,12 @@ NSError *OWSBackupErrorWithDescription(NSString *description) - (void)setup { - if (OWSBackup.isFeatureEnabled) { - [OWSBackupAPI setup]; + if (!OWSBackup.isFeatureEnabled) { + return; } + [OWSBackupAPI setup]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:OWSApplicationDidBecomeActiveNotification From 7522fbd88ea4528b05eb3c937450be6e805e7c49 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 12:34:39 -0600 Subject: [PATCH 437/493] "Bump build to 2.38.1.1." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 8656b93c1..5c659ae3b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.1.0 + 2.38.1.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 26bc7dd41..1f3d88acf 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.1 CFBundleVersion - 2.38.1.0 + 2.38.1.1 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From a693e77c01b356aa0e89904b44ef28fe3e265e67 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 17:35:57 -0600 Subject: [PATCH 438/493] sync translations --- .../translations/bs.lproj/Localizable.strings | 8 ++++---- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/it.lproj/Localizable.strings | 2 +- .../translations/ja.lproj/Localizable.strings | 20 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index dc492024d..edbe43c95 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -252,7 +252,7 @@ "BLOCK_LIST_UNBLOCK_BUTTON" = "Deblokiraj"; /* Action sheet body when confirming you want to unblock a group */ -"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Existing members will be able to add you to the group again."; +"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Postojeći članovi moći će Vas ponovo uvrstiti u grupu."; /* Action sheet title when confirming you want to unblock a group. */ "BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "Unblock This Group?"; @@ -435,7 +435,7 @@ "COMPOSE_MESSAGE_CONTACT_SECTION_TITLE" = "Kontakti"; /* Table section header for group listing when composing a new message */ -"COMPOSE_MESSAGE_GROUP_SECTION_TITLE" = "Groups"; +"COMPOSE_MESSAGE_GROUP_SECTION_TITLE" = "Grupe"; /* Table section header for invite listing when composing a new message */ "COMPOSE_MESSAGE_INVITE_SECTION_TITLE" = "Pozivnica"; @@ -516,10 +516,10 @@ "CONTACT_FIELD_MIDDLE_NAME" = "Middle Name"; /* Label for the 'name prefix' field of a contact. */ -"CONTACT_FIELD_NAME_PREFIX" = "Prefix"; +"CONTACT_FIELD_NAME_PREFIX" = "Prefiks"; /* Label for the 'name suffix' field of a contact. */ -"CONTACT_FIELD_NAME_SUFFIX" = "Suffix"; +"CONTACT_FIELD_NAME_SUFFIX" = "Sufiks"; /* Label for the 'organization' field of a contact. */ "CONTACT_FIELD_ORGANIZATION" = "Organization"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 9e93e7e4d..b15c5d920 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -1515,7 +1515,7 @@ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Accorder les autorisations"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Les informations de vos contacts sont toujours transmises de façon sécurisée."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Les renseignements de vos contacts sont toujours transmises de façon sécurisée."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Pas maintenant"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index d5955b7ec..3a54d1f89 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -15,7 +15,7 @@ "ACTION_SEND_MESSAGE" = "Invia messaggio"; /* Label for 'share contact' button. */ -"ACTION_SHARE_CONTACT" = "Condivi contatto"; +"ACTION_SHARE_CONTACT" = "Condividi contatto"; /* Label for 'video call' button in contact view. */ "ACTION_VIDEO_CALL" = "Videochiamata"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index ccd645aab..434f0f0fe 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "キャプションの追加..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "キャプション"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "ファイルの種類：%@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "着信を拒否する"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "動画再生はここをタップ"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "通話を切る"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "消去しますか？"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "見つかりません"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "ありました"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d （ %d のうち）"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "会話設定"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "新規の連絡先を作る"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "会話の検索"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "タップして変える"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "職場FAX"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "画像はキャプチャできません"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "画像はキャプチャできません"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "カメラの設定ができませんでした"; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "無名のアルバム"; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "安全なビデオ電話にようこそ！"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signalは、まもなくiOS 10以上だけの対応になります。アップデートしてください。"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "iOSを更新する"; From a1c6b7ec154ca999ed9ef9d4a1d095597b610fb5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 17:36:00 -0600 Subject: [PATCH 439/493] "Bump build to 2.38.1.2." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5c659ae3b..6f39a4de6 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.1.1 + 2.38.1.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 1f3d88acf..eaccdb4c0 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.38.1 CFBundleVersion - 2.38.1.1 + 2.38.1.2 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From eb68c19472c1cfd59a1865daf78f8d46e11bda81 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2019 10:29:55 -0600 Subject: [PATCH 440/493] bump_build_number adds git tag --- Scripts/{bump_build_number.py => bump_build_tag.py} | 2 ++ 1 file changed, 2 insertions(+) rename Scripts/{bump_build_number.py => bump_build_tag.py} (98%) diff --git a/Scripts/bump_build_number.py b/Scripts/bump_build_tag.py similarity index 98% rename from Scripts/bump_build_number.py rename to Scripts/bump_build_tag.py index bc6671e39..6569a4daf 100755 --- a/Scripts/bump_build_number.py +++ b/Scripts/bump_build_tag.py @@ -200,5 +200,7 @@ if __name__ == '__main__': execute_command(command) command = ['git', 'commit', '-m', '"Bump build to %s."' % new_build_version] execute_command(command) + command = ['git', 'tag', new_build_version] + execute_command(command) From 87094a8fb1e742f7745ba9b3c600e67273665d69 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:02:54 -0600 Subject: [PATCH 441/493] update carthage --- Signal/Signal-Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 6f39a4de6..d9b427a35 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -5,7 +5,7 @@ BuildDetails CarthageVersion - 0.31.2 + 0.32.0 OSXVersion 10.14.3 WebRTCCommit From 64a0c4bfaaa20bf522ae2d281d76b40aa54ab284 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:22:31 -0600 Subject: [PATCH 442/493] auto-migrate to Swift5 --- Signal.xcodeproj/project.pbxproj | 31 +++++----- Signal/src/Models/AccountManager.swift | 4 +- .../Models/CompareSafetyNumbersActivity.swift | 6 +- Signal/src/UIApplication+OWS.swift | 2 +- Signal/src/UserInterface/HapticFeedback.swift | 2 +- .../UserNotificationsAdaptee.swift | 9 ++- ...ShareToExistingContactViewController.swift | 2 +- .../Call/CallViewController.swift | 9 ++- .../ColorPickerViewController.swift | 2 +- .../ContactViewController.swift | 2 +- .../src/ViewControllers/ContactsPicker.swift | 6 +- .../Cells/ConversationMediaView.swift | 12 ++-- .../Cells/MediaAlbumCellView.swift | 6 +- .../Cells/MediaDownloadView.swift | 2 +- .../Cells/MediaUploadView.swift | 2 +- .../ConversationHeaderView.swift | 2 +- .../CropScaleImageViewController.swift | 2 +- .../GifPicker/GifPickerCell.swift | 2 +- .../GifPicker/GifPickerViewController.swift | 4 +- .../ConversationSearchViewController.swift | 8 +-- .../LongTextViewController.swift | 14 +++-- .../MediaGalleryViewController.swift | 24 ++++---- .../MediaPageViewController.swift | 17 +++++- .../MediaTileViewController.swift | 10 ++-- .../OWS2FAReminderViewController.swift | 2 +- .../Photos/ImagePickerController.swift | 6 +- .../ViewControllers/Photos/PhotoCapture.swift | 2 +- .../Photos/PhotoCaptureViewController.swift | 2 +- .../PhotoCollectionPickerController.swift | 2 +- .../SendMediaNavigationController.swift | 2 +- .../OnboardingSplashViewController.swift | 4 +- Signal/src/call/CallAudioService.swift | 58 +++++++++++++------ Signal/src/call/CallService.swift | 2 +- Signal/src/call/SignalCall.swift | 2 +- .../call/Speakerbox/CallKitCallManager.swift | 4 +- .../Speakerbox/CallKitCallUIAdaptee.swift | 2 +- Signal/src/util/Backup/OWSBackupAPI.swift | 14 ++--- Signal/src/views/AvatarTableViewCell.swift | 2 +- Signal/src/views/CaptionView.swift | 2 +- Signal/src/views/ContactCell.swift | 10 ++-- Signal/src/views/LinkPreviewView.swift | 2 +- Signal/src/views/MarqueeLabel.swift | 38 +++++++----- Signal/src/views/QuotedReplyPreview.swift | 2 +- Signal/test/contact/ContactsPickerTest.swift | 6 +- .../views/ImageEditor/ImageEditorTest.swift | 2 +- .../AttachmentApprovalViewController.swift | 29 +++++++--- .../AttachmentCaptionViewController.swift | 2 +- .../AttachmentItemCollection.swift | 4 +- .../AttachmentPrepViewController.swift | 2 +- .../ViewControllers/MediaMessageView.swift | 16 ++--- ...ModalActivityIndicatorViewController.swift | 2 +- SignalMessaging/Views/AvatarImageView.swift | 14 ++--- .../ImageEditor/ImageEditorCanvasView.swift | 10 ++-- SignalMessaging/Views/OWSNavigationBar.swift | 6 +- SignalMessaging/Views/VideoPlayerView.swift | 2 +- .../attachments/OWSVideoPlayer.swift | 4 +- .../attachments/SignalAttachment.swift | 5 +- .../environment/OWSAudioSession.swift | 19 +++--- SignalMessaging/utils/ConversationStyle.swift | 2 +- .../utils/ProximityMonitoringManager.swift | 2 +- .../Messages/Attachments/OWSMediaUtils.swift | 2 +- .../Attachments/OWSThumbnailService.swift | 2 +- .../Interactions/OWSLinkPreview.swift | 4 +- SignalServiceKit/src/Util/LRUCache.swift | 2 +- .../src/Util/MessageSender+Promise.swift | 2 +- .../src/Util/YapDatabase+Promise.swift | 2 +- .../SAELoadViewController.swift | 2 +- .../ShareViewController.swift | 2 +- 68 files changed, 275 insertions(+), 208 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c05e80e06..c0ec82a9b 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2875,7 +2875,7 @@ 453518671FC635DD00210559 = { CreatedOnToolsVersion = 9.2; DevelopmentTeam = U68MSDN6DR; - LastSwiftMigration = 0910; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -2895,12 +2895,12 @@ 453518911FC63DBF00210559 = { CreatedOnToolsVersion = 9.2; DevelopmentTeam = U68MSDN6DR; - LastSwiftMigration = 0930; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; D221A088169C9E5E00537ABF = { DevelopmentTeam = U68MSDN6DR; - LastSwiftMigration = 0930; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -2931,7 +2931,7 @@ }; D221A0A9169C9E5F00537ABF = { DevelopmentTeam = U68MSDN6DR; - LastSwiftMigration = 0930; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; TestTargetID = D221A088169C9E5E00537ABF; }; @@ -2942,6 +2942,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, az_AZ, bg_BG, @@ -3914,7 +3915,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "SignalShareExtension/SignalShareExtension-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -3979,7 +3980,7 @@ SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "SignalShareExtension/SignalShareExtension-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VALIDATE_PRODUCT = YES; }; @@ -4032,8 +4033,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -4106,8 +4106,7 @@ SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -4328,8 +4327,7 @@ SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Signal/src/Signal-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_AFTER_BUILD = YES; VALID_ARCHS = "arm64 armv7 armv7s"; WRAPPER_EXTENSION = app; @@ -4392,8 +4390,7 @@ RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Signal/src/Signal-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_AFTER_BUILD = YES; VALID_ARCHS = "arm64 armv7 armv7s"; WRAPPER_EXTENSION = app; @@ -4452,8 +4449,7 @@ PROVISIONING_PROFILE = ""; SWIFT_OBJC_BRIDGING_HEADER = "Signal/test/SignalTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUNDLE_LOADER)"; VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; }; @@ -4510,8 +4506,7 @@ PROVISIONING_PROFILE = ""; SWIFT_OBJC_BRIDGING_HEADER = "Signal/test/SignalTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUNDLE_LOADER)"; VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; }; diff --git a/Signal/src/Models/AccountManager.swift b/Signal/src/Models/AccountManager.swift index 1b2d6ee5e..9785a0e08 100644 --- a/Signal/src/Models/AccountManager.swift +++ b/Signal/src/Models/AccountManager.swift @@ -83,7 +83,7 @@ public class AccountManager: NSObject { private func registerForTextSecure(verificationCode: String, pin: String?) -> Promise { - return Promise { resolver in + return Promise { resolver in tsAccountManager.verifyAccount(withCode: verificationCode, pin: pin, success: resolver.fulfill, @@ -106,7 +106,7 @@ public class AccountManager: NSObject { // MARK: Message Delivery func updatePushTokens(pushToken: String, voipToken: String) -> Promise { - return Promise { resolver in + return Promise { resolver in tsAccountManager.registerForPushNotifications(pushToken: pushToken, voipToken: voipToken, success: resolver.fulfill, diff --git a/Signal/src/Models/CompareSafetyNumbersActivity.swift b/Signal/src/Models/CompareSafetyNumbersActivity.swift index 7fdeefc90..6a2527e01 100644 --- a/Signal/src/Models/CompareSafetyNumbersActivity.swift +++ b/Signal/src/Models/CompareSafetyNumbersActivity.swift @@ -27,12 +27,12 @@ class CompareSafetyNumbersActivity: UIActivity { // MARK: UIActivity - override class var activityCategory: UIActivityCategory { + override class var activityCategory: UIActivity.Category { get { return .action } } - override var activityType: UIActivityType? { - get { return UIActivityType(rawValue: CompareSafetyNumbersActivityType) } + override var activityType: UIActivity.ActivityType? { + get { return UIActivity.ActivityType(rawValue: CompareSafetyNumbersActivityType) } } override var activityTitle: String? { diff --git a/Signal/src/UIApplication+OWS.swift b/Signal/src/UIApplication+OWS.swift index b93f4eb9a..f5b8377e6 100644 --- a/Signal/src/UIApplication+OWS.swift +++ b/Signal/src/UIApplication+OWS.swift @@ -27,7 +27,7 @@ import Foundation } @objc public func openSystemSettings() { - openURL(URL(string: UIApplicationOpenSettingsURLString)!) + openURL(URL(string: UIApplication.openSettingsURLString)!) } } diff --git a/Signal/src/UserInterface/HapticFeedback.swift b/Signal/src/UserInterface/HapticFeedback.swift index 2db0b0975..ea7270cd6 100644 --- a/Signal/src/UserInterface/HapticFeedback.swift +++ b/Signal/src/UserInterface/HapticFeedback.swift @@ -52,7 +52,7 @@ enum NotificationHapticFeedbackType { } extension NotificationHapticFeedbackType { - var uiNotificationFeedbackType: UINotificationFeedbackType { + var uiNotificationFeedbackType: UINotificationFeedbackGenerator.FeedbackType { switch self { case .error: return .error case .success: return .success diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index 215d17ab1..cf85fac9a 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -281,8 +281,13 @@ extension OWSSound { func notificationSound(isQuiet: Bool) -> UNNotificationSound { guard let filename = OWSSounds.filename(for: self, quiet: isQuiet) else { owsFailDebug("filename was unexpectedly nil") - return UNNotificationSound.default() + return UNNotificationSound.default } - return UNNotificationSound(named: filename) + return UNNotificationSound(named: convertToUNNotificationSoundName(filename)) } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { + return UNNotificationSoundName(rawValue: input) +} diff --git a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift index 0bbf7fc51..a79dc9e93 100644 --- a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift +++ b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift @@ -128,7 +128,7 @@ class AddContactShareToExistingContactViewController: ContactsPicker, ContactsPi // We want to pop *this* view *and* the still presented CNContactViewController in a single animation. // Note this happens for *cancel* and for *done*. Unfortunately, I don't know of a way to detect the difference // between the two, since both just call this method. - guard let myIndex = navigationController.viewControllers.index(of: self) else { + guard let myIndex = navigationController.viewControllers.firstIndex(of: self) else { owsFailDebug("myIndex was unexpectedly nil") navigationController.popViewController(animated: true) navigationController.popViewController(animated: true) diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index ad1479317..8b02f5df7 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -124,7 +124,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } // Don't use receiver when video is enabled. Only bluetooth or speaker - return portDescription.portType != AVAudioSessionPortBuiltInMic + return convertFromAVAudioSessionPort(portDescription.portType) != convertFromAVAudioSessionPort(AVAudioSession.Port.builtInMic) } } return Set(appropriateForVideo) @@ -602,7 +602,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, internal func updateLocalVideoLayout() { if !localVideoView.isHidden { - localVideoView.superview?.bringSubview(toFront: localVideoView) + localVideoView.superview?.bringSubviewToFront(localVideoView) } updateCallUI(callState: call.state) @@ -1225,3 +1225,8 @@ extension CallViewController: CallVideoHintViewDelegate { updateRemoteVideoLayout() } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { + return input.rawValue +} diff --git a/Signal/src/ViewControllers/ColorPickerViewController.swift b/Signal/src/ViewControllers/ColorPickerViewController.swift index 7c89d5b5f..df687f60f 100644 --- a/Signal/src/ViewControllers/ColorPickerViewController.swift +++ b/Signal/src/ViewControllers/ColorPickerViewController.swift @@ -285,7 +285,7 @@ class ColorPickerView: UIView, ColorViewDelegate { let kRowLength = 4 let rows: [UIView] = colorViews.chunked(by: kRowLength).map { colorViewsInRow in let row = UIStackView(arrangedSubviews: colorViewsInRow) - row.distribution = UIStackViewDistribution.equalSpacing + row.distribution = UIStackView.Distribution.equalSpacing return row } let rowsStackView = UIStackView(arrangedSubviews: rows) diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift index 59c1f4b19..55973bc9e 100644 --- a/Signal/src/ViewControllers/ContactViewController.swift +++ b/Signal/src/ViewControllers/ContactViewController.swift @@ -320,7 +320,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate { // Show no action buttons for contacts without a phone number. break case .unknown: - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + let activityIndicator = UIActivityIndicatorView(style: .whiteLarge) topView.addSubview(activityIndicator) activityIndicator.autoPinEdge(.top, to: .bottom, of: lastView, withOffset: 10) activityIndicator.autoHCenterInSuperview() diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift index f6b9c4089..246caef1b 100644 --- a/Signal/src/ViewControllers/ContactsPicker.swift +++ b/Signal/src/ViewControllers/ContactsPicker.swift @@ -124,7 +124,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView // Auto size cells for dynamic type tableView.estimatedRowHeight = 60.0 - tableView.rowHeight = UITableViewAutomaticDimension + tableView.rowHeight = UITableView.automaticDimension tableView.estimatedRowHeight = 60 tableView.allowsMultipleSelection = allowsMultipleSelection @@ -136,7 +136,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView reloadContacts() updateSearchResults(searchText: "") - NotificationCenter.default.addObserver(self, selector: #selector(self.didChangePreferredContentSize), name: NSNotification.Name.UIContentSizeCategoryDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(self.didChangePreferredContentSize), name: UIContentSizeCategory.didChangeNotification, object: nil) } @objc @@ -172,7 +172,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView let title = NSLocalizedString("INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE", comment: "Alert title when contacts disabled while trying to invite contacts to signal") let body = NSLocalizedString("INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY", comment: "Alert body when contacts disabled while trying to invite contacts to signal") - let alert = UIAlertController(title: title, message: body, preferredStyle: UIAlertControllerStyle.alert) + let alert = UIAlertController(title: title, message: body, preferredStyle: UIAlertController.Style.alert) let dismissText = CommonStrings.cancelButton diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 0f3392143..dc917b7a8 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -204,8 +204,8 @@ public class ConversationMediaView: UIView { animatedImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - animatedImageView.layer.minificationFilter = kCAFilterTrilinear - animatedImageView.layer.magnificationFilter = kCAFilterTrilinear + animatedImageView.layer.minificationFilter = CALayerContentsFilter.trilinear + animatedImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear animatedImageView.backgroundColor = Theme.offBackgroundColor addSubview(animatedImageView) animatedImageView.autoPinEdgesToSuperviewEdges() @@ -263,8 +263,8 @@ public class ConversationMediaView: UIView { stillImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - stillImageView.layer.minificationFilter = kCAFilterTrilinear - stillImageView.layer.magnificationFilter = kCAFilterTrilinear + stillImageView.layer.minificationFilter = CALayerContentsFilter.trilinear + stillImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear stillImageView.backgroundColor = Theme.offBackgroundColor addSubview(stillImageView) stillImageView.autoPinEdgesToSuperviewEdges() @@ -318,8 +318,8 @@ public class ConversationMediaView: UIView { stillImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - stillImageView.layer.minificationFilter = kCAFilterTrilinear - stillImageView.layer.magnificationFilter = kCAFilterTrilinear + stillImageView.layer.minificationFilter = CALayerContentsFilter.trilinear + stillImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear stillImageView.backgroundColor = Theme.offBackgroundColor addSubview(stillImageView) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaAlbumCellView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaAlbumCellView.swift index 5e4beb8d0..be67476a8 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaAlbumCellView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaAlbumCellView.swift @@ -157,7 +157,7 @@ public class MediaAlbumCellView: UIStackView { // the "more" item, if any. continue } - guard let index = itemViews.index(of: itemView) else { + guard let index = itemViews.firstIndex(of: itemView) else { owsFailDebug("Couldn't determine index of item view.") continue } @@ -188,14 +188,14 @@ public class MediaAlbumCellView: UIStackView { } private func newRow(rowViews: [ConversationMediaView], - axis: UILayoutConstraintAxis, + axis: NSLayoutConstraint.Axis, viewSize: CGFloat) -> UIStackView { autoSet(viewSize: viewSize, ofViews: rowViews) return newRow(rowViews: rowViews, axis: axis) } private func newRow(rowViews: [ConversationMediaView], - axis: UILayoutConstraintAxis) -> UIStackView { + axis: NSLayoutConstraint.Axis) -> UIStackView { let stackView = UIStackView(arrangedSubviews: rowViews) stackView.axis = axis stackView.spacing = MediaAlbumCellView.kSpacingPts diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift index 23c39364c..a1c09e06c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift @@ -105,7 +105,7 @@ public class MediaDownloadView: UIView { shapeLayer1.path = bezierPath1.cgPath let fillColor1: UIColor = UIColor(white: 1.0, alpha: 0.4) shapeLayer1.fillColor = fillColor1.cgColor - shapeLayer1.fillRule = kCAFillRuleEvenOdd + shapeLayer1.fillRule = CAShapeLayerFillRule.evenOdd let bezierPath2 = UIBezierPath() bezierPath2.addArc(withCenter: center, radius: outerRadius, startAngle: startAngle, endAngle: endAngle, clockwise: true) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift index 4bd7dfabf..3fae2f099 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift @@ -110,7 +110,7 @@ public class MediaUploadView: UIView { bezierPath2.append(UIBezierPath(ovalIn: outerCircleBounds)) shapeLayer2.path = bezierPath2.cgPath shapeLayer2.fillColor = UIColor(white: 1.0, alpha: 0.4).cgColor - shapeLayer2.fillRule = kCAFillRuleEvenOdd + shapeLayer2.fillRule = CAShapeLayerFillRule.evenOdd CATransaction.commit() } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationHeaderView.swift b/Signal/src/ViewControllers/ConversationView/ConversationHeaderView.swift index 76b0acb22..a0ae1b92c 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationHeaderView.swift +++ b/Signal/src/ViewControllers/ConversationView/ConversationHeaderView.swift @@ -113,7 +113,7 @@ public class ConversationHeaderView: UIStackView { public override var intrinsicContentSize: CGSize { // Grow to fill as much of the navbar as possible. - return UILayoutFittingExpandedSize + return UIView.layoutFittingExpandedSize } @objc diff --git a/Signal/src/ViewControllers/CropScaleImageViewController.swift b/Signal/src/ViewControllers/CropScaleImageViewController.swift index 5e11d4525..1c816ea8d 100644 --- a/Signal/src/ViewControllers/CropScaleImageViewController.swift +++ b/Signal/src/ViewControllers/CropScaleImageViewController.swift @@ -184,7 +184,7 @@ import SignalMessaging path.usesEvenOddFillRule = true layer.path = path.cgPath - layer.fillRule = kCAFillRuleEvenOdd + layer.fillRule = CAShapeLayerFillRule.evenOdd layer.fillColor = UIColor.black.cgColor layer.opacity = 0.7 } diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift b/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift index a5934f875..e2cdb5f59 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerCell.swift @@ -221,7 +221,7 @@ class GifPickerCell: UICollectionViewCell { self.backgroundColor = nil if self.isCellSelected { - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray) + let activityIndicator = UIActivityIndicatorView(style: .gray) self.activityIndicator = activityIndicator addSubview(activityIndicator) activityIndicator.autoCenterInSuperview() diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift index d658135a9..1834d4396 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift @@ -216,7 +216,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect searchErrorView.isUserInteractionEnabled = true searchErrorView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(retryTapped))) - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .gray) + let activityIndicator = UIActivityIndicatorView(style: .gray) self.activityIndicator = activityIndicator self.view.addSubview(activityIndicator) activityIndicator.autoHCenterInSuperview() @@ -349,7 +349,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect path.append(UIBezierPath(rect: cellRect)) layer.path = path.cgPath - layer.fillRule = kCAFillRuleEvenOdd + layer.fillRule = CAShapeLayerFillRule.evenOdd layer.fillColor = UIColor.black.cgColor layer.opacity = 0.7 } diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift index fd34cb02c..82699c9c3 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift +++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift @@ -64,7 +64,7 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel blockListCache = BlockListCache() blockListCache.startObservingAndSyncState(delegate: self) - tableView.rowHeight = UITableViewAutomaticDimension + tableView.rowHeight = UITableView.automaticDimension tableView.estimatedRowHeight = 60 tableView.separatorColor = Theme.cellSeparatorColor @@ -272,7 +272,7 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel if let messageSnippet = searchResult.snippet { overrideSnippet = NSAttributedString(string: messageSnippet, attributes: [ - NSAttributedStringKey.foregroundColor: Theme.secondaryColor + NSAttributedString.Key.foregroundColor: Theme.secondaryColor ]) } else { owsFailDebug("message search result is missing message snippet") @@ -296,7 +296,7 @@ class ConversationSearchViewController: UITableViewController, BlockListCacheDel guard nil != self.tableView(tableView, titleForHeaderInSection: section) else { return 0 } - return UITableViewAutomaticDimension + return UITableView.automaticDimension } override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { @@ -433,7 +433,7 @@ class EmptySearchResultCell: UITableViewCell { static let reuseIdentifier = "EmptySearchResultCell" let messageLabel: UILabel - override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { self.messageLabel = UILabel() super.init(style: style, reuseIdentifier: reuseIdentifier) diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 2f9b88bbb..99521f116 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -142,11 +142,11 @@ public class LongTextViewController: OWSViewController { // // UITextView’s linkTextAttributes property has type [String : Any]! but should be [NSAttributedStringKey : Any]! in Swift 4. let linkTextAttributes: [String: Any] = [ - NSAttributedStringKey.foregroundColor.rawValue: Theme.primaryColor, - NSAttributedStringKey.underlineColor.rawValue: Theme.primaryColor, - NSAttributedStringKey.underlineStyle.rawValue: NSUnderlineStyle.styleSingle.rawValue + NSAttributedString.Key.foregroundColor.rawValue: Theme.primaryColor, + NSAttributedString.Key.underlineColor.rawValue: Theme.primaryColor, + NSAttributedString.Key.underlineStyle.rawValue: NSUnderlineStyle.single.rawValue ] - messageTextView.linkTextAttributes = linkTextAttributes + messageTextView.linkTextAttributes = convertToOptionalNSAttributedStringKeyDictionary(linkTextAttributes) view.addSubview(messageTextView) messageTextView.autoPinEdge(toSuperviewEdge: .top) @@ -173,3 +173,9 @@ public class LongTextViewController: OWSViewController { AttachmentSharing.showShareUI(forText: fullText) } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { + guard let input = input else { return nil } + return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)}) +} diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift index 984678ce2..e252f7e43 100644 --- a/Signal/src/ViewControllers/MediaGalleryViewController.swift +++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift @@ -282,8 +282,8 @@ class MediaGalleryNavigationController: OWSNavigationController { presentationView.isHidden = true presentationView.clipsToBounds = true presentationView.layer.allowsEdgeAntialiasing = true - presentationView.layer.minificationFilter = kCAFilterTrilinear - presentationView.layer.magnificationFilter = kCAFilterTrilinear + presentationView.layer.minificationFilter = CALayerContentsFilter.trilinear + presentationView.layer.magnificationFilter = CALayerContentsFilter.trilinear presentationView.contentMode = .scaleAspectFit guard let navigationBar = self.navigationBar as? OWSNavigationBar else { @@ -980,13 +980,13 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel if let completionBlock = completion { Bench(title: "calculating changes for collectionView") { // FIXME can we avoid this index offset? - let dateIndices = newDates.map { sectionDates.index(of: $0)! + 1 } + let dateIndices = newDates.map { sectionDates.firstIndex(of: $0)! + 1 } let addedSections: IndexSet = IndexSet(dateIndices) let addedItems: [IndexPath] = newGalleryItems.map { galleryItem in - let sectionIdx = sectionDates.index(of: galleryItem.galleryDate)! + let sectionIdx = sectionDates.firstIndex(of: galleryItem.galleryDate)! let section = sections[galleryItem.galleryDate]! - let itemIdx = section.index(of: galleryItem)! + let itemIdx = section.firstIndex(of: galleryItem)! // FIXME can we avoid this index offset? return IndexPath(item: itemIdx, section: sectionIdx + 1) @@ -1032,14 +1032,14 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel let originalSectionDates = self.sectionDates for item in items { - guard let itemIndex = galleryItems.index(of: item) else { + guard let itemIndex = galleryItems.firstIndex(of: item) else { owsFailDebug("removing unknown item.") return } self.galleryItems.remove(at: itemIndex) - guard let sectionIndex = sectionDates.index(where: { $0 == item.galleryDate }) else { + guard let sectionIndex = sectionDates.firstIndex(where: { $0 == item.galleryDate }) else { owsFailDebug("item with unknown date.") return } @@ -1049,13 +1049,13 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel return } - guard let sectionRowIndex = sectionItems.index(of: item) else { + guard let sectionRowIndex = sectionItems.firstIndex(of: item) else { owsFailDebug("item with unknown sectionRowIndex") return } // We need to calculate the index of the deleted item with respect to it's original position. - guard let originalSectionIndex = originalSectionDates.index(where: { $0 == item.galleryDate }) else { + guard let originalSectionIndex = originalSectionDates.firstIndex(where: { $0 == item.galleryDate }) else { owsFailDebug("item with unknown date.") return } @@ -1065,7 +1065,7 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel return } - guard let originalSectionRowIndex = originalSectionItems.index(of: item) else { + guard let originalSectionRowIndex = originalSectionItems.firstIndex(of: item) else { owsFailDebug("item with unknown sectionRowIndex") return } @@ -1095,7 +1095,7 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel self.ensureGalleryItemsLoaded(.after, item: currentItem, amount: kGallerySwipeLoadBatchSize) - guard let currentIndex = galleryItems.index(of: currentItem) else { + guard let currentIndex = galleryItems.firstIndex(of: currentItem) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } @@ -1119,7 +1119,7 @@ class MediaGallery: NSObject, MediaGalleryDataSource, MediaTileViewControllerDel self.ensureGalleryItemsLoaded(.before, item: currentItem, amount: kGallerySwipeLoadBatchSize) - guard let currentIndex = galleryItems.index(of: currentItem) else { + guard let currentIndex = galleryItems.firstIndex(of: currentItem) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index bdf05385c..7558a6010 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -48,7 +48,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou return currentViewController.galleryItemBox.value } - public func setCurrentItem(_ item: MediaGalleryItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) { + public func setCurrentItem(_ item: MediaGalleryItem, direction: UIPageViewController.NavigationDirection, animated isAnimated: Bool) { guard let galleryPage = self.buildGalleryPage(galleryItem: item) else { owsFailDebug("unexpectedly unable to build new gallery page") return @@ -77,7 +77,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, - options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems]) + options: convertToOptionalUIPageViewControllerOptionsKeyDictionary([convertFromUIPageViewControllerOptionsKey(UIPageViewController.OptionsKey.interPageSpacing): kSpacingBetweenItems])) self.dataSource = self self.delegate = self @@ -800,7 +800,7 @@ extension MediaPageViewController: GalleryRailViewDelegate { return } - let direction: UIPageViewControllerNavigationDirection + let direction: UIPageViewController.NavigationDirection direction = currentItem.albumIndex < targetItem.albumIndex ? .forward : .reverse self.setCurrentItem(targetItem, direction: direction, animated: true) @@ -829,3 +829,14 @@ extension MediaPageViewController: CaptionContainerViewDelegate { captionContainerView.isHidden = true } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { + guard let input = input else { return nil } + return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { + return input.rawValue +} diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift index 1d85aae1c..e715aaa4f 100644 --- a/Signal/src/ViewControllers/MediaTileViewController.swift +++ b/Signal/src/ViewControllers/MediaTileViewController.swift @@ -95,8 +95,8 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa collectionView.backgroundColor = Theme.darkThemeBackgroundColor collectionView.register(PhotoGridViewCell.self, forCellWithReuseIdentifier: PhotoGridViewCell.reuseIdentifier) - collectionView.register(MediaGallerySectionHeader.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: MediaGallerySectionHeader.reuseIdentifier) - collectionView.register(MediaGalleryStaticHeader.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: MediaGalleryStaticHeader.reuseIdentifier) + collectionView.register(MediaGallerySectionHeader.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: MediaGallerySectionHeader.reuseIdentifier) + collectionView.register(MediaGalleryStaticHeader.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: MediaGalleryStaticHeader.reuseIdentifier) collectionView.delegate = self @@ -113,10 +113,10 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa } private func indexPath(galleryItem: MediaGalleryItem) -> IndexPath? { - guard let sectionIdx = galleryDates.index(of: galleryItem.galleryDate) else { + guard let sectionIdx = galleryDates.firstIndex(of: galleryItem.galleryDate) else { return nil } - guard let rowIdx = galleryItems[galleryItem.galleryDate]!.index(of: galleryItem) else { + guard let rowIdx = galleryItems[galleryItem.galleryDate]!.firstIndex(of: galleryItem) else { return nil } @@ -311,7 +311,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa return sectionHeader } - if (kind == UICollectionElementKindSectionHeader) { + if (kind == UICollectionView.elementKindSectionHeader) { switch indexPath.section { case kLoadOlderSectionIdx: guard let sectionHeader = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: MediaGalleryStaticHeader.reuseIdentifier, for: indexPath) as? MediaGalleryStaticHeader else { diff --git a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift index 9affd18f1..4f78f79f2 100644 --- a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift +++ b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift @@ -44,7 +44,7 @@ public class OWS2FAReminderViewController: UIViewController, PinEntryViewDelegat let instructionsTextHeader = NSLocalizedString("REMINDER_2FA_BODY_HEADER", comment: "Body header for when user is periodically prompted to enter their registration lock PIN") let instructionsTextBody = NSLocalizedString("REMINDER_2FA_BODY", comment: "Body text for when user is periodically prompted to enter their registration lock PIN") - let attributes = [NSAttributedStringKey.font: pinEntryView.boldLabelFont] + let attributes = [NSAttributedString.Key.font: pinEntryView.boldLabelFont] let attributedInstructionsText = NSAttributedString(string: instructionsTextHeader, attributes: attributes).rtlSafeAppend(" ").rtlSafeAppend(instructionsTextBody) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index d1b784fd3..2e1e13cce 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -72,7 +72,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat // do nothing } else { // must assign titleView frame manually on older iOS - titleView.frame = CGRect(origin: .zero, size: titleView.systemLayoutSizeFitting(UILayoutFittingCompressedSize)) + titleView.frame = CGRect(origin: .zero, size: titleView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)) } navigationItem.titleView = titleView @@ -393,7 +393,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat assert(self.collectionPickerController == nil) self.collectionPickerController = collectionPickerController - addChildViewController(collectionPickerController) + addChild(collectionPickerController) view.addSubview(collectionPickerView) collectionPickerView.autoPinEdgesToSuperviewEdges(with: .zero, excludingEdge: .top) @@ -422,7 +422,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat self.titleView.rotateIcon(.down) }.done { _ in collectionPickerController.view.removeFromSuperview() - collectionPickerController.removeFromParentViewController() + collectionPickerController.removeFromParent() }.retainUntilComplete() } diff --git a/Signal/src/ViewControllers/Photos/PhotoCapture.swift b/Signal/src/ViewControllers/Photos/PhotoCapture.swift index 0cbc8bdea..bc79eed01 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCapture.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCapture.swift @@ -649,7 +649,7 @@ extension UIDeviceOrientation: CustomStringConvertible { } } -extension UIImageOrientation: CustomStringConvertible { +extension UIImage.Orientation: CustomStringConvertible { public var description: String { switch self { case .up: diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index f12129566..8d4887868 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -245,7 +245,7 @@ class PhotoCaptureViewController: OWSViewController { NotificationCenter.default.addObserver(self, selector: #selector(didChangeDeviceOrientation), - name: .UIDeviceOrientationDidChange, + name: UIDevice.orientationDidChangeNotification, object: UIDevice.current) } diff --git a/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift index de5b6d2d3..d551da139 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift @@ -53,7 +53,7 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg let sectionItems = photoCollections.map { collection in return OWSTableItem(customCellBlock: { self.buildTableCell(collection: collection) }, - customRowHeight: UITableViewAutomaticDimension, + customRowHeight: UITableView.automaticDimension, actionBlock: { [weak self] in guard let strongSelf = self else { return } strongSelf.didSelectCollection(collection: collection) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 79918b935..f579d0b60 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -111,7 +111,7 @@ class SendMediaNavigationController: OWSNavigationController { func fadeTo(viewControllers: [UIViewController]) { let transition: CATransition = CATransition() transition.duration = 0.1 - transition.type = kCATransitionFade + transition.type = CATransitionType.fade view.layer.add(transition, forKey: nil) setViewControllers(viewControllers, animated: false) } diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 4ada56d8c..7dfada0f2 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -17,8 +17,8 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { let heroImage = UIImage(named: "onboarding_splash_hero") let heroImageView = UIImageView(image: heroImage) heroImageView.contentMode = .scaleAspectFit - heroImageView.layer.minificationFilter = kCAFilterTrilinear - heroImageView.layer.magnificationFilter = kCAFilterTrilinear + heroImageView.layer.minificationFilter = CALayerContentsFilter.trilinear + heroImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear heroImageView.setCompressionResistanceLow() heroImageView.setContentHuggingVerticalLow() heroImageView.accessibilityIdentifier = "onboarding.splash." + "heroImageView" diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 8ce926ce7..45613c626 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -29,7 +29,7 @@ struct AudioSource: Hashable { init(portDescription: AVAudioSessionPortDescription) { - let isBuiltInEarPiece = portDescription.portType == AVAudioSessionPortBuiltInMic + let isBuiltInEarPiece = convertFromAVAudioSessionPort(portDescription.portType) == convertFromAVAudioSessionPort(AVAudioSession.Port.builtInMic) // portDescription.portName works well for BT linked devices, but if we are using // the built in mic, we have "iPhone Microphone" which is a little awkward. @@ -129,7 +129,7 @@ protocol CallAudioServiceDelegate: class { // Configure audio session so we don't prompt user with Record permission until call is connected. audioSession.configureRTCAudio() - NotificationCenter.default.addObserver(forName: .AVAudioSessionRouteChange, object: avAudioSession, queue: nil) { _ in + NotificationCenter.default.addObserver(forName: AVAudioSession.routeChangeNotification, object: avAudioSession, queue: nil) { _ in assert(!Thread.isMainThread) self.updateIsSpeakerphoneEnabled() } @@ -201,7 +201,7 @@ protocol CallAudioServiceDelegate: class { private func updateIsSpeakerphoneEnabled() { let value = avAudioSession.currentRoute.outputs.contains { (portDescription: AVAudioSessionPortDescription) -> Bool in - return portDescription.portName == AVAudioSessionPortBuiltInSpeaker + return portDescription.portName == convertFromAVAudioSessionPort(AVAudioSession.Port.builtInSpeaker) } DispatchQueue.main.async { self.isSpeakerphoneEnabled = value @@ -213,8 +213,8 @@ protocol CallAudioServiceDelegate: class { guard let call = call, !call.isTerminated else { // Revert to default audio - setAudioSession(category: AVAudioSessionCategorySoloAmbient, - mode: AVAudioSessionModeDefault) + setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient), + mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.default)) return } @@ -224,12 +224,12 @@ protocol CallAudioServiceDelegate: class { // to setPreferredInput to call.audioSource.portDescription in this case, // but in practice I'm seeing the call revert to the bluetooth headset. // Presumably something else (in WebRTC?) is touching our shared AudioSession. - mjk - let options: AVAudioSessionCategoryOptions = call.audioSource?.isBuiltInEarPiece == true ? [] : [.allowBluetooth] + let options: AVAudioSession.CategoryOptions = call.audioSource?.isBuiltInEarPiece == true ? [] : [.allowBluetooth] if call.state == .localRinging { // SoloAmbient plays through speaker, but respects silent switch - setAudioSession(category: AVAudioSessionCategorySoloAmbient, - mode: AVAudioSessionModeDefault) + setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient), + mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.default)) } else if call.hasLocalVideo { // Because ModeVideoChat affects gain, we don't want to apply it until the call is connected. // otherwise sounds like ringing will be extra loud for video vs. speakerphone @@ -238,16 +238,16 @@ protocol CallAudioServiceDelegate: class { // side effect of setting options: .allowBluetooth, when I remove the (seemingly unnecessary) // option, and inspect AVAudioSession.sharedInstance.categoryOptions == 0. And availableInputs // does not include my linked bluetooth device - setAudioSession(category: AVAudioSessionCategoryPlayAndRecord, - mode: AVAudioSessionModeVideoChat, + setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord), + mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.videoChat), options: options) } else { // Apple Docs say that setting mode to AVAudioSessionModeVoiceChat has the // side effect of setting options: .allowBluetooth, when I remove the (seemingly unnecessary) // option, and inspect AVAudioSession.sharedInstance.categoryOptions == 0. And availableInputs // does not include my linked bluetooth device - setAudioSession(category: AVAudioSessionCategoryPlayAndRecord, - mode: AVAudioSessionModeVoiceChat, + setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord), + mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.voiceChat), options: options) } @@ -384,7 +384,7 @@ protocol CallAudioServiceDelegate: class { // Stop solo audio, revert to default. isSpeakerphoneEnabled = false - setAudioSession(category: AVAudioSessionCategorySoloAmbient) + setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient)) } // MARK: Playing Sounds @@ -490,15 +490,15 @@ protocol CallAudioServiceDelegate: class { private func setAudioSession(category: String, mode: String? = nil, - options: AVAudioSessionCategoryOptions = AVAudioSessionCategoryOptions(rawValue: 0)) { + options: AVAudioSession.CategoryOptions = AVAudioSession.CategoryOptions(rawValue: 0)) { AssertIsOnMainThread() var audioSessionChanged = false do { if #available(iOS 10.0, *), let mode = mode { - let oldCategory = avAudioSession.category - let oldMode = avAudioSession.mode + let oldCategory = convertFromAVAudioSessionCategory(avAudioSession.category) + let oldMode = convertFromAVAudioSessionMode(avAudioSession.mode) let oldOptions = avAudioSession.categoryOptions guard oldCategory != category || oldMode != mode || oldOptions != options else { @@ -516,13 +516,13 @@ protocol CallAudioServiceDelegate: class { if oldOptions != options { Logger.debug("audio session changed options: \(oldOptions) -> \(options) ") } - try avAudioSession.setCategory(category, mode: mode, options: options) + try avAudioSession.setCategory(convertToAVAudioSessionCategory(category), mode: AVAudioSession.Mode(rawValue: mode), options: options) } else { - let oldCategory = avAudioSession.category + let oldCategory = convertFromAVAudioSessionCategory(avAudioSession.category) let oldOptions = avAudioSession.categoryOptions - guard avAudioSession.category != category || avAudioSession.categoryOptions != options else { + guard convertFromAVAudioSessionCategory(avAudioSession.category) != category || avAudioSession.categoryOptions != options else { return } @@ -548,3 +548,23 @@ protocol CallAudioServiceDelegate: class { } } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { + return input.rawValue +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { + return input.rawValue +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { + return input.rawValue +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { + return AVAudioSession.Category(rawValue: input) +} diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index d2eead0ab..0e03fa54b 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -1831,7 +1831,7 @@ private class SignalCallData: NSObject { func removeObserver(_ observer: CallServiceObserver) { AssertIsOnMainThread() - while let index = observers.index(where: { $0.value === observer }) { + while let index = observers.firstIndex(where: { $0.value === observer }) { observers.remove(at: index) } } diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index 370960238..ea7c989d2 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -191,7 +191,7 @@ protocol CallObserver: class { func removeObserver(_ observer: CallObserver) { AssertIsOnMainThread() - while let index = observers.index(where: { $0.value === observer }) { + while let index = observers.firstIndex(where: { $0.value === observer }) { observers.remove(at: index) } } diff --git a/Signal/src/call/Speakerbox/CallKitCallManager.swift b/Signal/src/call/Speakerbox/CallKitCallManager.swift index 399273416..588d1f4f2 100644 --- a/Signal/src/call/Speakerbox/CallKitCallManager.swift +++ b/Signal/src/call/Speakerbox/CallKitCallManager.swift @@ -102,7 +102,7 @@ final class CallKitCallManager: NSObject { private(set) var calls = [SignalCall]() func callWithLocalId(_ localId: UUID) -> SignalCall? { - guard let index = calls.index(where: { $0.localId == localId }) else { + guard let index = calls.firstIndex(where: { $0.localId == localId }) else { return nil } return calls[index] @@ -124,7 +124,7 @@ final class CallKitCallManager: NSObject { fileprivate extension Array { mutating func removeFirst(where predicate: (Element) throws -> Bool) rethrows { - guard let index = try index(where: predicate) else { + guard let index = try firstIndex(where: predicate) else { return } diff --git a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift index 678288590..7eaf53e15 100644 --- a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift +++ b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift @@ -60,7 +60,7 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate { providerConfiguration.supportedHandleTypes = [.phoneNumber, .generic] let iconMaskImage = #imageLiteral(resourceName: "logoSignal") - providerConfiguration.iconTemplateImageData = UIImagePNGRepresentation(iconMaskImage) + providerConfiguration.iconTemplateImageData = iconMaskImage.pngData() // We don't set the ringtoneSound property, so that we use either the // default iOS ringtone OR the custom ringtone associated with this user's diff --git a/Signal/src/util/Backup/OWSBackupAPI.swift b/Signal/src/util/Backup/OWSBackupAPI.swift index aceea9ab5..425f9bab6 100644 --- a/Signal/src/util/Backup/OWSBackupAPI.swift +++ b/Signal/src/util/Backup/OWSBackupAPI.swift @@ -120,7 +120,7 @@ import PromiseKit public class func record(forFileUrl fileUrl: URL, recordName: String) -> CKRecord { let recordType = signalBackupRecordType - let recordID = CKRecordID(recordName: recordName) + let recordID = CKRecord.ID(recordName: recordName) let record = CKRecord(recordType: recordType, recordID: recordID) let asset = CKAsset(fileURL: fileUrl) record[payloadKey] = asset @@ -234,7 +234,7 @@ import PromiseKit success: @escaping () -> Void, failure: @escaping (Error) -> Void) { - let recordIDs = recordNames.map { CKRecordID(recordName: $0) } + let recordIDs = recordNames.map { CKRecord.ID(recordName: $0) } let deleteOperation = CKModifyRecordsOperation(recordsToSave: nil, recordIDsToDelete: recordIDs) deleteOperation.modifyRecordsCompletionBlock = { (records, recordIds, error) in @@ -277,7 +277,7 @@ import PromiseKit let (promise, resolver) = Promise.pending() - let recordId = CKRecordID(recordName: recordName) + let recordId = CKRecord.ID(recordName: recordName) let fetchOperation = CKFetchRecordsOperation(recordIDs: [recordId ]) // Don't download the file; we're just using the fetch to check whether or // not this record already exists. @@ -386,7 +386,7 @@ import PromiseKit private class func fetchAllRecordNamesStep(recipientId: String?, query: CKQuery, previousRecordNames: [String], - cursor: CKQueryCursor?, + cursor: CKQueryOperation.Cursor?, remainingRetries: Int, success: @escaping ([String]) -> Void, failure: @escaping (Error) -> Void) { @@ -489,7 +489,7 @@ import PromiseKit remainingRetries: maxRetries) .then { (asset) -> Promise in do { - let data = try Data(contentsOf: asset.fileURL) + let data = try Data(contentsOf: asset.fileURL!) return Promise.value(data) } catch { Logger.error("couldn't load asset file: \(error).") @@ -512,7 +512,7 @@ import PromiseKit remainingRetries: maxRetries) .then { (asset) -> Promise in do { - try FileManager.default.copyItem(at: asset.fileURL, to: toFileUrl) + try FileManager.default.copyItem(at: asset.fileURL!, to: toFileUrl) return Promise.value(()) } catch { Logger.error("couldn't copy asset file: \(error).") @@ -533,7 +533,7 @@ import PromiseKit let (promise, resolver) = Promise.pending() - let recordId = CKRecordID(recordName: recordName) + let recordId = CKRecord.ID(recordName: recordName) let fetchOperation = CKFetchRecordsOperation(recordIDs: [recordId ]) // Download all keys for this record. fetchOperation.perRecordCompletionBlock = { (record, recordId, error) in diff --git a/Signal/src/views/AvatarTableViewCell.swift b/Signal/src/views/AvatarTableViewCell.swift index 18981bd16..d30e2b1f4 100644 --- a/Signal/src/views/AvatarTableViewCell.swift +++ b/Signal/src/views/AvatarTableViewCell.swift @@ -26,7 +26,7 @@ public class AvatarTableViewCell: UITableViewCell { } @objc - public override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { self.avatarView = AvatarImageView() avatarView.autoSetDimensions(to: CGSize(width: CGFloat(kStandardAvatarSize), height: CGFloat(kStandardAvatarSize))) diff --git a/Signal/src/views/CaptionView.swift b/Signal/src/views/CaptionView.swift index 90353fb3a..cfaf5cb08 100644 --- a/Signal/src/views/CaptionView.swift +++ b/Signal/src/views/CaptionView.swift @@ -165,7 +165,7 @@ private class CaptionView: UIView { override var intrinsicContentSize: CGSize { var size = super.intrinsicContentSize - if size.height == UIViewNoIntrinsicMetric { + if size.height == UIView.noIntrinsicMetric { size.height = layoutManager.usedRect(for: textContainer).height + textContainerInset.top + textContainerInset.bottom } size.height = min(kMaxHeight, size.height) diff --git a/Signal/src/views/ContactCell.swift b/Signal/src/views/ContactCell.swift index d738fb94d..a6f01776d 100644 --- a/Signal/src/views/ContactCell.swift +++ b/Signal/src/views/ContactCell.swift @@ -21,7 +21,7 @@ class ContactCell: UITableViewCell { var contact: Contact? var showsWhenSelected: Bool = false - override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { self.contactImageView = AvatarImageView() self.textStackView = UIStackView() self.titleLabel = UILabel() @@ -31,7 +31,7 @@ class ContactCell: UITableViewCell { super.init(style: style, reuseIdentifier: reuseIdentifier) - selectionStyle = UITableViewCellSelectionStyle.none + selectionStyle = UITableViewCell.SelectionStyle.none textStackView.axis = .vertical textStackView.addArrangedSubview(titleLabel) @@ -46,7 +46,7 @@ class ContactCell: UITableViewCell { self.contentView.addSubview(contentColumns) contentColumns.autoPinEdgesToSuperviewMargins() - NotificationCenter.default.addObserver(self, selector: #selector(self.didChangePreferredContentSize), name: NSNotification.Name.UIContentSizeCategoryDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(self.didChangePreferredContentSize), name: UIContentSizeCategory.didChangeNotification, object: nil) } required init?(coder aDecoder: NSCoder) { @@ -136,13 +136,13 @@ fileprivate extension CNContact { let boldDescriptor = font.fontDescriptor.withSymbolicTraits(.traitBold) let boldAttributes = [ - NSAttributedStringKey.font: UIFont(descriptor: boldDescriptor!, size: 0) + NSAttributedString.Key.font: UIFont(descriptor: boldDescriptor!, size: 0) ] if let attributedName = CNContactFormatter.attributedString(from: self, style: .fullName, defaultAttributes: nil) { let highlightedName = attributedName.mutableCopy() as! NSMutableAttributedString highlightedName.enumerateAttributes(in: NSRange(location: 0, length: highlightedName.length), options: [], using: { (attrs, range, _) in - if let property = attrs[NSAttributedStringKey(rawValue: CNContactPropertyAttribute)] as? String, property == keyToHighlight { + if let property = attrs[NSAttributedString.Key(rawValue: CNContactPropertyAttribute)] as? String, property == keyToHighlight { highlightedName.addAttributes(boldAttributes, range: range) } }) diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift index bce6af478..6b5e7b277 100644 --- a/Signal/src/views/LinkPreviewView.swift +++ b/Signal/src/views/LinkPreviewView.swift @@ -715,7 +715,7 @@ public class LinkPreviewView: UIStackView { let activityIndicatorStyle: UIActivityIndicatorView.Style = (Theme.isDarkThemeEnabled ? .white : .gray) - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: activityIndicatorStyle) + let activityIndicator = UIActivityIndicatorView(style: activityIndicatorStyle) activityIndicator.startAnimating() addArrangedSubview(activityIndicator) let activityIndicatorSize: CGFloat = 25 diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index 32e9a9e1a..f8810497c 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -97,7 +97,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { Defaults to `UIViewAnimationOptionCurveEaseInOut`. */ - open var animationCurve: UIViewAnimationCurve = .linear + open var animationCurve: UIView.AnimationCurve = .linear /** A boolean property that sets whether the `MarqueeLabel` should behave like a normal `UILabel`. @@ -1074,7 +1074,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { let colorAnimation = GradientSetupAnimation(keyPath: "colors") colorAnimation.fromValue = gradientMask.colors colorAnimation.toValue = adjustedColors - colorAnimation.fillMode = kCAFillModeForwards + colorAnimation.fillMode = CAMediaTimingFillMode.forwards colorAnimation.isRemovedOnCompletion = false colorAnimation.delegate = self gradientMask.add(colorAnimation, forKey: "setupFade") @@ -1088,21 +1088,21 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { self.layer.mask = nil } - private func timingFunctionForAnimationCurve(_ curve: UIViewAnimationCurve) -> CAMediaTimingFunction { + private func timingFunctionForAnimationCurve(_ curve: UIView.AnimationCurve) -> CAMediaTimingFunction { let timingFunction: String? switch curve { case .easeIn: - timingFunction = kCAMediaTimingFunctionEaseIn + timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeIn) case .easeInOut: - timingFunction = kCAMediaTimingFunctionEaseInEaseOut + timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeInEaseOut) case .easeOut: - timingFunction = kCAMediaTimingFunctionEaseOut + timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeOut) default: - timingFunction = kCAMediaTimingFunctionLinear + timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.linear) } - return CAMediaTimingFunction(name: timingFunction!) + return CAMediaTimingFunction(name: convertToCAMediaTimingFunctionName(timingFunction!)) } private func transactionDurationType(_ labelType: MarqueeType, interval: CGFloat, delay: CGFloat) -> TimeInterval { @@ -1554,7 +1554,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { sublabel.tintColorDidChange() } - override open var contentMode: UIViewContentMode { + override open var contentMode: UIView.ContentMode { get { return sublabel.contentMode } @@ -1588,7 +1588,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { // public protocol MarqueeStep { var timeStep: CGFloat { get } - var timingFunction: UIViewAnimationCurve { get } + var timingFunction: UIView.AnimationCurve { get } var edgeFades: EdgeFade { get } } @@ -1626,7 +1626,7 @@ public struct ScrollStep: MarqueeStep { - Note: The animation curve value for the first `ScrollStep` in a sequence has no effect. */ - public let timingFunction: UIViewAnimationCurve + public let timingFunction: UIView.AnimationCurve /** The position of the label for this scroll step. @@ -1642,7 +1642,7 @@ public struct ScrollStep: MarqueeStep { */ public let edgeFades: EdgeFade - public init(timeStep: CGFloat, timingFunction: UIViewAnimationCurve = .linear, position: Position, edgeFades: EdgeFade) { + public init(timeStep: CGFloat, timingFunction: UIView.AnimationCurve = .linear, position: Position, edgeFades: EdgeFade) { self.timeStep = timeStep self.position = position self.edgeFades = edgeFades @@ -1675,7 +1675,7 @@ public struct FadeStep: MarqueeStep { /** The animation curve to utilize between the previous fade state in a sequence and this step. */ - public let timingFunction: UIViewAnimationCurve + public let timingFunction: UIView.AnimationCurve /** The option set defining the edge fade state for this fade step. @@ -1687,7 +1687,7 @@ public struct FadeStep: MarqueeStep { */ public let edgeFades: EdgeFade - public init(timeStep: CGFloat, timingFunction: UIViewAnimationCurve = .linear, edgeFades: EdgeFade) { + public init(timeStep: CGFloat, timingFunction: UIView.AnimationCurve = .linear, edgeFades: EdgeFade) { self.timeStep = timeStep self.timingFunction = timingFunction self.edgeFades = edgeFades @@ -1840,3 +1840,13 @@ fileprivate extension CAMediaTimingFunction { return pointArray } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { + return input.rawValue +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { + return CAMediaTimingFunctionName(rawValue: input) +} diff --git a/Signal/src/views/QuotedReplyPreview.swift b/Signal/src/views/QuotedReplyPreview.swift index 8a4b5ff45..06e159c1d 100644 --- a/Signal/src/views/QuotedReplyPreview.swift +++ b/Signal/src/views/QuotedReplyPreview.swift @@ -40,7 +40,7 @@ class QuotedReplyPreview: UIView, OWSQuotedMessageViewDelegate { updateContents() - NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: .UIContentSizeCategoryDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil) } private let draftMarginTop: CGFloat = 6 diff --git a/Signal/test/contact/ContactsPickerTest.swift b/Signal/test/contact/ContactsPickerTest.swift index bf98b4750..02f77b0f0 100644 --- a/Signal/test/contact/ContactsPickerTest.swift +++ b/Signal/test/contact/ContactsPickerTest.swift @@ -36,12 +36,12 @@ final class ContactsPickerTest: SignalBaseTest { let collatedContacts = contactsPicker.collatedContacts([emailOnlyContactB, emailOnlyContactD]) let sectionTitles = contactsPicker.collationForTests.sectionTitles - if let bIndex = sectionTitles.index(of: "B") { + if let bIndex = sectionTitles.firstIndex(of: "B") { let bSectionContacts = collatedContacts[bIndex] XCTAssertEqual(bSectionContacts.first, emailOnlyContactB) } - if let dIndex = sectionTitles.index(of: "D") { + if let dIndex = sectionTitles.firstIndex(of: "D") { let dSectionContacts = collatedContacts[dIndex] XCTAssertEqual(dSectionContacts.first, emailOnlyContactD) } @@ -58,7 +58,7 @@ final class ContactsPickerTest: SignalBaseTest { let collatedContacts = contactsPicker.collatedContacts([nameAndEmailContact]) let sectionTitles = contactsPicker.collationForTests.sectionTitles - if let aIndex = sectionTitles.index(of: "A") { + if let aIndex = sectionTitles.firstIndex(of: "A") { let aSectionContacts = collatedContacts[aIndex] XCTAssertEqual(aSectionContacts.first, nameAndEmailContact) } diff --git a/Signal/test/views/ImageEditor/ImageEditorTest.swift b/Signal/test/views/ImageEditor/ImageEditorTest.swift index f6325b4df..e248bd5f2 100644 --- a/Signal/test/views/ImageEditor/ImageEditorTest.swift +++ b/Signal/test/views/ImageEditor/ImageEditorTest.swift @@ -49,7 +49,7 @@ class ImageEditorTest: SignalBaseTest { private func writeDummyImage() -> String { let image = UIImage.init(color: .red, size: CGSize(width: 1, height: 1)) - guard let data = UIImagePNGRepresentation(image) else { + guard let data = image.pngData() else { owsFail("Couldn't export dummy image.") } let filePath = OWSFileSystem.temporaryFilePath(withFileExtension: "png") diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 9ab7c7299..0a0b8d618 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -67,7 +67,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems) super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, - options: [UIPageViewControllerOptionInterPageSpacingKey: kSpacingBetweenItems]) + options: convertToOptionalUIPageViewControllerOptionsKeyDictionary([convertFromUIPageViewControllerOptionsKey(UIPageViewController.OptionsKey.interPageSpacing): kSpacingBetweenItems])) self.dataSource = self self.delegate = self @@ -516,7 +516,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return viewController } - private func setCurrentItem(_ item: SignalAttachmentItem, direction: UIPageViewControllerNavigationDirection, animated isAnimated: Bool) { + private func setCurrentItem(_ item: SignalAttachmentItem, direction: UIPageViewController.NavigationDirection, animated isAnimated: Bool) { guard let page = self.buildPage(item: item) else { owsFailDebug("unexpectedly unable to build new page") return @@ -586,10 +586,10 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC let isLossy: Bool = attachmentItem.attachment.mimeType.caseInsensitiveCompare(OWSMimeTypeImageJpeg) == .orderedSame if isLossy { dataUTI = kUTTypeJPEG as String - return UIImageJPEGRepresentation(dstImage, 0.9) + return dstImage.jpegData(compressionQuality: 0.9) } else { dataUTI = kUTTypePNG as String - return UIImagePNGRepresentation(dstImage) + return dstImage.pngData() } }() else { owsFailDebug("Could not export for output.") @@ -620,7 +620,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } func attachmentItem(before currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: currentItem) else { + guard let currentIndex = attachmentItems.firstIndex(of: currentItem) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } @@ -635,7 +635,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } func attachmentItem(after currentItem: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: currentItem) else { + guard let currentIndex = attachmentItems.firstIndex(of: currentItem) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } @@ -747,17 +747,17 @@ extension AttachmentApprovalViewController: GalleryRailViewDelegate { return } - guard let currentIndex = attachmentItems.index(of: currentItem) else { + guard let currentIndex = attachmentItems.firstIndex(of: currentItem) else { owsFailDebug("currentIndex was unexpectedly nil") return } - guard let targetIndex = attachmentItems.index(of: targetItem) else { + guard let targetIndex = attachmentItems.firstIndex(of: targetItem) else { owsFailDebug("targetIndex was unexpectedly nil") return } - let direction: UIPageViewControllerNavigationDirection = currentIndex < targetIndex ? .forward : .reverse + let direction: UIPageViewController.NavigationDirection = currentIndex < targetIndex ? .forward : .reverse self.setCurrentItem(targetItem, direction: direction, animated: true) } @@ -792,3 +792,14 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView isEditingCaptions = false } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { + guard let input = input else { return nil } + return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { + return input.rawValue +} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift index 2c3aa4ed1..6d33c73bb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentCaptionViewController.swift @@ -103,7 +103,7 @@ class AttachmentCaptionViewController: OWSViewController { let backgroundView = UIView() backgroundView.backgroundColor = UIColor(white: 0, alpha: 0.5) view.addSubview(backgroundView) - view.sendSubview(toBack: backgroundView) + view.sendSubviewToBack(backgroundView) backgroundView.autoPinEdge(toSuperviewEdge: .leading) backgroundView.autoPinEdge(toSuperviewEdge: .trailing) backgroundView.autoPinEdge(toSuperviewEdge: .bottom) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift index 9637ee098..deee60f3e 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift @@ -80,7 +80,7 @@ class AttachmentItemCollection { } func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: item) else { + guard let currentIndex = attachmentItems.firstIndex(of: item) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } @@ -91,7 +91,7 @@ class AttachmentItemCollection { } func itemBefore(item: SignalAttachmentItem) -> SignalAttachmentItem? { - guard let currentIndex = attachmentItems.index(of: item) else { + guard let currentIndex = attachmentItems.firstIndex(of: item) else { owsFailDebug("currentIndex was unexpectedly nil") return nil } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift index 80dab11b5..fe5e92175 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentPrepViewController.swift @@ -78,7 +78,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD scrollView.showsVerticalScrollIndicator = false // Panning should stop pretty soon after the user stops scrolling - scrollView.decelerationRate = UIScrollViewDecelerationRateFast + scrollView.decelerationRate = UIScrollView.DecelerationRate.fast // We want scroll view content up and behind the system status bar content // but we want other content (e.g. bar buttons) to respect the top layout guide. diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index 02e7b1a51..e4f88db71 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -138,8 +138,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { let audioPlayButton = UIButton() self.audioPlayButton = audioPlayButton setAudioIconToPlay() - audioPlayButton.imageView?.layer.minificationFilter = kCAFilterTrilinear - audioPlayButton.imageView?.layer.magnificationFilter = kCAFilterTrilinear + audioPlayButton.imageView?.layer.minificationFilter = CALayerContentsFilter.trilinear + audioPlayButton.imageView?.layer.magnificationFilter = CALayerContentsFilter.trilinear audioPlayButton.addTarget(self, action: #selector(audioPlayButtonPressed), for: .touchUpInside) let buttonSize = createHeroViewSize() audioPlayButton.autoSetDimension(.width, toSize: buttonSize) @@ -221,8 +221,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { } let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = kCAFilterTrilinear - imageView.layer.magnificationFilter = kCAFilterTrilinear + imageView.layer.minificationFilter = CALayerContentsFilter.trilinear + imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear let aspectRatio = image.size.width / image.size.height addSubviewWithScaleAspectFitLayout(view: imageView, aspectRatio: aspectRatio) contentView = imageView @@ -243,8 +243,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { } let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = kCAFilterTrilinear - imageView.layer.magnificationFilter = kCAFilterTrilinear + imageView.layer.minificationFilter = CALayerContentsFilter.trilinear + imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear let aspectRatio = image.size.width / image.size.height addSubviewWithScaleAspectFitLayout(view: imageView, aspectRatio: aspectRatio) contentView = imageView @@ -307,8 +307,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { let image = UIImage(named: imageName) assert(image != nil) let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = kCAFilterTrilinear - imageView.layer.magnificationFilter = kCAFilterTrilinear + imageView.layer.minificationFilter = CALayerContentsFilter.trilinear + imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear imageView.layer.shadowColor = UIColor.black.cgColor let shadowScaling = 5.0 imageView.layer.shadowRadius = CGFloat(2.0 * shadowScaling) diff --git a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift index 298ce238d..eaf999acf 100644 --- a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift +++ b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift @@ -74,7 +74,7 @@ public class ModalActivityIndicatorViewController: OWSViewController { : UIColor(white: 0, alpha: 0.25)) self.view.isOpaque = false - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + let activityIndicator = UIActivityIndicatorView(style: .whiteLarge) self.activityIndicator = activityIndicator self.view.addSubview(activityIndicator) activityIndicator.autoCenterInSuperview() diff --git a/SignalMessaging/Views/AvatarImageView.swift b/SignalMessaging/Views/AvatarImageView.swift index d4d4eb248..c3ba5c0cb 100644 --- a/SignalMessaging/Views/AvatarImageView.swift +++ b/SignalMessaging/Views/AvatarImageView.swift @@ -32,8 +32,8 @@ public class AvatarImageView: UIImageView { func configureView() { self.autoPinToSquareAspectRatio() - self.layer.minificationFilter = kCAFilterTrilinear - self.layer.magnificationFilter = kCAFilterTrilinear + self.layer.minificationFilter = CALayerContentsFilter.trilinear + self.layer.magnificationFilter = CALayerContentsFilter.trilinear self.layer.masksToBounds = true self.layer.addSublayer(self.shadowLayer) @@ -57,7 +57,7 @@ public class AvatarImageView: UIImageView { // This can be any color since the fill should be clipped. self.shadowLayer.fillColor = UIColor.black.cgColor self.shadowLayer.path = shadowPath.cgPath - self.shadowLayer.fillRule = kCAFillRuleEvenOdd + self.shadowLayer.fillRule = CAShapeLayerFillRule.evenOdd self.shadowLayer.shadowColor = (Theme.isDarkThemeEnabled ? UIColor.white : UIColor.black).cgColor self.shadowLayer.shadowRadius = 0.5 self.shadowLayer.shadowOpacity = 0.15 @@ -203,14 +203,14 @@ public class AvatarImageButton: UIButton { // This can be any color since the fill should be clipped. shadowLayer.fillColor = UIColor.black.cgColor shadowLayer.path = shadowPath.cgPath - shadowLayer.fillRule = kCAFillRuleEvenOdd + shadowLayer.fillRule = CAShapeLayerFillRule.evenOdd shadowLayer.shadowColor = (Theme.isDarkThemeEnabled ? UIColor.white : UIColor.black).cgColor shadowLayer.shadowRadius = 0.5 shadowLayer.shadowOpacity = 0.15 shadowLayer.shadowOffset = .zero } - override public func setImage(_ image: UIImage?, for state: UIControlState) { + override public func setImage(_ image: UIImage?, for state: UIControl.State) { ensureViewConfigured() super.setImage(image, for: state) } @@ -226,8 +226,8 @@ public class AvatarImageButton: UIButton { autoPinToSquareAspectRatio() - layer.minificationFilter = kCAFilterTrilinear - layer.magnificationFilter = kCAFilterTrilinear + layer.minificationFilter = CALayerContentsFilter.trilinear + layer.magnificationFilter = CALayerContentsFilter.trilinear layer.masksToBounds = true layer.addSublayer(shadowLayer) diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift index 59dad9841..92e4f93c1 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift @@ -470,8 +470,8 @@ public class ImageEditorCanvasView: UIView { shapeLayer.path = bezierPath.cgPath shapeLayer.fillColor = nil - shapeLayer.lineCap = kCALineCapRound - shapeLayer.lineJoin = kCALineJoinRound + shapeLayer.lineCap = CAShapeLayerLineCap.round + shapeLayer.lineJoin = CAShapeLayerLineJoin.round shapeLayer.zPosition = zPositionForItem(item: item, model: model, zPositionBase: brushLayerZ) return shapeLayer @@ -503,8 +503,8 @@ public class ImageEditorCanvasView: UIView { let text = item.text.filterForDisplay ?? "" let attributedString = NSAttributedString(string: text, attributes: [ - NSAttributedStringKey.font: item.font.withSize(fontSize), - NSAttributedStringKey.foregroundColor: item.color.color + NSAttributedString.Key.font: item.font.withSize(fontSize), + NSAttributedString.Key.foregroundColor: item.color.color ]) let layer = EditorTextLayer(itemId: item.itemId) layer.string = attributedString @@ -512,7 +512,7 @@ public class ImageEditorCanvasView: UIView { layer.font = CGFont(item.font.fontName as CFString) layer.fontSize = fontSize layer.isWrapped = true - layer.alignmentMode = kCAAlignmentCenter + layer.alignmentMode = CATextLayerAlignmentMode.center // I don't think we need to enable allowsFontSubpixelQuantization // or set truncationMode. diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift index 6255ee82f..ac2eaa3aa 100644 --- a/SignalMessaging/Views/OWSNavigationBar.swift +++ b/SignalMessaging/Views/OWSNavigationBar.swift @@ -48,7 +48,7 @@ public class OWSNavigationBar: UINavigationBar { applyTheme() NotificationCenter.default.addObserver(self, selector: #selector(callDidChange), name: .OWSWindowManagerCallDidChange, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(didChangeStatusBarFrame), name: .UIApplicationDidChangeStatusBarFrame, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(didChangeStatusBarFrame), name: UIApplication.didChangeStatusBarFrameNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .ThemeDidChange, @@ -75,7 +75,7 @@ public class OWSNavigationBar: UINavigationBar { return } - if UIAccessibilityIsReduceTransparencyEnabled() { + if UIAccessibility.isReduceTransparencyEnabled { blurEffectView?.isHidden = true let color = Theme.navbarBackgroundColor let backgroundImage = UIImage(color: color) @@ -213,7 +213,7 @@ public class OWSNavigationBar: UINavigationBar { respectsTheme = false barStyle = .black - titleTextAttributes = [NSAttributedStringKey.foregroundColor: Theme.darkThemePrimaryColor] + titleTextAttributes = [NSAttributedString.Key.foregroundColor: Theme.darkThemePrimaryColor] barTintColor = Theme.darkThemeBackgroundColor.withAlphaComponent(0.6) tintColor = Theme.darkThemePrimaryColor diff --git a/SignalMessaging/Views/VideoPlayerView.swift b/SignalMessaging/Views/VideoPlayerView.swift index ffdbc6f26..0dfb10d2d 100644 --- a/SignalMessaging/Views/VideoPlayerView.swift +++ b/SignalMessaging/Views/VideoPlayerView.swift @@ -106,7 +106,7 @@ public class PlayerProgressBar: UIView { // Background backgroundColor = UIColor.lightGray.withAlphaComponent(0.5) - if !UIAccessibilityIsReduceTransparencyEnabled() { + if !UIAccessibility.isReduceTransparencyEnabled { addSubview(blurEffectView) blurEffectView.ows_autoPinToSuperviewEdges() } diff --git a/SignalMessaging/attachments/OWSVideoPlayer.swift b/SignalMessaging/attachments/OWSVideoPlayer.swift index c32e899fd..0856bf9a6 100644 --- a/SignalMessaging/attachments/OWSVideoPlayer.swift +++ b/SignalMessaging/attachments/OWSVideoPlayer.swift @@ -58,7 +58,7 @@ public class OWSVideoPlayer: NSObject { if item.currentTime() == item.duration { // Rewind for repeated plays, but only if it previously played to end. - avPlayer.seek(to: kCMTimeZero) + avPlayer.seek(to: CMTime.zero) } avPlayer.play() @@ -67,7 +67,7 @@ public class OWSVideoPlayer: NSObject { @objc public func stop() { avPlayer.pause() - avPlayer.seek(to: kCMTimeZero) + avPlayer.seek(to: CMTime.zero) audioSession.endAudioActivity(self.audioActivity) } diff --git a/SignalMessaging/attachments/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift index 4a78de696..70d32d730 100644 --- a/SignalMessaging/attachments/SignalAttachment.swift +++ b/SignalMessaging/attachments/SignalAttachment.swift @@ -301,7 +301,7 @@ public class SignalAttachment: NSObject { let asset = AVURLAsset(url: mediaUrl) let generator = AVAssetImageGenerator(asset: asset) generator.appliesPreferredTrackTransform = true - let cgImage = try generator.copyCGImage(at: CMTimeMake(0, 1), actualTime: nil) + let cgImage = try generator.copyCGImage(at: CMTimeMake(value: 0, timescale: 1), actualTime: nil) let image = UIImage(cgImage: cgImage) cachedVideoPreview = image @@ -747,8 +747,7 @@ public class SignalAttachment: NSObject { } dstImage = resizedImage } - guard let jpgImageData = UIImageJPEGRepresentation(dstImage, - jpegCompressionQuality(imageUploadQuality: imageUploadQuality)) else { + guard let jpgImageData = dstImage.jpegData(compressionQuality: jpegCompressionQuality(imageUploadQuality: imageUploadQuality)) else { attachment.error = .couldNotConvertToJpeg return attachment } diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index 91996ebdd..5c7932883 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -39,7 +39,7 @@ public class OWSAudioSession: NSObject { @objc public func setup() { - NotificationCenter.default.addObserver(self, selector: #selector(proximitySensorStateDidChange(notification:)), name: .UIDeviceProximityStateDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(proximitySensorStateDidChange(notification:)), name: UIDevice.proximityStateDidChangeNotification, object: nil) } // MARK: Dependencies @@ -105,20 +105,20 @@ public class OWSAudioSession: NSObject { // Eventually it would be nice to consolidate more of the audio // session handling. } else if aggregateBehaviors.contains(.playAndRecord) { - assert(avAudioSession.recordPermission() == .granted) - try avAudioSession.setCategory(AVAudioSessionCategoryRecord) + assert(avAudioSession.recordPermission == .granted) + try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.record))) } else if aggregateBehaviors.contains(.audioMessagePlayback) { if self.device.proximityState { Logger.debug("proximityState: true") - try avAudioSession.setCategory(AVAudioSessionCategoryPlayAndRecord) + try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord))) try avAudioSession.overrideOutputAudioPort(.none) } else { Logger.debug("proximityState: false") - try avAudioSession.setCategory(AVAudioSessionCategoryPlayback) + try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playback))) } } else if aggregateBehaviors.contains(.playback) { - try avAudioSession.setCategory(AVAudioSessionCategoryPlayback) + try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playback))) } else { ensureAudioSessionActivationStateAfterDelay() } @@ -168,7 +168,7 @@ public class OWSAudioSession: NSObject { do { // When playing audio in Signal, other apps audio (e.g. Music) is paused. // By notifying when we deactivate, the other app can resume playback. - try avAudioSession.setActive(false, with: [.notifyOthersOnDeactivation]) + try avAudioSession.setActive(false, options: [.notifyOthersOnDeactivation]) } catch { owsFailDebug("failed with error: \(error)") } @@ -215,3 +215,8 @@ public class OWSAudioSession: NSObject { } } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { + return input.rawValue +} diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 8a84456b1..39f06dc75 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -72,7 +72,7 @@ public class ConversationStyle: NSObject { NotificationCenter.default.addObserver(self, selector: #selector(uiContentSizeCategoryDidChange), - name: NSNotification.Name.UIContentSizeCategoryDidChange, + name: UIContentSizeCategory.didChangeNotification, object: nil) } diff --git a/SignalMessaging/utils/ProximityMonitoringManager.swift b/SignalMessaging/utils/ProximityMonitoringManager.swift index b5dcd8148..aba48e36c 100644 --- a/SignalMessaging/utils/ProximityMonitoringManager.swift +++ b/SignalMessaging/utils/ProximityMonitoringManager.swift @@ -52,7 +52,7 @@ public class OWSProximityMonitoringManagerImpl: NSObject, OWSProximityMonitoring @objc public func setup() { - NotificationCenter.default.addObserver(self, selector: #selector(proximitySensorStateDidChange(notification:)), name: .UIDeviceProximityStateDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(proximitySensorStateDidChange(notification:)), name: UIDevice.proximityStateDidChangeNotification, object: nil) } @objc diff --git a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift index 6abc6d0ef..77f42d52f 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift @@ -50,7 +50,7 @@ public enum OWSMediaError: Error { let generator = AVAssetImageGenerator(asset: asset) generator.maximumSize = maxSize generator.appliesPreferredTrackTransform = true - let time: CMTime = CMTimeMake(1, 60) + let time: CMTime = CMTimeMake(value: 1, timescale: 60) let cgImage = try generator.copyCGImage(at: time, actualTime: nil) let image = UIImage(cgImage: cgImage) return image diff --git a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift index 165177b0d..7d6ffebe3 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift @@ -164,7 +164,7 @@ private struct OWSThumbnailRequest { } else { throw OWSThumbnailError.assertionFailure(description: "Invalid attachment type.") } - guard let thumbnailData = UIImageJPEGRepresentation(thumbnailImage, 0.85) else { + guard let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.85) else { throw OWSThumbnailError.failure(description: "Could not convert thumbnail to JPEG.") } do { diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 8b1eb18eb..470ad790a 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -699,7 +699,7 @@ public class OWSLinkPreview: MTLModel { let maxImageSize: CGFloat = 1024 let shouldResize = imageSize.width > maxImageSize || imageSize.height > maxImageSize guard shouldResize else { - guard let dstData = UIImageJPEGRepresentation(srcImage, 0.8) else { + guard let dstData = srcImage.jpegData(compressionQuality: 0.8) else { Logger.error("Could not write resized image.") return Promise(error: LinkPreviewError.invalidContent) } @@ -710,7 +710,7 @@ public class OWSLinkPreview: MTLModel { Logger.error("Could not resize image.") return Promise(error: LinkPreviewError.invalidContent) } - guard let dstData = UIImageJPEGRepresentation(dstImage, 0.8) else { + guard let dstData = dstImage.jpegData(compressionQuality: 0.8) else { Logger.error("Could not write resized image.") return Promise(error: LinkPreviewError.invalidContent) } diff --git a/SignalServiceKit/src/Util/LRUCache.swift b/SignalServiceKit/src/Util/LRUCache.swift index 780f07142..436b4e365 100644 --- a/SignalServiceKit/src/Util/LRUCache.swift +++ b/SignalServiceKit/src/Util/LRUCache.swift @@ -41,7 +41,7 @@ public class LRUCache { NotificationCenter.default.addObserver(self, selector: #selector(didReceiveMemoryWarning), - name: NSNotification.Name.UIApplicationDidReceiveMemoryWarning, + name: UIApplication.didReceiveMemoryWarningNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(didEnterBackground), diff --git a/SignalServiceKit/src/Util/MessageSender+Promise.swift b/SignalServiceKit/src/Util/MessageSender+Promise.swift index e117f5b61..4edb93363 100644 --- a/SignalServiceKit/src/Util/MessageSender+Promise.swift +++ b/SignalServiceKit/src/Util/MessageSender+Promise.swift @@ -11,7 +11,7 @@ public extension MessageSender { * Wrap message sending in a Promise for easier callback chaining. */ public func sendPromise(message: TSOutgoingMessage) -> Promise { - let promise: Promise = Promise { resolver in + let promise: Promise = Promise { resolver in self.send(message, success: resolver.fulfill, failure: resolver.reject) } diff --git a/SignalServiceKit/src/Util/YapDatabase+Promise.swift b/SignalServiceKit/src/Util/YapDatabase+Promise.swift index 89d7029ed..40876dced 100644 --- a/SignalServiceKit/src/Util/YapDatabase+Promise.swift +++ b/SignalServiceKit/src/Util/YapDatabase+Promise.swift @@ -13,7 +13,7 @@ public extension YapDatabaseConnection { } func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> Promise { - return Promise { resolver in + return Promise { resolver in self.asyncReadWrite(block, completionBlock: resolver.fulfill) } } diff --git a/SignalShareExtension/SAELoadViewController.swift b/SignalShareExtension/SAELoadViewController.swift index db7375325..ed062ccbe 100644 --- a/SignalShareExtension/SAELoadViewController.swift +++ b/SignalShareExtension/SAELoadViewController.swift @@ -63,7 +63,7 @@ class SAELoadViewController: UIViewController { self.view.backgroundColor = UIColor.ows_signalBrandBlue - let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + let activityIndicator = UIActivityIndicatorView(style: .whiteLarge) self.activityIndicator = activityIndicator self.view.addSubview(activityIndicator) activityIndicator.autoCenterInSuperview() diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index 1514423ed..c747bc19d 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -866,7 +866,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed isConvertibleToTextMessage: isConvertibleToTextMessage)) } } else if let image = value as? UIImage { - if let data = UIImagePNGRepresentation(image) { + if let data = image.pngData() { let tempFilePath = OWSFileSystem.temporaryFilePath(withFileExtension: "png") do { let url = NSURL.fileURL(withPath: tempFilePath) From 30266bf65e157a0ea31c14637c9b3dae4ef01e17 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:24:40 -0600 Subject: [PATCH 443/493] autoformatted --- Signal/src/UIApplication+OWS.swift | 8 ++++---- .../UserNotificationsAdaptee.swift | 2 +- ...tShareToExistingContactViewController.swift | 2 +- .../Call/CallViewController.swift | 2 +- .../Cells/MediaUploadView.swift | 2 +- .../LongTextViewController.swift | 2 +- .../MediaPageViewController.swift | 4 ++-- .../OWS2FAReminderViewController.swift | 2 +- Signal/src/call/CallAudioService.swift | 10 +++++----- Signal/src/call/SignalCall.swift | 2 +- .../call/Speakerbox/CallKitCallManager.swift | 2 +- Signal/src/views/AvatarTableViewCell.swift | 2 +- Signal/src/views/CaptionView.swift | 2 +- Signal/src/views/ContactCell.swift | 2 +- Signal/src/views/MarqueeLabel.swift | 18 +++++++++--------- Signal/test/contact/ContactsPickerTest.swift | 2 +- .../AttachmentApprovalViewController.swift | 4 ++-- .../ViewControllers/MediaMessageView.swift | 2 +- .../ModalActivityIndicatorViewController.swift | 2 +- SignalMessaging/Views/AvatarImageView.swift | 2 +- SignalMessaging/Views/VideoPlayerView.swift | 2 +- .../attachments/OWSVideoPlayer.swift | 2 +- .../environment/OWSAudioSession.swift | 4 ++-- SignalMessaging/utils/ConversationStyle.swift | 2 +- .../utils/ProximityMonitoringManager.swift | 2 +- .../Messages/Attachments/OWSMediaUtils.swift | 2 +- .../Attachments/OWSThumbnailService.swift | 2 +- .../src/Util/MessageSender+Promise.swift | 2 +- .../SAELoadViewController.swift | 2 +- SignalShareExtension/ShareViewController.swift | 2 +- 30 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Signal/src/UIApplication+OWS.swift b/Signal/src/UIApplication+OWS.swift index f5b8377e6..b6410c284 100644 --- a/Signal/src/UIApplication+OWS.swift +++ b/Signal/src/UIApplication+OWS.swift @@ -1,16 +1,16 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @objc public extension UIApplication { - @objc public var frontmostViewControllerIgnoringAlerts: UIViewController? { + public var frontmostViewControllerIgnoringAlerts: UIViewController? { return findFrontmostViewController(ignoringAlerts: true) } - @objc public var frontmostViewController: UIViewController? { + public var frontmostViewController: UIViewController? { return findFrontmostViewController(ignoringAlerts: false) } @@ -26,7 +26,7 @@ import Foundation return viewController.findFrontmostViewController(ignoringAlerts) } - @objc public func openSystemSettings() { + public func openSystemSettings() { openURL(URL(string: UIApplication.openSettingsURLString)!) } diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index cf85fac9a..361859e09 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -288,6 +288,6 @@ extension OWSSound { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { +private func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { return UNNotificationSoundName(rawValue: input) } diff --git a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift index a79dc9e93..0cc652d48 100644 --- a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift +++ b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index 8b02f5df7..779ba56f3 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -1227,6 +1227,6 @@ extension CallViewController: CallVideoHintViewDelegate { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { +private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { return input.rawValue } diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift index 3fae2f099..f2159af58 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 99521f116..295b939cf 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -175,7 +175,7 @@ public class LongTextViewController: OWSViewController { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { +private func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)}) } diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 7558a6010..5ff4fd936 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -831,12 +831,12 @@ extension MediaPageViewController: CaptionContainerViewDelegate { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { +private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { +private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { return input.rawValue } diff --git a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift index 4f78f79f2..42e8a2cfd 100644 --- a/Signal/src/ViewControllers/OWS2FAReminderViewController.swift +++ b/Signal/src/ViewControllers/OWS2FAReminderViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 45613c626..376639c2e 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -550,21 +550,21 @@ protocol CallAudioServiceDelegate: class { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { +private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { +private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { +private func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { +private func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { return AVAudioSession.Category(rawValue: input) } diff --git a/Signal/src/call/SignalCall.swift b/Signal/src/call/SignalCall.swift index ea7c989d2..339029884 100644 --- a/Signal/src/call/SignalCall.swift +++ b/Signal/src/call/SignalCall.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/call/Speakerbox/CallKitCallManager.swift b/Signal/src/call/Speakerbox/CallKitCallManager.swift index 588d1f4f2..1ef422f33 100644 --- a/Signal/src/call/Speakerbox/CallKitCallManager.swift +++ b/Signal/src/call/Speakerbox/CallKitCallManager.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/views/AvatarTableViewCell.swift b/Signal/src/views/AvatarTableViewCell.swift index d30e2b1f4..955584d82 100644 --- a/Signal/src/views/AvatarTableViewCell.swift +++ b/Signal/src/views/AvatarTableViewCell.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/Signal/src/views/CaptionView.swift b/Signal/src/views/CaptionView.swift index cfaf5cb08..44bf66fd7 100644 --- a/Signal/src/views/CaptionView.swift +++ b/Signal/src/views/CaptionView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // public protocol CaptionContainerViewDelegate: class { diff --git a/Signal/src/views/ContactCell.swift b/Signal/src/views/ContactCell.swift index a6f01776d..f796f20f5 100644 --- a/Signal/src/views/ContactCell.swift +++ b/Signal/src/views/ContactCell.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index f8810497c..26b31a9d7 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -245,7 +245,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { get { switch speed { case .duration(let duration): return duration - case .rate(_): return 0.0 + case .rate: return 0.0 } } set { @@ -257,7 +257,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { @IBInspectable open var scrollRate: CGFloat { get { switch speed { - case .duration(_): return 0.0 + case .duration: return 0.0 case .rate(let rate): return rate } } @@ -1139,11 +1139,11 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { return CAReplicatorLayer.self } - fileprivate weak var repliLayer: CAReplicatorLayer? { + fileprivate var repliLayer: CAReplicatorLayer? { return self.layer as? CAReplicatorLayer } - fileprivate weak var maskLayer: CAGradientLayer? { + fileprivate var maskLayer: CAGradientLayer? { return self.layer.mask as! CAGradientLayer? } @@ -1168,7 +1168,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { } class fileprivate func notifyController(_ controller: UIViewController, message: MarqueeKeys) { - NotificationCenter.default.post(name: Notification.Name(rawValue: message.rawValue), object: nil, userInfo: ["controller" : controller]) + NotificationCenter.default.post(name: Notification.Name(rawValue: message.rawValue), object: nil, userInfo: ["controller": controller]) } @objc public func restartForViewController(_ notification: Notification) { @@ -1705,8 +1705,8 @@ public struct EdgeFade: OptionSet { } // Define helpful typealiases -fileprivate typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void -fileprivate typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat) +private typealias MLAnimationCompletionBlock = (_ finished: Bool) -> Void +private typealias MLAnimation = (anim: CAKeyframeAnimation, duration: CGFloat) private class GradientSetupAnimation: CABasicAnimation { } @@ -1842,11 +1842,11 @@ fileprivate extension CAMediaTimingFunction { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { +private func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { return input.rawValue } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { +private func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { return CAMediaTimingFunctionName(rawValue: input) } diff --git a/Signal/test/contact/ContactsPickerTest.swift b/Signal/test/contact/ContactsPickerTest.swift index 02f77b0f0..1f91f3d55 100644 --- a/Signal/test/contact/ContactsPickerTest.swift +++ b/Signal/test/contact/ContactsPickerTest.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import XCTest diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 0a0b8d618..d9c6fbb02 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -794,12 +794,12 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { +private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { guard let input = input else { return nil } return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { +private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { return input.rawValue } diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index e4f88db71..4f3da9010 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift index eaf999acf..07ec2bcbe 100644 --- a/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift +++ b/SignalMessaging/ViewControllers/ModalActivityIndicatorViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/Views/AvatarImageView.swift b/SignalMessaging/Views/AvatarImageView.swift index c3ba5c0cb..1e08b37c3 100644 --- a/SignalMessaging/Views/AvatarImageView.swift +++ b/SignalMessaging/Views/AvatarImageView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/SignalMessaging/Views/VideoPlayerView.swift b/SignalMessaging/Views/VideoPlayerView.swift index 0dfb10d2d..213c2fe39 100644 --- a/SignalMessaging/Views/VideoPlayerView.swift +++ b/SignalMessaging/Views/VideoPlayerView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/attachments/OWSVideoPlayer.swift b/SignalMessaging/attachments/OWSVideoPlayer.swift index 0856bf9a6..95532b2a7 100644 --- a/SignalMessaging/attachments/OWSVideoPlayer.swift +++ b/SignalMessaging/attachments/OWSVideoPlayer.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index 5c7932883..ae0e11c17 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -217,6 +217,6 @@ public class OWSAudioSession: NSObject { } // Helper function inserted by Swift 4.2 migrator. -fileprivate func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { +private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { return input.rawValue } diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 39f06dc75..28df78303 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalMessaging/utils/ProximityMonitoringManager.swift b/SignalMessaging/utils/ProximityMonitoringManager.swift index aba48e36c..8c8ec9aef 100644 --- a/SignalMessaging/utils/ProximityMonitoringManager.swift +++ b/SignalMessaging/utils/ProximityMonitoringManager.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // @objc diff --git a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift index 77f42d52f..3ec42e904 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSMediaUtils.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift index 7d6ffebe3..d65a502d5 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift +++ b/SignalServiceKit/src/Messages/Attachments/OWSThumbnailService.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalServiceKit/src/Util/MessageSender+Promise.swift b/SignalServiceKit/src/Util/MessageSender+Promise.swift index 4edb93363..a60cba6b6 100644 --- a/SignalServiceKit/src/Util/MessageSender+Promise.swift +++ b/SignalServiceKit/src/Util/MessageSender+Promise.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation diff --git a/SignalShareExtension/SAELoadViewController.swift b/SignalShareExtension/SAELoadViewController.swift index ed062ccbe..52279f024 100644 --- a/SignalShareExtension/SAELoadViewController.swift +++ b/SignalShareExtension/SAELoadViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index c747bc19d..1815b14ac 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import UIKit From b1e1020eb33b1b79d181ef92abcda21a21e8da14 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:44:47 -0600 Subject: [PATCH 444/493] swift5: void promise must take void argument vs no argument --- Signal/src/Models/AccountManager.swift | 8 ++++---- SignalServiceKit/src/Util/MessageSender+Promise.swift | 6 +++--- SignalServiceKit/src/Util/YapDatabase+Promise.swift | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Signal/src/Models/AccountManager.swift b/Signal/src/Models/AccountManager.swift index 9785a0e08..bb825b7c3 100644 --- a/Signal/src/Models/AccountManager.swift +++ b/Signal/src/Models/AccountManager.swift @@ -83,10 +83,10 @@ public class AccountManager: NSObject { private func registerForTextSecure(verificationCode: String, pin: String?) -> Promise { - return Promise { resolver in + return Promise { resolver in tsAccountManager.verifyAccount(withCode: verificationCode, pin: pin, - success: resolver.fulfill, + success: { resolver.fulfill(()) }, failure: resolver.reject) } } @@ -106,10 +106,10 @@ public class AccountManager: NSObject { // MARK: Message Delivery func updatePushTokens(pushToken: String, voipToken: String) -> Promise { - return Promise { resolver in + return Promise { resolver in tsAccountManager.registerForPushNotifications(pushToken: pushToken, voipToken: voipToken, - success: resolver.fulfill, + success: { resolver.fulfill(()) }, failure: resolver.reject) } } diff --git a/SignalServiceKit/src/Util/MessageSender+Promise.swift b/SignalServiceKit/src/Util/MessageSender+Promise.swift index a60cba6b6..ac426fbb8 100644 --- a/SignalServiceKit/src/Util/MessageSender+Promise.swift +++ b/SignalServiceKit/src/Util/MessageSender+Promise.swift @@ -10,9 +10,9 @@ public extension MessageSender { /** * Wrap message sending in a Promise for easier callback chaining. */ - public func sendPromise(message: TSOutgoingMessage) -> Promise { - let promise: Promise = Promise { resolver in - self.send(message, success: resolver.fulfill, failure: resolver.reject) + func sendPromise(message: TSOutgoingMessage) -> Promise { + let promise: Promise = Promise { resolver in + self.send(message, success: { resolver.fulfill(()) }, failure: resolver.reject) } // Ensure sends complete before they're GC'd. diff --git a/SignalServiceKit/src/Util/YapDatabase+Promise.swift b/SignalServiceKit/src/Util/YapDatabase+Promise.swift index 40876dced..49ad9fcc0 100644 --- a/SignalServiceKit/src/Util/YapDatabase+Promise.swift +++ b/SignalServiceKit/src/Util/YapDatabase+Promise.swift @@ -13,13 +13,13 @@ public extension YapDatabaseConnection { } func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> Promise { - return Promise { resolver in - self.asyncReadWrite(block, completionBlock: resolver.fulfill) + return Promise { resolver in + self.asyncReadWrite(block, completionBlock: { resolver.fulfill(()) }) } } func read(_ block: @escaping (YapDatabaseReadTransaction) throws -> Void) throws { - var errorToRaise: Error? = nil + var errorToRaise: Error? read { transaction in do { @@ -35,7 +35,7 @@ public extension YapDatabaseConnection { } func readWrite(_ block: @escaping (YapDatabaseReadWriteTransaction) throws -> Void) throws { - var errorToRaise: Error? = nil + var errorToRaise: Error? readWrite { transaction in do { From 3703b34973343e5fe43b1d98b0a42d7122e58e59 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:45:33 -0600 Subject: [PATCH 445/493] swift5 new compiler nits --- Signal/src/UserInterface/HapticFeedback.swift | 1 + SignalShareExtension/ShareViewController.swift | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Signal/src/UserInterface/HapticFeedback.swift b/Signal/src/UserInterface/HapticFeedback.swift index ea7270cd6..c80bbf321 100644 --- a/Signal/src/UserInterface/HapticFeedback.swift +++ b/Signal/src/UserInterface/HapticFeedback.swift @@ -51,6 +51,7 @@ enum NotificationHapticFeedbackType { case error, success, warning } +@available(iOS 10.0, *) extension NotificationHapticFeedbackType { var uiNotificationFeedbackType: UINotificationFeedbackGenerator.FeedbackType { switch self { diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index 1815b14ac..fc32db9ef 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -23,7 +23,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed enum ShareViewControllerError: Error { case assertionError(description: String) case unsupportedMedia - case notRegistered() + case notRegistered case obsoleteShare } @@ -475,7 +475,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed // If root view is an error view, do nothing. return } - throw ShareViewControllerError.notRegistered() + throw ShareViewControllerError.notRegistered } // MARK: ShareViewDelegate, SAEFailedViewDelegate From d8640f60ef2bd15395fcbdf4f87338ed94c4c8fb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:46:05 -0600 Subject: [PATCH 446/493] undo most of Category/Mode conversion, respond to new types/api --- Signal/src/call/CallAudioService.swift | 56 +++++++++----------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 376639c2e..e27f09056 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -29,7 +29,7 @@ struct AudioSource: Hashable { init(portDescription: AVAudioSessionPortDescription) { - let isBuiltInEarPiece = convertFromAVAudioSessionPort(portDescription.portType) == convertFromAVAudioSessionPort(AVAudioSession.Port.builtInMic) + let isBuiltInEarPiece = portDescription.portType == AVAudioSession.Port.builtInMic // portDescription.portName works well for BT linked devices, but if we are using // the built in mic, we have "iPhone Microphone" which is a little awkward. @@ -201,7 +201,7 @@ protocol CallAudioServiceDelegate: class { private func updateIsSpeakerphoneEnabled() { let value = avAudioSession.currentRoute.outputs.contains { (portDescription: AVAudioSessionPortDescription) -> Bool in - return portDescription.portName == convertFromAVAudioSessionPort(AVAudioSession.Port.builtInSpeaker) + return portDescription.portName == .builtInSpeaker } DispatchQueue.main.async { self.isSpeakerphoneEnabled = value @@ -213,8 +213,8 @@ protocol CallAudioServiceDelegate: class { guard let call = call, !call.isTerminated else { // Revert to default audio - setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient), - mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.default)) + setAudioSession(category: .soloAmbient, + mode: .default) return } @@ -228,8 +228,8 @@ protocol CallAudioServiceDelegate: class { if call.state == .localRinging { // SoloAmbient plays through speaker, but respects silent switch - setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient), - mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.default)) + setAudioSession(category: .soloAmbient, + mode: .default) } else if call.hasLocalVideo { // Because ModeVideoChat affects gain, we don't want to apply it until the call is connected. // otherwise sounds like ringing will be extra loud for video vs. speakerphone @@ -238,16 +238,16 @@ protocol CallAudioServiceDelegate: class { // side effect of setting options: .allowBluetooth, when I remove the (seemingly unnecessary) // option, and inspect AVAudioSession.sharedInstance.categoryOptions == 0. And availableInputs // does not include my linked bluetooth device - setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord), - mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.videoChat), + setAudioSession(category: .playAndRecord, + mode: .videoChat, options: options) } else { // Apple Docs say that setting mode to AVAudioSessionModeVoiceChat has the // side effect of setting options: .allowBluetooth, when I remove the (seemingly unnecessary) // option, and inspect AVAudioSession.sharedInstance.categoryOptions == 0. And availableInputs // does not include my linked bluetooth device - setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord), - mode: convertFromAVAudioSessionMode(AVAudioSession.Mode.voiceChat), + setAudioSession(category: .playAndRecord, + mode: .voiceChat, options: options) } @@ -384,7 +384,7 @@ protocol CallAudioServiceDelegate: class { // Stop solo audio, revert to default. isSpeakerphoneEnabled = false - setAudioSession(category: convertFromAVAudioSessionCategory(AVAudioSession.Category.soloAmbient)) + setAudioSession(category: .soloAmbient) } // MARK: Playing Sounds @@ -488,8 +488,8 @@ protocol CallAudioServiceDelegate: class { return AudioSource(portDescription: portDescription) } - private func setAudioSession(category: String, - mode: String? = nil, + private func setAudioSession(category: AVAudioSession.Category, + mode: AVAudioSession.Mode? = nil, options: AVAudioSession.CategoryOptions = AVAudioSession.CategoryOptions(rawValue: 0)) { AssertIsOnMainThread() @@ -497,8 +497,8 @@ protocol CallAudioServiceDelegate: class { var audioSessionChanged = false do { if #available(iOS 10.0, *), let mode = mode { - let oldCategory = convertFromAVAudioSessionCategory(avAudioSession.category) - let oldMode = convertFromAVAudioSessionMode(avAudioSession.mode) + let oldCategory = avAudioSession.category + let oldMode = avAudioSession.mode let oldOptions = avAudioSession.categoryOptions guard oldCategory != category || oldMode != mode || oldOptions != options else { @@ -516,13 +516,13 @@ protocol CallAudioServiceDelegate: class { if oldOptions != options { Logger.debug("audio session changed options: \(oldOptions) -> \(options) ") } - try avAudioSession.setCategory(convertToAVAudioSessionCategory(category), mode: AVAudioSession.Mode(rawValue: mode), options: options) + try avAudioSession.setCategory(category, mode: mode, options: options) } else { - let oldCategory = convertFromAVAudioSessionCategory(avAudioSession.category) + let oldCategory = avAudioSession.category let oldOptions = avAudioSession.categoryOptions - guard convertFromAVAudioSessionCategory(avAudioSession.category) != category || avAudioSession.categoryOptions != options else { + guard avAudioSession.category != category || avAudioSession.categoryOptions != options else { return } @@ -548,23 +548,3 @@ protocol CallAudioServiceDelegate: class { } } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { - return input.rawValue -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { - return input.rawValue -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromAVAudioSessionMode(_ input: AVAudioSession.Mode) -> String { - return input.rawValue -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertToAVAudioSessionCategory(_ input: String) -> AVAudioSession.Category { - return AVAudioSession.Category(rawValue: input) -} From 409426d105649aea09f236053d5f203bbaed5f7a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:58:58 -0600 Subject: [PATCH 447/493] work around swift4.2 AudioSession API bug --- Signal.xcodeproj/project.pbxproj | 6 +++++ Signal/src/Signal-Bridging-Header.h | 1 + Signal/src/call/CallAudioService.swift | 3 +-- .../util/UI Categories/AVAudioSession+OWS.h | 22 +++++++++++++++++++ .../util/UI Categories/AVAudioSession+OWS.m | 15 +++++++++++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 Signal/src/util/UI Categories/AVAudioSession+OWS.h create mode 100644 Signal/src/util/UI Categories/AVAudioSession+OWS.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c0ec82a9b..7b8e73007 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -488,6 +488,7 @@ 4C4BC6C32102D697004040C9 /* ContactDiscoveryOperationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4BC6C22102D697004040C9 /* ContactDiscoveryOperationTest.swift */; }; 4C5250D221E7BD7D00CE3D95 /* PhoneNumberValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5250D121E7BD7D00CE3D95 /* PhoneNumberValidator.swift */; }; 4C5250D421E7C51900CE3D95 /* PhoneNumberValidatorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5250D321E7C51900CE3D95 /* PhoneNumberValidatorTest.swift */; }; + 4C586926224FAB83003FD070 /* AVAudioSession+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C586925224FAB83003FD070 /* AVAudioSession+OWS.m */; }; 4C618199219DF03A009BD6B5 /* OWSButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C618198219DF03A009BD6B5 /* OWSButton.swift */; }; 4C61819F219E1796009BD6B5 /* typing-animation-dark.gif in Resources */ = {isa = PBXBuildFile; fileRef = 4C61819E219E1795009BD6B5 /* typing-animation-dark.gif */; }; 4C63CC00210A620B003AE45C /* SignalTSan.supp in Resources */ = {isa = PBXBuildFile; fileRef = 4C63CBFF210A620B003AE45C /* SignalTSan.supp */; }; @@ -1239,6 +1240,8 @@ 4C4BC6C22102D697004040C9 /* ContactDiscoveryOperationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ContactDiscoveryOperationTest.swift; path = contact/ContactDiscoveryOperationTest.swift; sourceTree = ""; }; 4C5250D121E7BD7D00CE3D95 /* PhoneNumberValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneNumberValidator.swift; sourceTree = ""; }; 4C5250D321E7C51900CE3D95 /* PhoneNumberValidatorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneNumberValidatorTest.swift; sourceTree = ""; }; + 4C586924224FAB83003FD070 /* AVAudioSession+OWS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "AVAudioSession+OWS.h"; path = "util/UI Categories/AVAudioSession+OWS.h"; sourceTree = ""; }; + 4C586925224FAB83003FD070 /* AVAudioSession+OWS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "AVAudioSession+OWS.m"; path = "util/UI Categories/AVAudioSession+OWS.m"; sourceTree = ""; }; 4C618198219DF03A009BD6B5 /* OWSButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OWSButton.swift; sourceTree = ""; }; 4C61819E219E1795009BD6B5 /* typing-animation-dark.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "typing-animation-dark.gif"; sourceTree = ""; }; 4C63CBFF210A620B003AE45C /* SignalTSan.supp */ = {isa = PBXFileReference; lastKnownFileType = text; path = SignalTSan.supp; sourceTree = ""; }; @@ -2692,6 +2695,8 @@ EF764C331DB67CC5000D9A87 /* UIViewController+Permissions.h */, EF764C341DB67CC5000D9A87 /* UIViewController+Permissions.m */, 45B5360D206DD8BB00D61655 /* UIResponder+OWS.swift */, + 4C586924224FAB83003FD070 /* AVAudioSession+OWS.h */, + 4C586925224FAB83003FD070 /* AVAudioSession+OWS.m */, ); name = "UI Categories"; path = ..; @@ -3661,6 +3666,7 @@ 4517642B1DE939FD00EDB8B9 /* ContactCell.swift in Sources */, 34EA69402194933900702471 /* MediaDownloadView.swift in Sources */, 340FC8AB204DAC8D007AEB0F /* DomainFrontingCountryViewController.m in Sources */, + 4C586926224FAB83003FD070 /* AVAudioSession+OWS.m in Sources */, 3496744D2076768700080B5F /* OWSMessageBubbleView.m in Sources */, 34B3F8751E8DF1700035BE1A /* CallViewController.swift in Sources */, 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */, diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index fd0a20bb9..2c47e9850 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -6,6 +6,7 @@ #import // Separate iOS Frameworks from other imports. +#import "AVAudioSession+OWS.h" #import "AppSettingsViewController.h" #import "AttachmentUploadView.h" #import "AvatarViewHelper.h" diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index e27f09056..87c09e878 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -534,8 +534,7 @@ protocol CallAudioServiceDelegate: class { if oldOptions != options { Logger.debug("audio session changed options: \(oldOptions) -> \(options) ") } - try avAudioSession.setCategory(category, with: options) - + try avAudioSession.ows_setCategory(category, with: options) } } catch { let message = "failed to set category: \(category) mode: \(String(describing: mode)), options: \(options) with error: \(error)" diff --git a/Signal/src/util/UI Categories/AVAudioSession+OWS.h b/Signal/src/util/UI Categories/AVAudioSession+OWS.h new file mode 100644 index 000000000..1e8f7483b --- /dev/null +++ b/Signal/src/util/UI Categories/AVAudioSession+OWS.h @@ -0,0 +1,22 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface AVAudioSession (OWS) + +// #RADAR 45397675 http://www.openradar.me/45397675 +// +// A bug in Swift 4.2+ made `AVAudioSession#setCategory:categorywithOptions:error` not accessible +// to Swift. +// +// It's still available via ObjC, so we have an objc-category method which we can call from Swift +// which just calls the original `AVAudioSession#setCategory:categorywithOptions:error` method. +- (BOOL)ows_setCategory:(AVAudioSessionCategory)category withOptions:(AVAudioSessionCategoryOptions)options error:(NSError **)outError API_AVAILABLE(ios(6.0), watchos(2.0), tvos(9.0)) API_UNAVAILABLE(macos); + +@end + +NS_ASSUME_NONNULL_END diff --git a/Signal/src/util/UI Categories/AVAudioSession+OWS.m b/Signal/src/util/UI Categories/AVAudioSession+OWS.m new file mode 100644 index 000000000..2c73b0d92 --- /dev/null +++ b/Signal/src/util/UI Categories/AVAudioSession+OWS.m @@ -0,0 +1,15 @@ +// +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// + +#import "AVAudioSession+OWS.h" + +@implementation AVAudioSession(OWS) + + +- (BOOL)ows_setCategory:(AVAudioSessionCategory)category withOptions:(AVAudioSessionCategoryOptions)options error:(NSError **)outError API_AVAILABLE(ios(6.0), watchos(2.0), tvos(9.0)) API_UNAVAILABLE(macos) +{ + return [self setCategory:category withOptions:options error:outError]; +} + +@end From a837cc0ab0ec99f342f572892b41b6c238dfba80 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 07:59:34 -0600 Subject: [PATCH 448/493] fix builtInSpeaker type --- Signal/src/call/CallAudioService.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift index 87c09e878..c5a4f8a6b 100644 --- a/Signal/src/call/CallAudioService.swift +++ b/Signal/src/call/CallAudioService.swift @@ -201,7 +201,7 @@ protocol CallAudioServiceDelegate: class { private func updateIsSpeakerphoneEnabled() { let value = avAudioSession.currentRoute.outputs.contains { (portDescription: AVAudioSessionPortDescription) -> Bool in - return portDescription.portName == .builtInSpeaker + return portDescription.portType == .builtInSpeaker } DispatchQueue.main.async { self.isSpeakerphoneEnabled = value From 57b1aaa3dc845f1266cd994b884f671a672840f6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:05:02 -0600 Subject: [PATCH 449/493] inline enum converters --- .../UserNotificationsAdaptee.swift | 7 +----- .../Call/CallViewController.swift | 7 +----- .../MediaPageViewController.swift | 14 ++--------- Signal/src/views/MarqueeLabel.swift | 23 +++++-------------- .../AttachmentApprovalViewController.swift | 15 +++--------- .../environment/OWSAudioSession.swift | 13 ++++------- 6 files changed, 17 insertions(+), 62 deletions(-) diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index 361859e09..0c5e5877e 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -283,11 +283,6 @@ extension OWSSound { owsFailDebug("filename was unexpectedly nil") return UNNotificationSound.default } - return UNNotificationSound(named: convertToUNNotificationSoundName(filename)) + return UNNotificationSound(named: UNNotificationSoundName(rawValue: filename)) } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertToUNNotificationSoundName(_ input: String) -> UNNotificationSoundName { - return UNNotificationSoundName(rawValue: input) -} diff --git a/Signal/src/ViewControllers/Call/CallViewController.swift b/Signal/src/ViewControllers/Call/CallViewController.swift index 779ba56f3..7d5837a9c 100644 --- a/Signal/src/ViewControllers/Call/CallViewController.swift +++ b/Signal/src/ViewControllers/Call/CallViewController.swift @@ -124,7 +124,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } // Don't use receiver when video is enabled. Only bluetooth or speaker - return convertFromAVAudioSessionPort(portDescription.portType) != convertFromAVAudioSessionPort(AVAudioSession.Port.builtInMic) + return portDescription.portType != AVAudioSession.Port.builtInMic } } return Set(appropriateForVideo) @@ -1225,8 +1225,3 @@ extension CallViewController: CallVideoHintViewDelegate { updateRemoteVideoLayout() } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromAVAudioSessionPort(_ input: AVAudioSession.Port) -> String { - return input.rawValue -} diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 5ff4fd936..68f1abf2d 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -75,9 +75,10 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou let kSpacingBetweenItems: CGFloat = 20 + let options: [UIPageViewController.OptionsKey: Any] = [.interPageSpacing: kSpacingBetweenItems] super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, - options: convertToOptionalUIPageViewControllerOptionsKeyDictionary([convertFromUIPageViewControllerOptionsKey(UIPageViewController.OptionsKey.interPageSpacing): kSpacingBetweenItems])) + options: options) self.dataSource = self self.delegate = self @@ -829,14 +830,3 @@ extension MediaPageViewController: CaptionContainerViewDelegate { captionContainerView.isHidden = true } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { - guard let input = input else { return nil } - return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { - return input.rawValue -} diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index 26b31a9d7..c505510bf 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -1089,20 +1089,19 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { } private func timingFunctionForAnimationCurve(_ curve: UIView.AnimationCurve) -> CAMediaTimingFunction { - let timingFunction: String? - + let timingFunction: CAMediaTimingFunctionName switch curve { case .easeIn: - timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeIn) + timingFunction = .easeIn case .easeInOut: - timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeInEaseOut) + timingFunction = .easeInEaseOut case .easeOut: - timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.easeOut) + timingFunction = .easeOut default: - timingFunction = convertFromCAMediaTimingFunctionName(CAMediaTimingFunctionName.linear) + timingFunction = .linear } - return CAMediaTimingFunction(name: convertToCAMediaTimingFunctionName(timingFunction!)) + return CAMediaTimingFunction(name: timingFunction) } private func transactionDurationType(_ labelType: MarqueeType, interval: CGFloat, delay: CGFloat) -> TimeInterval { @@ -1840,13 +1839,3 @@ fileprivate extension CAMediaTimingFunction { return pointArray } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromCAMediaTimingFunctionName(_ input: CAMediaTimingFunctionName) -> String { - return input.rawValue -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertToCAMediaTimingFunctionName(_ input: String) -> CAMediaTimingFunctionName { - return CAMediaTimingFunctionName(rawValue: input) -} diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index d9c6fbb02..9480f2ecf 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -65,9 +65,11 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC self.mode = mode let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )} self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems) + + let options: [UIPageViewController.OptionsKey: Any] = [.interPageSpacing: kSpacingBetweenItems] super.init(transitionStyle: .scroll, navigationOrientation: .horizontal, - options: convertToOptionalUIPageViewControllerOptionsKeyDictionary([convertFromUIPageViewControllerOptionsKey(UIPageViewController.OptionsKey.interPageSpacing): kSpacingBetweenItems])) + options: options) self.dataSource = self self.delegate = self @@ -792,14 +794,3 @@ extension AttachmentApprovalViewController: AttachmentApprovalInputAccessoryView isEditingCaptions = false } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertToOptionalUIPageViewControllerOptionsKeyDictionary(_ input: [String: Any]?) -> [UIPageViewController.OptionsKey: Any]? { - guard let input = input else { return nil } - return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIPageViewController.OptionsKey(rawValue: key), value)}) -} - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromUIPageViewControllerOptionsKey(_ input: UIPageViewController.OptionsKey) -> String { - return input.rawValue -} diff --git a/SignalMessaging/environment/OWSAudioSession.swift b/SignalMessaging/environment/OWSAudioSession.swift index ae0e11c17..057ff15f5 100644 --- a/SignalMessaging/environment/OWSAudioSession.swift +++ b/SignalMessaging/environment/OWSAudioSession.swift @@ -106,19 +106,19 @@ public class OWSAudioSession: NSObject { // session handling. } else if aggregateBehaviors.contains(.playAndRecord) { assert(avAudioSession.recordPermission == .granted) - try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.record))) + try avAudioSession.setCategory(.record) } else if aggregateBehaviors.contains(.audioMessagePlayback) { if self.device.proximityState { Logger.debug("proximityState: true") - try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playAndRecord))) + try avAudioSession.setCategory(.playAndRecord) try avAudioSession.overrideOutputAudioPort(.none) } else { Logger.debug("proximityState: false") - try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playback))) + try avAudioSession.setCategory(.playback) } } else if aggregateBehaviors.contains(.playback) { - try avAudioSession.setCategory(AVAudioSession.Category(rawValue: convertFromAVAudioSessionCategory(AVAudioSession.Category.playback))) + try avAudioSession.setCategory(.playback) } else { ensureAudioSessionActivationStateAfterDelay() } @@ -215,8 +215,3 @@ public class OWSAudioSession: NSObject { } } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertFromAVAudioSessionCategory(_ input: AVAudioSession.Category) -> String { - return input.rawValue -} From cfebb5371978bed558fee720fc7f15cf2639e4bc Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:11:08 -0600 Subject: [PATCH 450/493] more concise constants post translation --- Signal/src/ViewControllers/ContactsPicker.swift | 2 +- .../Cells/ConversationMediaView.swift | 12 ++++++------ .../Cells/MediaDownloadView.swift | 2 +- .../ConversationView/Cells/MediaUploadView.swift | 2 +- .../CropScaleImageViewController.swift | 2 +- .../GifPicker/GifPickerViewController.swift | 2 +- .../MediaGalleryViewController.swift | 4 ++-- .../OnboardingSplashViewController.swift | 4 ++-- .../ViewControllers/MediaMessageView.swift | 16 ++++++++-------- SignalMessaging/Views/AvatarImageView.swift | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift index 246caef1b..1ec660512 100644 --- a/Signal/src/ViewControllers/ContactsPicker.swift +++ b/Signal/src/ViewControllers/ContactsPicker.swift @@ -172,7 +172,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView let title = NSLocalizedString("INVITE_FLOW_REQUIRES_CONTACT_ACCESS_TITLE", comment: "Alert title when contacts disabled while trying to invite contacts to signal") let body = NSLocalizedString("INVITE_FLOW_REQUIRES_CONTACT_ACCESS_BODY", comment: "Alert body when contacts disabled while trying to invite contacts to signal") - let alert = UIAlertController(title: title, message: body, preferredStyle: UIAlertController.Style.alert) + let alert = UIAlertController(title: title, message: body, preferredStyle: .alert) let dismissText = CommonStrings.cancelButton diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index dc917b7a8..243ca6983 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -204,8 +204,8 @@ public class ConversationMediaView: UIView { animatedImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - animatedImageView.layer.minificationFilter = CALayerContentsFilter.trilinear - animatedImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + animatedImageView.layer.minificationFilter = .trilinear + animatedImageView.layer.magnificationFilter = .trilinear animatedImageView.backgroundColor = Theme.offBackgroundColor addSubview(animatedImageView) animatedImageView.autoPinEdgesToSuperviewEdges() @@ -263,8 +263,8 @@ public class ConversationMediaView: UIView { stillImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - stillImageView.layer.minificationFilter = CALayerContentsFilter.trilinear - stillImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + stillImageView.layer.minificationFilter = .trilinear + stillImageView.layer.magnificationFilter = .trilinear stillImageView.backgroundColor = Theme.offBackgroundColor addSubview(stillImageView) stillImageView.autoPinEdgesToSuperviewEdges() @@ -318,8 +318,8 @@ public class ConversationMediaView: UIView { stillImageView.contentMode = .scaleAspectFill // Use trilinear filters for better scaling quality at // some performance cost. - stillImageView.layer.minificationFilter = CALayerContentsFilter.trilinear - stillImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + stillImageView.layer.minificationFilter = .trilinear + stillImageView.layer.magnificationFilter = .trilinear stillImageView.backgroundColor = Theme.offBackgroundColor addSubview(stillImageView) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift index a1c09e06c..65102dd3b 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaDownloadView.swift @@ -105,7 +105,7 @@ public class MediaDownloadView: UIView { shapeLayer1.path = bezierPath1.cgPath let fillColor1: UIColor = UIColor(white: 1.0, alpha: 0.4) shapeLayer1.fillColor = fillColor1.cgColor - shapeLayer1.fillRule = CAShapeLayerFillRule.evenOdd + shapeLayer1.fillRule = .evenOdd let bezierPath2 = UIBezierPath() bezierPath2.addArc(withCenter: center, radius: outerRadius, startAngle: startAngle, endAngle: endAngle, clockwise: true) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift index f2159af58..1e13ae255 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/MediaUploadView.swift @@ -110,7 +110,7 @@ public class MediaUploadView: UIView { bezierPath2.append(UIBezierPath(ovalIn: outerCircleBounds)) shapeLayer2.path = bezierPath2.cgPath shapeLayer2.fillColor = UIColor(white: 1.0, alpha: 0.4).cgColor - shapeLayer2.fillRule = CAShapeLayerFillRule.evenOdd + shapeLayer2.fillRule = .evenOdd CATransaction.commit() } diff --git a/Signal/src/ViewControllers/CropScaleImageViewController.swift b/Signal/src/ViewControllers/CropScaleImageViewController.swift index 1c816ea8d..541b376df 100644 --- a/Signal/src/ViewControllers/CropScaleImageViewController.swift +++ b/Signal/src/ViewControllers/CropScaleImageViewController.swift @@ -184,7 +184,7 @@ import SignalMessaging path.usesEvenOddFillRule = true layer.path = path.cgPath - layer.fillRule = CAShapeLayerFillRule.evenOdd + layer.fillRule = .evenOdd layer.fillColor = UIColor.black.cgColor layer.opacity = 0.7 } diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift index 1834d4396..35eacbe00 100644 --- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift +++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift @@ -349,7 +349,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect path.append(UIBezierPath(rect: cellRect)) layer.path = path.cgPath - layer.fillRule = CAShapeLayerFillRule.evenOdd + layer.fillRule = .evenOdd layer.fillColor = UIColor.black.cgColor layer.opacity = 0.7 } diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift index e252f7e43..b0ecda828 100644 --- a/Signal/src/ViewControllers/MediaGalleryViewController.swift +++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift @@ -282,8 +282,8 @@ class MediaGalleryNavigationController: OWSNavigationController { presentationView.isHidden = true presentationView.clipsToBounds = true presentationView.layer.allowsEdgeAntialiasing = true - presentationView.layer.minificationFilter = CALayerContentsFilter.trilinear - presentationView.layer.magnificationFilter = CALayerContentsFilter.trilinear + presentationView.layer.minificationFilter = .trilinear + presentationView.layer.magnificationFilter = .trilinear presentationView.contentMode = .scaleAspectFit guard let navigationBar = self.navigationBar as? OWSNavigationBar else { diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift index 7dfada0f2..755b8d7d7 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift @@ -17,8 +17,8 @@ public class OnboardingSplashViewController: OnboardingBaseViewController { let heroImage = UIImage(named: "onboarding_splash_hero") let heroImageView = UIImageView(image: heroImage) heroImageView.contentMode = .scaleAspectFit - heroImageView.layer.minificationFilter = CALayerContentsFilter.trilinear - heroImageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + heroImageView.layer.minificationFilter = .trilinear + heroImageView.layer.magnificationFilter = .trilinear heroImageView.setCompressionResistanceLow() heroImageView.setContentHuggingVerticalLow() heroImageView.accessibilityIdentifier = "onboarding.splash." + "heroImageView" diff --git a/SignalMessaging/ViewControllers/MediaMessageView.swift b/SignalMessaging/ViewControllers/MediaMessageView.swift index 4f3da9010..f78c4dba9 100644 --- a/SignalMessaging/ViewControllers/MediaMessageView.swift +++ b/SignalMessaging/ViewControllers/MediaMessageView.swift @@ -138,8 +138,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { let audioPlayButton = UIButton() self.audioPlayButton = audioPlayButton setAudioIconToPlay() - audioPlayButton.imageView?.layer.minificationFilter = CALayerContentsFilter.trilinear - audioPlayButton.imageView?.layer.magnificationFilter = CALayerContentsFilter.trilinear + audioPlayButton.imageView?.layer.minificationFilter = .trilinear + audioPlayButton.imageView?.layer.magnificationFilter = .trilinear audioPlayButton.addTarget(self, action: #selector(audioPlayButtonPressed), for: .touchUpInside) let buttonSize = createHeroViewSize() audioPlayButton.autoSetDimension(.width, toSize: buttonSize) @@ -221,8 +221,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { } let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = CALayerContentsFilter.trilinear - imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + imageView.layer.minificationFilter = .trilinear + imageView.layer.magnificationFilter = .trilinear let aspectRatio = image.size.width / image.size.height addSubviewWithScaleAspectFitLayout(view: imageView, aspectRatio: aspectRatio) contentView = imageView @@ -243,8 +243,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { } let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = CALayerContentsFilter.trilinear - imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + imageView.layer.minificationFilter = .trilinear + imageView.layer.magnificationFilter = .trilinear let aspectRatio = image.size.width / image.size.height addSubviewWithScaleAspectFitLayout(view: imageView, aspectRatio: aspectRatio) contentView = imageView @@ -307,8 +307,8 @@ public class MediaMessageView: UIView, OWSAudioPlayerDelegate { let image = UIImage(named: imageName) assert(image != nil) let imageView = UIImageView(image: image) - imageView.layer.minificationFilter = CALayerContentsFilter.trilinear - imageView.layer.magnificationFilter = CALayerContentsFilter.trilinear + imageView.layer.minificationFilter = .trilinear + imageView.layer.magnificationFilter = .trilinear imageView.layer.shadowColor = UIColor.black.cgColor let shadowScaling = 5.0 imageView.layer.shadowRadius = CGFloat(2.0 * shadowScaling) diff --git a/SignalMessaging/Views/AvatarImageView.swift b/SignalMessaging/Views/AvatarImageView.swift index 1e08b37c3..5495bc2e8 100644 --- a/SignalMessaging/Views/AvatarImageView.swift +++ b/SignalMessaging/Views/AvatarImageView.swift @@ -32,8 +32,8 @@ public class AvatarImageView: UIImageView { func configureView() { self.autoPinToSquareAspectRatio() - self.layer.minificationFilter = CALayerContentsFilter.trilinear - self.layer.magnificationFilter = CALayerContentsFilter.trilinear + self.layer.minificationFilter = .trilinear + self.layer.magnificationFilter = .trilinear self.layer.masksToBounds = true self.layer.addSublayer(self.shadowLayer) @@ -57,7 +57,7 @@ public class AvatarImageView: UIImageView { // This can be any color since the fill should be clipped. self.shadowLayer.fillColor = UIColor.black.cgColor self.shadowLayer.path = shadowPath.cgPath - self.shadowLayer.fillRule = CAShapeLayerFillRule.evenOdd + self.shadowLayer.fillRule = .evenOdd self.shadowLayer.shadowColor = (Theme.isDarkThemeEnabled ? UIColor.white : UIColor.black).cgColor self.shadowLayer.shadowRadius = 0.5 self.shadowLayer.shadowOpacity = 0.15 @@ -203,7 +203,7 @@ public class AvatarImageButton: UIButton { // This can be any color since the fill should be clipped. shadowLayer.fillColor = UIColor.black.cgColor shadowLayer.path = shadowPath.cgPath - shadowLayer.fillRule = CAShapeLayerFillRule.evenOdd + shadowLayer.fillRule = .evenOdd shadowLayer.shadowColor = (Theme.isDarkThemeEnabled ? UIColor.white : UIColor.black).cgColor shadowLayer.shadowRadius = 0.5 shadowLayer.shadowOpacity = 0.15 @@ -226,8 +226,8 @@ public class AvatarImageButton: UIButton { autoPinToSquareAspectRatio() - layer.minificationFilter = CALayerContentsFilter.trilinear - layer.magnificationFilter = CALayerContentsFilter.trilinear + layer.minificationFilter = .trilinear + layer.magnificationFilter = .trilinear layer.masksToBounds = true layer.addSublayer(shadowLayer) From 89ae37cea5042ee83ce3993074a467b8798e55c5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:17:46 -0600 Subject: [PATCH 451/493] avoid crashing optional unwrapping introduced by Swift5 migration --- Signal/src/util/Backup/OWSBackupAPI.swift | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Signal/src/util/Backup/OWSBackupAPI.swift b/Signal/src/util/Backup/OWSBackupAPI.swift index 425f9bab6..777d96ee0 100644 --- a/Signal/src/util/Backup/OWSBackupAPI.swift +++ b/Signal/src/util/Backup/OWSBackupAPI.swift @@ -484,17 +484,13 @@ import PromiseKit } public class func downloadDataFromCloud(recordName: String) -> Promise { - return downloadFromCloud(recordName: recordName, remainingRetries: maxRetries) - .then { (asset) -> Promise in - do { - let data = try Data(contentsOf: asset.fileURL!) - return Promise.value(data) - } catch { - Logger.error("couldn't load asset file: \(error).") - return Promise(error: invalidServiceResponseError()) + .map { (asset) -> Data in + guard let fileURL = asset.fileURL else { + throw invalidServiceResponseError() } + return try Data(contentsOf: fileURL) } } @@ -510,14 +506,11 @@ import PromiseKit return downloadFromCloud(recordName: recordName, remainingRetries: maxRetries) - .then { (asset) -> Promise in - do { - try FileManager.default.copyItem(at: asset.fileURL!, to: toFileUrl) - return Promise.value(()) - } catch { - Logger.error("couldn't copy asset file: \(error).") - return Promise(error: invalidServiceResponseError()) + .done { asset in + guard let fileURL = asset.fileURL else { + throw invalidServiceResponseError() } + try FileManager.default.copyItem(at: fileURL, to: toFileUrl) } } From 9f806d396357e9afd140ad1a32aa6efa529cd84e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:35:53 -0600 Subject: [PATCH 452/493] respond to fixed radar (hooray) --- .../LongTextViewController.swift | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Signal/src/ViewControllers/LongTextViewController.swift b/Signal/src/ViewControllers/LongTextViewController.swift index 295b939cf..a118e6c50 100644 --- a/Signal/src/ViewControllers/LongTextViewController.swift +++ b/Signal/src/ViewControllers/LongTextViewController.swift @@ -137,16 +137,12 @@ public class LongTextViewController: OWSViewController { messageTextView.text = "" } - // RADAR #18669 - // https://github.com/lionheart/openradar-mirror/issues/18669 - // - // UITextView’s linkTextAttributes property has type [String : Any]! but should be [NSAttributedStringKey : Any]! in Swift 4. - let linkTextAttributes: [String: Any] = [ - NSAttributedString.Key.foregroundColor.rawValue: Theme.primaryColor, - NSAttributedString.Key.underlineColor.rawValue: Theme.primaryColor, - NSAttributedString.Key.underlineStyle.rawValue: NSUnderlineStyle.single.rawValue + let linkTextAttributes: [NSAttributedString.Key: Any] = [ + NSAttributedString.Key.foregroundColor: Theme.primaryColor, + NSAttributedString.Key.underlineColor: Theme.primaryColor, + NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue ] - messageTextView.linkTextAttributes = convertToOptionalNSAttributedStringKeyDictionary(linkTextAttributes) + messageTextView.linkTextAttributes = linkTextAttributes view.addSubview(messageTextView) messageTextView.autoPinEdge(toSuperviewEdge: .top) @@ -173,9 +169,3 @@ public class LongTextViewController: OWSViewController { AttachmentSharing.showShareUI(forText: fullText) } } - -// Helper function inserted by Swift 4.2 migrator. -private func convertToOptionalNSAttributedStringKeyDictionary(_ input: [String: Any]?) -> [NSAttributedString.Key: Any]? { - guard let input = input else { return nil } - return Dictionary(uniqueKeysWithValues: input.map { key, value in (NSAttributedString.Key(rawValue: key), value)}) -} From 78790ab69d4dd17e01cb430de8b6d99412d77ce1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:50:52 -0600 Subject: [PATCH 453/493] swift style lint --- .../ConversationView/Cells/ConversationMediaView.swift | 2 +- Signal/src/ViewControllers/CropScaleImageViewController.swift | 4 ++-- Signal/src/views/MarqueeLabel.swift | 4 ++-- Signal/src/views/ReminderView.swift | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift index 243ca6983..2746f866e 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/ConversationMediaView.swift @@ -380,7 +380,7 @@ public class ConversationMediaView: UIView { private func configure(forError error: MediaError) { backgroundColor = (Theme.isDarkThemeEnabled ? .ows_gray90 : .ows_gray05) let icon: UIImage - switch (error) { + switch error { case .failed: guard let asset = UIImage(named: "media_retry") else { owsFailDebug("Missing image") diff --git a/Signal/src/ViewControllers/CropScaleImageViewController.swift b/Signal/src/ViewControllers/CropScaleImageViewController.swift index 541b376df..089bed25d 100644 --- a/Signal/src/ViewControllers/CropScaleImageViewController.swift +++ b/Signal/src/ViewControllers/CropScaleImageViewController.swift @@ -341,7 +341,7 @@ import SignalMessaging var lastPinchScale: CGFloat = 1.0 @objc func handlePinch(sender: UIPinchGestureRecognizer) { - switch (sender.state) { + switch sender.state { case .possible: break case .began: @@ -398,7 +398,7 @@ import SignalMessaging var srcTranslationAtPanStart: CGPoint = CGPoint.zero @objc func handlePan(sender: UIPanGestureRecognizer) { - switch (sender.state) { + switch sender.state { case .possible: break case .began: diff --git a/Signal/src/views/MarqueeLabel.swift b/Signal/src/views/MarqueeLabel.swift index c505510bf..2b787e477 100644 --- a/Signal/src/views/MarqueeLabel.swift +++ b/Signal/src/views/MarqueeLabel.swift @@ -1050,7 +1050,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { let adjustedColors: [CGColor] let trailingFadeNeeded = self.labelShouldScroll() - switch (type) { + switch type { case .continuousReverse, .rightLeft: adjustedColors = [(trailingFadeNeeded ? transparent : opaque), opaque, opaque, opaque] @@ -1105,7 +1105,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate { } private func transactionDurationType(_ labelType: MarqueeType, interval: CGFloat, delay: CGFloat) -> TimeInterval { - switch (labelType) { + switch labelType { case .leftRight, .rightLeft: return TimeInterval(2.0 * (delay + interval)) default: diff --git a/Signal/src/views/ReminderView.swift b/Signal/src/views/ReminderView.swift index cffe1035d..83cc1738f 100644 --- a/Signal/src/views/ReminderView.swift +++ b/Signal/src/views/ReminderView.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -63,7 +63,7 @@ class ReminderView: UIView { func setupSubviews() { let textColor: UIColor let iconColor: UIColor - switch (mode) { + switch mode { case .nag: self.backgroundColor = UIColor.ows_reminderYellow textColor = UIColor.ows_gray90 From 81b31f964002f69a5185e4e9770761b5561522ef Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 30 Mar 2019 08:55:50 -0600 Subject: [PATCH 454/493] update xcodeproj for xcode10.2 --- Pods | 2 +- Signal.xcodeproj/project.pbxproj | 5 ++--- .../xcschemes/Signal-Internal.xcscheme | 2 +- .../xcshareddata/xcschemes/Signal.xcscheme | 16 ++++++++-------- .../xcschemes/SignalShareExtension.xcscheme | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Pods b/Pods index 1da2265dd..0473f1e70 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 1da2265dd490b9d232a963b26a0ae3da26e6b71c +Subproject commit 0473f1e7065fdbf5d80d6fd5b86c770f902960b0 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 7b8e73007..040103991 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2874,7 +2874,7 @@ attributes = { LastSwiftUpdateCheck = 0920; LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Open Whisper Systems"; TargetAttributes = { 453518671FC635DD00210559 = { @@ -2944,10 +2944,9 @@ }; buildConfigurationList = D221A083169C9E5E00537ABF /* Build configuration list for PBXProject "Signal" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, az_AZ, bg_BG, diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme index 3f70ff5eb..572fd60ab 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme @@ -1,6 +1,6 @@ @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme index a875580b7..cc64d8a0e 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 5 Apr 2019 09:16:48 -0400 Subject: [PATCH 455/493] Fix Cocoapods breakage. --- Pods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pods b/Pods index 0473f1e70..c4790d3de 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 0473f1e7065fdbf5d80d6fd5b86c770f902960b0 +Subproject commit c4790d3de7ec4a04166d761d532f3eaf7aafcf1c From 79d594b4d31d978bbbc7622c844b95116c6e71ec Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 13:38:39 -0400 Subject: [PATCH 456/493] Ensure that conversation view's content insets reserve space for input accessory view when app is inactive. --- .../ConversationViewController.m | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 993748c21..a5f9b69e1 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3849,6 +3849,24 @@ typedef enum : NSUInteger { // Therefore, we only zero out the contentInsetBottom if the inputAccessoryView is nil. if (self.inputAccessoryView == nil || keyboardContentOverlap > 0) { self.contentInsetBottom = keyboardContentOverlap; + } else if (!CurrentAppContext().isAppForegroundAndActive) { + // If app is not active, we'll dismiss the keyboard + // so only reserve enough space for the input accessory + // view. Otherwise, the content will animate into place + // when the app returns from the background. + // + // NOTE: There are two separate cases. If the keyboard is + // dismissed, the inputAccessoryView grows to allow + // space for the notch. In this case, we need to + // subtract bottomLayoutGuide. However, if the + // keyboard is presented we don't want to do that. + // I don't see a simple, safe way to distinguish + // these two cases. Therefore, I'm _always_ + // subtracting bottomLayoutGuide. This will cause + // a slight animation when returning to the app + // but it will "match" the presentation animation + // of the input accessory. + self.contentInsetBottom = MAX(0, self.inputAccessoryView.height - self.bottomLayoutGuide.length); } newInsets.top = 0 + self.extraContentInsetPadding; From 0e87d2e5b31dfe326031df1eb1eaa92d5a7126b5 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 11:50:39 -0400 Subject: [PATCH 457/493] Simplify the scroll down button layout. --- .../ConversationView/ConversationViewController.m | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a5f9b69e1..5c09f4e3e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2595,7 +2595,7 @@ typedef enum : NSUInteger { { CGFloat inset = -(self.collectionView.contentInset.bottom + self.bottomLayoutGuide.length); self.scrollDownButtonButtomConstraint.constant = inset; - [self.view setNeedsLayout]; + [self.scrollDownButton setNeedsLayout]; } - (void)setHasUnreadMessages:(BOOL)hasUnreadMessages @@ -3886,16 +3886,14 @@ typedef enum : NSUInteger { // RADAR: #36297652 [self updateScrollDownButtonLayout]; - [self.scrollDownButton setNeedsLayout]; - [self.scrollDownButton layoutIfNeeded]; // HACK: I've made the assumption that we are already in the context of an animation, in which case the // above should be sufficient to smoothly move the scrollDown button in step with the keyboard presentation // animation. Yet, setting the constraint doesn't animate the movement of the button - it "jumps" to it's final // position. So here we manually lay out the scroll down button frame (seemingly redundantly), which allows it // to be smoothly animated. CGRect newButtonFrame = self.scrollDownButton.frame; - newButtonFrame.origin.y - = self.scrollDownButton.superview.height - (newInsets.bottom + self.scrollDownButton.height); + newButtonFrame.origin.y = self.scrollDownButton.superview.height + - (newInsets.bottom + self.scrollDownButton.height + self.bottomLayoutGuide.length); self.scrollDownButton.frame = newButtonFrame; // Adjust content offset to prevent the presented keyboard from obscuring content. From 42871bb6a60f65c33fe6fab53d1bcd8709bf9c42 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 14:48:01 -0400 Subject: [PATCH 458/493] Simplify the scroll down button layout. --- .../ConversationView/ConversationViewController.m | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 5c09f4e3e..5e305ae7b 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2595,7 +2595,6 @@ typedef enum : NSUInteger { { CGFloat inset = -(self.collectionView.contentInset.bottom + self.bottomLayoutGuide.length); self.scrollDownButtonButtomConstraint.constant = inset; - [self.scrollDownButton setNeedsLayout]; } - (void)setHasUnreadMessages:(BOOL)hasUnreadMessages @@ -3886,15 +3885,7 @@ typedef enum : NSUInteger { // RADAR: #36297652 [self updateScrollDownButtonLayout]; - // HACK: I've made the assumption that we are already in the context of an animation, in which case the - // above should be sufficient to smoothly move the scrollDown button in step with the keyboard presentation - // animation. Yet, setting the constraint doesn't animate the movement of the button - it "jumps" to it's final - // position. So here we manually lay out the scroll down button frame (seemingly redundantly), which allows it - // to be smoothly animated. - CGRect newButtonFrame = self.scrollDownButton.frame; - newButtonFrame.origin.y = self.scrollDownButton.superview.height - - (newInsets.bottom + self.scrollDownButton.height + self.bottomLayoutGuide.length); - self.scrollDownButton.frame = newButtonFrame; + [self.view layoutSubviews]; // Adjust content offset to prevent the presented keyboard from obscuring content. if (!self.viewHasEverAppeared) { @@ -5164,6 +5155,7 @@ typedef enum : NSUInteger { // Scroll button layout depends on input toolbar size. [self updateScrollDownButtonLayout]; + [self.view setNeedsLayout]; } @end From 40bd2b06d2bfeb26447db419f653e301048475c3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 14:55:49 -0400 Subject: [PATCH 459/493] Simplify the scroll down button layout. --- .../ConversationView/ConversationViewController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 5e305ae7b..fa095f6df 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3885,6 +3885,8 @@ typedef enum : NSUInteger { // RADAR: #36297652 [self updateScrollDownButtonLayout]; + // Update the layout of the scroll down button immediately. + // This change might be animated by the keyboard notification. [self.view layoutSubviews]; // Adjust content offset to prevent the presented keyboard from obscuring content. From 6c1d6cc20126dc7574f8540577e615b5b68c345e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 15:46:42 -0400 Subject: [PATCH 460/493] Simplify the scroll down button layout. --- .../ConversationView/ConversationViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index fa095f6df..202bd46ec 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2595,6 +2595,7 @@ typedef enum : NSUInteger { { CGFloat inset = -(self.collectionView.contentInset.bottom + self.bottomLayoutGuide.length); self.scrollDownButtonButtomConstraint.constant = inset; + [self.scrollDownButton.superview setNeedsLayout]; } - (void)setHasUnreadMessages:(BOOL)hasUnreadMessages @@ -3887,7 +3888,7 @@ typedef enum : NSUInteger { // Update the layout of the scroll down button immediately. // This change might be animated by the keyboard notification. - [self.view layoutSubviews]; + [self.scrollDownButton.superview layoutIfNeeded]; // Adjust content offset to prevent the presented keyboard from obscuring content. if (!self.viewHasEverAppeared) { @@ -5157,7 +5158,6 @@ typedef enum : NSUInteger { // Scroll button layout depends on input toolbar size. [self updateScrollDownButtonLayout]; - [self.view setNeedsLayout]; } @end From a9ba848ffc5ee3fb1b3a334e47ef00bac0e9d7c1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 9 Apr 2019 09:59:09 -0600 Subject: [PATCH 461/493] address notification race --- .../Notifications/AppNotifications.swift | 2 ++ .../ConversationView/ConversationViewController.m | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 4c2a4ba2f..1c1deadd8 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -496,10 +496,12 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { } } + @objc public func cancelNotifications(threadId: String) { self.adaptee.cancelNotifications(threadId: threadId) } + @objc public func clearAllNotifications() { adaptee.clearAllNotifications() } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 202bd46ec..a60661ae0 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -325,6 +325,11 @@ typedef enum : NSUInteger { return SSKEnvironment.shared.tsAccountManager; } +- (OWSNotificationPresenter *)notificationPresenter +{ + return AppEnvironment.shared.notificationPresenter; +} + #pragma mark - - (void)addNotificationListeners @@ -1187,6 +1192,13 @@ typedef enum : NSUInteger { { [super viewDidAppear:animated]; + // We don't present incoming message notifications for the presented + // conversation. But there's a narrow window *while* the conversationVC + // is being presented where a message notification for the not-quite-yet + // presented conversation can be shown. If that happens, dismiss it as soon + // as we enter the conversation. + [self.notificationPresenter cancelNotificationsWithThreadId:self.thread.uniqueId]; + // recover status bar when returning from PhotoPicker, which is dark (uses light status bar) [self setNeedsStatusBarAppearanceUpdate]; From 79eb3fb3cbb427377cede259fda1beeb74596340 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 9 Apr 2019 14:00:02 -0400 Subject: [PATCH 462/493] Suppress overzealous assert. --- SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m index 17d6b7c5a..660355f65 100644 --- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m +++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m @@ -702,7 +702,7 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O if (self.tsAccountManager.isRegisteredAndReady) { [self.tsAccountManager setIsDeregistered:YES]; } else { - OWSFailDebug(@"Ignoring auth failure; not registered and ready."); + OWSLogWarn(@"Ignoring auth failure; not registered and ready."); } } } From febcc196361b63e92b6f7436e131edca4fa64493 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Apr 2019 07:17:39 -0600 Subject: [PATCH 463/493] "Bump build to 2.39.0.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index d9b427a35..8eb62c2b3 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -30,7 +30,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.38.1 + 2.39.0 CFBundleSignature ???? CFBundleURLTypes @@ -47,7 +47,7 @@ CFBundleVersion - 2.38.1.2 + 2.39.0.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index eaccdb4c0..ff2f53293 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.38.1 + 2.39.0 CFBundleVersion - 2.38.1.2 + 2.39.0.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 39d32192384405cc6b443b08b498487ea3c815b4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Apr 2019 09:41:49 -0600 Subject: [PATCH 464/493] Add option to manually disable circumvention. --- .../AdvancedSettingsTableViewController.m | 42 ++++++++---- .../translations/en.lproj/Localizable.strings | 6 +- .../src/Network/OWSCensorshipConfiguration.h | 1 + .../src/Network/OWSCensorshipConfiguration.m | 30 +++++---- .../src/Network/OWSSignalService.h | 1 + .../src/Network/OWSSignalService.m | 66 ++++++++++++++----- 6 files changed, 99 insertions(+), 47 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m index 8c7654ac2..f5a5fbda7 100644 --- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m +++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m @@ -138,10 +138,17 @@ NS_ASSUME_NONNULL_BEGIN @"Table header for the 'censorship circumvention' section."); BOOL isAnySocketOpen = TSSocketManager.shared.highestSocketState == OWSWebSocketStateOpen; if (OWSSignalService.sharedInstance.hasCensoredPhoneNumber) { - censorshipSection.footerTitle - = NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED", + if (OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyDisabled) { + censorshipSection.footerTitle + = NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED", + @"Table footer for the 'censorship circumvention' section shown when censorship circumvention has " + @"been manually disabled."); + } else { + censorshipSection.footerTitle = NSLocalizedString( + @"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED", @"Table footer for the 'censorship circumvention' section shown when censorship circumvention has been " @"auto-enabled based on local phone number."); + } } else if (isAnySocketOpen) { censorshipSection.footerTitle = NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_WEBSOCKET_CONNECTED", @@ -170,20 +177,22 @@ NS_ASSUME_NONNULL_BEGIN // censorship circumvention unnecessarily, e.g. if they just don't have a valid // internet connection. OWSTableSwitchBlock isCensorshipCircumventionOnBlock = ^{ - if (OWSSignalService.sharedInstance.hasCensoredPhoneNumber) { - return YES; - } else { - return OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated; - } + return OWSSignalService.sharedInstance.isCensorshipCircumventionActive; }; Reachability *reachability = self.reachability; OWSTableSwitchBlock isManualCensorshipCircumventionOnEnabledBlock = ^{ - BOOL isAnySocketOpen = TSSocketManager.shared.highestSocketState == OWSWebSocketStateOpen; - BOOL value = (OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated - || (!OWSSignalService.sharedInstance.hasCensoredPhoneNumber && !isAnySocketOpen - && reachability.isReachable)); - return value; + OWSSignalService *service = OWSSignalService.sharedInstance; + if (service.isCensorshipCircumventionActive) { + return YES; + } else if (service.hasCensoredPhoneNumber && service.isCensorshipCircumventionManuallyDisabled) { + return YES; + } else if (TSSocketManager.shared.highestSocketState == OWSWebSocketStateOpen) { + return NO; + } else { + return reachability.isReachable; + } }; + [censorshipSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION", @"Label for the 'manual censorship circumvention' switch.") @@ -286,7 +295,14 @@ NS_ASSUME_NONNULL_BEGIN - (void)didToggleEnableCensorshipCircumventionSwitch:(UISwitch *)sender { - OWSSignalService.sharedInstance.isCensorshipCircumventionManuallyActivated = sender.isOn; + OWSSignalService *service = OWSSignalService.sharedInstance; + if (sender.isOn) { + service.isCensorshipCircumventionManuallyDisabled = NO; + service.isCensorshipCircumventionManuallyActivated = YES; + } else { + service.isCensorshipCircumventionManuallyDisabled = YES; + service.isCensorshipCircumventionManuallyActivated = NO; + } [self updateTableContents]; } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 3066ce983..509b5e69a 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2033,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2390,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Unarchive"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Unknown attachment"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "User not in your contacts. Would you like to block this user?"; diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h index 1f16ac63f..5b0a16193 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h @@ -19,6 +19,7 @@ extern NSString *const OWSFrontingHost_GoogleQatar; // returns best censorship configuration for country code. Will return a default if one hasn't // been specifically configured. + (instancetype)censorshipConfigurationWithCountryCode:(NSString *)countryCode; ++ (instancetype)defaultConfiguration; + (BOOL)isCensoredPhoneNumber:(NSString *)e164PhoneNumber; diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m index fd55f80a5..95bc3d279 100644 --- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m +++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m @@ -38,22 +38,27 @@ NSString *const OWSFrontingHost_Default = @"www.google.com"; OWSAssertDebug(countryMetadadata); NSString *_Nullable specifiedDomain = countryMetadadata.frontingDomain; - - NSURL *baseURL; - AFSecurityPolicy *securityPolicy; - if (specifiedDomain.length > 0) { - NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", specifiedDomain]; - baseURL = [NSURL URLWithString:frontingURLString]; - securityPolicy = [self securityPolicyForDomain:(NSString *)specifiedDomain]; - } else { - NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", OWSFrontingHost_Default]; - baseURL = [NSURL URLWithString:frontingURLString]; - securityPolicy = [self securityPolicyForDomain:OWSFrontingHost_Default]; + if (specifiedDomain.length == 0) { + return self.defaultConfiguration; } - OWSAssertDebug(baseURL); + NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", specifiedDomain]; + NSURL *_Nullable baseURL = [NSURL URLWithString:frontingURLString]; + if (baseURL == nil) { + OWSFailDebug(@"baseURL was unexpectedly nil with specifiedDomain: %@", specifiedDomain); + return self.defaultConfiguration; + } + AFSecurityPolicy *securityPolicy = [self securityPolicyForDomain:specifiedDomain]; OWSAssertDebug(securityPolicy); + return [[OWSCensorshipConfiguration alloc] initWithDomainFrontBaseURL:baseURL securityPolicy:securityPolicy]; +} + ++ (instancetype)defaultConfiguration +{ + NSString *frontingURLString = [NSString stringWithFormat:@"https://%@", OWSFrontingHost_Default]; + NSURL *baseURL = [NSURL URLWithString:frontingURLString]; + AFSecurityPolicy *securityPolicy = [self securityPolicyForDomain:OWSFrontingHost_Default]; return [[OWSCensorshipConfiguration alloc] initWithDomainFrontBaseURL:baseURL securityPolicy:securityPolicy]; } @@ -107,7 +112,6 @@ NSString *const OWSFrontingHost_Default = @"www.google.com"; }; } -// Returns nil if the phone number is not known to be censored + (BOOL)isCensoredPhoneNumber:(NSString *)e164PhoneNumber; { return [self censoredCountryCodeWithPhoneNumber:e164PhoneNumber].length > 0; diff --git a/SignalServiceKit/src/Network/OWSSignalService.h b/SignalServiceKit/src/Network/OWSSignalService.h index d209a40bd..0c1621b25 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.h +++ b/SignalServiceKit/src/Network/OWSSignalService.h @@ -24,6 +24,7 @@ extern NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidCha @property (atomic, readonly) BOOL isCensorshipCircumventionActive; @property (atomic, readonly) BOOL hasCensoredPhoneNumber; @property (atomic) BOOL isCensorshipCircumventionManuallyActivated; +@property (atomic) BOOL isCensorshipCircumventionManuallyDisabled; @property (atomic, nullable) NSString *manualCensorshipCircumventionCountryCode; /// For interacting with the Signal Service diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 75571d2d3..0e4d16e75 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN NSString *const kOWSPrimaryStorage_OWSSignalService = @"kTSStorageManager_OWSSignalService"; NSString *const kOWSPrimaryStorage_isCensorshipCircumventionManuallyActivated = @"kTSStorageManager_isCensorshipCircumventionManuallyActivated"; +NSString *const kOWSPrimaryStorage_isCensorshipCircumventionManuallyDisabled + = @"kTSStorageManager_isCensorshipCircumventionManuallyDisabled"; NSString *const kOWSPrimaryStorage_ManualCensorshipCircumventionDomain = @"kTSStorageManager_ManualCensorshipCircumventionDomain"; NSString *const kOWSPrimaryStorage_ManualCensorshipCircumventionCountryCode @@ -28,8 +30,6 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = @interface OWSSignalService () -@property (nonatomic, nullable, readonly) OWSCensorshipConfiguration *censorshipConfiguration; - @property (atomic) BOOL hasCensoredPhoneNumber; @property (atomic) BOOL isCensorshipCircumventionActive; @@ -116,10 +116,33 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = [self updateIsCensorshipCircumventionActive]; } +- (BOOL)isCensorshipCircumventionManuallyDisabled +{ + return [[OWSPrimaryStorage dbReadConnection] boolForKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyDisabled + inCollection:kOWSPrimaryStorage_OWSSignalService]; +} + +- (void)setIsCensorshipCircumventionManuallyDisabled:(BOOL)value +{ + [[OWSPrimaryStorage dbReadWriteConnection] setObject:@(value) + forKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyDisabled + inCollection:kOWSPrimaryStorage_OWSSignalService]; + + [self updateIsCensorshipCircumventionActive]; +} + + - (void)updateIsCensorshipCircumventionActive { - self.isCensorshipCircumventionActive - = (self.isCensorshipCircumventionManuallyActivated || self.hasCensoredPhoneNumber); + if (self.isCensorshipCircumventionManuallyDisabled) { + self.isCensorshipCircumventionActive = NO; + } else if (self.isCensorshipCircumventionManuallyActivated) { + self.isCensorshipCircumventionActive = YES; + } else if (self.hasCensoredPhoneNumber) { + self.isCensorshipCircumventionActive = YES; + } else { + self.isCensorshipCircumventionActive = NO; + } } - (void)setIsCensorshipCircumventionActive:(BOOL)isCensorshipCircumventionActive @@ -150,8 +173,9 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (AFHTTPSessionManager *)buildSignalServiceSessionManager { if (self.isCensorshipCircumventionActive) { - OWSLogInfo(@"using reflector HTTPSessionManager via: %@", self.censorshipConfiguration.domainFrontBaseURL); - return self.reflectorSignalServiceSessionManager; + OWSCensorshipConfiguration *censorshipConfiguration = [self buildCensorshipConfiguration]; + OWSLogInfo(@"using reflector HTTPSessionManager via: %@", censorshipConfiguration.domainFrontBaseURL); + return [self reflectorSignalServiceSessionManagerWithCensorshipConfiguration:censorshipConfiguration]; } else { return self.defaultSignalServiceSessionManager; } @@ -174,10 +198,9 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = return sessionManager; } -- (AFHTTPSessionManager *)reflectorSignalServiceSessionManager +- (AFHTTPSessionManager *)reflectorSignalServiceSessionManagerWithCensorshipConfiguration: + (OWSCensorshipConfiguration *)censorshipConfiguration { - OWSCensorshipConfiguration *censorshipConfiguration = self.censorshipConfiguration; - NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration; AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc] initWithBaseURL:censorshipConfiguration.domainFrontBaseURL @@ -186,7 +209,8 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = sessionManager.securityPolicy = censorshipConfiguration.domainFrontSecurityPolicy; sessionManager.requestSerializer = [AFJSONRequestSerializer serializer]; - [sessionManager.requestSerializer setValue:self.censorshipConfiguration.signalServiceReflectorHost forHTTPHeaderField:@"Host"]; + [sessionManager.requestSerializer setValue:censorshipConfiguration.signalServiceReflectorHost + forHTTPHeaderField:@"Host"]; sessionManager.responseSerializer = [AFJSONResponseSerializer serializer]; // Disable default cookie handling for all requests. sessionManager.requestSerializer.HTTPShouldHandleCookies = NO; @@ -199,8 +223,9 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (AFHTTPSessionManager *)CDNSessionManager { if (self.isCensorshipCircumventionActive) { - OWSLogInfo(@"using reflector CDNSessionManager via: %@", self.censorshipConfiguration.domainFrontBaseURL); - return self.reflectorCDNSessionManager; + OWSCensorshipConfiguration *censorshipConfiguration = [self buildCensorshipConfiguration]; + OWSLogInfo(@"using reflector CDNSessionManager via: %@", censorshipConfiguration.domainFrontBaseURL); + return [self reflectorCDNSessionManagerWithCensorshipConfiguration:censorshipConfiguration]; } else { return self.defaultCDNSessionManager; } @@ -223,12 +248,11 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = return sessionManager; } -- (AFHTTPSessionManager *)reflectorCDNSessionManager +- (AFHTTPSessionManager *)reflectorCDNSessionManagerWithCensorshipConfiguration: + (OWSCensorshipConfiguration *)censorshipConfiguration { NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration; - OWSCensorshipConfiguration *censorshipConfiguration = self.censorshipConfiguration; - AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc] initWithBaseURL:censorshipConfiguration.domainFrontBaseURL sessionConfiguration:sessionConf]; @@ -257,8 +281,10 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = #pragma mark - Manual Censorship Circumvention -- (nullable OWSCensorshipConfiguration *)censorshipConfiguration +- (OWSCensorshipConfiguration *)buildCensorshipConfiguration { + OWSAssertDebug(self.isCensorshipCircumventionActive); + if (self.isCensorshipCircumventionManuallyActivated) { NSString *countryCode = self.manualCensorshipCircumventionCountryCode; if (countryCode.length == 0) { @@ -272,9 +298,13 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = return configuration; } - OWSCensorshipConfiguration *configuration = + OWSCensorshipConfiguration *_Nullable configuration = [OWSCensorshipConfiguration censorshipConfigurationWithPhoneNumber:TSAccountManager.localNumber]; - return configuration; + if (configuration != nil) { + return configuration; + } + + return OWSCensorshipConfiguration.defaultConfiguration; } - (nullable NSString *)manualCensorshipCircumventionCountryCode From 21cffdfb5e5129abbfdfdbe429efb757a7aba283 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Apr 2019 14:32:36 -0600 Subject: [PATCH 465/493] always specify default when accessing bool preference --- .../src/Messages/OWSReadReceiptManager.m | 19 +++---------------- .../src/Network/OWSSignalService.m | 6 ++++-- .../src/Storage/YapDatabaseConnection+OWS.h | 3 +-- .../src/Storage/YapDatabaseConnection+OWS.m | 5 ----- .../src/Storage/YapDatabaseTransaction+OWS.h | 1 - .../src/Storage/YapDatabaseTransaction+OWS.m | 8 -------- 6 files changed, 8 insertions(+), 34 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m index 8f703ca13..e08fe371f 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSReadReceiptManager.h" @@ -524,22 +524,9 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE { // We don't need to worry about races around this cached value. if (!self.areReadReceiptsEnabledCached) { - // Default to NO. self.areReadReceiptsEnabledCached = @([self.dbConnection boolForKey:OWSReadReceiptManagerAreReadReceiptsEnabled - inCollection:OWSReadReceiptManagerCollection]); - } - - return [self.areReadReceiptsEnabledCached boolValue]; -} - -- (BOOL)areReadReceiptsEnabledWithTransaction:(YapDatabaseReadTransaction *)transaction -{ - if (!self.areReadReceiptsEnabledCached) { - [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - // Default to NO. - self.areReadReceiptsEnabledCached = [transaction objectForKey:OWSReadReceiptManagerAreReadReceiptsEnabled - inCollection:OWSReadReceiptManagerCollection]; - }]; + inCollection:OWSReadReceiptManagerCollection + defaultValue:NO]); } return [self.areReadReceiptsEnabledCached boolValue]; diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 0e4d16e75..4784d21ce 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -104,7 +104,8 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = { return [[OWSPrimaryStorage dbReadConnection] boolForKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyActivated - inCollection:kOWSPrimaryStorage_OWSSignalService]; + inCollection:kOWSPrimaryStorage_OWSSignalService + defaultValue:NO]; } - (void)setIsCensorshipCircumventionManuallyActivated:(BOOL)value @@ -119,7 +120,8 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (BOOL)isCensorshipCircumventionManuallyDisabled { return [[OWSPrimaryStorage dbReadConnection] boolForKey:kOWSPrimaryStorage_isCensorshipCircumventionManuallyDisabled - inCollection:kOWSPrimaryStorage_OWSSignalService]; + inCollection:kOWSPrimaryStorage_OWSSignalService + defaultValue:NO]; } - (void)setIsCensorshipCircumventionManuallyDisabled:(BOOL)value diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h index bbbdffabb..1b9e3afab 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import @@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN @interface YapDatabaseConnection (OWS) - (BOOL)hasObjectForKey:(NSString *)key inCollection:(NSString *)collection; -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection; - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue; - (double)doubleForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(double)defaultValue; - (int)intForKey:(NSString *)key inCollection:(NSString *)collection; diff --git a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m index 12d47b08e..f21372f80 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.m @@ -51,11 +51,6 @@ NS_ASSUME_NONNULL_BEGIN return [self objectForKey:key inCollection:collection ofExpectedType:[NSString class]]; } -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection -{ - return [self boolForKey:key inCollection:collection defaultValue:NO]; -} - - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue { NSNumber *_Nullable value = [self objectForKey:key inCollection:collection ofExpectedType:[NSNumber class]]; diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h index d4326e8da..b533e367f 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.h @@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN @interface YapDatabaseReadTransaction (OWS) -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection; - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue; - (int)intForKey:(NSString *)key inCollection:(NSString *)collection; - (nullable NSDate *)dateForKey:(NSString *)key inCollection:(NSString *)collection; diff --git a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m index 626472aad..255663255 100644 --- a/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m +++ b/SignalServiceKit/src/Storage/YapDatabaseTransaction+OWS.m @@ -36,14 +36,6 @@ NS_ASSUME_NONNULL_BEGIN return [self objectForKey:key inCollection:collection ofExpectedType:[NSString class]]; } -- (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection -{ - OWSAssertDebug(key.length > 0); - OWSAssertDebug(collection.length > 0); - - return [self boolForKey:key inCollection:collection defaultValue:NO]; -} - - (BOOL)boolForKey:(NSString *)key inCollection:(NSString *)collection defaultValue:(BOOL)defaultValue { OWSAssertDebug(key.length > 0); From b175bd77a5c3e1118fa5fe473e1432e0e5d86fe5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 12 Apr 2019 09:04:38 -0600 Subject: [PATCH 466/493] Fix "too much content inset" issue --- .../ConversationInputToolbar.m | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 689a0de88..048809530 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -291,9 +291,26 @@ const CGFloat kMaxTextViewHeight = 98; self.inputTextView.text = value; - [self ensureShouldShowVoiceMemoButtonAnimated:isAnimated doLayout:YES]; + // It's important that we set the textViewHeight before + // doing any animation in `ensureShouldShowVoiceMemoButtonAnimated` + // Otherwise, the resultant keyboard frame posted in `keyboardWillChangeFrame` + // could reflect the inputTextView height *before* the new text was set. + // + // This bug was surfaced to the user as: + // - have a quoted reply draft in the input toolbar + // - type a multiline message + // - hit send + // - quoted reply preview and message text is cleared + // - input toolbar is shrunk to it's expected empty-text height + // - *but* the conversation's bottom content inset was too large. Specifically, it was + // still sized as if the input textview was multiple lines. + // Presumably this bug only surfaced when an animation coincides with more complicated layout + // changes (in this case while simultaneous with removing quoted reply subviews, hiding the + // wrapper view *and* changing the height of the input textView [self ensureTextViewHeight]; [self updateInputLinkPreview]; + + [self ensureShouldShowVoiceMemoButtonAnimated:isAnimated doLayout:YES]; } - (void)ensureTextViewHeight From b55e0e45f502bbc5d9f3565b14ed81a5d2cb0de8 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 12 Apr 2019 14:51:14 -0600 Subject: [PATCH 467/493] Avoid deadlock There are multiple methods which synchronize(self) in TSAccountMessage and also multiple ones which can occur within a read-write transaction. --- .../src/Account/TSAccountManager.m | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 976de737e..e968ffac3 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -259,21 +259,23 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa - (uint32_t)getOrGenerateRegistrationId:(YapDatabaseReadWriteTransaction *)transaction { - @synchronized(self) - { - uint32_t registrationID = [[transaction objectForKey:TSAccountManager_LocalRegistrationIdKey - inCollection:TSAccountManager_UserAccountCollection] unsignedIntValue]; + // Unlike other methods in this class, there's no need for a `@synchronized` block + // here, since we're already in a write transaction, and all writes occur on a serial queue. + // + // Since other code in this class which uses @synchronized(self) also needs to open write + // transaction, using @synchronized(self) here, inside of a WriteTransaction risks deadlock. + uint32_t registrationID = [[transaction objectForKey:TSAccountManager_LocalRegistrationIdKey + inCollection:TSAccountManager_UserAccountCollection] unsignedIntValue]; - if (registrationID == 0) { - registrationID = (uint32_t)arc4random_uniform(16380) + 1; - OWSLogWarn(@"Generated a new registrationID: %u", registrationID); + if (registrationID == 0) { + registrationID = (uint32_t)arc4random_uniform(16380) + 1; + OWSLogWarn(@"Generated a new registrationID: %u", registrationID); - [transaction setObject:[NSNumber numberWithUnsignedInteger:registrationID] - forKey:TSAccountManager_LocalRegistrationIdKey - inCollection:TSAccountManager_UserAccountCollection]; - } - return registrationID; + [transaction setObject:[NSNumber numberWithUnsignedInteger:registrationID] + forKey:TSAccountManager_LocalRegistrationIdKey + inCollection:TSAccountManager_UserAccountCollection]; } + return registrationID; } - (void)registerForPushNotificationsWithPushToken:(NSString *)pushToken From 458564262f7a484b03fe37c40808e2d48da0efdd Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 12 Apr 2019 16:10:07 -0600 Subject: [PATCH 468/493] valign capture, switch, and done buttons Purelayout doesn't support UILayoutGuide =( --- .../Photos/PhotoCaptureViewController.swift | 7 +++---- .../Photos/SendMediaNavigationController.swift | 16 +++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 8d4887868..8bcc4fd22 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -88,7 +88,7 @@ class PhotoCaptureViewController: OWSViewController { return true } - // MARK - + // MARK: - var isRecordingMovie: Bool = false let recordingTimerView = RecordingTimerView() @@ -325,8 +325,7 @@ class PhotoCaptureViewController: OWSViewController { view.addSubview(captureButton) captureButton.autoHCenterInSuperview() - - captureButton.autoPinEdge(toSuperviewMargin: .bottom, withInset: 10) + captureButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: SendMediaNavigationController.bottomButtonsCenterOffset).isActive = true } private func showFailureUI(error: Error) { @@ -425,7 +424,7 @@ class CaptureButton: UIView { weak var delegate: CaptureButtonDelegate? let defaultDiameter: CGFloat = ScaleFromIPhone5To7Plus(60, 80) - let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(90, 120) + let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(68, 120) var innerButtonSizeConstraints: [NSLayoutConstraint]! var zoomIndicatorSizeConstraints: [NSLayoutConstraint]! diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index f579d0b60..98c5de2ff 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -18,6 +18,10 @@ protocol SendMediaNavDelegate: AnyObject { @objc class SendMediaNavigationController: OWSNavigationController { + // This is a sensitive constant, if you change it make sure to check + // on iPhone5, 6, 6+, X, layouts. + static let bottomButtonsCenterOffset: CGFloat = -50 + // MARK: - Overrides override var prefersStatusBarHidden: Bool { return true } @@ -27,24 +31,26 @@ class SendMediaNavigationController: OWSNavigationController { self.delegate = self + let bottomButtonsCenterOffset = SendMediaNavigationController.bottomButtonsCenterOffset + view.addSubview(batchModeButton) batchModeButton.setCompressionResistanceHigh() - batchModeButton.autoPinEdge(toSuperviewMargin: .bottom) + batchModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true batchModeButton.autoPinEdge(toSuperviewMargin: .trailing) view.addSubview(doneButton) doneButton.setCompressionResistanceHigh() - doneButton.autoPinEdge(toSuperviewMargin: .bottom) + doneButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true doneButton.autoPinEdge(toSuperviewMargin: .trailing) view.addSubview(cameraModeButton) cameraModeButton.setCompressionResistanceHigh() - cameraModeButton.autoPinEdge(toSuperviewMargin: .bottom) + cameraModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true cameraModeButton.autoPinEdge(toSuperviewMargin: .leading) view.addSubview(mediaLibraryModeButton) mediaLibraryModeButton.setCompressionResistanceHigh() - mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .bottom) + mediaLibraryModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .leading) } @@ -439,7 +445,7 @@ private struct AttachmentDraftCollection { return AttachmentDraftCollection(attachmentDrafts: []) } - // MARK - + // MARK: - var count: Int { return attachmentDrafts.count From 26ef36dc557defe02b2e889c4433075f22109872 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 10:34:32 -0600 Subject: [PATCH 469/493] Fix: back from approval not showing bottom buttons --- .../SendMediaNavigationController.swift | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 98c5de2ff..15b63dde9 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -63,7 +63,6 @@ class SendMediaNavigationController: OWSNavigationController { public class func showingCameraFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.captureViewController], animated: false) - navController.updateButtons() return navController } @@ -72,7 +71,6 @@ class SendMediaNavigationController: OWSNavigationController { public class func showingMediaLibraryFirst() -> SendMediaNavigationController { let navController = SendMediaNavigationController() navController.setViewControllers([navController.mediaLibraryViewController], animated: false) - navController.updateButtons() return navController } @@ -80,17 +78,16 @@ class SendMediaNavigationController: OWSNavigationController { var isInBatchSelectMode = false { didSet { if oldValue != isInBatchSelectMode { - updateButtons() mediaLibraryViewController.batchSelectModeDidChange() + guard let topViewController = viewControllers.last else { + return + } + updateButtons(topViewController: topViewController) } } } - func updateButtons() { - guard let topViewController = viewControllers.last else { - return - } - + func updateButtons(topViewController: UIViewController) { switch topViewController { case is AttachmentApprovalViewController: batchModeButton.isHidden = true @@ -131,12 +128,10 @@ class SendMediaNavigationController: OWSNavigationController { private func didTapCameraModeButton() { fadeTo(viewControllers: [captureViewController]) - updateButtons() } private func didTapMediaLibraryModeButton() { fadeTo(viewControllers: [mediaLibraryViewController]) - updateButtons() } // MARK: Views @@ -227,7 +222,6 @@ class SendMediaNavigationController: OWSNavigationController { approvalViewController.messageText = sendMediaNavDelegate.sendMediaNavInitialMessageText(self) pushViewController(approvalViewController, animated: true) - updateButtons() } private func didRequestExit(dontAbandonText: String) { @@ -265,6 +259,7 @@ extension SendMediaNavigationController: UINavigationControllerDelegate { owsFailDebug("unexpected navigationBar: \(navigationBar)") } } + self.updateButtons(topViewController: viewController) } // In case back navigation was canceled, we re-apply whatever is showing. @@ -276,6 +271,7 @@ extension SendMediaNavigationController: UINavigationControllerDelegate { owsFailDebug("unexpected navigationBar: \(navigationBar)") } } + self.updateButtons(topViewController: viewController) } // MARK: - Helpers @@ -299,7 +295,7 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) { attachmentDraftCollection.append(.camera(attachment: attachment)) if isInBatchSelectMode { - updateButtons() + updateButtons(topViewController: photoCaptureViewController) } else { pushApprovalViewController() } @@ -359,15 +355,16 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate { let libraryMedia = MediaLibrarySelection(asset: asset, signalAttachmentPromise: attachmentPromise) mediaLibrarySelections.append(key: asset, value: libraryMedia) - updateButtons() + updateButtons(topViewController: imagePicker) } func imagePicker(_ imagePicker: ImagePickerGridController, didDeselectAsset asset: PHAsset) { - if mediaLibrarySelections.hasValue(forKey: asset) { - mediaLibrarySelections.remove(key: asset) - - updateButtons() + guard mediaLibrarySelections.hasValue(forKey: asset) else { + return } + mediaLibrarySelections.remove(key: asset) + + updateButtons(topViewController: imagePicker) } func imagePickerCanSelectAdditionalItems(_ imagePicker: ImagePickerGridController) -> Bool { @@ -412,9 +409,7 @@ extension SendMediaNavigationController: AttachmentApprovalViewControllerDelegat isInBatchSelectMode = true mediaLibraryViewController.batchSelectModeDidChange() - popViewController(animated: true) { - self.updateButtons() - } + popViewController(animated: true) } } From db410becb7f1eafab53465d177715bcdb2d75c16 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 10:52:29 -0600 Subject: [PATCH 470/493] per design: "back" is retake for first photo --- .../SendMediaNavigationController.swift | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 15b63dde9..e887f5034 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -259,6 +259,13 @@ extension SendMediaNavigationController: UINavigationControllerDelegate { owsFailDebug("unexpected navigationBar: \(navigationBar)") } } + + if viewController is PhotoCaptureViewController && !isInBatchSelectMode { + // We're either showing the captureView for the first time or the user is navigating "back" + // indicating they want to "retake". We should discard any current image. + discardCameraDraft() + } + self.updateButtons(topViewController: viewController) } @@ -305,6 +312,14 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { let dontAbandonText = NSLocalizedString("SEND_MEDIA_RETURN_TO_CAMERA", comment: "alert action when the user decides not to cancel the media flow after all.") didRequestExit(dontAbandonText: dontAbandonText) } + + func discardCameraDraft() { + assert(attachmentDraftCollection.cameraAttachments.count <= 1) + if let lastCameraAttachment = attachmentDraftCollection.cameraAttachments.last { + attachmentDraftCollection.remove(attachment: lastCameraAttachment) + } + assert(attachmentDraftCollection.cameraAttachments.count == 0) + } } extension SendMediaNavigationController: ImagePickerGridControllerDelegate { @@ -457,6 +472,17 @@ private struct AttachmentDraftCollection { } } + var cameraAttachments: [SignalAttachment] { + return attachmentDrafts.compactMap { attachmentDraft in + switch attachmentDraft.source { + case .picker: + return nil + case .camera(let cameraAttachment): + return cameraAttachment + } + } + } + mutating func append(_ element: AttachmentDraft) { attachmentDrafts.append(element) } From a10973f8252614711c45c9fdd958645633982c96 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 11:01:33 -0600 Subject: [PATCH 471/493] align stop icons between picker and capture --- .../Photos/ImagePickerController.swift | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 2e1e13cce..04777933e 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -58,9 +58,14 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat view.backgroundColor = .ows_gray95 - let cancelButton = UIBarButtonItem(barButtonSystemItem: .stop, - target: self, - action: #selector(didPressCancel)) + // The PhotoCaptureVC needs a shadow behind it's cancel button, so we use a custom icon. + // This VC has a visible navbar so doesn't need the shadow, but because the user can + // quickly toggle between the Capture and the Picker VC's, we use the same custom "X" + // icon here rather than the system "stop" icon so that the spacing matches exactly. + // Otherwise there's a noticable shift in the icon placement. + let cancelImage = UIImage(imageLiteralResourceName: "ic_x_with_shadow") + let cancelButton = UIBarButtonItem(image: cancelImage, style: .plain, target: self, action: #selector(didPressCancel)) + cancelButton.tintColor = .ows_gray05 navigationItem.leftBarButtonItem = cancelButton From 1e4f670ffda936f757b593e0e9fc5dee8a725fe4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 11:07:04 -0600 Subject: [PATCH 472/493] add shadow to buttons that overlay images --- .../Photos/SendMediaNavigationController.swift | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index e887f5034..6065a4178 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -139,6 +139,7 @@ class SendMediaNavigationController: OWSNavigationController { private lazy var doneButton: DoneButton = { let button = DoneButton() button.delegate = self + button.setShadow() return button }() @@ -153,6 +154,7 @@ class SendMediaNavigationController: OWSNavigationController { button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) button.backgroundColor = .ows_white + button.setShadow() return button }() @@ -167,6 +169,7 @@ class SendMediaNavigationController: OWSNavigationController { button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) button.backgroundColor = .ows_white + button.setShadow() return button }() @@ -181,6 +184,7 @@ class SendMediaNavigationController: OWSNavigationController { button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) button.backgroundColor = .ows_white + button.setShadow() return button }() @@ -643,3 +647,12 @@ private class DoneButton: UIView { delegate?.doneButtonWasTapped(self) } } + +extension UIView { + func setShadow(radius: CGFloat = 2.0, opacity: CGFloat = 0.66, offset: CGPoint = .zero, color: CGColor = UIColor.black.cgColor) { + layer.shadowColor = UIColor.black.cgColor + layer.shadowRadius = 2.0 + layer.shadowOpacity = 0.66 + layer.shadowOffset = .zero + } +} From d8dbbd328dae692d639a189947433a3ef6c635f2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 11:15:47 -0600 Subject: [PATCH 473/493] clear timer once video is complete otherwise the old timer remains when returning to the capture view --- .../ViewControllers/Photos/PhotoCaptureViewController.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 8bcc4fd22..8c1d03968 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -6,7 +6,6 @@ import Foundation import AVFoundation import PromiseKit -@objc(OWSPhotoCaptureViewControllerDelegate) protocol PhotoCaptureViewControllerDelegate: AnyObject { func photoCaptureViewController(_ photoCaptureViewController: PhotoCaptureViewController, didFinishProcessingAttachment attachment: SignalAttachment) func photoCaptureViewControllerDidCancel(_ photoCaptureViewController: PhotoCaptureViewController) @@ -31,10 +30,8 @@ extension PhotoCaptureError: LocalizedError { } } -@objc(OWSPhotoCaptureViewController) class PhotoCaptureViewController: OWSViewController { - @objc weak var delegate: PhotoCaptureViewControllerDelegate? private var photoCapture: PhotoCapture! @@ -373,8 +370,9 @@ extension PhotoCaptureViewController: PhotoCaptureDelegate { } func photoCaptureDidCompleteVideo(_ photoCapture: PhotoCapture) { - // Stop counting, but keep visible + isRecordingMovie = false recordingTimerView.stopCounting() + updateNavigationItems() } func photoCaptureDidCancelVideo(_ photoCapture: PhotoCapture) { From 349dd61fee6221d0156a5a9c8190761ed7db1a41 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Sat, 13 Apr 2019 11:27:01 -0600 Subject: [PATCH 474/493] adapt iOS9 fix to new media flow --- .../ConversationViewController.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index a60661ae0..a9f4b9feb 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2950,13 +2950,6 @@ typedef enum : NSUInteger { didApproveAttachments:(NSArray *)attachments messageText:(nullable NSString *)messageText { - OWSAssertDebug(self.isFirstResponder); - if (@available(iOS 10, *)) { - // do nothing - } else { - [self reloadInputViews]; - } - [self tryToSendAttachments:attachments messageText:messageText]; [self.inputToolbar clearTextMessageAnimated:NO]; @@ -2964,7 +2957,15 @@ typedef enum : NSUInteger { // the new message scroll into view. [self scrollToBottomAnimated:NO]; - [self dismissViewControllerAnimated:YES completion:nil]; + [self dismissViewControllerAnimated:YES + completion:^{ + OWSAssertDebug(self.isFirstResponder); + if (@available(iOS 10, *)) { + // do nothing + } else { + [self reloadInputViews]; + } + }]; } - (nullable NSString *)sendMediaNavInitialMessageText:(SendMediaNavigationController *)sendMediaNavigationController From fa45339f83fbcc6c916fc9202cb70bea3af78305 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 15 Apr 2019 10:18:41 -0600 Subject: [PATCH 475/493] move to public category --- .../Photos/SendMediaNavigationController.swift | 9 --------- SignalMessaging/categories/UIView+OWS.swift | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 6065a4178..4aaf1cb4a 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -647,12 +647,3 @@ private class DoneButton: UIView { delegate?.doneButtonWasTapped(self) } } - -extension UIView { - func setShadow(radius: CGFloat = 2.0, opacity: CGFloat = 0.66, offset: CGPoint = .zero, color: CGColor = UIColor.black.cgColor) { - layer.shadowColor = UIColor.black.cgColor - layer.shadowRadius = 2.0 - layer.shadowOpacity = 0.66 - layer.shadowOffset = .zero - } -} diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 3e1453410..33012100f 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -126,6 +126,13 @@ extension UIView { constraints.append(subview.autoMatch(.height, to: .height, of: self, withMultiplier: 1.0, relation: .lessThanOrEqual)) return constraints } + + func setShadow(radius: CGFloat = 2.0, opacity: CGFloat = 0.66, offset: CGPoint = .zero, color: CGColor = UIColor.black.cgColor) { + layer.shadowColor = UIColor.black.cgColor + layer.shadowRadius = 2.0 + layer.shadowOpacity = 0.66 + layer.shadowOffset = .zero + } } // MARK: - From da79a53d96008fcc3050dad033a0fc277769fa99 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 15 Apr 2019 10:23:02 -0600 Subject: [PATCH 476/493] cleanup compiler warnings --- SignalMessaging/categories/UIView+OWS.swift | 131 +++++++++----------- 1 file changed, 59 insertions(+), 72 deletions(-) diff --git a/SignalMessaging/categories/UIView+OWS.swift b/SignalMessaging/categories/UIView+OWS.swift index 33012100f..cdab36901 100644 --- a/SignalMessaging/categories/UIView+OWS.swift +++ b/SignalMessaging/categories/UIView+OWS.swift @@ -5,7 +5,7 @@ import Foundation public extension UIEdgeInsets { - public init(top: CGFloat, leading: CGFloat, bottom: CGFloat, trailing: CGFloat) { + init(top: CGFloat, leading: CGFloat, bottom: CGFloat, trailing: CGFloat) { self.init(top: top, left: CurrentAppContext().isRTL ? trailing : leading, bottom: bottom, @@ -17,8 +17,7 @@ public extension UIEdgeInsets { @objc public extension UINavigationController { - @objc - public func pushViewController(_ viewController: UIViewController, + func pushViewController(_ viewController: UIViewController, animated: Bool, completion: (() -> Void)?) { CATransaction.begin() @@ -27,8 +26,7 @@ public extension UINavigationController { CATransaction.commit() } - @objc - public func popViewController(animated: Bool, + func popViewController(animated: Bool, completion: (() -> Void)?) { CATransaction.begin() CATransaction.setCompletionBlock(completion) @@ -36,8 +34,7 @@ public extension UINavigationController { CATransaction.commit() } - @objc - public func popToViewController(_ viewController: UIViewController, + func popToViewController(_ viewController: UIViewController, animated: Bool, completion: (() -> Void)?) { CATransaction.begin() @@ -49,12 +46,13 @@ public extension UINavigationController { // MARK: - -extension UIView { - public func renderAsImage() -> UIImage? { +@objc +public extension UIView { + func renderAsImage() -> UIImage? { return renderAsImage(opaque: false, scale: UIScreen.main.scale) } - public func renderAsImage(opaque: Bool, scale: CGFloat) -> UIImage? { + func renderAsImage(opaque: Bool, scale: CGFloat) -> UIImage? { if #available(iOS 10, *) { let format = UIGraphicsImageRendererFormat() format.scale = scale @@ -77,38 +75,33 @@ extension UIView { } } - @objc - public class func spacer(withWidth width: CGFloat) -> UIView { + class func spacer(withWidth width: CGFloat) -> UIView { let view = UIView() view.autoSetDimension(.width, toSize: width) return view } - @objc - public class func spacer(withHeight height: CGFloat) -> UIView { + class func spacer(withHeight height: CGFloat) -> UIView { let view = UIView() view.autoSetDimension(.height, toSize: height) return view } - @objc - public class func hStretchingSpacer() -> UIView { + class func hStretchingSpacer() -> UIView { let view = UIView() view.setContentHuggingHorizontalLow() view.setCompressionResistanceHorizontalLow() return view } - @objc - public class func vStretchingSpacer() -> UIView { + class func vStretchingSpacer() -> UIView { let view = UIView() view.setContentHuggingVerticalLow() view.setCompressionResistanceVerticalLow() return view } - @objc - public func applyScaleAspectFitLayout(subview: UIView, aspectRatio: CGFloat) -> [NSLayoutConstraint] { + func applyScaleAspectFitLayout(subview: UIView, aspectRatio: CGFloat) -> [NSLayoutConstraint] { guard subviews.contains(subview) else { owsFailDebug("Not a subview.") return [] @@ -137,14 +130,13 @@ extension UIView { // MARK: - +@objc public extension UIViewController { - @objc - public func presentAlert(_ alert: UIAlertController) { + func presentAlert(_ alert: UIAlertController) { self.presentAlert(alert, animated: true) } - @objc - public func presentAlert(_ alert: UIAlertController, animated: Bool) { + func presentAlert(_ alert: UIAlertController, animated: Bool) { self.present(alert, animated: animated, completion: { @@ -152,8 +144,7 @@ public extension UIViewController { }) } - @objc - public func presentAlert(_ alert: UIAlertController, completion: @escaping (() -> Void)) { + func presentAlert(_ alert: UIAlertController, completion: @escaping (() -> Void)) { self.present(alert, animated: true, completion: { @@ -167,32 +158,32 @@ public extension UIViewController { // MARK: - public extension CGFloat { - public func clamp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + func clamp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { return CGFloatClamp(self, minValue, maxValue) } - public func clamp01() -> CGFloat { + func clamp01() -> CGFloat { return CGFloatClamp01(self) } // Linear interpolation - public func lerp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { + func lerp(_ minValue: CGFloat, _ maxValue: CGFloat) -> CGFloat { return CGFloatLerp(minValue, maxValue, self) } // Inverse linear interpolation - public func inverseLerp(_ minValue: CGFloat, _ maxValue: CGFloat, shouldClamp: Bool = false) -> CGFloat { + func inverseLerp(_ minValue: CGFloat, _ maxValue: CGFloat, shouldClamp: Bool = false) -> CGFloat { let value = CGFloatInverseLerp(self, minValue, maxValue) return (shouldClamp ? CGFloatClamp01(value) : value) } - public static let halfPi: CGFloat = CGFloat.pi * 0.5 + static let halfPi: CGFloat = CGFloat.pi * 0.5 - public func fuzzyEquals(_ other: CGFloat, tolerance: CGFloat = 0.001) -> Bool { + func fuzzyEquals(_ other: CGFloat, tolerance: CGFloat = 0.001) -> Bool { return abs(self - other) < tolerance } - public var square: CGFloat { + var square: CGFloat { return self * self } } @@ -200,7 +191,7 @@ public extension CGFloat { // MARK: - public extension Int { - public func clamp(_ minValue: Int, _ maxValue: Int) -> Int { + func clamp(_ minValue: Int, _ maxValue: Int) -> Int { assert(minValue <= maxValue) return Swift.max(minValue, Swift.min(maxValue, self)) @@ -210,75 +201,75 @@ public extension Int { // MARK: - public extension CGPoint { - public func toUnitCoordinates(viewBounds: CGRect, shouldClamp: Bool) -> CGPoint { + func toUnitCoordinates(viewBounds: CGRect, shouldClamp: Bool) -> CGPoint { return CGPoint(x: (x - viewBounds.origin.x).inverseLerp(0, viewBounds.width, shouldClamp: shouldClamp), y: (y - viewBounds.origin.y).inverseLerp(0, viewBounds.height, shouldClamp: shouldClamp)) } - public func toUnitCoordinates(viewSize: CGSize, shouldClamp: Bool) -> CGPoint { + func toUnitCoordinates(viewSize: CGSize, shouldClamp: Bool) -> CGPoint { return toUnitCoordinates(viewBounds: CGRect(origin: .zero, size: viewSize), shouldClamp: shouldClamp) } - public func fromUnitCoordinates(viewBounds: CGRect) -> CGPoint { + func fromUnitCoordinates(viewBounds: CGRect) -> CGPoint { return CGPoint(x: viewBounds.origin.x + x.lerp(0, viewBounds.size.width), y: viewBounds.origin.y + y.lerp(0, viewBounds.size.height)) } - public func fromUnitCoordinates(viewSize: CGSize) -> CGPoint { + func fromUnitCoordinates(viewSize: CGSize) -> CGPoint { return fromUnitCoordinates(viewBounds: CGRect(origin: .zero, size: viewSize)) } - public func inverse() -> CGPoint { + func inverse() -> CGPoint { return CGPoint(x: -x, y: -y) } - public func plus(_ value: CGPoint) -> CGPoint { + func plus(_ value: CGPoint) -> CGPoint { return CGPointAdd(self, value) } - public func minus(_ value: CGPoint) -> CGPoint { + func minus(_ value: CGPoint) -> CGPoint { return CGPointSubtract(self, value) } - public func times(_ value: CGFloat) -> CGPoint { + func times(_ value: CGFloat) -> CGPoint { return CGPoint(x: x * value, y: y * value) } - public func min(_ value: CGPoint) -> CGPoint { + func min(_ value: CGPoint) -> CGPoint { // We use "Swift" to disambiguate the global function min() from this method. return CGPoint(x: Swift.min(x, value.x), y: Swift.min(y, value.y)) } - public func max(_ value: CGPoint) -> CGPoint { + func max(_ value: CGPoint) -> CGPoint { // We use "Swift" to disambiguate the global function max() from this method. return CGPoint(x: Swift.max(x, value.x), y: Swift.max(y, value.y)) } - public var length: CGFloat { + var length: CGFloat { return sqrt(x * x + y * y) } - public static let unit: CGPoint = CGPoint(x: 1.0, y: 1.0) + static let unit: CGPoint = CGPoint(x: 1.0, y: 1.0) - public static let unitMidpoint: CGPoint = CGPoint(x: 0.5, y: 0.5) + static let unitMidpoint: CGPoint = CGPoint(x: 0.5, y: 0.5) - public func applyingInverse(_ transform: CGAffineTransform) -> CGPoint { + func applyingInverse(_ transform: CGAffineTransform) -> CGPoint { return applying(transform.inverted()) } - public func fuzzyEquals(_ other: CGPoint, tolerance: CGFloat = 0.001) -> Bool { + func fuzzyEquals(_ other: CGPoint, tolerance: CGFloat = 0.001) -> Bool { return (x.fuzzyEquals(other.x, tolerance: tolerance) && y.fuzzyEquals(other.y, tolerance: tolerance)) } - public static func tan(angle: CGFloat) -> CGPoint { + static func tan(angle: CGFloat) -> CGPoint { return CGPoint(x: sin(angle), y: cos(angle)) } - public func clamp(_ rect: CGRect) -> CGPoint { + func clamp(_ rect: CGRect) -> CGPoint { return CGPoint(x: x.clamp(rect.minX, rect.maxX), y: y.clamp(rect.minY, rect.maxY)) } @@ -307,23 +298,23 @@ public extension CGSize { // MARK: - public extension CGRect { - public var center: CGPoint { + var center: CGPoint { return CGPoint(x: midX, y: midY) } - public var topLeft: CGPoint { + var topLeft: CGPoint { return origin } - public var topRight: CGPoint { + var topRight: CGPoint { return CGPoint(x: maxX, y: minY) } - public var bottomLeft: CGPoint { + var bottomLeft: CGPoint { return CGPoint(x: minX, y: maxY) } - public var bottomRight: CGPoint { + var bottomRight: CGPoint { return CGPoint(x: maxX, y: maxY) } } @@ -331,23 +322,23 @@ public extension CGRect { // MARK: - public extension CGAffineTransform { - public static func translate(_ point: CGPoint) -> CGAffineTransform { + static func translate(_ point: CGPoint) -> CGAffineTransform { return CGAffineTransform(translationX: point.x, y: point.y) } - public static func scale(_ scaling: CGFloat) -> CGAffineTransform { + static func scale(_ scaling: CGFloat) -> CGAffineTransform { return CGAffineTransform(scaleX: scaling, y: scaling) } - public func translate(_ point: CGPoint) -> CGAffineTransform { + func translate(_ point: CGPoint) -> CGAffineTransform { return translatedBy(x: point.x, y: point.y) } - public func scale(_ scaling: CGFloat) -> CGAffineTransform { + func scale(_ scaling: CGFloat) -> CGAffineTransform { return scaledBy(x: scaling, y: scaling) } - public func rotate(_ angleRadians: CGFloat) -> CGAffineTransform { + func rotate(_ angleRadians: CGFloat) -> CGAffineTransform { return rotated(by: angleRadians) } } @@ -355,7 +346,7 @@ public extension CGAffineTransform { // MARK: - public extension UIBezierPath { - public func addRegion(withPoints points: [CGPoint]) { + func addRegion(withPoints points: [CGPoint]) { guard let first = points.first else { owsFailDebug("No points.") return @@ -370,37 +361,33 @@ public extension UIBezierPath { // MARK: - +@objc public extension UIBarButtonItem { - @objc - public convenience init(image: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + convenience init(image: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { self.init(image: image, style: style, target: target, action: action) self.accessibilityIdentifier = accessibilityIdentifier } - @objc - public convenience init(image: UIImage?, landscapeImagePhone: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + convenience init(image: UIImage?, landscapeImagePhone: UIImage?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { self.init(image: image, landscapeImagePhone: landscapeImagePhone, style: style, target: target, action: action) self.accessibilityIdentifier = accessibilityIdentifier } - @objc - public convenience init(title: String?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { + convenience init(title: String?, style: UIBarButtonItem.Style, target: Any?, action: Selector?, accessibilityIdentifier: String) { self.init(title: title, style: style, target: target, action: action) self.accessibilityIdentifier = accessibilityIdentifier } - @objc - public convenience init(barButtonSystemItem systemItem: UIBarButtonItem.SystemItem, target: Any?, action: Selector?, accessibilityIdentifier: String) { + convenience init(barButtonSystemItem systemItem: UIBarButtonItem.SystemItem, target: Any?, action: Selector?, accessibilityIdentifier: String) { self.init(barButtonSystemItem: systemItem, target: target, action: action) self.accessibilityIdentifier = accessibilityIdentifier } - @objc - public convenience init(customView: UIView, accessibilityIdentifier: String) { + convenience init(customView: UIView, accessibilityIdentifier: String) { self.init(customView: customView) self.accessibilityIdentifier = accessibilityIdentifier From c84c478957752a653020f4ed3b2c7d7197b953c1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 15 Apr 2019 14:44:04 -0600 Subject: [PATCH 477/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 22 +++-- .../translations/az.lproj/Localizable.strings | 46 ++++++---- .../translations/bg.lproj/Localizable.strings | 22 +++-- .../translations/bs.lproj/Localizable.strings | 18 +++- .../translations/ca.lproj/Localizable.strings | 18 +++- .../translations/cs.lproj/Localizable.strings | 18 +++- .../translations/da.lproj/Localizable.strings | 44 ++++++---- .../translations/de.lproj/Localizable.strings | 18 +++- .../translations/el.lproj/Localizable.strings | 18 +++- .../translations/es.lproj/Localizable.strings | 18 +++- .../translations/et.lproj/Localizable.strings | 18 +++- .../translations/fa.lproj/Localizable.strings | 18 +++- .../translations/fi.lproj/Localizable.strings | 20 ++++- .../fil.lproj/Localizable.strings | 18 +++- .../translations/fr.lproj/Localizable.strings | 18 +++- .../translations/gl.lproj/Localizable.strings | 18 +++- .../translations/he.lproj/Localizable.strings | 18 +++- .../translations/hr.lproj/Localizable.strings | 18 +++- .../translations/hu.lproj/Localizable.strings | 18 +++- .../translations/id.lproj/Localizable.strings | 18 +++- .../translations/it.lproj/Localizable.strings | 18 +++- .../translations/ja.lproj/Localizable.strings | 18 +++- .../translations/km.lproj/Localizable.strings | 28 +++++-- .../translations/ko.lproj/Localizable.strings | 18 +++- .../translations/lt.lproj/Localizable.strings | 18 +++- .../translations/lv.lproj/Localizable.strings | 18 +++- .../translations/mk.lproj/Localizable.strings | 18 +++- .../translations/my.lproj/Localizable.strings | 18 +++- .../translations/nb.lproj/Localizable.strings | 84 +++++++++++-------- .../nb_NO.lproj/Localizable.strings | 18 +++- .../translations/nl.lproj/Localizable.strings | 18 +++- .../translations/pl.lproj/Localizable.strings | 18 +++- .../pt_BR.lproj/Localizable.strings | 20 ++++- .../pt_PT.lproj/Localizable.strings | 18 +++- .../translations/ro.lproj/Localizable.strings | 18 +++- .../translations/ru.lproj/Localizable.strings | 18 +++- .../translations/sl.lproj/Localizable.strings | 18 +++- .../translations/sn.lproj/Localizable.strings | 18 +++- .../translations/sq.lproj/Localizable.strings | 18 +++- .../translations/sv.lproj/Localizable.strings | 20 ++++- .../translations/th.lproj/Localizable.strings | 18 +++- .../translations/tr.lproj/Localizable.strings | 18 +++- .../translations/uk.lproj/Localizable.strings | 18 +++- .../zh_CN.lproj/Localizable.strings | 18 +++- .../zh_TW.lproj/Localizable.strings | 18 +++- 45 files changed, 747 insertions(+), 207 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index da167ad04..9a39be69c 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -201,7 +201,7 @@ "BACKUP_IMPORT_PHASE_CONFIGURATION" = "تهيئة النسخة الاحتياطية"; /* Indicates that the backup import data is being downloaded. */ -"BACKUP_IMPORT_PHASE_DOWNLOAD" = "Downloading Backup Data"; +"BACKUP_IMPORT_PHASE_DOWNLOAD" = "تحميل بيانات النسخة الاحتياطية"; /* Indicates that the backup import data is being finalized. */ "BACKUP_IMPORT_PHASE_FINALIZING" = "Finalizing Backup"; @@ -219,7 +219,7 @@ "BACKUP_RESTORE_DECISION_TITLE" = "Backup Available"; /* Label for the backup restore description. */ -"BACKUP_RESTORE_DESCRIPTION" = "Restoring Backup"; +"BACKUP_RESTORE_DESCRIPTION" = "استعادة النسخة الاحتياطية"; /* Label for the backup restore progress. */ "BACKUP_RESTORE_PROGRESS" = "Progress"; @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "دعوة عبر الرسائل القصيرة: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "إرسال دعوة لصديق عن طريق رسالة نصية غير آمنة؟"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "تم تنشيط التحايل على الرقابة إستنادًا إلى رقم الهاتف الخاص بحسابك."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "لا يمكن تفعيل التحايل على الرقابة إلا عند الإتصال بالإنترنت."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "استعادة من اﻷرشيف"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "مرفق غير معلوم"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "المستخدم ليس ضمن أسماء قائمة جهات الاتصال التابعة لك. هل ترغب في حظر هذا المستخدم؟"; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 79d309cf4..198a860e0 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -249,10 +249,10 @@ "BLOCK_LIST_BLOCKED_USERS_SECTION" = "Blocked Users"; /* Button label for the 'unblock' button */ -"BLOCK_LIST_UNBLOCK_BUTTON" = "Unblock"; +"BLOCK_LIST_UNBLOCK_BUTTON" = "Kilidi aç"; /* Action sheet body when confirming you want to unblock a group */ -"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Existing members will be able to add you to the group again."; +"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Mövcud üzvlər səni yenə də qrupa əlavə edə biləcəklər."; /* Action sheet title when confirming you want to unblock a group. */ "BLOCK_LIST_UNBLOCK_GROUP_TITLE" = "Unblock This Group?"; @@ -516,10 +516,10 @@ "CONTACT_FIELD_MIDDLE_NAME" = "Middle Name"; /* Label for the 'name prefix' field of a contact. */ -"CONTACT_FIELD_NAME_PREFIX" = "Prefix"; +"CONTACT_FIELD_NAME_PREFIX" = "Prefiks"; /* Label for the 'name suffix' field of a contact. */ -"CONTACT_FIELD_NAME_SUFFIX" = "Suffix"; +"CONTACT_FIELD_NAME_SUFFIX" = "Sufiks"; /* Label for the 'organization' field of a contact. */ "CONTACT_FIELD_ORGANIZATION" = "Organization"; @@ -690,7 +690,7 @@ "DATE_MINUTES_AGO_FORMAT" = "%@ Min Ago"; /* The present; the current time. */ -"DATE_NOW" = "Now"; +"DATE_NOW" = "İndi"; /* The current day. */ "DATE_TODAY" = "Bu gün"; @@ -1276,7 +1276,7 @@ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_READ" = "Read"; /* Status label for messages which are sending. */ -"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING" = "Sending"; +"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING" = "Göndərilir"; /* Status label for messages which are sent. */ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Sent"; @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Find Contacts by Phone Number"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "Nəzərində Saxla"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "You may have received messages while your %@ was restarting."; @@ -1536,7 +1536,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Profilini quraşdır"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; @@ -1608,7 +1608,7 @@ "PHONE_NUMBER_TYPE_AND_INDEX_NAME_FORMAT" = "%@ %@"; /* Label for 'Home' phone numbers. */ -"PHONE_NUMBER_TYPE_HOME" = "Home"; +"PHONE_NUMBER_TYPE_HOME" = "Ev"; /* Label for 'HomeFAX' phone numbers. */ "PHONE_NUMBER_TYPE_HOME_FAX" = "Home Fax"; @@ -1620,10 +1620,10 @@ "PHONE_NUMBER_TYPE_MAIN" = "Main"; /* Label for 'Mobile' phone numbers. */ -"PHONE_NUMBER_TYPE_MOBILE" = "Mobile"; +"PHONE_NUMBER_TYPE_MOBILE" = "Mobil"; /* Label for 'Other' phone numbers. */ -"PHONE_NUMBER_TYPE_OTHER" = "Other"; +"PHONE_NUMBER_TYPE_OTHER" = "Digər"; /* Label for 'Other FAX' phone numbers. */ "PHONE_NUMBER_TYPE_OTHER_FAX" = "Other Fax"; @@ -1635,7 +1635,7 @@ "PHONE_NUMBER_TYPE_UNKNOWN" = "Unknown"; /* Label for 'Work' phone numbers. */ -"PHONE_NUMBER_TYPE_WORK" = "Work"; +"PHONE_NUMBER_TYPE_WORK" = "İş"; /* Label for 'Work FAX' phone numbers. */ "PHONE_NUMBER_TYPE_WORK_FAX" = "Work Fax"; @@ -1737,7 +1737,7 @@ "PROFILE_VIEW_PROFILE_DESCRIPTION_LINK" = "Tap here to learn more."; /* Label for the profile name field of the profile view. */ -"PROFILE_VIEW_PROFILE_NAME_FIELD" = "Profile Name"; +"PROFILE_VIEW_PROFILE_NAME_FIELD" = "Profil Adı"; /* Button to save the profile view in the profile view. */ "PROFILE_VIEW_SAVE_BUTTON" = "Yaddaşa yaz"; @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Təhlükəsiz olmayan SMS-lə dostu dəvət edək?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2316,7 +2331,7 @@ "SMS_INVITE_BODY" = "Səni Signalı yükləməyə dəvət edirəm! Link belədir:"; /* Label for the 'no sound' option that allows users to disable sounds for notifications, etc. */ -"SOUNDS_NONE" = "None"; +"SOUNDS_NONE" = "Heç biri"; /* Alert body after verifying privacy with {{other user's name}} */ "SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Your safety number with %@ matches. You can mark this contact as verified."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Arxivləşdirmə"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Bilinməyən qoşma"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "User not in your contacts. Would you like to block this user?"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index 7cd50b240..9e0955640 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -1467,7 +1467,7 @@ "NO_CONTACTS_SEARCH_BY_PHONE_NUMBER" = "Намери Контакти по Телефонен Номер"; /* Label for 1:1 conversation with yourself. */ -"NOTE_TO_SELF" = "Note to Self"; +"NOTE_TO_SELF" = "\nНапомняне за мен"; /* Lock screen notification text presented after user powers on their device without unlocking. Embeds {{device model}} (either 'iPad' or 'iPhone') */ "NOTIFICATION_BODY_PHONE_LOCKED_FORMAT" = "You may have received messages while your %@ was restarting."; @@ -1536,7 +1536,7 @@ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; /* Title of the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_TITLE" = "Set up your profile"; +"ONBOARDING_PROFILE_TITLE" = "Настройте профила си"; /* Link to the 'terms and privacy policy' in the 'onboarding splash' view. */ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Terms & Privacy Policy"; @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Покани с СМС: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Покани прияте с не толкова сигурният СМС?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Заобикалянето на цензурата е активирано въз основа на телефонния номер на профила Ви."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Заобикалянето на цензура може да се активира само когато е свързано към интернет."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Разархивиране"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Непознат прикачен файл"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Потребителят не е в контактите ви. Искате ли да блокирате този потребител?"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index edbe43c95..7956a3d4a 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Pošalji pozivnicu putem SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Pošalji pozivnicu prijatelju putem obične SMS poruke?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Korištenje cenzure je aktivirano na temelju telefonskog broja vašeg računa."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Korištenje cenzure može se aktivirati samo ako ste povezani na internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Dearhiviraj"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Nepoznat prilog"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Korisnik nije u vašim kontaktima. Da li želite blokirati ovog korisnika?"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index f3864f93c..d92effd59 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Convida via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar a un amic via SMS segur?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "L'elusió de la censura s'ha activat basant-se en el número de telèfon del vostre compte."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "L'elusió de la censura només es pot activar si esteu connectat a internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Restaura"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Fitxer adjunt desconegut"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "L'usuari no és als vostres contactes. Voleu blocar-lo?"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index dea30dc85..d027700ff 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Pozvat pomocí SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Pozvat kamaráda přes zabezpečenou SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Obcházení cenzury bylo aktivováno na základě vašeho telefonního čísla."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Obcházení cenzury může být povoleno pouze pokud jste připojeni k internetu."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Zrušit archivaci"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Neznámá příloha"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Uživatel není ve vašich kontaktech. Chcete ho zablokovat?"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 7c4432ca0..b9594608a 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Tilføj en billedtekst..."; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Billedtekst"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Fil type: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Afvis opkald"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap her for at tænde video"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Afslut opkald"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Slet samtale?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Ingen resultater"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 resultat"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%daf %d matcher"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Samtale indstillingér"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Opret ny kontakt"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Søg samtale"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Tryk for at ændre"; @@ -1509,7 +1509,7 @@ "ONBOARDING_2FA_TITLE" = "Registreringslås"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Tilføj lidt personlighed til dine meddelelser"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Giv tilladelse"; @@ -1521,7 +1521,7 @@ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nu"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal kan gøre opmærksom på når du modtager en meddelelse (og hvem den er fra)"; /* Title of the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_TITLE" = "Indtast dit telefonnummer for at komme i gang"; @@ -1530,7 +1530,7 @@ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldigt nummer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiler er end-to-end krypteret, og Signal´s service kan ikke tilgå informationerne"; /* Placeholder text for the profile name in the 'onboarding profile' view. */ "ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Dit navn"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Arbejdsfax"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Ikke muligt at tage billede"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Ikke muligt at tage billede"; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Fejl ved konfiguration af kamera"; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Unavngivet album"; @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invitér via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invitér en ven via ukrypteret SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censur omgåelse er blevet aktiveret baseret på din kontos telefonnummer."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censuromgåelse kan kun aktiveres, når den er tilsluttet internettet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Til indbakke"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Ukendt vedhæftning"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Bruger er ikke i dine kontakter. Vil du blokere denne bruger?"; @@ -2484,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hej sikre videoopkald!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal vil snart kræve IOS 10 eller nyere. Opdater venligst i Indstillinger -> Generelt -> Software opdatering"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Opgrader iOS"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 397d3482f..b5970fff6 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Via SMS einladen: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Einen Freund per ungesicherter SMS einladen?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Die Zensurumgehung wurde aufgrund der Rufnummer deines Benutzerkontos aktiviert."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Die Zensurumgehung kann nur bei bestehender Internetverbindung aktiviert werden."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "In Eingang verschieben"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Unbekannter Anhang"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Benutzer nicht in deinen Kontakten. Möchtest du diesen Benutzer blockieren?"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index c1b56923d..5b9f2a413 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Πρόσκληση μέσω SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Πρόσκληση φίλου μέσω μη-ασφαλούς SMS;"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Η παράκαμψη λογοκρισίας ενεργοποιήθηκε βάσει του αριθμού τηλεφώνου του λογαριασμού σας."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Η παράκαμψη λογοκρισίας μπορεί να ενεργοποιηθεί μόνο όταν υπάρχει σύνδεση στο Internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Κατάργηση Αρχειοθέτησης"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Άγνωστο συνημμένο"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Ο χρήστης δεν είναι στις επαφές σας. Θέλετε να τον αποκλείσετε;"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 05df85c82..57ab7acbe 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invitar por SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "¿Invitar a un contacto vía SMS no cifrado? "; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "La opción para evitar censura se ha activado automáticamente basándose en el número de teléfono de tu cuenta de Signal."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "La opción para evitar censura sólo se puede activar con acceso a internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Desarchivar"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Adjunto de tipo desconocido"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Este número no está en tus contactos. ¿Deseas bloquearlo?"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index a60a0490e..39ea12d82 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Kutsu SMS abil: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Kas kutsuda sõber ebaturvalise SMS abil?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Tsenseerimisest möödahiilimine on aktiveeritud sinu konto telefoninumbri järgi."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Tsenseerimisest möödahiilimist saab aktiveerida ainult Internetis olles."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Eemalda arhiivist"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Tundmatu manus"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "See kasutaja pole sinu kontaktides. Kas sa soovid blokeerida seda kasutajat?"; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index d0fe38470..873f130c7 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "دعوت با پیامک: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "دعوت یک دوست با پیامک غیر امن؟"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "دورزدن سانسور بر اساس شماره تلفن شما فعال شد."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "دورزدن سانسور تنها در زمان اتصال به اینترنت فعال خواهد شد."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "خارج کردن از آرشیو"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "ضمیمه معتبر نمی‌باشد"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "کاربر در لیست مخاطبین شما وجود ندارد. آیا مایل به مسدود کردن این کاربر هستید؟"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 04d77f9d3..8b78d1384 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Kutsu tekstiviestillä: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Kutsu ystävä suojaamattomalla tekstiviestillä?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Puhelinnumerosi sijaintiin perustuva sensuurin kiertäminen otettu käyttöön."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sensuurin kiertäminen toimii ainoastaan silloin, kun olet yhteydessä internetiin."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Palauta arkistosta"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Tuntematon liitetiedosto"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Käyttäjä ei ole yhteystiedoissasi. Haluatko estää tämän käyttäjän?"; @@ -2484,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hei, turvalliset videopuhelut!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Lähitulevaisuudessa Signal tulee vaatimaan iOS 10:ä tai uudempaa. Voit päivittää käyttöjärjestelmäsi Asetukset ohjelmasta >> Yleiset >> Ohjelmistopäivitys"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Päivitä iOS"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 399ed5608..bf583c574 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invite a friend via insecure SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Unarchive"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Unknown attachment"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "User not in your contacts. Would you like to block this user?"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index b15c5d920..fbf0b3fbd 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Inviter par texto : %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Inviter un ami par texto non sécurisé ?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Le contournement de la censure a été activé d’après le numéro de téléphone de votre compte."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Le contournement de la censure ne peut être activé qu’une fois connecté à Internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Désarchiver"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Fichier joint inconnu"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "L’utilisateur n’est pas dans vos contacts. Voulez-vous bloquer cet utilisateur ?"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 9e7a8bc9b..6627186cf 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Convidar vía SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar unha amizade vía SMS non segura?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Desarquivar"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Anexo descoñecido"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "O usuario non está na túa listaxe de contactos. Desexas bloquealo?"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 2f65d5746..959dfc755 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "הזמן דרך מסרון: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "להזמין חבר דרך מסרון בלתי־מאובטח?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "עקיפת צנזורה שופעלה על סמך מספר הטלפון של חשבונך."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "עקיפת צנזורה יכולה להשתפעל בעת התחברות לאינטרנט."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "הוצא מארכיון"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "צרופה בלתי ידועה"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "המשתמש אינו באנשי הקשר שלך. האם תרצה לחסום משתמש זה?"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 3469fc488..127f78681 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Pošalji pozivnicu putem SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Pošalji pozivnicu prijatelju putem obične SMS poruke?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Korištenje cenzure je aktivirano na temelju telefonskog broja vašeg računa."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Korištenje cenzure može se aktivirati samo ako ste povezani na internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Dearhiviraj"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Nepoznat privitak"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Korisnik nije u vašim kontaktima. Da li želite blokirati ovog korisnika?"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index a4324de7a..9343f3c8e 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Szeretnéd meghívni egy barátodat nem-biztonságos SMS-en keresztül?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Archívumból visszahelyezés"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Ismeretlen melléklet"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Ez a felhasználó nem szerepel a kontaktjaid között. Szeretnéd letiltani?"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index a74a16caf..da8b66666 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Undang melalui %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Undang teman melalui SMS tidak aman?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Pengelabuan Penyensoran telah diaktifkan berdasarkan nomor telepon Anda."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Penghindar penyensoran hanya dapat diaktifkan ketika terkoneksi dengan internet"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Tidak Terarsip"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Lampiran tidak dikenal"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Pengguna tidak terdapat di dalam kontak. Apakah Anda ingin memblokir pengguna ini?"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 3a54d1f89..7415b1f13 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invita %@ via SMS"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invita un amico usando un SMS insicuro?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Il raggiro della censura è stato attivato sulla base del tuo numero telefonico."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Il raggiro della censura può essere attivato solo se connessi ad Internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Ripristina"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Allegato non riconosciuto"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Utente non presente nei contatti. Vuoi bloccare questo utente?"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index 434f0f0fe..4b5f6bb08 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "SMSで招待する：%@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "安全性の低いSMSで招待しますか？"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "検閲回避が登録番号のもとで有効になりました"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "検閲回避はネットに接続されているときのみ有効となります"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "受信箱に戻す"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "開封不能な添付ファイル"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "連絡先リストにない人です。ブロックしますか？"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index 027b7a4c7..d7447f943 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -282,7 +282,7 @@ "BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT" = "%@ ត្រូវបានបើកសោរ។"; /* Alert body after unblocking a group. */ -"BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Existing members can now add you to the group again."; +"BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "សមាជិកក្នុងក្រុមអាចបបញ្ជូលអ្នកក្នុងក្រុមនេះម្តងទៀត"; /* Action sheet that will block an unknown user. */ "BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION" = "ហាមឃាត់"; @@ -309,7 +309,7 @@ "CALL_AGAIN_BUTTON_TITLE" = "ហៅម្តងទៀត"; /* Alert message when calling and permissions for microphone are missing */ -"CALL_AUDIO_PERMISSION_MESSAGE" = "You can enable microphone access in the iOS Settings app to make calls and record voice messages in Signal."; +"CALL_AUDIO_PERMISSION_MESSAGE" = "អ្នកអាចបើកការអនុញ្ញាតចូលទៅប្រើប្រាស់មីក្រូហ្វូន នៅក្នុងការកំណត់របស់ iOS app ដើម្បីអាចធ្វើការហៅ និងថតសារជាសំឡេងក្នុង Signal"; /* Alert title when calling and permissions for microphone are missing */ "CALL_AUDIO_PERMISSION_TITLE" = "ទាមទារចូលប្រើប្រាស់ម៉ៃក្រូហ្វូន"; @@ -1072,7 +1072,7 @@ "HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "ចាប់ផ្តើមការសន្ទនាលើកដំបូងនៅទីនេះ។"; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "គ្មានលទ្ធផលក្នងការស្វែងរកសំរាប់ %@"; @@ -1084,7 +1084,7 @@ "HOME_VIEW_TITLE_INBOX" = "Signal"; /* Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared. */ -"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "You can't share more than %@ items."; +"IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT" = "អ្នកមិនអាចចែករំលែកលើសពី %@ ។"; /* alert title */ "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS" = "បរាជ័យក្នុងការជ្រើសរើសឯកសារភ្ជាប់។"; @@ -1376,7 +1376,7 @@ /* Alert body Alert body when camera is not authorized */ -"MISSING_CAMERA_PERMISSION_MESSAGE" = "You can enable camera access in the iOS Settings app to make video calls in Signal."; +"MISSING_CAMERA_PERMISSION_MESSAGE" = "អ្នកអាចបើកការអនុញ្ញាតចូលប្រើប្រាស់កាមេរ៉ា​ក្នុងការកំណត់របស់​ iOS ដើម្បើហៅជាវីដេអូក្នុង​ Signal។"; /* Alert title Alert title when camera is not authorized */ @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "អញ្ជើញតាមសារ SMS៖ %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "អញ្ជើញមិត្តភក្តិតាម SMS ដែលមិនមានសុវត្ថិភាព?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "ការចៀសវាងការឃ្លាំមើល ត្រូវបានដំណើរការ ផ្អែកលើលេខទូរស័ព្ទរបស់គណនីអ្នក។"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "ការចៀសវាងការឃ្លាំមើល អាចត្រូវបានដំណើរការ ពេលភ្ជាប់អ៊ីនធើណេតតែប៉ុណ្ណោះ។"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "បិទបណ្ណសារ"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "ឯកសារភ្ជាប់មិនស្គាល់"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "អ្នកប្រើប្រាស់មិននៅក្នុងបញ្ជីទំនាក់ទំនងទេ។ តើអ្នកចង់ហាមឃាត់អ្នកប្រើប្រាស់នេះទេ?"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index fdc7bab2f..5415561f6 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "불안전한 SMS를 통해 친구를 초대하겠습니까?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Unarchive"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Unknown attachment"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "User not in your contacts. Would you like to block this user?"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 49513dece..5171ead32 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Siųsti pakvietimą SMS žinute: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Pakviesti draugą, naudojant nesaugiąją SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Cenzūravimo apėjimas buvo aktyvuotas pagal jūsų paskyros telefono numerį."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Cenzūravimo apėjimas gali būti aktyvuotas tik prisijungus prie interneto."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Nebearchyvuoti"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Nežinomas priedas"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Naudotojo nėra jūsų kontaktų sąraše. Ar norėtumėte užblokuoti šį naudotoją?"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index ac282799a..6b515df68 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Vai uzaicināt draugu, izmantojot nedrošu SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Unarchive"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Unknown attachment"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "User not in your contacts. Would you like to block this user?"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 53def1970..9a460e743 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invite via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Поканете пријател преку несигурен СМС?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censorship circumvention has been activated based on your account's phone number."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censorship circumvention can only be activated when connected to the internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Одархивирај"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Непознат прилог"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Корисникот го нема во вашите контакти. Дали сакате да го блокирате корисникот?"; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index 657572c92..0d3714e20 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "SMS မှ တဆင့် ဖိတ်ပါ %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "သူငယ်ချင်းကို မလုံခြုံသည့် SMS မှ ဖိတ်မလား?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "သင့်ကိုယ်ပိုင်စာရင်း ၏ဖုန်းနံပါတ်အပေါ် မူတည်၍ ဆင်ဆာဖြတ်တောက်မှုရှောင်ကွင်းခြင်းကို ပြုလုပ်ပြီး ဖြစ်သည်။"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "ဆင်ဆာဖြတ်တောက်မှု ရှောင်ကွင်းခြင်းကို အင်တာနက် ချိတ်ထားမှသာ သုံးလို့ရမည်။"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "မှတ်တမ်းထဲမှ ပြန်ထုတ်ပါ"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "မသိသော ပူးတွဲဖိုင်"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "ဤလူသည် သင်၏ လိပ်စာစာရင်းထဲတွင် မရှိပါ။ သူ့ကို ဘလော့လုပ်ချင်ပါသလား?"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index 22e457e5b..5604bbfba 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -96,7 +96,7 @@ "ATTACHMENT_APPROVAL_CAPTION_PLACEHOLDER" = "Legg til tekst…"; /* Title for 'caption' mode of the attachment approval view. */ -"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Caption"; +"ATTACHMENT_APPROVAL_CAPTION_TITLE" = "Tekst"; /* Format string for file extension label in call interstitial view */ "ATTACHMENT_APPROVAL_FILE_EXTENSION_FORMAT" = "Filtype: %@"; @@ -351,7 +351,7 @@ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Avvis innkommende samtale"; /* tooltip label when remote party has enabled their video */ -"CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; +"CALL_VIEW_ENABLE_VIDEO_HINT" = "Trykk her for å skru på video"; /* Accessibility label for hang up call */ "CALL_VIEW_HANGUP_LABEL" = "Avslutt samtale"; @@ -564,13 +564,13 @@ "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Slett samtale?"; /* keyboard toolbar label when no messages match the search string */ -"CONVERSATION_SEARCH_NO_RESULTS" = "No matches"; +"CONVERSATION_SEARCH_NO_RESULTS" = "Ingen treff"; /* keyboard toolbar label when exactly 1 message matches the search string */ -"CONVERSATION_SEARCH_ONE_RESULT" = "1 match"; +"CONVERSATION_SEARCH_ONE_RESULT" = "1 treff"; /* keyboard toolbar label when more than 1 message matches the search string. Embeds {{number/position of the 'currently viewed' result}} and the {{total number of results}} */ -"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%d of %d matches"; +"CONVERSATION_SEARCH_RESULTS_FORMAT" = "%dav %dtreff"; /* title for conversation settings screen */ "CONVERSATION_SETTINGS" = "Samtaleinnstillinger"; @@ -624,7 +624,7 @@ "CONVERSATION_SETTINGS_NEW_CONTACT" = "Opprett ny kontakt"; /* Table cell label in conversation settings which returns the user to the conversation with 'search mode' activated */ -"CONVERSATION_SETTINGS_SEARCH" = "Search Conversation"; +"CONVERSATION_SETTINGS_SEARCH" = "Søk i samtale"; /* Label for button that opens conversation settings. */ "CONVERSATION_SETTINGS_TAP_TO_CHANGE" = "Trykk for å endre"; @@ -1063,16 +1063,16 @@ "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Søk"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Noen av dine kontakter er allerede på Signal, inkludert %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have 2 Signal contacts. Embeds {{The names of 2 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_2_CONTACTS_FORMAT" = "Noen av dine kontakter er allerede på Signal, inkludert %@ og %@."; /* Format string for a label offering to start a new conversation with your contacts, if you have at least 3 Signal contacts. Embeds {{The names of 3 of your Signal contacts}}. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Some of your contacts are already on Signal, including %@, %@ and %@"; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_3_CONTACTS_FORMAT" = "Noen av dine kontakter er allerede på Signal, inkludert %@, %@og %@"; /* A label offering to start a new conversation with your contacts, if you have no Signal contacts. */ -"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start your first conversation here."; +"HOME_VIEW_FIRST_CONVERSATION_OFFER_NO_CONTACTS" = "Start din første samtale her."; /* Format string when search returns no results. Embeds {{search term}} */ "HOME_VIEW_SEARCH_NO_RESULTS_FORMAT" = "Ingen resultater funnet for '%@'"; @@ -1500,28 +1500,28 @@ "ONBOARDING_2FA_EXPLANATION_1" = "Dette telefonnummeret er låst i Signal med registreringslås. Skriv inn registrerings-PIN."; /* The first explanation in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_EXPLANATION_2" = "Your Registration Lock PIN is separate from the automated verification code that was sent to your phone during the last step."; +"ONBOARDING_2FA_EXPLANATION_2" = "Din registrerte låsePIN er separat fra den automatiserte koden som ble sendt til din telefon i forrige steg."; /* Label for the 'forgot 2FA PIN' link in the 'onboarding 2FA' view. */ -"ONBOARDING_2FA_FORGOT_PIN_LINK" = "I forgot my PIN"; +"ONBOARDING_2FA_FORGOT_PIN_LINK" = "Jeg har glemt PIN-koden min"; /* Title of the 'onboarding 2FA' view. */ "ONBOARDING_2FA_TITLE" = "Registreringslås"; /* Title of the 'onboarding Captcha' view. */ -"ONBOARDING_CAPTCHA_TITLE" = "Add a touch of humanity to your messages"; +"ONBOARDING_CAPTCHA_TITLE" = "Legg til til menneskelighet i dine meldinger"; /* Label for the 'give access' button in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Enable Permissions"; +"ONBOARDING_PERMISSIONS_ENABLE_PERMISSIONS_BUTTON" = "Slå på tillatelser"; /* Explanation in the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_EXPLANATION" = "Your contact information is always transmitted securely."; +"ONBOARDING_PERMISSIONS_EXPLANATION" = "Din kontaktinformasjon overføres alltid sikkert."; /* Label for the 'not now' button in the 'onboarding permissions' view. */ "ONBOARDING_PERMISSIONS_NOT_NOW_BUTTON" = "Ikke nå"; /* Title of the 'onboarding permissions' view. */ -"ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; +"ONBOARDING_PERMISSIONS_TITLE" = "Signal kan gi deg beskjed når du får en melding (og si hvem den er fra)"; /* Title of the 'onboarding phone number' view. */ "ONBOARDING_PHONE_NUMBER_TITLE" = "Skriv inn telefonnummeret ditt for å komme i gang"; @@ -1530,10 +1530,10 @@ "ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Ugyldig nummer"; /* Explanation in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; +"ONBOARDING_PROFILE_EXPLANATION" = "Signal-profiler er kryptert fra ende til ende og Signal-tjenesten har aldri tilgang til denne informasjonen."; /* Placeholder text for the profile name in the 'onboarding profile' view. */ -"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Your Name"; +"ONBOARDING_PROFILE_NAME_PLACEHOLDER" = "Ditt navn"; /* Title of the 'onboarding profile' view. */ "ONBOARDING_PROFILE_TITLE" = "Sett opp din profil"; @@ -1542,40 +1542,40 @@ "ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY" = "Vilkår & personvernerklæring"; /* Title of the 'onboarding splash' view. */ -"ONBOARDING_SPLASH_TITLE" = "Take privacy with you.\nBe yourself in every message."; +"ONBOARDING_SPLASH_TITLE" = "Ta personvernet med deg.\nVær deg selv i hver melding."; /* Label for the link that lets users change their phone number in the onboarding views. */ "ONBOARDING_VERIFICATION_BACK_LINK" = "Feil nummer?"; /* Format for the label of the 'sent code' label of the 'onboarding verification' view. Embeds {{the time until the code can be resent}}. */ -"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "I didn't get a code (available in %@)"; +"ONBOARDING_VERIFICATION_CODE_COUNTDOWN_FORMAT" = "Jeg fikk ingen kode (tilgjengelig i %@)"; /* Label indicating that the verification code is incorrect in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_INVALID_CODE" = "This code is incorrect"; +"ONBOARDING_VERIFICATION_INVALID_CODE" = "Denne koden er feil"; /* Label for link that can be used when the original code did not arrive. */ -"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "I didn't get a code"; +"ONBOARDING_VERIFICATION_ORIGINAL_CODE_MISSING_LINK" = "Jeg fikk ingen kode"; /* Message for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Please ensure that you have cellular service and can receive SMS messages."; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_MESSAGE" = "Sjekk at du har dekning og kan ta i mot SMS meldinger."; /* Title for the 'resend code' alert in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "No code?"; +"ONBOARDING_VERIFICATION_RESEND_CODE_ALERT_TITLE" = "Ingen kode?"; /* Label for the 'resend code by SMS' button in the 'onboarding verification' view. */ -"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Resend code"; +"ONBOARDING_VERIFICATION_RESEND_CODE_BY_SMS_BUTTON" = "Send kode på nytt"; /* Label for the 'resend code by voice' button in the 'onboarding verification' view. */ "ONBOARDING_VERIFICATION_RESEND_CODE_BY_VOICE_BUTTON" = "Ring meg i stedet"; /* Label for link that can be used when the resent code did not arrive. */ -"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Still no code?"; +"ONBOARDING_VERIFICATION_RESENT_CODE_MISSING_LINK" = "Fortsatt ingen kode?"; /* Format for the title of the 'onboarding verification' view. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Enter the code we sent to %@"; +"ONBOARDING_VERIFICATION_TITLE_DEFAULT_FORMAT" = "Tast inn koden vi sendte til %@"; /* Format for the title of the 'onboarding verification' view after the verification code has been resent. Embeds {{the user's phone number}}. */ -"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "We just resent a code to %@"; +"ONBOARDING_VERIFICATION_TITLE_RESENT_FORMAT" = "Vi sendte akkurat kode på nytt til %@"; /* Button text which opens the settings app */ "OPEN_SETTINGS_BUTTON" = "Innstillinger"; @@ -1641,13 +1641,13 @@ "PHONE_NUMBER_TYPE_WORK_FAX" = "Fax arbeid"; /* alert title, generic error preventing user from capturing a photo */ -"PHOTO_CAPTURE_GENERIC_ERROR" = "Unable to capture image."; +"PHOTO_CAPTURE_GENERIC_ERROR" = "Kan ikke lagre bilde."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Unable to capture image."; +"PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE" = "Kan ikke lagre bilde."; /* alert title */ -"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Failed to configure camera."; +"PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA" = "Kunne ikke konfigurere kamera."; /* label for system photo collections which have no name. */ "PHOTO_PICKER_UNNAMED_COLLECTION" = "Ikke navngitt album"; @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Inviter via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Inviter en venn via usikker SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Sensur-unngåelse har blitt aktivert basert på telefonnummeret som kontoen er registrert med."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sensur-unngåelse kan bare bli skrudd på når telefonen er koblet til internett."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Hent frem fra arkiv"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Ukjent vedlegg"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Brukeren er ikke i kontaktlisten din. Vil du blokkere denne brukeren?"; @@ -2388,7 +2400,7 @@ "UNKNOWN_CONTACT_NAME" = "Ukjent kontakt"; /* Label for unknown countries. */ -"UNKNOWN_COUNTRY_NAME" = "Unknown Country"; +"UNKNOWN_COUNTRY_NAME" = "Ukjent land"; /* Indicates an unknown or unrecognizable value. */ "UNKNOWN_VALUE" = "Ukjent"; @@ -2484,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Velkommen til sikre videosamtaler!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal vil snart kreve iOS 10 eller nyere. Vennligst oppgrader i Innstilinger >> Geenrelt >> Oppdatering."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Oppgrader iOS"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index fd1707701..fbfab0beb 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Inviter via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Inviter en venn via usikker SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Sensur-unngåelse har blitt aktivert basert på telefonnummeret som kontoen er registrert med."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sensur-unngåelse kan bare bli skrudd på når telefonen er koblet til internett."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Hent frem fra arkiv"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Ukjent vedlegg"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Brukeren er ikke i kontaktlisten din. Vil du blokkere denne brukeren?"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 3f0c5c6c8..5cfae5f5f 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Uitnodigen via sms: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Kennis uitnodigen via onbeveiligde sms?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censuuromzeiling is ingeschakeld gebaseerd op het telefoonnummer van je account."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censuuromzeiling kan alleen worden ingeschakeld als je verbonden bent met het internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Dearchiveren"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Onbekende bijlage"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Gebruiker staat niet in contacten. Wil je deze gebruiker blokkeren?"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index b52e06fb3..356b2e00f 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Zaproś przez SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Zaproś znajomego przez niezaszyfrowany SMS:"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Omijanie cenzury włączone dla twojego numeru telefonu i konta Signal. "; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Aktywacja omijania cenzury wymaga połączenia z Internetem."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Zdezarchiwizuj"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Nieznany załącznik"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Ten użytkownik nie należy do twoich kontaktów. Czy chcesz go zablokować?"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 1e515027e..6a2b03071 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Convide via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar amigos usando SMS que não é seguro?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A driblagem de censura foi ativada tendo como base o número de telefone da sua conta."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "A driblagem de censura pode ser ativada somente durante uma conexão à Internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Desarquivar"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Anexo desconhecido"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "O usuário não está em seus contatos. Gostaria de bloqueá-lo?"; @@ -2484,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Olá, chamadas seguras em vídeo!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal irá em breve exigir iOS 10 ou mais recente. Favor atualizar em Configurações app >> Geral >> Atualização de Software"; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Atualize o iOS"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 9fe6a3821..5504e022c 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Enviar convite via SMS para: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar um amigo por SMS inseguro?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A circunscrição de censura foi ativada baseada no número de telefone da sua conta."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Circunscrição de censura só pode ser ativada enquanto existe ligação à internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Desarquivar"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Anexo desconhecido"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Este utilizador não está nos seus contactos. Deseja bloquear este utilizador?"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index cedb11182..9657b519a 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invită prin SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invită un prieten prin SMS nesecurizat?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Ocolirea cenzurii a fost activată pe baza numărului tău de telefon."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Ocolirea cenzurii poate fi activată numai atunci când ești conectat la internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Dezarhivare"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Atașament necunoscut"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Utilizatorul nu este în lista ta de contacte. Vrei să-l blochezi?"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index f921301e3..2efb29d19 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Пригласить %@ по SMS"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Пригласить друга через незащищенное SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Обход цензуры (блокировки провайдером) был активирован на основе номера телефона Вашего аккаунта."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Обход цензуры (блокировки провайдером) может быть активирован только при подключении к интернету."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Разархивировать"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Неизвестное вложение"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Пользователя нет в Вашем списке контактов. Заблокировать его?"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 94c013d0f..76bb87a72 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Povabi preko sporočila SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Povabim prijatelja preko nezaščitenega sporočila SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Zaščita pred cenzuro je bila vklopljena v povezavi s telefonsko številko vašega računa."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Zaščito pred cenzuro je mogoče vklopiti le kadar ste povezani z internetom."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Premakni v nabiralnik"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Priponka neznanega tipa"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Uporabnik ni med vašimi stiki. Bi ga želeli blokirati?"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 76dcb1c16..b35f541c2 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Koka neSMS:%@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Koka shamwari kupfurikidza netsamba isina kukwedekerwa?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Kunzvenga kuvharirwa kwabatidzwa maererano nenhamba yerunhare iri paaccount yako."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Kunzvenga kuvharirwa kunogona kutangwa kana wakabatira paInternet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Bvisa mudura"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Batanidzwa risingazivikanwe"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Munhu uyu haasi mumacontacts,uri kuda kumuvharira here?"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 777308ab1..5222b7ced 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Ftojeni me SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Të ftohet një shok përmes SMS-s të pasigurt?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Anashkalimi i censurimit është aktivizuar për numrin e telefonit të llogarisë tuaj."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Anashkalimi i censurimit mund të aktivizohet vetëm kur jeni i lidhur në internet."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Çarkivoje "; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Bashkëngjitje e panjohur"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Përdoruesi s’gjendet në kontaktet tuaja. Doni të bllokohet ky përdorues?"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index b671cbd2d..a294a4477 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Bjud in via SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Bjud in en vän via osäkert SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Kringgå censur har aktiverats baserat på ditt kontos telefonnummer"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Kringgå censur kan bara aktiveras när då internet är tillgängligt"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Avarkivera"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Okänd bifogad fil"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Användaren finns inte i dina kontakter. Vill du blockera användaren?"; @@ -2484,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallå säkra videosamtal!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal kommer snart att kräva iOS 10 eller senare. Vänligen uppgradera i Inställningar-app >> Allmänt >> Programuppdatering."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Uppgradera iOS"; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index 4486d34fd..f3e600700 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "เชิญผ่านเอสเอ็มเอส: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "เชิญเพื่อนผ่านเอสเอ็มเอสที่ไม่ปลอดภัยหรือ"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "การหลบเลี่ยงการปิดกั้นข้อมูลถูกเปิดใช้ เนื่องจากหมายเลขโทรศัพท์ของบัญชีของคุณ"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "การหลบเลี่ยงการปิดกั้นข้อมูลจะใช้ได้ก็ต่อเมื่อเชื่อมต่อกับอินเทอร์เน็ต"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "นำออกจากที่เก็บถาวร"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "ไฟล์แนบที่ไม่รู้จัก"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "ผู้ใช้ไม่อยู่ในผู้ติดต่อของคุณ คุณต้องการบล็อกผู้ใช้นี้หรือไม่"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index c4443f218..9b0915e9d 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "SMS ile davet et: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Güvensiz SMS ile arkadaş davet edilsin mi?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Sansür atlatma hesabınızın telefon numarasına bağlı olarak etkinleştirildi."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sansür atlatma sadece İnternet'e bağlıyken etkinleştirilebilir."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Arşivden çıkart"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Bilinmeyen eklenti"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Kullanıcı rehberinizde değil. Bu kullanıcıyı engellemek ister misiniz?"; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index 81e779a34..f19a0fc58 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Запросити через SMS: %@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Запросити друга незахищеним SMS?"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Обхід цензури було активовано враховуючи номер мобільного цього акаунта."; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Обхід цензури може бути активований лише при підключенні до інтернету."; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "Розархівувати"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "Невідоме вкладення"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "Користувача немає у ваших контактах. Бажаєте заблокувати цього користувача?"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 7d7ecdc5f..0774741de 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "通过短信邀请：%@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "通过非加密的短信邀请好友？"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "已根据您的电话号码启动审查规避。"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "审查规避只能在联网时启动。"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "未存档"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "未知附件"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "该用户不在你的联系人里，是否将其加入黑名单？"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index ba66a5d17..c001069f6 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -1991,6 +1991,18 @@ /* Text for button to send a Signal invite via SMS. %@ is placeholder for the recipient's phone number. */ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "透過簡訊邀請：%@"; +/* alert title when user attempts to leave the send media flow when they have an in-progress album */ +"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; + +/* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; + +/* alert action when the user decides not to cancel the media flow after all. */ +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; + /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "透過未加密的簡訊邀請朋友？"; @@ -2021,6 +2033,9 @@ /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "已根據你的電話號碼啟動審查規避。"; +/* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; + /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "審查規避只能在連上網路時啟動。"; @@ -2378,9 +2393,6 @@ /* Pressing this button moves an archived thread from the archive back to the inbox */ "UNARCHIVE_ACTION" = "解除封存"; -/* In Inbox view, last message label for thread with corrupted attachment. */ -"UNKNOWN_ATTACHMENT_LABEL" = "未知的附件檔案"; - /* Message shown in conversation view that offers to block an unknown user. */ "UNKNOWN_CONTACT_BLOCK_OFFER" = "此使用者不在你的聯絡資訊名單中，是否要封鎖該使用者？"; From dfdde8cb7ad21af6e6c94d9286004de49030980b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 15 Apr 2019 14:45:17 -0600 Subject: [PATCH 478/493] "Bump build to 2.39.0.1." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 8eb62c2b3..ea985a2ef 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.39.0.0 + 2.39.0.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index ff2f53293..3c20d56ba 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.39.0 CFBundleVersion - 2.39.0.0 + 2.39.0.1 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From a44712ec3dbf72da4ed5b85e51fceea11be7d199 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 19 Apr 2019 15:33:18 -0600 Subject: [PATCH 479/493] update info.plist --- Signal/Signal-Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index ea985a2ef..34e8654fc 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -5,9 +5,9 @@ BuildDetails CarthageVersion - 0.32.0 + 0.33.0 OSXVersion - 10.14.3 + 10.14.4 WebRTCCommit 1445d719bf05280270e9f77576f80f973fd847f8 M73 From 415526fc9b286ead97a3b791ce0027f0b04af062 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 18 Apr 2019 16:27:48 -0400 Subject: [PATCH 480/493] Refine request padding. --- .../src/Network/ContentProxy.swift | 68 ++++++------------- 1 file changed, 19 insertions(+), 49 deletions(-) diff --git a/SignalServiceKit/src/Network/ContentProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift index 6dd135b79..29693e402 100644 --- a/SignalServiceKit/src/Network/ContentProxy.swift +++ b/SignalServiceKit/src/Network/ContentProxy.swift @@ -3,6 +3,7 @@ // import Foundation +import SignalCoreKit @objc public class ContentProxy: NSObject { @@ -102,56 +103,25 @@ public class ContentProxy: NSObject { } public class func padRequestSize(request: inout URLRequest) { - guard let sizeEstimate: UInt = estimateRequestSize(request: request) else { - owsFailDebug("Could not estimate request size.") - return - } - // We pad the estimated size to an even multiple of paddingQuantum (plus the - // extra ": " and "\r\n"). The exact size doesn't matter so long as the - // padding is consistent. - let paddingQuantum: UInt = 1024 - let paddingSize = paddingQuantum - (sizeEstimate % paddingQuantum) - let padding = String(repeating: ".", count: Int(paddingSize)) + // Generate 1-64 chars of padding. + let paddingLength: Int = 1 + Int(arc4random_uniform(64)) + let padding = self.padding(withLength: paddingLength) + assert(padding.count == paddingLength) request.addValue(padding, forHTTPHeaderField: "X-SignalPadding") } - private class func estimateRequestSize(request: URLRequest) -> UInt? { - // iOS doesn't offer an exact way to measure request sizes on the wire, - // but we can reliably estimate request sizes using the "knowns", e.g. - // HTTP method, path, querystring, headers. The "unknowns" should be - // consistent between requests. - - guard let url = request.url?.absoluteString else { - owsFailDebug("Request missing URL.") - return nil + private class func padding(withLength length: Int) -> String { + // Pick a random ASCII char in the range 48-122 + var result = "" + // Min and max values, inclusive. + let minValue: UInt32 = 48 + let maxValue: UInt32 = 122 + for _ in 1...length { + let value = minValue + arc4random_uniform(maxValue - minValue + 1) + assert(value >= minValue) + assert(value <= maxValue) + result += String(UnicodeScalar(UInt8(value))) } - guard let components = URLComponents(string: url) else { - owsFailDebug("Request has invalid URL.") - return nil - } - - var result: Int = 0 - - if let httpMethod = request.httpMethod { - result += httpMethod.count - } - result += components.percentEncodedPath.count - if let percentEncodedQuery = components.percentEncodedQuery { - result += percentEncodedQuery.count - } - if let allHTTPHeaderFields = request.allHTTPHeaderFields { - for (key, value) in allHTTPHeaderFields { - // Each header has 4 extra bytes: - // - // * Two for the key/value separator ": " - // * Two for "\r\n", the line break in the HTTP protocol spec. - result += key.count + value.count + 4 - } - } else { - owsFailDebug("Request has no headers.") - } - if let httpBody = request.httpBody { - result += httpBody.count - } - return UInt(result) - }} + return result + } +} From 11af22432d7be322fa62ac200289b8d934e4086e Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Fri, 12 Apr 2019 15:58:26 -0700 Subject: [PATCH 481/493] Add pinterest domain and asset domains for link preview support --- Signal/translations/en.lproj/Localizable.strings | 2 +- .../src/Messages/Interactions/OWSLinkPreview.swift | 12 ++++++++++-- .../tests/Messages/OWSLinkPreviewTest.swift | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 509b5e69a..3fbe2f448 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 470ad790a..862995525 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -311,7 +311,12 @@ public class OWSLinkPreview: MTLModel { // Instagram "instagram.com", "www.instagram.com", - "m.instagram.com" + "m.instagram.com", + + // Pinterest + "pinterest.com", + "www.pinterest.com", + "pin.it" ] // For media domains, we DO NOT require an exact match - subdomains are allowed. @@ -327,7 +332,10 @@ public class OWSLinkPreview: MTLModel { // Instagram "cdninstagram.com", - "fbcdn.net" + "fbcdn.net", + + // Pinterest + "pinimg.com" ] private static let protocolWhitelist = [ diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index f6e0c86e5..8c9776e44 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -130,6 +130,9 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://www.instagram.com/p/BrgpsUjF9Jo/?utm_source=ig_web_button_share_sheet")) XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://www.instagram.com/p/BrgpsUjF9Jo/?utm_source=ig_share_sheet&igshid=94c7ihqjfmbm")) XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://imgur.com/gallery/igHOwDM")) + XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://pinterest.com/something")) + XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://www.pinterest.com/something")) + XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://pin.it/something")) // Strip trailing commas. XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://imgur.com/gallery/igHOwDM,")) @@ -171,6 +174,7 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { XCTAssertTrue(OWSLinkPreview.isValidMediaUrl("https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com")) XCTAssertTrue(OWSLinkPreview.isValidMediaUrl("https://scontent-mia3-2.cdninstagram.com/vp/9035a7d6b32e6f840856661e4a11e3cf/5CFC285B/t51.2885-15/e35/47690175_2275988962411653_1145978227188801192_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com")) XCTAssertTrue(OWSLinkPreview.isValidMediaUrl("https://i.imgur.com/PYiyLv1.jpg?fbplay")) + XCTAssertTrue(OWSLinkPreview.isValidMediaUrl("https://pinimg.com/something")) } func testPreviewUrlForMessageBodyText() { From 4060bf0ca47d05ec1f0843d22840c0b5c194d41f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 22 Apr 2019 15:29:20 -0400 Subject: [PATCH 482/493] Add Pinterest link previews. --- .../src/Messages/Interactions/OWSLinkPreview.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift index 862995525..e395204eb 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift +++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift @@ -788,7 +788,7 @@ public class OWSLinkPreview: MTLModel { } var title: String? - if let rawTitle = NSRegularExpression.parseFirstMatch(pattern: "", + if let rawTitle = NSRegularExpression.parseFirstMatch(pattern: "]*content\\s*=\\s*\"(.*?)\"\\s*[^>]*/?>", text: linkText, options: .dotMatchesLineSeparators) { if let decodedTitle = decodeHTMLEntities(inString: rawTitle) { @@ -801,7 +801,7 @@ public class OWSLinkPreview: MTLModel { Logger.verbose("title: \(String(describing: title))") - guard let rawImageUrlString = NSRegularExpression.parseFirstMatch(pattern: "", text: linkText) else { + guard let rawImageUrlString = NSRegularExpression.parseFirstMatch(pattern: "]*content\\s*=\\s*\"(.*?)\"[^>]*/?>", text: linkText) else { return OWSLinkPreviewContents(title: title) } guard let imageUrlString = decodeHTMLEntities(inString: rawImageUrlString)?.ows_stripped() else { From 85aa976101dcafbd5c683d8556dad2ef26fdcc72 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 22 Apr 2019 15:33:50 -0400 Subject: [PATCH 483/493] Add Pinterest link previews. --- .../tests/Messages/OWSLinkPreviewTest.swift | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift index 8c9776e44..97ce56fb7 100644 --- a/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift +++ b/SignalServiceKit/tests/Messages/OWSLinkPreviewTest.swift @@ -133,6 +133,7 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://pinterest.com/something")) XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://www.pinterest.com/something")) XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://pin.it/something")) + XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://www.pinterest.com/ohjoy/recipes/")) // Strip trailing commas. XCTAssertTrue(OWSLinkPreview.isValidLinkUrl("https://imgur.com/gallery/igHOwDM,")) @@ -456,6 +457,27 @@ class OWSLinkPreviewTest: SSKBaseTestSwift { self.waitForExpectations(timeout: 5.0, handler: nil) } + func testLinkParsingWithRealData10() { + let expectation = self.expectation(description: "link download and parsing") + + OWSLinkPreview.downloadLink(url: "https://www.pinterest.com/ohjoy/recipes/") + .done { (linkData) in + let content = try! OWSLinkPreview.parse(linkData: linkData) + XCTAssertNotNil(content) + + XCTAssertEqual(content.title, "Recipes") + XCTAssertEqual(content.imageUrl, "https://i.pinimg.com/200x150/76/ae/9d/76ae9d3056dbcb295924fdd5db6951c6.jpg") + + expectation.fulfill() + }.catch { (error) in + Logger.error("error: \(error)") + XCTFail("Unexpected error: \(error)") + expectation.fulfill() + }.retainUntilComplete() + + self.waitForExpectations(timeout: 5.0, handler: nil) + } + // When using regular expressions to parse link titles, we need to use // String.utf16.count, not String.count in the range. func testRegexRanges() { From 3eb28df967e94bcd4c7c74da871b6cbaf9126b57 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 19 Apr 2019 15:33:00 -0600 Subject: [PATCH 484/493] swap icon order --- .../src/ViewControllers/Photos/PhotoCaptureViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift index 8c1d03968..6ce39f862 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCaptureViewController.swift @@ -101,7 +101,7 @@ class PhotoCaptureViewController: OWSViewController { let fixedSpace = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) fixedSpace.width = 16 - navigationItem.rightBarButtonItems = [flashModeControl.barButtonItem, fixedSpace, switchCameraControl.barButtonItem] + navigationItem.rightBarButtonItems = [switchCameraControl.barButtonItem, fixedSpace, flashModeControl.barButtonItem] } } From 4af9fa6789d831df0c3f6eb2dd3ef438ffbb72a6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 19 Apr 2019 16:21:00 -0600 Subject: [PATCH 485/493] "add more" as rail cell --- .../ic_plus_24.imageset/Contents.json | 23 +++++++ .../ic_plus_24.imageset/plus-24@1x.png | Bin 0 -> 168 bytes .../ic_plus_24.imageset/plus-24@2x.png | Bin 0 -> 248 bytes .../ic_plus_24.imageset/plus-24@3x.png | Bin 0 -> 348 bytes .../MediaPageViewController.swift | 24 ++++--- ...AttachmentApprovalInputAccessoryView.swift | 5 +- .../AttachmentApprovalViewController.swift | 60 ++++++++++++------ .../AttachmentItemCollection.swift | 20 +++++- .../AttachmentTextToolbar.swift | 28 +------- SignalMessaging/Views/GalleryRailView.swift | 44 ++++++------- 10 files changed, 125 insertions(+), 79 deletions(-) create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@2x.png create mode 100644 Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/Contents.json b/Signal/Images.xcassets/ic_plus_24.imageset/Contents.json new file mode 100644 index 000000000..72e7fa1e2 --- /dev/null +++ b/Signal/Images.xcassets/ic_plus_24.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "plus-24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "plus-24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "plus-24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png b/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..5a11ea9a1d129a1dbf19f106db44dd7ba5faebb8 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0pkS1z zi(`mKXY!x_|LvJ|8HIg))vq$SxgBFx=uvEB=h2hzi89Dy409;ve&EVFQSt*H$#5Cl>NYP zm`Q1oE6eY!mrb*O$OjZR%woPGv)~znDfRJJK8PFVEm@e~)3!%Pww@ zf427{4=ny3>2d61`A@-Fmn9#}J{M!0(lV*G#Z8Cd_nJ-X&0g8n^{xWz=R+8|_4`|| hkjH{St7RD;u*)zk3gf%b%LH^agQu&X%Q~loCICf4Ui$z5 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png b/Signal/Images.xcassets/ic_plus_24.imageset/plus-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d63c48c7145d591dab4fc313375b0df64da993ba GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fq{|F z)5S5QV$R!J2YH(u1RO3(COb}PP>t-=jbxJT4b0bhY~Oh7&-8+usx37MmJVT|E6TId zza%LnfZ+$>Mx)|$XQFaHZ+I+T!OqA`Dr_t^ul=z6ex^j{45MO+JKmvpxAWcom-y|E zpB>M?jjL|$k+MrV;BdfULF^LcM@Btwp6~RyALhQ_?MTrB%bYCc($&A@W^KP(^u)5H r=14;$snFqf{e*janqk`PIy>0^d{X4{+hKPY7+egVu6{1-oD!M UIView { + let imageView = UIImageView() + imageView.contentMode = .scaleAspectFill + getRailImage().map { [weak imageView] image in + guard let imageView = imageView else { return } + imageView.image = image + }.retainUntilComplete() + + return imageView } - public func getRailImage() -> Promise { - let (guarantee, fulfill) = Guarantee.pending() - if let image = self.thumbnailImage(async: { fulfill($0) }) { - fulfill(image) + public func getRailImage() -> Guarantee { + return Guarantee { fulfill in + if let image = self.thumbnailImage(async: { fulfill($0) }) { + fulfill(image) + } } - - return Promise(guarantee) } } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift index eadc0afda..95084efc3 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalInputAccessoryView.swift @@ -32,9 +32,8 @@ class AttachmentApprovalInputAccessoryView: UIView { let kGalleryRailViewHeight: CGFloat = 72 - required init(isAddMoreVisible: Bool) { - attachmentTextToolbar = AttachmentTextToolbar(isAddMoreVisible: isAddMoreVisible) - + required init() { + attachmentTextToolbar = AttachmentTextToolbar() attachmentCaptionToolbar = AttachmentCaptionToolbar() galleryRailView = GalleryRailView() diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 9480f2ecf..3cae70819 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -40,6 +40,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC // MARK: - Properties private let mode: AttachmentApprovalViewControllerMode + private let isAddMoreVisible: Bool public weak var approvalDelegate: AttachmentApprovalViewControllerDelegate? @@ -64,7 +65,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC assert(attachments.count > 0) self.mode = mode let attachmentItems = attachments.map { SignalAttachmentItem(attachment: $0 )} - self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems) + self.isAddMoreVisible = mode == .sharedNavigation + + self.attachmentItemCollection = AttachmentItemCollection(attachmentItems: attachmentItems, isAddMoreVisible: isAddMoreVisible) let options: [UIPageViewController.OptionsKey: Any] = [.interPageSpacing: kSpacingBetweenItems] super.init(transitionStyle: .scroll, @@ -118,8 +121,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC } lazy var bottomToolView: AttachmentApprovalInputAccessoryView = { - let isAddMoreVisible = mode == .sharedNavigation - let bottomToolView = AttachmentApprovalInputAccessoryView(isAddMoreVisible: isAddMoreVisible) + let bottomToolView = AttachmentApprovalInputAccessoryView() bottomToolView.delegate = self return bottomToolView @@ -536,17 +538,31 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC return } - let cellViewBuilder: () -> ApprovalRailCellView = { [weak self] in - let cell = ApprovalRailCellView() - cell.approvalRailCellDelegate = self - return cell + let cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView = { [weak self] railItem in + switch railItem { + case is AddMoreRailItem: + return GalleryRailCellView() + case is SignalAttachmentItem: + let cell = ApprovalRailCellView() + cell.approvalRailCellDelegate = self + return cell + default: + owsFailDebug("unexpted rail item type: \(railItem)") + return GalleryRailCellView() + } } galleryRailView.configureCellViews(itemProvider: attachmentItemCollection, focusedItem: currentItem, cellViewBuilder: cellViewBuilder) - galleryRailView.isHidden = attachmentItemCollection.attachmentItems.count < 2 + if isAddMoreVisible { + galleryRailView.isHidden = false + } else if attachmentItemCollection.attachmentItems.count > 1 { + galleryRailView.isHidden = false + } else { + galleryRailView.isHidden = true + } } let attachmentItemCollection: AttachmentItemCollection @@ -699,10 +715,6 @@ extension AttachmentApprovalViewController: AttachmentTextToolbarDelegate { approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: attachmentTextToolbar.messageText) } - func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) { - self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self) - } - func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar) { approvalDelegate?.attachmentApproval(self, didChangeMessageText: attachmentTextToolbar.messageText) } @@ -723,12 +735,15 @@ extension AttachmentApprovalViewController: AttachmentPrepViewControllerDelegate // MARK: GalleryRail extension SignalAttachmentItem: GalleryRailItem { - var aspectRatio: CGFloat { - return self.imageSize.aspectRatio - } + func buildRailItemView() -> UIView { + let imageView = UIImageView() + imageView.contentMode = .scaleAspectFill - func getRailImage() -> Promise { - return self.getThumbnailImage() + getThumbnailImage().map { image in + imageView.image = image + }.retainUntilComplete() + + return imageView } } @@ -736,7 +751,11 @@ extension SignalAttachmentItem: GalleryRailItem { extension AttachmentItemCollection: GalleryRailItemProvider { var railItems: [GalleryRailItem] { - return self.attachmentItems + if isAddMoreVisible { + return self.attachmentItems + [AddMoreRailItem()] + } else { + return self.attachmentItems + } } } @@ -744,6 +763,11 @@ extension AttachmentItemCollection: GalleryRailItemProvider { extension AttachmentApprovalViewController: GalleryRailViewDelegate { public func galleryRailView(_ galleryRailView: GalleryRailView, didTapItem imageRailItem: GalleryRailItem) { + if imageRailItem is AddMoreRailItem { + self.approvalDelegate?.attachmentApprovalDidTapAddMore?(self) + return + } + guard let targetItem = imageRailItem as? SignalAttachmentItem else { owsFailDebug("unexpected imageRailItem: \(imageRailItem)") return diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift index deee60f3e..f03ff9472 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentItemCollection.swift @@ -5,6 +5,22 @@ import Foundation import PromiseKit +class AddMoreRailItem: GalleryRailItem { + func buildRailItemView() -> UIView { + let view = UIView() + view.backgroundColor = UIColor.black.withAlphaComponent(0.33) + + let iconView = UIImageView(image: #imageLiteral(resourceName: "ic_plus_24").withRenderingMode(.alwaysTemplate)) + iconView.tintColor = .ows_white + view.addSubview(iconView) + iconView.setCompressionResistanceHigh() + iconView.setContentHuggingHigh() + iconView.autoCenterInSuperview() + + return view + } +} + class SignalAttachmentItem: Hashable { enum SignalAttachmentItemError: Error { @@ -75,8 +91,10 @@ class SignalAttachmentItem: Hashable { class AttachmentItemCollection { private (set) var attachmentItems: [SignalAttachmentItem] - init(attachmentItems: [SignalAttachmentItem]) { + let isAddMoreVisible: Bool + init(attachmentItems: [SignalAttachmentItem], isAddMoreVisible: Bool) { self.attachmentItems = attachmentItems + self.isAddMoreVisible = isAddMoreVisible } func itemAfter(item: SignalAttachmentItem) -> SignalAttachmentItem? { diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift index d475d2a0b..4e3c1d387 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentTextToolbar.swift @@ -12,7 +12,6 @@ protocol AttachmentTextToolbarDelegate: class { func attachmentTextToolbarDidTapSend(_ attachmentTextToolbar: AttachmentTextToolbar) func attachmentTextToolbarDidBeginEditing(_ attachmentTextToolbar: AttachmentTextToolbar) func attachmentTextToolbarDidEndEditing(_ attachmentTextToolbar: AttachmentTextToolbar) - func attachmentTextToolbarDidAddMore(_ attachmentTextToolbar: AttachmentTextToolbar) func attachmentTextToolbarDidChange(_ attachmentTextToolbar: AttachmentTextToolbar) } @@ -44,8 +43,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { // MARK: - Initializers - init(isAddMoreVisible: Bool) { - self.addMoreButton = UIButton(type: .custom) + init() { self.sendButton = UIButton(type: .system) self.textViewHeight = kMinTextViewHeight @@ -59,11 +57,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { textView.delegate = self - let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) - addMoreButton.setImage(addMoreIcon, for: .normal) - addMoreButton.tintColor = Theme.darkThemePrimaryColor - addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) - let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") sendButton.setTitle(sendTitle, for: .normal) sendButton.addTarget(self, action: #selector(didTapSend), for: .touchUpInside) @@ -79,10 +72,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { contentView.addSubview(sendButton) contentView.addSubview(textContainer) contentView.addSubview(lengthLimitLabel) - if isAddMoreVisible { - contentView.addSubview(addMoreButton) - } - addSubview(contentView) contentView.autoPinEdgesToSuperviewEdges() @@ -105,15 +94,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { // I believe this is a bug in PureLayout. Filed here: https://github.com/PureLayout/PureLayout/issues/209 textContainer.autoPinEdge(toSuperviewMargin: .top) textContainer.autoPinEdge(toSuperviewMargin: .bottom) - if isAddMoreVisible { - addMoreButton.autoPinEdge(toSuperviewMargin: .left) - textContainer.autoPinEdge(.left, to: .right, of: addMoreButton, withOffset: kToolbarMargin) - addMoreButton.autoAlignAxis(.horizontal, toSameAxisOf: sendButton) - addMoreButton.setContentHuggingHigh() - addMoreButton.setCompressionResistanceHigh() - } else { - textContainer.autoPinEdge(toSuperviewMargin: .left) - } + textContainer.autoPinEdge(toSuperviewMargin: .left) sendButton.autoPinEdge(.left, to: .right, of: textContainer, withOffset: kToolbarMargin) sendButton.autoPinEdge(.bottom, to: .bottom, of: textContainer, withOffset: -3) @@ -145,7 +126,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { // MARK: - Subviews - private let addMoreButton: UIButton private let sendButton: UIButton private lazy var lengthLimitLabel: UILabel = { @@ -221,10 +201,6 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { attachmentTextToolbarDelegate?.attachmentTextToolbarDidTapSend(self) } - @objc func didTapAddMore() { - attachmentTextToolbarDelegate?.attachmentTextToolbarDidAddMore(self) - } - // MARK: - UITextViewDelegate public func textViewDidChange(_ textView: UITextView) { diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index 4227c108c..c05097ad1 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -9,8 +9,7 @@ public protocol GalleryRailItemProvider: class { } public protocol GalleryRailItem: class { - func getRailImage() -> Promise - var aspectRatio: CGFloat { get } + func buildRailItemView() -> UIView } protocol GalleryRailCellViewDelegate: class { @@ -26,8 +25,8 @@ public class GalleryRailCellView: UIView { layoutMargins = .zero clipsToBounds = false - addSubview(imageView) - imageView.autoPinEdgesToSuperviewMargins() + addSubview(contentContainer) + contentContainer.autoPinEdgesToSuperviewMargins() let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap(sender:))) addGestureRecognizer(tapGesture) @@ -52,11 +51,13 @@ public class GalleryRailCellView: UIView { self.item = item self.delegate = delegate - item.getRailImage().done { image in - guard self.item === item else { return } + for view in contentContainer.subviews { + view.removeFromSuperview() + } - self.imageView.image = image - }.retainUntilComplete() + let itemView = item.buildRailItemView() + contentContainer.addSubview(itemView) + itemView.autoPinEdgesToSuperviewEdges() } // MARK: Selected @@ -72,24 +73,23 @@ public class GalleryRailCellView: UIView { layoutMargins = UIEdgeInsets(top: 0, left: cellBorderWidth, bottom: 0, right: cellBorderWidth) if isSelected { - imageView.layer.borderColor = Theme.galleryHighlightColor.cgColor - imageView.layer.borderWidth = cellBorderWidth - imageView.layer.cornerRadius = cellBorderWidth + contentContainer.layer.borderColor = Theme.galleryHighlightColor.cgColor + contentContainer.layer.borderWidth = cellBorderWidth + contentContainer.layer.cornerRadius = cellBorderWidth } else { - imageView.layer.borderWidth = 0 - imageView.layer.cornerRadius = 0 + contentContainer.layer.borderWidth = 0 + contentContainer.layer.cornerRadius = 0 } } // MARK: Subview Helpers - let imageView: UIImageView = { - let imageView = UIImageView() - imageView.contentMode = .scaleAspectFill - imageView.autoPinToSquareAspectRatio() - imageView.clipsToBounds = true + let contentContainer: UIView = { + let view = UIView() + view.autoPinToSquareAspectRatio() + view.clipsToBounds = true - return imageView + return view }() } @@ -124,7 +124,7 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate { // MARK: Public - public func configureCellViews(itemProvider: GalleryRailItemProvider?, focusedItem: GalleryRailItem?, cellViewBuilder: () -> GalleryRailCellView) { + public func configureCellViews(itemProvider: GalleryRailItemProvider?, focusedItem: GalleryRailItem?, cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView) { let animationDuration: TimeInterval = 0.2 guard let itemProvider = itemProvider else { @@ -210,9 +210,9 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate { return scrollView }() - private func buildCellViews(items: [GalleryRailItem], cellViewBuilder: () -> GalleryRailCellView) -> [GalleryRailCellView] { + private func buildCellViews(items: [GalleryRailItem], cellViewBuilder: (GalleryRailItem) -> GalleryRailCellView) -> [GalleryRailCellView] { return items.map { item in - let cellView = cellViewBuilder() + let cellView = cellViewBuilder(item) cellView.configure(item: item, delegate: self) return cellView } From a1e008f9305a784a6baabef3d875ad1805dfe523 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 19 Apr 2019 16:41:36 -0600 Subject: [PATCH 486/493] apply new rounding/highlight design --- SignalMessaging/Views/GalleryRailView.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SignalMessaging/Views/GalleryRailView.swift b/SignalMessaging/Views/GalleryRailView.swift index c05097ad1..62f6daa2e 100644 --- a/SignalMessaging/Views/GalleryRailView.swift +++ b/SignalMessaging/Views/GalleryRailView.swift @@ -27,6 +27,7 @@ public class GalleryRailCellView: UIView { clipsToBounds = false addSubview(contentContainer) contentContainer.autoPinEdgesToSuperviewMargins() + contentContainer.layer.cornerRadius = 4.8 let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTap(sender:))) addGestureRecognizer(tapGesture) @@ -64,7 +65,7 @@ public class GalleryRailCellView: UIView { private(set) var isSelected: Bool = false - public let cellBorderWidth: CGFloat = 2 + public let cellBorderWidth: CGFloat = 3 func setIsSelected(_ isSelected: Bool) { self.isSelected = isSelected @@ -75,10 +76,8 @@ public class GalleryRailCellView: UIView { if isSelected { contentContainer.layer.borderColor = Theme.galleryHighlightColor.cgColor contentContainer.layer.borderWidth = cellBorderWidth - contentContainer.layer.cornerRadius = cellBorderWidth } else { contentContainer.layer.borderWidth = 0 - contentContainer.layer.cornerRadius = 0 } } @@ -179,7 +178,7 @@ public class GalleryRailView: UIView, GalleryRailCellViewDelegate { self.cellViews = cellViews let stackView = UIStackView(arrangedSubviews: cellViews) stackView.axis = .horizontal - stackView.spacing = 2 + stackView.spacing = 0 stackView.clipsToBounds = false scrollView.addSubview(stackView) From fbc0b5f8ee374a4632ebe2a35ec81a08cc85fdf5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 11:25:22 -0700 Subject: [PATCH 487/493] Add padding below last row of media content --- .../Photos/ImagePickerController.swift | 18 +++++++++++++----- .../Photos/SendMediaNavigationController.swift | 7 ++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 04777933e..7d197bd6e 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -56,6 +56,9 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat collectionView.register(PhotoGridViewCell.self, forCellWithReuseIdentifier: PhotoGridViewCell.reuseIdentifier) + // ensure images at the end of the list can be scrolled above the bottom buttons + let bottomButtonInset = -1 * SendMediaNavigationController.bottomButtonsCenterOffset + SendMediaNavigationController.bottomButtonWidth / 2 + collectionView.contentInset.bottom = bottomButtonInset + 8 view.backgroundColor = .ows_gray95 // The PhotoCaptureVC needs a shadow behind it's cancel button, so we use a custom icon. @@ -235,6 +238,10 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat // MARK: + var lastPageYOffset: CGFloat { + return collectionView.contentSize.height - collectionView.frame.height + } + func scrollToBottom(animated: Bool) { self.view.layoutIfNeeded() @@ -243,12 +250,13 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat return } - let lastSection = collectionView.numberOfSections - 1 - let lastItem = collectionView.numberOfItems(inSection: lastSection) - 1 - if lastSection >= 0 && lastItem >= 0 { - let lastIndex = IndexPath(item: lastItem, section: lastSection) - collectionView.scrollToItem(at: lastIndex, at: .bottom, animated: animated) + let yOffset = lastPageYOffset + guard yOffset > 0 else { + // less than 1 page of content. Do not offset. + return } + + collectionView.setContentOffset(CGPoint(x: 0, y: yOffset), animated: animated) } private func reloadDataAndRestoreSelection() { diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 4aaf1cb4a..94d8c17d8 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -135,6 +135,7 @@ class SendMediaNavigationController: OWSNavigationController { } // MARK: Views + public static let bottomButtonWidth: CGFloat = 44 private lazy var doneButton: DoneButton = { let button = DoneButton() @@ -149,7 +150,7 @@ class SendMediaNavigationController: OWSNavigationController { tintColor: .ows_gray60, block: { [weak self] in self?.didTapBatchModeButton() }) - let width: CGFloat = 44 + let width: CGFloat = type(of: self).bottomButtonWidth button.autoSetDimensions(to: CGSize(width: width, height: width)) button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) @@ -164,7 +165,7 @@ class SendMediaNavigationController: OWSNavigationController { tintColor: .ows_gray60, block: { [weak self] in self?.didTapCameraModeButton() }) - let width: CGFloat = 44 + let width: CGFloat = type(of: self).bottomButtonWidth button.autoSetDimensions(to: CGSize(width: width, height: width)) button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) @@ -179,7 +180,7 @@ class SendMediaNavigationController: OWSNavigationController { tintColor: .ows_gray60, block: { [weak self] in self?.didTapMediaLibraryModeButton() }) - let width: CGFloat = 44 + let width: CGFloat = type(of: self).bottomButtonWidth button.autoSetDimensions(to: CGSize(width: width, height: width)) button.layer.cornerRadius = width / 2 button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) From abd4e0dd41632c6cb1f8545f80782b7603b2abae Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 11:35:26 -0700 Subject: [PATCH 488/493] ensure scrolled to the _Very_ bottom. --- .../Photos/ImagePickerController.swift | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 7d197bd6e..5912c7214 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -259,6 +259,21 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat collectionView.setContentOffset(CGPoint(x: 0, y: yOffset), animated: animated) } + override func scrollViewDidScroll(_ scrollView: UIScrollView) { + if !hasEverAppeared, collectionView.contentOffset.y != lastPageYOffset { + // We initially want the user to be scrolled to the bottom of the media library content. + // However, at least on iOS12, we were finding that when the view finally presented, + // the content was not *quite* to the bottom (~20px above it). + // + // Debugging shows that initially we have the correct offset, but that *something* is + // causing the content to adjust *after* viewWillAppear and viewSafeAreaInsetsDidChange. + // Because that something results in `scrollViewDidScroll` we re-adjust the content + // insets to the bottom. + Logger.debug("adjusting scroll offset back to bottom") + scrollToBottom(animated: false) + } + } + private func reloadDataAndRestoreSelection() { guard let collectionView = collectionView else { owsFailDebug("Missing collectionView.") From 41977f74374f3509ca58a34fd96df473e35e9878 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 12:08:34 -0700 Subject: [PATCH 489/493] snappier presentation of collection picker --- .../Photos/ImagePickerController.swift | 38 +++++++++---------- .../PhotoCollectionPickerController.swift | 3 -- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/ImagePickerController.swift b/Signal/src/ViewControllers/Photos/ImagePickerController.swift index 5912c7214..8ecbd9ae4 100644 --- a/Signal/src/ViewControllers/Photos/ImagePickerController.swift +++ b/Signal/src/ViewControllers/Photos/ImagePickerController.swift @@ -226,6 +226,11 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat // We don't need to do this when pushing VCs onto the SignalsNavigationController - only when // presenting directly from ConversationVC. _ = self.becomeFirstResponder() + + DispatchQueue.main.async { + // pre-layout collectionPicker for snappier response + self.collectionPickerController.view.layoutIfNeeded() + } } // HACK: Though we don't have an input accessory view, the VC we are presented above (ConversationVC) does. @@ -401,26 +406,23 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat // MARK: - PhotoCollectionPicker Presentation - var isShowingCollectionPickerController: Bool { - return collectionPickerController != nil - } + var isShowingCollectionPickerController: Bool = false + + lazy var collectionPickerController: PhotoCollectionPickerController = { + return PhotoCollectionPickerController(library: library, + collectionDelegate: self) + }() - var collectionPickerController: PhotoCollectionPickerController? func showCollectionPicker() { Logger.debug("") - let collectionPickerController = PhotoCollectionPickerController(library: library, - previousPhotoCollection: photoCollection, - collectionDelegate: self) - guard let collectionPickerView = collectionPickerController.view else { owsFailDebug("collectionView was unexpectedly nil") return } - assert(self.collectionPickerController == nil) - self.collectionPickerController = collectionPickerController - + assert(!isShowingCollectionPickerController) + isShowingCollectionPickerController = true addChild(collectionPickerController) view.addSubview(collectionPickerView) @@ -439,18 +441,16 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat func hideCollectionPicker() { Logger.debug("") - guard let collectionPickerController = collectionPickerController else { - owsFailDebug("collectionPickerController was unexpectedly nil") - return - } - self.collectionPickerController = nil + + assert(isShowingCollectionPickerController) + isShowingCollectionPickerController = false UIView.animate(.promise, duration: 0.25, delay: 0, options: .curveEaseInOut) { - collectionPickerController.view.frame = self.view.frame.offsetBy(dx: 0, dy: self.view.frame.height) + self.collectionPickerController.view.frame = self.view.frame.offsetBy(dx: 0, dy: self.view.frame.height) self.titleView.rotateIcon(.down) }.done { _ in - collectionPickerController.view.removeFromSuperview() - collectionPickerController.removeFromParent() + self.collectionPickerController.view.removeFromSuperview() + self.collectionPickerController.removeFromParent() }.retainUntilComplete() } diff --git a/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift index d551da139..a0b070b64 100644 --- a/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift +++ b/Signal/src/ViewControllers/Photos/PhotoCollectionPickerController.swift @@ -15,14 +15,11 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg private weak var collectionDelegate: PhotoCollectionPickerDelegate? private let library: PhotoLibrary - private let previousPhotoCollection: PhotoCollection private var photoCollections: [PhotoCollection] required init(library: PhotoLibrary, - previousPhotoCollection: PhotoCollection, collectionDelegate: PhotoCollectionPickerDelegate) { self.library = library - self.previousPhotoCollection = previousPhotoCollection self.photoCollections = library.allPhotoCollections() self.collectionDelegate = collectionDelegate super.init() From abf35decde3e92ca79264bab64150d8f291ecdd9 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 13:02:15 -0700 Subject: [PATCH 490/493] Enable batch mode when popping to Media Library --- .../SendMediaNavigationController.swift | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift index 94d8c17d8..e59533ee5 100644 --- a/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift +++ b/Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift @@ -265,10 +265,20 @@ extension SendMediaNavigationController: UINavigationControllerDelegate { } } - if viewController is PhotoCaptureViewController && !isInBatchSelectMode { - // We're either showing the captureView for the first time or the user is navigating "back" - // indicating they want to "retake". We should discard any current image. - discardCameraDraft() + switch viewController { + case is PhotoCaptureViewController: + if attachmentDraftCollection.count == 1 && !isInBatchSelectMode { + // User is navigating "back" to the previous view, indicating + // they want to discard the previously captured item + discardDraft() + } + case is ImagePickerGridController: + if attachmentDraftCollection.count == 1 && !isInBatchSelectMode { + isInBatchSelectMode = true + self.mediaLibraryViewController.batchSelectModeDidChange() + } + default: + break } self.updateButtons(topViewController: viewController) @@ -318,12 +328,12 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate { didRequestExit(dontAbandonText: dontAbandonText) } - func discardCameraDraft() { - assert(attachmentDraftCollection.cameraAttachments.count <= 1) - if let lastCameraAttachment = attachmentDraftCollection.cameraAttachments.last { - attachmentDraftCollection.remove(attachment: lastCameraAttachment) + func discardDraft() { + assert(attachmentDraftCollection.attachmentDrafts.count <= 1) + if let lastAttachmentDraft = attachmentDraftCollection.attachmentDrafts.last { + attachmentDraftCollection.remove(attachment: lastAttachmentDraft.attachment) } - assert(attachmentDraftCollection.cameraAttachments.count == 0) + assert(attachmentDraftCollection.attachmentDrafts.count == 0) } } From 19002a13b156a8edabed755406a434754fecdbdb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 13:02:50 -0700 Subject: [PATCH 491/493] Cannot delete last item in rail --- .../AttachmentApproval/ApprovalRailCellView.swift | 10 +++++++--- .../AttachmentApprovalViewController.swift | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift b/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift index 539baaf5b..d937c7381 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/ApprovalRailCellView.swift @@ -7,6 +7,7 @@ import UIKit protocol ApprovalRailCellViewDelegate: class { func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) + func canRemoveApprovalRailCellView(_ approvalRailCellView: ApprovalRailCellView) -> Bool } // MARK: - @@ -55,10 +56,13 @@ public class ApprovalRailCellView: GalleryRailCellView { super.setIsSelected(isSelected) if isSelected { - addSubview(deleteButton) + if let approvalRailCellDelegate = self.approvalRailCellDelegate, + approvalRailCellDelegate.canRemoveApprovalRailCellView(self) { - deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) - deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4) + addSubview(deleteButton) + deleteButton.autoPinEdge(toSuperviewEdge: .top, withInset: cellBorderWidth) + deleteButton.autoPinEdge(toSuperviewEdge: .trailing, withInset: cellBorderWidth + 4) + } } else { deleteButton.removeFromSuperview() } diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index 3cae70819..80768e4cb 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -801,6 +801,10 @@ extension AttachmentApprovalViewController: ApprovalRailCellViewDelegate { func approvalRailCellView(_ approvalRailCellView: ApprovalRailCellView, didRemoveItem attachmentItem: SignalAttachmentItem) { remove(attachmentItem: attachmentItem) } + + func canRemoveApprovalRailCellView(_ approvalRailCellView: ApprovalRailCellView) -> Bool { + return self.attachmentItems.count > 1 + } } // MARK: - From 29ec77e09f4d2e75ded78cc6eed170f3c5fbc9b7 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 13:50:44 -0700 Subject: [PATCH 492/493] sync translations --- .../translations/ar.lproj/Localizable.strings | 2 +- .../translations/az.lproj/Localizable.strings | 102 +++++++++--------- .../translations/bg.lproj/Localizable.strings | 2 +- .../translations/bs.lproj/Localizable.strings | 2 +- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 12 +-- .../translations/de.lproj/Localizable.strings | 12 +-- .../translations/el.lproj/Localizable.strings | 2 +- .../translations/es.lproj/Localizable.strings | 12 +-- .../translations/et.lproj/Localizable.strings | 2 +- .../translations/fa.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 12 +-- .../fil.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/gl.lproj/Localizable.strings | 2 +- .../translations/he.lproj/Localizable.strings | 12 +-- .../translations/hr.lproj/Localizable.strings | 2 +- .../translations/hu.lproj/Localizable.strings | 2 +- .../translations/id.lproj/Localizable.strings | 2 +- .../translations/it.lproj/Localizable.strings | 12 +-- .../translations/ja.lproj/Localizable.strings | 12 +-- .../translations/km.lproj/Localizable.strings | 2 +- .../translations/ko.lproj/Localizable.strings | 2 +- .../translations/lt.lproj/Localizable.strings | 12 +-- .../translations/lv.lproj/Localizable.strings | 2 +- .../translations/mk.lproj/Localizable.strings | 2 +- .../translations/my.lproj/Localizable.strings | 2 +- .../translations/nb.lproj/Localizable.strings | 12 +-- .../nb_NO.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 66 ++++++------ .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 22 ++-- .../pt_PT.lproj/Localizable.strings | 12 +-- .../translations/ro.lproj/Localizable.strings | 12 +-- .../translations/ru.lproj/Localizable.strings | 12 +-- .../translations/sl.lproj/Localizable.strings | 2 +- .../translations/sn.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 12 +-- .../translations/sv.lproj/Localizable.strings | 12 +-- .../translations/th.lproj/Localizable.strings | 2 +- .../translations/tr.lproj/Localizable.strings | 12 +-- .../translations/uk.lproj/Localizable.strings | 2 +- .../zh_CN.lproj/Localizable.strings | 12 +-- .../zh_TW.lproj/Localizable.strings | 12 +-- 45 files changed, 222 insertions(+), 222 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index 9a39be69c..8532ce4ac 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/az.lproj/Localizable.strings b/Signal/translations/az.lproj/Localizable.strings index 198a860e0..ccc606553 100644 --- a/Signal/translations/az.lproj/Localizable.strings +++ b/Signal/translations/az.lproj/Localizable.strings @@ -5,10 +5,10 @@ "ACCEPT_NEW_IDENTITY_ACTION" = "Accept New Safety Number"; /* Label for 'audio call' button in contact view. */ -"ACTION_AUDIO_CALL" = "Signal Call"; +"ACTION_AUDIO_CALL" = "Signal Zəngi"; /* Label for 'invite' button in contact view. */ -"ACTION_INVITE" = "Invite to Signal"; +"ACTION_INVITE" = "Signala dəvət et"; /* Label for 'send message' button in contact view. Label for button that lets you send a message to a contact. */ @@ -153,7 +153,7 @@ "ATTACHMENT_LABEL" = "Əlavə"; /* attachment menu option to send contact */ -"ATTACHMENT_MENU_CONTACT_BUTTON" = "Contact"; +"ATTACHMENT_MENU_CONTACT_BUTTON" = "Əlaqə"; /* Alert title when picking a document fails for an unknown reason */ "ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE" = "Failed to choose document."; @@ -231,10 +231,10 @@ "BACKUP_UNEXPECTED_ERROR" = "Unexpected Backup Error"; /* An explanation of the consequences of blocking a group. */ -"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "You will no longer receive messages or updates from this group."; +"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "Bu qrupdan bir daha mesaj və yeniliklər almayacaqsan."; /* Button label for the 'block' button */ -"BLOCK_LIST_BLOCK_BUTTON" = "Block"; +"BLOCK_LIST_BLOCK_BUTTON" = "Kilidlə"; /* A format for the 'block group' action sheet title. Embeds the {{group name}}. */ "BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Block and Leave the \"%@\" Group?"; @@ -261,7 +261,7 @@ "BLOCK_LIST_UNBLOCK_TITLE_FORMAT" = "Unblock %@?"; /* A label for the block button in the block list view */ -"BLOCK_LIST_VIEW_BLOCK_BUTTON" = "Block"; +"BLOCK_LIST_VIEW_BLOCK_BUTTON" = "Kilidlə"; /* The message format of the 'conversation blocked' alert. Embeds the {{conversation title}}. */ "BLOCK_LIST_VIEW_BLOCKED_ALERT_MESSAGE_FORMAT" = "%@ has been blocked."; @@ -285,7 +285,7 @@ "BLOCK_LIST_VIEW_UNBLOCKED_GROUP_ALERT_BODY" = "Existing members can now add you to the group again."; /* Action sheet that will block an unknown user. */ -"BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION" = "Block"; +"BLOCK_OFFER_ACTIONSHEET_BLOCK_ACTION" = "Kilidlə"; /* Title format for action sheet that offers to block an unknown user.Embeds {{the unknown user's name or phone number}}. */ "BLOCK_OFFER_ACTIONSHEET_TITLE_FORMAT" = "Block %@?"; @@ -300,7 +300,7 @@ "BUTTON_DONE" = "Done"; /* Label for the 'next' button. */ -"BUTTON_NEXT" = "Next"; +"BUTTON_NEXT" = "Növbəti"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; @@ -345,7 +345,7 @@ "CALL_VIEW_ACCEPT_INCOMING_CALL_LABEL" = "Accept incoming call"; /* Accessibility label for selection the audio source */ -"CALL_VIEW_AUDIO_SOURCE_LABEL" = "Audio"; +"CALL_VIEW_AUDIO_SOURCE_LABEL" = "Səs"; /* Accessibility label for declining incoming calls */ "CALL_VIEW_DECLINE_INCOMING_CALL_LABEL" = "Decline incoming call"; @@ -354,10 +354,10 @@ "CALL_VIEW_ENABLE_VIDEO_HINT" = "Tap here to turn on your video"; /* Accessibility label for hang up call */ -"CALL_VIEW_HANGUP_LABEL" = "End call"; +"CALL_VIEW_HANGUP_LABEL" = "Zəngi bitir"; /* Accessibility label for muting the microphone */ -"CALL_VIEW_MUTE_LABEL" = "Mute"; +"CALL_VIEW_MUTE_LABEL" = "Səssiz"; /* Reminder to the user of the benefits of enabling CallKit and disabling CallKit privacy. */ "CALL_VIEW_SETTINGS_NAG_DESCRIPTION_ALL" = "You can enable iOS Call Integration in your Signal privacy settings to answer incoming calls from your lock screen."; @@ -594,10 +594,10 @@ "CONVERSATION_SETTINGS_GROUP_INFO_TITLE" = "Group Info"; /* Title of the 'mute this thread' action sheet. */ -"CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE" = "Mute"; +"CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE" = "Səssiz"; /* label for 'mute thread' cell in conversation settings */ -"CONVERSATION_SETTINGS_MUTE_LABEL" = "Mute"; +"CONVERSATION_SETTINGS_MUTE_LABEL" = "Səssiz"; /* Indicates that the current thread is not muted. */ "CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Not muted"; @@ -648,7 +648,7 @@ "CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER" = "Share Your Profile"; /* Message shown in conversation view that offers to add an unknown user to your phone's contacts. */ -"CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER" = "Add to Contacts"; +"CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER" = "Əlaqələrə əlavə et"; /* Message shown in conversation view that offers to share your profile with a user. */ "CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER" = "Share Your Profile with This User"; @@ -729,7 +729,7 @@ "DEBUG_LOG_ALERT_OPTION_SEND_TO_SELF" = "Send to Self"; /* Label for the 'Share' option of the debug log alert. */ -"DEBUG_LOG_ALERT_OPTION_SHARE" = "Share"; +"DEBUG_LOG_ALERT_OPTION_SHARE" = "Paylaş"; /* Title of the alert shown for failures while uploading debug logs. Title of the debug log alert. */ @@ -847,7 +847,7 @@ "ENABLE_2FA_VIEW_ENABLE_2FA" = "Enable"; /* Label for the 'next' button in the 'enable two factor auth' views. */ -"ENABLE_2FA_VIEW_NEXT_BUTTON" = "Next"; +"ENABLE_2FA_VIEW_NEXT_BUTTON" = "Növbəti"; /* Error indicating that the entered 'two-factor auth PINs' do not match. */ "ENABLE_2FA_VIEW_PIN_DOES_NOT_MATCH" = "PIN does not match."; @@ -865,7 +865,7 @@ "ENABLE_2FA_VIEW_TITLE" = "Registration Lock"; /* Call setup status label */ -"END_CALL_RESPONDER_IS_BUSY" = "Busy"; +"END_CALL_RESPONDER_IS_BUSY" = "Məşğul"; /* Call setup status label */ "END_CALL_UNCATEGORIZED_FAILURE" = "Call Failed."; @@ -1060,7 +1060,7 @@ "HOME_VIEW_BLOCKED_CONVERSATION" = "Blocked"; /* Placeholder text for search bar which filters conversations. */ -"HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search"; +"HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Axtar"; /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact. Embeds {{The name of 1 of your Signal contacts}}. */ "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@."; @@ -1138,7 +1138,7 @@ "INVITE_FRIENDS_CONTACT_TABLE_BUTTON" = "Invite Friends to Signal"; /* Search */ -"INVITE_FRIENDS_PICKER_SEARCHBAR_PLACEHOLDER" = "Search"; +"INVITE_FRIENDS_PICKER_SEARCHBAR_PLACEHOLDER" = "Axtar"; /* Navbar title */ "INVITE_FRIENDS_PICKER_TITLE" = "Invite Friends"; @@ -1204,10 +1204,10 @@ "MEDIA_DETAIL_VIEW_ALL_MEDIA_BUTTON" = "All Media"; /* media picker option to take photo or video */ -"MEDIA_FROM_CAMERA_BUTTON" = "Camera"; +"MEDIA_FROM_CAMERA_BUTTON" = "Kamera"; /* action sheet button title when choosing attachment type */ -"MEDIA_FROM_DOCUMENT_PICKER_BUTTON" = "Document"; +"MEDIA_FROM_DOCUMENT_PICKER_BUTTON" = "Sənəd"; /* media picker option to choose from library */ "MEDIA_FROM_LIBRARY_BUTTON" = "Photo Library"; @@ -1225,7 +1225,7 @@ "MEDIA_GALLERY_MORE_ITEMS_FORMAT" = "+%@"; /* Short sender label for media sent by you */ -"MEDIA_GALLERY_SENDER_NAME_YOU" = "You"; +"MEDIA_GALLERY_SENDER_NAME_YOU" = "Sən"; /* Section header in media gallery collection view */ "MEDIA_GALLERY_THIS_MONTH_HEADER" = "This Month"; @@ -1255,7 +1255,7 @@ "MESSAGE_APPROVAL_DIALOG_TITLE" = "Message"; /* Label for the recipient name in the 'message approval' dialog. */ -"MESSAGE_APPROVAL_RECIPIENT_LABEL" = "To:"; +"MESSAGE_APPROVAL_RECIPIENT_LABEL" = "Hara:"; /* No comment provided by engineer. */ "MESSAGE_COMPOSEVIEW_TITLE" = "Yeni ismarış"; @@ -1267,19 +1267,19 @@ "MESSAGE_METADATA_VIEW_ATTACHMENT_MIME_TYPE" = "MIME type"; /* Status label for messages which are delivered. */ -"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_DELIVERED" = "Delivered"; +"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_DELIVERED" = "Çatdırıldı"; /* Status label for messages which are failed. */ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_FAILED" = "Failed"; /* Status label for messages which are read. */ -"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_READ" = "Read"; +"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_READ" = "Oxundu"; /* Status label for messages which are sending. */ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING" = "Göndərilir"; /* Status label for messages which are sent. */ -"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Sent"; +"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Göndərildi"; /* Status label for messages which were skipped. */ "MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SKIPPED" = "Skipped"; @@ -1291,13 +1291,13 @@ "MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "Message has no content or attachment."; /* Label for the 'received date & time' field of the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME" = "Received"; +"MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME" = "Qəbul edildi"; /* Label for the 'sender' field of the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_SENDER" = "Sender"; /* Label for the 'sent date & time' field of the 'message metadata' view. */ -"MESSAGE_METADATA_VIEW_SENT_DATE_TIME" = "Sent"; +"MESSAGE_METADATA_VIEW_SENT_DATE_TIME" = "Göndərildi"; /* Label for the original filename of any attachment in the 'message metadata' view. */ "MESSAGE_METADATA_VIEW_SOURCE_FILENAME" = "Filename"; @@ -1306,7 +1306,7 @@ "MESSAGE_METADATA_VIEW_TITLE" = "Message"; /* message status for message delivered to their recipient. */ -"MESSAGE_STATUS_DELIVERED" = "Delivered"; +"MESSAGE_STATUS_DELIVERED" = "Çatdırıldı"; /* status message for failed messages */ "MESSAGE_STATUS_FAILED" = "Sending failed."; @@ -1315,19 +1315,19 @@ "MESSAGE_STATUS_FAILED_SHORT" = "Failed"; /* status message for read messages */ -"MESSAGE_STATUS_READ" = "Read"; +"MESSAGE_STATUS_READ" = "Oxundu"; /* message status if message delivery to a recipient is skipped. We skip delivering group messages to users who have left the group or unregistered their Signal account. */ "MESSAGE_STATUS_RECIPIENT_SKIPPED" = "Skipped"; /* Label indicating that a message failed to send. */ -"MESSAGE_STATUS_SEND_FAILED" = "Send Failed"; +"MESSAGE_STATUS_SEND_FAILED" = "Göndərmə alınmadı"; /* message status while message is sending. */ "MESSAGE_STATUS_SENDING" = "Sending…"; /* status message for sent messages */ -"MESSAGE_STATUS_SENT" = "Sent"; +"MESSAGE_STATUS_SENT" = "Göndərildi"; /* status message while attachment is uploading */ "MESSAGE_STATUS_UPLOADING" = "Uploading…"; @@ -1398,7 +1398,7 @@ "MUTE_BEHAVIOR_EXPLANATION" = "You will not receive notifications for muted conversations."; /* A button to skip a view. */ -"NAVIGATION_ITEM_SKIP_BUTTON" = "Skip"; +"NAVIGATION_ITEM_SKIP_BUTTON" = "Ötür"; /* No comment provided by engineer. */ "NETWORK_ERROR_RECOVERY" = "Please check if you are online and try again."; @@ -1458,7 +1458,7 @@ "new_message" = "Yeni ismarış"; /* A label for the 'add by phone number' button in the 'new non-contact conversation' view */ -"NEW_NONCONTACT_CONVERSATION_VIEW_BUTTON" = "Search"; +"NEW_NONCONTACT_CONVERSATION_VIEW_BUTTON" = "Axtar"; /* Title for the 'new non-contact conversation' view. */ "NEW_NONCONTACT_CONVERSATION_VIEW_TITLE" = "Find User"; @@ -1524,10 +1524,10 @@ "ONBOARDING_PERMISSIONS_TITLE" = "Signal can let you know when you get a message (and who it is from)"; /* Title of the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_TITLE" = "Enter your phone number to get started"; +"ONBOARDING_PHONE_NUMBER_TITLE" = "Başlamaq üçün telefon nömrəni daxil et"; /* Label indicating that the phone number is invalid in the 'onboarding phone number' view. */ -"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Invalid number"; +"ONBOARDING_PHONE_NUMBER_VALIDATION_WARNING" = "Səhv nömrə"; /* Explanation in the 'onboarding profile' view. */ "ONBOARDING_PROFILE_EXPLANATION" = "Signal profiles are end-to-end encrypted and the Signal service never has access to this information."; @@ -1632,7 +1632,7 @@ "PHONE_NUMBER_TYPE_PAGER" = "Pager"; /* Label used when we don't what kind of phone number it is (e.g. mobile/work/home). */ -"PHONE_NUMBER_TYPE_UNKNOWN" = "Unknown"; +"PHONE_NUMBER_TYPE_UNKNOWN" = "Naməlum"; /* Label for 'Work' phone numbers. */ "PHONE_NUMBER_TYPE_WORK" = "İş"; @@ -1659,7 +1659,7 @@ "PRIVACY_IDENTITY_IS_NOT_VERIFIED_FORMAT" = "You have not marked %@ as verified."; /* Badge indicating that the user is verified. */ -"PRIVACY_IDENTITY_IS_VERIFIED_BADGE" = "Verified"; +"PRIVACY_IDENTITY_IS_VERIFIED_BADGE" = "Təsdiq edildi"; /* Label indicating that the user is verified. Embeds {{the user's name or phone number}}. */ "PRIVACY_IDENTITY_IS_VERIFIED_FORMAT" = "%@ is verified."; @@ -1728,7 +1728,7 @@ "PROFILE_VIEW_NAME_DEFAULT_TEXT" = "Enter your name"; /* Label for the profile avatar field of the profile view. */ -"PROFILE_VIEW_PROFILE_AVATAR_FIELD" = "Avatar"; +"PROFILE_VIEW_PROFILE_AVATAR_FIELD" = "Şəkil"; /* Description of the user profile. */ "PROFILE_VIEW_PROFILE_DESCRIPTION" = "Your Signal Profile will be visible to your contacts, when you initiate new conversations, and when you share it with other users and groups."; @@ -1782,13 +1782,13 @@ "QUOTED_REPLY_TYPE_ATTACHMENT" = "Qoşma"; /* Indicates this message is a quoted reply to an audio file. */ -"QUOTED_REPLY_TYPE_AUDIO" = "Audio"; +"QUOTED_REPLY_TYPE_AUDIO" = "Səs"; /* Indicates this message is a quoted reply to animated GIF file. */ "QUOTED_REPLY_TYPE_GIF" = "GIF"; /* Indicates this message is a quoted reply to an image file. */ -"QUOTED_REPLY_TYPE_IMAGE" = "Image"; +"QUOTED_REPLY_TYPE_IMAGE" = "Şəkil"; /* Indicates this message is a quoted reply to a video file. */ "QUOTED_REPLY_TYPE_VIDEO" = "Video"; @@ -1800,7 +1800,7 @@ "REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registration of this phone number will be possible without your Registration Lock PIN after 7 days have passed since the phone number was last active on Signal."; /* Label for 'submit' button in the 2FA registration view. */ -"REGISTER_2FA_SUBMIT_BUTTON" = "Submit"; +"REGISTER_2FA_SUBMIT_BUTTON" = "Təqdim et"; /* No comment provided by engineer. */ "REGISTER_CONTACTS_WELCOME" = "Xoş gördük!"; @@ -1956,10 +1956,10 @@ "SEARCH_SECTION_CONTACTS" = "Other Contacts"; /* section header for search results that match existing conversations (either group or contact conversations) */ -"SEARCH_SECTION_CONVERSATIONS" = "Conversations"; +"SEARCH_SECTION_CONVERSATIONS" = "Söhbətlər"; /* section header for search results that match a message in a conversation */ -"SEARCH_SECTION_MESSAGES" = "Messages"; +"SEARCH_SECTION_MESSAGES" = "Mesajlar"; /* No comment provided by engineer. */ "SECURE_SESSION_RESET" = "Təhlükəsiz qoşulma yenidən başldıldı."; @@ -2019,7 +2019,7 @@ "SETTINGS_ADD_TO_BLOCK_LIST_BLOCK_PHONE_NUMBER_TITLE" = "Block Phone Number"; /* Title for the 'add to block list' view. */ -"SETTINGS_ADD_TO_BLOCK_LIST_TITLE" = "Block"; +"SETTINGS_ADD_TO_BLOCK_LIST_TITLE" = "Kilidlə"; /* Label for the 'manual censorship circumvention' switch. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION" = "Censorship Circumvention"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; @@ -2244,10 +2244,10 @@ "SETTINGS_SUPPORT" = "Dəstək"; /* Indicates that 'two factor auth' is disabled in the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Disabled"; +"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Deaktiv et"; /* Indicates that 'two factor auth' is enabled in the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_ENABLED" = "Enabled"; +"SETTINGS_TWO_FACTOR_AUTH_ENABLED" = "Aktiv et"; /* Label for the 'two factor auth' item of the privacy settings. */ "SETTINGS_TWO_FACTOR_AUTH_ITEM" = "Registration Lock"; @@ -2403,7 +2403,7 @@ "UNKNOWN_COUNTRY_NAME" = "Unknown Country"; /* Indicates an unknown or unrecognizable value. */ -"UNKNOWN_VALUE" = "Unknown"; +"UNKNOWN_VALUE" = "Naməlum"; /* button title for unlinking a device */ "UNLINK_ACTION" = "Qoşma"; @@ -2448,7 +2448,7 @@ "UPGRADE_EXPERIENCE_ENABLE_TYPING_INDICATOR_BUTTON" = "Turn On Typing Indicators"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Optional link previews are now supported for some of the most popular sites on the Internet."; +"UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_DESCRIPTION" = "Bir çox ən populyar veb saytların ilkin baxışı funksiyası indi dəstəklənir."; /* Subtitle for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_LINK_PREVIEWS_SUBTITLE" = "You can disable or enable this feature anytime in your Signal settings (Privacy > Send link previews)."; @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_INTRODUCING_READ_RECEIPTS_TITLE" = "Introducing Read Receipts"; /* Body text for upgrading users */ -"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "Now you can optionally see and share when messages are being typed."; +"UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_DESCRIPTION" = "İndi istəsən mesajlar yazılan zaman onu izləyə, yaxud bu məlumatı bölüşə bilərsən."; /* Header for upgrading users */ "UPGRADE_EXPERIENCE_INTRODUCING_TYPING_INDICATORS_TITLE" = "Introducing Typing Indicators"; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index 9e0955640..eef8f536e 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 7956a3d4a..3f3b0295e 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index d92effd59..94e66fad1 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Envia previsualitzacions d'enllaços"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Les previsualitzacions estan disponibles per a enllaços d'Imgur, Reddit i Youtube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Previsualitzacions d'enllaços"; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index d027700ff..9510e138d 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Odeslat náhledy odkazů"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Náhledy jsou podporovány pro odkazy na Imgur, Instagram, Reddit, a YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Náhledy odkazů"; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index b9594608a..4f1deafaf 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invitér via SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Kassere mediet?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Kassere mediet"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Tilbage til kameraet"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Tilbage til mediebiblioteket"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invitér en ven via ukrypteret SMS?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censur omgåelse er blevet aktiveret baseret på din kontos telefonnummer."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Du har manuelt deaktiveret censur omgåelse."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censuromgåelse kan kun aktiveres, når den er tilsluttet internettet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send link eksempelvisning"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Eksempelvisning er understøttet for Imgur, Instagram, Reddit og YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link eksempelvisninger"; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index b5970fff6..bfac08377 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Via SMS einladen: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Medieninhalte verwerfen?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Medieninhalte verwerfen"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Zurück zur Kamera"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Zurück zur Mediengalerie"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Einen Freund per ungesicherter SMS einladen?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Die Zensurumgehung wurde aufgrund der Rufnummer deines Benutzerkontos aktiviert."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Du hast die Zensurumgehung manuell deaktiviert."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Die Zensurumgehung kann nur bei bestehender Internetverbindung aktiviert werden."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Link-Vorschauen senden"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Vorschauen werden unterstützt für Links von Imgur, Instagram, Reddit und YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link-Vorschauen"; diff --git a/Signal/translations/el.lproj/Localizable.strings b/Signal/translations/el.lproj/Localizable.strings index 5b9f2a413..9eac7195a 100644 --- a/Signal/translations/el.lproj/Localizable.strings +++ b/Signal/translations/el.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 57ab7acbe..6bd4eee5a 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invitar por SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "¿Descartar cambios?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Descartar"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Regresar a la cámara"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Regresar a la biblioteca de medios"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "¿Invitar a un contacto vía SMS no cifrado? "; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "La opción para evitar censura se ha activado automáticamente basándose en el número de teléfono de tu cuenta de Signal."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Has desactivado manualmente la opción de evitar la censura."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "La opción para evitar censura sólo se puede activar con acceso a internet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Enviar previsualizaciones"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Al activar, se enviarán las previsualizaciones de enlaces de Imgur, Instagram, Reddit y YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Previsualizar enlaces"; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index 39ea12d82..a22a8be48 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Saada linkide eelvaateid"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Eelvaated on toetatud Imgur, Instagram, Reddit ja YouTube linkide puhul"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Linkide eelvaated"; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index 873f130c7..77cdecc1d 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index 8b78d1384..e3560cd5a 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Kutsu tekstiviestillä: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Hylkää media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Hylkää media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Palaa kameraan"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Palaa mediakirjastoon"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Kutsu ystävä suojaamattomalla tekstiviestillä?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Puhelinnumerosi sijaintiin perustuva sensuurin kiertäminen otettu käyttöön."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Olet manuaalisesti poistanut käytöstä sensuurin kiertämisen."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sensuurin kiertäminen toimii ainoastaan silloin, kun olet yhteydessä internetiin."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Lähetä esikatselukuva linkeistä"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Esikatselu tukee sivustoja Imgur, Instagram, Reddit ja YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Linkkien esikatselukuvat"; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index bf583c574..baaabbdd9 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index fbf0b3fbd..50a67002c 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Envoyer des aperçus de liens."; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Les aperçus sont pris en charge pour les liens Imgur, Instagram, Reddit et YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Aperçus de liens"; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 6627186cf..ab058d780 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 959dfc755..2bd86d41c 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "הזמן דרך מסרון: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "להשמיט מדיה?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "השמט מדיה"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "חזור אל מצלמה"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "חזור אל סיפריית המדיה"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "להזמין חבר דרך מסרון בלתי־מאובטח?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "עקיפת צנזורה שופעלה על סמך מספר הטלפון של חשבונך."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "הִשְׁבַּת באופן ידני עקיפת צנזורה."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "עקיפת צנזורה יכולה להשתפעל בעת התחברות לאינטרנט."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "שלח קדם־תצוגות של קישורים"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "קדם־תצוגות נתמכות עבור קישורים של Imgur, Instagram, Reddit ו־YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "קדם־תצוגות של קישורים"; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 127f78681..d840e87d7 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 9343f3c8e..70cb13683 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Hivatkozások előnézetének küldése"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Az előnézeti képek az Imgur, Instagram, Reddit és YouTube szolgáltatásokhoz elérhetőek"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index da8b66666..8bcf0c144 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/it.lproj/Localizable.strings b/Signal/translations/it.lproj/Localizable.strings index 7415b1f13..0be0b7f8b 100644 --- a/Signal/translations/it.lproj/Localizable.strings +++ b/Signal/translations/it.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invita %@ via SMS"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Scartare il media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Scarta media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Ritorna alla fotocamera"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Ritorna alla libreria multimediale"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invita un amico usando un SMS insicuro?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Il raggiro della censura è stato attivato sulla base del tuo numero telefonico."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Hai disabilitato manualmente l'aggiramento della censura."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Il raggiro della censura può essere attivato solo se connessi ad Internet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Invia anteprime link"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Le anteprime sono supportate per i link di Imgur, Instagram, Reddit e YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Anteprime link"; diff --git a/Signal/translations/ja.lproj/Localizable.strings b/Signal/translations/ja.lproj/Localizable.strings index 4b5f6bb08..66e377470 100644 --- a/Signal/translations/ja.lproj/Localizable.strings +++ b/Signal/translations/ja.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "SMSで招待する：%@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "メディアを破棄しますか？"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "メディアを破棄します"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "カメラに戻ります"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "メディアライブラリに戻ります"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "安全性の低いSMSで招待しますか？"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "検閲回避が登録番号のもとで有効になりました"; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "検閲制限をマニュアルで無効にしました"; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "検閲回避はネットに接続されているときのみ有効となります"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "リンクプレビューを送る"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "リンクプレビューは、次のサービスに対応しています: Imgur, Instagram, Reddit, YouTube"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "リンクプレビュー"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index d7447f943..d74429cb6 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/ko.lproj/Localizable.strings b/Signal/translations/ko.lproj/Localizable.strings index 5415561f6..14c27fc1d 100644 --- a/Signal/translations/ko.lproj/Localizable.strings +++ b/Signal/translations/ko.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 5171ead32..c161ceb01 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Siųsti pakvietimą SMS žinute: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Atmesti mediją?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Atmesti mediją"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Grįžti į kamerą"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Grįžti į medijos biblioteką"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Pakviesti draugą, naudojant nesaugiąją SMS?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Cenzūravimo apėjimas buvo aktyvuotas pagal jūsų paskyros telefono numerį."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Jūs esate rankiniu būdu išjungę cenzūros apėjimą."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Cenzūravimo apėjimas gali būti aktyvuotas tik prisijungus prie interneto."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Siųsti nuorodų peržiūras"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Peržiūros yra palaikomos Imgur, Instagram, Reddit, ir YouTube nuorodoms."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Nuorodų peržiūros"; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 6b515df68..ec1bd74ac 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 9a460e743..44ab2a945 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index 0d3714e20..2890e33c3 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/nb.lproj/Localizable.strings b/Signal/translations/nb.lproj/Localizable.strings index 5604bbfba..72a61b4ec 100644 --- a/Signal/translations/nb.lproj/Localizable.strings +++ b/Signal/translations/nb.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Inviter via SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Kast ut media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Kast ut media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Tilbake til kameraet"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Tilbake til mediebiblioteket"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Inviter en venn via usikker SMS?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Sensur-unngåelse har blitt aktivert basert på telefonnummeret som kontoen er registrert med."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Du har manuelt deaktivert censur kringgående."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sensur-unngåelse kan bare bli skrudd på når telefonen er koblet til internett."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send linkforhåndsvisninger"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Forhåndsvisninger støttes for Imgur, Instagram, Reddit og YouTube-koblinger."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Linkforhåndsvisninger"; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index fbfab0beb..61d9c1c51 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 5cfae5f5f..1d006137a 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -60,7 +60,7 @@ "APN_Message" = "Nieuw bericht!"; /* Message for the 'app launch failed' alert. */ -"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal kan niet opstarten. Stuur alstublieft een foutopsporingslogboek naar support@signal.org zodat we dit probleem kunnen oplossen."; +"APP_LAUNCH_FAILURE_ALERT_MESSAGE" = "Signal kan niet opstarten. Gelieve een foutopsporingslog naar support@signal.org te sturen zodat we dit probleem kunnen oplossen."; /* Title for the 'app launch failed' alert. */ "APP_LAUNCH_FAILURE_ALERT_TITLE" = "Fout"; @@ -138,7 +138,7 @@ "ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE" = "Bijlage is te groot."; /* Attachment error message for attachments with invalid data */ -"ATTACHMENT_ERROR_INVALID_DATA" = "Bijlage bevat inhoud die niet wordt ondersteund."; +"ATTACHMENT_ERROR_INVALID_DATA" = "Bijlage bevat inhoud die niet wordt ondersteund of niet correct is geformatteerd."; /* Attachment error message for attachments with an invalid file format */ "ATTACHMENT_ERROR_INVALID_FILE_FORMAT" = "Bijlage is een ongeldig bestandstype."; @@ -477,7 +477,7 @@ "CONTACT_CELL_IS_NO_LONGER_VERIFIED" = "Niet geverifieerd"; /* No comment provided by engineer. */ -"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Nummer niet geregistreerd"; +"CONTACT_DETAIL_COMM_TYPE_INSECURE" = "Ongeregistreerd nummer"; /* Label for the 'edit name' button in the contact share approval view. */ "CONTACT_EDIT_NAME_BUTTON" = "Bewerk"; @@ -681,7 +681,7 @@ "DATABASE_VIEW_OVERLAY_SUBTITLE" = "Dit kan enkele minuten duren."; /* Title shown while the app is updating its database. */ -"DATABASE_VIEW_OVERLAY_TITLE" = "Database optimaliseren"; +"DATABASE_VIEW_OVERLAY_TITLE" = "Database aan het optimaliseren"; /* Format string for a relative time, expressed as a certain number of hours in the past. Embeds {{The number of hours}}. */ "DATE_HOURS_AGO_FORMAT" = "%@ uur geleden"; @@ -708,7 +708,7 @@ "DEBUG_LOG_ALERT_ERROR_UPLOADING_LOG" = "Kon logs niet uploaden."; /* Message of the debug log alert. */ -"DEBUG_LOG_ALERT_MESSAGE" = "Wat wil je doen met de koppeling naar je foutopsporingslogboek?"; +"DEBUG_LOG_ALERT_MESSAGE" = "Wat wil je doen met de koppeling naar je foutopsporingslog?"; /* Error indicating that no debug logs could be found. */ "DEBUG_LOG_ALERT_NO_LOGS" = "Kon geen logs vinden."; @@ -763,7 +763,7 @@ "DISAPPEARING_MESSAGES" = "Zelf-wissende berichten"; /* Info Message when added to a group which has enabled disappearing messages. Embeds {{time amount}} before messages disappear, see the *_TIME_AMOUNT strings for context. */ -"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Berichten in dit gesprek zullen na %@ verdwijnen."; +"DISAPPEARING_MESSAGES_CONFIGURATION_GROUP_EXISTING_FORMAT" = "Berichten in dit gesprek zullen na %@ zichzelf wissen."; /* subheading in conversation settings */ "DISAPPEARING_MESSAGES_DESCRIPTION" = "Indien ingeschakeld zullen nieuwe verzonden en ontvangen berichten in dit gesprek zichzelf wissen nadat ze zijn gelezen."; @@ -943,7 +943,7 @@ "ERROR_MESSAGE_WRONG_TRUSTED_IDENTITY_KEY" = "Veiligheidsnummer is veranderd."; /* Format string for 'unregistered user' error. Embeds {{the unregistered user's name or signal id}}. */ -"ERROR_UNREGISTERED_USER_FORMAT" = "Niet-geregistreerde gebruiker:%@"; +"ERROR_UNREGISTERED_USER_FORMAT" = "Ongeregistreerde gebruiker: %@"; /* Button to dismiss/ignore the one time splash screen that appears after upgrading */ "EXPERIENCE_UPGRADE_DISMISS_BUTTON" = "Niet nu"; @@ -985,7 +985,7 @@ "GIF_PICKER_ERROR_GENERIC" = "Er is een onbekende fout opgetreden."; /* Shown when selected GIF couldn't be fetched */ -"GIF_PICKER_FAILURE_ALERT_TITLE" = "Kan GIF niet kiezen"; +"GIF_PICKER_FAILURE_ALERT_TITLE" = "Er is een probleem met deze GIF, deze kan niet worden gebruikt"; /* Alert message shown when user tries to search for GIFs without entering any search terms. */ "GIF_PICKER_VIEW_MISSING_QUERY" = "Voer je zoekopdracht in."; @@ -1195,7 +1195,7 @@ "LIST_GROUP_MEMBERS_ACTION" = "Groepsleden"; /* No comment provided by engineer. */ -"LOGGING_SECTION" = "Logboek bijhouden"; +"LOGGING_SECTION" = "Log bijhouden"; /* Title for the 'long text message' view. */ "LONG_TEXT_VIEW_TITLE" = "Bericht"; @@ -1401,7 +1401,7 @@ "NAVIGATION_ITEM_SKIP_BUTTON" = "Overslaan"; /* No comment provided by engineer. */ -"NETWORK_ERROR_RECOVERY" = "Controleer of je verbonden bent en probeer het opnieuw."; +"NETWORK_ERROR_RECOVERY" = "Controleer of je met internet verbonden bent en probeer het opnieuw."; /* Indicates to the user that censorship circumvention has been activated. */ "NETWORK_STATUS_CENSORSHIP_CIRCUMVENTION_ACTIVE" = "Censuuromzeiling: aan"; @@ -1797,7 +1797,7 @@ "REGISTER_2FA_FORGOT_PIN" = "Ik ben mijn pincode vergeten."; /* Alert message explaining what happens if you forget your 'two-factor auth pin'. */ -"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registratie van dit telefoonnummer zal 7 dagen nadat het telefoonnummer laatst actief was op Signal mogelijk zijn zonder je pincode voor registratievergrendeling."; +"REGISTER_2FA_FORGOT_PIN_ALERT_MESSAGE" = "Registratie van dit telefoonnummer zal mogelijk zijn zonder je pincode voor registratievergrendeling als je telefoonnummer minstens 7 dagen niet actief is geweest op Signal."; /* Label for 'submit' button in the 2FA registration view. */ "REGISTER_2FA_SUBMIT_BUTTON" = "Indienen"; @@ -1809,10 +1809,10 @@ "REGISTER_FAILED_TRY_AGAIN" = "Opnieuw proberen"; /* No comment provided by engineer. */ -"REGISTER_RATE_LIMITING_BODY" = "Je hebt het te vaak geprobeerd. Wacht een minuutje vooraleer je het opnieuw probeert."; +"REGISTER_RATE_LIMITING_BODY" = "Je hebt het te vaak geprobeerd. Wacht een minuut voor je het opnieuw probeert."; /* No comment provided by engineer. */ -"REGISTER_RATE_LIMITING_ERROR" = "Je hebt het te vaak geprobeerd. Wacht een minuutje vooraleer je het opnieuw probeert."; +"REGISTER_RATE_LIMITING_ERROR" = "Je hebt het te vaak geprobeerd. Wacht een minuut voor je het opnieuw probeert."; /* Title of alert shown when push tokens sync job fails. */ "REGISTRATION_BODY" = "Opnieuw registreren voor pushmeldingen mislukt."; @@ -1836,7 +1836,7 @@ "REGISTRATION_IPAD_CONFIRM_BUTTON" = "Deze iPad registreren"; /* alert title when registering an iPad */ -"REGISTRATION_IPAD_CONFIRM_TITLE" = "Heeft u al een Signalaccount?"; +"REGISTRATION_IPAD_CONFIRM_TITLE" = "Heb je al een Signal-account?"; /* No comment provided by engineer. */ "REGISTRATION_NON_VALID_NUMBER" = "Deze opmaak van een telefoonnummer wordt niet ondersteund, neem contact op met support."; @@ -1914,7 +1914,7 @@ "SAFETY_NUMBERS_ACTIONSHEET_TITLE" = "Je veiligheidsnummer met %@ is veranderd. Het wordt aanbevolen het nieuwe veiligheidsnummer te verifiëren."; /* label presented once scanning (camera) view is visible. */ -"SCAN_CODE_INSTRUCTIONS" = "Scan de QR-code op het apparaat van je contact."; +"SCAN_CODE_INSTRUCTIONS" = "Scan de QR-code op het apparaat van je gesprekspartner."; /* Title for the 'scan QR code' view. */ "SCAN_QR_CODE_VIEW_TITLE" = "QR-code scannen"; @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Uitnodigen via sms: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Media verwerpen?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Verwerp media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Terug naar camera"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Terug naar mediabibliotheek"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Kennis uitnodigen via onbeveiligde sms?"; @@ -2031,10 +2031,10 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER" = "Indien ingeschakeld zal Signal proberen censuur te omzeilen. Schakel deze functie niet in tenzij je je op een locatie bevindt waar Signal gecensureerd wordt."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been auto-enabled based on local phone number. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censuuromzeiling is ingeschakeld gebaseerd op het telefoonnummer van je account."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Censuuromzeiling is automatisch ingeschakeld omdat je telefoonnummer bij een risicoregio hoort."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Je hebt censuuromzeiling handmatig uitgeschakeld."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Censuuromzeiling kan alleen worden ingeschakeld als je verbonden bent met het internet."; @@ -2046,10 +2046,10 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Censuuromzeiling"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_DEBUGLOG" = "Foutopsporingslogboek inschakelen"; +"SETTINGS_ADVANCED_DEBUGLOG" = "Foutopsporingslog inschakelen"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Foutopsporingslogboek indienen"; +"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Foutopsporingslog indienen"; /* No comment provided by engineer. */ "SETTINGS_ADVANCED_TITLE" = "Geavanceerd"; @@ -2061,7 +2061,7 @@ "SETTINGS_BACKUP" = "Back-up"; /* Label for 'backup now' button in the backup settings view. */ -"SETTINGS_BACKUP_BACKUP_NOW" = "Back-up nu uitvoeren"; +"SETTINGS_BACKUP_BACKUP_NOW" = "Back-up nu aanmaken"; /* Label for 'cancel backup' button in the backup settings view. */ "SETTINGS_BACKUP_CANCEL_BACKUP" = "Back-up annuleren"; @@ -2094,16 +2094,16 @@ "SETTINGS_BACKUP_STATUS" = "Status"; /* Indicates that the last backup failed. */ -"SETTINGS_BACKUP_STATUS_FAILED" = "Back-up mislukt"; +"SETTINGS_BACKUP_STATUS_FAILED" = "Back-up aanmaken mislukt"; /* Indicates that app is not backing up. */ "SETTINGS_BACKUP_STATUS_IDLE" = "Wachten"; /* Indicates that app is backing up. */ -"SETTINGS_BACKUP_STATUS_IN_PROGRESS" = "Back-up wordt uitgevoerd"; +"SETTINGS_BACKUP_STATUS_IN_PROGRESS" = "Er wordt een back-up gemaakt"; /* Indicates that the last backup succeeded. */ -"SETTINGS_BACKUP_STATUS_SUCCEEDED" = "Back-up voltooid"; +"SETTINGS_BACKUP_STATUS_SUCCEEDED" = "Back-up aanmaken voltooid"; /* A label for the 'add phone number' button in the block list table. */ "SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Gebruiker blokkeren"; @@ -2127,7 +2127,7 @@ "SETTINGS_CLEAR_HISTORY" = "Gespreksgeschiedenis wissen"; /* No comment provided by engineer. */ -"SETTINGS_COPYRIGHT" = "Copyright Signal Messenger\n Gelicentieerd onder de GPLv3"; +"SETTINGS_COPYRIGHT" = "Auteursrecht Signal Messenger\n Gelicentieerd onder de GPLv3"; /* No comment provided by engineer. */ "SETTINGS_DELETE_ACCOUNT_BUTTON" = "Account wissen"; @@ -2151,7 +2151,7 @@ "SETTINGS_INFORMATION_HEADER" = "Informatie"; /* Settings table view cell label */ -"SETTINGS_INVITE_TITLE" = "Nodig je vrienden uit"; +"SETTINGS_INVITE_TITLE" = "Nodig kenissen uit"; /* content of tweet when inviting via twitter - please do not translate URL */ "SETTINGS_INVITE_TWITTER_TEXT" = "Je kunt me bereiken met de @signalapp. Download de app nu: https://signal.org/download/"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Voorbeeldweergaven verzenden"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Voorbeelden worden ondersteund voor koppelingen naar Imgur, Instagram, Reddit en YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Voorbeeldweergaven"; @@ -2223,7 +2223,7 @@ "SETTINGS_SCREEN_SECURITY" = "Schermafdrukken blokkeren"; /* No comment provided by engineer. */ -"SETTINGS_SCREEN_SECURITY_DETAIL" = "Verberg Signal-voorbeeldweergaven in het overzicht van open apps."; +"SETTINGS_SCREEN_SECURITY_DETAIL" = "Verberg Signal-voorbeeldweergaven in het overzicht van open apps en blokkeer schermafdrukken."; /* Settings table section footer. */ "SETTINGS_SECTION_CALL_KIT_DESCRIPTION" = "iOS-oproepintegratie geeft Signal-oproepen weer op je vergrendelscherm en in de oproepgeschiedenis van het systeem. Je kunt er voor kiezen dat naam en telefoonnummer van je gesprekspartner ook weergegeven worden. Als iCloud is ingeschakeld zal je oproepgeschiedenis gedeeld worden met Apple."; @@ -2244,7 +2244,7 @@ "SETTINGS_SUPPORT" = "Ondersteuning"; /* Indicates that 'two factor auth' is disabled in the privacy settings. */ -"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Uit"; +"SETTINGS_TWO_FACTOR_AUTH_DISABLED" = "Uitgeschakeld"; /* Indicates that 'two factor auth' is enabled in the privacy settings. */ "SETTINGS_TWO_FACTOR_AUTH_ENABLED" = "Ingeschakeld"; @@ -2496,7 +2496,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hallo, beveiligde videogesprekken!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Binnenkort vereist Signal dat je iOS 10 of een latere versie gebruikt. Werk je besturingssysteem bij in Instellingen >> Algemeen >> Software-update."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Binnenkort vereist Signal dat je iOS 10 of een latere versie gebruikt. Werk je besturingssysteem bij via Instellingen >> Algemeen >> Software-update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Werk iOS bij"; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 356b2e00f..25aae511c 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Podgląd linków"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Podglądy linków są obsługiwane dla Imgur, Instagram, Reddit i YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Podgląd linków"; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index 6a2b03071..bc8a2f0d4 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -582,7 +582,7 @@ "CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Bloquear grupo"; /* table cell label in conversation settings */ -"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Bloquear pessoa"; +"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Bloquear usuário"; /* Navbar title when viewing settings for a 1-on-1 thread */ "CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Informações do contato"; @@ -1818,7 +1818,7 @@ "REGISTRATION_BODY" = "Falha na reinscrição para notificações."; /* Label for the country code field */ -"REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código Do País"; +"REGISTRATION_DEFAULT_COUNTRY_NAME" = "Código do país"; /* Placeholder text for the phone number textfield */ "REGISTRATION_ENTERNUMBER_DEFAULT_TEXT" = "Inserir Número"; @@ -1842,7 +1842,7 @@ "REGISTRATION_NON_VALID_NUMBER" = "Este formato de número de telefone não possui suporte. Por favor, contactar a assistência. "; /* Label for the phone number textfield */ -"REGISTRATION_PHONENUMBER_BUTTON" = "Número De Telefone"; +"REGISTRATION_PHONENUMBER_BUTTON" = "Número de telefone"; /* No comment provided by engineer. */ "REGISTRATION_RESTRICTED_MESSAGE" = "Você precisa se cadastrar antes de mandar uma mensagem."; @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Convide via SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Descartar mídia?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Descartar mídia"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Voltar para a Câmera"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Voltar para a Midiateca"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar amigos usando SMS que não é seguro?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A driblagem de censura foi ativada tendo como base o número de telefone da sua conta."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Você desativou manualmente a driblagem de censura."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "A driblagem de censura pode ser ativada somente durante uma conexão à Internet."; @@ -2046,10 +2046,10 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Driblagem de Censura"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_DEBUGLOG" = "Habilitar log de depuração"; +"SETTINGS_ADVANCED_DEBUGLOG" = "Habilitar registro de depuração"; /* No comment provided by engineer. */ -"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Enviar log de depuração"; +"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Enviar registro de depuração"; /* No comment provided by engineer. */ "SETTINGS_ADVANCED_TITLE" = "Avançado"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Enviar pré-visualizações de links"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Visualizações são suportadas para Imgur, Instagram, Reddit e links do YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Pré-visualizações de links"; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 5504e022c..798df5802 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Enviar convite via SMS para: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Descartar média?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Descartar média"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Voltar à câmara"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Voltar à biblioteca de média"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Convidar um amigo por SMS inseguro?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "A circunscrição de censura foi ativada baseada no número de telefone da sua conta."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Desativou manualmente a circunscrição de censura."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Circunscrição de censura só pode ser ativada enquanto existe ligação à internet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Enviar pré-visualização de hiperligações"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "As pré-visualizações são suportadas em hiperligações do Imgur, Instagram, Reddit, e YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Pré-visualizações de hiperligações"; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 9657b519a..63b83e3bc 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Invită prin SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Renunțați la Media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Renunțați la Media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Întoarceți-vă la Cameră"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Întoarceți-vă la Librăria Media"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Invită un prieten prin SMS nesecurizat?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Ocolirea cenzurii a fost activată pe baza numărului tău de telefon."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Ați dezactivat manual ocolirea cenzurii."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Ocolirea cenzurii poate fi activată numai atunci când ești conectat la internet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Trimite previzualizarea link-urilor"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previzualizarea este suportată pentru link-uri Imgur, Instagram, Reddit și YouTube"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Previzualizare link-uri"; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index 2efb29d19..78e2b6b19 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Пригласить %@ по SMS"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Отклонить медиа?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Отклонить медиа"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Вернуться в Камеру"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Вернуться в Медиатеку"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Пригласить друга через незащищенное SMS?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Обход цензуры (блокировки провайдером) был активирован на основе номера телефона Вашего аккаунта."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Вы вручную отключили обход цензуры."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Обход цензуры (блокировки провайдером) может быть активирован только при подключении к интернету."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Отправлять предпросмотр ссылки"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Предварительный просмотр поддерживается для ссылок Imgur, Instagram, Reddit и YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Предпросмотры ссылок"; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 76bb87a72..ec82bde5d 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Pošiljaj povezave s predogledi"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Predogledi so na voljo za povezave na Imgur, Instagram, Reddit in YouTube"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index b35f541c2..e4f5d1a08 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 5222b7ced..cab765ba1 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Ftojeni me SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Të hidhet tej Media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Hidhe tej Median"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Kthehuni te Kamera"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Kthehuni te Mediateka"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Të ftohet një shok përmes SMS-s të pasigurt?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Anashkalimi i censurimit është aktivizuar për numrin e telefonit të llogarisë tuaj."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Anashkalimin e censurës e keni çaktivizuar dorazi."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Anashkalimi i censurimit mund të aktivizohet vetëm kur jeni i lidhur në internet."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Dërgo Paraparje Lidhjesh"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Paraparjet mbulohen për lidhje Imgur, Instagram, Reddit, dhe YouTube."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Paraparje Lidhjesh"; diff --git a/Signal/translations/sv.lproj/Localizable.strings b/Signal/translations/sv.lproj/Localizable.strings index a294a4477..9d12bc2b1 100644 --- a/Signal/translations/sv.lproj/Localizable.strings +++ b/Signal/translations/sv.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Bjud in via SMS: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Släng media?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Släng media"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Återgå till kameran"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Återgå till mediebiblioteket"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Bjud in en vän via osäkert SMS?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Kringgå censur har aktiverats baserat på ditt kontos telefonnummer"; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Du har manuellt inaktiverad censur kringgående."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Kringgå censur kan bara aktiveras när då internet är tillgängligt"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Skicka länkförhandsvisningar"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Förhandsvisningar stöds för Imgur-, Instagram-, Reddit- och YouTube-länkar."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Länkförhandsvisningar"; diff --git a/Signal/translations/th.lproj/Localizable.strings b/Signal/translations/th.lproj/Localizable.strings index f3e600700..2ee65bbd4 100644 --- a/Signal/translations/th.lproj/Localizable.strings +++ b/Signal/translations/th.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/tr.lproj/Localizable.strings b/Signal/translations/tr.lproj/Localizable.strings index 9b0915e9d..14d6e7e17 100644 --- a/Signal/translations/tr.lproj/Localizable.strings +++ b/Signal/translations/tr.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "SMS ile davet et: %@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "Medyayı İptal Et?"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Medyayı İptal Et"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "Kameraya Dön"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Medya Kütüphanesine Dön"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "Güvensiz SMS ile arkadaş davet edilsin mi?"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "Sansür atlatma hesabınızın telefon numarasına bağlı olarak etkinleştirildi."; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "Sansür atlatma özelliğini devre dışı bıraktınız."; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "Sansür atlatma sadece İnternet'e bağlıyken etkinleştirilebilir."; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Bağlantı Ön İzlemelerini Gönder"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Ön izlemeler Imgur, Instagram, Reddit, ve YouTube bağlantıları için desteklenmektedir."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Bağlantı Ön İzlemeleri"; diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings index f19a0fc58..ce60584a3 100644 --- a/Signal/translations/uk.lproj/Localizable.strings +++ b/Signal/translations/uk.lproj/Localizable.strings @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "Send Link Previews"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Reddit, and YouTube links."; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "Link Previews"; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index 0774741de..249a0138a 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "通过短信邀请：%@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "丢弃媒体？"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "丢弃媒体"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "返回相机"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "返回媒体库"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "通过非加密的短信邀请好友？"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "已根据您的电话号码启动审查规避。"; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "您已手动禁用了审查规避功能"; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "审查规避只能在联网时启动。"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "发送链接预览"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "预览现支持Imgur, Instagram, Reddit, 以及YouTube链接"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "链接预览"; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index c001069f6..1e4d4120d 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -1992,16 +1992,16 @@ "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "透過簡訊邀請：%@"; /* alert title when user attempts to leave the send media flow when they have an in-progress album */ -"SEND_MEDIA_ABANDON_TITLE" = "Discard Media?"; +"SEND_MEDIA_ABANDON_TITLE" = "放棄媒體檔案？"; /* alert action, confirming the user wants to exit the media flow and abandon any photos they've taken */ -"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "Discard Media"; +"SEND_MEDIA_CONFIRM_ABANDON_ALBUM" = "放棄媒體檔案。"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_CAMERA" = "Return to Camera"; +"SEND_MEDIA_RETURN_TO_CAMERA" = "回到照相機功能"; /* alert action when the user decides not to cancel the media flow after all. */ -"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "Return to Media Library"; +"SEND_MEDIA_RETURN_TO_MEDIA_LIBRARY" = "回到我的相簿"; /* No comment provided by engineer. */ "SEND_SMS_CONFIRM_TITLE" = "透過未加密的簡訊邀請朋友？"; @@ -2034,7 +2034,7 @@ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_AUTO_ENABLED" = "已根據你的電話號碼啟動審查規避。"; /* Table footer for the 'censorship circumvention' section shown when censorship circumvention has been manually disabled. */ -"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "You have manually disabled censorship circumvention."; +"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_MANUALLY_DISABLED" = "你已經手動關閉規避審查。"; /* Table footer for the 'censorship circumvention' section shown when the app is not connected to the internet. */ "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_FOOTER_NO_CONNECTION" = "審查規避只能在連上網路時啟動。"; @@ -2166,7 +2166,7 @@ "SETTINGS_LINK_PREVIEWS" = "傳送連結預覽"; /* Footer for setting for enabling & disabling link previews. */ -"SETTINGS_LINK_PREVIEWS_FOOTER" = "預覽功能支援 Imgur、Instagram、 Reddit 及 YouTube 的連結。"; +"SETTINGS_LINK_PREVIEWS_FOOTER" = "Previews are supported for Imgur, Instagram, Pinterest, Reddit, and YouTube links."; /* Header for setting for enabling & disabling link previews. */ "SETTINGS_LINK_PREVIEWS_HEADER" = "連結預覽"; From e0bba32505896cdfd41c1a5c1a16bb22e4222f32 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 22 Apr 2019 13:51:00 -0700 Subject: [PATCH 493/493] "Bump build to 2.39.0.2." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 34e8654fc..7396df8e5 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.39.0.1 + 2.39.0.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 3c20d56ba..0aa0ec6fa 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.39.0 CFBundleVersion - 2.39.0.1 + 2.39.0.2 ITSAppUsesNonExemptEncryption NSAppTransportSecurity