mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-08-29 07:38:54 +00:00
core: update webrtc types (#599)
This commit is contained in:
@@ -12,6 +12,7 @@ import qualified Data.Aeson as J
|
||||
import qualified Data.Attoparsec.ByteString.Char8 as A
|
||||
import Data.ByteString.Char8 (ByteString)
|
||||
import Data.Int (Int64)
|
||||
import Data.Text (Text)
|
||||
import GHC.Generics (Generic)
|
||||
import qualified Simplex.Messaging.Crypto as C
|
||||
import Simplex.Messaging.Encoding.String
|
||||
@@ -176,8 +177,8 @@ instance ToJSON CallExtraInfo where
|
||||
toEncoding = J.genericToEncoding J.defaultOptions
|
||||
|
||||
data WebRTCSession = WebRTCSession
|
||||
{ rtcSession :: J.Value,
|
||||
rtcIceCandidates :: [J.Value]
|
||||
{ rtcSession :: Text,
|
||||
rtcIceCandidates :: [Text]
|
||||
}
|
||||
deriving (Eq, Show, Generic, FromJSON)
|
||||
|
||||
@@ -186,7 +187,7 @@ instance ToJSON WebRTCSession where
|
||||
toEncoding = J.genericToEncoding J.defaultOptions
|
||||
|
||||
data WebRTCExtraInfo = WebRTCExtraInfo
|
||||
{ rtcIceCandidates :: [J.Value]
|
||||
{ rtcIceCandidates :: [Text]
|
||||
}
|
||||
deriving (Eq, Show, Generic, FromJSON)
|
||||
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@ import ChatClient
|
||||
import Control.Concurrent (threadDelay)
|
||||
import Control.Concurrent.Async (concurrently_)
|
||||
import Control.Concurrent.STM
|
||||
import Data.Aeson (ToJSON, (.=))
|
||||
import Data.Aeson (ToJSON)
|
||||
import qualified Data.Aeson as J
|
||||
import qualified Data.ByteString.Char8 as B
|
||||
import qualified Data.ByteString.Lazy.Char8 as LB
|
||||
@@ -1774,8 +1774,8 @@ testCallType = CallType {media = CMVideo, capabilities = CallCapabilities {encry
|
||||
testWebRTCSession :: WebRTCSession
|
||||
testWebRTCSession =
|
||||
WebRTCSession
|
||||
{ rtcSession = J.object ["test" .= (123 :: Int)],
|
||||
rtcIceCandidates = []
|
||||
{ rtcSession = "{}",
|
||||
rtcIceCandidates = [""]
|
||||
}
|
||||
|
||||
testWebRTCCallOffer :: WebRTCCallOffer
|
||||
|
||||
Reference in New Issue
Block a user