Skip to content

Commit ebae216

Browse files
committed
Merge branch 'release/0.27.3/master'
2 parents 3b93a03 + 37784b5 commit ebae216

File tree

12 files changed

+135
-85
lines changed

12 files changed

+135
-85
lines changed

CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## Changes in 0.27.3 (2023-10-04)
2+
3+
🐛 Bugfixes
4+
5+
- Prevent crash when sending file with unrecognised file extension (no associated mime type) (mimetype)
6+
7+
🧱 Build
8+
9+
- Update Cocoapods to 1.13.0. ([#1820](https://github.com/matrix-org/matrix-ios-sdk/pull/1820))
10+
11+
112
## Changes in 0.27.2 (2023-09-12)
213

314
🐛 Bugfixes

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "fastlane"
4-
gem "cocoapods", '~>1.11.2'
4+
gem "cocoapods", '~>1.13.0'
55
gem "xcode-install"
66
gem "slather"

Gemfile.lock

Lines changed: 59 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,59 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.7)
6+
activesupport (7.0.8)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.1)
11+
addressable (2.8.5)
1312
public_suffix (>= 2.0.2, < 6.0)
1413
algoliasearch (1.27.5)
1514
httpclient (~> 2.8, >= 2.8.3)
1615
json (>= 1.5.1)
1716
artifactory (3.0.15)
1817
atomos (0.1.3)
1918
aws-eventstream (1.2.0)
20-
aws-partitions (1.674.0)
21-
aws-sdk-core (3.168.4)
19+
aws-partitions (1.828.0)
20+
aws-sdk-core (3.183.1)
2221
aws-eventstream (~> 1, >= 1.0.2)
2322
aws-partitions (~> 1, >= 1.651.0)
2423
aws-sigv4 (~> 1.5)
2524
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.61.0)
27-
aws-sdk-core (~> 3, >= 3.165.0)
25+
aws-sdk-kms (1.71.0)
26+
aws-sdk-core (~> 3, >= 3.177.0)
2827
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.117.2)
30-
aws-sdk-core (~> 3, >= 3.165.0)
28+
aws-sdk-s3 (1.136.0)
29+
aws-sdk-core (~> 3, >= 3.181.0)
3130
aws-sdk-kms (~> 1)
32-
aws-sigv4 (~> 1.4)
33-
aws-sigv4 (1.5.2)
31+
aws-sigv4 (~> 1.6)
32+
aws-sigv4 (1.6.0)
3433
aws-eventstream (~> 1, >= 1.0.2)
3534
babosa (1.0.4)
3635
claide (1.1.0)
3736
clamp (1.3.2)
38-
cocoapods (1.11.3)
37+
cocoapods (1.13.0)
3938
addressable (~> 2.8)
4039
claide (>= 1.0.2, < 2.0)
41-
cocoapods-core (= 1.11.3)
40+
cocoapods-core (= 1.13.0)
4241
cocoapods-deintegrate (>= 1.0.3, < 2.0)
43-
cocoapods-downloader (>= 1.4.0, < 2.0)
42+
cocoapods-downloader (>= 1.6.0, < 2.0)
4443
cocoapods-plugins (>= 1.0.0, < 2.0)
4544
cocoapods-search (>= 1.0.0, < 2.0)
46-
cocoapods-trunk (>= 1.4.0, < 2.0)
45+
cocoapods-trunk (>= 1.6.0, < 2.0)
4746
cocoapods-try (>= 1.1.0, < 2.0)
4847
colored2 (~> 3.1)
4948
escape (~> 0.0.4)
5049
fourflusher (>= 2.3.0, < 3.0)
5150
gh_inspector (~> 1.0)
5251
molinillo (~> 0.8.0)
5352
nap (~> 1.0)
54-
ruby-macho (>= 1.0, < 3.0)
55-
xcodeproj (>= 1.21.0, < 2.0)
56-
cocoapods-core (1.11.3)
57-
activesupport (>= 5.0, < 7)
53+
ruby-macho (>= 2.3.0, < 3.0)
54+
xcodeproj (>= 1.23.0, < 2.0)
55+
cocoapods-core (1.13.0)
56+
activesupport (>= 5.0, < 8)
5857
addressable (~> 2.8)
5958
algoliasearch (~> 1.0)
6059
concurrent-ruby (~> 1.1)
@@ -76,9 +75,9 @@ GEM
7675
colored2 (3.1.2)
7776
commander (4.6.0)
7877
highline (~> 2.0.0)
79-
concurrent-ruby (1.1.10)
78+
concurrent-ruby (1.2.2)
8079
declarative (0.0.20)
81-
digest-crc (0.6.4)
80+
digest-crc (0.6.5)
8281
rake (>= 12.0.0, < 14.0.0)
8382
domain_name (0.5.20190701)
8483
unf (>= 0.0.5, < 1.0.0)
@@ -87,8 +86,8 @@ GEM
8786
escape (0.0.4)
8887
ethon (0.16.0)
8988
ffi (>= 1.15.0)
90-
excon (0.94.0)
91-
faraday (1.10.2)
89+
excon (0.103.0)
90+
faraday (1.10.3)
9291
faraday-em_http (~> 1.0)
9392
faraday-em_synchrony (~> 1.0)
9493
faraday-excon (~> 1.1)
@@ -116,8 +115,8 @@ GEM
116115
faraday-retry (1.0.3)
117116
faraday_middleware (1.2.0)
118117
faraday (~> 1.0)
119-
fastimage (2.2.6)
120-
fastlane (2.211.0)
118+
fastimage (2.2.7)
119+
fastlane (2.216.0)
121120
CFPropertyList (>= 2.3, < 4.0.0)
122121
addressable (>= 2.8, < 3.0.0)
123122
artifactory (~> 3.0)
@@ -138,31 +137,32 @@ GEM
138137
google-apis-playcustomapp_v1 (~> 0.1)
139138
google-cloud-storage (~> 1.31)
140139
highline (~> 2.0)
140+
http-cookie (~> 1.0.5)
141141
json (< 3.0.0)
142142
jwt (>= 2.1.0, < 3)
143143
mini_magick (>= 4.9.4, < 5.0.0)
144-
multipart-post (~> 2.0.0)
144+
multipart-post (>= 2.0.0, < 3.0.0)
145145
naturally (~> 2.2)
146146
optparse (~> 0.1.1)
147147
plist (>= 3.1.0, < 4.0.0)
148148
rubyzip (>= 2.0.0, < 3.0.0)
149149
security (= 0.1.3)
150150
simctl (~> 1.6.3)
151151
terminal-notifier (>= 2.0.0, < 3.0.0)
152-
terminal-table (>= 1.4.5, < 2.0.0)
152+
terminal-table (~> 3)
153153
tty-screen (>= 0.6.3, < 1.0.0)
154154
tty-spinner (>= 0.8.0, < 1.0.0)
155155
word_wrap (~> 1.0.0)
156156
xcodeproj (>= 1.13.0, < 2.0.0)
157157
xcpretty (~> 0.3.0)
158158
xcpretty-travis-formatter (>= 0.0.3)
159-
ffi (1.15.5)
159+
ffi (1.16.2)
160160
fourflusher (2.3.1)
161161
fuzzy_match (2.0.4)
162162
gh_inspector (1.1.3)
163-
google-apis-androidpublisher_v3 (0.31.0)
164-
google-apis-core (>= 0.9.1, < 2.a)
165-
google-apis-core (0.9.1)
163+
google-apis-androidpublisher_v3 (0.50.0)
164+
google-apis-core (>= 0.11.0, < 2.a)
165+
google-apis-core (0.11.1)
166166
addressable (~> 2.5, >= 2.5.1)
167167
googleauth (>= 0.16.2, < 2.a)
168168
httpclient (>= 2.8.1, < 3.a)
@@ -171,18 +171,18 @@ GEM
171171
retriable (>= 2.0, < 4.a)
172172
rexml
173173
webrick
174-
google-apis-iamcredentials_v1 (0.16.0)
175-
google-apis-core (>= 0.9.1, < 2.a)
176-
google-apis-playcustomapp_v1 (0.12.0)
177-
google-apis-core (>= 0.9.1, < 2.a)
174+
google-apis-iamcredentials_v1 (0.17.0)
175+
google-apis-core (>= 0.11.0, < 2.a)
176+
google-apis-playcustomapp_v1 (0.13.0)
177+
google-apis-core (>= 0.11.0, < 2.a)
178178
google-apis-storage_v1 (0.19.0)
179179
google-apis-core (>= 0.9.0, < 2.a)
180180
google-cloud-core (1.6.0)
181181
google-cloud-env (~> 1.0)
182182
google-cloud-errors (~> 1.0)
183183
google-cloud-env (1.6.0)
184184
faraday (>= 0.17.3, < 3.0)
185-
google-cloud-errors (1.3.0)
185+
google-cloud-errors (1.3.1)
186186
google-cloud-storage (1.44.0)
187187
addressable (~> 2.8)
188188
digest-crc (~> 0.4)
@@ -191,91 +191,89 @@ GEM
191191
google-cloud-core (~> 1.6)
192192
googleauth (>= 0.16.2, < 2.a)
193193
mini_mime (~> 1.0)
194-
googleauth (1.3.0)
194+
googleauth (1.8.1)
195195
faraday (>= 0.17.3, < 3.a)
196196
jwt (>= 1.4, < 3.0)
197-
memoist (~> 0.16)
198197
multi_json (~> 1.11)
199198
os (>= 0.9, < 2.0)
200199
signet (>= 0.16, < 2.a)
201200
highline (2.0.3)
202201
http-cookie (1.0.5)
203202
domain_name (~> 0.5)
204203
httpclient (2.8.3)
205-
i18n (1.12.0)
204+
i18n (1.14.1)
206205
concurrent-ruby (~> 1.0)
207206
jmespath (1.6.2)
208207
json (2.6.3)
209-
jwt (2.5.0)
210-
memoist (0.16.2)
208+
jwt (2.7.1)
211209
mini_magick (4.12.0)
212-
mini_mime (1.1.2)
213-
mini_portile2 (2.8.0)
214-
minitest (5.16.3)
210+
mini_mime (1.1.5)
211+
mini_portile2 (2.8.4)
212+
minitest (5.20.0)
215213
molinillo (0.8.0)
216214
multi_json (1.15.0)
217-
multipart-post (2.0.0)
215+
multipart-post (2.3.0)
218216
nanaimo (0.3.0)
219217
nap (1.1.0)
220218
naturally (2.2.1)
221219
netrc (0.11.0)
222-
nokogiri (1.13.10)
223-
mini_portile2 (~> 2.8.0)
220+
nokogiri (1.15.4)
221+
mini_portile2 (~> 2.8.2)
224222
racc (~> 1.4)
225223
optparse (0.1.1)
226224
os (1.1.4)
227-
plist (3.6.0)
225+
plist (3.7.0)
228226
public_suffix (4.0.7)
229-
racc (1.6.1)
227+
racc (1.7.1)
230228
rake (13.0.6)
231229
representable (3.2.0)
232230
declarative (< 0.1.0)
233231
trailblazer-option (>= 0.1.1, < 0.2.0)
234232
uber (< 0.2.0)
235233
retriable (3.1.2)
236-
rexml (3.2.5)
234+
rexml (3.2.6)
237235
rouge (2.0.7)
238236
ruby-macho (2.5.1)
239237
ruby2_keywords (0.0.5)
240238
rubyzip (2.3.2)
241239
security (0.1.3)
242-
signet (0.17.0)
240+
signet (0.18.0)
243241
addressable (~> 2.8)
244242
faraday (>= 0.17.5, < 3.a)
245243
jwt (>= 1.5, < 3.0)
246244
multi_json (~> 1.10)
247-
simctl (1.6.8)
245+
simctl (1.6.10)
248246
CFPropertyList
249247
naturally
250-
slather (2.7.3)
248+
slather (2.7.4)
251249
CFPropertyList (>= 2.2, < 4)
252250
activesupport
253251
clamp (~> 1.3)
254252
nokogiri (>= 1.13.9)
255253
xcodeproj (~> 1.21)
256254
terminal-notifier (2.0.0)
257-
terminal-table (1.8.0)
258-
unicode-display_width (~> 1.1, >= 1.1.1)
255+
terminal-table (3.0.2)
256+
unicode-display_width (>= 1.1.1, < 3)
259257
trailblazer-option (0.1.2)
260258
tty-cursor (0.7.1)
261259
tty-screen (0.8.1)
262260
tty-spinner (0.9.3)
263261
tty-cursor (~> 0.7)
264262
typhoeus (1.4.0)
265263
ethon (>= 0.9.0)
266-
tzinfo (2.0.5)
264+
tzinfo (2.0.6)
267265
concurrent-ruby (~> 1.0)
268266
uber (0.1.0)
269267
unf (0.1.4)
270268
unf_ext
271269
unf_ext (0.0.8.2)
272-
unicode-display_width (1.8.0)
273-
webrick (1.7.0)
270+
unicode-display_width (2.4.2)
271+
webrick (1.8.1)
274272
word_wrap (1.0.0)
275273
xcode-install (2.8.1)
276274
claide (>= 0.9.1)
277275
fastlane (>= 2.1.0, < 3.0.0)
278-
xcodeproj (1.22.0)
276+
xcodeproj (1.23.0)
279277
CFPropertyList (>= 2.3.3, < 4.0)
280278
atomos (~> 0.1.3)
281279
claide (>= 1.0.2, < 2.0)
@@ -286,13 +284,12 @@ GEM
286284
rouge (~> 2.0.7)
287285
xcpretty-travis-formatter (1.0.1)
288286
xcpretty (~> 0.2, >= 0.0.7)
289-
zeitwerk (2.6.6)
290287

291288
PLATFORMS
292289
ruby
293290

294291
DEPENDENCIES
295-
cocoapods (~> 1.11.2)
292+
cocoapods (~> 1.13.0)
296293
fastlane
297294
slather
298295
xcode-install

MatrixSDK.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "MatrixSDK"
4-
s.version = "0.27.2"
4+
s.version = "0.27.3"
55
s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
66

77
s.description = <<-DESC
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
4545
ss.dependency 'OLMKit', '~> 3.2.5'
4646
ss.dependency 'Realm', '10.27.0'
4747
ss.dependency 'libbase58', '~> 0.1.4'
48-
ss.dependency 'MatrixSDKCrypto', '0.3.12', :configurations => ["DEBUG", "RELEASE"], :inhibit_warnings => true
48+
ss.dependency 'MatrixSDKCrypto', '0.3.13', :configurations => ["DEBUG", "RELEASE"], :inhibit_warnings => true
4949
end
5050

5151
s.subspec 'JingleCallStack' do |ss|

MatrixSDK/Crypto/CryptoMachine/MXCryptoMachine.swift

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,23 @@ extension MXCryptoMachine: MXCryptoCrossSigning {
613613
log.error("Failed importing cross signing keys", context: error)
614614
}
615615
}
616+
617+
func queryMissingSecretsFromOtherSessions() async throws {
618+
let isMissingSecrets = try machine.queryMissingSecretsFromOtherSessions()
619+
620+
if (isMissingSecrets) {
621+
// Out-of-sync check if there are any secret request to send out as a result of
622+
// the missing secret request
623+
for request in try machine.outgoingRequests() {
624+
if case .toDevice(_, let eventType, _) = request {
625+
if (eventType == kMXEventTypeStringSecretRequest) {
626+
try await handleRequest(request)
627+
}
628+
}
629+
}
630+
}
631+
}
632+
616633
}
617634

618635
extension MXCryptoMachine: MXCryptoVerifying {

MatrixSDK/Crypto/CryptoMachine/MXCryptoProtocols.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ protocol MXCryptoCrossSigning: MXCryptoUserIdentitySource, MXCryptoDevicesSource
9090
func bootstrapCrossSigning(authParams: [AnyHashable: Any]) async throws
9191
func exportCrossSigningKeys() -> CrossSigningKeyExport?
9292
func importCrossSigningKeys(export: CrossSigningKeyExport)
93+
94+
func queryMissingSecretsFromOtherSessions() async throws
9395
}
9496

9597
/// Verification functionality

0 commit comments

Comments
 (0)