ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 15:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various code smells as reported by Sonarcloud, fixed tests

Browse Source
This commit is contained in:
Stefan Ceriu
2022-05-25 13:44:24 +03:00
committed by Stefan Ceriu
parent f5890b68a2
commit 73f507045b
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Authentication/UserSession.swift
+3 -3
View File
@@ -28,7 +28,7 @@ private class WeakUserSessionWrapper: ClientDelegate {
} }
@MainActor func didReceiveSyncUpdate() { @MainActor func didReceiveSyncUpdate() {
self.userSession?.didReceiveSyncUpdate() userSession?.didReceiveSyncUpdate()
} }
} }
@@ -112,7 +112,7 @@ class UserSession {
private func updateRooms() async { private func updateRooms() async {
var currentRooms = self.rooms var currentRooms = self.rooms
Benchmark.startTrackingForIdentifier("ClientRooms", message: "Fetching available rooms") Benchmark.startTrackingForIdentifier("ClientRooms", message: "Fetching available rooms")
let sdkRooms = self.client.rooms() let sdkRooms = client.rooms()
Benchmark.endTrackingForIdentifier("ClientRooms", message: "Retrieved \(sdkRooms.count) rooms") Benchmark.endTrackingForIdentifier("ClientRooms", message: "Retrieved \(sdkRooms.count) rooms")
Benchmark.startTrackingForIdentifier("ProcessingRooms", message: "Started processing \(sdkRooms.count) rooms") Benchmark.startTrackingForIdentifier("ProcessingRooms", message: "Started processing \(sdkRooms.count) rooms")
@@ -133,6 +133,6 @@ class UserSession {
Benchmark.endTrackingForIdentifier("ProcessingRooms", message: "Finished processing \(sdkRooms.count) rooms") Benchmark.endTrackingForIdentifier("ProcessingRooms", message: "Finished processing \(sdkRooms.count) rooms")
self.rooms = currentRooms rooms = currentRooms
} }
} }
ElementX/Sources/Services/Media/MediaProvider.swift
+3 -3
View File
@@ -46,12 +46,12 @@ struct MediaProvider: MediaProviderProtocol {
return .success(image) return .success(image)
} }
let cachedImageLoadResult = await withCheckedContinuation({ continuation in let cachedImageLoadResult = await withCheckedContinuation { continuation in
imageCache.retrieveImage(forKey: source.underlyingSource.url()) { result in imageCache.retrieveImage(forKey: source.underlyingSource.url()) { result in
continuation.resume(returning: result) continuation.resume(returning: result)
} }
}) }
if case let .success(cacheResult) = cachedImageLoadResult, if case let .success(cacheResult) = cachedImageLoadResult,
let image = cacheResult.image { let image = cacheResult.image {
return .success(image) return .success(image)
ElementX/Sources/Services/Room/RoomProxy.swift
+1 -1
View File
@@ -21,7 +21,7 @@ private class WeakRoomProxyWrapper: RoomDelegate {
// MARK: - RoomDelegate // MARK: - RoomDelegate
func didReceiveMessage(message: AnyMessage) { func didReceiveMessage(message: AnyMessage) {
self.roomProxy?.appendMessage(message) roomProxy?.appendMessage(message)
} }
} }
ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
+1 -1
View File
@@ -143,7 +143,7 @@ class RoomSummary: RoomSummaryProtocol {
switch await roomProxy.paginateBackwards(count: 1) { switch await roomProxy.paginateBackwards(count: 1) {
case .success: case .success:
self.lastMessage = await self.eventBriefFactory.eventBriefForMessage(self.roomProxy.messages.last) lastMessage = await eventBriefFactory.eventBriefForMessage(roomProxy.messages.last)
case .failure(let error): case .failure(let error):
MXLog.error("Failed back paginating with error: \(error)") MXLog.error("Failed back paginating with error: \(error)")
} }
ElementX/Sources/Services/Timeline/RoomTimelineController.swift
+13 -15
View File
@@ -82,9 +82,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
func sendMessage(_ message: String) async { func sendMessage(_ message: String) async {
switch await timelineProvider.sendMessage(message) { switch await timelineProvider.sendMessage(message) {
case .success: default:
break
case .failure:
break break
} }
} }
@@ -141,14 +139,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await mediaProvider.loadImageFromSource(source) { switch await mediaProvider.loadImageFromSource(source) {
case .success(let image): case .success(let image):
guard let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }), guard let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? ImageRoomTimelineItem else { var item = timelineItems[index] as? ImageRoomTimelineItem else {
return return
} }
item.image = image item.image = image
self.timelineItems[index] = item timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id)) callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure: case .failure:
break break
} }
@@ -167,14 +165,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await mediaProvider.loadImageFromURL(avatarURL) { switch await mediaProvider.loadImageFromURL(avatarURL) {
case .success(let avatar): case .success(let avatar):
guard let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }), guard let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? EventBasedTimelineItemProtocol else { var item = timelineItems[index] as? EventBasedTimelineItemProtocol else {
return return
} }
item.senderAvatar = avatar item.senderAvatar = avatar
self.timelineItems[index] = item timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id)) callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure: case .failure:
break break
} }
@@ -192,14 +190,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await memberDetailProvider.loadDisplayNameForUserId(timelineItem.senderId) { switch await memberDetailProvider.loadDisplayNameForUserId(timelineItem.senderId) {
case .success(let displayName): case .success(let displayName):
guard let displayName = displayName, guard let displayName = displayName,
let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }), let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? EventBasedTimelineItemProtocol else { var item = timelineItems[index] as? EventBasedTimelineItemProtocol else {
return return
} }
item.senderDisplayName = displayName item.senderDisplayName = displayName
self.timelineItems[index] = item timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id)) callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure: case .failure:
break break
} }
Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateSimpleScreenViewModelTests.swift
+2 -1
View File
@@ -18,6 +18,7 @@ import XCTest
@testable import ElementX @testable import ElementX
@MainActor
class TemplateSimpleScreenViewModelTests: XCTestCase { class TemplateSimpleScreenViewModelTests: XCTestCase {
private enum Constants { private enum Constants {
static let counterInitialValue = 0 static let counterInitialValue = 0
@@ -26,7 +27,7 @@ class TemplateSimpleScreenViewModelTests: XCTestCase {
var viewModel: TemplateSimpleScreenViewModelProtocol! var viewModel: TemplateSimpleScreenViewModelProtocol!
var context: TemplateSimpleScreenViewModelType.Context! var context: TemplateSimpleScreenViewModelType.Context!
override func setUpWithError() throws { @MainActor override func setUpWithError() throws {
viewModel = TemplateSimpleScreenViewModel(promptType: .regular, initialCount: Constants.counterInitialValue) viewModel = TemplateSimpleScreenViewModel(promptType: .regular, initialCount: Constants.counterInitialValue)
context = viewModel.context context = viewModel.context
} }