Commit 38454fac authored by Erwan Croze's avatar Erwan Croze 👋🏻

Fixing some bugs, update msWinrtvid

parent 9d810a30
......@@ -1049,12 +1049,16 @@ namespace Linphone.Model {
MediaEncryptionToEnum = new Dictionary<string, MediaEncryption>()
{
{ "None", MediaEncryption.None },
{ "SRTP", MediaEncryption.SRTP }
{ "SRTP", MediaEncryption.SRTP },
{ "ZRTP", MediaEncryption.ZRTP },
{ "DTLS", MediaEncryption.DTLS }
};
EnumToMediaEncryption = new Dictionary<MediaEncryption, string>()
{
{ MediaEncryption.None, "None" },
{ MediaEncryption.SRTP, "SRTP" }
{ MediaEncryption.SRTP, "SRTP" },
{ MediaEncryption.ZRTP, "ZRTP" },
{ MediaEncryption.DTLS, "DTLS" }
};
}
......
......@@ -593,6 +593,12 @@ Do you want to report it to the developpers ? It will help fix it faster.</value
<data name="MediaEncryptionSRTP" xml:space="preserve">
<value>SRTP</value>
</data>
<data name="MediaEncryptionZRTP" xml:space="preserve">
<value>ZRTP</value>
</data>
<data name="MediaEncryptionDTLS" xml:space="preserve">
<value>DTLS</value>
</data>
<data name="StatMediaEncryption" xml:space="preserve">
<value>Media encryption:</value>
</data>
......
......@@ -18,6 +18,7 @@ using BelledonneCommunications.Linphone.Native;
using Linphone.Model;
using System.Collections.Generic;
using Windows.ApplicationModel.Resources;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
......@@ -35,6 +36,7 @@ namespace Linphone.Views {
/// </summary>
public AccountSettings() {
this.InitializeComponent();
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
_settings.Load();
Username.Text = _settings.Username;
......@@ -123,5 +125,12 @@ namespace Linphone.Views {
AVPF.IsOn = true;
linphoneAccount = true;
}
private void back_Click(object sender, BackRequestedEventArgs e) {
if (Frame.CanGoBack) {
e.Handled = true;
Frame.GoBack();
}
}
}
}
\ No newline at end of file
......@@ -22,6 +22,7 @@ using Windows.UI.Xaml.Navigation;
using Windows.ApplicationModel.Resources;
using Windows.UI.Xaml;
using BelledonneCommunications.Linphone.Native;
using Windows.UI.Core;
namespace Linphone.Views {
......@@ -34,6 +35,7 @@ namespace Linphone.Views {
public AdvancedSettings() {
this.InitializeComponent();
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
_callSettings.Load();
_networkSettings.Load();
......@@ -45,11 +47,13 @@ namespace Linphone.Views {
//vibrator.IsOn = (bool) _chatSettings.VibrateOnIncomingMessage;
//resizeDown.IsOn = (bool) _chatSettings.ScaleDownSentPictures;
List<string> mediaEncryptions = new List<string>
{
ResourceLoader.GetForCurrentView().GetString("MediaEncryptionNone"),
ResourceLoader.GetForCurrentView().GetString("MediaEncryptionSRTP")
List<string> mediaEncryptions = new List<string> {
ResourceLoader.GetForCurrentView().GetString("MediaEncryptionNone")
};
if (LinphoneManager.Instance.Core.IsMediaEncryptionSupported(MediaEncryption.SRTP))
mediaEncryptions.Add(ResourceLoader.GetForCurrentView().GetString("MediaEncryptionSRTP"));
mediaEncryption.ItemsSource = mediaEncryptions;
mediaEncryption.SelectedItem = _networkSettings.MEncryption;
......@@ -168,5 +172,12 @@ namespace Linphone.Views {
private void ResetLogs_Click(object sender, RoutedEventArgs e) {
LinphoneManager.Instance.resetLogCollection();
}
private void back_Click(object sender, BackRequestedEventArgs e) {
if (Frame.CanGoBack) {
e.Handled = true;
Frame.GoBack();
}
}
}
}
\ No newline at end of file
......@@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
using BelledonneCommunications.Linphone.Native;
using Linphone.Model;
using System;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
......@@ -34,6 +35,7 @@ namespace Linphone.Views {
/// </summary>
public AudioSettings() {
this.InitializeComponent();
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
_settings.Load();
Speex16.IsOn = _settings.Speex16;
......@@ -135,5 +137,13 @@ namespace Linphone.Views {
}
ECCalibratorButton.IsEnabled = true;
}
private void back_Click(object sender, BackRequestedEventArgs e) {
if (Frame.CanGoBack) {
e.Handled = true;
Frame.GoBack();
}
}
}
}
\ No newline at end of file
......@@ -53,6 +53,9 @@ namespace Linphone.Views {
VideoGrid.Visibility = Visibility.Collapsed;
}
if (LinphoneManager.Instance.Core.CurrentCall.State == CallState.StreamsRunning)
Status.Text = "00:00:00";
displayOrientation = ApplicationView.GetForCurrentView().Orientation;
displayInformation = DisplayInformation.GetForCurrentView();
deviceOrientation = SimpleOrientation.NotRotated;
......
......@@ -33,6 +33,7 @@ namespace Linphone.Views {
/// </summary>
public Settings() {
this.InitializeComponent();
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
}
/// <summary>
......@@ -62,11 +63,11 @@ namespace Linphone.Views {
// var op = await Windows.System.Launcher.LaunchUriAsync(new Uri("ms-settings-lock:"));
}
private void back_Click(object sender, RoutedEventArgs e) {
private void back_Click(object sender, BackRequestedEventArgs e) {
if (Frame.CanGoBack) {
e.Handled = true;
Frame.GoBack();
}
}
}
}
\ No newline at end of file
......@@ -19,6 +19,7 @@ using Linphone.Model;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
......@@ -37,6 +38,7 @@ namespace Linphone.Views {
/// </summary>
public VideoSettings() {
this.InitializeComponent();
SystemNavigationManager.GetForCurrentView().BackRequested += back_Click;
_callSettings.Load();
VideoEnabled.IsOn = (bool)_callSettings.VideoEnabled;
......@@ -54,7 +56,7 @@ namespace Linphone.Views {
_codecsSettings.Load();
foreach (PayloadType p in LinphoneManager.Instance.Core.VideoCodecs) {
if (p.Equals("H264")) {
if (p.MimeType.Equals("H264")) {
H264.Visibility = Visibility.Visible;
}
}
......@@ -108,5 +110,12 @@ namespace Linphone.Views {
Frame.GoBack();
}
}
private void back_Click(object sender, BackRequestedEventArgs e) {
e.Handled = true;
if (Frame.CanGoBack) {
Frame.GoBack();
}
}
}
}
\ No newline at end of file
mswinrtvid @ 7172f8b2
Subproject commit 6ccf934e3a4c6d94a1af8442788a36fa2264e6f3
Subproject commit 7172f8b233faee6b01b44aa67e2f38da67aa38aa
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment