Merge f848129d15 into 6942a502b3

Merge pull request #8853 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.37.4
Bump io.element.android:wysiwyg from 2.37.3 to 2.37.4
2024-06-29 05:54:30 +00:00 · 2024-06-26 10:13:22 +02:00 · 2024-06-26 07:47:06 +02:00 · 2024-06-25 23:05:42 +00:00 · 2024-06-25 15:56:10 +02:00 · 2024-06-25 15:14:20 +02:00
13 changed files with 32 additions and 11 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,17 @@
+Changes in Element v1.6.18 (2024-06-25)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix redacted events not grouped correctly when hidden events are inserted between. ([#8840](https://github.com/element-hq/element-android/issues/8840))
+ - Element-Android session doesn't encrypt for a dehydrated device ([#8842](https://github.com/element-hq/element-android/issues/8842))
+ - Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X. ([#8894](https://github.com/element-hq/element-android/issues/8894))
+
+Other changes
+-------------
+ - Posthog | report platform code for EA ([#8839](https://github.com/element-hq/element-android/issues/8839))
+
+
 Changes in Element v1.6.16 (2024-05-29)
 =======================================

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -203,7 +203,8 @@ GEM
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
    rouge (2.0.7)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
@ -219,6 +220,7 @@ GEM
    simctl (1.6.8)
      CFPropertyList
      naturally
+    strscan (3.1.0)
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
--- a/changelog.d/8839.misc
+++ b/changelog.d/8839.misc
@ -1 +0,0 @@
-Posthog | report platform code for EA
--- a/changelog.d/8840.bugfix
+++ b/changelog.d/8840.bugfix
@ -1 +0,0 @@
-Fix redacted events not grouped correctly when hidden events are inserted between.
--- a/changelog.d/8842.bugfix
+++ b/changelog.d/8842.bugfix
@ -1 +0,0 @@
-Element-Android session doesn't encrypt for a dehydrated device
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -101,7 +101,7 @@ ext.libs = [
        ],
        element     : [
                'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-                'wysiwyg'                 : "io.element.android:wysiwyg:2.37.3"
+                'wysiwyg'                 : "io.element.android:wysiwyg:2.37.4"
        ],
        squareup    : [
                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
--- a/fastlane/metadata/android/en-US/changelogs/40106180.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40106180.txt
@ -0,0 +1,2 @@
+Main changes in this version: Bugfixes.
+Full changelog: https://github.com/element-hq/element-android/releases
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@ -62,7 +62,7 @@ android {
        // that the app's state is completely cleared between tests.
        testInstrumentationRunnerArguments clearPackageData: 'true'

-        buildConfigField "String", "SDK_VERSION", "\"1.6.18\""
+        buildConfigField "String", "SDK_VERSION", "\"1.6.20\""

        buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
        buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
--- a/tools/release/releaseScript.sh
+++ b/tools/release/releaseScript.sh
@ -66,7 +66,7 @@ if [ ${envError} == 1 ]; then
  exit 1
 fi

-buildToolsVersion="30.0.2"
+buildToolsVersion="35.0.0"
 buildToolsPath="${androidHome}/build-tools/${buildToolsVersion}"

 if [[ ! -d ${buildToolsPath} ]]; then
--- a/tools/release/sign_apk.sh
+++ b/tools/release/sign_apk.sh
@ -17,7 +17,7 @@ PARAM_KEYSTORE_PATH=$1
 PARAM_APK=$2

 # Other params
-BUILD_TOOLS_VERSION="31.0.0"
+BUILD_TOOLS_VERSION="35.0.0"
 MIN_SDK_VERSION=21

 echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
--- a/tools/release/sign_apk_unsafe.sh
+++ b/tools/release/sign_apk_unsafe.sh
@ -23,7 +23,7 @@ PARAM_KS_PASS=$3
 PARAM_KEY_PASS=$4

 # Other params
-BUILD_TOOLS_VERSION="31.0.0"
+BUILD_TOOLS_VERSION="35.0.0"
 MIN_SDK_VERSION=21

 echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@ -37,7 +37,7 @@ ext.versionMinor = 6
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 18
+ext.versionPatch = 20

 static def getGitTimestamp() {
    def cmd = 'git show -s --format=%ct'
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@ -184,7 +184,13 @@
                <category android:name="android.intent.category.BROWSABLE" />

                <data android:scheme="https" />
-                <data android:host="*.element.io" />
+                <!-- Note: we can't use "*.element.io" here because it'll intercept the "mas.element.io" domain too. -->
+                <!-- Matching asset file: https://app.element.io/.well-known/assetlinks.json -->
+                <data android:host="app.element.io" />
+                <!-- Matching asset file: https://develop.element.io/.well-known/assetlinks.json -->
+                <data android:host="develop.element.io" />
+                <!-- Matching asset file: https://staging.element.io/.well-known/assetlinks.json -->
+                <data android:host="staging.element.io" />
            </intent-filter>
        </activity>
Author	SHA1	Message	Date
dependabot[bot]	dcda11b1ea	Merge `f848129d15` into `6942a502b3`	2024-06-26 10:13:22 +02:00
Jorge Martin Espinosa	6942a502b3	Merge pull request #8853 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.37.4 Bump io.element.android:wysiwyg from 2.37.3 to 2.37.4	2024-06-26 07:47:06 +02:00
dependabot[bot]	80904ee847	Bump io.element.android:wysiwyg from 2.37.3 to 2.37.4 Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.37.3 to 2.37.4. - [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md) - [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.37.3...2.37.4) --- updated-dependencies: - dependency-name: io.element.android:wysiwyg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-25 23:05:42 +00:00
Benoit Marty	dfb0fc31e1	Use BuildTools 35.0.0 - part 2	2024-06-25 15:56:10 +02:00
Benoit Marty	207ab2802a	version++	2024-06-25 15:14:20 +02:00
Benoit Marty	6e7b095254	Merge tag 'v1.6.18' into develop tag	2024-06-25 15:13:43 +02:00
Benoit Marty	026318304f	Merge branch 'release/1.6.18' into main	2024-06-25 15:13:30 +02:00
Benoit Marty	3f67bbf4e0	Adding fastlane file for version 1.6.18	2024-06-25 15:13:20 +02:00
Benoit Marty	4a261a88c5	Changelog for version 1.6.18	2024-06-25 15:12:55 +02:00
Benoit Marty	712b846f9f	Use BuildTools 35.0.0	2024-06-25 15:06:21 +02:00
Benoit Marty	b5758c5335	Merge pull request #8850 from element-hq/fix/jme/8894-ea-intercepts-mas-urls Replace `*.element.io` deep link with actual hosts	2024-06-25 14:17:18 +02:00
Jorge Martín	0292749cc0	Add changelog	2024-06-25 11:56:15 +02:00
Jorge Martín	a1dd3ba1b5	Replace `*.element.io` deep link with actual hosts This is done to avoid incorrectly intercepting links in other apps, as Element X Android.	2024-06-25 11:48:16 +02:00
dependabot[bot]	f848129d15	Bump rexml from 3.2.5 to 3.2.8 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.5 to 3.2.8. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.5...v3.2.8) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-16 19:08:07 +00:00
				`@ -1 +0,0 @@`
				`Fix redacted events not grouped correctly when hidden events are inserted between.`
				`@ -1 +0,0 @@`
				`Element-Android session doesn't encrypt for a dehydrated device`