Disable UnifiedPush for linkedDevices

mollyim · Sep 20, 2023 · 015be2b · 015be2b
1 parent d47c769
commit 015be2b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/...ghtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/...ghtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
@@ -266,27 +266,29 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
         }
       )
 
-      dividerPref()
+      if (!state.isLinkedDevice) {
+        dividerPref()
 
-      sectionHeaderPref(R.string.NotificationsSettingsFragment__pushStrategy)
+        sectionHeaderPref(R.string.NotificationsSettingsFragment__pushStrategy)
 
-      radioListPref(
-        title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__deliveryMethod),
-        listItems = notificationMethodLabels,
-        selected = notificationMethodValues.indexOf(state.notificationDeliveryMethod),
-        onSelected = {
-          viewModel.setNotificationDeliveryMethod(notificationMethodValues[it])
-        }
-      )
+        radioListPref(
+          title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__deliveryMethod),
+          listItems = notificationMethodLabels,
+          selected = notificationMethodValues.indexOf(state.notificationDeliveryMethod),
+          onSelected = {
+            viewModel.setNotificationDeliveryMethod(notificationMethodValues[it])
+          }
+        )
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpush),
-        summary = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpushDescription),
-        isEnabled = state.notificationDeliveryMethod == NotificationDeliveryMethod.UNIFIEDPUSH,
-        onClick = {
-          findNavController().safeNavigate(R.id.action_notificationsSettingsFragment_to_unifiedPushFragment)
-        }
-      )
+        clickPref(
+          title = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpush),
+          summary = DSLSettingsText.from(R.string.NotificationsSettingsFragment__unifiedpushDescription),
+          isEnabled = state.notificationDeliveryMethod == NotificationDeliveryMethod.UNIFIEDPUSH,
+          onClick = {
+            findNavController().safeNavigate(R.id.action_notificationsSettingsFragment_to_unifiedPushFragment)
+          }
+        )
+      }
     }
   }
 

diff --git a/...houghtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt b/...houghtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import org.thoughtcrime.securesms.keyvalue.SettingsValues.NotificationDeliveryMethod
 
 data class NotificationsSettingsState(
+  val isLinkedDevice: Boolean,
   val messageNotificationsState: MessageNotificationsState,
   val callNotificationsState: CallNotificationsState,
   val notifyWhenContactJoinsSignal: Boolean,

diff --git a/...htcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt b/...htcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt
@@ -126,6 +126,7 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
   }
 
   private fun getState(): NotificationsSettingsState = NotificationsSettingsState(
+    isLinkedDevice = SignalStore.account().isLinkedDevice,
     messageNotificationsState = MessageNotificationsState(
       notificationsEnabled = SignalStore.settings().isMessageNotificationsEnabled,
       sound = SignalStore.settings().messageNotificationSound,