Update target API to 33

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt

@@ -31,8 +31,11 @@ import org.thoughtcrime.securesms.components.settings.PreferenceViewHolder
 import org.thoughtcrime.securesms.components.settings.RadioListPreference
 import org.thoughtcrime.securesms.components.settings.RadioListPreferenceViewHolder
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.components.settings.models.Banner
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.TurnOnNotificationsBottomSheet
+import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.RingtoneUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
@@ -62,6 +65,11 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
 
   private lateinit var viewModel: NotificationsSettingsViewModel
 
+  override fun onResume() {
+    super.onResume()
+    viewModel.refresh()
+  }
+
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     if (requestCode == MESSAGE_SOUND_SELECT && resultCode == Activity.RESULT_OK && data != null) {
       val uri: Uri? = data.getParcelableExtraCompat(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, Uri::class.java)
@@ -78,6 +86,8 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
       LayoutFactory(::LedColorPreferenceViewHolder, R.layout.dsl_preference_item)
     )
 
+    Banner.register(adapter)
+
     val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
     val factory = NotificationsSettingsViewModel.Factory(sharedPreferences)
 
@@ -90,10 +100,23 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
 
   private fun getConfiguration(state: NotificationsSettingsState): DSLConfiguration {
     return configure {
+      if (!state.messageNotificationsState.canEnableNotifications) {
+        customPref(
+          Banner.Model(
+            textId = R.string.NotificationSettingsFragment__to_enable_notifications,
+            actionId = R.string.NotificationSettingsFragment__turn_on,
+            onClick = {
+              TurnOnNotificationsBottomSheet().show(childFragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+            }
+          )
+        )
+      }
+
       sectionHeaderPref(R.string.NotificationsSettingsFragment__messages)
 
       switchPref(
         title = DSLSettingsText.from(R.string.preferences__notifications),
+        isEnabled = state.messageNotificationsState.canEnableNotifications,
         isChecked = state.messageNotificationsState.notificationsEnabled,
         onClick = {
           viewModel.setMessageNotificationsEnabled(!state.messageNotificationsState.notificationsEnabled)
@@ -223,6 +246,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
 
       switchPref(
         title = DSLSettingsText.from(R.string.preferences__notifications),
+        isEnabled = state.callNotificationsState.canEnableNotifications,
         isChecked = state.callNotificationsState.notificationsEnabled,
         onClick = {
           viewModel.setCallNotificationsEnabled(!state.callNotificationsState.notificationsEnabled)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt

@@ -10,6 +10,7 @@ data class NotificationsSettingsState(
 
 data class MessageNotificationsState(
   val notificationsEnabled: Boolean,
+  val canEnableNotifications: Boolean,
   val sound: Uri,
   val vibrateEnabled: Boolean,
   val ledColor: String,
@@ -23,6 +24,7 @@ data class MessageNotificationsState(
 
 data class CallNotificationsState(
   val notificationsEnabled: Boolean,
+  val canEnableNotifications: Boolean,
   val ringtone: Uri,
   val vibrateEnabled: Boolean
 )

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.notifications
 
 import android.content.SharedPreferences
 import android.net.Uri
+import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -26,78 +27,83 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
 
   val state: LiveData<NotificationsSettingsState> = store.stateLiveData
 
+  fun refresh() {
+    store.update { getState() }
+  }
+
   fun setMessageNotificationsEnabled(enabled: Boolean) {
     SignalStore.settings().isMessageNotificationsEnabled = enabled
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationsSound(sound: Uri?) {
     val messageSound = sound ?: Uri.EMPTY
     SignalStore.settings().messageNotificationSound = messageSound
     NotificationChannels.getInstance().updateMessageRingtone(messageSound)
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationVibration(enabled: Boolean) {
     SignalStore.settings().isMessageVibrateEnabled = enabled
     NotificationChannels.getInstance().updateMessageVibrate(enabled)
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationLedColor(color: String) {
     SignalStore.settings().messageLedColor = color
     NotificationChannels.getInstance().updateMessagesLedColor(color)
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationLedBlink(blink: String) {
     SignalStore.settings().messageLedBlinkPattern = blink
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationInChatSoundsEnabled(enabled: Boolean) {
     SignalStore.settings().isMessageNotificationsInChatSoundsEnabled = enabled
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageRepeatAlerts(repeats: Int) {
     SignalStore.settings().messageNotificationsRepeatAlerts = repeats
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationPrivacy(preference: String) {
     SignalStore.settings().messageNotificationsPrivacy = NotificationPrivacyPreference(preference)
-    store.update { getState() }
+    refresh()
   }
 
   fun setMessageNotificationPriority(priority: Int) {
     sharedPreferences.edit().putString(TextSecurePreferences.NOTIFICATION_PRIORITY_PREF, priority.toString()).apply()
-    store.update { getState() }
+    refresh()
   }
 
   fun setCallNotificationsEnabled(enabled: Boolean) {
     SignalStore.settings().isCallNotificationsEnabled = enabled
-    store.update { getState() }
+    refresh()
   }
 
   fun setCallRingtone(ringtone: Uri?) {
     SignalStore.settings().callRingtone = ringtone ?: Uri.EMPTY
-    store.update { getState() }
+    refresh()
   }
 
   fun setCallVibrateEnabled(enabled: Boolean) {
     SignalStore.settings().isCallVibrateEnabled = enabled
-    store.update { getState() }
+    refresh()
   }
 
   fun setNotifyWhenContactJoinsSignal(enabled: Boolean) {
     SignalStore.settings().isNotifyWhenContactJoinsSignal = enabled
-    store.update { getState() }
+    refresh()
   }
 
   private fun getState(): NotificationsSettingsState = NotificationsSettingsState(
     messageNotificationsState = MessageNotificationsState(
-      notificationsEnabled = SignalStore.settings().isMessageNotificationsEnabled,
+      notificationsEnabled = SignalStore.settings().isMessageNotificationsEnabled && canEnableNotifications(),
+      canEnableNotifications = canEnableNotifications(),
       sound = SignalStore.settings().messageNotificationSound,
       vibrateEnabled = SignalStore.settings().isMessageVibrateEnabled,
       ledColor = SignalStore.settings().messageLedColor,
@@ -109,13 +115,24 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
       troubleshootNotifications = SlowNotificationHeuristics.isPotentiallyCausedByBatteryOptimizations() && SlowNotificationHeuristics.isHavingDelayedNotifications()
     ),
     callNotificationsState = CallNotificationsState(
-      notificationsEnabled = SignalStore.settings().isCallNotificationsEnabled,
+      notificationsEnabled = SignalStore.settings().isCallNotificationsEnabled && canEnableNotifications(),
+      canEnableNotifications = canEnableNotifications(),
       ringtone = SignalStore.settings().callRingtone,
       vibrateEnabled = SignalStore.settings().isCallVibrateEnabled
     ),
     notifyWhenContactJoinsSignal = SignalStore.settings().isNotifyWhenContactJoinsSignal
   )
 
+  private fun canEnableNotifications(): Boolean {
+    val areNotificationsDisabledBySystem = Build.VERSION.SDK_INT >= 26 && (
+      !NotificationChannels.getInstance().isMessageChannelEnabled ||
+        !NotificationChannels.getInstance().isMessagesChannelGroupEnabled ||
+        !NotificationChannels.getInstance().areNotificationsEnabled()
+      )
+
+    return !areNotificationsDisabledBySystem
+  }
+
   class Factory(private val sharedPreferences: SharedPreferences) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(NotificationsSettingsViewModel(sharedPreferences)))

app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Banner.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.models
+
+import androidx.annotation.StringRes
+import org.thoughtcrime.securesms.databinding.DslBannerBinding
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+
+/**
+ * Displays a banner to notify the user of certain state or action that needs to be taken.
+ */
+object Banner {
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, DslBannerBinding::inflate))
+  }
+
+  class Model(
+    @StringRes val textId: Int,
+    @StringRes val actionId: Int,
+    val onClick: () -> Unit
+  ) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean {
+      return true
+    }
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return textId == newItem.textId && actionId == newItem.actionId
+    }
+  }
+
+  private class ViewHolder(binding: DslBannerBinding) : BindingViewHolder<Model, DslBannerBinding>(binding) {
+    override fun bind(model: Model) {
+      binding.bannerText.setText(model.textId)
+      binding.bannerAction.setText(model.actionId)
+      binding.bannerAction.setOnClickListener { model.onClick() }
+    }
+  }
+}