From f5d2ba39f44cf99e6646db073370d4f901ffb07e Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 25 Mar 2022 15:04:00 +0000
Subject: [PATCH 1/3] moving the live location sharing permission debug only to
 unblock releases whilst the feature is WIP

---
 changelog.d/5636.misc                | 1 +
 vector/src/debug/AndroidManifest.xml | 2 ++
 vector/src/main/AndroidManifest.xml  | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/5636.misc

diff --git a/changelog.d/5636.misc b/changelog.d/5636.misc
new file mode 100644
index 0000000000..fda29bc5a1
--- /dev/null
+++ b/changelog.d/5636.misc
@@ -0,0 +1 @@
+Moving live location sharing permission to debug only builds whilst it is WIP
\ No newline at end of file
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index 0b2b5cf90f..87aade0c8b 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="im.vector.app">
 
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity android:name=".features.debug.DebugPermissionActivity" />
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1d99fba91a..541d6aa6f8 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -45,7 +45,8 @@
     <!-- Location Sharing -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <!--  Debug only whilst live location sharing is WIP -->
+    <!--<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />-->
 
     <!-- Jitsi SDK is now API23+ -->
     <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react" />

From e01c5049f6a65e8114811ea98d9df83e24b04070 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 28 Mar 2022 09:46:26 +0100
Subject: [PATCH 2/3] updating version to 1.4.8

---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index a26a709afc..1e2eda166f 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -31,7 +31,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.7\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.8\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
diff --git a/vector/build.gradle b/vector/build.gradle
index f58b7d444d..c3ad6e32cf 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -18,7 +18,7 @@ ext.versionMinor = 4
 // 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 = 7
+ext.versionPatch = 8
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 9bf54a3750beea69bb2f5063748d114134794479 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 28 Mar 2022 11:47:43 +0200
Subject: [PATCH 3/3] Update changes

---
 CHANGES.md                                              | 8 ++++++++
 changelog.d/5636.misc                                   | 1 -
 fastlane/metadata/android/en-US/changelogs/40104080.txt | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)
 delete mode 100644 changelog.d/5636.misc
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40104080.txt

diff --git a/CHANGES.md b/CHANGES.md
index 5f0a2945de..2a97120452 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+Changes in Element v1.4.8 (2022-03-28)
+======================================
+
+Other changes
+-------------
+ - Moving live location sharing permission to debug only builds whilst it is WIP ([#5636](https://github.com/vector-im/element-android/issues/5636))
+
+
 Changes in Element v1.4.7 (2022-03-24)
 ======================================
 
diff --git a/changelog.d/5636.misc b/changelog.d/5636.misc
deleted file mode 100644
index fda29bc5a1..0000000000
--- a/changelog.d/5636.misc
+++ /dev/null
@@ -1 +0,0 @@
-Moving live location sharing permission to debug only builds whilst it is WIP
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40104080.txt b/fastlane/metadata/android/en-US/changelogs/40104080.txt
new file mode 100644
index 0000000000..66ed1664bd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Thread timeline are now live and faster. Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
\ No newline at end of file