Send a multi device sent transcript content

.gitignore

@@ -8,3 +8,6 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# IDE settings
+.vscode/*

libsignal-service-actix/examples/registering.rs

@@ -29,7 +29,6 @@ async fn main() -> Result<(), Error> {
     let args = Args::from_args();
 
     // Only used with MessageSender and MessageReceiver
-    let _trust_store = args.load_trust_store()?;
     let password = args.get_password()?;
 
     let config: ServiceConfiguration = SignalServers::Staging.into();

libsignal-service-actix/src/push_service.rs

@@ -26,7 +26,7 @@ impl PushService for AwcPushService {
     type ByteStream = Box<dyn futures::io::AsyncRead + Unpin>;
     type WebSocket = AwcWebSocket;
 
-    async fn get<T>(&mut self, path: &str) -> Result<T, ServiceError>
+    async fn get<T>(&self, path: &str) -> Result<T, ServiceError>
     where
         for<'de> T: Deserialize<'de>,
     {
@@ -83,11 +83,7 @@ impl PushService for AwcPushService {
         }
     }
 
-    async fn put<D, S>(
-        &mut self,
-        path: &str,
-        value: S,
-    ) -> Result<D, ServiceError>
+    async fn put<D, S>(&self, path: &str, value: S) -> Result<D, ServiceError>
     where
         for<'de> D: Deserialize<'de>,
         S: Serialize,

libsignal-service/src/cipher.rs

@@ -214,7 +214,11 @@ impl ServiceCipher {
                 session_cipher.get_remote_registration_id()?;
             let body = base64::encode(message.serialize()?);
             use crate::proto::envelope::Type;
-            let message_type = match message.get_type()? {
+            let message_type = match message.get_type().map_err(|_| {
+                ServiceError::InvalidFrameError {
+                    reason: "unknown message type".into(),
+                }
+            })? {
                 CiphertextType::PreKey => Type::PrekeyBundle,
                 CiphertextType::Signal => Type::Ciphertext,
                 t => panic!("Bad type: {:?}", t),

libsignal-service/src/messagepipe.rs

@@ -152,7 +152,7 @@ impl<WS: WebSocketService> MessagePipe<WS> {
                                 });
                                 background_work.push(request.boxed_local());
                             },
-                            Err(e) => log::warn!("Could not send keep alive"),
+                            Err(e) => log::warn!("Could not send keep alive: {}", e),
                         }
                     },
                     None => {

libsignal-service/src/push_service.rs

@@ -299,15 +299,11 @@ pub trait PushService {
     type WebSocket: WebSocketService;
     type ByteStream: futures::io::AsyncRead + Unpin;
 
-    async fn get<T>(&mut self, path: &str) -> Result<T, ServiceError>
+    async fn get<T>(&self, path: &str) -> Result<T, ServiceError>
     where
         for<'de> T: Deserialize<'de>;
 
-    async fn put<D, S>(
-        &mut self,
-        path: &str,
-        value: S,
-    ) -> Result<D, ServiceError>
+    async fn put<D, S>(&self, path: &str, value: S) -> Result<D, ServiceError>
     where
         for<'de> D: Deserialize<'de>,
         S: Serialize;
@@ -425,7 +421,7 @@ pub trait PushService {
     }
 
     async fn send_messages<'a>(
-        &mut self,
+        &self,
         messages: OutgoingPushMessages<'a>,
     ) -> Result<SendMessageResponse, ServiceError> {
         let path = format!("/v1/messages/{}", messages.destination);
@@ -484,7 +480,7 @@ pub trait PushService {
     }
 
     async fn get_pre_key(
-        &mut self,
+        &self,
         context: &Context,
         destination: &ServiceAddress,
         device_id: i32,
@@ -528,7 +524,7 @@ pub trait PushService {
     }
 
     async fn get_pre_keys(
-        &mut self,
+        &self,
         context: &Context,
         destination: &ServiceAddress,
         device_id: i32,