From dd891063bd4efa2a37abc63bc913a60733e2cce6 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Mon, 15 Nov 2021 16:02:24 +1100 Subject: [PATCH] minor fix --- Session/Calls/CallVC.swift | 1 + Session/Calls/Views & Modals/MiniCallView.swift | 1 + SessionMessagingKit/Database/Storage+Messaging.swift | 1 + SessionMessagingKit/Sending & Receiving/MessageSender.swift | 4 ---- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Session/Calls/CallVC.swift b/Session/Calls/CallVC.swift index bb0eae1e4..7a4ba3df7 100644 --- a/Session/Calls/CallVC.swift +++ b/Session/Calls/CallVC.swift @@ -131,6 +131,7 @@ final class CallVC : UIViewController, VideoPreviewDelegate { private lazy var volumeView: MPVolumeView = { let result = MPVolumeView() let image = UIImage(named: "Speaker")?.withRenderingMode(.alwaysTemplate) + result.showsVolumeSlider = false result.showsRouteButton = true result.setRouteButtonImage(image, for: UIControl.State.normal) result.set(.width, to: 60) diff --git a/Session/Calls/Views & Modals/MiniCallView.swift b/Session/Calls/Views & Modals/MiniCallView.swift index f7d5869ce..7fe48fb71 100644 --- a/Session/Calls/Views & Modals/MiniCallView.swift +++ b/Session/Calls/Views & Modals/MiniCallView.swift @@ -33,6 +33,7 @@ final class MiniCallView: UIView { private func setUpViewHierarchy() { self.set(.width, to: 80) self.set(.height, to: 173) + self.layer.masksToBounds = true // Background let background = getBackgroudView() self.addSubview(background) diff --git a/SessionMessagingKit/Database/Storage+Messaging.swift b/SessionMessagingKit/Database/Storage+Messaging.swift index e02363de7..0035217f2 100644 --- a/SessionMessagingKit/Database/Storage+Messaging.swift +++ b/SessionMessagingKit/Database/Storage+Messaging.swift @@ -28,6 +28,7 @@ extension Storage { let thread = TSThread.fetch(uniqueId: threadID, transaction: transaction) else { return nil } let tsMessage: TSMessage if message.sender == getUserPublicKey() { + if let _ = TSOutgoingMessage.find(withTimestamp: message.sentTimestamp!) { return nil } let tsOutgoingMessage = TSOutgoingMessage.from(message, associatedWith: thread, using: transaction) var recipients: [String] = [] if let syncTarget = message.syncTarget { diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 69946ffc0..0206929b1 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -116,8 +116,6 @@ public final class MessageSender : NSObject { if message.sentTimestamp == nil { // Visible messages will already have their sent timestamp set message.sentTimestamp = NSDate.millisecondTimestamp() } - // Ignore future self-sends - Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction) message.sender = userPublicKey switch destination { case .contact(let publicKey): message.recipient = publicKey @@ -271,8 +269,6 @@ public final class MessageSender : NSObject { if message.sentTimestamp == nil { // Visible messages will already have their sent timestamp set message.sentTimestamp = NSDate.millisecondTimestamp() } - // Ignore future self-sends - Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction) message.sender = storage.getUserPublicKey() switch destination { case .contact(_): preconditionFailure()