Merge branch 'release/tchap_v2.11.2'

tchapgouv · Apr 30, 2024 · cb5ca07 · cb5ca07
2 parents 7e9abea + 6879d76
commit cb5ca07
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 16 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,16 @@
+Changes in Tchap 2.11.2 (2024-04-30)
+====================================
+
+Features ✨
+----------
+ - Activation des appels vocaux pour les instances Diplomatie et Finances ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))
+
+Improvements 🙌
+--------------
+ - Mise à jour de l'écran de compte expiré. ([#1035](https://github.com/tchapgouv/tchap-android/issues/1035))
+ - Améliorer la compréhension de la fonctionnalité notification par courriel. ([#1037](https://github.com/tchapgouv/tchap-android/issues/1037))
+
+
 Changes in Tchap 2.11.1 (2024-04-11)
 ====================================
 

diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -68,10 +68,12 @@
     <string name="tchap_room_settings_room_access_by_link_share">Partager le lien</string>
 
     <!-- tchap account validity -->
-    <string name="tchap_expired_account_msg">La durée de validité de votre compte a expiré. Un e\u2011mail vous a été envoyé pour la renouveler. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
-    <string name="tchap_expired_account_resume_button">J’ai renouvelé mon compte</string>
-    <string name="tchap_request_renewal_email_button">Demander l’envoi d’un nouvel email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour renouveler la validité de votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_title">Votre compte a expiré</string>
+    <string name="tchap_expired_account_msg">Un e\u2011mail vous a été envoyé pour renouveler votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_resume_button">Continuer</string>
+    <string name="tchap_request_renewal_email_button">Envoyer un nouvel email</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">Un nouvel e\u2011mail vous a été envoyé pour renouveler votre compte. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="tchap_expired_account_on_new_sent_email_title">Nouvel e\u2011mail envoyé</string>
 
     <!-- Login/Register Tchap -->
     <string name="tchap_has_account_no">Je n’ai pas\nde compte</string>
@@ -109,6 +111,7 @@
     <string name="tchap_settings_hide_from_users_directory_title">Inscrire mon compte sur liste rouge</string>
     <string name="tchap_settings_hide_from_users_directory_summary">Les autres utilisateurs ne pourront pas découvrir mon compte lors de leurs recherches</string>
     <string name="tchap_settings_show_external_user_in_users_directory_prompt">Pour désactiver cette option, vous devez accepter que votre adresse e\u2011mail soit visible des autres utilisateurs lors de leurs recherches.</string>
+    <string name="tchap_settings_notification_emails_summary">Recevez un e\u2011mail si au moins un message reste non lu pendant 72h.</string>
 
     <!-- Verification -->
     <string name="tchap_verification_conclusion_not_secure">La vérification de votre nouvelle session a échoué.</string>

diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -68,10 +68,12 @@
     <string name="tchap_room_settings_room_access_by_link_share">Share the link</string>
 
     <!-- tchap account validity -->
-    <string name="tchap_expired_account_msg">The validity period of your account has expired. An email has been sent to you in order to renew it. Once you’ve followed the link it contains, click below.</string>
-    <string name="tchap_expired_account_resume_button">I renewed the validity of my account</string>
+    <string name="tchap_expired_account_title">Your account has expired</string>
+    <string name="tchap_expired_account_msg">An email has been sent to you in order to renew your account. Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_resume_button">Continue</string>
     <string name="tchap_request_renewal_email_button">Request a renewal email</string>
-    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order to renew your account validity. Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_on_new_sent_email_msg">A new email has been sent to you in order to renew your account. Once you’ve followed the link it contains, click below.</string>
+    <string name="tchap_expired_account_on_new_sent_email_title">Email sent</string>
 
     <!-- Login/Register Tchap -->
     <string name="tchap_has_account_no">I do not have\nan account</string>
@@ -109,6 +111,7 @@
     <string name="tchap_settings_hide_from_users_directory_title">Subscribe to the red list.</string>
     <string name="tchap_settings_hide_from_users_directory_summary">"Other users won't be able to find my account in their search results."</string>
     <string name="tchap_settings_show_external_user_in_users_directory_prompt">To disable this option, you must accept that your email address is visible to the other users.</string>
+    <string name="tchap_settings_notification_emails_summary">Receive an email if at least one message has not been read for 72 hours.</string>
 
     <!-- Verification -->
     <string name="tchap_verification_conclusion_not_secure">Failed to verify your new session.</string>

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.11.1"
+    version = "2.11.2"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 11
 // 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 = 1
+ext.versionPatch = 2
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt
@@ -46,8 +46,8 @@ object Config {
      */
     const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false // Tchap: Disable UnifiedPush (use Firebase/background sync)
 
-    const val ENABLE_LOCATION_SHARING = true
-    const val LOCATION_MAP_TILER_KEY = "" // Tchap: Disable Location Sharing
+    const val ENABLE_LOCATION_SHARING = false // Tchap: Disable Location Sharing
+    const val LOCATION_MAP_TILER_KEY = ""
 
     /**
      * Whether to read the `io.element.functional_members` state event

diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
@@ -6,5 +6,7 @@
 
     <string-array name="tchap_is_voip_supported_homeservers" translatable="false">
         <item>agent.dinum.tchap.gouv.fr</item>
+        <item>agent.diplomatie.tchap.gouv.fr</item>
+        <item>agent.finances.tchap.gouv.fr</item>
     </string-array>
 </resources>
diff --git a/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt b/vector/src/main/java/fr/gouv/tchap/features/expired/ExpiredAccountActivity.kt
@@ -65,10 +65,12 @@ class ExpiredAccountActivity : VectorBaseActivity<ActivityTchapExpiredBinding>()
     private fun renderState(state: ExpiredAccountViewState) {
         with(views) {
             if (state.isRenewalEmailSent) {
-                titleView.setText(R.string.tchap_expired_account_on_new_sent_email_msg)
+                titleView.setText(R.string.tchap_expired_account_on_new_sent_email_title)
+                msgView.setText(R.string.tchap_expired_account_on_new_sent_email_msg)
                 renewalEmailButton.isVisible = false
             } else {
-                titleView.setText(R.string.tchap_expired_account_msg)
+                titleView.setText(R.string.tchap_expired_account_title)
+                msgView.setText(R.string.tchap_expired_account_msg)
                 renewalEmailButton.isVisible = true
             }
         }

diff --git a/.../java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt b/.../java/im/vector/app/features/settings/notifications/VectorSettingsNotificationFragment.kt
@@ -269,6 +269,8 @@ class VectorSettingsNotificationFragment :
                 emails.forEach { (emailPid, isEnabled) ->
                     val pref = VectorSwitchPreference(requireContext())
                     pref.title = resources.getString(R.string.settings_notification_emails_enable_for_email, emailPid.email)
+                    // Tchap: Add notification email description
+                    pref.summary = resources.getString(R.string.tchap_settings_notification_emails_summary)
                     pref.isChecked = isEnabled
                     pref.setTransactionalSwitchChangeListener(lifecycleScope) { isChecked ->
                         if (isChecked) {

diff --git a/vector/src/main/res/layout/activity_tchap_expired.xml b/vector/src/main/res/layout/activity_tchap_expired.xml
@@ -18,9 +18,20 @@
 
             <TextView
                 android:id="@+id/titleView"
+                style="@style/Widget.Vector.TextView.Title.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/tchap_expired_account_title"
+                android:textColor="?colorPrimary" />
+
+            <TextView
+                android:id="@+id/msgView"
                 style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="22dp"
+                android:layout_marginBottom="22dp"
                 android:gravity="start"
                 android:text="@string/tchap_expired_account_msg"
                 android:textColor="?vctr_content_primary" />
@@ -30,16 +41,15 @@
                 style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="22dp"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/tchap_expired_account_resume_button" />
 
             <Button
                 android:id="@+id/renewalEmailButton"
                 style="@style/Widget.Vector.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/tchap_request_renewal_email_button" />
 
         </LinearLayout>