Merge branch 'release/2.13.4'

tchapgouv · Sep 19, 2024 · 7a262ad · 7a262ad
2 parents dc680b1 + af27c7e
commit 7a262ad
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 17 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,15 @@
+Changes in Tchap 2.13.4 (2024-09-19)
+====================================
+
+Features ✨
+----------
+ - Activation des appels vidéos pour Éducation. ([#1106](https://github.com/tchapgouv/tchap-android/issues/1106))
+
+Bugfixes 🐛
+----------
+ - Activation du module analytics sur l'instance de dev. ([#1101](https://github.com/tchapgouv/tchap-android/issues/1101))
+ - Correction du problème de microphone sur Android 14. ([#1108](https://github.com/tchapgouv/tchap-android/issues/1108))
+
 Changes in Tchap 2.13.3 (2024-08-02)
 ====================================
 

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/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt
@@ -83,7 +83,13 @@ object Config {
      * The analytics configuration to use for the Debug build type.
      * Can be disabled by providing Analytics.Disabled
      */
-    val DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // TCHAP No analytics
+    val DEBUG_ANALYTICS_CONFIG = Analytics.Enabled(
+            postHogHost = "https://us.i.posthog.com", // TCHAP dev posthog
+            postHogApiKey = "phc_eQOeaQiaIxdX9kaQmqYTD7RJLyFubYmGYKUI9czqqQD", // TCHAP dev posthog
+            policyLink = "https://tchap.beta.gouv.fr/politique-de-confidentialite", // TCHAP dev posthog
+            sentryDSN = "",
+            sentryEnvironment = "DEBUG"
+    )
 
     /**
      * The analytics configuration to use for the Release build type.

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/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -56,6 +56,8 @@ import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.plan.ViewRoom
+import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewActions
+import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.room.list.actions.RoomListSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListSharedActionViewModel
@@ -134,6 +136,8 @@ class HomeActivity :
 
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by viewModel()
 
+    private val analyticsConsentViewModel: AnalyticsConsentViewModel by viewModel()
+
     @Inject lateinit var vectorUncaughtExceptionHandler: VectorUncaughtExceptionHandler
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
     @Inject lateinit var popupAlertManager: PopupAlertManager
@@ -280,6 +284,7 @@ class HomeActivity :
                 }
                 is HomeActivityViewEvents.OnCrossSignedInvalidated -> handleCrossSigningInvalidated(it)
                 HomeActivityViewEvents.ShowAnalyticsOptIn -> handleShowAnalyticsOptIn()
+                HomeActivityViewEvents.SetAnalyticsOptIn -> handleSetAnalyticsOptIn()
                 HomeActivityViewEvents.ShowNotificationDialog -> handleShowNotificationDialog()
                 HomeActivityViewEvents.ShowReleaseNotes -> handleShowReleaseNotes()
                 HomeActivityViewEvents.NotifyUserForThreadsMigration -> handleNotifyUserForThreadsMigration()
@@ -340,6 +345,11 @@ class HomeActivity :
         navigator.openAnalyticsOptIn(this)
     }
 
+    // TCHAP user already consented about analytics in the private policy
+    private fun handleSetAnalyticsOptIn() {
+        analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(true))
+    }
+
     /**
      * Migrating from old threads io.element.thread to new m.thread needs an initial sync to
      * sync and display existing messages appropriately.

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
@@ -33,6 +33,7 @@ sealed interface HomeActivityViewEvents : VectorViewEvents {
     data class OnCrossSignedInvalidated(val userItem: MatrixItem.UserItem) : HomeActivityViewEvents
     object PromptToEnableSessionPush : HomeActivityViewEvents
     object ShowAnalyticsOptIn : HomeActivityViewEvents
+    object SetAnalyticsOptIn : HomeActivityViewEvents
     object ShowNotificationDialog : HomeActivityViewEvents
     object ShowReleaseNotes : HomeActivityViewEvents
     object NotifyUserForThreadsMigration : HomeActivityViewEvents

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
@@ -203,7 +203,9 @@ class HomeActivityViewModel @AssistedInject constructor(
                     .onEach { didAskUser ->
                         Timber.v("DidAskUserConsent: $didAskUser")
                         if (!didAskUser) {
-                            _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
+                            // TCHAP user already consented about analytics in the private policy
+//                            _viewEvents.post(HomeActivityViewEvents.ShowAnalyticsOptIn)
+                            _viewEvents.post(HomeActivityViewEvents.SetAnalyticsOptIn)
                         } else {
                             _viewEvents.post(HomeActivityViewEvents.ShowNotificationDialog)
                         }

diff --git a/...or/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/...or/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -354,13 +354,15 @@ class VectorSettingsSecurityPrivacyFragment :
 
         analyticsConsent.setOnPreferenceChangeListener { _, newValue ->
             val newValueBool = newValue as? Boolean ?: false
-            if (newValueBool) {
-                // User wants to enable analytics, display the opt in screen
-                navigator.openAnalyticsOptIn(requireContext())
-            } else {
-                // Just disable analytics
-                analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(false))
-            }
+            // TCHAP user already consented about analytics in the private policy
+            analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(newValueBool))
+//            if (newValueBool) {
+//                // User wants to enable analytics, display the opt in screen
+//                navigator.openAnalyticsOptIn(requireContext())
+//            } else {
+//                // Just disable analytics
+//                analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(false))
+//            }
             true
         }
     }

diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -174,6 +174,8 @@ class WebRtcCall(
             }
         }
     }
+    var durationMillis = 0
+        private set
 
     private var inviteTimeout: Deferred<Unit>? = null
 
@@ -274,10 +276,6 @@ class WebRtcCall(
         }
     }
 
-    fun durationMillis(): Int {
-        return timer.elapsedTime().toInt()
-    }
-
     fun formattedDuration(): String {
         return formatDuration(
                 Duration.ofMillis(timer.elapsedTime())
@@ -914,6 +912,7 @@ class WebRtcCall(
         inviteTimeout?.cancel()
         inviteTimeout = null
         mxCall.state = CallState.Ended(reason ?: EndCallReason.USER_HANGUP)
+        durationMillis = timer.elapsedTime().toInt()
         release()
         onCallEnded(callId, reason ?: EndCallReason.USER_HANGUP, rejected)
     }

diff --git a/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -477,7 +477,7 @@ class WebRtcCallManager @Inject constructor(
     private fun WebRtcCall.trackCallEnded() {
         analyticsTracker.capture(
                 CallEnded(
-                        durationMs = durationMillis(),
+                        durationMs = durationMillis,
                         isVideo = mxCall.isVideoCall,
                         numParticipants = 2,
                         placed = mxCall.isOutgoing