Skip to content

Commit 0a01e52

Browse files
chrisballingerchrisballinger
committed
Working on SQLCipher 4.0 compat
1 parent f44bf57 commit 0a01e52

File tree

11 files changed

+129
-143
lines changed

11 files changed

+129
-143
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@
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

‎ChatSecure/Classes/Controllers/OTRDatabaseManager.m‎

Lines changed: 1 addition & 0 deletions
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/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ version: 1.7.13
9898

9999
name: FormatterKit, nameSpecified:
100100
body: Copyright (c) 2011–2…
101-
version: 1.8.2
101+
version: 1.9.0
102102

103103
name: FormatterKit, nameSpecified:
104104
body: Copyright (c) 2011–2…
105-
version: 1.8.2
105+
version: 1.9.0
106106

107107
name: GCDWebServer, nameSpecified:
108108
body: Copyright (c) 2012-2…
@@ -126,11 +126,11 @@ version: 5.1.4
126126

127127
name: HTMLReader, nameSpecified:
128128
body: HTMLReader is in the…
129-
version: 2.1.3
129+
version: 2.1.4
130130

131131
name: HTMLReader, nameSpecified:
132132
body: HTMLReader is in the…
133-
version: 2.1.3
133+
version: 2.1.4
134134

135135
name: IOCipher, nameSpecified:
136136
body: GNU LESSER GENER…
@@ -346,11 +346,11 @@ version: 1.1.0
346346

347347
name: SQLCipher, nameSpecified:
348348
body: Copyright (c) 2008, …
349-
version: 3.4.2
349+
version: 4.2.0
350350

351351
name: SQLCipher, nameSpecified:
352352
body: Copyright (c) 2008, …
353-
version: 3.4.2
353+
version: 4.2.0
354354

355355
name: TTTAttributedLabel, nameSpecified:
356356
body: Copyright (c) 2011 M…
@@ -386,11 +386,11 @@ version: 4.0.0
386386

387387
name: YapDatabase, nameSpecified:
388388
body: Software License Agr…
389-
version: 3.1.1
389+
version: 3.1.3
390390

391391
name: YapDatabase, nameSpecified:
392392
body: Software License Agr…
393-
version: 3.1.1
393+
version: 3.1.3
394394

395395
name: YapTaskQueue, nameSpecified:
396396
body: This is free and une…
@@ -408,28 +408,6 @@ name: ZXingObjC, nameSpecified:
408408
body: …
409409
version: 3.6.5
410410

411-
name: AFNetworking, nameSpecified: , owner: AFNetworking, version: 3.2.1
412-
413-
name: FormatterKit, nameSpecified: , owner: mattt, version: 1.8.2
414-
415-
name: HTMLReader, nameSpecified: , owner: nolanw, version: v2.1.3
416-
417-
name: KVOController, nameSpecified: , owner: facebook, version: v1.2.0
418-
419-
name: Mantle, nameSpecified: , owner: Mantle, version: 0987467
420-
421-
name: MBProgressHUD, nameSpecified: , owner: jdg, version: 1.1.0
422-
423-
name: PureLayout, nameSpecified: , owner: PureLayout, version: v3.1.4
424-
425-
name: SAMKeychain, nameSpecified: , owner: soffes, version: v1.5.3
426-
427-
name: TTTAttributedLabel, nameSpecified: , owner: TTTAttributedLabel, version: 2.0.0
428-
429-
name: XLForm, nameSpecified: , owner: xmartlabs, version: 4.0.0
430-
431-
name: ZXingObjC, nameSpecified: , owner: TheLevelUp, version: 3.6.4
432-
433411
name: libevent, nameSpecified: , version: 2.0.22
434412
body: Libevent is availabl…
435413

‎ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<key>File</key>
105105
<string>com.mono0926.LicensePlist/FormatterKit</string>
106106
<key>Title</key>
107-
<string>FormatterKit (1.8.2)</string>
107+
<string>FormatterKit (1.9.0)</string>
108108
<key>Type</key>
109109
<string>PSChildPaneSpecifier</string>
110110
</dict>
@@ -128,7 +128,7 @@
128128
<key>File</key>
129129
<string>com.mono0926.LicensePlist/HTMLReader</string>
130130
<key>Title</key>
131-
<string>HTMLReader (v2.1.3)</string>
131+
<string>HTMLReader (2.1.4)</string>
132132
<key>Type</key>
133133
<string>PSChildPaneSpecifier</string>
134134
</dict>
@@ -176,7 +176,7 @@
176176
<key>File</key>
177177
<string>com.mono0926.LicensePlist/KVOController</string>
178178
<key>Title</key>
179-
<string>KVOController (v1.2.0)</string>
179+
<string>KVOController (1.2.0)</string>
180180
<key>Type</key>
181181
<string>PSChildPaneSpecifier</string>
182182
</dict>
@@ -248,7 +248,7 @@
248248
<key>File</key>
249249
<string>com.mono0926.LicensePlist/Mantle</string>
250250
<key>Title</key>
251-
<string>Mantle (0987467)</string>
251+
<string>Mantle (2.1.0)</string>
252252
<key>Type</key>
253253
<string>PSChildPaneSpecifier</string>
254254
</dict>
@@ -328,7 +328,7 @@
328328
<key>File</key>
329329
<string>com.mono0926.LicensePlist/PureLayout</string>
330330
<key>Title</key>
331-
<string>PureLayout (v3.1.4)</string>
331+
<string>PureLayout (3.1.4)</string>
332332
<key>Type</key>
333333
<string>PSChildPaneSpecifier</string>
334334
</dict>
@@ -344,7 +344,7 @@
344344
<key>File</key>
345345
<string>com.mono0926.LicensePlist/SAMKeychain</string>
346346
<key>Title</key>
347-
<string>SAMKeychain (v1.5.3)</string>
347+
<string>SAMKeychain (1.5.3)</string>
348348
<key>Type</key>
349349
<string>PSChildPaneSpecifier</string>
350350
</dict>
@@ -368,7 +368,7 @@
368368
<key>File</key>
369369
<string>com.mono0926.LicensePlist/SQLCipher</string>
370370
<key>Title</key>
371-
<string>SQLCipher (3.4.2)</string>
371+
<string>SQLCipher (4.2.0)</string>
372372
<key>Type</key>
373373
<string>PSChildPaneSpecifier</string>
374374
</dict>
@@ -400,7 +400,7 @@
400400
<key>File</key>
401401
<string>com.mono0926.LicensePlist/XLForm</string>
402402
<key>Title</key>
403-
<string>XLForm (4.0.0)</string>
403+
<string>XLForm (4.0.1)</string>
404404
<key>Type</key>
405405
<string>PSChildPaneSpecifier</string>
406406
</dict>
@@ -416,7 +416,7 @@
416416
<key>File</key>
417417
<string>com.mono0926.LicensePlist/YapDatabase</string>
418418
<key>Title</key>
419-
<string>YapDatabase (3.1.1)</string>
419+
<string>YapDatabase (3.1.3)</string>
420420
<key>Type</key>
421421
<string>PSChildPaneSpecifier</string>
422422
</dict>
@@ -432,7 +432,7 @@
432432
<key>File</key>
433433
<string>com.mono0926.LicensePlist/ZXingObjC</string>
434434
<key>Title</key>
435-
<string>ZXingObjC (3.6.4)</string>
435+
<string>ZXingObjC (3.6.5)</string>
436436
<key>Type</key>
437437
<string>PSChildPaneSpecifier</string>
438438
</dict>

‎ChatSecure/Settings.bundle/com.mono0926.LicensePlist/FormatterKit.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<array>
77
<dict>
88
<key>FooterText</key>
9-
<string>Copyright (c) 2011–2015 Mattt Thompson (http://mattt.me/)
9+
<string>Copyright (c) 2011–2019 Mattt Thompson (http://mattt.me/)
1010
1111
Permission is hereby granted, free of charge, to any person obtaining a copy
1212
of this software and associated documentation files (the "Software"), to deal

‎ChatSecureCore.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ TODO: Add long description of the pod here.
5858

5959
# Storage
6060
# We are blocked on SQLCipher 4.0.0 migration https://github.com/ChatSecure/ChatSecure-iOS/issues/1078
61-
s.dependency 'SQLCipher', '~> 3.4'
61+
s.dependency 'SQLCipher', '~> 4.2.0'
6262
# Version 3.1.2 breaks YapTaskQueue 0.3.0
63-
s.dependency 'YapDatabase/SQLCipher', '3.1.1'
63+
s.dependency 'YapDatabase/SQLCipher', '~> 3.1.3'
6464

6565
# The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
6666
s.dependency 'libsqlfs/SQLCipher'

‎Gemfile.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ GEM
1212
atomos (0.1.3)
1313
babosa (1.0.2)
1414
claide (1.0.2)
15-
cocoapods (1.7.0)
15+
cocoapods (1.7.4)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.7.0)
18+
cocoapods-core (= 1.7.4)
1919
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2020
cocoapods-downloader (>= 1.2.2, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -25,13 +25,13 @@ GEM
2525
cocoapods-try (>= 1.1.0, < 2.0)
2626
colored2 (~> 3.1)
2727
escape (~> 0.0.4)
28-
fourflusher (>= 2.2.0, < 3.0)
28+
fourflusher (>= 2.3.0, < 3.0)
2929
gh_inspector (~> 1.0)
3030
molinillo (~> 0.6.6)
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.8.2, < 2.0)
34-
cocoapods-core (1.7.0)
33+
xcodeproj (>= 1.10.0, < 2.0)
34+
cocoapods-core (1.7.4)
3535
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
@@ -53,9 +53,9 @@ GEM
5353
declarative (0.0.10)
5454
declarative-option (0.1.0)
5555
digest-crc (0.4.1)
56-
domain_name (0.5.20180417)
56+
domain_name (0.5.20190701)
5757
unf (>= 0.0.5, < 1.0.0)
58-
dotenv (2.7.2)
58+
dotenv (2.7.4)
5959
emoji_regex (1.0.1)
6060
escape (0.0.4)
6161
excon (0.64.0)
@@ -67,7 +67,7 @@ GEM
6767
faraday_middleware (0.13.1)
6868
faraday (>= 0.7.4, < 1.0)
6969
fastimage (2.1.5)
70-
fastlane (2.123.0)
70+
fastlane (2.127.1)
7171
CFPropertyList (>= 2.3, < 4.0.0)
7272
addressable (>= 2.3, < 3.0.0)
7373
babosa (>= 1.0.2, < 2.0.0)
@@ -86,8 +86,8 @@ GEM
8686
google-cloud-storage (>= 1.15.0, < 2.0.0)
8787
highline (>= 1.7.2, < 2.0.0)
8888
json (< 3.0.0)
89+
jwt (~> 2.1.0)
8990
mini_magick (~> 4.5.1)
90-
multi_json
9191
multi_xml (~> 0.5)
9292
multipart-post (~> 2.0.0)
9393
plist (>= 3.1.0, < 4.0.0)
@@ -104,7 +104,7 @@ GEM
104104
xcodeproj (>= 1.8.1, < 2.0.0)
105105
xcpretty (~> 0.3.0)
106106
xcpretty-travis-formatter (>= 0.0.3)
107-
fourflusher (2.2.0)
107+
fourflusher (2.3.1)
108108
fuzzy_match (2.0.4)
109109
gh_inspector (1.1.3)
110110
google-api-client (0.23.9)
@@ -117,7 +117,7 @@ GEM
117117
signet (~> 0.9)
118118
google-cloud-core (1.3.0)
119119
google-cloud-env (~> 1.0)
120-
google-cloud-env (1.0.5)
120+
google-cloud-env (1.2.0)
121121
faraday (~> 0.11)
122122
google-cloud-storage (1.16.0)
123123
digest-crc (~> 0.4)
@@ -138,7 +138,7 @@ GEM
138138
i18n (0.9.5)
139139
concurrent-ruby (~> 1.0)
140140
json (2.2.0)
141-
jwt (2.2.1)
141+
jwt (2.1.0)
142142
memoist (0.16.0)
143143
mime-types (3.2.2)
144144
mime-types-data (~> 3.2015)
@@ -178,10 +178,10 @@ GEM
178178
terminal-table (1.8.0)
179179
unicode-display_width (~> 1.1, >= 1.1.1)
180180
thread_safe (0.3.6)
181-
tty-cursor (0.6.1)
181+
tty-cursor (0.7.0)
182182
tty-screen (0.7.0)
183-
tty-spinner (0.9.0)
184-
tty-cursor (~> 0.6.0)
183+
tty-spinner (0.9.1)
184+
tty-cursor (~> 0.7)
185185
tzinfo (1.2.5)
186186
thread_safe (~> 0.1)
187187
uber (0.1.0)
@@ -190,7 +190,7 @@ GEM
190190
unf_ext (0.0.7.6)
191191
unicode-display_width (1.6.0)
192192
word_wrap (1.0.0)
193-
xcodeproj (1.9.0)
193+
xcodeproj (1.11.0)
194194
CFPropertyList (>= 2.3.3, < 4.0)
195195
atomos (~> 0.1.3)
196196
claide (>= 1.0.2, < 2.0)

‎Podfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,17 @@ abstract_target 'ChatSecureCorePods' do
5959

6060
# Storage
6161
# We are blocked on SQLCipher 4.0.0 migration https://github.com/ChatSecure/ChatSecure-iOS/issues/1078
62-
pod 'SQLCipher', '~> 3.4'
62+
pod 'SQLCipher', '~> 4.2'
6363
# Version 3.1.2 breaks YapTaskQueue 0.3.0
64-
pod 'YapDatabase/SQLCipher', '3.1.1'
64+
# pod 'YapDatabase/SQLCipher', '~> 3.1.3'
65+
pod 'YapDatabase/SQLCipher', :path => 'Submodules/YapDatabase/YapDatabase.podspec'
6566
pod 'Mantle', :podspec => 'Podspecs/Mantle.podspec.json'
6667

6768
# The upstream 1.3.2 has a regression https://github.com/ChatSecure/ChatSecure-iOS/issues/1075
6869
pod 'libsqlfs/SQLCipher', :git => 'https://github.com/ChatSecure/libsqlfs.git', :branch => '1.3.2-chatsecure'
6970
pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
70-
pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'swift4'
71+
# pod 'YapTaskQueue/SQLCipher', :git => 'https://github.com/ChatSecure/YapTaskQueue.git', :branch => 'swift4'
72+
pod 'YapTaskQueue/SQLCipher', :path => 'Submodules/YapTaskQueue/YapTaskQueue.podspec'
7173

7274
# Crypto
7375
pod 'SignalProtocolObjC', :path => 'Submodules/SignalProtocol-ObjC/SignalProtocolObjC.podspec'

0 commit comments

Comments
 (0)