From a7aae1bbc47a7bce61a11f5874d9f897848d4674 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Sat, 24 Jun 2023 20:36:03 +0300
Subject: [PATCH] Fix clientProxy `isSyncing` not taking into consideration the
 encryptionSyncLoop feature flag

---
 ElementX/Sources/Services/Client/ClientProxy.swift | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index cc628eadc..74ced3929 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -106,7 +106,13 @@ class ClientProxy: ClientProxyProtocol {
     }
 
     var isSyncing: Bool {
-        roomListService?.isSyncing() ?? false && isEncryptionSyncing
+        let isRoomListServiceSyncing = roomListService?.isSyncing() ?? false
+        
+        if ServiceLocator.shared.settings.isEncryptionSyncEnabled {
+            return isRoomListServiceSyncing && isEncryptionSyncing
+        } else {
+            return isRoomListServiceSyncing
+        }
     }
     
     func startSync() {