Merge branch 'release/0.4.1' into main

.editorconfig

@@ -14,10 +14,19 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
-# Ktlint rule, for more information see https://pinterest.github.io/ktlint/faq/#why-is-editorconfig-property-disabled_rules-deprecated-and-how-do-i-resolve-this
+# Ktlint rule, for more information see https://pinterest.github.io/ktlint/1.1.1/faq/#how-do-i-enable-or-disable-a-rule
 ktlint_standard_wrapping = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
-
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_spacing-between-declarations-with-annotations = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_indent = disabled
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_function_naming_ignore_when_annotated_with=Composable
 
 [*.java]
 ij_java_align_consecutive_assignments = false

.github/renovate.json

@@ -18,12 +18,6 @@
       ],
       "groupName" : "kotlin"
     },
-    {
-      "matchPackageNames" : [
-        "org.jetbrains.kotlinx.kover"
-      ],
-      "enabled" : false
-    },
     {
       "matchPackagePatterns" : [
         "^org.maplibre"

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

@@ -0,0 +1,31 @@
+name: Community PR notice
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  welcome:
+    runs-on: ubuntu-latest
+    name: Welcome comment
+    if: github.event.pull_request.fork != null
+    steps:
+      - name: Add auto-generated commit warning
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Thank you for your contribution! Here are a few things to check in the PR to ensure it's reviewed as quickly as possible:
+            
+              - Your branch should be based on \`origin/develop\`, at least when it was created.
+              - There is a changelog entry in the \`changelog.d\` folder with [the Towncrier format](https://towncrier.readthedocs.io/en/latest/tutorial.html#creating-news-fragments).
+              - The test pass locally running \`./gradlew test\`.
+              - The code quality check suite pass locally running \`./gradlew runQualityChecks\`.
+              - If you modified anything related to the UI, including previews, you'll have to run the \`Record screenshots\` GH action in your forked repo: that will generate compatible new screenshots. However, given Github Actions limitations, **it will prevent the CI from running temporarily**, until you upload a new commit after that one. To do so, just pull the latest changes and push [an empty commit](https://coderwall.com/p/vkdekq/git-commit-allow-empty).`
+            })

.github/workflows/maestro.yml

@@ -24,27 +24,31 @@ jobs:
       cancel-in-progress: true
     steps:
       - name: Remove Run-Maestro label
-        if: ${{ github.event.label.name == 'Run-Maestro' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.label.name == 'Run-Maestro' }}
         uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: Run-Maestro
       - uses: actions/checkout@v4
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-java@v4
         name: Use JDK 17
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Assemble debug APK
         run: ./gradlew :app:assembleDebug $CI_GRADLE_ARG_PROPERTIES
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
       - uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
           # Doc says (https://github.com/mobile-dev-inc/action-maestro-cloud#android):

.github/workflows/nightlyReports.yml

@@ -33,15 +33,15 @@ jobs:
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈 Generate kover report and verify coverage
-        run: ./gradlew koverMergedReport koverMergedVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 
       - name: ✅ Upload kover report
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: kover-results
           path: |
-            **/build/reports/kover/merged
+            **/build/reports/kover
 
       - name: 🔊 Publish results to Sonar
         env:

.github/workflows/recordScreenshots.yml

@@ -26,7 +26,7 @@ jobs:
         uses: nschloe/action-cached-lfs-checkout@v1.2.2
         with:
           persist-credentials: false
-          ref: ${{ github.event.pull_request.head.ref }}
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref }}
       - name: ⏬ Checkout with LFS (Branch)
         if: github.event_name == 'workflow_dispatch'
         uses: nschloe/action-cached-lfs-checkout@v1.2.2
@@ -43,8 +43,8 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots
+        id: record
         run: ./.github/workflows/scripts/recordScreenshots.sh
         env:
-          GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
-

.github/workflows/scripts/recordScreenshots.sh

@@ -68,11 +68,27 @@ echo "Record screenshots"
 ./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn
 
 echo "Committing changes"
-git config user.name "ElementBot"
-git config user.email "benoitm+elementbot@element.io"
+git config http.sslVerify false
+
+if [[ -z ${INPUT_AUTHOR_NAME} ]]; then
+  git config user.name "ElementBot"
+else
+  git config --local user.name "${INPUT_AUTHOR_NAME}"
+fi
+
+if [[ -z ${INPUT_AUTHOR_EMAIL} ]]; then
+  git config user.email "benoitm+elementbot@element.io"
+else
+  git config --local user.name "${INPUT_AUTHOR_EMAIL}"
+fi
 git add -A
 git commit -m "Update screenshots"
 
+GITHUB_REPO="https://$GITHUB_ACTOR:$TOKEN@github.com/$REPO.git"
 echo "Pushing changes"
-git push "https://$TOKEN@github.com/$REPO.git" $BRANCH
+if [[ -z ${GITHUB_ACTOR} ]]; then
+  echo "No GITHUB_ACTOR env var"
+  GITHUB_REPO="https://$TOKEN@github.com/$REPO.git"
+fi
+git push $GITHUB_REPO "$BRANCH"
 echo "Done!"

.github/workflows/tests.yml

@@ -55,15 +55,15 @@ jobs:
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈Generate kover report and verify coverage
-        run: ./gradlew koverMergedReport koverMergedVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 
       - name: 🚫 Upload kover failed coverage reports
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: kover-error-report
           path: |
-            **/kover/merged/verification/errors.txt
+            app/build/reports/kover/verify.err
 
       - name: ✅ Upload kover report (disabled)
         if: always()
@@ -83,4 +83,4 @@ jobs:
         if: always()
         uses: codecov/codecov-action@v3
         # with:
-        #  files: build/reports/kover/merged/xml/report.xml
+        #  files: build/reports/kover/xml/report.xml

.maestro/tests/account/logout.yaml

@@ -6,12 +6,10 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
 - tapOn: "Sign out"
-- tapOn:
-    id: "sign-out-submit"
 # Ensure cancel cancels
-- tapOn: "Cancel"
 - tapOn:
-    id: "sign-out-submit"
+    id: "dialog-negative"
+- tapOn: "Sign out"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml

.maestro/tests/roomList/createAndDeleteDM.yaml

@@ -9,5 +9,5 @@ appId: ${APP_ID}
     index: 1
 - takeScreenshot: build/maestro/330-createAndDeleteDM
 - tapOn: "maestroelement2"
-- tapOn: "Leave room"
+- tapOn: "Leave conversation"
 - tapOn: "Leave"

CHANGES.md

@@ -1,3 +1,39 @@
+Changes in Element X v0.4.1 (2024-01-17)
+========================================
+
+Features ✨
+----------
+ - Render m.sticker events ([#1949](https://github.com/element-hq/element-x-android/issues/1949))
+ - Add support for sending images from the keyboard ([#1977](https://github.com/element-hq/element-x-android/issues/1977))
+ - Added support for MSC4027 (render custom images in reactions) ([#2159](https://github.com/element-hq/element-x-android/issues/2159))
+
+Bugfixes 🐛
+----------
+ - Fix crash sending image with latest Posthog because of an usage of an internal Android method. ([#+crash-sending-image-with-latest-posthog](https://github.com/element-hq/element-x-android/issues/+crash-sending-image-with-latest-posthog))
+ - Make sure the media viewer tries the main url first (if not empty) then the thumbnail url and then not open if both are missing instead of failing with an error dialog ([#1949](https://github.com/element-hq/element-x-android/issues/1949))
+ - Fix room transition animation happens twice. ([#2084](https://github.com/element-hq/element-x-android/issues/2084))
+ - Disable ability to send reaction if the user does not have the permission to. ([#2093](https://github.com/element-hq/element-x-android/issues/2093))
+ - Trim whitespace at the end of messages to ensure we render the right content. ([#2099](https://github.com/element-hq/element-x-android/issues/2099))
+ - Fix crashes in room list when the last message for a room was an extremely long one (several thousands of characters) with no line breaks. ([#2105](https://github.com/element-hq/element-x-android/issues/2105))
+ - Disable rasterisation of Vector XMLs, which was causing crashes on API 23. ([#2124](https://github.com/element-hq/element-x-android/issues/2124))
+ - Use `SubomposeLayout` for `ContentAvoidingLayout` to prevent wrong measurements in the layout process, leading to cut-off text messages in the timeline. ([#2155](https://github.com/element-hq/element-x-android/issues/2155))
+ - Improve rendering of voice messages in the timeline in large displays ([#2156](https://github.com/element-hq/element-x-android/issues/2156))
+ - Fix no indication that user list is loading when inviting to room. ([#2172](https://github.com/element-hq/element-x-android/issues/2172))
+ - Hide keyboard when tapping on a message in the timeline. ([#2182](https://github.com/element-hq/element-x-android/issues/2182))
+ - Mention selector gets stuck when quickly deleting the prompt. ([#2192](https://github.com/element-hq/element-x-android/issues/2192))
+ - Hide verbose state events from the timeline ([#2216](https://github.com/element-hq/element-x-android/issues/2216))
+
+Other changes
+-------------
+ - Only apply `com.autonomousapps.dependency-analysis` plugin in those modules that need it. ([#+only-apply-dependency-analysis-plugin-where-needed](https://github.com/element-hq/element-x-android/issues/+only-apply-dependency-analysis-plugin-where-needed))
+ - Migrate to Kover 0.7.X ([#1782](https://github.com/element-hq/element-x-android/issues/1782))
+ - Remove extra logout screen. ([#2072](https://github.com/element-hq/element-x-android/issues/2072))
+ - Handle `MembershipChange.NONE` rendering in the timeline. ([#2102](https://github.com/element-hq/element-x-android/issues/2102))
+ - Remove extra previews for timestamp view with 'document' case ([#2127](https://github.com/element-hq/element-x-android/issues/2127))
+ - Bump AGP version to 8.2.0 ([#2142](https://github.com/element-hq/element-x-android/issues/2142))
+ - Replace 'leave room' text with 'leave conversation' for DMs. ([#2218](https://github.com/element-hq/element-x-android/issues/2218))
+
+
 Changes in Element X v0.4.0 (2023-12-22)
 ========================================
 

anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt

@@ -58,7 +58,6 @@ import java.io.File
  */
 @AutoService(CodeGenerator::class)
 class ContributesNodeCodeGenerator : CodeGenerator {
-
     override fun isApplicable(context: AnvilContext): Boolean = true
 
     override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {

app/build.gradle.kts

@@ -20,14 +20,16 @@ import com.android.build.api.variant.FilterConfiguration.FilterType.ABI
 import extension.allFeaturesImpl
 import extension.allLibrariesImpl
 import extension.allServicesImpl
+import org.jetbrains.kotlin.cli.common.toBooleanLenient
 
 plugins {
     id("io.element.android-compose-application")
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
     alias(libs.plugins.kapt)
-    alias(libs.plugins.firebaseAppDistribution)
+    // When using precompiled plugins, we need to apply the firebase plugin like this
+    id(libs.plugins.firebaseAppDistribution.get().pluginId)
     alias(libs.plugins.knit)
     id("kotlin-parcelize")
     // To be able to update the firebase.xml files, uncomment and build the project
@@ -43,10 +45,6 @@ android {
         versionCode = Versions.versionCode
         versionName = Versions.versionName
 
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-
         // Keep abiFilter for the universalApk
         ndk {
             abiFilters += listOf("armeabi-v7a", "x86", "arm64-v8a", "x86_64")
@@ -194,6 +192,26 @@ knit {
     }
 }
 
+val ciBuildProperty = "ci-build"
+val isCiBuild = if (project.hasProperty(ciBuildProperty)) {
+    val raw = project.property(ciBuildProperty) as? String
+    raw?.toBooleanLenient() == true || raw?.toIntOrNull() == 1
+} else {
+    false
+}
+
+kover {
+    // When running on the CI, run only debug test variants
+    if (isCiBuild) {
+        excludeTests {
+            // Disable instrumentation for debug test tasks
+            tasks(
+                "testDebugUnitTest",
+            )
+        }
+    }
+}
+
 dependencies {
     allLibrariesImpl()
     allServicesImpl()

app/proguard-rules.pro

@@ -10,6 +10,9 @@
 -keep class com.sun.jna.** { *; }
 -keep class * implements com.sun.jna.** { *; }
 
+# TagSoup, coming from the RTE library
+-keep class org.ccil.cowan.tagsoup.** { *; }
+
 # kotlinx.serialization
 
 # Kotlin serialization looks up the generated serializer classes through a function on companion
@@ -32,3 +35,8 @@
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
+
+# Needed for Posthog
+-keepclassmembers class android.view.JavaViewSpy {
+    static int windowAttachCount(android.view.View);
+}

app/src/main/kotlin/io/element/android/x/ElementXApplication.kt

@@ -27,7 +27,6 @@ import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.TracingInitializer
 
 class ElementXApplication : Application(), DaggerComponentOwner {
-
     override val daggerComponent: AppComponent = DaggerAppComponent.factory().create(this)
 
     override fun onCreate() {

app/src/main/kotlin/io/element/android/x/MainActivity.kt

@@ -51,7 +51,6 @@ import timber.log.Timber
 private val loggerTag = LoggerTag("MainActivity")
 
 class MainActivity : NodeActivity() {
-
     private lateinit var mainNode: MainNode
     private lateinit var appBindings: AppBindings
 

app/src/main/kotlin/io/element/android/x/MainNode.kt

@@ -48,7 +48,6 @@ class MainNode(
     plugins = plugins,
 ),
     DaggerComponentOwner {
-
     override val daggerComponent = (context as DaggerComponentOwner).daggerComponent
 
     override fun resolve(navTarget: RootNavTarget, buildContext: BuildContext): Node {
@@ -68,5 +67,4 @@ class MainNode(
 
     @Parcelize
     object RootNavTarget : Parcelable
-
 }

app/src/main/kotlin/io/element/android/x/di/AppBindings.kt

@@ -27,8 +27,12 @@ import io.element.android.libraries.matrix.api.tracing.TracingService
 @ContributesTo(AppScope::class)
 interface AppBindings {
     fun snackbarDispatcher(): SnackbarDispatcher
+
     fun tracingService(): TracingService
+
     fun bugReporter(): BugReporter
+
     fun lockScreenService(): LockScreenService
+
     fun preferencesStore(): PreferencesStore
 }

app/src/main/kotlin/io/element/android/x/di/AppComponent.kt

@@ -28,9 +28,11 @@ import io.element.android.libraries.di.SingleIn
 @SingleIn(AppScope::class)
 @MergeComponent(AppScope::class)
 interface AppComponent : NodeFactoriesBindings {
-
     @Component.Factory
     interface Factory {
-        fun create(@ApplicationContext @BindsInstance context: Context): AppComponent
+        fun create(
+            @ApplicationContext @BindsInstance
+            context: Context
+        ): AppComponent
     }
 }