XMPPFramework 4.0

Author: chrisballinger

ChatSecure.xcodeproj/project.pbxproj

@@ -3518,6 +3518,7 @@
 				CODE_SIGN_ENTITLEMENTS = ChatSecure/ChatSecure.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3555,6 +3556,7 @@
 				CODE_SIGN_ENTITLEMENTS = ChatSecure/ChatSecure.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

ChatSecure/Classes/Controllers/OTRYapExtensions.swift

@@ -18,7 +18,7 @@ open class OTRYapExtensions:NSObject {
         let usernameColumnName = BuddyFTSColumnName.username.name()
         let displayNameColumnName = BuddyFTSColumnName.displayName.name()
 
-        let searchHandler = YapDatabaseFullTextSearchHandler.withObjectBlock { (dict, collection, key, object) in
+        let searchHandler = YapDatabaseFullTextSearchHandler.withObjectBlock { (transaction, dict, collection, key, object) in
             guard let buddy = object as? OTRBuddy else {
                 return
             }

ChatSecure/Classes/Controllers/XMPP/Storage/MessageStorage.swift

@@ -400,7 +400,7 @@ extension MessageStorage: XMPPMessageArchiveManagementDelegate {
         }
     }
 
-    public func xmppMessageArchiveManagement(_ xmppMessageArchiveManagement: XMPPMessageArchiveManagement, didFailToReceiveMessages error: XMPPIQ) {
+    public func xmppMessageArchiveManagement(_ xmppMessageArchiveManagement: XMPPMessageArchiveManagement, didFailToReceiveMessages error: XMPPIQ?) {
         DDLogError("Failed to receive messages \(error)")
     }
 

ChatSecure/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.0</string>
+	<string>4.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>127</string>
+	<string>128</string>
 	<key>FacebookAppID</key>
 	<string>447241325394334</string>
 	<key>FacebookDisplayName</key>

Gemfile.lock

@@ -1,18 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     atomos (0.1.2)
     claide (1.0.2)
-    cocoapods (1.5.0)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.0)
+      cocoapods-core (= 1.5.3)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,12 +28,12 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.1)
       xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.0)
+    cocoapods-core (1.5.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -47,7 +47,7 @@ GEM
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.1.2)
+    gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
@@ -59,12 +59,12 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.7)
+    xcodeproj (1.5.9)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
+      nanaimo (~> 0.2.5)
 
 PLATFORMS
   ruby

Podfile

@@ -53,6 +53,7 @@ abstract_target 'ChatSecureCorePods' do
   # pod 'GCDWebServer/CocoaLumberjack', :git => 'https://github.com/ChatSecure/GCDWebServer.git', :branch => 'kdbertel-CocoaLumberjack3'
   pod 'CPAProxy', :path => 'Submodules/CPAProxy/CPAProxy.podspec'
   pod 'XMPPFramework/Swift', :path => 'Submodules/XMPPFramework/XMPPFramework.podspec'
+
   pod 'ChatSecure-Push-iOS', :path => 'Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec'
 
   # Google Auth
@@ -61,7 +62,7 @@ abstract_target 'ChatSecureCorePods' do
 
   # Storage
   # pod 'YapDatabase/SQLCipher', '~> 3.0.2'
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/yapstudios/YapDatabase.git', :commit => 'ce9c8db' # 865 fix
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/yapstudios/YapDatabase.git', :commit => 'fcfda4e' # 865 fix
   pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => 'podspec-fix'
   pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
   pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'swift4'

Podfile.lock

@@ -40,7 +40,7 @@ PODS:
     - IOCipher/common
   - JSQMessagesViewController (7.3.4)
   - JTSImageViewController (1.5.1)
-  - KissXML (5.2.2)
+  - KissXML (5.2.3)
   - KSCrash (1.15.18):
     - KSCrash/Installations (= 1.15.18)
   - KSCrash/Installations (1.15.18):
@@ -109,7 +109,7 @@ PODS:
     - Kvitto/Core (= 1.0.3)
   - Kvitto/Core (1.0.3):
     - DTFoundation/DTASN1 (~> 1.7.13)
-  - libidn (1.33)
+  - libidn (1.35)
   - libsqlfs/common (1.3.2)
   - libsqlfs/SQLCipher (1.3.2):
     - libsqlfs/common
@@ -146,12 +146,12 @@ PODS:
   - SQLCipher/standard (3.4.2):
     - SQLCipher/common
   - TUSafariActivity (1.0.4)
-  - XMPPFramework/default (4.0):
-    - CocoaAsyncSocket (~> 7.6.0)
+  - XMPPFramework/default (4.0.0):
+    - CocoaAsyncSocket (~> 7.6)
     - CocoaLumberjack
-    - KissXML (~> 5.2.0)
-    - libidn (~> 1.33.0)
-  - XMPPFramework/Swift (4.0):
+    - KissXML (~> 5.2)
+    - libidn (~> 1.35)
+  - XMPPFramework/Swift (4.0.0):
     - CocoaLumberjack/Swift
     - XMPPFramework/default
   - YapDatabase/SQLCipher (3.0.2):
@@ -166,6 +166,7 @@ PODS:
     - YapDatabase/SQLCipher/Extensions/AutoView (= 3.0.2)
     - YapDatabase/SQLCipher/Extensions/CloudCore (= 3.0.2)
     - YapDatabase/SQLCipher/Extensions/CloudKit (= 3.0.2)
+    - YapDatabase/SQLCipher/Extensions/ConnectionPool (= 3.0.2)
     - YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 3.0.2)
     - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 3.0.2)
     - YapDatabase/SQLCipher/Extensions/FilteredView (= 3.0.2)
@@ -187,6 +188,8 @@ PODS:
     - YapDatabase/SQLCipher/Core
   - YapDatabase/SQLCipher/Extensions/CloudKit (3.0.2):
     - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/ConnectionPool (3.0.2):
+    - YapDatabase/SQLCipher/Core
   - YapDatabase/SQLCipher/Extensions/ConnectionProxy (3.0.2):
     - YapDatabase/SQLCipher/Core
   - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (3.0.2):
@@ -246,11 +249,11 @@ DEPENDENCIES:
   - SignalProtocolObjC (from `Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec`)
   - TUSafariActivity (~> 1.0)
   - XMPPFramework/Swift (from `Submodules/XMPPFramework/XMPPFramework.podspec`)
-  - YapDatabase/SQLCipher (from `https://github.com/yapstudios/YapDatabase.git`, commit `ce9c8db`)
+  - YapDatabase/SQLCipher (from `https://github.com/yapstudios/YapDatabase.git`, commit `fcfda4e`)
   - YapTaskQueue/SQLCipher (from `https://github.com/ChatSecure/YapTaskQueue.git`, branch `swift4`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - Alamofire
     - Appirater
     - ARChromeActivity
@@ -303,7 +306,7 @@ EXTERNAL SOURCES:
   XMPPFramework:
     :path: Submodules/XMPPFramework/XMPPFramework.podspec
   YapDatabase:
-    :commit: ce9c8db
+    :commit: fcfda4e
     :git: https://github.com/yapstudios/YapDatabase.git
   YapTaskQueue:
     :branch: swift4
@@ -317,7 +320,7 @@ CHECKOUT OPTIONS:
     :commit: 43f1d3b
     :git: https://github.com/gmertk/ParkedTextField.git
   YapDatabase:
-    :commit: ce9c8db
+    :commit: fcfda4e
     :git: https://github.com/yapstudios/YapDatabase.git
   YapTaskQueue:
     :commit: fb0716626af841b573ff752b9bd064d26d3fda96
@@ -340,10 +343,10 @@ SPEC CHECKSUMS:
   IOCipher: 3b86ccd68b08ee73b3de80c24a10de130269698c
   JSQMessagesViewController: bc44afc60cca8c9e0fb127243d57551013e1f319
   JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9
-  KissXML: 4418f32138aec43797891845d682b00fc8cd4677
+  KissXML: 09f88ff8161fd058d67b70740b8b516687b52823
   KSCrash: 5394936f41e5c1ef7b79cf79b30d53299b0c160e
   Kvitto: d451f893f84ad669850b7cb7d3f8781363e14232
-  libidn: 90fc1a62b60288dcf543f13f4ebca913f17d829f
+  libidn: e4576a956b797c584c77aaedfc6e3dd639b61bdc
   libsqlfs: 053504a0181dd89441857c02eea05c1f972abeed
   LumberjackConsole: 8ab064c6cf434e4a749de1e8e0ab53824bb53407
   MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
@@ -358,10 +361,10 @@ SPEC CHECKSUMS:
   SignalProtocolObjC: cddb256f5d3015dd507e59f7175fa6c9154f8dc6
   SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
   TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
-  XMPPFramework: 0e1a2db1a9a2b05ea354b5b418f797462885f9d9
-  YapDatabase: 299a32de9d350d37a9ac5b0532609d87d5d2a5de
+  XMPPFramework: 42441b450fa312d8f6d8386ca1d371b31a881d1b
+  YapDatabase: 178cc1eabfa25a1307a6245ca0de9dadadc6c331
   YapTaskQueue: f3b23875bead71a7ee57b65637ce9c0e98b68c34
 
-PODFILE CHECKSUM: a3465172f60834508b141f5c6bbdbb38c93c595a
+PODFILE CHECKSUM: ab8421772b71fcfaffc4015123e94b89e107ab25
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3