diff --git a/Signal/src/Loki/View Controllers/GroupMembersVC.swift b/Signal/src/Loki/View Controllers/GroupMembersVC.swift index 9333fef69..4dab2cd7e 100644 --- a/Signal/src/Loki/View Controllers/GroupMembersVC.swift +++ b/Signal/src/Loki/View Controllers/GroupMembersVC.swift @@ -47,13 +47,24 @@ final class GroupMembersVC : UIViewController, UITableViewDataSource { titleLabel.textColor = Colors.text titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize) navigationItem.titleView = titleLabel - // Set up table view + let explanationLabel = UILabel() + explanationLabel.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity) + explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) + explanationLabel.text = NSLocalizedString("The ability to add members to a closed group is coming soon.", comment: "") + explanationLabel.numberOfLines = 0 + explanationLabel.textAlignment = .center + explanationLabel.lineBreakMode = .byWordWrapping + // Set up view hierarchy + view.addSubview(explanationLabel) + explanationLabel.pin(.leading, to: .leading, of: view, withInset: Values.largeSpacing) + explanationLabel.pin(.top, to: .top, of: view, withInset: Values.mediumSpacing) + explanationLabel.pin(.trailing, to: .trailing, of: view, withInset: -Values.largeSpacing) let separator = UIView() separator.backgroundColor = Colors.separator separator.set(.height, to: Values.separatorThickness) view.addSubview(separator) separator.pin(.leading, to: .leading, of: view) - separator.pin(.top, to: .top, of: view) + separator.pin(.top, to: .bottom, of: explanationLabel, withInset: Values.mediumSpacing) separator.pin(.trailing, to: .trailing, of: view) view.addSubview(tableView) tableView.pin(.leading, to: .leading, of: view) diff --git a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift index 1766f5f43..ba42daa13 100644 --- a/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift +++ b/Signal/src/Loki/View Controllers/JoinPublicChatVC.swift @@ -176,7 +176,7 @@ private final class EnterChatURLVC : UIViewController { // MARK: Components private lazy var chatURLTextField: TextField = { - let result = TextField(placeholder: "https://chat.lokinet.org") + let result = TextField(placeholder: "https://chat.getsession.org") result.keyboardType = .URL result.autocapitalizationType = .none return result diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 8dc7b8a4f..d3840337b 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2801,3 +2801,4 @@ "Open groups can be joined by anyone and do not provide full metadata protection" = "Open groups can be joined by anyone and do not provide full metadata protection"; "Search GIFs?" = "Search GIFs?"; "You will not have full metadata protection when sending GIFs." = "You will not have full metadata protection when sending GIFs."; +"The ability to add members to a closed group is coming soon." = "The ability to add members to a closed group is coming soon."; diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 618672752..ff1155cb1 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1788,12 +1788,10 @@ NS_ASSUME_NONNULL_BEGIN if (thread.friendRequestStatus == LKThreadFriendRequestStatusNone) { return; } // Become happy friends and go on great adventures [thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction]; - dispatch_async(dispatch_get_main_queue(), ^{ - TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class]; - if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) { - [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction]; - } - }); + TSOutgoingMessage *existingFriendRequestMessage = [thread.lastInteraction as:TSOutgoingMessage.class]; + if (existingFriendRequestMessage != nil && existingFriendRequestMessage.isFriendRequest) { + [existingFriendRequestMessage saveFriendRequestStatus:LKMessageFriendRequestStatusAccepted withTransaction:transaction]; + } // Send our P2P details LKAddressMessage *_Nullable onlineMessage = [LKP2PAPI onlineBroadcastMessageForThread:thread]; if (onlineMessage != nil) {