reorder

simplex-chat · Jan 31, 2024 · b1e76c1 · b1e76c1
1 parent e543f61
commit b1e76c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...platform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt b/...platform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
@@ -591,15 +591,15 @@ fun PreviewActiveCallOverlayVideo() {
     ActiveCallOverlayLayout(
       call = Call(
         remoteHostId = null,
+        user = User.sampleData,
         contact = Contact.sampleData,
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Video,
         peerMedia = CallMediaType.Video,
         connectionInfo = ConnectionInfo(
           RTCIceCandidate(RTCIceCandidateType.Host, "tcp"),
           RTCIceCandidate(RTCIceCandidateType.Host, "tcp")
-        ),
-        user = User.sampleData
+        )
       ),
       speakerCanBeEnabled = true,
       dismiss = {},
@@ -618,15 +618,15 @@ fun PreviewActiveCallOverlayAudio() {
     ActiveCallOverlayLayout(
       call = Call(
         remoteHostId = null,
+        user = User.sampleData,
         contact = Contact.sampleData,
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Audio,
         peerMedia = CallMediaType.Audio,
         connectionInfo = ConnectionInfo(
           RTCIceCandidate(RTCIceCandidateType.Host, "udp"),
           RTCIceCandidate(RTCIceCandidateType.Host, "udp")
-        ),
-        user = User.sampleData
+        )
       ),
       speakerCanBeEnabled = true,
       dismiss = {},

diff --git a/.../multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt b/.../multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
@@ -45,11 +45,11 @@ class CallManager(val chatModel: ChatModel) {
     with (chatModel) {
       activeCall.value = Call(
         remoteHostId = invitation.remoteHostId,
+        user = currentUser.value ?: return,
         contact = invitation.contact,
         callState = CallState.InvitationAccepted,
         localMedia = invitation.callType.media,
         sharedKey = invitation.sharedKey,
-        user = currentUser.value ?: return
       )
       showCallView.value = true
       val useRelay = controller.appPrefs.webrtcPolicyRelay.get()

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
@@ -12,6 +12,7 @@ import kotlin.collections.ArrayList
 
 data class Call(
   val remoteHostId: Long?,
+  val user: User,
   val contact: Contact,
   val callState: CallState,
   val localMedia: CallMediaType,
@@ -24,7 +25,6 @@ data class Call(
   var localCamera: VideoCamera = VideoCamera.User,
   val connectionInfo: ConnectionInfo? = null,
   var connectedAt: Instant? = null,
-  val user: User,
 ) {
   val encrypted: Boolean get() = localEncrypted && sharedKey != null
   val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false