Merge branch 'master' into remote-desktop

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -61,6 +61,7 @@ class AudioRecorder {
             await MainActor.run {
                 AppDelegate.keepScreenOn(false)
             }
+            try? av.setCategory(AVAudioSession.Category.soloAmbient)
             logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
             return .error(error.localizedDescription)
         }
@@ -76,6 +77,7 @@ class AudioRecorder {
         }
         recordingTimer = nil
         AppDelegate.keepScreenOn(false)
+        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
     }
 
     private func checkPermission() async -> Bool {
@@ -129,6 +131,9 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
                 AppDelegate.keepScreenOn(true)
                 guard let time = self.audioPlayer?.currentTime else { return }
                 self.onTimer?(time)
+                AudioPlayer.changeAudioSession(true)
+            } else {
+                AudioPlayer.changeAudioSession(false)
             }
         }
     }
@@ -157,6 +162,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         if let player = audioPlayer {
             player.stop()
             AppDelegate.keepScreenOn(false)
+            AudioPlayer.changeAudioSession(false)
         }
         audioPlayer = nil
         if let timer = playbackTimer {
@@ -165,6 +171,24 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         playbackTimer = nil
     }
 
+    static func changeAudioSession(_ playback: Bool) {
+        // When there is a audio recording, setting any other category will disable sound
+        if AVAudioSession.sharedInstance().category == .playAndRecord {
+            return
+        }
+        if playback {
+            if AVAudioSession.sharedInstance().category != .playback {
+                logger.log("AudioSession: playback")
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
+            }
+        } else {
+            if AVAudioSession.sharedInstance().category != .soloAmbient {
+                logger.log("AudioSession: soloAmbient")
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
+            }
+        }
+    }
+
     func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         stop()
         self.onFinishPlayback?()

apps/ios/Shared/Model/ChatModel.swift

@@ -194,7 +194,7 @@ final class ChatModel: ObservableObject {
 
     func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
         var updatedConn = contact.activeConn
-        updatedConn.connectionStats = connectionStats
+        updatedConn?.connectionStats = connectionStats
         var updatedContact = contact
         updatedContact.activeConn = updatedConn
         updateContact(updatedContact)
@@ -671,11 +671,17 @@ final class ChatModel: ObservableObject {
     }
 
     func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        networkStatuses[contact.activeConn.agentConnId] = status
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
     }
 
     func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
     }
 }
 

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -675,6 +675,18 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     }
 }
 
+func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Contact?, Alert?) {
+    guard let userId = ChatModel.shared.currentUser?.userId else {
+        logger.error("apiConnectContactViaAddress: no current user")
+        return (nil, nil)
+    }
+    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
+    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
+    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
+    let alert = connectionErrorAlert(r)
+    return (nil, alert)
+}
+
 func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
     let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
@@ -1358,8 +1370,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                m.dismissConnReqView(contact.activeConn.id)
-                m.removeChat(contact.activeConn.id)
+                if let conn = contact.activeConn {
+                    m.dismissConnReqView(conn.id)
+                    m.removeChat(conn.id)
+                }
             }
         }
         if contact.directOrUsed {
@@ -1372,8 +1386,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                m.dismissConnReqView(contact.activeConn.id)
-                m.removeChat(contact.activeConn.id)
+                if let conn = contact.activeConn {
+                    m.dismissConnReqView(conn.id)
+                    m.removeChat(conn.id)
+                }
             }
         }
     case let .receivedContactRequest(user, contactRequest):
@@ -1512,9 +1528,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
 
         await MainActor.run {
             m.updateGroup(groupInfo)
-            if let hostContact = hostContact {
-                m.dismissConnReqView(hostContact.activeConn.id)
-                m.removeChat(hostContact.activeConn.id)
+            if let conn = hostContact?.activeConn {
+                m.dismissConnReqView(conn.id)
+                m.removeChat(conn.id)
             }
         }
     case let .groupLinkConnecting(user, groupInfo, hostMember):