From 33e1601004a583b1c0ef2061b6030feb67631e31 Mon Sep 17 00:00:00 2001
From: Devin Ragotzy <devin.ragotzy@gmail.com>
Date: Mon, 3 Aug 2020 20:13:58 -0400
Subject: [PATCH] matrix_sdk: Fix import error

---
 matrix_sdk_base/src/client.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index 9f70bdec..257a5b90 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -26,20 +26,8 @@ use std::{
 
 #[cfg(feature = "encryption")]
 use matrix_sdk_common::locks::Mutex;
-#[cfg(feature = "encryption")]
 use matrix_sdk_common::{
     api::r0 as api,
-    api::r0::keys::{
-        claim_keys::Response as KeysClaimResponse, get_keys::Response as KeysQueryResponse,
-        upload_keys::Response as KeysUploadResponse, DeviceKeys, KeyAlgorithm,
-    },
-    api::r0::to_device::send_event_to_device,
-    events::room::{
-        encrypted::EncryptedEventContent, message::MessageEventContent as MsgEventContent,
-    },
-    identifiers::DeviceId,
-};
-use matrix_sdk_common::{
     events::{
         ignored_user_list::IgnoredUserListEvent, push_rules::PushRulesEvent,
         room::member::MemberEventContent, AnyBasicEvent, AnyStrippedStateEvent,
@@ -51,6 +39,18 @@ use matrix_sdk_common::{
     Raw,
 };
 #[cfg(feature = "encryption")]
+use matrix_sdk_common::{
+    api::r0::keys::{
+        claim_keys::Response as KeysClaimResponse, get_keys::Response as KeysQueryResponse,
+        upload_keys::Response as KeysUploadResponse, DeviceKeys, KeyAlgorithm,
+    },
+    api::r0::to_device::send_event_to_device,
+    events::room::{
+        encrypted::EncryptedEventContent, message::MessageEventContent as MsgEventContent,
+    },
+    identifiers::DeviceId,
+};
+#[cfg(feature = "encryption")]
 use matrix_sdk_crypto::{CryptoStore, OlmError, OlmMachine, OneTimeKeys};
 use zeroize::Zeroizing;