Merge remote-tracking branch 'origin/RTC-Rewrite' into RTC-Rewrite

# Conflicts:
#	RelayClient/MainPage.xaml.cs

RelayClient/MainPage.xaml.cs

@@ -32,7 +32,6 @@ public partial class MainPage : ContentPage
             KeyStorage.SavePublicKey(_username, keys.publicKey);
         }
 
-        hybridWebView.SetInvokeJavaScriptTarget(this);
         ServerAPI.setupClient();
 
         _socket = new RelaySocketClient(_username);
@@ -44,6 +43,8 @@ public partial class MainPage : ContentPage
             SafeSendRawToWebView
         );
         
+        hybridWebView.SetInvokeJavaScriptTarget(_rtc);
+
         _socket.Log += Console.WriteLine;
         _socket.ChannelListReceived += HandleChannelList;
         _socket.EncryptedChatReceived += HandleEncryptedChat;
@@ -297,26 +298,6 @@ public partial class MainPage : ContentPage
         SwapView();
     }
 
-    public Task JoinRtcChannel()
-    {
-        return _rtc.JoinRtcChannel();
-    }
-
-    public void LeaveRtcChannel()
-    {
-        _rtc.LeaveRtcChannel();
-    }
-
-    public void SendRtcSignal(string json)
-    {
-        _rtc.SendRtcSignal(json);
-    }
-
-    public Task<string> GetRtcParticipants()
-    {
-        return _rtc.GetRtcParticipants();
-    }
-
     private async void OnHybridWebViewRawMessageReceived(object sender, HybridWebViewRawMessageReceivedEventArgs e)
     {
         if (e.Message == "rtc_page_ready")

RelayClient/Services/RtcBridgeService.cs

@@ -13,12 +13,8 @@ public sealed class RtcBridgeService
     private readonly Func<string?> _getCurrentChannelId;
     private readonly Action<string> _sendRawToWebView;
 
-    public RtcBridgeService(
+    public RtcBridgeService(string username, RelaySocketClient socket, HybridWebView hybridWebView,
-        string username,
+                            Func<string?> getCurrentChannelId, Action<string> sendRawToWebView)
-        RelaySocketClient socket,
-        HybridWebView hybridWebView,
-        Func<string?> getCurrentChannelId,
-        Action<string> sendRawToWebView)
     {
         _username = username;
         _socket = socket;