From a8e9b87f0391d6f5c007ebb48b842c4645991bc0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 18 Mar 2019 11:24:09 -0400 Subject: [PATCH] Rework menu actions focus item layout. --- .../ConversationViewController.m | 209 +- .../ConversationView/ConversationViewModel.h | 3 - .../ConversationView/ConversationViewModel.m | 6 - .../MenuActionsViewController.swift | 85 +- temp.txt | 16486 ---------------- 5 files changed, 189 insertions(+), 16600 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)); + self.menuActionsViewController = nil; + self.contentInsetPadding = 0; +} - // 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)scrollToFocusInteractionIfNecessary +{ + if (self.menuActionsViewController != nil) { + [self scrollToFocusInteraction:NO]; + } } -- (void)menuActions:(MenuActionsViewController *)menuActionsViewController - isDismissingWithVerticalFocusChange:(CGFloat)verticalChange +- (void)scrollToFocusInteraction:(BOOL)animated { - UIEdgeInsets oldInset = self.collectionView.contentInset; - CGPoint oldOffset = self.collectionView.contentOffset; + NSValue *_Nullable contentOffset = [self contentOffsetForFocusInteraction]; + if (contentOffset == nil) { + OWSFailDebug(@"Missing contentOffset."); + return; + } + [self.collectionView setContentOffset:contentOffset.CGPointValue animated:animated]; +} - UIEdgeInsets newInset = oldInset; - CGPoint newOffset = oldOffset; +- (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; - // 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; + 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)]; +} - OWSLogDebug(@"verticalChange: %f, insets: %@ -> %@", - verticalChange, - NSStringFromUIEdgeInsets(oldInset), - NSStringFromUIEdgeInsets(newInset)); +- (void)dismissMenuActionsIfNecessary +{ + if (self.shouldDismissMenuActions) { + [self dismissMenuActions]; + } +} - // 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; +- (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