Version 3.31.9

webim · Jul 16, 2020 · 52979cc · 52979cc
1 parent 402b259
commit 52979cc
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,20 +2,24 @@ PODS:
   - Cosmos (19.0.3)
   - Crashlytics (3.14.0):
     - Fabric (~> 1.10.2)
+  - DynamicBlurView (3.0.1)
   - Fabric (1.10.2)
-  - Nuke (8.4.0)
+  - PopupDialog (1.0.0):
+    - DynamicBlurView (~> 3.0.1)
+  - SlackTextViewController (1.9.6)
   - SnapKit (4.2.0)
   - SQLite.swift (0.12.2):
     - SQLite.swift/standard (= 0.12.2)
   - SQLite.swift/standard (0.12.2)
-  - WebimClientLibrary (3.31.6):
+  - WebimClientLibrary (3.31.8):
     - SQLite.swift (= 0.12.2)
 
 DEPENDENCIES:
   - Cosmos (~> 19.0.3)
   - Crashlytics
   - Fabric
-  - Nuke (~> 8.0)
+  - PopupDialog (~> 1.0)
+  - SlackTextViewController
   - SnapKit
   - SQLite.swift (= 0.12.2)
   - WebimClientLibrary (from `../`)
@@ -24,8 +28,10 @@ SPEC REPOS:
   trunk:
     - Cosmos
     - Crashlytics
+    - DynamicBlurView
     - Fabric
-    - Nuke
+    - PopupDialog
+    - SlackTextViewController
     - SnapKit
     - SQLite.swift
 
@@ -36,12 +42,14 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Cosmos: a6fb17284281fa12cf4c85c2efecd440a215ec44
   Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
+  DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
   Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
-  Nuke: fa6f784c4f7e1c0f9313668510186c68b7af2509
+  PopupDialog: 28f29a1ffe9e1fab32fb258b53d56ca31670e8a2
+  SlackTextViewController: b854e62c1c156336bc4fd409c6ca79b5773e8f9d
   SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
   SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
-  WebimClientLibrary: 73a15e308005ef1c5b935640a9cb68bfc9b8962a
+  WebimClientLibrary: 92eee96a56be508530713eb4985a7c15124101ad
 
-PODFILE CHECKSUM: e4bb38410a4561f613957985fac939cc3e30347c
+PODFILE CHECKSUM: 6e32648b7078df57752b6b95cd2aa7128e22c8b5
 
 COCOAPODS: 1.8.3
diff --git a/README.md b/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.31.8'
+pod 'WebimClientLibrary', :git => 'https://github.com/webim/webim-client-sdk-ios.git', :branch => 'master', :tag => '3.31.9'
 ```
 `use_frameworks!` must be specified.
 
 ### Carthage
 
 Add following line to your **Cartfile**:
 ```
-github "webim/webim-client-sdk-ios" ~> 3.31.8
+github "webim/webim-client-sdk-ios" ~> 3.31.9
 ```
 
 ### Additional notes
@@ -39,7 +39,7 @@ Previous _Objective-C_ version (version numbers 2.x.x) can be reached from **ver
 
 ## Release notes
 
-* Some crashes fixed.
+*  `getRawData()` bug fixed.
 
 ## Example
 

diff --git a/WebimClientLibrary.podspec b/WebimClientLibrary.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'WebimClientLibrary'
-  s.version = '3.31.8'
+  s.version = '3.31.9'
 
   s.author = { 'Webim.ru Ltd.' => '[email protected]' }
   s.homepage = 'https://webim.ru/integration/mobile-sdk/ios-sdk-howto/'

diff --git a/WebimClientLibrary/Backend/AbstractRequestLoop.swift b/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.31.8; (\(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.31.9; (\(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

diff --git a/WebimClientLibrary/Backend/DeltaRequestLoop.swift b/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.31.8", forHTTPHeaderField: WebimActions.Parameter.webimSDKVersion.rawValue)
+        request.setValue("3.31.9", forHTTPHeaderField: WebimActions.Parameter.webimSDKVersion.rawValue)
         request.httpMethod = AbstractRequestLoop.HTTPMethods.get.rawValue
 
         do {

diff --git a/WebimClientLibrary/Backend/Items/MessageItem.swift b/WebimClientLibrary/Backend/Items/MessageItem.swift
@@ -105,8 +105,8 @@ final class MessageItem {
             self.clientSideID = clientSideID
         }
 
-        if let data = jsonDictionary[JSONField.data.rawValue] as? [String: Any?] {
-            self.rawData = data
+        if let rawData = jsonDictionary[JSONField.data.rawValue] as? [String: Any?] {
+            self.rawData = rawData
         }
 
         if let data = jsonDictionary[JSONField.data.rawValue] as? MessageData {

diff --git a/WebimClientLibrary/Implementation/MessageImpl.swift b/WebimClientLibrary/Implementation/MessageImpl.swift
@@ -86,6 +86,7 @@ class MessageImpl {
         self.quote = quote
         self.operatorID = operatorID
         self.rawText = rawText
+        self.rawData = rawData
         self.senderAvatarURLString = senderAvatarURLString
         self.senderName = senderName
         self.sendStatus = sendStatus