Enable visio on education instance (#1108)

tchapgouv · Sep 19, 2024 · d9f6ff2 · d9f6ff2
1 parent 4247dea
commit d9f6ff2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 4 deletions.
diff --git a/changelog.d/1106.feature b/changelog.d/1106.feature
@@ -0,0 +1 @@
+Activation des appels vidéos pour Éducation.
diff --git a/changelog.d/1108.bugfix b/changelog.d/1108.bugfix
@@ -0,0 +1 @@
+Correction du problème de microphone sur Android 14.
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.13.3"
+    version = "2.13.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 = 13
 // 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/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
@@ -7,5 +7,6 @@
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false">
         <item>agent.dinum.tchap.gouv.fr</item>
+        <item>agent.education.tchap.gouv.fr</item>
     </string-array>
 </resources>
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
@@ -44,6 +44,7 @@
 
     <!-- For CallAndroidService -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
 
     <!-- For VectorSyncAndroidService -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
@@ -362,7 +363,7 @@
 
         <service
             android:name=".core.services.CallAndroidService"
-            android:foregroundServiceType="phoneCall"
+            android:foregroundServiceType="microphone|phoneCall"
             android:exported="false">
             <!-- in order to get headset button events -->
             <intent-filter>

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -204,7 +204,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                         Timber.v("DidAskUserConsent: $didAskUser")
                         if (!didAskUser) {
                             // TCHAP user already consented about analytics in the private policy
-                            //_viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
+//                            _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
                             _viewEvents.post(HomeActivityViewEvents.SetAnalyticsOptIn)
                         } else {
                             _viewEvents.post(HomeActivityViewEvents.ShowNotificationDialog)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Correction du problème de microphone sur Android 14.