Version 3.34.3

Author: webim

Example/Podfile.lock

@@ -9,7 +9,7 @@ PODS:
   - SQLite.swift (0.12.2):
     - SQLite.swift/standard (= 0.12.2)
   - SQLite.swift/standard (0.12.2)
-  - WebimClientLibrary (3.33.1):
+  - WebimClientLibrary (3.34.2):
     - SQLite.swift (= 0.12.2)
 
 DEPENDENCIES:
@@ -44,7 +44,7 @@ SPEC CHECKSUMS:
   SlackTextViewController: b854e62c1c156336bc4fd409c6ca79b5773e8f9d
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
-  WebimClientLibrary: 2abdc50bba15581d6bedac3fbcac155bfc49b811
+  WebimClientLibrary: 022873cd49ed24e12fc81adecea1b84e47d00f08
 
 PODFILE CHECKSUM: 855d312996046cd3434fca3a4cba56d96623a531
 

Example/WebimClientLibrary.xcodeproj/project.pbxproj

@@ -1014,13 +1014,13 @@
 				CODE_SIGN_ENTITLEMENTS = WebimClientLibrary_Example.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.34.2;
+				CURRENT_PROJECT_VERSION = 3.34.3;
 				DEVELOPMENT_TEAM = 574GE9X9L7;
 				FRAMEWORK_SEARCH_PATHS = " $(inherited)";
 				INFOPLIST_FILE = WebimClientLibrary/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.34.2;
+				MARKETING_VERSION = 3.34.3;
 				MODULE_NAME = ExampleApp;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=400 -Xfrontend -warn-long-function-bodies=400 -Onone";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.webim.Webim-Client";
@@ -1041,13 +1041,13 @@
 				CODE_SIGN_ENTITLEMENTS = WebimClientLibrary_Example.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.34.2;
+				CURRENT_PROJECT_VERSION = 3.34.3;
 				DEVELOPMENT_TEAM = 574GE9X9L7;
 				FRAMEWORK_SEARCH_PATHS = " $(inherited)";
 				INFOPLIST_FILE = WebimClientLibrary/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.34.2;
+				MARKETING_VERSION = 3.34.3;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.webim.Webim-Client";
 				PRODUCT_NAME = "$(TARGET_NAME)";

README.md

@@ -16,15 +16,15 @@ This library provides [_Webim SDK_ for _iOS_](https://webim.ru/integration/mobil
 
 Add following line for your target in your **Podfile**:
 ```
-pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :branch => 'master', :tag => '3.34.2'
+pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :branch => 'master', :tag => '3.34.3'
 ```
 `use_frameworks!` must be specified.
 
 ### Carthage
 
 Add following line to your **Cartfile**:
 ```
-github "webim/webim-client-sdk-ios" ~> 3.34.2
+github "webim/webim-client-sdk-ios" ~> 3.34.3
 ```
 
 ### Additional notes
@@ -38,7 +38,7 @@ Trying to integrate _WebimClientLibrary_ into your _Objective-C_ code? Try out o
 Previous _Objective-C_ version (version numbers 2.x.x) can be reached from **version2** branch.
 
 ## Release notes
-* Method `getURL()` returns URL with fresh expired parameter.
+* Empty history bug fixed.
 
 ## Example
 

WebimClientLibrary.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'WebimClientLibrary'
-  s.version = '3.34.2'
+  s.version = '3.34.3'
 
   s.author = { 'Webim.ru Ltd.' => 'n.lazarev-zubov@webim.ru' }
   s.homepage = 'https://webim.ru/integration/mobile-sdk/ios-sdk-howto/'

WebimClientLibrary/Backend/AbstractRequestLoop.swift

@@ -101,7 +101,7 @@ class AbstractRequestLoop {
 
     func perform(request: URLRequest) throws -> Data {
         var requestWithUesrAngent = request
-        requestWithUesrAngent.setValue("iOS: Webim-Client 3.34.2; (\(UIDevice.current.model); \(UIDevice.current.systemVersion)); Bundle ID and version: \(Bundle.main.bundleIdentifier ?? "none") \(Bundle.main.infoDictionary?["CFBundleVersion"] ?? "none")", forHTTPHeaderField: "User-Agent")
+        requestWithUesrAngent.setValue("iOS: Webim-Client 3.34.3; (\(UIDevice.current.model); \(UIDevice.current.systemVersion)); Bundle ID and version: \(Bundle.main.bundleIdentifier ?? "none") \(Bundle.main.infoDictionary?["CFBundleVersion"] ?? "none")", forHTTPHeaderField: "User-Agent")
 
         var errorCounter = 0
         var lastHTTPCode = -1

WebimClientLibrary/Backend/DeltaRequestLoop.swift

@@ -147,7 +147,7 @@ class DeltaRequestLoop: AbstractRequestLoop {
     func requestInitialization() {
         let url = URL(string: getDeltaServerURLString() + "?" + getInitializationParameterString())
         var request = URLRequest(url: url!)
-        request.setValue("3.34.2", forHTTPHeaderField: WebimActions.Parameter.webimSDKVersion.rawValue)
+        request.setValue("3.34.3", forHTTPHeaderField: WebimActions.Parameter.webimSDKVersion.rawValue)
         request.httpMethod = AbstractRequestLoop.HTTPMethods.get.rawValue
 
         do {

WebimClientLibrary/Backend/MessageHolder.swift

@@ -162,6 +162,10 @@ final class MessageHolder {
         self.reachedEndOfLocalHistory = reachedEndOfLocalHistory
     }
 
+    func getReachedEndOfRemoteHistory() -> Bool {
+        return reachedEndOfRemoteHistory
+    }
+    
     func newMessageTracker(withMessageListener messageListener: MessageListener) throws -> MessageTrackerImpl {
         try messageTracker?.destroy()
 
@@ -180,6 +184,7 @@ final class MessageHolder {
                                             idsToDelete: deleted) { [weak self] (endOfBatch: Bool, messageDeleted: Bool, deletedMessageID: String?, messageChanged: Bool, changedMessage: MessageImpl?, messageAdded: Bool, addedMessage: MessageImpl?, idBeforeAddedMessage: HistoryID?) -> () in
                                                 if endOfBatch {
                                                     self?.messageTracker?.endedHistoryBatch()
+                                                    self?.reachedEndOfRemoteHistory = true
 
                                                     completion()
                                                 }

WebimClientLibrary/Implementation/MessageTrackerImpl.swift

@@ -541,7 +541,7 @@ extension MessageTrackerImpl: MessageTracker {
 
             messageHolder.getHistoryStorage().getLatestHistory(byLimit: limitOfMessages) { [weak self] messages in
                 if let cachedCompletionHandler = self?.cachedCompletionHandler,
-                    !messages.isEmpty || self?.firstHistoryUpdateReceived == true {
+                   !messages.isEmpty || self?.messageHolder.getReachedEndOfRemoteHistory() == true {
                     self?.firstHistoryUpdateReceived = true
 
                     let completionHandlerToPass = cachedCompletionHandler.getCompletionHandler()
@@ -605,7 +605,7 @@ extension MessageTrackerImpl: MessageTracker {
 
             messageHolder.getHistoryStorage().getLatestHistory(byLimit: limitOfMessages) { [weak self] messages in
                 if let cachedCompletionHandler = self?.cachedCompletionHandler,
-                    !messages.isEmpty || self?.firstHistoryUpdateReceived == true {
+                   !messages.isEmpty || self?.messageHolder.getReachedEndOfRemoteHistory() == true {
                     self?.firstHistoryUpdateReceived = true
 
                     let completionHandlerToPass = cachedCompletionHandler.getCompletionHandler()