rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checking lab flag to select session manager screen to navigate to

Browse Source
This commit is contained in:
Maxime NATUREL 2022-10-14 14:26:21 +02:00
parent 1f0028fd7e
commit 111a70f6c1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
View File

@ -63,6 +63,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
@Inject lateinit var session: Session @Inject lateinit var session: Session
@Inject lateinit var vectorPreferences: VectorPreferences
override fun initUiAndData() { override fun initUiAndData() {
setupToolbar(views.settingsToolbar) setupToolbar(views.settingsToolbar)
.allowBack() .allowBack()
@ -77,13 +79,19 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
replaceFragment(views.vectorSettingsPage, VectorSettingsAdvancedSettingsFragment::class.java, null, FRAGMENT_TAG) replaceFragment(views.vectorSettingsPage, VectorSettingsAdvancedSettingsFragment::class.java, null, FRAGMENT_TAG)
SettingsActivityPayload.SecurityPrivacy -> SettingsActivityPayload.SecurityPrivacy ->
replaceFragment(views.vectorSettingsPage, VectorSettingsSecurityPrivacyFragment::class.java, null, FRAGMENT_TAG) replaceFragment(views.vectorSettingsPage, VectorSettingsSecurityPrivacyFragment::class.java, null, FRAGMENT_TAG)
SettingsActivityPayload.SecurityPrivacyManageSessions -> SettingsActivityPayload.SecurityPrivacyManageSessions -> {
val fragmentClass = if (vectorPreferences.isNewSessionManagerEnabled()) {
im.vector.app.features.settings.devices.v2.VectorSettingsDevicesFragment::class.java
} else {
VectorSettingsDevicesFragment::class.java
}
replaceFragment( replaceFragment(
views.vectorSettingsPage, views.vectorSettingsPage,
VectorSettingsDevicesFragment::class.java, fragmentClass,
null, null,
FRAGMENT_TAG FRAGMENT_TAG
) )
}
SettingsActivityPayload.Notifications -> { SettingsActivityPayload.Notifications -> {
requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY) requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
replaceFragment(views.vectorSettingsPage, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG) replaceFragment(views.vectorSettingsPage, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)