From 2f9eb2f0ab5211ca91e09e83a6709bc8e10dbc76 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 21 Mar 2025 11:13:01 +0100
Subject: [PATCH] Improved message when WiFi only mode is enabled & active
 network isn't Wifi nor Ethernet

---
 .../org/linphone/ui/main/viewmodel/MainViewModel.kt   | 11 ++++++++++-
 app/src/main/res/values-fr/strings.xml                |  1 +
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
index b107cd8fb..83c0077cc 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
@@ -43,6 +43,7 @@ import org.linphone.core.GlobalState
 import org.linphone.core.MessageWaitingIndication
 import org.linphone.core.RegistrationState
 import org.linphone.core.VFS
+import org.linphone.core.tools.AndroidPlatformHelper
 import org.linphone.core.tools.Log
 import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
@@ -582,7 +583,15 @@ class MainViewModel
         val reachable = coreContext.core.isNetworkReachable
         Log.i("$TAG Network is ${if (reachable) "reachable" else "not reachable"}")
         if (!reachable && coreContext.core.globalState == GlobalState.On) {
-            val label = AppUtils.getString(R.string.network_not_reachable)
+            val label = if (coreContext.core.isWifiOnlyEnabled) {
+                if (AndroidPlatformHelper.isReady() && AndroidPlatformHelper.instance().isActiveNetworkWifiOnlyCompliant) {
+                    AppUtils.getString(R.string.network_not_reachable)
+                } else {
+                    AppUtils.getString(R.string.network_is_not_wifi)
+                }
+            } else {
+                AppUtils.getString(R.string.network_not_reachable)
+            }
             addAlert(NETWORK_NOT_REACHABLE, label)
         } else {
             removeAlert(NETWORK_NOT_REACHABLE)
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6c2da2524..199f90295 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -783,6 +783,7 @@
         <item quantity="other">%s notifications en attente</item>
     </plurals>
     <string name="network_not_reachable">Vous n\'êtes pas connecté à internet</string>
+    <string name="network_is_not_wifi">Mode Wi-Fi uniquement activé</string>
     <string name="operation_in_progress_overlay">Opération en cours, merci de patienter…</string>
     <string name="generic_address_picker_conversations_list_title">Conversations</string>
     <string name="generic_address_picker_contacts_list_title">Contacts</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2cb537fa0..e18b0e560 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -824,6 +824,7 @@
         <item quantity="other">%s notifications for other account(s)</item>
     </plurals>
     <string name="network_not_reachable">You aren\'t connected to internet</string>
+    <string name="network_is_not_wifi">Wi-Fi only mode enabled</string>
     <string name="operation_in_progress_overlay">Operation in progress, please wait</string>
     <string name="generic_address_picker_conversations_list_title">Conversations</string>
     <string name="generic_address_picker_contacts_list_title">Contacts</string>