Issue/270 (#461)

* Prevent app crash if profile is corrupted * Update 04_Changelog.md Co-authored-by: BornToBeRoot <[email protected]>
BornToBeRoot · Feb 6, 2021 · a7de585 · a7de585
1 parent 477b33d
commit a7de585
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -2919,4 +2919,10 @@ $$hostname$$ --&gt; Hostname</value>
  <data name="SSID" xml:space="preserve">
  <value>SSID</value>
  </data>
+ <data name="ProfileCouldNotBeLoaded" xml:space="preserve">
+ <value>Profile could not be loaded!</value>
+ </data>
+ <data name="ProfileCouldNotBeLoadedAndMayBeCorruptedMessage" xml:space="preserve">
+ <value>The profile could not be loaded and may be corrupted. If this is unexpected or due to an update, please report this issue on GitHub!</value>
+ </data>
 </root>
diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs
@@ -8,8 +8,6 @@
 using System.Windows.Threading;
 using NETworkManager.Profiles;
 using NETworkManager.Localization;
-using ABI.Windows.Devices.AllJoyn;
-using System.Threading.Tasks;
 
 namespace NETworkManager
 {

diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -271,15 +271,15 @@ public ProfileFileInfo SelectedProfileFile
  // Switch profile...
  if (value != null && !value.Equals(ProfileManager.LoadedProfileFile))
  {
- ProfileManager.SwitchProfile(value);
+ SwitchProfile(value);
  SettingsManager.Current.Profiles_LastSelected = value.Name;
  }
 
  OnPropertyChanged();
  }
  }
  #endregion
-
+ 
  #region Constructor, window load and close events
  public MainWindow()
  {
@@ -1259,6 +1259,25 @@ private void ClearSearchAction()
  #endregion
 
  #region Methods
+ private async void SwitchProfile(ProfileFileInfo info)
+ {
+ try
+ {
+ ProfileManager.SwitchProfile(info);
+ }
+ catch
+ {
+ var settings = AppearanceManager.MetroDialog;
+ settings.AffirmativeButtonText = Localization.Resources.Strings.OK;
+
+ ConfigurationManager.Current.FixAirspace = true;
+
+ await this.ShowMessageAsync(Localization.Resources.Strings.ProfileCouldNotBeLoaded, Localization.Resources.Strings.ProfileCouldNotBeLoadedAndMayBeCorruptedMessage, MessageDialogStyle.Affirmative, settings);
+
+ ConfigurationManager.Current.FixAirspace = false;
+ }
+ }
+
  private void OpenStatusWindow()
  {
  statusWindow.ShowFromExternal();

diff --git a/docs/04_Changelog.md b/docs/04_Changelog.md
@@ -25,6 +25,7 @@ Date: **xx.xx.2021**
 
 
 ## Bugfixes
+- Prevent app crash if profile is corrupted [#270](https://github.com/BornToBeRoot/NETworkManager/issues/270)
 - Wrong flags `sl-SI` and `zh-TW` fixed [#438](https://github.com/BornToBeRoot/NETworkManager/issues/438)
 - Update link color fixed