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

# Conflicts:
#	RelayClient/MainPage.xaml.cs

RelayClient/MainPage.xaml.cs

@@ -32,12 +32,7 @@ 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(
@@ -47,6 +42,8 @@ public partial class MainPage : ContentPage
             () => _currentChannelId,
             SafeSendRawToWebView
         );
+        
+        hybridWebView.SetInvokeJavaScriptTarget(_rtc);
 
         _socket.Log += Console.WriteLine;
         _socket.ChannelListReceived += HandleChannelList;
@@ -300,26 +297,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)
     {