attempt to fix intermittent SEGFAULT in SocketRocket (Maybe Fixes #1196) (#1217)

* Rebased OWS fork of SocketRocket against upstream * Pulling in SocketRocket directly from OWS Github rather than going through the motions of publishing a pod that only we use. * Bump version // FREEBIE
9 years ago · 965261f465
parent e7f3092f00
commit 965261f465
4 changed files with 27 additions and 12 deletions
--- a/1
+++ b/1
@ -2,6 +2,7 @@ platform :ios, '8.0'
 source 'https://github.com/CocoaPods/Specs.git'

 target 'Signal' do
+    pod 'SocketRocket',               :git => 'https://github.com/WhisperSystems/SocketRocket.git', :branch => 'signal-ios'
    pod 'SignalServiceKit',           :git => 'https://github.com/WhisperSystems/SignalServiceKit.git'
    pod 'OpenSSL',                    '~> 1.0.208'
    pod 'PastelogKit',                '~> 1.3'
--- a/Podfile.lock
+++ b/Podfile.lock
@ -33,7 +33,7 @@ PODS:
  - JSQMessagesViewController (7.1.0):
    - JSQSystemSoundPlayer (~> 2.0.1)
  - JSQSystemSoundPlayer (2.0.1)
-  - libPhoneNumber-iOS (0.8.12)
+  - libPhoneNumber-iOS (0.8.13)
  - Mantle (2.0.7):
    - Mantle/extobjc (= 2.0.7)
  - Mantle/extobjc (2.0.7)
@ -50,11 +50,11 @@ PODS:
    - CocoaLumberjack
    - libPhoneNumber-iOS
    - Mantle
-    - SocketRocket-PinningPolicy
+    - SocketRocket
    - SSKeychain
    - TwistedOakCollapsingFutures
    - YapDatabase/SQLCipher
-  - SocketRocket-PinningPolicy (0.4.3)
+  - SocketRocket (0.5.1)
  - SQLCipher/common (3.4.0)
  - SQLCipher/fts (3.4.0):
    - SQLCipher/common
@ -120,6 +120,7 @@ DEPENDENCIES:
  - PastelogKit (~> 1.3)
  - SCWaveformView (~> 1.0)
  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
+  - SocketRocket (from `https://github.com/WhisperSystems/SocketRocket.git`, branch `signal-ios`)

 EXTERNAL SOURCES:
  JSQMessagesViewController:
@ -127,14 +128,20 @@ EXTERNAL SOURCES:
    :git: https://github.com/WhisperSystems/JSQMessagesViewController
  SignalServiceKit:
    :git: https://github.com/WhisperSystems/SignalServiceKit.git
+  SocketRocket:
+    :branch: signal-ios
+    :git: https://github.com/WhisperSystems/SocketRocket.git

 CHECKOUT OPTIONS:
  JSQMessagesViewController:
    :commit: e5582fef8a6b3e35f8070361ef37237222da712b
    :git: https://github.com/WhisperSystems/JSQMessagesViewController
  SignalServiceKit:
-    :commit: 32a7d49facdb26238f13c7e4932a5c7874608a47
+    :commit: 8058951b08a9fb0c610c56bdb50c403132da2089
    :git: https://github.com/WhisperSystems/SignalServiceKit.git
+  SocketRocket:
+    :commit: 587ad297eb63eb0d64d4caeb32a7da646ad1132b
+    :git: https://github.com/WhisperSystems/SocketRocket.git

 SPEC CHECKSUMS:
  '25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
@ -146,21 +153,21 @@ SPEC CHECKSUMS:
  HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
  JSQMessagesViewController: ca11f86fa68ca70835f05e169df9244147c1dc40
  JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
-  libPhoneNumber-iOS: 3f1889b70403cf7848c0e4136780a0d0aef9016d
+  libPhoneNumber-iOS: 3a37004baf779b4262ab29a31a87d2ae668159d4
  Mantle: bc40bb061d8c2c6fb48d5083e04d928c3b7f73d9
  OpenSSL: b187269d386b07452f56af273764ea0636dd5da8
  PastelogKit: 7b475be4cf577713506a943dd940bcc0499c8bca
  ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b
  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
  SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
-  SignalServiceKit: db7e03dbb7870f77dfa2743eb0e4926dab59d792
-  SocketRocket-PinningPolicy: f2ef00c3927bac05cd04d9d5171f82d922b40d3d
+  SignalServiceKit: e27a3025c2d5c61696386e44a50ac8d2fe83151e
+  SocketRocket: 3f77ec2104cc113add553f817ad90a77114f5d43
  SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
  SSKeychain: c71293fa57216a40ab06c23f4085387583293de4
  TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
  UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
  YapDatabase: 713d4018cfacbd6e77dd430710ca84730e450980

-PODFILE CHECKSUM: 540f3266cb4655587b739533c1d417b9a5362e84
+PODFILE CHECKSUM: a9818778687fb3b24c8db9e4fe1e7344dcf7643b

 COCOAPODS: 1.0.1
--- a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
+++ b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
@ -4,14 +4,16 @@

  },
  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
+    "ABB939127996C66F7E852A780552ADEEF03C6B13" : 0,
    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
+    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
    "D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0
  },
  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
+    "ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/",
    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/",
+    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
    "D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
  },
  "DVTSourceControlWorkspaceBlueprintNameKey" : "Signal",
@ -28,6 +30,11 @@
      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C"
    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/SocketRocket.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "ABB939127996C66F7E852A780552ADEEF03C6B13"
+    },
    {
      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/FredericJacobs\/Precompiled-Signal-Dependencies.git",
      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.3.1.0</string>
+	<string>2.3.2.0	</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>