From 092448d5842b98693870f862625727e03f2d291e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Thu, 4 Jun 2026 16:13:28 +0200 Subject: [PATCH 1/4] Setting version for the release 26.06.1 --- plugins/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index 69d7791e6b..f87eed1a40 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -45,7 +45,7 @@ private const val versionMonth = 6 * Release number in the month. Value must be in [0,99]. * Do not update this value. it is updated by the release script. */ -private const val versionReleaseNumber = 0 +private const val versionReleaseNumber = 1 object Versions { /** From 144e3c6b5d76cc8f6d6c0214f9af2bf33de90f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Thu, 4 Jun 2026 16:13:50 +0200 Subject: [PATCH 2/4] Adding fastlane file for version 26.06.1 --- fastlane/metadata/android/en-US/changelogs/202606010.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/202606010.txt diff --git a/fastlane/metadata/android/en-US/changelogs/202606010.txt b/fastlane/metadata/android/en-US/changelogs/202606010.txt new file mode 100644 index 0000000000..08c06cf192 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/202606010.txt @@ -0,0 +1,2 @@ +Main changes in this version: fixed an issue with devices not supporting Vulkan, added image editing before sending and an option for custom notification sounds, improved start times, several other bug fixes and improvements. +Full changelog: https://github.com/element-hq/element-x-android/releases \ No newline at end of file From 33f64ca5a10f17726113fe14139706506e23afe9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 10 Jun 2026 12:22:13 +0200 Subject: [PATCH 3/4] Merge commit from fork * Log error on unsupported OAuth URL. * Bump version to 26.06.2 --- .../element/android/libraries/oauth/impl/OAuthUrlParser.kt | 6 ++++-- .../libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt index e62dea696f..7e2c4d03f5 100644 --- a/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt +++ b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt @@ -12,6 +12,7 @@ import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding import io.element.android.libraries.matrix.api.auth.OAuthRedirectUrlProvider import io.element.android.libraries.oauth.api.OAuthAction +import timber.log.Timber fun interface OAuthUrlParser { fun parse(url: String): OAuthAction? @@ -38,7 +39,8 @@ class DefaultOAuthUrlParser( if (url.contains("error=access_denied")) return OAuthAction.GoBack() if (url.contains("code=")) return OAuthAction.Success(url) - // Other case not supported, let's crash the app for now - error("Not supported: $url") + // Other cases are not supported, log an error and return null + Timber.w("Unsupported OAuth url") + return null } } diff --git a/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt index ff34ae8220..159d7eeae9 100644 --- a/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt +++ b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt @@ -13,7 +13,6 @@ import androidx.core.net.toUri import com.google.common.truth.Truth.assertThat import io.element.android.libraries.matrix.test.auth.FakeOAuthRedirectUrlProvider import io.element.android.libraries.oauth.api.OAuthAction -import org.junit.Assert.assertThrows import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -54,9 +53,8 @@ class DefaultOAuthIntentResolverTest { action = Intent.ACTION_VIEW data = "io.element.android:/invalid".toUri() } - assertThrows(IllegalStateException::class.java) { - sut.resolve(intent) - } + val result = sut.resolve(intent) + assertThat(result).isNull() } private fun createDefaultOAuthIntentResolver(): DefaultOAuthIntentResolver { From 937b2a5e3a9b4a517dd570b14c212cbf6e1095b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Wed, 10 Jun 2026 12:29:13 +0200 Subject: [PATCH 4/4] Bump version to `v26.06.2` --- plugins/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index f87eed1a40..e47196709a 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -45,7 +45,7 @@ private const val versionMonth = 6 * Release number in the month. Value must be in [0,99]. * Do not update this value. it is updated by the release script. */ -private const val versionReleaseNumber = 1 +private const val versionReleaseNumber = 2 object Versions { /**