Skip to content

Commit 7216b76

Browse files
chrisballingerchrisballinger
authored
Merge pull request #1134 from ChatSecure/dep-updates
Update to SQLCipher 4.0, Tor 0.4.0.5
2 parents f44bf57 + 8e0fd84 commit 7216b76

23 files changed

+191
-446
lines changed

‎.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@
3131
[submodule "Submodules/LumberjackConsole"]
3232
path = Submodules/LumberjackConsole
3333
url = [email protected]:ChatSecure/LumberjackConsole.git
34+
[submodule "Submodules/YapDatabase"]
35+
path = Submodules/YapDatabase
36+
url = [email protected]:ChatSecure/YapDatabase.git
37+
[submodule "Submodules/YapTaskQueue"]
38+
path = Submodules/YapTaskQueue
39+
url = [email protected]:ChatSecure/YapTaskQueue.git
40+
[submodule "Submodules/libsqlfs"]
41+
path = Submodules/libsqlfs
42+
url = [email protected]:ChatSecure/libsqlfs.git

‎.travis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ install:
2222
- unzip -q ChatSecure-iOS-Precompiled-Dependencies.zip
2323
- mv ChatSecure-iOS-Precompiled-Dependencies-master ChatSecure-iOS-Precompiled-Dependencies
2424
- mkdir -p ./Carthage/Build/iOS/
25-
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/Carthage-iOS.zip -d ./Carthage/Build
26-
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/CPAProxyDependencies.zip -d ./Submodules/CPAProxy/
27-
- mv ./Submodules/CPAProxy/CPAProxyDependencies ./Submodules/CPAProxy/CPAProxyDependencies-iOS
25+
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/CPAProxyDependencies-iOS.zip -d ./Submodules/CPAProxy/
2826
- cp -r ./Submodules/CPAProxy/CPAProxyDependencies-iOS ./Submodules/CPAProxy/CPAProxyDependencies-macOS
2927
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/OTRKitDependencies-iOS.zip -d ./Submodules/OTRKit/
3028
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/Pods.zip

‎ChatSecure.xcodeproj/project.pbxproj

+2-53
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,6 @@
339339
6331066C1A16D1A300C17BAE /* OTRComposingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRComposingImageView.m; sourceTree = "<group>"; };
340340
6331066D1A16D1A300C17BAE /* OTRLockButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRLockButton.h; sourceTree = "<group>"; };
341341
6331066E1A16D1A300C17BAE /* OTRLockButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRLockButton.m; sourceTree = "<group>"; };
342-
6331066F1A16D1A300C17BAE /* OTRPasswordStrengthView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRPasswordStrengthView.h; sourceTree = "<group>"; };
343-
633106701A16D1A300C17BAE /* OTRPasswordStrengthView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRPasswordStrengthView.m; sourceTree = "<group>"; };
344342
633106711A16D1A300C17BAE /* OTRRememberPasswordView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRRememberPasswordView.h; sourceTree = "<group>"; };
345343
633106721A16D1A300C17BAE /* OTRRememberPasswordView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRRememberPasswordView.m; sourceTree = "<group>"; };
346344
633106731A16D1A300C17BAE /* OTRSocialButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRSocialButtonsView.h; sourceTree = "<group>"; };
@@ -1105,8 +1103,6 @@
11051103
6331066C1A16D1A300C17BAE /* OTRComposingImageView.m */,
11061104
6331066D1A16D1A300C17BAE /* OTRLockButton.h */,
11071105
6331066E1A16D1A300C17BAE /* OTRLockButton.m */,
1108-
6331066F1A16D1A300C17BAE /* OTRPasswordStrengthView.h */,
1109-
633106701A16D1A300C17BAE /* OTRPasswordStrengthView.m */,
11101106
633106711A16D1A300C17BAE /* OTRRememberPasswordView.h */,
11111107
633106721A16D1A300C17BAE /* OTRRememberPasswordView.m */,
11121108
633106731A16D1A300C17BAE /* OTRSocialButtonsView.h */,
@@ -1564,7 +1560,6 @@
15641560
6396AF971A169D54009F3E6C /* Frameworks */,
15651561
6396AF981A169D54009F3E6C /* Resources */,
15661562
D9227C481BA7952100B5E1D0 /* Embed Frameworks */,
1567-
D9EC47841EFA043B00C39B25 /* [Carthage] Copy Frameworks */,
15681563
D92F96D821BA1E7A0056EA35 /* LicensePlist */,
15691564
42829843B1DFA068A70F83E8 /* [CP] Copy Pods Resources */,
15701565
);
@@ -1586,7 +1581,6 @@
15861581
6396AFAF1A169D54009F3E6C /* Sources */,
15871582
6396AFB01A169D54009F3E6C /* Frameworks */,
15881583
6396AFB11A169D54009F3E6C /* Resources */,
1589-
D9BE0B531EFAFED800BDF8D8 /* [Carthage] Copy Frameworks */,
15901584
3CDE4234E348F4E767DA1980 /* [CP] Copy Pods Resources */,
15911585
);
15921586
buildRules = (
@@ -2017,45 +2011,6 @@
20172011
shellPath = /bin/sh;
20182012
shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n${PODS_ROOT}/LicensePlist/license-plist --output-path $PRODUCT_NAME/Settings.bundle --add-version-numbers --suppress-opening-directory || true\nfi\n";
20192013
};
2020-
D9BE0B531EFAFED800BDF8D8 /* [Carthage] Copy Frameworks */ = {
2021-
isa = PBXShellScriptBuildPhase;
2022-
buildActionMask = 2147483647;
2023-
files = (
2024-
);
2025-
inputPaths = (
2026-
"$(SRCROOT)/Carthage/Build/iOS/FormatterKit.framework",
2027-
"$(SRCROOT)/Carthage/Build/iOS/HTMLReader.framework",
2028-
"$(SRCROOT)/Carthage/Build/iOS/KVOController.framework",
2029-
"$(SRCROOT)/Carthage/Build/iOS/Mantle.framework",
2030-
"$(SRCROOT)/Carthage/Build/iOS/MBProgressHUD.framework",
2031-
"$(SRCROOT)/Carthage/Build/iOS/PureLayout.framework",
2032-
"$(SRCROOT)/Carthage/Build/iOS/SAMKeychain.framework",
2033-
"$(SRCROOT)/Carthage/Build/iOS/TTTAttributedLabel.framework",
2034-
"$(SRCROOT)/Carthage/Build/iOS/XLForm.framework",
2035-
"$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework",
2036-
"$(SRCROOT)/Carthage/Build/iOS/AFNetworking.framework",
2037-
);
2038-
name = "[Carthage] Copy Frameworks";
2039-
outputPaths = (
2040-
);
2041-
runOnlyForDeploymentPostprocessing = 0;
2042-
shellPath = /bin/sh;
2043-
shellScript = "/usr/local/bin/carthage copy-frameworks";
2044-
};
2045-
D9EC47841EFA043B00C39B25 /* [Carthage] Copy Frameworks */ = {
2046-
isa = PBXShellScriptBuildPhase;
2047-
buildActionMask = 2147483647;
2048-
files = (
2049-
);
2050-
inputPaths = (
2051-
);
2052-
name = "[Carthage] Copy Frameworks";
2053-
outputPaths = (
2054-
);
2055-
runOnlyForDeploymentPostprocessing = 0;
2056-
shellPath = /bin/sh;
2057-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
2058-
};
20592014
/* End PBXShellScriptBuildPhase section */
20602015

20612016
/* Begin PBXSourcesBuildPhase section */
@@ -2342,10 +2297,7 @@
23422297
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
23432298
CODE_SIGN_STYLE = Automatic;
23442299
DEVELOPMENT_TEAM = "";
2345-
FRAMEWORK_SEARCH_PATHS = (
2346-
"$(inherited)",
2347-
"$(PROJECT_DIR)/Carthage/Build/iOS",
2348-
);
2300+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
23492301
GCC_PREPROCESSOR_DEFINITIONS = (
23502302
"$(inherited)",
23512303
"COCOAPODS=1",
@@ -2379,10 +2331,7 @@
23792331
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
23802332
CODE_SIGN_STYLE = Automatic;
23812333
DEVELOPMENT_TEAM = "";
2382-
FRAMEWORK_SEARCH_PATHS = (
2383-
"$(inherited)",
2384-
"$(PROJECT_DIR)/Carthage/Build/iOS",
2385-
);
2334+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
23862335
GCC_PREPROCESSOR_DEFINITIONS = (
23872336
"$(inherited)",
23882337
"COCOAPODS=1",

‎ChatSecure/Classes/Controllers/OTRDatabaseManager.m

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ - (BOOL)setupYapDatabaseWithName:(NSString *)name directory:(nullable NSString*)
123123
}
124124
return keyData;
125125
};
126+
options.cipherCompatability = YapDatabaseCipherCompatability_Version3;
126127
_databaseDirectory = [directory copy];
127128
if (!_databaseDirectory) {
128129
_databaseDirectory = [[self class] defaultYapDatabaseDirectory];

‎ChatSecure/Classes/Controllers/OTRMediaFileManager.m

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ - (instancetype)init
5252
- (BOOL)setupWithPath:(NSString *)path password:(NSString *)password
5353
{
5454
_ioCipher = [[IOCipher alloc] initWithPath:path password:password];
55-
return _ioCipher != nil;
55+
if (!_ioCipher) {
56+
return NO;
57+
}
58+
return [_ioCipher setCipherCompatibility:3];
5659
}
5760

5861
- (void)copyDataFromFilePath:(NSString *)filePath

‎ChatSecure/Classes/Views/OTRPasswordStrengthView.h

-29
This file was deleted.

‎ChatSecure/Classes/Views/OTRPasswordStrengthView.m

-139
This file was deleted.

‎ChatSecure/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.3.7</string>
18+
<string>4.3.8</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleURLTypes</key>
@@ -35,7 +35,7 @@
3535
</dict>
3636
</array>
3737
<key>CFBundleVersion</key>
38-
<string>139</string>
38+
<string>141</string>
3939
<key>FacebookAppID</key>
4040
<string>447241325394334</string>
4141
<key>FacebookDisplayName</key>

0 commit comments

Comments
 (0)