removing notifications v1, v2 is live

vector/build.gradle

@@ -141,7 +141,6 @@ android {
         resValue "string", "build_number", "\"${buildNumber}\""
 
         buildConfigField "im.vector.app.features.VectorFeatures.LoginVersion", "LOGIN_VERSION", "im.vector.app.features.VectorFeatures.LoginVersion.V1"
-        buildConfigField "im.vector.app.features.VectorFeatures.NotificationSettingsVersion", "NOTIFICATION_SETTINGS_VERSION", "im.vector.app.features.VectorFeatures.NotificationSettingsVersion.V2"
 
         buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
 

vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt

@@ -18,29 +18,19 @@ package im.vector.app.ui.robot.settings
 
 import androidx.test.espresso.Espresso.pressBack
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.espresso.tools.clickOnPreference
-import im.vector.app.features.VectorFeatures
 
 class SettingsNotificationsRobot {
 
     fun crawl() {
-        when (BuildConfig.NOTIFICATION_SETTINGS_VERSION!!) {
+        clickOn(R.string.settings_notification_default)
-            VectorFeatures.NotificationSettingsVersion.V1 -> {
+        pressBack()
-                clickOn(R.string.settings_notification_advanced)
+        clickOn(R.string.settings_notification_mentions_and_keywords)
-                pressBack()
+        // TODO Test adding a keyword?
-            }
+        pressBack()
-            VectorFeatures.NotificationSettingsVersion.V2 -> {
+        clickOn(R.string.settings_notification_other)
-                clickOn(R.string.settings_notification_default)
+        pressBack()
-                pressBack()
-                clickOn(R.string.settings_notification_mentions_and_keywords)
-                // TODO Test adding a keyword?
-                pressBack()
-                clickOn(R.string.settings_notification_other)
-                pressBack()
-            }
-        }
 
         /*
         clickOn(R.string.settings_noisy_notifications_preferences)

vector/src/main/java/im/vector/app/features/VectorFeatures.kt

@@ -21,7 +21,6 @@ import im.vector.app.BuildConfig
 interface VectorFeatures {
 
     fun loginVersion(): LoginVersion
-    fun notificationSettingsVersion(): NotificationSettingsVersion
 
     enum class LoginVersion {
         V1,
@@ -36,5 +35,4 @@ interface VectorFeatures {
 
 class DefaultVectorFeatures : VectorFeatures {
     override fun loginVersion(): VectorFeatures.LoginVersion = BuildConfig.LOGIN_VERSION
-    override fun notificationSettingsVersion(): VectorFeatures.NotificationSettingsVersion = BuildConfig.NOTIFICATION_SETTINGS_VERSION
 }

vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt

@@ -24,7 +24,6 @@ import im.vector.app.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem
 import im.vector.app.core.epoxy.profiles.notifications.radioButtonItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.notifications.notificationOptions
 import im.vector.app.features.roomprofile.notifications.notificationStateMapped
@@ -39,7 +38,6 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val colorProvider: ColorProvider,
         private val stringProvider: StringProvider,
-        private val features: VectorFeatures
 ) : TypedEpoxyController<RoomListQuickActionViewState>() {
 
     var listener: Listener? = null
@@ -48,54 +46,38 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         val notificationViewState = state.notificationSettingsViewState
         val roomSummary = notificationViewState.roomSummary() ?: return
         val host = this
-        val isV2 = features.notificationSettingsVersion() == VectorFeatures.NotificationSettingsVersion.V2
+        // Preview, favorite, settings
-        // V2 always shows full details as we no longer display the sheet from RoomProfile > Notifications
+        bottomSheetRoomPreviewItem {
-        val showFull = state.roomListActionsArgs.mode == RoomListActionsArgs.Mode.FULL || isV2
+            id("room_preview")
-
+            avatarRenderer(host.avatarRenderer)
-        if (showFull) {
+            matrixItem(roomSummary.toMatrixItem())
-            // Preview, favorite, settings
+            stringProvider(host.stringProvider)
-            bottomSheetRoomPreviewItem {
+            colorProvider(host.colorProvider)
-                id("room_preview")
+            izLowPriority(roomSummary.isLowPriority)
-                avatarRenderer(host.avatarRenderer)
+            izFavorite(roomSummary.isFavorite)
-                matrixItem(roomSummary.toMatrixItem())
+            settingsClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.Settings(roomSummary.roomId)) }
-                stringProvider(host.stringProvider)
+            favoriteClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.Favorite(roomSummary.roomId)) }
-                colorProvider(host.colorProvider)
+            lowPriorityClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.LowPriority(roomSummary.roomId)) }
-                izLowPriority(roomSummary.isLowPriority)
-                izFavorite(roomSummary.isFavorite)
-                settingsClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.Settings(roomSummary.roomId)) }
-                favoriteClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.Favorite(roomSummary.roomId)) }
-                lowPriorityClickListener { host.listener?.didSelectMenuAction(RoomListQuickActionsSharedAction.LowPriority(roomSummary.roomId)) }
-            }
-
-            // Notifications
-            bottomSheetDividerItem {
-                id("notifications_separator")
-            }
         }
 
-        if (isV2) {
+        // Notifications
-            notificationViewState.notificationOptions.forEach { notificationState ->
+        bottomSheetDividerItem {
-                val title = titleForNotificationState(notificationState)
+            id("notifications_separator")
-                radioButtonItem {
+        }
-                    id(notificationState.name)
+
-                    titleRes(title)
+        notificationViewState.notificationOptions.forEach { notificationState ->
-                    selected(notificationViewState.notificationStateMapped() == notificationState)
+            val title = titleForNotificationState(notificationState)
-                    listener {
+            radioButtonItem {
-                        host.listener?.didSelectRoomNotificationState(notificationState)
+                id(notificationState.name)
-                    }
+                titleRes(title)
+                selected(notificationViewState.notificationStateMapped() == notificationState)
+                listener {
+                    host.listener?.didSelectRoomNotificationState(notificationState)
                 }
             }
-        } else {
-            val selectedRoomState = notificationViewState.notificationState()
-            RoomListQuickActionsSharedAction.NotificationsAllNoisy(roomSummary.roomId).toBottomSheetItem(0, selectedRoomState)
-            RoomListQuickActionsSharedAction.NotificationsAll(roomSummary.roomId).toBottomSheetItem(1, selectedRoomState)
-            RoomListQuickActionsSharedAction.NotificationsMentionsOnly(roomSummary.roomId).toBottomSheetItem(2, selectedRoomState)
-            RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
         }
 
-        if (showFull) {
+        RoomListQuickActionsSharedAction.Leave(roomSummary.roomId, showIcon = !true).toBottomSheetItem(5)
-            RoomListQuickActionsSharedAction.Leave(roomSummary.roomId, showIcon = !isV2).toBottomSheetItem(5)
-        }
     }
 
     @StringRes

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt

@@ -44,13 +44,10 @@ import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentMatrixProfileBinding
 import im.vector.app.databinding.ViewStubRoomProfileHeaderBinding
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailPendingAction
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
-import im.vector.app.features.home.room.list.actions.RoomListActionsArgs
-import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
 import kotlinx.coroutines.flow.launchIn
@@ -69,8 +66,7 @@ data class RoomProfileArgs(
 class RoomProfileFragment @Inject constructor(
         private val roomProfileController: RoomProfileController,
         private val avatarRenderer: AvatarRenderer,
-        private val roomDetailPendingActionStore: RoomDetailPendingActionStore,
+        private val roomDetailPendingActionStore: RoomDetailPendingActionStore
-        private val features: VectorFeatures
 ) :
         VectorBaseFragment<FragmentMatrixProfileBinding>(),
         RoomProfileController.Callback {
@@ -259,16 +255,7 @@ class RoomProfileFragment @Inject constructor(
     }
 
     override fun onNotificationsClicked() {
-        when (features.notificationSettingsVersion()) {
+        roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomNotificationSettings)
-            VectorFeatures.NotificationSettingsVersion.V1 -> {
-                RoomListQuickActionsBottomSheet
-                        .newInstance(roomProfileArgs.roomId, RoomListActionsArgs.Mode.NOTIFICATIONS)
-                        .show(childFragmentManager, "ROOM_PROFILE_NOTIFICATIONS")
-            }
-            VectorFeatures.NotificationSettingsVersion.V2 -> {
-                roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomNotificationSettings)
-            }
-        }
     }
 
     override fun onUploadsClicked() {

vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

@@ -46,10 +46,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         const val SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY = "SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
         const val SETTINGS_DISCOVERY_PREFERENCE_KEY = "SETTINGS_DISCOVERY_PREFERENCE_KEY"
 
-        const val SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
-        const val SETTINGS_NOTIFICATION_DEFAULT_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_DEFAULT_PREFERENCE_KEY"
-        const val SETTINGS_NOTIFICATION_KEYWORD_AND_MENTIONS_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_KEYWORD_AND_MENTIONS_PREFERENCE_KEY"
-        const val SETTINGS_NOTIFICATION_OTHER_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_OTHER_PREFERENCE_KEY"
         const val SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY = "SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
         const val SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY = "SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
         const val SETTINGS_COPYRIGHT_PREFERENCE_KEY = "SETTINGS_COPYRIGHT_PREFERENCE_KEY"

vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt

@@ -40,7 +40,6 @@ import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.core.utils.isIgnoringBatteryOptimizations
 import im.vector.app.core.utils.requestDisablingBatteryOptimization
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.BackgroundSyncModeChooserDialog
@@ -64,8 +63,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         private val pushManager: PushersManager,
         private val activeSessionHolder: ActiveSessionHolder,
         private val vectorPreferences: VectorPreferences,
-        private val guardServiceStarter: GuardServiceStarter,
+        private val guardServiceStarter: GuardServiceStarter
-        private val features: VectorFeatures
 ) : VectorSettingsBaseFragment(),
         BackgroundSyncModeChooserDialog.InteractionListener {
 
@@ -147,7 +145,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         refreshBackgroundSyncPrefs()
 
         handleSystemPreference()
-        handleVersionedSettings()
     }
 
     private fun bindEmailNotifications() {
@@ -312,15 +309,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         }
     }
 
-    private fun handleVersionedSettings() {
-        val isNotificationSettingsV2Enabled = features.notificationSettingsVersion() == VectorFeatures.NotificationSettingsVersion.V2
-
-        findPreference<Preference>(VectorPreferences.SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY)?.isVisible = !isNotificationSettingsV2Enabled
-        findPreference<Preference>(VectorPreferences.SETTINGS_NOTIFICATION_DEFAULT_PREFERENCE_KEY)?.isVisible = isNotificationSettingsV2Enabled
-        findPreference<Preference>(VectorPreferences.SETTINGS_NOTIFICATION_KEYWORD_AND_MENTIONS_PREFERENCE_KEY)?.isVisible = isNotificationSettingsV2Enabled
-        findPreference<Preference>(VectorPreferences.SETTINGS_NOTIFICATION_OTHER_PREFERENCE_KEY)?.isVisible = isNotificationSettingsV2Enabled
-    }
-
     override fun onResume() {
         super.onResume()
         activeSessionHolder.getSafeActiveSession()?.refreshPushers()

vector/src/main/res/xml/vector_settings_notifications.xml

@@ -20,14 +20,6 @@
         <!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"-->
         <!--android:title="@string/settings_turn_screen_on" />-->
 
-        <im.vector.app.core.preference.VectorPreference
-            android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
-            android:key="SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
-            android:persistent="false"
-            android:summary="@string/settings_notification_advanced_summary"
-            android:title="@string/settings_notification_advanced"
-            app:fragment="im.vector.app.features.settings.notifications.VectorSettingsAdvancedNotificationPreferenceFragment" />
-
         <im.vector.app.core.preference.VectorPreference
             android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:key="SETTINGS_NOTIFICATION_DEFAULT_PREFERENCE_KEY"