Expose Element Call settings in the developer options. Start using th… (#2039)

* Expose Element Call settings in the developer options. Start using the encryption widget parameter. * Remove the Element Call feature flag
2026-11-06 04:18:31 +00:00 · 2023-11-07 16:12:03 +02:00
parent b13abf9cdf
commit 5dcb24add7
13 changed files with 76 additions and 56 deletions
@@ -23,6 +23,8 @@ struct CallScreenCoordinatorParameters {
    let callBaseURL: URL
    /// A way to identify the current client against Element Call
    let clientID: String
+    /// Whether encryption should be used within the call
+    let useEncryption: Bool
 }

 enum CallScreenCoordinatorAction {
@@ -44,7 +46,8 @@ final class CallScreenCoordinator: CoordinatorProtocol {
        
        viewModel = CallScreenViewModel(roomProxy: parameters.roomProxy,
                                        callBaseURL: parameters.callBaseURL,
-                                        clientID: parameters.clientID)
+                                        clientID: parameters.clientID,
+                                        useEncryption: parameters.useEncryption)
    }
    
    func start() {
@@ -46,7 +46,10 @@ class CallScreenViewModel: CallScreenViewModelType, CallScreenViewModelProtocol
    ///   - roomProxy: The room in which the call should be created
    ///   - callBaseURL: Which Element Call instance should be used
    ///   - clientID: Something to identify the current client on the Element Call side
-    init(roomProxy: RoomProxyProtocol, callBaseURL: URL, clientID: String) {
+    init(roomProxy: RoomProxyProtocol,
+         callBaseURL: URL,
+         clientID: String,
+         useEncryption: Bool) {
        self.roomProxy = roomProxy
        self.callBaseURL = callBaseURL
        self.clientID = clientID
@@ -99,7 +102,7 @@ class CallScreenViewModel: CallScreenViewModelType, CallScreenViewModelProtocol
            .store(in: &cancellables)
        
        Task {
-            switch await widgetDriver.start(baseURL: callBaseURL, clientID: clientID) {
+            switch await widgetDriver.start(baseURL: callBaseURL, clientID: clientID, useEncryption: useEncryption) {
            case .success(let url):
                state.url = url
            case .failure(let error):
@@ -23,8 +23,6 @@ struct CallScreen: View {
    
    var body: some View {
        WebView(url: context.viewState.url, viewModelContext: context)
-            .navigationTitle("Call")
-            .navigationBarTitleDisplayMode(.inline)
            .ignoresSafeArea(edges: .bottom)
            .presentationDragIndicator(.visible)
            .environment(\.colorScheme, .dark)
@@ -164,13 +162,14 @@ struct CallScreen_Previews: PreviewProvider {
        let widgetDriver = ElementCallWidgetDriverMock()
        widgetDriver.underlyingMessagePublisher = .init()
        widgetDriver.underlyingActions = PassthroughSubject<ElementCallWidgetDriverAction, Never>().eraseToAnyPublisher()
-        widgetDriver.startBaseURLClientIDReturnValue = .success(URL.userDirectory)
+        widgetDriver.startBaseURLClientIDUseEncryptionReturnValue = .success(URL.userDirectory)
        
        roomProxy.elementCallWidgetDriverReturnValue = widgetDriver
        
        return CallScreenViewModel(roomProxy: roomProxy,
                                   callBaseURL: "https://call.element.io",
-                                   clientID: "io.element.elementx")
+                                   clientID: "io.element.elementx",
+                                   useEncryption: false)
    }()
    
    static var previews: some View {
@@ -116,7 +116,6 @@ struct RoomScreenViewState: BindableState {

    var ownUserID: String
    
-    var showCallButton = false
    var isCallOngoing = false
    
    var bindings: RoomScreenViewStateBindings
@@ -264,11 +264,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
        appSettings.$readReceiptsEnabled
            .weakAssign(to: \.state.readReceiptsEnabled, on: self)
            .store(in: &cancellables)
-        
-        appSettings.$elementCallEnabled
-            .weakAssign(to: \.state.showCallButton, on: self)
-            .store(in: &cancellables)
-        
+                
        roomProxy.members
            .map { members in
                members.reduce(into: [String: RoomMemberState]()) { dictionary, member in
@@ -162,21 +162,19 @@ struct RoomScreen: View {
    
    @ViewBuilder
    private var callButton: some View {
-        if context.viewState.showCallButton {
-            if context.viewState.isCallOngoing {
-                Button {
-                    context.send(viewAction: .presentCall)
-                } label: {
-                    Label(L10n.actionJoin, icon: \.videoCallSolid)
-                        .labelStyle(.titleAndIcon)
-                }
-                .buttonStyle(ElementCallButtonStyle())
-            } else {
-                Button {
-                    context.send(viewAction: .presentCall)
-                } label: {
-                    CompoundIcon(\.videoCallSolid)
-                }
+        if context.viewState.isCallOngoing {
+            Button {
+                context.send(viewAction: .presentCall)
+            } label: {
+                Label(L10n.actionJoin, icon: \.videoCallSolid)
+                    .labelStyle(.titleAndIcon)
+            }
+            .buttonStyle(ElementCallButtonStyle())
+        } else {
+            Button {
+                context.send(viewAction: .presentCall)
+            } label: {
+                CompoundIcon(\.videoCallSolid)
            }
        }
    }
@@ -49,8 +49,10 @@ protocol DeveloperOptionsProtocol: AnyObject {
    var userSuggestionsEnabled: Bool { get set }
    var readReceiptsEnabled: Bool { get set }
    var swiftUITimelineEnabled: Bool { get set }
-    var elementCallEnabled: Bool { get set }
    var chatBackupEnabled: Bool { get set }
+    
+    var elementCallBaseURL: URL { get set }
+    var elementCallUseEncryption: Bool { get set }
 }

 extension AppSettings: DeveloperOptionsProtocol { }
@@ -19,6 +19,7 @@ import SwiftUI
 struct DeveloperOptionsScreen: View {
    @ObservedObject var context: DeveloperOptionsScreenViewModel.Context
    @State private var showConfetti = false
+    @State private var elementCallBaseURLString = ""
    
    var body: some View {
        Form {
@@ -52,10 +53,6 @@ struct DeveloperOptionsScreen: View {
                    Text("SwiftUI Timeline")
                    Text("Resets on reboot")
                }
-                
-                Toggle(isOn: $context.elementCallEnabled) {
-                    Text("Element Call")
-                }
            }
            
            Section("Room creation") {
@@ -63,6 +60,25 @@ struct DeveloperOptionsScreen: View {
                    Text("User suggestions")
                }
            }
+            
+            Section("Element Call") {
+                TextField(context.elementCallBaseURL.absoluteString, text: $elementCallBaseURLString)
+                    .submitLabel(.done)
+                    .onSubmit {
+                        guard let url = URL(string: elementCallBaseURLString) else {
+                            return
+                        }
+                        
+                        context.elementCallBaseURL = url
+                    }
+                    .autocorrectionDisabled(true)
+                    .autocapitalization(.none)
+                    .foregroundColor(URL(string: elementCallBaseURLString) == nil ? .red : .primary)
+                
+                Toggle(isOn: $context.elementCallUseEncryption) {
+                    Text("Use encryption")
+                }
+            }

            Section {
                Button {