From 93a34d953f7d532533ce5de1712ccc0b41ef9d2b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 30 Nov 2022 09:54:16 +0100
Subject: [PATCH 1/5] Release script: Fix script error

---
 tools/release/releaseScript.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/release/releaseScript.sh b/tools/release/releaseScript.sh
index 943e9771f2..e1579b00fc 100755
--- a/tools/release/releaseScript.sh
+++ b/tools/release/releaseScript.sh
@@ -77,7 +77,7 @@ fi
 cp ./vector-app/build.gradle ./vector-app/build.gradle.bak
 sed "s/ext.versionMajor = .*/ext.versionMajor = ${versionMajor}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
 sed "s/ext.versionMinor = .*/ext.versionMinor = ${versionMinor}/" ./vector-app/build.gradle     > ./vector-app/build.gradle.bak
-sed "s/ext.versionPatch = .*/ext.versionPatch = ${patchVersion}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
+sed "s/ext.versionPatch = .*/ext.versionPatch = ${versionPatch}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
 rm ./vector-app/build.gradle.bak
 cp ./matrix-sdk-android/build.gradle ./matrix-sdk-android/build.gradle.bak
 sed "s/\"SDK_VERSION\", .*$/\"SDK_VERSION\", \"\\\\\"${version}\\\\\"\"/" ./matrix-sdk-android/build.gradle.bak > ./matrix-sdk-android/build.gradle
@@ -184,7 +184,6 @@ git checkout develop
 # Set next version
 printf "\n================================================================================\n"
 printf "Setting next version on file './vector-app/build.gradle'...\n"
-nextPatchVersion=$((versionPatch + 2))
 cp ./vector-app/build.gradle ./vector-app/build.gradle.bak
 sed "s/ext.versionPatch = .*/ext.versionPatch = ${nextPatchVersion}/" ./vector-app/build.gradle.bak > ./vector-app/build.gradle
 rm ./vector-app/build.gradle.bak

From b0029f2dd3409a568cb7d56f9c1fddfcb19bef1c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Nov 2022 10:00:12 +0100
Subject: [PATCH 2/5] Release script: Check if git flow is enabled

---
 tools/release/releaseScript.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/release/releaseScript.sh b/tools/release/releaseScript.sh
index e1579b00fc..de97f2e7bb 100755
--- a/tools/release/releaseScript.sh
+++ b/tools/release/releaseScript.sh
@@ -38,6 +38,17 @@ if [[ ! -f ${releaseScriptFullPath} ]]; then
   exit 1
 fi
 
+# Check if git flow is enabled
+git flow config >/dev/null 2>&1
+if [[ $? == 0 ]]
+then
+    printf "Git flow is initialized"
+else
+    printf "Git flow is not initialized. Initializing...\n"
+    # All default value, just set 'v' for tag prefix
+    git flow init -d -t 'v'
+fi
+
 # Guessing version to propose a default version
 versionMajorCandidate=`grep "ext.versionMajor" ./vector-app/build.gradle | cut  -d " " -f3`
 versionMinorCandidate=`grep "ext.versionMinor" ./vector-app/build.gradle | cut  -d " " -f3`

From eb7154d42c03c6358558af33f864d3119b041775 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Nov 2022 10:25:21 +0100
Subject: [PATCH 3/5] Remove the obsolete description of the attribute.

---
 .github/ISSUE_TEMPLATE/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index 0c3542997a..4ab77af5a0 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -10,7 +10,6 @@ body:
     id: checklist
     attributes:
       label: Release checklist
-      description: For the template example, we are releasing the version 1.2.3. Replace 1.2.3 with the version in the issue body.
       placeholder: |
         If you are reading this, you have deleted the content of the release template: undo the deletion or start again.
       value: |

From d447d809f733e5a7154d1a922196afe548c83959 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Nov 2022 10:46:58 +0100
Subject: [PATCH 4/5] Changelog for version 1.5.10

---
 CHANGES.md               | 36 ++++++++++++++++++++++++++++++++++++
 changelog.d/2725.feature |  1 -
 changelog.d/5679.bugfix  |  1 -
 changelog.d/6996.sdk     |  1 -
 changelog.d/7546.feature |  1 -
 changelog.d/7555.bugfix  |  1 -
 changelog.d/7577.feature |  1 -
 changelog.d/7583.misc    |  1 -
 changelog.d/7594.misc    |  1 -
 changelog.d/7604.bugfix  |  1 -
 changelog.d/7620.bugfix  |  1 -
 changelog.d/7626.sdk     |  2 --
 changelog.d/7629.wip     |  1 -
 changelog.d/7634.bugfix  |  1 -
 changelog.d/7646.bugfix  |  1 -
 changelog.d/7655.wip     |  1 -
 changelog.d/7656.wip     |  1 -
 17 files changed, 36 insertions(+), 17 deletions(-)
 delete mode 100644 changelog.d/2725.feature
 delete mode 100644 changelog.d/5679.bugfix
 delete mode 100644 changelog.d/6996.sdk
 delete mode 100644 changelog.d/7546.feature
 delete mode 100644 changelog.d/7555.bugfix
 delete mode 100644 changelog.d/7577.feature
 delete mode 100644 changelog.d/7583.misc
 delete mode 100644 changelog.d/7594.misc
 delete mode 100644 changelog.d/7604.bugfix
 delete mode 100644 changelog.d/7620.bugfix
 delete mode 100644 changelog.d/7626.sdk
 delete mode 100644 changelog.d/7629.wip
 delete mode 100644 changelog.d/7634.bugfix
 delete mode 100644 changelog.d/7646.bugfix
 delete mode 100644 changelog.d/7655.wip
 delete mode 100644 changelog.d/7656.wip

diff --git a/CHANGES.md b/CHANGES.md
index 442d3641dd..022591f5a1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,39 @@
+Changes in Element v1.5.10 (2022-11-30)
+=======================================
+
+Features ✨
+----------
+ - Add setting to allow disabling direct share ([#2725](https://github.com/vector-im/element-android/issues/2725))
+ - [Device Manager] Toggle IP address visibility ([#7546](https://github.com/vector-im/element-android/issues/7546))
+ - New implementation of the full screen mode for the Rich Text Editor. ([#7577](https://github.com/vector-im/element-android/issues/7577))
+
+Bugfixes 🐛
+----------
+ - Fix italic text is truncated when bubble mode and markdown is enabled ([#5679](https://github.com/vector-im/element-android/issues/5679))
+ - Missing translations on "replyTo" messages ([#7555](https://github.com/vector-im/element-android/issues/7555))
+ - ANR on session start when sending client info is enabled ([#7604](https://github.com/vector-im/element-android/issues/7604))
+ - Make the plain text mode layout of the RTE more compact. ([#7620](https://github.com/vector-im/element-android/issues/7620))
+ - Push notification for thread message is now shown correctly when user observes rooms main timeline ([#7634](https://github.com/vector-im/element-android/issues/7634))
+ - Voice Broadcast - Fix playback stuck in buffering mode ([#7646](https://github.com/vector-im/element-android/issues/7646))
+
+In development 🚧
+----------------
+ - Voice Broadcast - Handle redaction of the state events on the listener and recorder sides ([#7629](https://github.com/vector-im/element-android/issues/7629))
+ - Voice Broadcast - Update the buffering display in the timeline ([#7655](https://github.com/vector-im/element-android/issues/7655))
+ - Voice Broadcast - Remove voice messages related to a VB from the room attachments ([#7656](https://github.com/vector-im/element-android/issues/7656))
+
+SDK API changes ⚠️
+------------------
+ - Added support for read receipts in threads. Now user in a room can have multiple read receipts (one per thread + one in main thread + one without threadId) ([#6996](https://github.com/vector-im/element-android/issues/6996))
+ - Sync Filter now taking in account homeserver capabilities to not pass unsupported parameters.
+  Sync Filter is now configured by providing SyncFilterBuilder class instance, instead of Filter to identify Filter changes related to homeserver capabilities ([#7626](https://github.com/vector-im/element-android/issues/7626))
+
+Other changes
+-------------
+ - Remove usage of Buildkite. ([#7583](https://github.com/vector-im/element-android/issues/7583))
+ - Better validation of edits ([#7594](https://github.com/vector-im/element-android/issues/7594))
+
+
 Changes in Element v1.5.8 (2022-11-17)
 ======================================
 
diff --git a/changelog.d/2725.feature b/changelog.d/2725.feature
deleted file mode 100644
index eb3fcaed57..0000000000
--- a/changelog.d/2725.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add setting to allow disabling direct share
diff --git a/changelog.d/5679.bugfix b/changelog.d/5679.bugfix
deleted file mode 100644
index 0394bc3e5d..0000000000
--- a/changelog.d/5679.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix italic text is truncated when bubble mode and markdown is enabled
diff --git a/changelog.d/6996.sdk b/changelog.d/6996.sdk
deleted file mode 100644
index 588ec160d7..0000000000
--- a/changelog.d/6996.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Added support for read receipts in threads. Now user in a room can have multiple read receipts (one per thread + one in main thread + one without threadId)
diff --git a/changelog.d/7546.feature b/changelog.d/7546.feature
deleted file mode 100644
index 94450082c9..0000000000
--- a/changelog.d/7546.feature
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Toggle IP address visibility
diff --git a/changelog.d/7555.bugfix b/changelog.d/7555.bugfix
deleted file mode 100644
index 064b21a9e5..0000000000
--- a/changelog.d/7555.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Missing translations on "replyTo" messages
diff --git a/changelog.d/7577.feature b/changelog.d/7577.feature
deleted file mode 100644
index e21ccb13c0..0000000000
--- a/changelog.d/7577.feature
+++ /dev/null
@@ -1 +0,0 @@
-New implementation of the full screen mode for the Rich Text Editor.
diff --git a/changelog.d/7583.misc b/changelog.d/7583.misc
deleted file mode 100644
index 3c63aeaadf..0000000000
--- a/changelog.d/7583.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove usage of Buildkite.
diff --git a/changelog.d/7594.misc b/changelog.d/7594.misc
deleted file mode 100644
index 5c5771d8d0..0000000000
--- a/changelog.d/7594.misc
+++ /dev/null
@@ -1 +0,0 @@
-Better validation of edits
diff --git a/changelog.d/7604.bugfix b/changelog.d/7604.bugfix
deleted file mode 100644
index 0fbee55bce..0000000000
--- a/changelog.d/7604.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-ANR on session start when sending client info is enabled
diff --git a/changelog.d/7620.bugfix b/changelog.d/7620.bugfix
deleted file mode 100644
index 55c0e423ad..0000000000
--- a/changelog.d/7620.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make the plain text mode layout of the RTE more compact.
diff --git a/changelog.d/7626.sdk b/changelog.d/7626.sdk
deleted file mode 100644
index 4d9f28183a..0000000000
--- a/changelog.d/7626.sdk
+++ /dev/null
@@ -1,2 +0,0 @@
-Sync Filter now taking in account homeserver capabilities to not pass unsupported parameters.
-Sync Filter is now configured by providing SyncFilterBuilder class instance, instead of Filter to identify Filter changes related to homeserver capabilities
diff --git a/changelog.d/7629.wip b/changelog.d/7629.wip
deleted file mode 100644
index ecc4449b6f..0000000000
--- a/changelog.d/7629.wip
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Handle redaction of the state events on the listener and recorder sides
diff --git a/changelog.d/7634.bugfix b/changelog.d/7634.bugfix
deleted file mode 100644
index a3c829840a..0000000000
--- a/changelog.d/7634.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Push notification for thread message is now shown correctly when user observes rooms main timeline
diff --git a/changelog.d/7646.bugfix b/changelog.d/7646.bugfix
deleted file mode 100644
index 7f771bc6f7..0000000000
--- a/changelog.d/7646.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Fix playback stuck in buffering mode
diff --git a/changelog.d/7655.wip b/changelog.d/7655.wip
deleted file mode 100644
index 24358007a9..0000000000
--- a/changelog.d/7655.wip
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Update the buffering display in the timeline
diff --git a/changelog.d/7656.wip b/changelog.d/7656.wip
deleted file mode 100644
index ab0e47289f..0000000000
--- a/changelog.d/7656.wip
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Remove voice messages related to a VB from the room attachments

From a656b003296ac0bf72485e7a37d4345153586f23 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Nov 2022 10:50:06 +0100
Subject: [PATCH 5/5] Adding fastlane file for version 1.5.10

---
 fastlane/metadata/android/en-US/changelogs/40105100.txt | 2 ++
 tools/release/releaseScript.sh                          | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40105100.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/40105100.txt b/fastlane/metadata/android/en-US/changelogs/40105100.txt
new file mode 100644
index 0000000000..c9e5ba5fa9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105100.txt
@@ -0,0 +1,2 @@
+Main changes in this version: New implementation of the full screen mode for the Rich Text Editor and bugfixes.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/tools/release/releaseScript.sh b/tools/release/releaseScript.sh
index de97f2e7bb..d8980b9da7 100755
--- a/tools/release/releaseScript.sh
+++ b/tools/release/releaseScript.sh
@@ -166,6 +166,7 @@ fastlanePathFile="./fastlane/metadata/android/en-US/changelogs/${fastlaneFile}"
 printf "Main changes in this version: TODO.\nFull changelog: https://github.com/vector-im/element-android/releases" > ${fastlanePathFile}
 
 read -p "I have created the file ${fastlanePathFile}, please edit it and press enter when it's done."
+git add ${fastlanePathFile}
 git commit -a -m "Adding fastlane file for version ${version}"
 
 printf "\n================================================================================\n"