Merge pull request #98 from Adamant-im/feature/chats-screen-crash-fix

Fixed crash on first messages loading

Author: just-software-dev

Adamant.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		550066C7284D682D0044C0B1 /* AdamantHealthCheckService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 550066C6284D682D0044C0B1 /* AdamantHealthCheckService.swift */; };
 		551F66E628959A5300DE5D69 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F66E528959A5200DE5D69 /* LoadingView.swift */; };
 		551F66E82895B3DA00DE5D69 /* AdamantHealthCheckServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F66E72895B3DA00DE5D69 /* AdamantHealthCheckServiceTests.swift */; };
+		5522A44028B758530029B543 /* UIKitUtilites.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5522A43F28B758530029B543 /* UIKitUtilites.swift */; };
 		553B1284281C6EE100FFF24C /* GCDUtilites.swift in Sources */ = {isa = PBXBuildFile; fileRef = 553B1283281C6EE100FFF24C /* GCDUtilites.swift */; };
 		5551CC8F28A8B75300B52AD0 /* ApiServiceStub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5551CC8E28A8B75300B52AD0 /* ApiServiceStub.swift */; };
 		5558A436282AAFCC0024DDD6 /* AdamantApi+Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5558A435282AAFCC0024DDD6 /* AdamantApi+Status.swift */; };
@@ -633,6 +634,7 @@
 		550066C6284D682D0044C0B1 /* AdamantHealthCheckService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantHealthCheckService.swift; sourceTree = "<group>"; };
 		551F66E528959A5200DE5D69 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
 		551F66E72895B3DA00DE5D69 /* AdamantHealthCheckServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantHealthCheckServiceTests.swift; sourceTree = "<group>"; };
+		5522A43F28B758530029B543 /* UIKitUtilites.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitUtilites.swift; sourceTree = "<group>"; };
 		553B1283281C6EE100FFF24C /* GCDUtilites.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GCDUtilites.swift; sourceTree = "<group>"; };
 		5551CC8E28A8B75300B52AD0 /* ApiServiceStub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiServiceStub.swift; sourceTree = "<group>"; };
 		5558A435282AAFCC0024DDD6 /* AdamantApi+Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdamantApi+Status.swift"; sourceTree = "<group>"; };
@@ -1814,6 +1816,7 @@
 				E927171D20C04613002BB9A6 /* UIColor+hex.swift */,
 				E935C84C22AC06E500A8CA2F /* RichMessageTools.swift */,
 				553B1283281C6EE100FFF24C /* GCDUtilites.swift */,
+				5522A43F28B758530029B543 /* UIKitUtilites.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -2447,6 +2450,7 @@
 				E908472A2196FEA80095825D /* RichMessageTransaction+CoreDataClass.swift in Sources */,
 				64A223D620F760BB005157CB /* Localization.swift in Sources */,
 				64E1C82F222E95F6006C4DA7 /* DogeWallet.swift in Sources */,
+				5522A44028B758530029B543 /* UIKitUtilites.swift in Sources */,
 				E9484B7D2285BAD9008E10F0 /* PrivateKeyGenerator.swift in Sources */,
 				E94E7B08205D4CB80042B639 /* SharedRoutes.swift in Sources */,
 				E9960B3621F5154300C840A8 /* DummyAccount+CoreDataProperties.swift in Sources */,

Adamant/ServiceProtocols/DataProviders/ChatsProvider.swift

@@ -190,7 +190,7 @@ protocol ChatsProvider: DataProvider {
     func getChatroomsController() -> NSFetchedResultsController<Chatroom>
     func getChatController(for chatroom: Chatroom) -> NSFetchedResultsController<ChatTransaction>
     func getChatRooms(offset: Int?, completion: (() ->())?)
-    func getChatMessages(with addressRecipient: String, offset: Int?, completion: ((Int) ->())?)
+    func getChatMessages(with addressRecipient: String, offset: Int?, completion: (() -> Void)?)
 
     /// Unread messages controller. Sections by chatroom.
     func getUnreadMessagesController() -> NSFetchedResultsController<ChatTransaction>

Adamant/Services/ApiService/AdamantApiService.swift

@@ -64,7 +64,7 @@ class AdamantApiService: ApiService {
     // MARK: - Properties
 
     private var _lastRequestTimeDelta: TimeInterval?
-    private var lastRequestTimeDeltaSemaphore: DispatchSemaphore = DispatchSemaphore(value: 1)
+    private var semaphore: DispatchSemaphore = DispatchSemaphore(value: 1)
 
     private(set) var currentNodes: [Node] = [] {
         didSet {
@@ -75,15 +75,15 @@ class AdamantApiService: ApiService {
 
     private(set) var lastRequestTimeDelta: TimeInterval? {
         get {
-            defer { lastRequestTimeDeltaSemaphore.signal() }
-            lastRequestTimeDeltaSemaphore.wait()
+            defer { semaphore.signal() }
+            semaphore.wait()
 
             return _lastRequestTimeDelta
         }
         set {
-            lastRequestTimeDeltaSemaphore.wait()
+            semaphore.wait()
             _lastRequestTimeDelta = newValue
-            lastRequestTimeDeltaSemaphore.signal()
+            semaphore.signal()
         }
     }
 
@@ -102,7 +102,9 @@ class AdamantApiService: ApiService {
             object: nil,
             queue: nil
         ) { [weak self] _ in
+            self?.semaphore.wait()
             self?.updateCurrentNodes()
+            self?.semaphore.signal()
         }
     }
 

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -324,10 +324,10 @@ extension AdamantChatsProvider {
         }
     }
 
-    func getChatMessages(with addressRecipient: String, offset: Int?, completion: ((Int) ->())?) {
+    func getChatMessages(with addressRecipient: String, offset: Int?, completion: (() -> Void)?) {
         guard let address = accountService.account?.address,
               let privateKey = accountService.keypair?.privateKey else {
-            completion?(0)
+            completion?()
             return
         }
 
@@ -344,7 +344,7 @@ extension AdamantChatsProvider {
                 self?.chatLoadedMessages[addressRecipient] = loadedCount + (chatroom?.messages?.count ?? 0)
                 guard let transactions = chatroom?.messages,
                       transactions.count > 0 else {
-                    completion?(0)
+                    completion?()
                     return
                 }
                 self?.process(messageTransactions: transactions,
@@ -353,7 +353,7 @@ extension AdamantChatsProvider {
                               context: privateContext,
                               contextMutatingSemaphore: cms,
                               completion: {
-                    completion?(transactions.count)
+                    completion?()
                 })
             }
         }

Adamant/Services/SocketService/AdamantSocketService.swift

@@ -48,6 +48,7 @@ class AdamantSocketService: SocketService {
     private var socket: SocketIOClient?
     private var currentAddress: String?
     private var currentHandler: ((ApiServiceResult<Transaction>) -> Void)?
+    private let semaphore = DispatchSemaphore(value: 1)
 
     let defaultResponseDispatchQueue = DispatchQueue(
         label: "com.adamant.response-queue",
@@ -67,7 +68,10 @@ class AdamantSocketService: SocketService {
     // MARK: - Tools
 
     func connect(address: String, handler: @escaping (ApiServiceResult<Transaction>) -> Void) {
-        disconnect()
+        semaphore.wait()
+        defer { semaphore.signal() }
+        
+        _disconnect()
         currentAddress = address
         currentHandler = handler
 
@@ -91,6 +95,12 @@ class AdamantSocketService: SocketService {
     }
 
     func disconnect() {
+        semaphore.wait()
+        _disconnect()
+        semaphore.signal()
+    }
+    
+    private func _disconnect() {
         socket?.disconnect()
         socket = nil
         manager = nil

Adamant/Stories/Chats/ChatViewController.swift

@@ -1135,15 +1135,11 @@ extension ChatViewController {
 
         setBusyIndicator(state: true)
 
-        chatsProvider.getChatMessages(with: address, offset: 0) { [weak self] count in
+        chatsProvider.getChatMessages(with: address, offset: 0) { [weak self] in
             DispatchQueue.main.async {
                 self?.messagesCollectionView.reloadDataAndKeepOffset()
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    if count > 0 {
-                        self?.messagesCollectionView.scrollToItem(at: IndexPath(row: 0, section: count - 1), at: .top, animated: false)
-                    }
-                    self?.setBusyIndicator(state: false)
-                }
+                self?.messagesCollectionView.scrollToLastItem(animated: false)
+                self?.setBusyIndicator(state: false)
             }
         }
     }
@@ -1161,7 +1157,7 @@ extension ChatViewController {
         if address == AdamantContacts.adamantWelcomeWallet.name { return }
         isBusy = true
         let offset = chatsProvider.chatLoadedMessages[address] ?? 0
-        chatsProvider.getChatMessages(with: address, offset: offset) { [weak self] _count in
+        chatsProvider.getChatMessages(with: address, offset: offset) { [weak self] in
             DispatchQueue.main.async {
                 self?.messagesCollectionView.reloadDataAndKeepOffset()
                 self?.isBusy = false

AdamantShared/Helpers/UIKitUtilites.swift

@@ -0,0 +1,26 @@
+//
+//  UIKitUtilites.swift
+//  Adamant
+//
+//  Created by Andrey on 25.08.2022.
+//  Copyright © 2022 Adamant. All rights reserved.
+//
+
+import UIKit
+
+extension UICollectionView {
+    func scrollToLastItem(animated: Bool) {
+        let indexPath = IndexPath(
+            row: numberOfItems(inSection: numberOfSections - 1) - 1,
+            section: numberOfSections - 1
+        )
+        
+        guard hasItemAtIndexPath(indexPath) else { return }
+        scrollToItem(at: indexPath, at: .bottom, animated: animated)
+    }
+
+    func hasItemAtIndexPath(_ indexPath: IndexPath) -> Bool {
+        indexPath.section < numberOfSections
+            && indexPath.row < numberOfItems(inSection: indexPath.section)
+    }
+}