From facc19f60ecf0d06355dd56ad6e5d0befb640d2b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 26 Mar 2026 15:37:50 +0100
Subject: [PATCH] Minor code improvements, bumped gradle & firebase
 dependencies

---
 .../linphone/compatibility/Compatibility.kt   |  6 ++--
 .../java/org/linphone/ui/call/CallActivity.kt |  1 -
 .../ui/call/fragment/ConversationFragment.kt  |  2 +-
 .../chat/model/MessageDeleteDialogModel.kt    | 35 -------------------
 .../layout-land/call_outgoing_fragment.xml    |  1 +
 ..._conference_participants_list_fragment.xml |  1 +
 .../res/layout/call_outgoing_fragment.xml     |  1 +
 .../call_video_local_preview_surface.xml      |  1 +
 .../main/res/layout/calls_list_fragment.xml   |  1 +
 app/src/main/res/values-cs/strings.xml        |  7 ----
 app/src/main/res/values-de/strings.xml        |  7 ----
 app/src/main/res/values-es/strings.xml        |  1 -
 app/src/main/res/values-fr/strings.xml        |  7 ----
 app/src/main/res/values-nl/strings.xml        |  1 -
 app/src/main/res/values-pt-rBR/strings.xml    |  1 -
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-sk/strings.xml        |  1 -
 app/src/main/res/values-uk/strings.xml        |  1 -
 app/src/main/res/values-zh-rCN/strings.xml    |  1 -
 app/src/main/res/values/strings.xml           |  7 ----
 gradle/libs.versions.toml                     |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 22 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 app/src/main/java/org/linphone/ui/main/chat/model/MessageDeleteDialogModel.kt

diff --git a/app/src/main/java/org/linphone/compatibility/Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Compatibility.kt
index 3ed91c9a4..99dd1d02b 100644
--- a/app/src/main/java/org/linphone/compatibility/Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Compatibility.kt
@@ -53,15 +53,15 @@ class Compatibility {
             notification: Notification,
             foregroundServiceType: Int
         ): Boolean {
-            if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
-                return Api34Compatibility.startServiceForeground(
+            return if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
+                Api34Compatibility.startServiceForeground(
                     service,
                     id,
                     notification,
                     foregroundServiceType
                 )
             } else {
-                return Api28Compatibility.startServiceForeground(service, id, notification)
+                Api28Compatibility.startServiceForeground(service, id, notification)
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
index befed1851..bcbe1ba31 100644
--- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt
+++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
@@ -43,7 +43,6 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
-import androidx.navigation.fragment.findNavController
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ConversationFragment.kt
index c5c5660cd..4171344d1 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/ConversationFragment.kt
@@ -120,7 +120,7 @@ class ConversationFragment : ConversationFragment() {
 
         val layout = layoutInflater.inflate(R.layout.call_video_local_preview_surface, binding.constraintLayout, false)
         binding.constraintLayout.addView(layout)
-        localPreviewVideoSurface = layout.findViewById<RoundCornersTextureView>(R.id.local_preview_video_surface)
+        localPreviewVideoSurface = layout.findViewById(R.id.local_preview_video_surface)
 
         callViewModel.isSendingVideo.observe(viewLifecycleOwner) { sending ->
             coreContext.postOnCoreThread { core ->
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeleteDialogModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeleteDialogModel.kt
deleted file mode 100644
index c4bf5b451..000000000
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeleteDialogModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.linphone.ui.main.chat.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.Event
-
-class MessageDeleteDialogModel(val canBeRetracted: Boolean) {
-    val dismissEvent = MutableLiveData<Event<Boolean>>()
-
-    val cancelEvent = MutableLiveData<Event<Boolean>>()
-
-    val deleteLocallyEvent = MutableLiveData<Event<Boolean>>()
-
-    val deleteForEveryoneEvent = MutableLiveData<Event<Boolean>>()
-
-    @UiThread
-    fun dismiss() {
-        dismissEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun cancel() {
-        cancelEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun deleteLocally() {
-        deleteLocallyEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun deleteForEveryone() {
-        deleteForEveryoneEvent.value = Event(true)
-    }
-}
diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml
index 2cf0ca382..8db5468a4 100644
--- a/app/src/main/res/layout-land/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml
@@ -117,6 +117,7 @@
                 app:layout_constraintTop_toTopOf="@id/name_address"
                 app:layout_constraintBottom_toBottomOf="@id/name_address" />
 
+            <!--suppress AndroidUnknownAttribute -->
             <org.linphone.ui.call.view.RoundCornersTextureView
                 android:id="@+id/local_preview_video_surface"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
index b790c8a3b..ddd42515d 100644
--- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
@@ -95,6 +95,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <!--suppress AndroidUnknownAttribute -->
         <org.linphone.ui.call.view.RoundCornersTextureView
             android:id="@+id/local_preview_video_surface"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
index 2cf44c975..35860acc8 100644
--- a/app/src/main/res/layout/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -112,6 +112,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <!--suppress AndroidUnknownAttribute -->
             <org.linphone.ui.call.view.RoundCornersTextureView
                 android:id="@+id/local_preview_video_surface"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/call_video_local_preview_surface.xml b/app/src/main/res/layout/call_video_local_preview_surface.xml
index 99061f5c8..fc12fbaf8 100644
--- a/app/src/main/res/layout/call_video_local_preview_surface.xml
+++ b/app/src/main/res/layout/call_video_local_preview_surface.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!--suppress AndroidUnknownAttribute -->
     <org.linphone.ui.call.view.RoundCornersTextureView
         android:id="@+id/local_preview_video_surface"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
index 3cb191a64..74d5662db 100644
--- a/app/src/main/res/layout/calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -93,6 +93,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <!--suppress AndroidUnknownAttribute -->
         <org.linphone.ui.call.view.RoundCornersTextureView
             android:id="@+id/local_preview_video_surface"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bf604ebf3..81be18514 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -278,7 +278,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">selhalo</string>
     <string name="settings_calls_adaptive_rate_control_title">Adaptivní datový tok</string>
-    <string name="settings_calls_enable_video_title">Povolit video</string>
     <string name="settings_calls_enable_fec_title">Povolit FEC pro video</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrovat při příchozím hovoru</string>
     <string name="settings_calls_auto_record_title">Automaticky spouštět nahrávání hovorů</string>
@@ -722,12 +721,6 @@
     <string name="menu_export_selected_item">Stáhnout</string>
     <string name="menu_share_selected_item">Sdílet</string>
     <string name="orange">Oranžová</string>
-    <string name="yellow">Žlutá</string>
-    <string name="green">Zelená</string>
-    <string name="blue">Modrá</string>
-    <string name="red">Červená</string>
-    <string name="pink">Růžová</string>
-    <string name="purple">Fialová</string>
     <string name="multiple_participants_selection_placeholder">Zde se zobrazí vybraní účastnící</string>
     <string name="connection_error_for_non_default_account">Chyba při připojení účtu(ů)</string>
     <string name="default_account_disabled">Zvolený účet je momentálně zákázán</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8bc8fc4c2..5c458ce1a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -170,7 +170,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">fehlgeschlagen</string>
     <string name="settings_calls_adaptive_rate_control_title">Adaptive Geschwindigkeitsregelung</string>
-    <string name="settings_calls_enable_video_title">Video aktivieren</string>
     <string name="settings_calls_enable_fec_title">Video FEC aktivieren</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrieren während ein eingehender Anruf klingelt</string>
     <string name="settings_calls_auto_record_title">Automatische Anrufaufzeichnung starten</string>
@@ -661,12 +660,6 @@
     <string name="menu_export_selected_item">Herunterladen</string>
     <string name="menu_share_selected_item">Teilen</string>
     <string name="orange">Orange</string>
-    <string name="yellow">Gelb</string>
-    <string name="green">Grün</string>
-    <string name="blue">Blau</string>
-    <string name="red">Rot</string>
-    <string name="pink">Rosa</string>
-    <string name="purple">Lila</string>
     <string name="list_filter_no_result_found">Kein Ergebnis gefunden…</string>
     <string name="multiple_participants_selection_placeholder">Ausgewählte Teilnehmer erscheinen hier</string>
     <string name="connection_error_for_non_default_account">Verbindungsfehler bei den Konten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 66e17cf96..1269e1e7a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -187,7 +187,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">fallido</string>
     <string name="settings_calls_adaptive_rate_control_title">Control de velocidad adaptativo</string>
-    <string name="settings_calls_enable_video_title">Habilitar video</string>
     <string name="settings_calls_enable_fec_title">Habilitar FEC de vídeo</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrar mientras suena la llamada entrante</string>
     <string name="settings_calls_auto_record_title">Iniciar automáticamente la grabación de llamadas</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 52cc1056a..0a495859c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -220,7 +220,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">échec</string>
     <string name="settings_calls_adaptive_rate_control_title">Contrôle automatique de la qualité</string>
-    <string name="settings_calls_enable_video_title">Autoriser la vidéo</string>
     <string name="settings_calls_enable_fec_title">Activer la FEC vidéo</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibration lors de l\'appel</string>
     <string name="settings_calls_auto_record_title">Enregistrement automatique des appels</string>
@@ -852,12 +851,6 @@
 
     <!-- Colors -->
     <string name="orange">Orange</string>
-    <string name="yellow">Jaune</string>
-    <string name="green">Vert</string>
-    <string name="blue">Bleu</string>
-    <string name="red">Rouge</string>
-    <string name="pink">Rose</string>
-    <string name="purple">Violet</string>
     <string name="terracotta">Terracotta</string>
     <string name="lavender">Lavande</string>
     <string name="honey">Miel</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2967ea235..7cdcebc52 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -140,7 +140,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done_no_echo">Geen echo</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">Mislukt</string>
     <string name="settings_calls_adaptive_rate_control_title">Adaptieve bitrate-regeling</string>
-    <string name="settings_calls_enable_video_title">Video inschakelen</string>
     <string name="settings_calls_enable_fec_title">Video-FEC inschakelen</string>
     <string name="settings_calls_vibrate_while_ringing_title">Trillen tijdens inkomend gesprek</string>
     <string name="settings_calls_auto_record_title">Oproepen automatisch opnemen</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 95dcb2146..3b66ea56c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -222,7 +222,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done_no_echo">sem eco</string>
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">falhou</string>
-    <string name="settings_calls_enable_video_title">Ativar vídeo</string>
     <string name="settings_calls_enable_fec_title">Ativar FEC de vídeo</string>
     <string name="settings_calls_auto_record_title">Iniciar gravação de chamadas automaticamente</string>
     <string name="settings_calls_change_ringtone_title">Alterar toque</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9a210b0c0..545e24af0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -292,7 +292,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s мс</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">калибровка не удалась</string>
     <string name="settings_calls_adaptive_rate_control_title">Адаптивный контроль скорости</string>
-    <string name="settings_calls_enable_video_title">Включить видео</string>
     <string name="settings_calls_enable_fec_title">Включить видео FEC</string>
     <string name="settings_calls_auto_record_title">Автоматически начинать запись звонков</string>
     <string name="settings_calls_change_ringtone_title">Изменить рингтон</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f2c0a0f1a..d962a6827 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -176,7 +176,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done_no_echo">bez ozveny</string>
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">zlyhalo</string>
-    <string name="settings_calls_enable_video_title">Povoliť video</string>
     <string name="settings_calls_enable_fec_title">Povoliť FEC pre video</string>
     <string name="settings_calls_auto_record_title">Automaticky spustiť nahrávanie hovorov</string>
     <string name="settings_calls_change_ringtone_title">Zmeniť vyzváňací tón</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d06575b00..cecedbd2c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -277,7 +277,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s мс</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">Калібрування не вдалося</string>
     <string name="settings_calls_adaptive_rate_control_title">Адаптивне керування швидкістю</string>
-    <string name="settings_calls_enable_video_title">Увімкнути відео</string>
     <string name="settings_calls_enable_fec_title">Увімкнути FEC відео</string>
     <string name="settings_calls_vibrate_while_ringing_title">Вібрація під час вхідного дзвінка</string>
     <string name="settings_calls_auto_record_title">Автоматично починати запис дзвінків</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d8b34f69f..8d73c19de 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -199,7 +199,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s 毫秒</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">失败</string>
     <string name="settings_calls_adaptive_rate_control_title">自适应速率控制</string>
-    <string name="settings_calls_enable_video_title">启用视频</string>
     <string name="settings_calls_enable_fec_title">启用视频前向纠错FEC</string>
     <string name="settings_calls_vibrate_while_ringing_title">来电铃响时振动</string>
     <string name="settings_calls_auto_record_title">自动开始录制通话</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df201b613..bd5cedc2c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,7 +262,6 @@
     <string name="settings_calls_calibrate_echo_canceller_done">%s ms</string>
     <string name="settings_calls_calibrate_echo_canceller_failed">failed</string>
     <string name="settings_calls_adaptive_rate_control_title">Adaptive rate control</string>
-    <string name="settings_calls_enable_video_title">Enable video</string>
     <string name="settings_calls_enable_fec_title">Enable video FEC</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrate while incoming call is ringing</string>
     <string name="settings_calls_auto_record_title">Automatically start recording calls</string>
@@ -895,12 +894,6 @@
 
     <!-- Colors -->
     <string name="orange">Orange</string>
-    <string name="yellow">Yellow</string>
-    <string name="green">Green</string>
-    <string name="blue">Blue</string>
-    <string name="red">Red</string>
-    <string name="pink">Pink</string>
-    <string name="purple">Purple</string>
     <string name="terracotta">Terracotta</string>
     <string name="lavender">Lavender</string>
     <string name="honey">Honey</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a68dd6dcf..6d6765c90 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ agp = "9.1.0"
 kotlin = "2.3.20"
 gmsGoogleServices = "4.4.4"
 firebaseCrashlytics = "3.0.6"
-firebaseBomVersion = "34.10.0"
+firebaseBomVersion = "34.11.0"
 #noinspection NewerVersionAvailable
 ktlint = "12.3.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98556d5d9..80618190c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 22 12:11:25 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists