From 628ccdc328410a6ec6b021fc3642c77e2a47a1e8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 20 Oct 2021 09:16:56 +0200
Subject: [PATCH 1/4] Add English - GB to the list of languages

---
 vector/src/main/res/values-en-rGB/strings_no_weblate.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 vector/src/main/res/values-en-rGB/strings_no_weblate.xml

diff --git a/vector/src/main/res/values-en-rGB/strings_no_weblate.xml b/vector/src/main/res/values-en-rGB/strings_no_weblate.xml
new file mode 100644
index 0000000000..a57e7ca631
--- /dev/null
+++ b/vector/src/main/res/values-en-rGB/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">en</string>
+    <string name="resources_country_code">GB</string>
+    <string name="resources_script">Latn</string>
+
+</resources>
\ No newline at end of file

From 367795ee24aba444d8ad23c5ccf36fc8d6b3d757 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 20 Oct 2021 09:29:15 +0200
Subject: [PATCH 2/4] Fix crash reported by the PlayStore, for release 1.3.4 I
 did not find a way to reproduce, but this change should add some safety

---
 .../app/features/home/room/detail/RoomDetailFragment.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 473a993395..7461b89001 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -641,9 +641,11 @@ class RoomDetailFragment @Inject constructor(
                     }
                 }
                 .setOnEmojiPopupDismissListener {
-                    views.composerLayout.views.composerEmojiButton.apply {
-                        contentDescription = getString(R.string.a11y_open_emoji_picker)
-                        setImageResource(R.drawable.ic_insert_emoji)
+                    if (isAdded) {
+                        views.composerLayout.views.composerEmojiButton.apply {
+                            contentDescription = getString(R.string.a11y_open_emoji_picker)
+                            setImageResource(R.drawable.ic_insert_emoji)
+                        }
                     }
                 }
                 .build(views.composerLayout.views.composerEditText)

From e536e1c78510212be7515b2fd0249163dc166ed4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 20 Oct 2021 10:42:12 +0200
Subject: [PATCH 3/4] Run towncrier

---
 CHANGES.md               | 36 ++++++++++++++++++++++++++++++++++++
 changelog.d/2909.feature |  1 -
 changelog.d/3437.bugfix  |  1 -
 changelog.d/3608.bugfix  |  1 -
 changelog.d/3774.bugfix  |  1 -
 changelog.d/3890.misc    |  1 -
 changelog.d/4006.bugfix  |  1 -
 changelog.d/4090.feature |  1 -
 changelog.d/4106.bugfix  |  2 --
 changelog.d/4162.bugfix  |  1 -
 changelog.d/4167.bugfix  |  1 -
 changelog.d/4193.bugfix  |  1 -
 changelog.d/4201.bugfix  |  1 -
 changelog.d/4216.misc    |  1 -
 changelog.d/4221.bugfix  |  1 -
 changelog.d/4226.misc    |  1 -
 changelog.d/4234.bugfix  |  1 -
 changelog.d/4247.bugfix  |  1 -
 changelog.d/4250.misc    |  1 -
 changelog.d/4261.bugfix  |  1 -
 changelog.d/4264.misc    |  1 -
 changelog.d/465.misc     |  1 -
 changelog.d/908.bugfix   |  1 -
 23 files changed, 36 insertions(+), 23 deletions(-)
 delete mode 100644 changelog.d/2909.feature
 delete mode 100644 changelog.d/3437.bugfix
 delete mode 100644 changelog.d/3608.bugfix
 delete mode 100644 changelog.d/3774.bugfix
 delete mode 100644 changelog.d/3890.misc
 delete mode 100644 changelog.d/4006.bugfix
 delete mode 100644 changelog.d/4090.feature
 delete mode 100644 changelog.d/4106.bugfix
 delete mode 100644 changelog.d/4162.bugfix
 delete mode 100644 changelog.d/4167.bugfix
 delete mode 100644 changelog.d/4193.bugfix
 delete mode 100644 changelog.d/4201.bugfix
 delete mode 100644 changelog.d/4216.misc
 delete mode 100644 changelog.d/4221.bugfix
 delete mode 100644 changelog.d/4226.misc
 delete mode 100644 changelog.d/4234.bugfix
 delete mode 100644 changelog.d/4247.bugfix
 delete mode 100644 changelog.d/4250.misc
 delete mode 100644 changelog.d/4261.bugfix
 delete mode 100644 changelog.d/4264.misc
 delete mode 100644 changelog.d/465.misc
 delete mode 100644 changelog.d/908.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index c545a70671..8de71eae62 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,39 @@
+Changes in Element v1.3.4 (2021-10-20)
+======================================
+
+Features ✨
+----------
+ - Implement /part command, with or without parameter ([#2909](https://github.com/vector-im/element-android/issues/2909))
+ - Handle Presence support, for Direct Message room ([#4090](https://github.com/vector-im/element-android/issues/4090))
+
+Bugfixes 🐛
+----------
+ - Issue #908 Adding trailing space " " or ": " if the user started a sentence by mentioning someone, ([#908](https://github.com/vector-im/element-android/issues/908))
+ - Fixes reappearing notifications when dismissing notifications from slow homeservers or delayed /sync responses ([#3437](https://github.com/vector-im/element-android/issues/3437))
+ - Catching event decryption crash and logging when attempting to markOlmSessionForUnwedging fails ([#3608](https://github.com/vector-im/element-android/issues/3608))
+ - Fixing notification sounds being triggered for every message, now they only trigger for the first, consistent with the vibrations ([#3774](https://github.com/vector-im/element-android/issues/3774))
+ - Voice Message not sendable if recorded while flight mode was on ([#4006](https://github.com/vector-im/element-android/issues/4006))
+ - Fixes push notification emails list not refreshing the first time seeing the notifications page.
+  Also improves the error handling in the email notification toggling by using synchronous flows instead of the WorkManager ([#4106](https://github.com/vector-im/element-android/issues/4106))
+ - Make MegolmBackupAuthData.signatures optional for robustness ([#4162](https://github.com/vector-im/element-android/issues/4162))
+ - Fixing push notifications starting the looping background sync when the push notification causes the application to be created. ([#4167](https://github.com/vector-im/element-android/issues/4167))
+ - Fix random crash when user logs out just after the log in. ([#4193](https://github.com/vector-im/element-android/issues/4193))
+ - Make the font size selection dialog scrollable ([#4201](https://github.com/vector-im/element-android/issues/4201))
+ - Fix conversation notification for sent messages ([#4221](https://github.com/vector-im/element-android/issues/4221))
+ - Fixes the developer sync options being displayed in the home menu when developer mode is disabled ([#4234](https://github.com/vector-im/element-android/issues/4234))
+ - Restore support for Android Auto as sent messages are no longer read aloud ([#4247](https://github.com/vector-im/element-android/issues/4247))
+ - Fix crash on slash commands Exceptions ([#4261](https://github.com/vector-im/element-android/issues/4261))
+
+Other changes
+-------------
+ - Scrub user sensitive data like gps location from images when sending on original quality ([#465](https://github.com/vector-im/element-android/issues/465))
+ - Migrate to MvRx2 (Mavericks) ([#3890](https://github.com/vector-im/element-android/issues/3890))
+ - Implement a new github action workflow to generate two PRs for emoji and sas string sync ([#4216](https://github.com/vector-im/element-android/issues/4216))
+ - Improve wording around rageshakes in the defect issue template. ([#4226](https://github.com/vector-im/element-android/issues/4226))
+ - Add automation to move incoming issues and X-Needs-Info into the right places on the issue triage board. ([#4250](https://github.com/vector-im/element-android/issues/4250))
+ - Uppon sharing image compression fails, return the original image ([#4264](https://github.com/vector-im/element-android/issues/4264))
+
+
 Changes in Element v1.3.3 (2021-10-11)
 ======================================
 
diff --git a/changelog.d/2909.feature b/changelog.d/2909.feature
deleted file mode 100644
index 4d72734192..0000000000
--- a/changelog.d/2909.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implement /part command, with or without parameter
\ No newline at end of file
diff --git a/changelog.d/3437.bugfix b/changelog.d/3437.bugfix
deleted file mode 100644
index 11e493e1ba..0000000000
--- a/changelog.d/3437.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes reappearing notifications when dismissing notifications from slow homeservers or delayed /sync responses
\ No newline at end of file
diff --git a/changelog.d/3608.bugfix b/changelog.d/3608.bugfix
deleted file mode 100644
index 5f219ab319..0000000000
--- a/changelog.d/3608.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Catching event decryption crash and logging when attempting to markOlmSessionForUnwedging fails
\ No newline at end of file
diff --git a/changelog.d/3774.bugfix b/changelog.d/3774.bugfix
deleted file mode 100644
index 9145771bae..0000000000
--- a/changelog.d/3774.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixing notification sounds being triggered for every message, now they only trigger for the first, consistent with the vibrations
\ No newline at end of file
diff --git a/changelog.d/3890.misc b/changelog.d/3890.misc
deleted file mode 100644
index 3bace80fa7..0000000000
--- a/changelog.d/3890.misc
+++ /dev/null
@@ -1 +0,0 @@
-Migrate to MvRx2 (Mavericks)
\ No newline at end of file
diff --git a/changelog.d/4006.bugfix b/changelog.d/4006.bugfix
deleted file mode 100644
index 61ac98ccb8..0000000000
--- a/changelog.d/4006.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Voice Message not sendable if recorded while flight mode was on
\ No newline at end of file
diff --git a/changelog.d/4090.feature b/changelog.d/4090.feature
deleted file mode 100644
index be8aa317a6..0000000000
--- a/changelog.d/4090.feature
+++ /dev/null
@@ -1 +0,0 @@
-Handle Presence support, for Direct Message room
\ No newline at end of file
diff --git a/changelog.d/4106.bugfix b/changelog.d/4106.bugfix
deleted file mode 100644
index 6ca030f8c4..0000000000
--- a/changelog.d/4106.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes push notification emails list not refreshing the first time seeing the notifications page.
-Also improves the error handling in the email notification toggling by using synchronous flows instead of the WorkManager
\ No newline at end of file
diff --git a/changelog.d/4162.bugfix b/changelog.d/4162.bugfix
deleted file mode 100644
index 833ed2f1b8..0000000000
--- a/changelog.d/4162.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make MegolmBackupAuthData.signatures optional for robustness
\ No newline at end of file
diff --git a/changelog.d/4167.bugfix b/changelog.d/4167.bugfix
deleted file mode 100644
index 8df264d8f6..0000000000
--- a/changelog.d/4167.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixing push notifications starting the looping background sync when the push notification causes the application to be created.
diff --git a/changelog.d/4193.bugfix b/changelog.d/4193.bugfix
deleted file mode 100644
index a395e70cee..0000000000
--- a/changelog.d/4193.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix random crash when user logs out just after the log in.
\ No newline at end of file
diff --git a/changelog.d/4201.bugfix b/changelog.d/4201.bugfix
deleted file mode 100644
index fa8e506015..0000000000
--- a/changelog.d/4201.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make the font size selection dialog scrollable
diff --git a/changelog.d/4216.misc b/changelog.d/4216.misc
deleted file mode 100644
index acf5f1dbcb..0000000000
--- a/changelog.d/4216.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement a new github action workflow to generate two PRs for emoji and sas string sync
diff --git a/changelog.d/4221.bugfix b/changelog.d/4221.bugfix
deleted file mode 100644
index 76c66898b1..0000000000
--- a/changelog.d/4221.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix conversation notification for sent messages
diff --git a/changelog.d/4226.misc b/changelog.d/4226.misc
deleted file mode 100644
index ac7a294f35..0000000000
--- a/changelog.d/4226.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve wording around rageshakes in the defect issue template.
diff --git a/changelog.d/4234.bugfix b/changelog.d/4234.bugfix
deleted file mode 100644
index e7b46a6186..0000000000
--- a/changelog.d/4234.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes the developer sync options being displayed in the home menu when developer mode is disabled
\ No newline at end of file
diff --git a/changelog.d/4247.bugfix b/changelog.d/4247.bugfix
deleted file mode 100644
index da8ca300b4..0000000000
--- a/changelog.d/4247.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Restore support for Android Auto as sent messages are no longer read aloud
diff --git a/changelog.d/4250.misc b/changelog.d/4250.misc
deleted file mode 100644
index c4d2fcbd6d..0000000000
--- a/changelog.d/4250.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add automation to move incoming issues and X-Needs-Info into the right places on the issue triage board.
diff --git a/changelog.d/4261.bugfix b/changelog.d/4261.bugfix
deleted file mode 100644
index 4283335131..0000000000
--- a/changelog.d/4261.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash on slash commands Exceptions
\ No newline at end of file
diff --git a/changelog.d/4264.misc b/changelog.d/4264.misc
deleted file mode 100644
index 601abbf792..0000000000
--- a/changelog.d/4264.misc
+++ /dev/null
@@ -1 +0,0 @@
-Uppon sharing image compression fails, return the original image
diff --git a/changelog.d/465.misc b/changelog.d/465.misc
deleted file mode 100644
index 709d1f1957..0000000000
--- a/changelog.d/465.misc
+++ /dev/null
@@ -1 +0,0 @@
-Scrub user sensitive data like gps location from images when sending on original quality
diff --git a/changelog.d/908.bugfix b/changelog.d/908.bugfix
deleted file mode 100644
index f43b03e892..0000000000
--- a/changelog.d/908.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Issue #908 Adding trailing space " " or ": " if the user started a sentence by mentioning someone,

From d5f2a6179d8ed66ec5f23f48086ab6018723e21b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 20 Oct 2021 10:44:20 +0200
Subject: [PATCH 4/4] Fastlane change

---
 fastlane/metadata/android/en-US/changelogs/40103040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40103040.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/40103040.txt b/fastlane/metadata/android/en-US/changelogs/40103040.txt
new file mode 100644
index 0000000000..06b32c8dff
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40103040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Add Presence support, for Direct Message room (note: presence is disabled on matrix.org. Add again Android Auto support.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.4
\ No newline at end of file