Merge branch 'release/2.11.4'

tchapgouv · May 16, 2024 · 0fe8f09 · 0fe8f09
2 parents 3a40f86 + 92fe5b3
commit 0fe8f09
Show file tree

Hide file tree

Showing 13 changed files with 718 additions and 191 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,11 @@
+Changes in Tchap 2.11.4 (2024-05-16)
+====================================
+
+Features ✨
+----------
+ - Activation de la fonction de partage de localisation. ([#1046](https://github.com/tchapgouv/tchap-android/issues/1046))
+
+
 Changes in Tchap 2.11.3 (2024-05-14)
 ====================================
 

diff --git a/library/ui-strings/src/main/res/values/donottranslate.xml b/library/ui-strings/src/main/res/values/donottranslate.xml
@@ -13,5 +13,5 @@
     <string name="command_description_crash_application" translatable="false">Crash the application.</string>
 
     <!--  WIP -->
-    <string name="location_map_view_copyright" translatable="false">© IGN</string> <!-- Tchap: Custom string -->
+    <string name="location_map_view_copyright" translatable="false">© Etalab © OpenMapTiles © Contributeurs OpenStreetMap</string> <!-- Tchap: Custom string -->
 </resources>
diff --git a/tools/release/sign_all_apks_yubi.sh b/tools/release/sign_all_apks_yubi.sh
@@ -23,7 +23,8 @@ then
     exit 1
 fi
 
-read -p "Please enter the artifact URL: " artifactUrl
+read -p "Please enter the artifact URL for Gplay: " artifactGplayUrl
+read -p "Please enter the artifact URL for F-Droid: " artifactFdroidUrl
 read -s -p "Please enter your GitHub token: " gitHubToken
 
 printf "\n================================================================================\n"
@@ -34,7 +35,13 @@ set +e
 
 python3 ./tools/release/download_github_artifacts.py \
     --token ${gitHubToken} \
-    --artifactUrl ${artifactUrl} \
+    --artifactUrl ${artifactGplayUrl} \
+    --directory ${PARAM_DIRECTORY} \
+    --ignoreErrors
+
+python3 ./tools/release/download_github_artifacts.py \
+    --token ${gitHubToken} \
+    --artifactUrl ${artifactFdroidUrl} \
     --directory ${PARAM_DIRECTORY} \
     --ignoreErrors
 
@@ -45,10 +52,12 @@ printf "\n======================================================================
 printf "Unzipping the artifact...\n"
 
 unzip ${PARAM_DIRECTORY}/GplayTchapWithdmvoipWithpinning-release-unsigned.zip -d ${PARAM_DIRECTORY}
+unzip ${PARAM_DIRECTORY}/FdroidTchapWithdmvoipWithoutpinning-release-unsigned.zip -d ${PARAM_DIRECTORY}
 
 # Flatten folder hierarchy
 mv ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning/release/* ${PARAM_DIRECTORY}
-rm -rf ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning
+mv ${PARAM_DIRECTORY}/fdroidTchapWithdmvoipWithoutpinning/release/* ${PARAM_DIRECTORY}
+rm -rf ${PARAM_DIRECTORY}/gplayTchapWithdmvoipWithpinning ${PARAM_DIRECTORY}/fdroidTchapWithdmvoipWithoutpinning
 
 read -s -p "Enter your PIN: " pin
 

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.11.3"
+    version = "2.11.4"
     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 = 3
+ext.versionPatch = 4
 
 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 = false // Tchap: Disable Location Sharing
-    const val LOCATION_MAP_TILER_KEY = ""
+    const val ENABLE_LOCATION_SHARING = true
+    const val LOCATION_MAP_TILER_KEY = "" // Tchap: No key for map is needed
 
     /**
      * Whether to read the `io.element.functional_members` state event

diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
@@ -43,7 +43,7 @@
     <bool name="settings_ignored_users_visible">true</bool>
 
     <!-- Level 1: Labs -->
-    <bool name="tchap_settings_labs_enable_location_sharing">false</bool> <!-- Tchap: Disable Location Sharing -->
+    <bool name="tchap_settings_labs_enable_location_sharing">true</bool> <!-- Tchap: Enable Location Sharing -->
 
     <bool name="settings_labs_deferred_dm_visible">true</bool>
     <bool name="settings_labs_deferred_dm_default">true</bool>

diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.location
 // Tchap: Tiles from IGN
 // const val MAP_BASE_URL = "https://data.geopf.fr/annexes/ressources/vectorTiles/styles/PLAN.IGN/standard.json"
 // Tchap: Tiles from geo.data.gouv.fr
-// const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
+const val MAP_BASE_URL = "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
 // Tchap: Generate and load map on device
 // const val MAP_BASE_URL = "https://api.maptiler.com/maps/streets/style.json"
 // const val STATIC_MAP_BASE_URL = "https://api.maptiler.com/maps/basic/static/"