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
index be49697bd2..dfe1649180 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -110,7 +110,7 @@
Inscrire mon compte sur liste rouge
Les autres utilisateurs ne pourront pas découvrir mon compte lors de leurs recherches
Pour désactiver cette option, vous devez accepter que votre adresse e\u2011mail soit visible des autres utilisateurs lors de leurs recherches.
- Joyeuses Fêtes
+ 🎄 Joyeuses Fêtes 🎄
La vérification de votre nouvelle session a échoué.
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index 296cf70bdf..67bd2be7e6 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -110,7 +110,7 @@
Subscribe to the red list.
"Other users won't be able to find my account in their search results."
To disable this option, you must accept that your email address is visible to the other users.
- Happy Holidays
+ 🎄 Happy Holidays 🎄
Failed to verify your new session.
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index afba822e12..be6a96cd8f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.utils.FirstThrottler
import im.vector.app.core.utils.openUrlInChromeCustomTab
import im.vector.app.features.analytics.plan.MobileScreen
import im.vector.app.features.navigation.Navigator
+import java.util.Calendar
@AndroidEntryPoint
class VectorSettingsRootFragment :
@@ -63,12 +64,16 @@ class VectorSettingsRootFragment :
}
// Tchap: Manage Christmas entry
- findPreference(VectorPreferences.TCHAP_SETTINGS_CHRISTMAS_PREFERENCE_KEY)!!
- .onPreferenceClickListener = Preference.OnPreferenceClickListener {
- if (firstThrottler.canHandle() is FirstThrottler.CanHandlerResult.Yes) {
- navigator.openRoom(requireContext(), "!cDKdQyXHeWBEaKDWWV:agent.dinum.tchap.gouv.fr", null)
+ if (Calendar.getInstance().before(Calendar.getInstance().apply { set(2024, 1, 10) })) {
+ findPreference(VectorPreferences.TCHAP_SETTINGS_CHRISTMAS_PREFERENCE_KEY)!!.let {
+ it.isVisible = true
+ it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+ if (firstThrottler.canHandle() is FirstThrottler.CanHandlerResult.Yes) {
+ navigator.openRoom(requireContext(), "!cDKdQyXHeWBEaKDWWV:agent.dinum.tchap.gouv.fr", null)
+ }
+ false
+ }
}
- false
}
}
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 26638f9b6a..44064f2e60 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -63,8 +63,9 @@
app:isPreferenceVisible="@bool/settings_root_legals_visible" />
+ android:title="@string/tchap_settings_christmas_title"
+ app:isPreferenceVisible="@bool/false_tchap_hidden" />