Enable VoIP on dev mode

tchapgouv · Dec 12, 2023 · 891f90a · 891f90a
1 parent ae37438
commit 891f90a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -855,8 +855,8 @@ class TimelineViewModel @AssistedInject constructor(
                     R.id.invite -> state.canInvite
                     R.id.open_matrix_apps -> false // Tchap: there are no matrix apps
                     // Tchap: check if voip is enabled
-                    R.id.video_call -> vectorPreferences.developerMode()
-                    R.id.voice_call -> session.sessionParams.homeServerUrl.contains("agent.dinum.tchap.gouv.fr") &&
+                    R.id.video_call -> vectorPreferences.developerMode() && vectorFeatures.tchapIsVoipSupported()
+                    R.id.voice_call -> (session.sessionParams.homeServerUrl.contains("agent.dinum.tchap.gouv.fr") || vectorPreferences.developerMode()) &&
                             vectorFeatures.tchapIsVoipSupported() && (state.isCallOptionAvailable() || state.hasActiveElementCallWidget())
                     // Show Join conference button only if there is an active conf id not joined. Otherwise fallback to default video disabled. ^
                     R.id.join_conference -> vectorFeatures.tchapIsVoipSupported() && !state.isCallOptionAvailable() &&

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -993,8 +993,8 @@ class VectorPreferences @Inject constructor(
      * The user does not allow screenshots of the application.
      */
     fun useFlagSecure(): Boolean {
-        // Tchap: Screenshot is allowed for Gplay Pre-prod and Dev versions only.
-        return BuildConfig.FLAVOR_store != "gplay" || BuildConfig.FLAVOR_target == "tchap"
+        // Tchap: Screenshot is allowed when developer mode is enabled or for Gplay Pre-prod and Dev versions only.
+        return (!developerMode() && (BuildConfig.FLAVOR_store != "gplay" || BuildConfig.FLAVOR_target == "tchap"))
     }
 
     /** Whether the keyboard should disable personalized learning. */