Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Remove option to select protocol in create group - WPB-10442 #2148

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+1 −6
Open

feat: Remove option to select protocol in create group - WPB-10442 #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
424a8c4
feat: remove CREATE_MLS_GROUP_ENABLED flag
KaterinaWire Nov 11, 2024
1846a43
test commit
KaterinaWire Nov 12, 2024
c9d67cf
fix: revert changes
KaterinaWire Nov 12, 2024
ab4fa6d
Merge branch 'develop' into feat/remove-option-to-select-protocol-WPB…
KaterinaWire Nov 12, 2024
aeea6e7
Merge branch 'develop' into feat/remove-option-to-select-protocol-WPB…
KaterinaWire Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions wire-ios-utilities/Resources/WireUtilities-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
<string>Copyright © 2015 Wire. All rights reserved.</string>
<key>MLSEnabled</key>
<string>${MLS_ENABLED}</string>
<key>CreateMLSGroupEnabled</key>
<string>${CREATE_MLS_GROUP_ENABLED}</string>
<key>ProteusByCoreCryptoEnabled</key>
<string>${PROTEUS_BY_CORECRYPTO_ENABLED}</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion wire-ios-utilities/Source/DeveloperFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public enum DeveloperFlag: String, CaseIterable {
case .enableMLSSupport:
return "MLSEnabled"
case .showCreateMLSGroupToggle:
return "CreateMLSGroupEnabled"
return nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK so returning nil here means it is still available for developer builds but not for regular builds?

case .proteusViaCoreCrypto:
return "ProteusByCoreCryptoEnabled"
case .forceDatabaseLoadingFailure:
Expand Down
2 changes: 0 additions & 2 deletions wire-ios/Configuration/Developer-Flags.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@

PROTEUS_BY_CORECRYPTO_ENABLED=1
MLS_ENABLED=0
// Shows the toggle to choose MLS as messaging protocol when creating a group
CREATE_MLS_GROUP_ENABLED=0
1 change: 0 additions & 1 deletion ...s/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ final class ConversationCreationController: UIViewController {

private lazy var encryptionProtocolSection = {
let section = ConversationEncryptionProtocolSectionController(values: values)
section.isHidden = true
Copy link
Contributor Author

@KaterinaWire KaterinaWire Nov 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was not fixed during the conversation creation view refactoring.

section.tapAction = { sender in
self.presentEncryptionProtocolPicker(sender: sender) { [weak self] encryptionProtocol in
self?.values.encryptionProtocol = encryptionProtocol
Expand Down
Loading