Tidy up.

element-hq · Feb 3, 2023 · ec4de39 · ec4de39
1 parent fc0d236
commit ec4de39
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -29,6 +29,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
     private let timelineController: RoomTimelineControllerProtocol
     private let timelineViewFactory: RoomTimelineViewFactoryProtocol
 
+    // swiftlint:disable:next cyclomatic_complexity
     init(timelineController: RoomTimelineControllerProtocol,
          timelineViewFactory: RoomTimelineViewFactoryProtocol,
          mediaProvider: MediaProviderProtocol,
@@ -188,22 +189,14 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
         }
     }
 
-    /// The task responsible for retrying decryption of any encrypted items in the timeline.
-    private var retryDecryptionTask: Task<Void, Never>? {
-        didSet { oldValue?.cancel() }
-    }
-
     /// Retry decrypting any encrypted items in the timeline.
     private func retryDecryption() {
-        retryDecryptionTask = Task {
-            for timelineItem in state.items.reversed() {
-                guard !Task.isCancelled else { break }
-
-                guard case let .encrypted(item) = timelineItem,
-                      case let .megolmV1AesSha2(sessionID) = item.encryptionType
-                else { continue }
-
-                MXLog.debug("Retrying decryption for: \(sessionID)")
+        Task {
+            let firstEncryptedItem = state.items.first { $0.sessionID != nil }
+
+            if let sessionID = firstEncryptedItem?.sessionID {
+                // Request for the first encrypted item to be decrypted as the SDK
+                // will continue to decrypt any following items automatically.
                 await timelineController.retryDecryption(for: sessionID)
             }
         }
@@ -309,3 +302,12 @@ extension RoomScreenViewModel {
                                           mediaProvider: MockMediaProvider(),
                                           roomName: "Preview room")
 }
+
+private extension RoomTimelineViewProvider {
+    var sessionID: String? {
+        guard case let .encrypted(item) = self,
+              case let .megolmV1AesSha2(sessionID) = item.encryptionType
+        else { return nil }
+        return sessionID
+    }
+}
diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
@@ -141,7 +141,6 @@ private struct UITextViewWrapper: UIViewRepresentable {
     final class Coordinator: NSObject, UITextViewDelegate, TextViewWithKeyDetectionDelegate {
         private var text: Binding<String>
         private var focused: Binding<Bool>
-//        private var isMultiline: Binding<Bool>
 
         private let maxHeight: CGFloat
 

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -24,7 +24,7 @@ struct RoomScreen: View {
     var body: some View {
         timeline
             .background(Color.element.background.ignoresSafeArea()) // Kills the toolbar translucency.
-            .safeAreaInset(edge: .top, spacing: 0) { encryptionBanner }
+            .overlay(alignment: .top) { encryptionBanner } // Overlay for now, safeAreaInset breaks timeline offset.
             .safeAreaInset(edge: .bottom, spacing: 0) { messageComposer }
             .navigationBarTitleDisplayMode(.inline)
             .toolbar { toolbar }
@@ -83,6 +83,7 @@ struct RoomScreen: View {
                     .fill(Color.element.system)
             }
             .padding([.horizontal, .top], 16)
+            .background(Color.element.background)
         }
     }
 

diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@@ -77,7 +77,6 @@ protocol RoomProxyProtocol {
 }
 
 extension RoomProxyProtocol {
-
     var permalink: URL? {
         if let canonicalAlias, let link = try? PermalinkBuilder.permalinkTo(roomAlias: canonicalAlias) {
             return link

diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
@@ -218,7 +218,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
         updateTimelineItems()
     }
 
-    // swiftlint:disable:next cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     private func updateTimelineItems() {
         var newTimelineItems = [RoomTimelineItemProtocol]()
         var canBackPaginate = true

diff --git a/changelog.d/430.change b/changelog.d/430.change
@@ -1 +1 @@
-Update the designs for the timeline.
+Finish the design review ready for a public TestFlight.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Update the designs for the timeline.
		Finish the design review ready for a public TestFlight.