Skip to content

Commit bf7657c

Browse files
chrisballingerchrisballinger
committed
Fix errors from cherry-picking upstream
1 parent 7dd2593 commit bf7657c

File tree

10 files changed

+79
-68
lines changed

10 files changed

+79
-68
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ DerivedData
1010
*.xccheckout
1111

1212
/Pods/
13-
13+
Carthage/
1414
Secrets.plist

‎ChatSecure.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,7 +2421,7 @@
24212421
);
24222422
runOnlyForDeploymentPostprocessing = 0;
24232423
shellPath = /bin/sh;
2424-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
2424+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
24252425
showEnvVarsInLog = 0;
24262426
};
24272427
3465A939CCAAAAC0480C0795 /* [CP] Embed Pods Frameworks */ = {
@@ -2466,7 +2466,7 @@
24662466
);
24672467
runOnlyForDeploymentPostprocessing = 0;
24682468
shellPath = /bin/sh;
2469-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
2469+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
24702470
showEnvVarsInLog = 0;
24712471
};
24722472
A32A5DF4737208630E1EA1F8 /* [CP] Copy Pods Resources */ = {
@@ -2496,7 +2496,7 @@
24962496
);
24972497
runOnlyForDeploymentPostprocessing = 0;
24982498
shellPath = /bin/sh;
2499-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
2499+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
25002500
showEnvVarsInLog = 0;
25012501
};
25022502
B54AA4231DBE4A463B56D596 /* [CP] Copy Pods Resources */ = {

‎ChatSecure.xcworkspace/xcshareddata/ChatSecure.xcscmblueprint‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
77
"98D05BCBC40AE5315578EEE7C186D3063CCA59C3" : 0,
88
"D2885296440547CB23891301E79B480A22EAC5F6" : 9223372036854775807,
9+
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : 9223372036854775807,
910
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : 0,
1011
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : 0,
11-
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : 9223372036854775807,
12+
"1F0E69EE6C74FB8A0A162333FB8AE87DA223658A" : 9223372036854775807,
1213
"6629762BA356A4C56436558F8BA2A9102478B1C6" : 0,
1314
"425D736B25093B4D45BF64638604863B9D31F2C1" : 0,
1415
"EF95512761D96C4A6BCF745F9F23442E0E2471D9" : 0,
1516
"A9950D8C7A488A3339E7426A4D08917C04DE7033" : 9223372036854775807,
1617
"65A79C2919A5538250064F3C245A290D7BFC656E" : 0,
1718
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : 0,
19+
"46009F899FD1E549A6EA909CCE643A67FC5D3AED" : 9223372036854775807,
1820
"2D31E58E12E928BB18019A2FA755DD659EB4E709" : 0,
1921
"A3F0483F361B2F4077033C635E9F3F6840AE7757" : 0,
2022
"AF7423C487C4B1B7082E587F3AB70804F6530E81" : 0
@@ -23,15 +25,17 @@
2325
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
2426
"98D05BCBC40AE5315578EEE7C186D3063CCA59C3" : "ChatSecure-iOS\/Submodules\/CPAProxy\/",
2527
"D2885296440547CB23891301E79B480A22EAC5F6" : "ChatSecure-iOS\/Submodules\/KSCrash\/",
28+
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : "ChatSecure-iOS\/Submodules\/YapDatabase\/",
2629
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : "ChatSecure-iOS\/Submodules\/XMPPFramework\/",
2730
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : "ChatSecure-iOS\/Submodules\/IOCipher\/",
28-
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : "ChatSecure-iOS\/Submodules\/YapDatabase\/",
31+
"1F0E69EE6C74FB8A0A162333FB8AE87DA223658A" : "ChatSecure-iOS\/Carthage\/Checkouts\/SignalProtocolC\/libsignal-protocol-c\/",
2932
"6629762BA356A4C56436558F8BA2A9102478B1C6" : "ChatSecure-iOS\/Submodules\/xmpp-server-list\/",
3033
"425D736B25093B4D45BF64638604863B9D31F2C1" : "ChatSecure-iOS\/Submodules\/OTRKit\/",
3134
"EF95512761D96C4A6BCF745F9F23442E0E2471D9" : "ChatSecure-iOS\/Submodules\/SignalProtocol-ObjC\/",
3235
"A9950D8C7A488A3339E7426A4D08917C04DE7033" : "",
3336
"65A79C2919A5538250064F3C245A290D7BFC656E" : "ChatSecure-iOS\/",
3437
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : "ChatSecure\/Submodules\/ParkedTextField\/",
38+
"46009F899FD1E549A6EA909CCE643A67FC5D3AED" : "ChatSecure-iOS\/Carthage\/Checkouts\/SignalProtocolC\/",
3539
"2D31E58E12E928BB18019A2FA755DD659EB4E709" : "ChatSecure\/Submodules\/ProxyKit\/",
3640
"A3F0483F361B2F4077033C635E9F3F6840AE7757" : "ChatSecure-iOS\/Submodules\/ChatSecure-Push-iOS\/",
3741
"AF7423C487C4B1B7082E587F3AB70804F6530E81" : "ChatSecure-iOS\/Submodules\/XLForm\/"
@@ -45,6 +49,11 @@
4549
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
4650
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0667158F825A93D2AA325B5DCB5737C5DE9CB558"
4751
},
52+
{
53+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/WhisperSystems\/libsignal-protocol-c.git",
54+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
55+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1F0E69EE6C74FB8A0A162333FB8AE87DA223658A"
56+
},
4857
{
4958
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:chrisballinger\/ProxyKit.git",
5059
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
@@ -55,6 +64,11 @@
5564
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
5665
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "425D736B25093B4D45BF64638604863B9D31F2C1"
5766
},
67+
{
68+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ChatSecure\/SignalProtocolC.git",
69+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
70+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "46009F899FD1E549A6EA909CCE643A67FC5D3AED"
71+
},
5872
{
5973
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ChatSecure\/ChatSecure-iOS.git",
6074
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

‎ChatSecure/Classes/Controllers/OTRAccountSignalEncryptionManager.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ extension OTRAccountSignalEncryptionManager {
9090
if let preKey = preKeys.first {
9191
let _ = try SignalPreKeyBundle(registrationId: 0, deviceId: bundle.deviceId, preKeyId: preKey.preKeyId(), preKeyPublic: preKey.keyPair().publicKey, signedPreKeyId: bundle.signedPreKeyId, signedPreKeyPublic: bundle.signedPublicPreKey, signature: bundle.signedPreKeySignature, identityKey: bundle.publicIdentityKey)
9292
} else {
93-
DDLogError("Error testing outgoing bundle")
93+
//DDLogError("Error testing outgoing bundle")
9494
throw OMEMOBundleError.invalid
9595
}
9696
} catch let error {
97-
DDLogError("Error creating outgoing bundle: \(error)")
97+
//DDLogError("Error creating outgoing bundle: \(error)")
9898
throw OMEMOBundleError.invalid
9999
}
100100

‎ChatSecure/Classes/Controllers/OTROMEMOSignalCoordinator.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,13 @@ extension OTROMEMOSignalCoordinator: OMEMOModuleDelegate {
516516
public func omemo(_ omemo: OMEMOModule, fetchedBundle bundle: OMEMOBundle, from fromJID: XMPPJID, responseIq: XMPPIQ, outgoingIq: XMPPIQ) {
517517

518518
if (self.isOurJID(fromJID) && bundle.deviceId == self.signalEncryptionManager.registrationId) {
519-
DDLogVerbose("fetchedOurOwnBundle: \(responseIq) \(outgoingIq)")
519+
//DDLogVerbose("fetchedOurOwnBundle: \(responseIq) \(outgoingIq)")
520520

521521
//We fetched our own bundle
522522
if let ourDatabaseBundle = self.fetchMyBundle() {
523523
//This bundle doesn't have the correct identity key. Something has gone wrong and we should republish
524524
if ourDatabaseBundle.identityKey != bundle.identityKey {
525-
DDLogError("Bundle identityKeys do not match! \(ourDatabaseBundle.identityKey) vs \(bundle.identityKey)")
525+
//DDLogError("Bundle identityKeys do not match! \(ourDatabaseBundle.identityKey) vs \(bundle.identityKey)")
526526
omemo.publishBundle(ourDatabaseBundle, elementId: nil)
527527
}
528528
}
@@ -628,14 +628,14 @@ extension OTROMEMOSignalCoordinator:OMEMOStorageDelegate {
628628
} catch let omemoError as OMEMOBundleError {
629629
switch omemoError {
630630
case .invalid:
631-
DDLogError("Found invalid stored bundle!")
631+
//DDLogError("Found invalid stored bundle!")
632632
// delete???
633633
break
634634
default:
635635
break
636636
}
637637
} catch let error {
638-
DDLogError("Other error fetching bundle! \(error)")
638+
//DDLogError("Other error fetching bundle! \(error)")
639639
}
640640
let maxTries = 5
641641
var tries = 0
@@ -644,11 +644,11 @@ extension OTROMEMOSignalCoordinator:OMEMOStorageDelegate {
644644
do {
645645
_bundle = try self.signalEncryptionManager.generateOutgoingBundle(self.preKeyCount)
646646
} catch let error {
647-
DDLogError("Error generating bundle! Try #\(tries)/\(maxTries) \(error)")
647+
//DDLogError("Error generating bundle! Try #\(tries)/\(maxTries) \(error)")
648648
}
649649
}
650650
guard let bundle = _bundle else {
651-
DDLogError("Could not fetch or generate valid bundle!")
651+
//DDLogError("Could not fetch or generate valid bundle!")
652652
return nil
653653
}
654654

‎ChatSecure/Classes/Controllers/OTRSignalStorageManager.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ open class OTRSignalStorageManager: NSObject {
202202
if let preKey = preKeys.first, let preKeyData = preKey.keyData {
203203
let _ = try SignalPreKeyBundle(registrationId: 0, deviceId: bundle.deviceId, preKeyId: preKey.keyId, preKeyPublic: preKeyData, signedPreKeyId: bundle.signedPreKeyId, signedPreKeyPublic: bundle.signedPublicPreKey, signature: bundle.signedPreKeySignature, identityKey: bundle.publicIdentityKey)
204204
} else {
205-
DDLogError("Error fetching outgoing bundle: no prekeys")
205+
//DDLogError("Error fetching outgoing bundle: no prekeys")
206206
throw OMEMOBundleError.invalid
207207
}
208208
} catch let error {
209-
DDLogError("Error fetching outgoing bundle: \(error)")
209+
//DDLogError("Error fetching outgoing bundle: \(error)")
210210
throw error
211211
}
212212

‎Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ abstract_target 'ChatSecureCorePods' do
6060
pod 'QRCodeReaderViewController', '~> 4.0'
6161
pod 'ZXingObjC', '~> 3.0'
6262

63-
pod 'SignalProtocolC', :podspec => 'https://raw.githubusercontent.com/ChatSecure/SignalProtocolC.podspec/b2b483fe1c4c66cecfc0376c496e6a58ed1939b5/SignalProtocolC.podspec'
63+
# pod 'SignalProtocolC', :podspec => 'https://raw.githubusercontent.com/ChatSecure/SignalProtocolC.podspec/b2b483fe1c4c66cecfc0376c496e6a58ed1939b5/SignalProtocolC.podspec'
6464
pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => 'podspec-fix'
6565
pod 'ParkedTextField', :git => 'https://github.com/gmertk/ParkedTextField.git', :tag => '0.3.0'
6666

@@ -76,7 +76,7 @@ abstract_target 'ChatSecureCorePods' do
7676

7777
# Submodules
7878

79-
pod 'SignalProtocol-ObjC', :path => 'Submodules/SignalProtocol-ObjC/SignalProtocol-ObjC.podspec'
79+
pod 'SignalProtocolObjC', :path => 'Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec'
8080
pod 'ChatSecure-Push-iOS', :path => 'Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec'
8181
pod 'OTRKit', :path => 'Submodules/OTRKit/OTRKit.podspec'
8282
pod 'CPAProxy', :path => 'Submodules/CPAProxy/CPAProxy.podspec'

‎Podfile.lock‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -58,68 +58,68 @@ PODS:
5858
- JTSImageViewController (1.5.1)
5959
- JVFloatLabeledTextField (1.1.1)
6060
- KissXML (5.2.0)
61-
- KSCrash (1.15.4):
62-
- KSCrash/Installations (= 1.15.4)
63-
- KSCrash/Installations (1.15.4):
61+
- KSCrash (1.15.8):
62+
- KSCrash/Installations (= 1.15.8)
63+
- KSCrash/Installations (1.15.8):
6464
- KSCrash/Recording
6565
- KSCrash/Reporting
66-
- KSCrash/Recording (1.15.4):
67-
- KSCrash/Recording/Tools (= 1.15.4)
68-
- KSCrash/Recording/Tools (1.15.4)
69-
- KSCrash/Reporting (1.15.4):
66+
- KSCrash/Recording (1.15.8):
67+
- KSCrash/Recording/Tools (= 1.15.8)
68+
- KSCrash/Recording/Tools (1.15.8)
69+
- KSCrash/Reporting (1.15.8):
7070
- KSCrash/Recording
71-
- KSCrash/Reporting/Filters (= 1.15.4)
72-
- KSCrash/Reporting/MessageUI (= 1.15.4)
73-
- KSCrash/Reporting/Sinks (= 1.15.4)
74-
- KSCrash/Reporting/Tools (= 1.15.4)
75-
- KSCrash/Reporting/Filters (1.15.4):
71+
- KSCrash/Reporting/Filters (= 1.15.8)
72+
- KSCrash/Reporting/MessageUI (= 1.15.8)
73+
- KSCrash/Reporting/Sinks (= 1.15.8)
74+
- KSCrash/Reporting/Tools (= 1.15.8)
75+
- KSCrash/Reporting/Filters (1.15.8):
7676
- KSCrash/Recording
77-
- KSCrash/Reporting/Filters/Alert (= 1.15.4)
78-
- KSCrash/Reporting/Filters/AppleFmt (= 1.15.4)
79-
- KSCrash/Reporting/Filters/Base (= 1.15.4)
80-
- KSCrash/Reporting/Filters/Basic (= 1.15.4)
81-
- KSCrash/Reporting/Filters/GZip (= 1.15.4)
82-
- KSCrash/Reporting/Filters/JSON (= 1.15.4)
83-
- KSCrash/Reporting/Filters/Sets (= 1.15.4)
84-
- KSCrash/Reporting/Filters/Stringify (= 1.15.4)
85-
- KSCrash/Reporting/Filters/Tools (= 1.15.4)
86-
- KSCrash/Reporting/Filters/Alert (1.15.4):
77+
- KSCrash/Reporting/Filters/Alert (= 1.15.8)
78+
- KSCrash/Reporting/Filters/AppleFmt (= 1.15.8)
79+
- KSCrash/Reporting/Filters/Base (= 1.15.8)
80+
- KSCrash/Reporting/Filters/Basic (= 1.15.8)
81+
- KSCrash/Reporting/Filters/GZip (= 1.15.8)
82+
- KSCrash/Reporting/Filters/JSON (= 1.15.8)
83+
- KSCrash/Reporting/Filters/Sets (= 1.15.8)
84+
- KSCrash/Reporting/Filters/Stringify (= 1.15.8)
85+
- KSCrash/Reporting/Filters/Tools (= 1.15.8)
86+
- KSCrash/Reporting/Filters/Alert (1.15.8):
8787
- KSCrash/Recording
8888
- KSCrash/Reporting/Filters/Base
89-
- KSCrash/Reporting/Filters/AppleFmt (1.15.4):
89+
- KSCrash/Reporting/Filters/AppleFmt (1.15.8):
9090
- KSCrash/Recording
9191
- KSCrash/Reporting/Filters/Base
92-
- KSCrash/Reporting/Filters/Base (1.15.4):
92+
- KSCrash/Reporting/Filters/Base (1.15.8):
9393
- KSCrash/Recording
94-
- KSCrash/Reporting/Filters/Basic (1.15.4):
94+
- KSCrash/Reporting/Filters/Basic (1.15.8):
9595
- KSCrash/Recording
9696
- KSCrash/Reporting/Filters/Base
97-
- KSCrash/Reporting/Filters/GZip (1.15.4):
97+
- KSCrash/Reporting/Filters/GZip (1.15.8):
9898
- KSCrash/Recording
9999
- KSCrash/Reporting/Filters/Base
100-
- KSCrash/Reporting/Filters/JSON (1.15.4):
100+
- KSCrash/Reporting/Filters/JSON (1.15.8):
101101
- KSCrash/Recording
102102
- KSCrash/Reporting/Filters/Base
103-
- KSCrash/Reporting/Filters/Sets (1.15.4):
103+
- KSCrash/Reporting/Filters/Sets (1.15.8):
104104
- KSCrash/Recording
105105
- KSCrash/Reporting/Filters/AppleFmt
106106
- KSCrash/Reporting/Filters/Base
107107
- KSCrash/Reporting/Filters/Basic
108108
- KSCrash/Reporting/Filters/GZip
109109
- KSCrash/Reporting/Filters/JSON
110110
- KSCrash/Reporting/Filters/Stringify
111-
- KSCrash/Reporting/Filters/Stringify (1.15.4):
111+
- KSCrash/Reporting/Filters/Stringify (1.15.8):
112112
- KSCrash/Recording
113113
- KSCrash/Reporting/Filters/Base
114-
- KSCrash/Reporting/Filters/Tools (1.15.4):
114+
- KSCrash/Reporting/Filters/Tools (1.15.8):
115115
- KSCrash/Recording
116-
- KSCrash/Reporting/MessageUI (1.15.4):
116+
- KSCrash/Reporting/MessageUI (1.15.8):
117117
- KSCrash/Recording
118-
- KSCrash/Reporting/Sinks (1.15.4):
118+
- KSCrash/Reporting/Sinks (1.15.8):
119119
- KSCrash/Recording
120120
- KSCrash/Reporting/Filters
121121
- KSCrash/Reporting/Tools
122-
- KSCrash/Reporting/Tools (1.15.4):
122+
- KSCrash/Reporting/Tools (1.15.8):
123123
- KSCrash/Recording
124124
- KVOController (1.2.0)
125125
- libidn (1.33)
@@ -153,9 +153,9 @@ PODS:
153153
- QRCodeReaderViewController (4.0.2)
154154
- Reachability (3.2)
155155
- SAMKeychain (1.5.2)
156-
- SignalProtocol-ObjC (0.1.0):
157-
- SignalProtocolC (~> 0.1.0)
158-
- SignalProtocolC (0.1.0)
156+
- SignalProtocolC (2.3.1)
157+
- SignalProtocolObjC (1.0.0):
158+
- SignalProtocolC (~> 2.3.1)
159159
- SQLCipher (3.4.1):
160160
- SQLCipher/standard (= 3.4.1)
161161
- SQLCipher/common (3.4.1)
@@ -260,8 +260,7 @@ DEPENDENCIES:
260260
- QRCodeReaderViewController (~> 4.0)
261261
- Reachability (~> 3)
262262
- SAMKeychain (~> 1.5)
263-
- SignalProtocol-ObjC (from `Submodules/SignalProtocol-ObjC/SignalProtocol-ObjC.podspec`)
264-
- SignalProtocolC (from `https://raw.githubusercontent.com/ChatSecure/SignalProtocolC.podspec/b2b483fe1c4c66cecfc0376c496e6a58ed1939b5/SignalProtocolC.podspec`)
263+
- SignalProtocolObjC (from `Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec`)
265264
- TTTAttributedLabel (~> 2.0)
266265
- TUSafariActivity (~> 1.0)
267266
- uservoice-iphone-sdk (~> 3.2)
@@ -294,10 +293,8 @@ EXTERNAL SOURCES:
294293
ParkedTextField:
295294
:git: https://github.com/gmertk/ParkedTextField.git
296295
:tag: 0.3.0
297-
SignalProtocol-ObjC:
298-
:path: Submodules/SignalProtocol-ObjC/SignalProtocol-ObjC.podspec
299-
SignalProtocolC:
300-
:podspec: https://raw.githubusercontent.com/ChatSecure/SignalProtocolC.podspec/b2b483fe1c4c66cecfc0376c496e6a58ed1939b5/SignalProtocolC.podspec
296+
SignalProtocolObjC:
297+
:path: Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec
301298
XMPPFramework:
302299
:path: Submodules/XMPPFramework/XMPPFramework.podspec
303300
YapTaskQueue:
@@ -338,7 +335,7 @@ SPEC CHECKSUMS:
338335
JTSImageViewController: 1f8ce1cc93dab0d0af8e53badeea7528560cfec9
339336
JVFloatLabeledTextField: 0e5524b097f102036214dd8279edc8ecf08b5e18
340337
KissXML: 1c1eeeb6b94e4522cd2f2373e5d0d03c9227738f
341-
KSCrash: cbdf1f66c45c8dcc11154a4b1596c6cd1bfc2657
338+
KSCrash: 4acb0f9cdb0b1ce7155c608dc175d91d750a8c3a
342339
KVOController: d72ace34afea42468329623b3379ab3cd1d286b6
343340
libidn: 90fc1a62b60288dcf543f13f4ebca913f17d829f
344341
libsqlfs: 053504a0181dd89441857c02eea05c1f972abeed
@@ -354,19 +351,19 @@ SPEC CHECKSUMS:
354351
QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff
355352
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
356353
SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
357-
SignalProtocol-ObjC: 06dbca97b2c0b1b434ea325abc50b4c26cf6e900
358-
SignalProtocolC: a059b4ff6899a2d99d7fafb046513fdd2db2b441
354+
SignalProtocolC: e61c89693515347df8ed97961160a36cbe55c441
355+
SignalProtocolObjC: f5f0c7dcbedf21490b7ec190b6dc5103910acb75
359356
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559
360357
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
361358
TUSafariActivity: afc55a00965377939107ce4fdc7f951f62454546
362359
uservoice-iphone-sdk: 82b5c44465fe900b6e54ee856328733d2abfa947
363360
VTAcknowledgementsViewController: e1de80f2c0ce31cc7e1c6f1c8aaeec2770371f09
364361
XLForm: d5c391dfc62865927b5bcab0a5a0dbfb3e02b0ec
365-
XMPPFramework: 544da7ab3faf7005de303708630a4e9741efb907
362+
XMPPFramework: 164ed2ce99e3eb2f358e9f5ca5eeaa8d75339fde
366363
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
367364
YapTaskQueue: f5d60946ffa289e228faf8411bf53cf90cfa7ead
368365
ZXingObjC: bbf7b8f0cf8933fdd33eb4f9f46e22308552869b
369366

370-
PODFILE CHECKSUM: dd16556f1d4274389bcaf64c9041872f13ad1bf8
367+
PODFILE CHECKSUM: 4b36c3890db7f83bb7bf599f2a24a4b449cda1fc
371368

372-
COCOAPODS: 1.2.0
369+
COCOAPODS: 1.2.1

‎Submodules/SignalProtocol-ObjC‎

Submodule SignalProtocol-ObjC updated 33 files

‎Submodules/XMPPFramework‎

0 commit comments

Comments
 (0)