From 6c07620a264c1adc834fbf247b4bfdab3af7dfca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 12 Aug 2020 16:52:50 +0200
Subject: [PATCH] matrix-sdk: Fix the to-device imports for the non-crypto
 case.

---
 matrix_sdk/src/client.rs | 65 +++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index dd2246dd..d839a014 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -40,20 +40,45 @@ use matrix_sdk_base::{BaseClient, BaseClientConfig, Room, Session, StateStore};
 #[cfg(feature = "encryption")]
 use matrix_sdk_base::Device;
 
-#[cfg(feature = "encryption")]
-use matrix_sdk_common::api::r0::to_device::send_event_to_device::{
-    IncomingRequest as OwnedToDeviceRequest, Request as ToDeviceRequest,
-};
 use matrix_sdk_common::{
+    api::r0::{
+        account::register,
+        directory::{get_public_rooms, get_public_rooms_filtered},
+        membership::{
+            ban_user, forget_room,
+            invite_user::{self, InvitationRecipient},
+            join_room_by_id, join_room_by_id_or_alias, kick_user, leave_room, Invite3pid,
+        },
+        message::{get_message_events, send_message_event},
+        read_marker::set_read_marker,
+        receipt::create_receipt,
+        room::create_room,
+        session::login,
+        sync::sync_events,
+        typing::create_typing_event,
+    },
     identifiers::ServerName,
     instant::{Duration, Instant},
     js_int::UInt,
-    locks::{Mutex, RwLock},
+    locks::RwLock,
     presence::PresenceState,
     uuid::Uuid,
     FromHttpResponseError,
 };
 
+#[cfg(feature = "encryption")]
+use matrix_sdk_common::{
+    api::r0::{
+        keys::{claim_keys, get_keys, upload_keys},
+        to_device::send_event_to_device::{
+            IncomingRequest as OwnedToDeviceRequest, Request as ToDeviceRequest,
+            Response as ToDeviceResponse,
+        },
+    },
+    identifiers::DeviceKeyAlgorithm,
+    locks::Mutex,
+};
+
 use crate::{
     api,
     events::{room::message::MessageEventContent, EventType},
@@ -294,31 +319,6 @@ impl SyncSettings {
     }
 }
 
-use api::r0::{
-    account::register,
-    directory::{get_public_rooms, get_public_rooms_filtered},
-    membership::{
-        ban_user, forget_room,
-        invite_user::{self, InvitationRecipient},
-        join_room_by_id, join_room_by_id_or_alias, kick_user, leave_room, Invite3pid,
-    },
-    message::{get_message_events, send_message_event},
-    read_marker::set_read_marker,
-    receipt::create_receipt,
-    room::create_room,
-    session::login,
-    sync::sync_events,
-    typing::create_typing_event,
-};
-#[cfg(feature = "encryption")]
-use matrix_sdk_common::{
-    api::r0::{
-        keys::{claim_keys, get_keys, upload_keys},
-        to_device::send_event_to_device,
-    },
-    identifiers::DeviceKeyAlgorithm,
-};
-
 impl Client {
     /// Creates a new client for making HTTP requests to the given homeserver.
     ///
@@ -1132,10 +1132,7 @@ impl Client {
             .await
     }
 
-    async fn send_to_device(
-        &self,
-        request: OwnedToDeviceRequest,
-    ) -> Result<send_event_to_device::Response> {
+    async fn send_to_device(&self, request: OwnedToDeviceRequest) -> Result<ToDeviceResponse> {
         let request = ToDeviceRequest {
             event_type: request.event_type,
             txn_id: &request.txn_id,