From 7791050039773b95a90eada12b3222a9a0336f79 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 27 Aug 2021 12:11:57 +0200
Subject: [PATCH] Removed push notification setting in Network, use only the
 one in Account

---
 .../settings/viewmodels/NetworkSettingsViewModel.kt    | 10 ----------
 app/src/main/res/layout/settings_network_fragment.xml  |  7 -------
 2 files changed, 17 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
index 9650ac156..1a07e8736 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/NetworkSettingsViewModel.kt
@@ -38,14 +38,6 @@ class NetworkSettingsViewModel : GenericSettingsViewModel() {
     }
     val allowIpv6 = MutableLiveData<Boolean>()
 
-    val pushNotificationsListener = object : SettingListenerStub() {
-        override fun onBoolValueChanged(newValue: Boolean) {
-            core.isPushNotificationEnabled = newValue
-        }
-    }
-    val pushNotifications = MutableLiveData<Boolean>()
-    val pushNotificationsAvailable = MutableLiveData<Boolean>()
-
     val randomPortsListener = object : SettingListenerStub() {
         override fun onBoolValueChanged(newValue: Boolean) {
             val port = if (newValue) -1 else 5060
@@ -69,8 +61,6 @@ class NetworkSettingsViewModel : GenericSettingsViewModel() {
     init {
         wifiOnly.value = core.wifiOnlyEnabled()
         allowIpv6.value = core.ipv6Enabled()
-        pushNotifications.value = core.isPushNotificationEnabled
-        pushNotificationsAvailable.value = core.isPushNotificationAvailable
         randomPorts.value = getTransportPort() == -1
         sipPort.value = getTransportPort()
     }
diff --git a/app/src/main/res/layout/settings_network_fragment.xml b/app/src/main/res/layout/settings_network_fragment.xml
index 067f4ceb3..6a8e7d2c7 100644
--- a/app/src/main/res/layout/settings_network_fragment.xml
+++ b/app/src/main/res/layout/settings_network_fragment.xml
@@ -81,13 +81,6 @@
                     linphone:listener="@{viewModel.allowIpv6Listener}"
                     linphone:checked="@={viewModel.allowIpv6}"/>
 
-                <include
-                    layout="@layout/settings_widget_switch"
-                    linphone:title="@{@string/network_settings_push_notifications_title}"
-                    linphone:listener="@{viewModel.pushNotificationsListener}"
-                    linphone:checked="@={viewModel.pushNotifications}"
-                    linphone:enabled="@{viewModel.pushNotificationsAvailable}"/>
-
                 <include
                     layout="@layout/settings_widget_switch"
                     linphone:title="@{@string/network_settings_random_ports_title}"