diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 65ced8e53c..1ddce5067a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
name: Build
env:
- FLUTTER_VERSION: 3.22.2
+ FLUTTER_VERSION: 3.24.0
XCODE_VERSION: ^15.0.1
jobs:
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
index a05f24d3f1..60d8b36c78 100644
--- a/.github/workflows/gh-pages.yaml
+++ b/.github/workflows/gh-pages.yaml
@@ -2,7 +2,7 @@ on:
pull_request:
env:
- FLUTTER_VERSION: 3.22.2
+ FLUTTER_VERSION: 3.24.0
LIBOLM_VERSION: 3.2.16
name: Deploying on GitHub Pages
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9900cf2e99..6f78ddbfbf 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -4,7 +4,7 @@ on:
- "v*.*.*"
env:
- FLUTTER_VERSION: 3.22.2
+ FLUTTER_VERSION: 3.24.0
XCODE_VERSION: ^15.0.1
name: Release
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 69d251ff18..685041ed13 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -4,7 +4,7 @@ on:
name: Tests
env:
- FLUTTER_VERSION: 3.22.2
+ FLUTTER_VERSION: 3.24.0
jobs:
code_analyze:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dcffc6a5a..f048d25f30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
variables:
- FLUTTER_VERSION: 3.22.2
+ FLUTTER_VERSION: 3.24.0
image:
name: cirrusci/flutter:${FLUTTER_VERSION}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1e5c21ca8..8015581ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## [2.6.0+2330] - 2024-07-18
+
+### Fixed
+
+- #1879 Fix online status is not updated correctly
+- #1892 Handle error recovery key lost
+- #1898 Fix memory leak in file picker
+- #1897 Fix profile image is not updated in multiple account
+- #1903 Check dialog status before sending file
+- #1911 Fix can't open chat when search exact Matrix ID
+- #1921 Fix iOS is forced to log out many times
+- #1910 Remove x when searchbar is empty
+- #1938 Fix wrong responsive when size of screen is small
+- #1930 Improve search exact Matrix ID inside Contact tab
+- #1948 Fix jump exactly to message in the notification on Mobile
+- #1946 Fix 500,404 error in POST request when login
+
+### Added
+
+- #1940 Upload feature
+- #1890 Renamed artifact to describe the OS
+- #1880 Standarlize Appbar and Appgrid popup
+- #1889 Change style loading dialog
+- #1894 Change message info dialog close button
+- #1905 Update online status based on design
+- #1937 Improve style for backup dialog
+- #1951 Integration dynamic link on android mobile
+- #1944 Update quick actions
+- #1956 Create permission dialogs for contacts and media
+
## [2.5.8+2330] - 2024-05-25
- #1781 Upgrade to Flutter SDK 3.22.0
@@ -2353,6 +2383,7 @@ interesting devices. If you have one, I would very like to see some screenshots
This CHANGELOG.md was generated with [**Changelog for
Dart**](https://pub.dartlang.org/packages/changelog)
+[2.6.0+2330]: https://github.com/linagora/twake-on-matrix/releases/tag/2.6.0
[2.5.2+2330]: https://github.com/linagora/twake-on-matrix/releases/tag/2.5.2
[2.4.20+2330]: https://github.com/linagora/twake-on-matrix/releases/tag/2.4.20
[2.4.19+2330]: https://github.com/linagora/twake-on-matrix/releases/tag/2.4.19
diff --git a/Dockerfile b/Dockerfile
index 8843fe8c2f..705320acd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Specify versions
-ARG FLUTTER_VERSION=3.22.2
+ARG FLUTTER_VERSION=3.24.0
ARG OLM_VERSION=3.2.16
ARG NIX_VERSION=2.22.1
diff --git a/android/app/build.gradle b/android/app/build.gradle
index cee5c1f7b6..191d884db1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
defaultConfig {
applicationId "app.twake.android.chat"
minSdkVersion 23
- targetSdkVersion 33
+ targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5dbba0bcfc..58016494b2 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -61,26 +61,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
index 4484f8e15d..6d9f2d881c 100644
--- a/android/fastlane/Fastfile
+++ b/android/fastlane/Fastfile
@@ -37,7 +37,7 @@ platform :android do
track = "internal"
upload_to_play_store(track: track,
aab: '../build/app/outputs/bundle/release/app-release.aab',
- release_status: "draft")
+ release_status: "completed")
end
lane :deploy_candidate do
diff --git a/assets/images/ic_encrypted.svg b/assets/images/ic_encrypted.svg
index f082a53915..4a461b2b26 100644
--- a/assets/images/ic_encrypted.svg
+++ b/assets/images/ic_encrypted.svg
@@ -1,7 +1,3 @@
-