Add a "connectivity warning" bottom sheet.

app/src/main/java/org/thoughtcrime/securesms/components/ConnectivityWarningBottomSheet.kt

@@ -0,0 +1,101 @@
+package org.thoughtcrime.securesms.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+
+/**
+ * A bottom sheet that warns the user when they haven't been able to connect to the websocket for some time.
+ */
+class ConnectivityWarningBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 0.66f
+
+  companion object {
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      if (fragmentManager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) == null) {
+        ConnectivityWarningBottomSheet().show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+        SignalStore.misc.lastConnectivityWarningTime = System.currentTimeMillis()
+      }
+    }
+  }
+
+  @Composable
+  override fun SheetContent() {
+    Sheet(
+      onDismiss = { dismissAllowingStateLoss() }
+    )
+  }
+}
+
+@Composable
+private fun Sheet(onDismiss: () -> Unit = {}) {
+  return Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.fillMaxWidth().wrapContentSize(Alignment.Center)
+  ) {
+    BottomSheets.Handle()
+    Icon(
+      painterResource(id = R.drawable.ic_connectivity_warning),
+      contentDescription = null,
+      tint = Color.Unspecified,
+      modifier = Modifier.padding(top = 32.dp, bottom = 8.dp)
+    )
+    Text(
+      text = stringResource(id = R.string.ConnectivityWarningBottomSheet_title),
+      style = MaterialTheme.typography.headlineSmall,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)
+    )
+    Text(
+      text = stringResource(id = R.string.ConnectivityWarningBottomSheet_body),
+      style = MaterialTheme.typography.bodyLarge,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      modifier = Modifier.padding(horizontal = 24.dp)
+    )
+    Row(
+      modifier = Modifier.padding(top = 60.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)
+    ) {
+      Buttons.MediumTonal(
+        onClick = onDismiss,
+        modifier = Modifier.padding(end = 12.dp)
+      ) {
+        Text(stringResource(id = R.string.ConnectivityWarningBottomSheet_dismiss_button))
+      }
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun ConnectivityWarningSheetPreview() {
+  Previews.BottomSheetPreview {
+    Sheet()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/DebugLogsPromptDialogFragment.kt

@@ -15,7 +15,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
-import org.signal.core.util.ResourceUtil
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.databinding.PromptLogsBottomSheetBinding
@@ -50,6 +49,7 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
         when (purpose) {
           Purpose.NOTIFICATIONS -> SignalStore.uiHints.lastNotificationLogsPrompt = System.currentTimeMillis()
           Purpose.CRASH -> SignalStore.uiHints.lastCrashPrompt = System.currentTimeMillis()
+          Purpose.CONNECTIVITY_WARNING -> SignalStore.misc.lastConnectivityWarningTime = System.currentTimeMillis()
         }
       }
     }
@@ -85,6 +85,9 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
       Purpose.CRASH -> {
         binding.title.setText(R.string.PromptLogsSlowNotificationsDialog__title_crash)
       }
+      Purpose.CONNECTIVITY_WARNING -> {
+        binding.title.setText(R.string.PromptLogsSlowNotificationsDialog__title_connectivity_warning)
+      }
     }
 
     binding.submit.setOnClickListener {
@@ -137,8 +140,9 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
     }
 
     val category = when (purpose) {
-      Purpose.NOTIFICATIONS -> ResourceUtil.getEnglishResources(requireContext()).getString(R.string.DebugLogsPromptDialogFragment__slow_notifications_category)
-      Purpose.CRASH -> ResourceUtil.getEnglishResources(requireContext()).getString(R.string.DebugLogsPromptDialogFragment__crash_category)
+      Purpose.NOTIFICATIONS -> "Slow notifications"
+      Purpose.CRASH -> "Crash"
+      Purpose.CONNECTIVITY_WARNING -> "Connectivity"
     }
 
     return SupportEmailUtil.generateSupportEmailBody(
@@ -177,17 +181,12 @@ class DebugLogsPromptDialogFragment : FixedRoundedCornerBottomSheetDialogFragmen
   enum class Purpose(val serialized: Int) {
 
     NOTIFICATIONS(1),
-    CRASH(2);
+    CRASH(2),
+    CONNECTIVITY_WARNING(3);
 
     companion object {
       fun deserialize(serialized: Int): Purpose {
-        for (value in values()) {
-          if (value.serialized == serialized) {
-            return value
-          }
-        }
-
-        throw IllegalArgumentException("Invalid value: $serialized")
+        return entries.firstOrNull { it.serialized == serialized } ?: throw IllegalArgumentException("Invalid value: $serialized")
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt

@@ -63,7 +63,7 @@ class DeviceSpecificNotificationBottomSheet : ComposeBottomSheetDialogFragment()
 }
 
 @Composable
-fun DeviceSpecificSheet(onContinue: () -> Unit = {}, onDismiss: () -> Unit = {}) {
+private fun DeviceSpecificSheet(onContinue: () -> Unit = {}, onDismiss: () -> Unit = {}) {
   return Column(
     horizontalAlignment = Alignment.CenterHorizontally,
     modifier = Modifier.fillMaxWidth().wrapContentSize(Alignment.Center)
@@ -111,7 +111,7 @@ fun DeviceSpecificSheet(onContinue: () -> Unit = {}, onDismiss: () -> Unit = {})
 
 @SignalPreview
 @Composable
-fun DeviceSpecificSheetPreview() {
+private fun DeviceSpecificSheetPreview() {
   Previews.BottomSheetPreview {
     DeviceSpecificSheet()
   }

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

@@ -122,7 +122,7 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
       priority = TextSecurePreferences.getNotificationPriority(AppDependencies.application),
       troubleshootNotifications = if (calculateSlowNotifications) {
         (SlowNotificationHeuristics.isBatteryOptimizationsOn() && SlowNotificationHeuristics.isHavingDelayedNotifications()) ||
-          SlowNotificationHeuristics.showCondition() == DeviceSpecificNotificationConfig.ShowCondition.ALWAYS
+          SlowNotificationHeuristics.getDeviceSpecificShowCondition() == DeviceSpecificNotificationConfig.ShowCondition.ALWAYS
       } else if (currentState != null) {
         currentState.messageNotificationsState.troubleshootNotifications
       } else {