diff --git a/FieldLogger/Services/SettingsService.cs b/FieldLogger/Services/SettingsService.cs index 0710eb7..d9a582a 100644 --- a/FieldLogger/Services/SettingsService.cs +++ b/FieldLogger/Services/SettingsService.cs @@ -73,7 +73,7 @@ public sealed class SettingsService public int MqttPort { - get => Preferences.Default.Get(MqttPortKey, 8884); + get => Preferences.Default.Get(MqttPortKey, 443); set => Preferences.Default.Set(MqttPortKey, value); } diff --git a/FieldLogger/Services/Sync/MqttSyncService.cs b/FieldLogger/Services/Sync/MqttSyncService.cs index 4044d47..542fc6e 100644 --- a/FieldLogger/Services/Sync/MqttSyncService.cs +++ b/FieldLogger/Services/Sync/MqttSyncService.cs @@ -185,6 +185,9 @@ public sealed class MqttSyncService : IMqttSyncService { Host = _settings.MqttHost, Port = _settings.MqttPort, + WebSocketUri = _settings.MqttPort == 443 + ? $"wss://{_settings.MqttHost}/mqtt" + : null, ClientId = _settings.MqttClientId, Username = _settings.MqttOrgId, Password = password, diff --git a/FieldLogger/ViewModels/SettingsViewModel.cs b/FieldLogger/ViewModels/SettingsViewModel.cs index 2868b24..73586ec 100644 --- a/FieldLogger/ViewModels/SettingsViewModel.cs +++ b/FieldLogger/ViewModels/SettingsViewModel.cs @@ -24,7 +24,7 @@ public sealed partial class SettingsViewModel : ObservableObject private string _mqttHost = ""; [ObservableProperty] - private string _mqttPort = "8884"; + private string _mqttPort = "443"; [ObservableProperty] private string _mqttOrgId = ""; diff --git a/FieldLogger/Views/SettingsPage.xaml b/FieldLogger/Views/SettingsPage.xaml index 6b2ff2e..62a7ccb 100644 --- a/FieldLogger/Views/SettingsPage.xaml +++ b/FieldLogger/Views/SettingsPage.xaml @@ -58,7 +58,7 @@ - +