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

# Conflicts:
#	RelayClient/MainPage.xaml.cs

RelayClient/MainPage.xaml.cs

@@ -32,13 +32,8 @@ public partial class MainPage : ContentPage
             KeyStorage.SavePublicKey(_username, keys.publicKey);
         }
 
-        hybridWebView.SetInvokeJavaScriptTarget(this);
-        // hybridWebView.SetInvokeJavaScriptTarget(new RtcBridgeService());
-        //TODO: Need to not have parameters in constructor, protected flags on vars instead of private should make everything accessible
-        
         ServerAPI.setupClient();
 
-
         _socket = new RelaySocketClient(_username);
         _rtc = new RtcBridgeService(
             _username,
@@ -48,6 +43,8 @@ public partial class MainPage : ContentPage
             SafeSendRawToWebView
         );
         
+        hybridWebView.SetInvokeJavaScriptTarget(_rtc);
+
         _socket.Log += Console.WriteLine;
         _socket.ChannelListReceived += HandleChannelList;
         _socket.EncryptedChatReceived += HandleEncryptedChat;
@@ -301,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")