keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into switch-video-view

Browse Source
pull/792/head
Ryan Zhao 2 years ago
parent b2fcf48c73 37962fa071
commit 037c88395b
21 changed files with 142 additions and 52 deletions
Show Stats Download Patch File Download Diff File

12
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -6040,7 +6040,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -6113,7 +6113,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
@ -6179,7 +6179,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -6253,7 +6253,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
@ -7181,7 +7181,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -7253,7 +7253,7 @@
CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 393; CURRENT_PROJECT_VERSION = 395;
DEVELOPMENT_TEAM = SUQ8J2PCT7; DEVELOPMENT_TEAM = SUQ8J2PCT7;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

16
Session/Conversations/Context Menu/ContextMenuVC+Action.swift
Unescape Escape View File

@ -57,14 +57,17 @@ extension ContextMenuVC {
static func copy(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { static func copy(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
return Action( return Action(
icon: UIImage(named: "ic_copy"), icon: UIImage(named: "ic_copy"),
title: "copy".localized() title: "copy".localized(),
accessibilityLabel: "Copy text"
) { delegate?.copy(cellViewModel) } ) { delegate?.copy(cellViewModel) }
} }
static func copySessionID(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { static func copySessionID(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
return Action( return Action(
icon: UIImage(named: "ic_copy"), icon: UIImage(named: "ic_copy"),
title: "vc_conversation_settings_copy_session_id_button_title".localized() title: "vc_conversation_settings_copy_session_id_button_title".localized(),
accessibilityLabel: "Copy Session ID"
) { delegate?.copySessionID(cellViewModel) } ) { delegate?.copySessionID(cellViewModel) }
} }
@ -87,14 +90,16 @@ extension ContextMenuVC {
static func ban(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { static func ban(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
return Action( return Action(
icon: UIImage(named: "ic_block"), icon: UIImage(named: "ic_block"),
title: "context_menu_ban_user".localized() title: "context_menu_ban_user".localized(),
accessibilityLabel: "Ban user"
) { delegate?.ban(cellViewModel) } ) { delegate?.ban(cellViewModel) }
} }
static func banAndDeleteAllMessages(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { static func banAndDeleteAllMessages(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
return Action( return Action(
icon: UIImage(named: "ic_block"), icon: UIImage(named: "ic_block"),
title: "context_menu_ban_and_delete_all".localized() title: "context_menu_ban_and_delete_all".localized(),
accessibilityLabel: "Ban user and delete"
) { delegate?.banAndDeleteAllMessages(cellViewModel) } ) { delegate?.banAndDeleteAllMessages(cellViewModel) }
} }
@ -107,7 +112,8 @@ extension ContextMenuVC {
static func emojiPlusButton(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action { static func emojiPlusButton(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
return Action( return Action(
isEmojiPlus: true isEmojiPlus: true,
accessibilityLabel: "Add emoji"
) { delegate?.showFullEmojiKeyboard(cellViewModel) } ) { delegate?.showFullEmojiKeyboard(cellViewModel) }
} }

24
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -1604,6 +1604,23 @@ extension ConversationVC:
let thread: SessionThread = try SessionThread.fetchOne(db, id: threadId) let thread: SessionThread = try SessionThread.fetchOne(db, id: threadId)
else { return } else { return }
if
let quote = try? interaction.quote.fetchOne(db),
let quotedAttachment = try? quote.attachment.fetchOne(db),
quotedAttachment.isVisualMedia,
quotedAttachment.downloadUrl == Attachment.nonMediaQuoteFileId,
let quotedInteraction = try? quote.originalInteraction.fetchOne(db)
{
let attachment = try? quotedInteraction.attachments.fetchAll(db).first
try quote.with(
attachmentId: attachment?.cloneAsQuoteThumbnail()?.inserted(db).id
).update(db)
}
// Remove message sending jobs for the same interaction in database
// Prevent the same message being sent twice
try Job.filter(Job.Columns.interactionId == interaction.id).deleteAll(db)
try MessageSender.send( try MessageSender.send(
db, db,
interaction: interaction, interaction: interaction,
@ -1862,7 +1879,11 @@ extension ConversationVC:
} }
let actionSheet: UIAlertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) let actionSheet: UIAlertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
actionSheet.addAction(UIAlertAction(title: "delete_message_for_me".localized(), style: .destructive) { [weak self] _ in actionSheet.addAction(UIAlertAction(
title: "delete_message_for_me".localized(),
accessibilityIdentifier: "Delete for me",
style: .destructive
) { [weak self] _ in
Storage.shared.writeAsync { db in Storage.shared.writeAsync { db in
_ = try Interaction _ = try Interaction
.filter(id: cellViewModel.id) .filter(id: cellViewModel.id)
@ -1891,6 +1912,7 @@ extension ConversationVC:
) )
} }
}(), }(),
accessibilityIdentifier: "Delete for everyone",
style: .destructive style: .destructive
) { [weak self] _ in ) { [weak self] _ in
deleteRemotely( deleteRemotely(

13
Session/Conversations/Input View/ExpandingAttachmentsButton.swift
Unescape Escape View File

@ -26,28 +26,31 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
// MARK: UI Components // MARK: UI Components
lazy var gifButton: InputViewButton = { lazy var gifButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_gif_black"), delegate: self, hasOpaqueBackground: true) let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_gif_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityLabel = "GIF button" result.accessibilityIdentifier = "GIF button"
result.isAccessibilityElement = true
return result return result
}() }()
lazy var gifButtonContainer = container(for: gifButton) lazy var gifButtonContainer = container(for: gifButton)
lazy var documentButton: InputViewButton = { lazy var documentButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_document_black"), delegate: self, hasOpaqueBackground: true) let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_document_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityLabel = "Documents folder" result.accessibilityIdentifier = "Documents folder"
result.isAccessibilityElement = true
return result return result
}() }()
lazy var documentButtonContainer = container(for: documentButton) lazy var documentButtonContainer = container(for: documentButton)
lazy var libraryButton: InputViewButton = { lazy var libraryButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_roll_black"), delegate: self, hasOpaqueBackground: true) let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_roll_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityLabel = "Images folder" result.accessibilityIdentifier = "Images folder"
result.isAccessibilityElement = true
return result return result
}() }()
lazy var libraryButtonContainer = container(for: libraryButton) lazy var libraryButtonContainer = container(for: libraryButton)
lazy var cameraButton: InputViewButton = { lazy var cameraButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_black"), delegate: self, hasOpaqueBackground: true) let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityLabel = "Select camera button" result.accessibilityIdentifier = "Select camera button"
result.isAccessibilityElement = true
return result return result
}() }()

5
Session/Conversations/Input View/InputView.swift
Unescape Escape View File

@ -54,6 +54,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
private lazy var attachmentsButton: ExpandingAttachmentsButton = { private lazy var attachmentsButton: ExpandingAttachmentsButton = {
let result = ExpandingAttachmentsButton(delegate: delegate) let result = ExpandingAttachmentsButton(delegate: delegate)
result.accessibilityLabel = "Attachments button" result.accessibilityLabel = "Attachments button"
result.accessibilityIdentifier = "Attachments button"
result.isAccessibilityElement = true result.isAccessibilityElement = true
return result return result
@ -62,6 +63,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
private lazy var voiceMessageButton: InputViewButton = { private lazy var voiceMessageButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "Microphone"), delegate: self) let result = InputViewButton(icon: #imageLiteral(resourceName: "Microphone"), delegate: self)
result.accessibilityLabel = "New voice message" result.accessibilityLabel = "New voice message"
result.accessibilityIdentifier = "New voice message"
result.isAccessibilityElement = true result.isAccessibilityElement = true
return result return result
@ -70,6 +72,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
private lazy var sendButton: InputViewButton = { private lazy var sendButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "ArrowUp"), isSendButton: true, delegate: self) let result = InputViewButton(icon: #imageLiteral(resourceName: "ArrowUp"), isSendButton: true, delegate: self)
result.isHidden = true result.isHidden = true
result.accessibilityIdentifier = "Send message button"
result.accessibilityLabel = "Send message button" result.accessibilityLabel = "Send message button"
result.isAccessibilityElement = true result.isAccessibilityElement = true
@ -87,6 +90,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
private lazy var mentionsViewContainer: UIView = { private lazy var mentionsViewContainer: UIView = {
let result: UIView = UIView() let result: UIView = UIView()
result.accessibilityLabel = "Mentions list" result.accessibilityLabel = "Mentions list"
result.accessibilityIdentifier = "Mentions list"
result.isAccessibilityElement = true result.isAccessibilityElement = true
result.alpha = 0 result.alpha = 0
@ -119,6 +123,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
let maxWidth = UIScreen.main.bounds.width - 2 * InputViewButton.expandedSize - 2 * Values.smallSpacing - 2 * (Values.mediumSpacing - adjustment) let maxWidth = UIScreen.main.bounds.width - 2 * InputViewButton.expandedSize - 2 * Values.smallSpacing - 2 * (Values.mediumSpacing - adjustment)
let result = InputTextView(delegate: self, maxWidth: maxWidth) let result = InputTextView(delegate: self, maxWidth: maxWidth)
result.accessibilityLabel = "Message input box" result.accessibilityLabel = "Message input box"
result.accessibilityIdentifier = "Message input box"
result.isAccessibilityElement = true result.isAccessibilityElement = true
return result return result

3
Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift
Unescape Escape View File

@ -13,7 +13,8 @@ final class DeletedMessageView: UIView {
init(textColor: ThemeValue) { init(textColor: ThemeValue) {
super.init(frame: CGRect.zero) super.init(frame: CGRect.zero)
accessibilityIdentifier = "Deleted message"
isAccessibilityElement = true
setUpViewHierarchy(textColor: textColor) setUpViewHierarchy(textColor: textColor)
} }

3
Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift
Unescape Escape View File

@ -12,7 +12,8 @@ final class MediaPlaceholderView: UIView {
init(cellViewModel: MessageViewModel, textColor: ThemeValue) { init(cellViewModel: MessageViewModel, textColor: ThemeValue) {
super.init(frame: CGRect.zero) super.init(frame: CGRect.zero)
self.accessibilityLabel = "Untrusted attachment message" self.accessibilityIdentifier = "Untrusted attachment message"
self.isAccessibilityElement = true
setUpViewHierarchy(cellViewModel: cellViewModel, textColor: textColor) setUpViewHierarchy(cellViewModel: cellViewModel, textColor: textColor)
} }

11
Session/Conversations/Message Cells/Content Views/QuoteView.swift
Unescape Escape View File

@ -144,7 +144,7 @@ final class QuoteView: UIView {
.messageBubble_outgoingText : .messageBubble_outgoingText :
.messageBubble_incomingText .messageBubble_incomingText
) )
case .draft: return .messageBubble_outgoingText case .draft: return .textPrimary
} }
}() }()
imageView.contentMode = .center imageView.contentMode = .center
@ -156,10 +156,7 @@ final class QuoteView: UIView {
mainStackView.addArrangedSubview(imageView) mainStackView.addArrangedSubview(imageView)
if (body ?? "").isEmpty { if (body ?? "").isEmpty {
body = (attachment.isImage ? body = attachment.shortDescription
"Image" :
(isAudio ? "Audio" : "Document")
)
} }
// Generate the thumbnail if needed // Generate the thumbnail if needed
@ -223,10 +220,10 @@ final class QuoteView: UIView {
} }
.defaulting( .defaulting(
to: attachment.map { to: attachment.map {
NSAttributedString(string: MIMETypeUtil.isAudio($0.contentType) ? "Audio" : "Document") NSAttributedString(string: $0.shortDescription, attributes: [ .foregroundColor: textColor ])
} }
) )
.defaulting(to: NSAttributedString(string: "Document")) .defaulting(to: NSAttributedString(string: "QUOTED_MESSAGE_NOT_FOUND".localized(), attributes: [ .foregroundColor: textColor ]))
} }
// Label stack view // Label stack view

3
Session/Conversations/Message Cells/Content Views/VoiceMessageView.swift
Unescape Escape View File

@ -98,7 +98,8 @@ public final class VoiceMessageView: UIView {
init() { init() {
super.init(frame: CGRect.zero) super.init(frame: CGRect.zero)
self.accessibilityIdentifier = "Voice message"
self.isAccessibilityElement = true
setUpViewHierarchy() setUpViewHierarchy()
} }

26
Session/Conversations/Message Cells/VisibleMessageCell.swift
Unescape Escape View File

@ -150,15 +150,17 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
internal lazy var messageStatusLabel: UILabel = { internal lazy var messageStatusLabel: UILabel = {
let result = UILabel() let result = UILabel()
result.accessibilityIdentifier = "Message sent status"
result.accessibilityLabel = "Message sent status" result.accessibilityLabel = "Message sent status"
result.font = .systemFont(ofSize: Values.verySmallFontSize) result.font = .systemFont(ofSize: Values.verySmallFontSize)
result.themeTextColor = .messageBubble_deliveryStatus result.themeTextColor = .messageBubble_deliveryStatus
return result return result
}() }()
internal lazy var messageStatusImageView: UIImageView = { internal lazy var messageStatusImageView: UIImageView = {
let result = UIImageView() let result = UIImageView()
result.accessibilityIdentifier = "Message sent status tick"
result.accessibilityLabel = "Message sent status tick" result.accessibilityLabel = "Message sent status tick"
result.contentMode = .scaleAspectFit result.contentMode = .scaleAspectFit
result.themeTintColor = .messageBubble_deliveryStatus result.themeTintColor = .messageBubble_deliveryStatus
@ -425,6 +427,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
messageStatusLabel.text = statusText messageStatusLabel.text = statusText
messageStatusLabel.themeTextColor = tintColor messageStatusLabel.themeTextColor = tintColor
messageStatusImageView.image = image messageStatusImageView.image = image
messageStatusLabel.accessibilityIdentifier = "Message sent status: \(statusText ?? "invalid")"
messageStatusImageView.themeTintColor = tintColor messageStatusImageView.themeTintColor = tintColor
messageStatusContainerView.isHidden = ( messageStatusContainerView.isHidden = (
cellViewModel.variant != .standardOutgoing || cellViewModel.variant != .standardOutgoing ||
@ -470,6 +473,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
subview.removeFromSuperview() subview.removeFromSuperview()
} }
albumView = nil albumView = nil
albumView = nil
bodyTappableLabel = nil bodyTappableLabel = nil
// Handle the deleted state first (it's much simpler than the others) // Handle the deleted state first (it's much simpler than the others)
@ -541,7 +545,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
let quoteView: QuoteView = QuoteView( let quoteView: QuoteView = QuoteView(
for: .regular, for: .regular,
authorId: quote.authorId, authorId: quote.authorId,
quotedText: quote.body ?? "QUOTED_MESSAGE_NOT_FOUND".localized(), quotedText: quote.body,
threadVariant: cellViewModel.threadVariant, threadVariant: cellViewModel.threadVariant,
currentUserPublicKey: cellViewModel.currentUserPublicKey, currentUserPublicKey: cellViewModel.currentUserPublicKey,
currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey,
@ -770,15 +774,15 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
// MARK: - Interaction // MARK: - Interaction
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { // override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
if let bodyTappableLabel = bodyTappableLabel { // if let bodyTappableLabel = bodyTappableLabel {
let btIngetBodyTappableLabelCoordinates = convert(point, to: bodyTappableLabel) // let btIngetBodyTappableLabelCoordinates = convert(point, to: bodyTappableLabel)
if bodyTappableLabel.bounds.contains(btIngetBodyTappableLabelCoordinates) { // if bodyTappableLabel.bounds.contains(btIngetBodyTappableLabelCoordinates) {
return bodyTappableLabel // return bodyTappableLabel
} // }
} // }
return super.hitTest(point, with: event) // return super.hitTest(point, with: event)
} // }
override func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { override func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
return true // Needed for the pan gesture recognizer to work with the table view's pan gesture recognizer return true // Needed for the pan gesture recognizer to work with the table view's pan gesture recognizer

10
Session/Conversations/Settings/ThreadSettingsViewModel.swift
Unescape Escape View File

@ -206,6 +206,10 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
threadVariant == .closedGroup && threadVariant == .closedGroup &&
threadViewModel.currentUserIsClosedGroupMember == true threadViewModel.currentUserIsClosedGroupMember == true
) )
let currentUserIsClosedGroupAdmin: Bool = (
threadVariant == .closedGroup &&
threadViewModel.currentUserIsClosedGroupAdmin == true
)
return [ return [
SectionModel( SectionModel(
@ -391,7 +395,7 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
accessibilityLabel: "Leave group", accessibilityLabel: "Leave group",
confirmationInfo: ConfirmationModal.Info( confirmationInfo: ConfirmationModal.Info(
title: "CONFIRM_LEAVE_GROUP_TITLE".localized(), title: "CONFIRM_LEAVE_GROUP_TITLE".localized(),
explanation: (currentUserIsClosedGroupMember ? explanation: (currentUserIsClosedGroupAdmin ?
"Because you are the creator of this group it will be deleted for everyone. This cannot be undone." : "Because you are the creator of this group it will be deleted for everyone. This cannot be undone." :
"CONFIRM_LEAVE_GROUP_DESCRIPTION".localized() "CONFIRM_LEAVE_GROUP_DESCRIPTION".localized()
), ),
@ -678,9 +682,9 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
nil nil
), ),
accessibilityLabel: oldBlockedState == false ? "User blocked" : "Confirm unblock", accessibilityLabel: oldBlockedState == false ? "User blocked" : "Confirm unblock",
accessibilityId: "OK", accessibilityId: "Test_name",
cancelTitle: "BUTTON_OK".localized(), cancelTitle: "BUTTON_OK".localized(),
cancelAccessibilityLabel: "OK", cancelAccessibilityLabel: "OK_BUTTON",
cancelStyle: .alert_text cancelStyle: .alert_text
) )
) )

1
Session/Media Viewing & Editing/GIFs/GifPickerCell.swift
Unescape Escape View File

@ -218,6 +218,7 @@ class GifPickerCell: UICollectionViewCell {
return return
} }
imageView.image = image imageView.image = image
imageView.accessibilityIdentifier = "gif cell"
self.themeBackgroundColor = nil self.themeBackgroundColor = nil
if self.isCellSelected { if self.isCellSelected {

2
Session/Onboarding/RegisterVC.swift
Unescape Escape View File

@ -172,7 +172,7 @@ final class RegisterVC : BaseVC {
private func updatePublicKeyLabel() { private func updatePublicKeyLabel() {
let hexEncodedPublicKey = x25519KeyPair.hexEncodedPublicKey let hexEncodedPublicKey = x25519KeyPair.hexEncodedPublicKey
publicKeyLabel.accessibilityLabel = hexEncodedPublicKey publicKeyLabel.accessibilityLabel = hexEncodedPublicKey
publicKeyLabel.accessibilityIdentifier = "Session ID generated" publicKeyLabel.accessibilityIdentifier = "Session ID"
publicKeyLabel.isAccessibilityElement = true publicKeyLabel.isAccessibilityElement = true
let characterCount = hexEncodedPublicKey.count let characterCount = hexEncodedPublicKey.count
var count = 0 var count = 0

2
Session/Shared/Views/SessionAvatarCell.swift
Unescape Escape View File

@ -63,6 +63,7 @@ class SessionAvatarCell: UITableViewCell {
fileprivate let displayNameContainer: UIView = { fileprivate let displayNameContainer: UIView = {
let view: UIView = UIView() let view: UIView = UIView()
view.translatesAutoresizingMaskIntoConstraints = false view.translatesAutoresizingMaskIntoConstraints = false
view.accessibilityIdentifier = "Username"
view.accessibilityLabel = "Username" view.accessibilityLabel = "Username"
view.isAccessibilityElement = true view.isAccessibilityElement = true
@ -266,6 +267,7 @@ class SessionAvatarCell: UITableViewCell {
} }
let completion: (Bool) -> Void = { [weak self] complete in let completion: (Bool) -> Void = { [weak self] complete in
self?.displayNameTextField.text = self?.originalInputValue self?.displayNameTextField.text = self?.originalInputValue
self?.displayNameContainer.accessibilityLabel = self?.displayNameLabel.text
} }
if animated { if animated {

7
SessionMessagingKit/Database/Models/Attachment.swift
Unescape Escape View File

@ -787,6 +787,13 @@ extension Attachment {
public var isText: Bool { MIMETypeUtil.isText(contentType) } public var isText: Bool { MIMETypeUtil.isText(contentType) }
public var isMicrosoftDoc: Bool { MIMETypeUtil.isMicrosoftDoc(contentType) } public var isMicrosoftDoc: Bool { MIMETypeUtil.isMicrosoftDoc(contentType) }
public var shortDescription: String {
if isImage { return "Image" }
if isAudio { return "Audio" }
if isVideo { return "Video" }
return "Document"
}
public func readDataFromFile() throws -> Data? { public func readDataFromFile() throws -> Data? {
guard let filePath: String = self.originalFilePath else { guard let filePath: String = self.originalFilePath else {
return nil return nil

20
SessionMessagingKit/Database/Models/Quote.swift
Unescape Escape View File

@ -76,6 +76,26 @@ public struct Quote: Codable, Equatable, Hashable, FetchableRecord, PersistableR
} }
} }
// MARK: - Mutation
public extension Quote {
func with(
interactionId: Int64? = nil,
authorId: String? = nil,
timestampMs: Int64? = nil,
body: String? = nil,
attachmentId: String? = nil
) -> Quote {
return Quote(
interactionId: interactionId ?? self.interactionId,
authorId: authorId ?? self.authorId,
timestampMs: timestampMs ?? self.timestampMs,
body: body ?? self.body,
attachmentId: attachmentId ?? self.attachmentId
)
}
}
// MARK: - Protobuf // MARK: - Protobuf
public extension Quote { public extension Quote {

2
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
Unescape Escape View File

@ -420,7 +420,7 @@ extension MessageReceiver {
// Delete the members to remove // Delete the members to remove
try GroupMember try GroupMember
.filter(GroupMember.Columns.groupId == id) .filter(GroupMember.Columns.groupId == id)
.filter(updatedMemberIds.contains(GroupMember.Columns.profileId)) .filter(membersToRemove.map{ $0.profileId }.contains(GroupMember.Columns.profileId))
.deleteAll(db) .deleteAll(db)
if didAdminLeave || sender == userPublicKey { if didAdminLeave || sender == userPublicKey {

20
SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
Unescape Escape View File

@ -825,6 +825,10 @@ public extension SessionThreadViewModel {
let profileIdColumnLiteral: SQL = SQL(stringLiteral: Profile.Columns.id.name) let profileIdColumnLiteral: SQL = SQL(stringLiteral: Profile.Columns.id.name)
let groupMemberProfileIdColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.profileId.name)
let groupMemberRoleColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.role.name)
let groupMemberGroupIdColumnLiteral: SQL = SQL(stringLiteral: GroupMember.Columns.groupId.name)
/// **Note:** The `numColumnsBeforeProfiles` value **MUST** match the number of fields before /// **Note:** The `numColumnsBeforeProfiles` value **MUST** match the number of fields before
/// the `ViewModel.contactProfileKey` entry below otherwise the query will fail to /// the `ViewModel.contactProfileKey` entry below otherwise the query will fail to
/// parse and might throw /// parse and might throw
@ -851,7 +855,8 @@ public extension SessionThreadViewModel {
\(ViewModel.closedGroupProfileBackFallbackKey).*, \(ViewModel.closedGroupProfileBackFallbackKey).*,
\(closedGroup[.name]) AS \(ViewModel.closedGroupNameKey), \(closedGroup[.name]) AS \(ViewModel.closedGroupNameKey),
(\(groupMember[.profileId]) IS NOT NULL) AS \(ViewModel.currentUserIsClosedGroupMemberKey), (\(ViewModel.currentUserIsClosedGroupMemberKey).profileId IS NOT NULL) AS \(ViewModel.currentUserIsClosedGroupMemberKey),
(\(ViewModel.currentUserIsClosedGroupAdminKey).profileId IS NOT NULL) AS \(ViewModel.currentUserIsClosedGroupAdminKey),
\(openGroup[.name]) AS \(ViewModel.openGroupNameKey), \(openGroup[.name]) AS \(ViewModel.openGroupNameKey),
\(openGroup[.server]) AS \(ViewModel.openGroupServerKey), \(openGroup[.server]) AS \(ViewModel.openGroupServerKey),
\(openGroup[.roomToken]) AS \(ViewModel.openGroupRoomTokenKey), \(openGroup[.roomToken]) AS \(ViewModel.openGroupRoomTokenKey),
@ -865,10 +870,15 @@ public extension SessionThreadViewModel {
LEFT JOIN \(Profile.self) AS \(ViewModel.contactProfileKey) ON \(ViewModel.contactProfileKey).\(profileIdColumnLiteral) = \(thread[.id]) LEFT JOIN \(Profile.self) AS \(ViewModel.contactProfileKey) ON \(ViewModel.contactProfileKey).\(profileIdColumnLiteral) = \(thread[.id])
LEFT JOIN \(OpenGroup.self) ON \(openGroup[.threadId]) = \(thread[.id]) LEFT JOIN \(OpenGroup.self) ON \(openGroup[.threadId]) = \(thread[.id])
LEFT JOIN \(ClosedGroup.self) ON \(closedGroup[.threadId]) = \(thread[.id]) LEFT JOIN \(ClosedGroup.self) ON \(closedGroup[.threadId]) = \(thread[.id])
LEFT JOIN \(GroupMember.self) ON ( LEFT JOIN \(GroupMember.self) AS \(ViewModel.currentUserIsClosedGroupMemberKey) ON (
\(SQL("\(groupMember[.role]) = \(GroupMember.Role.standard)")) AND \(SQL("\(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberRoleColumnLiteral) != \(GroupMember.Role.zombie)")) AND
\(groupMember[.groupId]) = \(closedGroup[.threadId]) AND \(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberGroupIdColumnLiteral) = \(closedGroup[.threadId]) AND
\(SQL("\(groupMember[.profileId]) = \(userPublicKey)")) \(SQL("\(ViewModel.currentUserIsClosedGroupMemberKey).\(groupMemberProfileIdColumnLiteral) = \(userPublicKey)"))
)
LEFT JOIN \(GroupMember.self) AS \(ViewModel.currentUserIsClosedGroupAdminKey) ON (
\(SQL("\(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberRoleColumnLiteral) = \(GroupMember.Role.admin)")) AND
\(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberGroupIdColumnLiteral) = \(closedGroup[.threadId]) AND
\(SQL("\(ViewModel.currentUserIsClosedGroupAdminKey).\(groupMemberProfileIdColumnLiteral) = \(userPublicKey)"))
) )
LEFT JOIN \(Profile.self) AS \(ViewModel.closedGroupProfileFrontKey) ON ( LEFT JOIN \(Profile.self) AS \(ViewModel.closedGroupProfileFrontKey) ON (

8
SessionUIKit/Components/ConfirmationModal.swift
Unescape Escape View File

@ -22,7 +22,7 @@ public class ConfirmationModal: Modal {
let explanation: String? let explanation: String?
let attributedExplanation: NSAttributedString? let attributedExplanation: NSAttributedString?
let accessibilityLabel: String? let accessibilityLabel: String?
let accessibilityId: String? let accessibilityIdentifier: String?
public let stateToShow: State public let stateToShow: State
let confirmTitle: String? let confirmTitle: String?
let confirmAccessibilityLabel: String? let confirmAccessibilityLabel: String?
@ -57,7 +57,7 @@ public class ConfirmationModal: Modal {
self.explanation = explanation self.explanation = explanation
self.attributedExplanation = attributedExplanation self.attributedExplanation = attributedExplanation
self.accessibilityLabel = accessibilityLabel self.accessibilityLabel = accessibilityLabel
self.accessibilityId = accessibilityId self.accessibilityIdentifier = accessibilityId
self.stateToShow = stateToShow self.stateToShow = stateToShow
self.confirmTitle = confirmTitle self.confirmTitle = confirmTitle
self.confirmAccessibilityLabel = confirmAccessibilityLabel self.confirmAccessibilityLabel = confirmAccessibilityLabel
@ -241,8 +241,8 @@ public class ConfirmationModal: Modal {
cancelButton.setTitle(info.cancelTitle, for: .normal) cancelButton.setTitle(info.cancelTitle, for: .normal)
cancelButton.setThemeTitleColor(info.cancelStyle, for: .normal) cancelButton.setThemeTitleColor(info.cancelStyle, for: .normal)
self.accessibilityLabel = info.accessibilityLabel self.contentView.accessibilityLabel = info.accessibilityLabel
self.contentView.accessibilityIdentifier = info.accessibilityId self.contentView.accessibilityIdentifier = info.accessibilityIdentifier
} }
required init?(coder: NSCoder) { required init?(coder: NSCoder) {

4
SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
Unescape Escape View File

@ -58,6 +58,8 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
self.themeBackgroundColor = .clear self.themeBackgroundColor = .clear
textView.delegate = self textView.delegate = self
textView.accessibilityIdentifier = "Text input box"
textView.isAccessibilityElement = true
let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.") let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")
sendButton.setTitle(sendTitle, for: .normal) sendButton.setTitle(sendTitle, for: .normal)
@ -66,6 +68,8 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate {
sendButton.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize) sendButton.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize)
sendButton.titleLabel?.textAlignment = .center sendButton.titleLabel?.textAlignment = .center
sendButton.themeTintColor = .textPrimary sendButton.themeTintColor = .textPrimary
sendButton.accessibilityIdentifier = "Send button"
sendButton.isAccessibilityElement = true
// Increase hit area of send button // Increase hit area of send button
sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8) sendButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 8, bottom: 6, right: 8)

2
SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift
Unescape Escape View File

@ -40,6 +40,8 @@ public class ModalActivityIndicatorViewController: OWSViewController {
result.set(.width, to: 64) result.set(.width, to: 64)
result.set(.height, to: 64) result.set(.height, to: 64)
result.accessibilityIdentifier = "Loading animation"
ThemeManager.onThemeChange(observer: result) { [weak result] theme, _ in ThemeManager.onThemeChange(observer: result) { [weak result] theme, _ in
guard let textPrimary: UIColor = theme.color(for: .textPrimary) else { return } guard let textPrimary: UIColor = theme.color(for: .textPrimary) else { return }

Write Preview
Loading…
Cancel
Save