From 29465f49aeb156c4efd2e8f7e01ae13d79e57d9c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 15:36:04 +0200 Subject: [PATCH 1/6] version++ --- 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 658603cb56..0e9d807014 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -56,7 +56,7 @@ private const val versionMinor = 1 // 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. -private const val versionPatch = 4 +private const val versionPatch = 6 object Versions { val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch From 8c2cc41f9790d25c448a8ef9cffa622e0df6233a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 16:54:08 +0200 Subject: [PATCH 2/6] Add missing plugin forward between `LoggedInAppScopeFlowNode` and `LoggedInFlowNode`. The RoomComponent was not created. Fix crash when opening a room. --- .../io/element/android/appnav/LoggedInAppScopeFlowNode.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt index c94967939e..6fbe63c1e8 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt @@ -102,7 +102,8 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor( plugins().forEach { it.onOpenBugReport() } } } - createNode(buildContext, listOf(callback)) + val nodeLifecycleCallbacks = plugins() + createNode(buildContext, nodeLifecycleCallbacks + callback) } } } From a700f114d2930303f98497287eb06fb484e8c166 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 16:59:31 +0200 Subject: [PATCH 3/6] Changelog --- changelog.d/1160.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1160.bugfix diff --git a/changelog.d/1160.bugfix b/changelog.d/1160.bugfix new file mode 100644 index 0000000000..de994b406e --- /dev/null +++ b/changelog.d/1160.bugfix @@ -0,0 +1 @@ +Fix crash when opening any room. From f696fcde353aab2459f6ba97737d1f87ba7e472e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 17:17:49 +0200 Subject: [PATCH 4/6] Setting version for the release 0.1.5 --- 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 0e9d807014..ebccf62e9c 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -56,7 +56,7 @@ private const val versionMinor = 1 // 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. -private const val versionPatch = 6 +private const val versionPatch = 5 object Versions { val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch From 56af73234b55a59f6b0bf6a13473fa7b55a1c6c5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 17:18:39 +0200 Subject: [PATCH 5/6] Changelog for version 0.1.5 --- CHANGES.md | 8 ++++++++ changelog.d/1160.bugfix | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/1160.bugfix diff --git a/CHANGES.md b/CHANGES.md index 3e6c3d9b3c..c9e3ad2d33 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +Changes in Element X v0.1.5 (2023-08-28) +======================================== + +Bugfixes 🐛 +---------- + - Fix crash when opening any room. ([#1160](https://github.com/vector-im/element-x-android/issues/1160)) + + Changes in Element X v0.1.4 (2023-08-28) ======================================== diff --git a/changelog.d/1160.bugfix b/changelog.d/1160.bugfix deleted file mode 100644 index de994b406e..0000000000 --- a/changelog.d/1160.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix crash when opening any room. From a48fad655b544a389ff6921b6f9dd308d129cae5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Aug 2023 17:18:55 +0200 Subject: [PATCH 6/6] Adding fastlane file for version 0.1.5 --- fastlane/metadata/android/en-US/changelogs/40001050.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40001050.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40001050.txt b/fastlane/metadata/android/en-US/changelogs/40001050.txt new file mode 100644 index 0000000000..2593704785 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40001050.txt @@ -0,0 +1,2 @@ +Main changes in this version: bug fixes and add OIDC support. +Full changelog: https://github.com/vector-im/element-x-android/releases