Skip to content

Commit 56e1957

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/fga/pinned_message_banner_ui
2 parents c76ff38 + 902d7ab commit 56e1957

File tree

193 files changed

+4545
-1695
lines changed

Some content is hidden

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

193 files changed

+4545
-1695
lines changed

CHANGES.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,80 @@
1+
Changes in Element X v0.5.0 (2024-07-24)
2+
=========================================
3+
4+
### 🙌 Improvements
5+
* Add icon for "Mark as read" and "Mark as unread" actions. by @bmarty in https://github.com/element-hq/element-x-android/pull/3144
6+
* Add support for Picture In Picture for Element Call by @bmarty in https://github.com/element-hq/element-x-android/pull/3159
7+
* Set pin grace period to 2 minutes by @bmarty in https://github.com/element-hq/element-x-android/pull/3172
8+
* Unify the way we decide whether a room is a DM or a group room by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3100
9+
* Subscribe to `RoomListItems` in the visible range by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3169
10+
* Improve pip and add feature flag. by @bmarty in https://github.com/element-hq/element-x-android/pull/3199
11+
* Open Source licenses: add color for links. by @bmarty in https://github.com/element-hq/element-x-android/pull/3215
12+
* Cancel ringing call notification on call cancellation by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3047
13+
14+
### 🐛 Bugfixes
15+
* Fix `MainActionButton` layout for long texts by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3158
16+
* Always follow the desired theme for Pin, Incoming Call and Element Call screens by @bmarty in https://github.com/element-hq/element-x-android/pull/3165
17+
* Fix empty screen issue after clearing the cache by @bmarty in https://github.com/element-hq/element-x-android/pull/3163
18+
* Restore intentional mentions in the markdown/plain text editor by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3193
19+
* Fix crash in the room list after a forced log out in background by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3180
20+
* Clear existing notification when a room is marked as read by @bmarty in https://github.com/element-hq/element-x-android/pull/3203
21+
* Fix crash when Pin code screen is displayed by @bmarty in https://github.com/element-hq/element-x-android/pull/3205
22+
* Fix pillification not working for non formatted message bodies by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3201
23+
* Update grammar on Matrix Ids to be more spec compliant and render error instead of infinite loading in room member list screen by @bmarty in https://github.com/element-hq/element-x-android/pull/3206
24+
* Reduce the risk of text truncation in buttons. by @bmarty in https://github.com/element-hq/element-x-android/pull/3209
25+
* Ensure that the manual dark theme is rendering correctly regarding -night resource and keyboard by @bmarty in https://github.com/element-hq/element-x-android/pull/3216
26+
* Fix rendering issue of SunsetPage in dark mode by @bmarty in https://github.com/element-hq/element-x-android/pull/3217
27+
* Fix linkification not working for `Spanned` strings in text messages by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3233
28+
* Edit : fallback to room.edit when timeline item is not found. by @ganfra in https://github.com/element-hq/element-x-android/pull/3239
29+
30+
### 🗣 Translations
31+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/3156
32+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/3192
33+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/3232
34+
35+
### 🧱 Build
36+
* Remove Showkase processor not found warning from Danger by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3148
37+
* Set targetSDK to 34 by @bmarty in https://github.com/element-hq/element-x-android/pull/3149
38+
* Add a local copy of `inplace-fix.py` and `fix-pg-map-id.py` by @bmarty in https://github.com/element-hq/element-x-android/pull/3167
39+
* Only add private SSH keys and clone submodules in the original repo by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3225
40+
* Fix CI for forks by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3226
41+
42+
### Dependency upgrades
43+
* Update dependency io.element.android:compound-android to v0.0.7 by @renovate in https://github.com/element-hq/element-x-android/pull/3143
44+
* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.31 by @renovate in https://github.com/element-hq/element-x-android/pull/3145
45+
* Update dependency com.squareup:kotlinpoet to v1.18.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3150
46+
* Update dependency org.robolectric:robolectric to v4.13 by @renovate in https://github.com/element-hq/element-x-android/pull/3157
47+
* Update plugin dependencycheck to v10.0.2 by @renovate in https://github.com/element-hq/element-x-android/pull/3154
48+
* Update wysiwyg to v2.37.5 by @renovate in https://github.com/element-hq/element-x-android/pull/3162
49+
* Update plugin sonarqube to v5.1.0.4882 by @renovate in https://github.com/element-hq/element-x-android/pull/3139
50+
* Update dependency org.jsoup:jsoup to v1.18.1 by @renovate in https://github.com/element-hq/element-x-android/pull/3171
51+
* Update dependency com.google.firebase:firebase-bom to v33.1.2 by @renovate in https://github.com/element-hq/element-x-android/pull/3178
52+
* Update telephoto to v0.12.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3191
53+
* Update dependency com.google.truth:truth to v1.4.4 by @renovate in https://github.com/element-hq/element-x-android/pull/3187
54+
* Update dependency com.squareup:kotlinpoet to v1.18.1 by @renovate in https://github.com/element-hq/element-x-android/pull/3194
55+
* Update dependency io.mockk:mockk to v1.13.12 by @renovate in https://github.com/element-hq/element-x-android/pull/3198
56+
* Update dependency io.sentry:sentry-android to v7.12.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3200
57+
* Update plugin dependencycheck to v10.0.3 by @renovate in https://github.com/element-hq/element-x-android/pull/3204
58+
* Update dependency gradle to v8.9 by @renovate in https://github.com/element-hq/element-x-android/pull/3177
59+
* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.32 by @renovate in https://github.com/element-hq/element-x-android/pull/3202
60+
* Update coil to v2.7.0 by @renovate in https://github.com/element-hq/element-x-android/pull/3210
61+
* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.33 by @renovate in https://github.com/element-hq/element-x-android/pull/3220
62+
* Update wysiwyg to v2.37.7 by @renovate in https://github.com/element-hq/element-x-android/pull/3218
63+
* Update telephoto to v0.12.1 by @renovate in https://github.com/element-hq/element-x-android/pull/3230
64+
* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.34 by @renovate in https://github.com/element-hq/element-x-android/pull/3237
65+
66+
### Others
67+
* Reduce delay when selecting room list filters by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3160
68+
* Add `--alignment-preserved true` when signing APK for F-Droid. by @bmarty in https://github.com/element-hq/element-x-android/pull/3161
69+
* Ensure that all callback plugins are invoked. by @bmarty in https://github.com/element-hq/element-x-android/pull/3146
70+
* Add generated screen to show open source licenses in Gplay variant by @bmarty in https://github.com/element-hq/element-x-android/pull/3207
71+
* Performance : improve time to open a room. by @ganfra in https://github.com/element-hq/element-x-android/pull/3186
72+
* Add logging to help debug forced logout issues by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3208
73+
* Use the right filename for log files so they're sorted in rageshakes by @jmartinesp in https://github.com/element-hq/element-x-android/pull/3219
74+
* Compose : add immutability to some Reaction classes by @ganfra in https://github.com/element-hq/element-x-android/pull/3224
75+
* Fix stickers display text on room summary by @surakin in https://github.com/element-hq/element-x-android/pull/3221
76+
* Rework FakeMatrixRoom so that it contains only lambdas. by @bmarty in https://github.com/element-hq/element-x-android/pull/3229
77+
178
Changes in Element X v0.4.16 (2024-07-05)
279
=========================================
380

app/src/main/res/xml/locales_config.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<locale android:name="in"/>
1414
<locale android:name="it"/>
1515
<locale android:name="ka"/>
16+
<locale android:name="pl"/>
1617
<locale android:name="pt"/>
18+
<locale android:name="pt_BR"/>
1719
<locale android:name="ro"/>
1820
<locale android:name="ru"/>
1921
<locale android:name="sk"/>

appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ class JoinRoomLoadedFlowNodeTest {
123123
@Test
124124
fun `given a room flow node when initialized then it loads messages entry point`() = runTest {
125125
// GIVEN
126-
val room = FakeMatrixRoom()
126+
val room = FakeMatrixRoom(
127+
updateMembersResult = { }
128+
)
127129
val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
128130
val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
129131
val roomFlowNode = createJoinedRoomLoadedFlowNode(
@@ -144,7 +146,9 @@ class JoinRoomLoadedFlowNodeTest {
144146
@Test
145147
fun `given a room flow node when callback on room details is triggered then it loads room details entry point`() = runTest {
146148
// GIVEN
147-
val room = FakeMatrixRoom()
149+
val room = FakeMatrixRoom(
150+
updateMembersResult = { }
151+
)
148152
val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
149153
val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
150154
val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())

appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import org.junit.Test
3333

3434
@OptIn(ExperimentalCoroutinesApi::class) class SendQueuesTest {
3535
private val matrixClient = FakeMatrixClient()
36-
private val room = FakeMatrixRoom()
3736
private val networkMonitor = FakeNetworkMonitor()
3837
private val sut = SendQueues(matrixClient, networkMonitor)
3938

@@ -43,11 +42,11 @@ import org.junit.Test
4342
val setAllSendQueuesEnabledLambda = lambdaRecorder { _: Boolean -> }
4443
matrixClient.sendQueueDisabledFlow = sendQueueDisabledFlow
4544
matrixClient.setAllSendQueuesEnabledLambda = setAllSendQueuesEnabledLambda
46-
matrixClient.givenGetRoomResult(room.roomId, room)
47-
4845
val setRoomSendQueueEnabledLambda = lambdaRecorder { _: Boolean -> }
49-
room.setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
50-
46+
val room = FakeMatrixRoom(
47+
setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
48+
)
49+
matrixClient.givenGetRoomResult(room.roomId, room)
5150
sut.launchIn(backgroundScope)
5251

5352
sendQueueDisabledFlow.emit(room.roomId)
@@ -72,10 +71,11 @@ import org.junit.Test
7271
matrixClient.sendQueueDisabledFlow = sendQueueDisabledFlow
7372
matrixClient.setAllSendQueuesEnabledLambda = setAllSendQueuesEnabledLambda
7473
networkMonitor.connectivity.value = NetworkStatus.Offline
75-
matrixClient.givenGetRoomResult(room.roomId, room)
76-
7774
val setRoomSendQueueEnabledLambda = lambdaRecorder { _: Boolean -> }
78-
room.setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
75+
val room = FakeMatrixRoom(
76+
setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
77+
)
78+
matrixClient.givenGetRoomResult(room.roomId, room)
7979

8080
sut.launchIn(backgroundScope)
8181

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Main changes in this version: mostly bug fixes and performance improvements.
2+
Full changelog: https://github.com/element-hq/element-x-android/releases
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_settings_help_us_improve">"Udostępniaj anonimowe dane dotyczące użytkowania, aby pomóc nam identyfikować problemy."</string>
4+
<string name="screen_analytics_settings_read_terms">"Możesz przeczytać wszystkie nasze warunki %1$s."</string>
5+
<string name="screen_analytics_settings_read_terms_content_link">"tutaj"</string>
6+
<string name="screen_analytics_settings_share_data">"Udostępniaj dane analityczne"</string>
7+
</resources>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_settings_help_us_improve">"Compartilhe dados de uso anônimos para nos ajudar a identificar problemas."</string>
4+
<string name="screen_analytics_settings_read_terms">"Você pode ler todos os nossos termos %1$s ."</string>
5+
<string name="screen_analytics_settings_read_terms_content_link">"aqui"</string>
6+
<string name="screen_analytics_settings_share_data">"Compartilhar dados de utilização"</string>
7+
</resources>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_prompt_data_usage">"Nie będziemy rejestrować ani profilować żadnych danych osobistych"</string>
4+
<string name="screen_analytics_prompt_help_us_improve">"Udostępniaj anonimowe dane dotyczące użytkowania, aby pomóc nam identyfikować problemy."</string>
5+
<string name="screen_analytics_prompt_read_terms">"Możesz przeczytać wszystkie nasze warunki %1$s."</string>
6+
<string name="screen_analytics_prompt_read_terms_content_link">"tutaj"</string>
7+
<string name="screen_analytics_prompt_settings">"Możesz to wyłączyć w dowolnym momencie"</string>
8+
<string name="screen_analytics_prompt_third_party_sharing">"Nie będziemy udostępniać Twoich danych podmiotom trzecim"</string>
9+
<string name="screen_analytics_prompt_title">"Pomóż nam ulepszyć %1$s"</string>
10+
</resources>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
3+
<string name="screen_analytics_prompt_data_usage">"Não registraremos nem criaremos perfil baseado em qualquer dado pessoal"</string>
4+
<string name="screen_analytics_prompt_help_us_improve">"Compartilhe dados de uso anônimos para nos ajudar a identificar problemas."</string>
5+
<string name="screen_analytics_prompt_read_terms">"Você pode ler todos os nossos termos %1$s ."</string>
6+
<string name="screen_analytics_prompt_read_terms_content_link">"aqui"</string>
7+
<string name="screen_analytics_prompt_settings">"Você pode desativar isso a qualquer momento"</string>
8+
<string name="screen_analytics_prompt_third_party_sharing">"Não compartilharemos seus dados com terceiros"</string>
9+
<string name="screen_analytics_prompt_title">"Ajude a melhorar o %1$s"</string>
10+
</resources>

features/call/impl/src/main/res/values-de/translations.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<string name="call_foreground_service_channel_title_android">"Laufender Anruf"</string>
44
<string name="call_foreground_service_message_android">"Tippen, um zum Anruf zurückzukehren"</string>
55
<string name="call_foreground_service_title_android">"☎️ Anruf läuft"</string>
6+
<string name="screen_incoming_call_subtitle_android">"Eingehender Element Call"</string>
67
</resources>

0 commit comments

Comments
 (0)