From 827dd357915428bf23f53cef2ca03751d213d42f Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 13 Sep 2023 14:18:28 +0100
Subject: [PATCH] Enabled NotificationSettings by default, Fix spacing, use
 activeMemberCount for isOneToOne.

- Enabled Notification Settings by default
- Fix spacing
- Use activeMemberCount for isOneToOne
---
 .../android/features/preferences/impl/PreferencesFlowNode.kt   | 1 -
 .../preferences/impl/notifications/NotificationSettingsView.kt | 3 +--
 .../element/android/libraries/featureflag/api/FeatureFlags.kt  | 3 +--
 .../libraries/featureflag/impl/StaticFeatureFlagProvider.kt    | 2 +-
 .../io/element/android/libraries/matrix/api/room/MatrixRoom.kt | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index 1f3c24108b..85ae3ac55f 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -70,7 +70,6 @@ class PreferencesFlowNode @AssistedInject constructor(
         data object AnalyticsSettings : NavTarget
 
         @Parcelize
-
         data object About : NavTarget
 
         @Parcelize
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
index 144821906c..9bb0f1cd66 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
@@ -54,6 +54,7 @@ import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
+
 @Composable
 fun NotificationSettingsView(
     state: NotificationSettingsState,
@@ -166,7 +167,6 @@ private fun NotificationSettingsContentView(
         }
 }
 
-
 @Composable
 private fun getTitleForRoomNotificationMode(mode: RoomNotificationMode?) =
 when(mode) {
@@ -246,7 +246,6 @@ private fun ContentToPreview(state: NotificationSettingsState) {
     )
 }
 
-
 @Preview
 @Composable
 internal fun InvalidNotificationSettingsViewightPreview() =
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 0f27a94a2d..ca68b0cbd1 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -41,8 +41,7 @@ enum class FeatureFlags(
     NotificationSettings(
         key = "feature.notificationsettings",
         title = "Show notification settings",
-        // Do not forget to edit StaticFeatureFlagProvider when enabling the feature.
-        defaultValue = false,
+        defaultValue = true,
     ),
     RichTextEditor(
         key = "feature.richtexteditor",
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
index c9b24f08e6..d7759ac474 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
@@ -34,7 +34,7 @@ class StaticFeatureFlagProvider @Inject constructor() :
             when(feature) {
                 FeatureFlags.LocationSharing -> true
                 FeatureFlags.Polls -> true
-                FeatureFlags.NotificationSettings -> false
+                FeatureFlags.NotificationSettings -> true
                 FeatureFlags.RichTextEditor -> true
             }
         } else {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
index d122aca495..1dd6101354 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -53,7 +53,7 @@ interface MatrixRoom : Closeable {
      * A one-to-one is a room with exactly 2 members.
      * See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/#default-underride-rules).
      */
-    val isOneToOne: Boolean get() = joinedMemberCount == 2L
+    val isOneToOne: Boolean get() = activeMemberCount == 2L
 
     /**
      * The current loaded members as a StateFlow.