From 99a5ed23f6cd645b7e7d66f5f1fc5ee1df9fea10 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 2 May 2025 14:37:23 +0200
Subject: [PATCH] Updated CHANGELOG & version code from release/6.0 branch

---
 CHANGELOG.md         | 19 +++++++++++++++++++
 app/build.gradle.kts |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0cafcb0c..e7e53d9b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,25 @@ Group changes to describe their impact on the project, as follows:
 - Added a vu meter for recording volume
 - Added a setting for user to choose whether to sort contacts by first name or last name
 
+## [6.0.6] - 2025-05-02
+
+### Added
+- Added recover phone account when clicking on "Forgotten password" in the assistant
+- Improved message when contacts list is empty depending on the currently selected filter and added a button to open the filter popup menu for users that didn't notice the icon on the top right corner of the screen when contacts list is empty and "SIP contacts only" filter is set.
+- Added "Logs collection sharing server URL" setting in developper area
+- Added "Disable sending logs to Crashlytics" advanced setting.
+
+### Changed
+- Improved VFS message in confirmation dialog
+- Moved "Print logs in logcat" and "File sharing server URL" settings to developper area
+
+### Fixed
+- Fixed crash when opening a password protected PDF
+- Fixed chat room lookup while in 1-1 call, using SDK method for getting chat room from conference
+- Fixed newly created contact not being visible in contacts list without reloading it
+- Fixed missing event icon for group conversations
+- Another attempts at preventing crashes due to In-Call service not being started as foreground before being stopped
+
 ## [6.0.5] - 2025-04-18
 
 ### Changed
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 64f4badff..5bc574602 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,7 +32,7 @@ if (firebaseCloudMessagingAvailable) {
 }
 
 var gitBranch = ByteArrayOutputStream()
-var gitVersion = "6.0.5"
+var gitVersion = "6.0.6"
 
 task("getGitVersion") {
     val gitVersionStream = ByteArrayOutputStream()
@@ -100,8 +100,8 @@ android {
         applicationId = packageName
         minSdk = 28
         targetSdk = 36
-        versionCode = 600005 // 6.00.005
-        versionName = "6.0.5"
+        versionCode = 600006 // 6.00.006
+        versionName = "6.0.6"
 
         manifestPlaceholders["appAuthRedirectScheme"] = packageName