Remove deprecated restricted lab option #4889
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bmarty
requested changes
Jan 10, 2022
There was a problem hiding this comment.
Please do not touch the translated strings, I do not want to have conflict with Weblate.
See https://github.com/vector-im/element-android/blob/main/CONTRIBUTING.md#removing-existing-strings for more details
Updated |
bmarty
requested changes
Jan 10, 2022
| @@ -72,7 +72,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init | |||
| val restrictedSupport = session.getHomeServerCapabilities().isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED) | |||
| val createRestricted = when (restrictedSupport) { | |||
| HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED -> true | |||
| HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED_UNSTABLE -> vectorPreferences.labsUseExperimentalRestricted() | |||
| // HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED_UNSTABLE -> vectorPreferences.labsUseExperimentalRestricted() | |||
There was a problem hiding this comment.
I would prefer to just remove instead of commenting all the lines like this one.
There was a problem hiding this comment.
yeah, I hesitated a bit but will remove now (done)
bmarty
reviewed
Jan 10, 2022
| @@ -75,7 +75,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState: | |||
| val restrictedSupport = homeServerCapabilities.isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED) | |||
| val couldUpgradeToRestricted = when (restrictedSupport) { | |||
| HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED -> true | |||
| HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED_UNSTABLE -> vectorPreferences.labsUseExperimentalRestricted() | |||
| // HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED_UNSTABLE -> vectorPreferences.labsUseExperimentalRestricted() | |||
There was a problem hiding this comment.
thx, updated (+ rebase)
BillCarsonFr
force-pushed
the
feature/bca/clean_deprecated_lab_restricted
branch
from
f88cf06
to
da94bfb
Compare
bmarty
approved these changes
Jan 11, 2022
bmarty
reviewed
Jan 11, 2022
| @@ -0,0 +1 @@ | |||
| Remove deprecated experimental restricted space lab option | |||
There was a problem hiding this comment.
FYI: using removal extension is reserved for changes in the SDK. For this change misc would have been better. (I am seeing that when doing the release, so I will update the changelog manaully, no worries)
onurays
pushed a commit
that referenced
this pull request
Jan 11, 2022
* develop: (281 commits) Add a comment about the workaround Remove deprecated restricted lab option (#4889) Bump actions/github-script from 3 to 5.1.0 Add some missing language in the change language screen Workaround to not to reuse poll option cells. Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 Changelog Test: Fix test after change on OnBoarding screens Test: Analytics opt-in Cleanup Revert "Disable automatic opt-in screen display." - Do not add GitHub comments on successful ktlint runs - Remove already existing comments when ktlint succeed restore deprecated lab preference Update nb of enum classes Change autoUisi label + rename matching_issue code review Fix enabling was broken Simple rate limiting of RS sending use flow instead of reactivex Fix UISIS preference listener ... # Conflicts: # vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt # vector/src/main/res/layout/view_attachment_type_selector.xml # vector/src/main/res/values/strings.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes the deprecated use experimental restricted join rule lab option