Merge pull request #772 from oxen-io/dev

Release 2.2.5

Author: RyanRory

Session.xcodeproj/project.pbxproj

@@ -7212,7 +7212,7 @@
 					"$(SRCROOT)",
 				);
 				LLVM_LTO = NO;
-				MARKETING_VERSION = 2.2.4;
+				MARKETING_VERSION = 2.2.5;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
@@ -7284,7 +7284,7 @@
 					"$(SRCROOT)",
 				);
 				LLVM_LTO = NO;
-				MARKETING_VERSION = 2.2.4;
+				MARKETING_VERSION = 2.2.5;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger";
 				PRODUCT_NAME = Session;

Session/Calls/Call Management/SessionCall.swift

@@ -206,7 +206,7 @@ public final class SessionCall: CurrentCallProtocol, WebRTCSessionDelegate {
             let thread: SessionThread = try? SessionThread.fetchOne(db, id: sessionId)
         else { return }
 
-        let timestampMs: Int64 = Int64(floor(Date().timeIntervalSince1970 * 1000))
+        let timestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
         let message: CallMessage = CallMessage(
             uuid: self.uuid,
             kind: .preOffer,

Session/Calls/CallVC.swift

@@ -112,6 +112,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
 
     private lazy var hangUpButton: UIButton = {
         let result = UIButton(type: .custom)
+        result.accessibilityLabel = "End call button"
         result.setImage(
             UIImage(named: "EndCall")?
                 .withRenderingMode(.alwaysTemplate),

Session/Closed Groups/EditClosedGroupVC.swift

@@ -13,6 +13,8 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
         let profileId: String
         let role: GroupMember.Role
         let profile: Profile?
+        let accessibilityLabel: String?
+        let accessibilityId: String?
     }
 
     private let threadId: String
@@ -30,6 +32,8 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
 
     private lazy var groupNameLabel: UILabel = {
         let result: UILabel = UILabel()
+        result.accessibilityLabel = "Group name"
+        result.isAccessibilityElement = true
         result.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
         result.themeTextColor = .textPrimary
         result.lineBreakMode = .byTruncatingTail
@@ -44,12 +48,16 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
             usesDefaultHeight: false
         )
         result.textAlignment = .center
+        result.isAccessibilityElement = true
+        result.accessibilityIdentifier = "Group name text field"
 
         return result
     }()
 
     private lazy var addMembersButton: SessionButton = {
         let result: SessionButton = SessionButton(style: .bordered, size: .medium)
+        result.accessibilityLabel = "Add members"
+        result.isAccessibilityElement = true
         result.setTitle("vc_conversation_settings_invite_button_title".localized(), for: .normal)
         result.addTarget(self, action: #selector(addMembers), for: UIControl.Event.touchUpInside)
         result.contentEdgeInsets = UIEdgeInsets(top: 0, leading: Values.mediumSpacing, bottom: 0, trailing: Values.mediumSpacing)
@@ -59,6 +67,9 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
 
     @objc private lazy var tableView: UITableView = {
         let result: UITableView = UITableView()
+        result.accessibilityLabel = "Contact"
+        result.accessibilityIdentifier = "Contact"
+        result.isAccessibilityElement = true
         result.dataSource = self
         result.delegate = self
         result.separatorStyle = .none
@@ -264,6 +275,12 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
         }
 
         let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleDoneButtonTapped))
+        if isEditingGroupName {
+            doneButton.accessibilityLabel = "Accept name change"
+        }
+        else {
+            doneButton.accessibilityLabel = "Apply changes"
+        }
         doneButton.themeTintColor = .textPrimary
         navigationItem.rightBarButtonItem = doneButton
     }
@@ -343,7 +360,9 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
                         GroupMemberDisplayInfo(
                             profileId: profile.id,
                             role: .standard,
-                            profile: profile
+                            profile: profile,
+                            accessibilityLabel: "Contact",
+                            accessibilityId: "Contact"
                         )
                     }
                 self?.membersAndZombies = (self?.membersAndZombies ?? [])

Session/Closed Groups/NewClosedGroupVC.swift

@@ -9,15 +9,17 @@ import SessionMessagingKit
 import SignalUtilitiesKit
 
 private protocol TableViewTouchDelegate {
-    func tableViewWasTouched(_ tableView: TableView)
+    func tableViewWasTouched(_ tableView: TableView, withView hitView: UIView?)
 }
 
 private final class TableView: UITableView {
     var touchDelegate: TableViewTouchDelegate?
 
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        touchDelegate?.tableViewWasTouched(self)
-        return super.hitTest(point, with: event)
+        let resultingView: UIView? = super.hitTest(point, with: event)
+        touchDelegate?.tableViewWasTouched(self, withView: resultingView)
+        
+        return resultingView
     }
 }
 
@@ -48,6 +50,8 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
         result.themeBorderColor = .borderSeparator
         result.layer.cornerRadius = 13
         result.delegate = self
+        result.accessibilityIdentifier = "Group name input"
+        result.isAccessibilityElement = true
 
         return result
     }()
@@ -133,6 +137,8 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
         result.translatesAutoresizingMaskIntoConstraints = false
         result.setTitle("CREATE_GROUP_BUTTON_TITLE".localized(), for: .normal)
         result.addTarget(self, action: #selector(createClosedGroup), for: .touchUpInside)
+        result.accessibilityIdentifier = "Create group"
+        result.isAccessibilityElement = true
         result.set(.width, to: 160)
 
         return result
@@ -151,6 +157,8 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.themeTintColor = .textPrimary
         navigationItem.rightBarButtonItem = closeButton
+        navigationItem.leftBarButtonItem?.accessibilityIdentifier = "Cancel"
+        navigationItem.leftBarButtonItem?.isAccessibilityElement = true
 
         // Set up content
         setUpViewHierarchy()
@@ -204,8 +212,9 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                 title: profile.displayName(),
                 rightAccessory: .radio(isSelected: { [weak self] in
                     self?.selectedContacts.contains(profile.id) == true
-                })
-            ),
+                }),
+                accessibilityIdentifier: "Contact"
+        ),
             style: .edgeToEdge,
             position: Position.with(indexPath.row, count: data[indexPath.section].elements.count)
         )
@@ -268,10 +277,23 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
         )
     }
 
-    fileprivate func tableViewWasTouched(_ tableView: TableView) {
+    fileprivate func tableViewWasTouched(_ tableView: TableView, withView hitView: UIView?) {
         if nameTextField.isFirstResponder {
             nameTextField.resignFirstResponder()
         }
+        else if searchBar.isFirstResponder {
+            var hitSuperview: UIView? = hitView?.superview
+            
+            while hitSuperview != nil && hitSuperview != searchBar {
+                hitSuperview = hitSuperview?.superview
+            }
+            
+            // If the user hit the cancel button then do nothing (we want to let the cancel
+            // button remove the focus or it will instantly refocus)
+            if hitSuperview == searchBar { return }
+            
+            searchBar.resignFirstResponder()
+        }
     }
 
     @objc private func close() {
@@ -286,6 +308,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                     explanation: message,
                     cancelTitle: "BUTTON_OK".localized(),
                     cancelStyle: .alert_text
+                    
                 )
             )
             present(modal, animated: true)

Session/Conversations/Context Menu/ContextMenuVC+Action.swift

@@ -10,6 +10,7 @@ extension ContextMenuVC {
         let isEmojiAction: Bool
         let isEmojiPlus: Bool
         let isDismissAction: Bool
+        let accessibilityLabel: String?
         let work: () -> Void
 
         // MARK: - Initialization
@@ -20,13 +21,15 @@ extension ContextMenuVC {
             isEmojiAction: Bool = false,
             isEmojiPlus: Bool = false,
             isDismissAction: Bool = false,
+            accessibilityLabel: String? = nil,
             work: @escaping () -> Void
         ) {
             self.icon = icon
             self.title = title
             self.isEmojiAction = isEmojiAction
             self.isEmojiPlus = isEmojiPlus
             self.isDismissAction = isDismissAction
+            self.accessibilityLabel = accessibilityLabel
             self.work = work
         }
 
@@ -35,7 +38,8 @@ extension ContextMenuVC {
         static func reply(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
                 icon: UIImage(named: "ic_reply"),
-                title: "context_menu_reply".localized()
+                title: "context_menu_reply".localized(),
+                accessibilityLabel: "Reply to message"
             ) { delegate?.reply(cellViewModel) }
         }
 
@@ -56,14 +60,16 @@ extension ContextMenuVC {
         static func delete(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
                 icon: UIImage(named: "ic_trash"),
-                title: "TXT_DELETE_TITLE".localized()
+                title: "TXT_DELETE_TITLE".localized(),
+                accessibilityLabel: "Delete message"
             ) { delegate?.delete(cellViewModel) }
         }
 
         static func save(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
                 icon: UIImage(named: "ic_download"),
-                title: "context_menu_save".localized()
+                title: "context_menu_save".localized(),
+                accessibilityLabel: "Save attachment"
             ) { delegate?.save(cellViewModel) }
         }
 

Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift

@@ -40,7 +40,7 @@ extension ContextMenuVC {
             self.dismiss = dismiss
 
             super.init(frame: CGRect.zero)
-            
+            self.accessibilityLabel = action.accessibilityLabel
             setUpViewHierarchy()
         }
 

Session/Conversations/ConversationVC+Interaction.swift

@@ -69,6 +69,8 @@ extension ConversationVC:
                     title: "modal_call_permission_request_title".localized(),
                     explanation: "modal_call_permission_request_explanation".localized(),
                     confirmTitle: "vc_settings_title".localized(),
+                    confirmAccessibilityLabel: "Settings",
+                    cancelAccessibilityLabel: "Cancel",
                     dismissOnConfirm: false // Custom dismissal logic
                 ) { [weak self] _ in
                     self?.dismiss(animated: true) {
@@ -135,6 +137,8 @@ extension ConversationVC:
                         range: (message as NSString).range(of: self.viewModel.threadData.displayName)
                     ),
                 confirmTitle: "modal_blocked_button_title".localized(),
+                confirmAccessibilityLabel: "Confirm block",
+                cancelAccessibilityLabel: "Cancel block",
                 dismissOnConfirm: false // Custom dismissal logic
             ) { [weak self] _ in
                 self?.viewModel.unblockContact()
@@ -405,7 +409,7 @@ extension ConversationVC:
         // flags appropriately
         let threadId: String = self.viewModel.threadData.threadId
         let oldThreadShouldBeVisible: Bool = (self.viewModel.threadData.threadShouldBeVisible == true)
-        let sentTimestampMs: Int64 = Int64(floor((Date().timeIntervalSince1970 * 1000)))
+        let sentTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
         let linkPreviewDraft: LinkPreviewDraft? = snInputView.linkPreviewInfo?.draft
         let quoteModel: QuotedReplyModel? = snInputView.quoteDraftInfo?.model
 
@@ -530,7 +534,7 @@ extension ConversationVC:
         // flags appropriately
         let threadId: String = self.viewModel.threadData.threadId
         let oldThreadShouldBeVisible: Bool = (self.viewModel.threadData.threadShouldBeVisible == true)
-        let sentTimestampMs: Int64 = Int64(floor((Date().timeIntervalSince1970 * 1000)))
+        let sentTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
 
         // If this was a message request then approve it
         approveMessageRequestIfNeeded(
@@ -636,7 +640,7 @@ extension ConversationVC:
                 threadVariant: threadVariant,
                 threadIsMessageRequest: threadIsMessageRequest,
                 direction: .outgoing,
-                timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000))
+                timestampMs: SnodeAPI.currentOffsetTimestampMs()
             )
 
             if needsToStartTypingIndicator {
@@ -854,6 +858,8 @@ extension ConversationVC:
                             range: (message as NSString).range(of: cellViewModel.authorName)
                         ),
                     confirmTitle: "modal_download_button_title".localized(),
+                    confirmAccessibilityLabel: "Download media",
+                    cancelAccessibilityLabel: "Don't download media",
                     dismissOnConfirm: false // Custom dismissal logic
                 ) { [weak self] _ in
                     self?.viewModel.trustContact()
@@ -1213,7 +1219,7 @@ extension ConversationVC:
         guard !threadIsMessageRequest else { return }
 
         // Perform local rate limiting (don't allow more than 20 reactions within 60 seconds)
-        let sentTimestamp: Int64 = Int64(floor(Date().timeIntervalSince1970 * 1000))
+        let sentTimestamp: Int64 = SnodeAPI.currentOffsetTimestampMs()
         let recentReactionTimestamps: [Int64] = General.cache.wrappedValue.recentReactionTimestamps
 
         guard
@@ -2038,7 +2044,7 @@ extension ConversationVC:
 
         // Create URL
         let directory: String = OWSTemporaryDirectory()
-        let fileName: String = "\(Int64(floor(Date().timeIntervalSince1970 * 1000))).m4a"
+        let fileName: String = "\(SnodeAPI.currentOffsetTimestampMs()).m4a"
         let url: URL = URL(fileURLWithPath: directory).appendingPathComponent(fileName)
 
         // Set up audio session
@@ -2279,7 +2285,7 @@ extension ConversationVC {
             for: self.viewModel.threadData.threadId,
             threadVariant: self.viewModel.threadData.threadVariant,
             isNewThread: false,
-            timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000))
+            timestampMs: SnodeAPI.currentOffsetTimestampMs()
         )
     }