Skip to content

Commit ae87624

Browse files
committed
Merge branch 'release/1.9.16/master'
2 parents 2e9bb70 + c0b819f commit ae87624

File tree

184 files changed

+2523
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+2523
-690
lines changed

.github/workflows/release-alpha.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,10 @@ env:
1313
MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
1414

1515
jobs:
16-
check-secret:
17-
runs-on: macos-12
18-
outputs:
19-
out-key: ${{ steps.out-key.outputs.defined }}
20-
steps:
21-
- id: out-key
22-
env:
23-
P12_KEY: ${{ secrets.ALPHA_CERTIFICATES_P12 }}
24-
P12_PASSWORD_KEY: ${{ secrets.ALPHA_CERTIFICATES_P12 }}
25-
if: "${{ env.P12_KEY != '' || env.P12_PASSWORD_KEY != '' }}"
26-
run: echo "::set-output name=defined::true"
2716
build:
28-
# Run job if secrets are available (not available for forks).
29-
needs: [check-secret]
17+
# Don't run for forks as secrets are unavailable.
3018
if: |
31-
needs.check-secret.outputs.out-key == 'true' &&
19+
github.event.pull_request.head.repo.full_name == github.repository &&
3220
(github.event_name == 'push' ||
3321
(github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')))
3422

CHANGES.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
## Changes in 1.9.16 (2023-01-24)
2+
3+
✨ Features
4+
5+
- Rich Text Composer: Enable bulleted/numbered lists support ([#7238](https://github.com/vector-im/element-ios/issues/7238))
6+
- Rich Text Composer: Enable quote & code blocks support ([#7271](https://github.com/vector-im/element-ios/issues/7271))
7+
- Voice Broadcast: When deleting a voice broadcast, all data is now deleted on server side (MSC3912 implementation). ([#7283](https://github.com/vector-im/element-ios/issues/7283))
8+
9+
🙌 Improvements
10+
11+
- Labs: VoiceBroadcast: Handle VoIP buttons when VB is used ([#7225](https://github.com/vector-im/element-ios/pull/7225))
12+
- Polls: add UI for active poll history. ([#7267](https://github.com/vector-im/element-ios/pull/7267))
13+
- CryptoSDK: Add labs settings to enable Crypto SDK ([#7272](https://github.com/vector-im/element-ios/pull/7272))
14+
- Voice Broadcast: Improved detection of voice broadcast completion during playback. ([#7273](https://github.com/vector-im/element-ios/pull/7273))
15+
- Remove "Leave" button on Room details screen ([#7275](https://github.com/vector-im/element-ios/pull/7275))
16+
- Polls: poll history UI for past polls. ([#7278](https://github.com/vector-im/element-ios/pull/7278))
17+
- Polls: render replies to poll events better. ([#7284](https://github.com/vector-im/element-ios/pull/7284))
18+
- CryptoV2: Display migration progress during startup ([#7286](https://github.com/vector-im/element-ios/pull/7286))
19+
- Upgrade MatrixSDK version ([v0.24.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.8)).
20+
- Voice broadcast connection error handling while recording. ([#7229](https://github.com/vector-im/element-ios/issues/7229))
21+
- Handle a connection issue when we try to start a new voice broadcast. ([#7234](https://github.com/vector-im/element-ios/issues/7234))
22+
- Rich Text Editor: https:// or mailto: scheme is automatically added when creating a link if no scheme is specified. ([#7279](https://github.com/vector-im/element-ios/issues/7279))
23+
- Rich Text Editor: Adding a link over a blank selection, prompts the user to create a new link with new text to replace such selection. ([#7280](https://github.com/vector-im/element-ios/issues/7280))
24+
- Voice Broadcast: handle the lost of connectivity with the homeserver while recording. ([#7285](https://github.com/vector-im/element-ios/issues/7285))
25+
26+
🐛 Bugfixes
27+
28+
- Voice Broadcast: The Now Playing Info Center now displays a voice broadcast instead of a voice message when a user is listening to a voice broadcast. ([#7257](https://github.com/vector-im/element-ios/pull/7257))
29+
- Fix a crash caused by the missing Avatar Service dependency. ([#7268](https://github.com/vector-im/element-ios/pull/7268))
30+
- The (edited) tag for messages is now light grey like on web and Android. ([#5148](https://github.com/vector-im/element-ios/issues/5148))
31+
- Live Location Sharing does not work on first selection after granting "Allow always" location permission. ([#7222](https://github.com/vector-im/element-ios/issues/7222))
32+
- Voice Broadcast: Fixed an issue where the voice broadcast audio player progress bar behaved unexpectedly. ([#7252](https://github.com/vector-im/element-ios/issues/7252))
33+
- Voice Broadcast: VoiceBroadcast chunks are no longer resent as voice messages ([#7261](https://github.com/vector-im/element-ios/issues/7261))
34+
- Timeline's links and hyperlinks match now the blue colour of Android and Web. ([#7263](https://github.com/vector-im/element-ios/issues/7263))
35+
36+
🧱 Build
37+
38+
- Fix Element Alpha workflow not being able to run. ([#7256](https://github.com/vector-im/element-ios/pull/7256))
39+
40+
141
## Changes in 1.9.15 (2023-01-10)
242

343
✨ Features

Config/AppVersion.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
//
1616

1717
// Version
18-
MARKETING_VERSION = 1.9.15
19-
CURRENT_PROJECT_VERSION = 1.9.15
18+
MARKETING_VERSION = 1.9.16
19+
CURRENT_PROJECT_VERSION = 1.9.16

Config/BuildSettings.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ final class BuildSettings: NSObject {
399399
// MARK: - Polls
400400

401401
static let pollsEnabled = true
402+
static var pollsHistoryEnabled: Bool = false
402403

403404
// MARK: - Location Sharing
404405

Config/CommonConfiguration.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ class CommonConfiguration: NSObject, Configurable {
9191
MXKeyProvider.sharedInstance().delegate = EncryptionKeyManager.shared
9292

9393
sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
94+
95+
#if DEBUG
96+
if sdkOptions.isCryptoSDKAvailable {
97+
sdkOptions.enableCryptoSDK = RiotSettings.shared.enableCryptoSDK
98+
}
99+
#endif
94100
}
95101

96102
private func makeASCIIUserAgent() -> String? {

DesignKit/Source/ColorValues.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@ public struct ColorValues: Colors {
4848

4949
public let ems: UIColor
5050

51+
public let links: UIColor
52+
5153
public let namesAndAvatars: [UIColor]
5254
}

DesignKit/Source/Colors.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ public protocol Colors {
6767
/// Global color: The EMS brand's purple colour.
6868
var ems: ColorType { get }
6969

70+
/// - Links
71+
/// - Hyperlinks
72+
var links: ColorType { get }
73+
7074
/// - Names in chat timeline
7175
/// - Avatars default states that include first name letter
7276
var namesAndAvatars: [ColorType] { get }

DesignKit/Source/ColorsSwiftUI.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import SwiftUI
2121
Struct for holding colors for use in SwiftUI.
2222
*/
2323
public struct ColorSwiftUI: Colors {
24-
24+
2525
public let accent: Color
2626

2727
public let alert: Color
@@ -48,8 +48,10 @@ public struct ColorSwiftUI: Colors {
4848

4949
public var ems: Color
5050

51-
public let namesAndAvatars: [Color]
51+
public let links: Color
5252

53+
public let namesAndAvatars: [Color]
54+
5355
init(values: ColorValues) {
5456
accent = Color(values.accent)
5557
alert = Color(values.alert)
@@ -64,6 +66,7 @@ public struct ColorSwiftUI: Colors {
6466
navigation = Color(values.navigation)
6567
background = Color(values.background)
6668
ems = Color(values.ems)
69+
links = Color(values.links)
6770
namesAndAvatars = values.namesAndAvatars.map({ Color($0) })
6871
}
6972
}

DesignKit/Source/ColorsUIkit.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ import UIKit
4545
public let navigation: UIColor
4646

4747
public let background: UIColor
48+
49+
public let links: UIColor
4850

4951
public let namesAndAvatars: [UIColor]
5052

@@ -61,6 +63,7 @@ import UIKit
6163
tile = values.tile
6264
navigation = values.navigation
6365
background = values.background
66+
links = values.links
6467
namesAndAvatars = values.namesAndAvatars
6568
}
6669
}

DesignKit/Variants/Colors/Dark/DarkColors.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class DarkColors {
3434
navigation: UIColor(rgb:0x21262C),
3535
background: UIColor(rgb:0x15191E),
3636
ems: UIColor(rgb: 0x7E69FF),
37+
links: UIColor(rgb: 0x0086E6),
3738
namesAndAvatars: [
3839
UIColor(rgb:0x368BD6),
3940
UIColor(rgb:0xAC3BA8),

0 commit comments

Comments
 (0)