letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 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 46845c77d0
commit c4480e4524
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ElementX/Sources/Services/Authentication/UserSession.swift
View File

@@ -28,7 +28,7 @@ private class WeakUserSessionWrapper: ClientDelegate {
}
@MainActor func didReceiveSyncUpdate() {
self.userSession?.didReceiveSyncUpdate()
userSession?.didReceiveSyncUpdate()
}
}
@@ -112,7 +112,7 @@ class UserSession {
private func updateRooms() async {
var currentRooms = self.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.startTrackingForIdentifier("ProcessingRooms", message: "Started processing \(sdkRooms.count) rooms")
@@ -133,6 +133,6 @@ class UserSession {
Benchmark.endTrackingForIdentifier("ProcessingRooms", message: "Finished processing \(sdkRooms.count) rooms")
self.rooms = currentRooms
rooms = currentRooms
}
}

6
ElementX/Sources/Services/Media/MediaProvider.swift
View File

@@ -46,12 +46,12 @@ struct MediaProvider: MediaProviderProtocol {
return .success(image)
}
let cachedImageLoadResult = await withCheckedContinuation({ continuation in
let cachedImageLoadResult = await withCheckedContinuation { continuation in
imageCache.retrieveImage(forKey: source.underlyingSource.url()) { result in
continuation.resume(returning: result)
}
})
}
if case let .success(cacheResult) = cachedImageLoadResult,
let image = cacheResult.image {
return .success(image)

2
ElementX/Sources/Services/Room/RoomProxy.swift
View File

@@ -21,7 +21,7 @@ private class WeakRoomProxyWrapper: RoomDelegate {
// MARK: - RoomDelegate
func didReceiveMessage(message: AnyMessage) {
self.roomProxy?.appendMessage(message)
roomProxy?.appendMessage(message)
}
}

2
ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
View File

@@ -143,7 +143,7 @@ class RoomSummary: RoomSummaryProtocol {
switch await roomProxy.paginateBackwards(count: 1) {
case .success:
self.lastMessage = await self.eventBriefFactory.eventBriefForMessage(self.roomProxy.messages.last)
lastMessage = await eventBriefFactory.eventBriefForMessage(roomProxy.messages.last)
case .failure(let error):
MXLog.error("Failed back paginating with error: \(error)")
}

28
ElementX/Sources/Services/Timeline/RoomTimelineController.swift
View File

@@ -82,9 +82,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
func sendMessage(_ message: String) async {
switch await timelineProvider.sendMessage(message) {
case .success:
break
case .failure:
default:
break
}
}
@@ -141,14 +139,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await mediaProvider.loadImageFromSource(source) {
case .success(let image):
guard let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? ImageRoomTimelineItem else {
guard let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = timelineItems[index] as? ImageRoomTimelineItem else {
return
}
item.image = image
self.timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id))
timelineItems[index] = item
callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure:
break
}
@@ -167,14 +165,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await mediaProvider.loadImageFromURL(avatarURL) {
case .success(let avatar):
guard let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? EventBasedTimelineItemProtocol else {
guard let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = timelineItems[index] as? EventBasedTimelineItemProtocol else {
return
}
item.senderAvatar = avatar
self.timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id))
timelineItems[index] = item
callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure:
break
}
@@ -192,14 +190,14 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
switch await memberDetailProvider.loadDisplayNameForUserId(timelineItem.senderId) {
case .success(let displayName):
guard let displayName = displayName,
let index = self.timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = self.timelineItems[index] as? EventBasedTimelineItemProtocol else {
let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = timelineItems[index] as? EventBasedTimelineItemProtocol else {
return
}
item.senderDisplayName = displayName
self.timelineItems[index] = item
self.callbacks.send(.updatedTimelineItem(timelineItem.id))
timelineItems[index] = item
callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure:
break
}

3
Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateSimpleScreenViewModelTests.swift
View File

@@ -18,6 +18,7 @@ import XCTest
@testable import ElementX
@MainActor
class TemplateSimpleScreenViewModelTests: XCTestCase {
private enum Constants {
static let counterInitialValue = 0
@@ -26,7 +27,7 @@ class TemplateSimpleScreenViewModelTests: XCTestCase {
var viewModel: TemplateSimpleScreenViewModelProtocol!
var context: TemplateSimpleScreenViewModelType.Context!
override func setUpWithError() throws {
@MainActor override func setUpWithError() throws {
viewModel = TemplateSimpleScreenViewModel(promptType: .regular, initialCount: Constants.counterInitialValue)
context = viewModel.context
}