From 926d062ec885be61f70d51916a814fb22d804da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <g@leirbag.net>
Date: Tue, 27 Apr 2021 18:17:33 +0200
Subject: [PATCH] Last changes before shipping\!

---
 .../src/sealed_session_cipher.rs              |  4 ++--
 libsignal-service/src/sender.rs               | 23 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libsignal-service/src/sealed_session_cipher.rs b/libsignal-service/src/sealed_session_cipher.rs
index 62b188eab..4397caecf 100644
--- a/libsignal-service/src/sealed_session_cipher.rs
+++ b/libsignal-service/src/sealed_session_cipher.rs
@@ -1,4 +1,4 @@
-use crate::{push_service::ProfileKey, ServiceAddress};
+use std::convert::TryFrom;
 
 use aes_ctr::{
     cipher::stream::{NewStreamCipher, StreamCipher},
@@ -17,7 +17,7 @@ use rand::{CryptoRng, Rng};
 use sha2::Sha256;
 use uuid::Uuid;
 
-use std::convert::TryFrom;
+use crate::{push_service::ProfileKey, ServiceAddress};
 
 #[derive(Debug, thiserror::Error)]
 pub enum SealedSessionError {
diff --git a/libsignal-service/src/sender.rs b/libsignal-service/src/sender.rs
index 4766c6064..c556cffae 100644
--- a/libsignal-service/src/sender.rs
+++ b/libsignal-service/src/sender.rs
@@ -1,14 +1,5 @@
 use std::time::SystemTime;
 
-use crate::proto::{
-    attachment_pointer::AttachmentIdentifier,
-    attachment_pointer::Flags as AttachmentPointerFlags, sync_message,
-    AttachmentPointer, SyncMessage,
-};
-use crate::{
-    cipher::get_preferred_protocol_address, session_store::SessionStoreExt,
-};
-
 use chrono::prelude::*;
 use libsignal_protocol::{
     process_prekey_bundle, IdentityKeyStore, ProtocolAddress,
@@ -18,8 +9,17 @@ use log::{info, trace};
 use rand::{CryptoRng, Rng};
 
 use crate::{
-    cipher::ServiceCipher, content::ContentBody, push_service::*,
-    sealed_session_cipher::UnidentifiedAccess, ServiceAddress,
+    cipher::{get_preferred_protocol_address, ServiceCipher},
+    content::ContentBody,
+    proto::{
+        attachment_pointer::AttachmentIdentifier,
+        attachment_pointer::Flags as AttachmentPointerFlags, sync_message,
+        AttachmentPointer, SyncMessage,
+    },
+    push_service::*,
+    sealed_session_cipher::UnidentifiedAccess,
+    session_store::SessionStoreExt,
+    ServiceAddress,
 };
 
 pub use crate::proto::{ContactDetails, GroupDetails};
@@ -363,7 +363,6 @@ where
             if let Some(e164) = recipient.e164() {
                 self.session_store.delete_all_sessions(&e164)?;
             }
-            log::warn!("deleting all sessions: unimplemented following the switch to the Rust version of libsignal-protocol");
         }
 
         result