Resolve conflict in intl_fr

.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:

.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

.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

.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:

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  FLUTTER_VERSION: 3.22.2
+  FLUTTER_VERSION: 3.24.0
 
 image:
   name: cirrusci/flutter:${FLUTTER_VERSION}

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

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
 

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"

android/app/src/main/AndroidManifest.xml

@@ -61,26 +61,12 @@
                 <action android:name="FLUTTER_NOTIFICATION_CLICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-               <action android:name="android.intent.action.VIEW" />
-               <category android:name="android.intent.category.DEFAULT" />
-               <category android:name="android.intent.category.BROWSABLE" />
-               <data
-                   android:scheme="https"
-                   android:host="matrix.to"/>
-            </intent-filter>
             <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="matrix" />
             </intent-filter>
-            <intent-filter>
-               <action android:name="android.intent.action.VIEW" />
-               <category android:name="android.intent.category.DEFAULT" />
-               <category android:name="android.intent.category.BROWSABLE" />
-               <data android:scheme="im.fluffychat" android:host="chat" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />

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

assets/l10n/intl_en.arb

@@ -899,7 +899,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "friday": "Friday",
+  "friday": "Fri",
   "@friday": {
     "type": "text",
     "placeholders": {}
@@ -1180,8 +1180,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "loading": "Loading...",
-  "@loading": {},
+  "loadingStatus": "Loading status...",
   "loadMore": "Load more…",
   "@loadMore": {
     "type": "text",
@@ -1248,7 +1247,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "monday": "Monday",
+  "monday": "Mon",
   "@monday": {
     "type": "text",
     "placeholders": {}
@@ -1693,7 +1692,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "saturday": "Saturday",
+  "saturday": "Sat",
   "@saturday": {
     "type": "text",
     "placeholders": {}
@@ -1953,7 +1952,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "sunday": "Sunday",
+  "sunday": "Sun",
   "@sunday": {
     "type": "text",
     "placeholders": {}
@@ -1983,7 +1982,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "thursday": "Thursday",
+  "thursday": "Thu",
   "@thursday": {
     "type": "text",
     "placeholders": {}
@@ -2024,7 +2023,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "tuesday": "Tuesday",
+  "tuesday": "Tue",
   "@tuesday": {
     "type": "text",
     "placeholders": {}
@@ -2201,7 +2200,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "wednesday": "Wednesday",
+  "wednesday": "Wed",
   "@wednesday": {
     "type": "text",
     "placeholders": {}
@@ -2582,7 +2581,7 @@
   },
   "noMessageHereYet": "No message here yet...",
   "@noMessageHereYet": {},
-  "sendMessageGuide": "Send a message or tap on the greeting bellow.",
+  "sendMessageGuide": "Send a message or tap on the greeting below.",
   "@sendMessageGuide": {},
   "youCreatedGroupChat": "You created a Group chat",
   "@youCreatedGroupChat": {},
@@ -2734,7 +2733,7 @@
   "@chatsAndContacts": {},
   "externalContactTitle": "Invite new users",
   "@externalContactTitle": {},
-  "externalContactMessage": "Some of the users you want to add are not in your contacs. Do you want to invite them?",
+  "externalContactMessage": "Some of the users you want to add are not in your contacts. Do you want to invite them?",
   "@externalContactMessage": {},
   "clear": "Clear",
   "@clear": {},
@@ -3102,6 +3101,10 @@
       }
     }
   },
+  "explainPermissionToAccessContacts": "Twake Chat DOES NOT collect your contacts. Twake Chat sends only contact hashes to the Twake Chat servers to understand who from your friends already joined Twake Chat, enabling connection with them. Your contacts ARE NOT synchronized with our server.",
+  "explainPermissionToAccessMedias": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Photos and Videos permission. You can also deny access to your media library at any time.",
+  "explainPermissionToAccessPhotos": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Photos permission. You can also deny access to your media library at any time.",
+  "explainPermissionToAccessVideos": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Videos permission. You can also deny access to your media library at any time.",
   "downloading": "Downloading",
   "@downloading": {},
   "settingUpYourTwake": "Setting up your Twake\nIt could take a while",
@@ -3163,7 +3166,24 @@
   "byContinuingYourAgreeingToOur": "By continuing, you're agreeing to our",
   "@byContinuingYourAgreeingToOur": {},
   "youDontHaveAnyContactsYet": "You dont have any contacts yet.",
-  "@youDontHaveAnyContactsYet": {},
+  "loading": "Loading...",
   "errorDialogTitle": "Oops, something went wrong",
-  "@errorDialogTitle": {}
+  "shootingTips": "Tap to take photo.",
+  "shootingWithRecordingTips": "Tap to take photo. Long press to record video.",
+  "shootingOnlyRecordingTips": "Long press to record video.",
+  "shootingTapRecordingTips": "Tap to record video.",
+  "loadFailed": "Load failed",
+  "saving": "Saving...",
+  "sActionManuallyFocusHint": "Manually focus",
+  "sActionPreviewHint": "Preview",
+  "sActionRecordHint": "Record",
+  "sActionShootHint": "Take picture",
+  "sActionShootingButtonTooltip": "Shooting button",
+  "sActionStopRecordingHint": "Stop recording",
+  "sCameraLensDirectionLabel": "Camera lens direction: {value}",
+  "sCameraPreviewLabel": "Camera preview: {value}",
+  "sFlashModeLabel": "Flash mode: {mode}",
+  "sSwitchCameraLensDirectionLabel": "Switch to the {value} camera",
+  "photo": "Photo",
+  "video": "Video"
 }