Merge branch 'release/2.11.5'

TCHAP_CHANGES.md

@@ -1,3 +1,11 @@
+Changes in Tchap 2.11.5 (2024-05-23)
+====================================
+
+Other changes
+-------------
+ - Suppression du variant sans VoIP. ([#1047](https://github.com/tchapgouv/tchap-android/issues/1047))
+
+
 Changes in Tchap 2.11.4 (2024-05-16)
 ====================================
 
@@ -11,7 +19,7 @@ Changes in Tchap 2.11.3 (2024-05-14)
 
 Features ✨
 ----------
- - Activation des appels vocaux pour toutes les instances. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))
+ - Activation des appels vocaux pour toutes les instances en beta externe. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))
 
 Other changes
 -------------
@@ -23,7 +31,7 @@ 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))
+ - Activation des appels vocaux pour les instances Diplomatie et Finances en beta externe ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))
 
 Improvements 🙌
 --------------

towncrier.toml

@@ -1,5 +1,5 @@
 [tool.towncrier]
- version = "2.11.4"
+ version = "2.11.5"
  directory = "changelog.d"
  filename = "TCHAP_CHANGES.md"
  name = "Changes in Tchap"

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 = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
  def cmd = 'git show -s --format=%ct'
@@ -352,7 +352,6 @@ android {
 
  withvoip { dimension "voip" }
  withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
 
  withpinning { dimension "pinning" }
  withoutpinning { dimension "pinning" }
@@ -445,24 +444,6 @@ configurations {
  gplayTchapWithvoipWithpinningDebugImplementation
 
 
- fdroidBtchapWithoutvoipWithpinningDebugImplementation
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation
- fdroidTchapWithoutvoipWithpinningDebugImplementation
-
- gplayBtchapWithoutvoipWithpinningDebugImplementation
- gplayDevTchapWithoutvoipWithpinningDebugImplementation
- gplayTchapWithoutvoipWithpinningDebugImplementation
-
-
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation
-
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation
- gplayTchapWithoutvoipWithoutpinningDebugImplementation
-
-
  fdroidBtchapWithdmvoipWithpinningDebugImplementation
  fdroidDevTchapWithdmvoipWithpinningDebugImplementation
  fdroidTchapWithdmvoipWithpinningDebugImplementation
@@ -563,45 +544,6 @@ dependencies {
  fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
  fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
- fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
- gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper)
- fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
-
-
  gplayBtchapWithdmvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
  gplayBtchapWithdmvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
 

vector-config/build.gradle

@@ -20,7 +20,6 @@ android {
  productFlavors {
  withvoip { dimension "voip" }
  withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
 
  devTchap { dimension "target" }
  btchap { dimension "target" }

vector-config/src/tchap/res/values/config-features.xml

@@ -4,5 +4,7 @@
  <bool name="tchap_is_key_backup_enabled">true</bool>
  <bool name="tchap_is_thread_enabled">false</bool>
 
- <string-array name="tchap_is_voip_supported_homeservers" translatable="false" />
+ <string-array name="tchap_is_voip_supported_homeservers" translatable="false">
+ <item>agent.dinum.tchap.gouv.fr</item>
+ </string-array>
 </resources>

vector/build.gradle

@@ -93,7 +93,6 @@ android {
 
  withvoip { dimension "voip" }
  withdmvoip { dimension "voip" }
- withoutvoip { dimension "voip" }
 
  withpinning { dimension "pinning" }
  withoutpinning { dimension "pinning" }
@@ -272,7 +271,6 @@ dependencies {
 
  // Tchap: Manage jitsi lib
  // WebRTC
- withoutvoipImplementation('org.jitsi:webrtc:111.0.1')
  withdmvoipImplementation('org.jitsi:webrtc:111.0.1')
  // Jitsi
  withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') {

vector/src/main/java/im/vector/app/features/location/Config.kt

@@ -16,13 +16,13 @@
 
 package im.vector.app.features.location
 
+// 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/"
 // 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"
-// 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/"
 const val DEFAULT_PIN_ID = "DEFAULT_PIN_ID"
 
 const val INITIAL_MAP_ZOOM_IN_PREVIEW = 15.0