Merge branch 'release/0.4.3'

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug APK

.github/workflows/fork-pr-notice.yml

@@ -11,7 +11,8 @@ jobs:
   welcome:
     runs-on: ubuntu-latest
     name: Welcome comment
-    if: github.event.pull_request.fork != null
+    # Only display it if base repo (upstream) is different from HEAD repo (possibly a fork)
+    if: github.event.pull_request.base.repo.full_name != github.event.pull_request.head.repo.full_name
     steps:
       - name: Add auto-generated commit warning
         uses: actions/github-script@v7

.github/workflows/nightlyReports.yml

@@ -62,7 +62,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Dependency analysis

.github/workflows/quality.yml

@@ -40,7 +40,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run code quality check suite

.github/workflows/recordScreenshots.yml

@@ -39,7 +39,7 @@ jobs:
           java-version: '17'
       # Add gradle cache, this should speed up the process
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
       - name: Create app bundle
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}

.github/workflows/sonar.yml

@@ -32,7 +32,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: 🔊 Publish results to Sonar

.github/workflows/sync-localazy.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Run Localazy script
         run: ./tools/localazy/downloadStrings.sh --all
       - name: Create Pull Request for Strings
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           commit-message: Sync Strings from Localazy

.github/workflows/sync-sas-strings.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/sas/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings

.github/workflows/tests.yml

@@ -44,7 +44,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Configure gradle
-        uses: gradle/[email protected]
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
@@ -81,6 +81,9 @@ jobs:
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
         if: always()
-        uses: codecov/codecov-action@v3
-        # with:
-        #  files: build/reports/kover/xml/report.xml
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+#        with:
+#          files: build/reports/kover/xml/report.xml

.maestro/tests/roomList/searchRoomList.yaml

@@ -8,6 +8,7 @@ appId: ${APP_ID}
 # Back from timeline
 - back
 - assertVisible: "MyR"
+- hideKeyboard
 # Back from search
 - back
 - runFlow: ../assertions/assertHomeDisplayed.yaml

CHANGES.md

@@ -1,3 +1,34 @@
+Changes in Element X v0.4.3 (2024-02-14)
+========================================
+
+Features ✨
+----------
+ - Change "Read receipts" advanced setting used to send private Read Receipt to "Share presence" settings. When disabled, private Read Receipts will be sent, and no typing notification will be sent. Also Read Receipts and typing notifications will not be rendered in the timeline. ([#2241](https://github.com/element-hq/element-x-android/issues/2241))
+ - Render typing notifications. ([#2242](https://github.com/element-hq/element-x-android/issues/2242))
+ - Manually mark a room as unread. ([#2261](https://github.com/element-hq/element-x-android/issues/2261))
+ - Add empty state to the room list. ([#2330](https://github.com/element-hq/element-x-android/issues/2330))
+ - Allow joining unencrypted video calls in non encrypted rooms. ([#2333](https://github.com/element-hq/element-x-android/issues/2333))
+
+Bugfixes 🐛
+----------
+ - Fix crash after unregistering UnifiedPush distributor ([#2304](https://github.com/element-hq/element-x-android/issues/2304))
+ - Add missing device id to settings screen. ([#2316](https://github.com/element-hq/element-x-android/issues/2316))
+ - Open the keyboard (and keep it opened) when creating a poll. ([#2329](https://github.com/element-hq/element-x-android/issues/2329))
+ - Fix message forwarding after SDK API change related to Timeline intitialization.
+
+Other changes
+-------------
+ - Adjusted the login flow buttons so the continue button is always at the same height ([#825](https://github.com/element-hq/element-x-android/issues/825))
+ - Move migration screen to within the room list ([#2310](https://github.com/element-hq/element-x-android/issues/2310))
+ - Render correctly in reply to data when Event cannot be decrypted or has been redacted ([#2318](https://github.com/element-hq/element-x-android/issues/2318))
+ - Remove Compose Foundation version pinning workaround. This was done to avoid a bug introduced in the default foundation version used by the material3 library, but that has already been fixed.
+ - Remove `FilterHiddenStateEventsProcessor`, as this is already handled by the Rust SDK.
+ - Remove session preferences on user log out.
+
+Breaking changes 🚨
+-------------------
+ - Update Compound icons in the project. Since the icon prefix changed to `ic_compound_` and the `CompoundIcons` helper now contains the vector icons as composable functions.
+
 Changes in Element X v0.4.2 (2024-01-31)
 ========================================
 

CONTRIBUTING.md

@@ -31,7 +31,7 @@
 
 Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
 
-Element X Android support can be found in this room: [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org).
+Element X Android support can be found in this room: [![Element X Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org).
 
 The rest of the document contains specific rules for Matrix Android projects
 

README.md

@@ -3,7 +3,7 @@
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-x-android&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-x-android)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-x-android&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-x-android)
 [![codecov](https://codecov.io/github/element-hq/element-x-android/branch/develop/graph/badge.svg?token=ecwvia7amV)](https://codecov.io/github/vector-im/element-x-android)
-[![Element X_Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org)
+[![Element X Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org)
 [![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element)
 
 # Element X Android

app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt

@@ -35,33 +35,27 @@ import io.element.android.x.R
 
 @Preview
 @Composable
-internal fun IconPreview(
-    modifier: Modifier = Modifier,
-) {
-    Box(modifier = modifier) {
+internal fun IconPreview() {
+    Box {
         Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
         Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
     }
 }
 
 @Preview
 @Composable
-internal fun RoundIconPreview(
-    modifier: Modifier = Modifier,
-) {
-    Box(modifier = modifier.clip(shape = CircleShape)) {
+internal fun RoundIconPreview() {
+    Box(modifier = Modifier.clip(shape = CircleShape)) {
         Image(painter = painterResource(id = R.mipmap.ic_launcher_background), contentDescription = null)
         Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
     }
 }
 
 @Preview
 @Composable
-internal fun MonochromeIconPreview(
-    modifier: Modifier = Modifier,
-) {
+internal fun MonochromeIconPreview() {
     Box(
-        modifier = modifier
+        modifier = Modifier
             .size(108.dp)
             .background(Color(0xFF2F3133))
             .clip(shape = RoundedCornerShape(32.dp)),

appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomNodeView.kt

@@ -84,10 +84,8 @@ fun LoadingRoomNodeView(
 @Composable
 private fun LoadingRoomTopBar(
     onBackClicked: () -> Unit,
-    modifier: Modifier = Modifier
 ) {
     TopAppBar(
-        modifier = modifier,
         navigationIcon = {
             BackButton(onClick = onBackClicked)
         },

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

@@ -28,6 +28,7 @@ import io.element.android.features.rageshake.test.crash.FakeCrashDataStore
 import io.element.android.features.rageshake.test.rageshake.FakeRageShake
 import io.element.android.features.rageshake.test.rageshake.FakeRageshakeDataStore
 import io.element.android.features.rageshake.test.screenshot.FakeScreenshotHolder
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.services.apperror.api.AppErrorState
 import io.element.android.services.apperror.api.AppErrorStateService
 import io.element.android.services.apperror.impl.DefaultAppErrorStateService
@@ -83,6 +84,7 @@ class RootPresenterTest {
         val rageshake = FakeRageShake()
         val screenshotHolder = FakeScreenshotHolder()
         val crashDetectionPresenter = DefaultCrashDetectionPresenter(
+            buildMeta = aBuildMeta(),
             crashDataStore = crashDataStore
         )
         val rageshakeDetectionPresenter = DefaultRageshakeDetectionPresenter(

docs/install_from_github_release.md

@@ -4,13 +4,43 @@ This document explains how to install Element X Android from a Github Release.
 
 <!--- TOC -->
 
-* [Requirements](#requirements)
-* [Steps](#steps)
-* [I already have the application on my phone](#i-already-have-the-application-on-my-phone)
+* [Installing the universal APK](#installing-the-universal-apk)
+  * [Instructions](#instructions)
+  * [Steps](#steps)
+  * [I already have the application on my phone](#i-already-have-the-application-on-my-phone)
+* [Installing from the App Bundle](#installing-from-the-app-bundle)
+  * [Requirements](#requirements)
+  * [Steps](#steps)
+  * [I already have the application on my phone](#i-already-have-the-application-on-my-phone)
 
 <!--- END -->
 
-## Requirements
+## Installing the universal APK
+
+### Instructions
+
+The easiest way to install the application from a GitHub release is to use the universal APK which is attached to the release. This APK is compatible with all Android devices, but it is not optimized for any of them. So it may not be as fast as it could be on your device, and it may not be as small as it could be.
+
+Alternatively, you can generate an APK that is optimized for your device. This is explained in the next section.
+
+### Steps
+
+- Open the GitHub release that you want to install from using the Web browser of your phone.
+- Download the APK
+- Open the APK file from the download notification, or from the file manager
+- Follow the steps to install the application
+
+###  I already have the application on my phone
+
+If the application was already installed on your phone, there are several cases:
+
+- it was installed from the PlayStore, you can install the universal APK as long as the version is more recent. The existing data should not be lost.
+- it was installed from a previous GitHub release, this is like an application upgrade.
+- it was installed from a more recent GitHub release, or from the PlayStore with a later version, you will have to uninstall it first.
+
+## Installing from the App Bundle
+
+### Requirements
 
 The Github release will contain an Android App Bundle (with `aab` extension) file, unlike in the Element Android project where releases directly provide the APKs. So there are some steps to perform to generate and sign App Bundle APKs. An APK suitable for the targeted device will then be generated.
 
@@ -31,7 +61,7 @@ You will also need to install [bundletool](https://developer.android.com/studio/
 brew install bundletool
 ```
 
-## Steps
+### Steps
 
 1. Open the GitHub release that you want to install from https://github.com/element-hq/element-x-android/releases
 2. Download the asset `app-release-signed.aab`
@@ -55,7 +85,7 @@ bundletool install-apks --apks=./tmp/elementx.apks
 
 That's it, the application should be installed on your device, you can start it from the launcher icon.
 
-##  I already have the application on my phone
+###  I already have the application on my phone
 
 If the application was already installed on your phone, there are several cases:
 

fastlane/metadata/android/en-US/changelogs/40004030.txt

@@ -0,0 +1,10 @@
+Main changes in this version:
+- Added share presence toggle.
+- Render typing notifications.
+- Manually mark a room as unread.
+- Add an empty state to the room list.
+- Allow joining unencrypted video calls in non encrypted rooms.
+
+And several other bugfixes.
+
+Full changelog: https://github.com/element-hq/element-x-android/releases

features/analytics/api/src/main/res/values-be/translations.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_share_data">"Дзяліцеся дадзенымі аналітыкі"</string>
+  <string name="screen_analytics_settings_help_us_improve">"Даваць ананімныя дадзеныя аб выкарыстанні, каб дапамагчы нам выявіць праблемы."</string>
+  <string name="screen_analytics_settings_read_terms">"Вы можаце азнаёміцца з усімі нашымі ўмовамі %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"тут"</string>
+</resources>

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt

@@ -57,7 +57,6 @@ import io.element.android.libraries.designsystem.theme.components.ButtonSize
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
-import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.persistentListOf
 
@@ -67,7 +66,6 @@ fun AnalyticsOptInView(
     onClickTerms: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    LogCompositions(tag = "Analytics", msg = "Root")
     val eventSink = state.eventSink
 
     fun onTermsAccepted() {
@@ -101,10 +99,8 @@ private const val LINK_TAG = "link"
 private fun AnalyticsOptInHeader(
     state: AnalyticsOptInState,
     onClickTerms: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         IconTitleSubtitleMolecule(
@@ -141,24 +137,22 @@ private fun AnalyticsOptInHeader(
 }
 
 @Composable
-private fun CheckIcon(modifier: Modifier = Modifier) {
+private fun CheckIcon() {
     Icon(
-        modifier = modifier
+        modifier = Modifier
             .size(20.dp)
             .background(color = MaterialTheme.colorScheme.background, shape = CircleShape)
             .padding(2.dp),
-        imageVector = CompoundIcons.Check,
+        imageVector = CompoundIcons.Check(),
         contentDescription = null,
         tint = ElementTheme.colors.textActionAccent,
     )
 }
 
 @Composable
-private fun AnalyticsOptInContent(
-    modifier: Modifier = Modifier,
-) {
+private fun AnalyticsOptInContent() {
     Box(
-        modifier = modifier.fillMaxSize(),
+        modifier = Modifier.fillMaxSize(),
         contentAlignment = BiasAlignment(
             horizontalBias = 0f,
             verticalBias = -0.4f
@@ -190,11 +184,8 @@ private fun AnalyticsOptInContent(
 private fun AnalyticsOptInFooter(
     onTermsAccepted: () -> Unit,
     onTermsDeclined: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    ButtonColumnMolecule(
-        modifier = modifier,
-    ) {
+    ButtonColumnMolecule {
         Button(
             text = stringResource(id = CommonStrings.action_ok),
             onClick = onTermsAccepted,

features/analytics/impl/src/main/res/values-be/translations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"Мы не будзем запісваць або прафіляваць любыя асабістыя даныя"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Даваць ананімныя дадзеныя аб выкарыстанні, каб дапамагчы нам выявіць праблемы."</string>
+  <string name="screen_analytics_prompt_read_terms">"Вы можаце азнаёміцца з усімі нашымі ўмовамі %1$s."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"тут"</string>
+  <string name="screen_analytics_prompt_settings">"Вы можаце адключыць гэта ў любы час"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Мы не будзем перадаваць вашыя дадзеныя трэцім асобам"</string>
+  <string name="screen_analytics_prompt_title">"Дапамажыце палепшыць %1$s"</string>
+</resources>